From 5967ac3b0bc02eaa5c9a7665808a7cc006d9789e Mon Sep 17 00:00:00 2001
From: Mihir Lad <mihirlad55@gmail.com>
Date: Tue, 21 Jul 2020 00:42:58 -0400
Subject: [PATCH] dwm: Remove id param from update_title_label

Use m_focused_client_id to update the label. It makes more sense to use this
variable instead of passing a client id to the function.
---
 include/modules/dwm.hpp |  8 +++-----
 src/modules/dwm.cpp     | 11 ++++++-----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/include/modules/dwm.hpp b/include/modules/dwm.hpp
index 0c026e83..74f64098 100644
--- a/include/modules/dwm.hpp
+++ b/include/modules/dwm.hpp
@@ -158,12 +158,10 @@ namespace modules {
     void update_tag_labels();
 
     /**
-     * Get the window title of the specified client from dwm and update the
-     * title label
-     *
-     * @param client_id The window XID of the client
+     * Get the window title of the currently focused client from dwm and update
+     * the title label
      */
-    void update_title_label(window_t client_id);
+    void update_title_label();
 
     /**
      * Translate the tag's tag states to a state_t enum value
diff --git a/src/modules/dwm.cpp b/src/modules/dwm.cpp
index 170fa336..8eabb201 100644
--- a/src/modules/dwm.cpp
+++ b/src/modules/dwm.cpp
@@ -60,6 +60,7 @@ namespace modules {
 
     try {
       update_monitor_ref();
+      m_focused_client_id = m_bar_mon->clients.selected;
 
       // Initialize tags array
       auto tags = m_ipc->get_tags();
@@ -90,7 +91,7 @@ namespace modules {
 
       // These events are only necessary to update the focused window title
       if (m_title_label) {
-        update_title_label(m_bar_mon->clients.selected);
+        update_title_label();
         m_ipc->on_client_focus_change = [this](const dwmipc::ClientFocusChangeEvent& ev) {
           this->on_client_focus_change(ev);
         };
@@ -296,11 +297,11 @@ namespace modules {
     }
   }
 
-  void dwm_module::update_title_label(window_t client_id) {
+  void dwm_module::update_title_label() {
     std::string new_title;
-    if (client_id != 0) {
+    if (m_focused_client_id != 0) {
       try {
-        new_title = m_ipc->get_client(client_id)->name;
+        new_title = m_ipc->get_client(m_focused_client_id)->name;
       } catch (const dwmipc::SocketClosedError& err) {
         m_log.err("%s: Disconnected from socket: %s", name(), err.what());
         reconnect_dwm();
@@ -363,7 +364,7 @@ namespace modules {
   void dwm_module::on_client_focus_change(const dwmipc::ClientFocusChangeEvent& ev) {
     if (ev.monitor_num == m_bar_mon->num) {
       m_focused_client_id = ev.new_win_id;
-      update_title_label(ev.new_win_id);
+      update_title_label();
     }
   }