]> git.sur5r.net Git - i3/i3/commitdiff
handle_configure_request: reuse 'workspace' variable
authorOrestis Floros <orestisf1993@gmail.com>
Wed, 22 Aug 2018 11:10:42 +0000 (14:10 +0300)
committerOrestis Floros <orestisf1993@gmail.com>
Wed, 22 Aug 2018 11:10:42 +0000 (14:10 +0300)
src/handlers.c

index fe10d4b9d494cc161170165251101be5c8e2c081..c203517b07137c7fd8a50cd0f341dc35391f8c04 100644 (file)
@@ -406,23 +406,22 @@ static void handle_configure_request(xcb_configure_request_event_t *event) {
             goto out;
         }
 
-        Con *ws = con_get_workspace(con);
-        if (ws == NULL) {
+        if (workspace == NULL) {
             DLOG("Window is not being managed, ignoring ConfigureRequest\n");
             goto out;
         }
 
-        if (strcmp(ws->name, "__i3_scratch") == 0) {
+        if (strcmp(workspace->name, "__i3_scratch") == 0) {
             DLOG("This is a scratchpad container, ignoring ConfigureRequest\n");
             goto out;
         }
 
-        if (config.focus_on_window_activation == FOWA_FOCUS || (config.focus_on_window_activation == FOWA_SMART && workspace_is_visible(ws))) {
+        if (config.focus_on_window_activation == FOWA_FOCUS || (config.focus_on_window_activation == FOWA_SMART && workspace_is_visible(workspace))) {
             DLOG("Focusing con = %p\n", con);
-            workspace_show(ws);
+            workspace_show(workspace);
             con_activate(con);
             tree_render();
-        } else if (config.focus_on_window_activation == FOWA_URGENT || (config.focus_on_window_activation == FOWA_SMART && !workspace_is_visible(ws))) {
+        } else if (config.focus_on_window_activation == FOWA_URGENT || (config.focus_on_window_activation == FOWA_SMART && !workspace_is_visible(workspace))) {
             DLOG("Marking con = %p urgent\n", con);
             con_set_urgency(con, true);
             tree_render();