Make window id logging hex everywhere

Right now some logs use %d and some use %08x and it can be confusing to follow.
tdemin · Sep 9, 2021 · af23c0f · af23c0f
1 parent ce2c218
commit af23c0f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/ewmh.c b/src/ewmh.c
@@ -278,10 +278,10 @@ void ewmh_update_client_list_stacking(xcb_window_t *stack, int num_windows) {
  */
 void ewmh_update_sticky(xcb_window_t window, bool sticky) {
     if (sticky) {
-        DLOG("Setting _NET_WM_STATE_STICKY for window = %d.\n", window);
+        DLOG("Setting _NET_WM_STATE_STICKY for window = %08x.\n", window);
         xcb_add_property_atom(conn, window, A__NET_WM_STATE, A__NET_WM_STATE_STICKY);
     } else {
-        DLOG("Removing _NET_WM_STATE_STICKY for window = %d.\n", window);
+        DLOG("Removing _NET_WM_STATE_STICKY for window = %08x.\n", window);
         xcb_remove_property_atom(conn, window, A__NET_WM_STATE, A__NET_WM_STATE_STICKY);
     }
 }
@@ -292,10 +292,10 @@ void ewmh_update_sticky(xcb_window_t window, bool sticky) {
  */
 void ewmh_update_focused(xcb_window_t window, bool is_focused) {
     if (is_focused) {
-        DLOG("Setting _NET_WM_STATE_FOCUSED for window = %d.\n", window);
+        DLOG("Setting _NET_WM_STATE_FOCUSED for window = %08x.\n", window);
         xcb_add_property_atom(conn, window, A__NET_WM_STATE, A__NET_WM_STATE_FOCUSED);
     } else {
-        DLOG("Removing _NET_WM_STATE_FOCUSED for window = %d.\n", window);
+        DLOG("Removing _NET_WM_STATE_FOCUSED for window = %08x.\n", window);
         xcb_remove_property_atom(conn, window, A__NET_WM_STATE, A__NET_WM_STATE_FOCUSED);
     }
 }

diff --git a/src/handlers.c b/src/handlers.c
@@ -803,12 +803,12 @@ static void handle_client_message(xcb_client_message_event_t *event) {
         if (event->data.data32[0] == XCB_ICCCM_WM_STATE_ICONIC) {
             /* For compatiblity reasons, Wine will request iconic state and cannot ensure that the WM has agreed on it;
              * immediately revert to normal to avoid being stuck in a paused state. */
-            DLOG("Client has requested iconic state, rejecting. (window = %d)\n", event->window);
+            DLOG("Client has requested iconic state, rejecting. (window = %08x)\n", event->window);
             long data[] = {XCB_ICCCM_WM_STATE_NORMAL, XCB_NONE};
             xcb_change_property(conn, XCB_PROP_MODE_REPLACE, event->window,
                                 A_WM_STATE, A_WM_STATE, 32, 2, data);
         } else {
-            DLOG("Not handling WM_CHANGE_STATE request. (window = %d, state = %d)\n", event->window, event->data.data32[0]);
+            DLOG("Not handling WM_CHANGE_STATE request. (window = %08x, state = %d)\n", event->window, event->data.data32[0]);
         }
     } else if (event->type == A__NET_CURRENT_DESKTOP) {
         /* This request is used by pagers and bars to change the current
@@ -876,7 +876,7 @@ static void handle_client_message(xcb_client_message_event_t *event) {
             tree_close_internal(con, KILL_WINDOW, false);
             tree_render();
         } else {
-            DLOG("Couldn't find con for _NET_CLOSE_WINDOW request. (window = %d)\n", event->window);
+            DLOG("Couldn't find con for _NET_CLOSE_WINDOW request. (window = %08x)\n", event->window);
         }
     } else if (event->type == A__NET_WM_MOVERESIZE) {
         /*
@@ -885,7 +885,7 @@ static void handle_client_message(xcb_client_message_event_t *event) {
          */
         Con *con = con_by_window_id(event->window);
         if (!con || !con_is_floating(con)) {
-            DLOG("Couldn't find con for _NET_WM_MOVERESIZE request, or con not floating (window = %d)\n", event->window);
+            DLOG("Couldn't find con for _NET_WM_MOVERESIZE request, or con not floating (window = %08x)\n", event->window);
             return;
         }
         DLOG("Handling _NET_WM_MOVERESIZE request (con = %p)\n", con);