Merge pull request #3022 from orestisf1993/i3bar-leaks

[i3/i3] / src / handlers.c

diff --git a/src/handlers.c b/src/handlers.c
index 3140e4057674ca7596719ece8df9f5fbba70b19a..0f81afae19a095233e4c568e0b8dff7667edeb8b 100644 (file)
--- a/src/handlers.c
+++ b/src/handlers.c
@@ -774,6 +774,8 @@ static void handle_client_message(xcb_client_message_event_t *event) {
                 scratchpad_show(con);
             } else {
                 workspace_show(ws);
+                /* Re-set focus, even if unchanged from i3’s perspective. */
+                focused_id = XCB_NONE;
                 con_focus(con);
             }
         } else {
@@ -1262,6 +1264,9 @@ static void handle_configure_notify(xcb_configure_notify_event_t *event) {
     }
     DLOG("ConfigureNotify for root window 0x%08x\n", event->event);
 
+    if (force_xinerama) {
+        return;
+    }
     randr_query_outputs();
 }