Merge pull request #3697 from orestisf1993/ewmh

[i3/i3] / src / output.c

diff --git a/src/output.c b/src/output.c
index 19a7c4afafcecddccfb40e199449bf0b13e788f7..3d931b1b567aa260d062ba770e3f7b92677dc794 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -54,16 +54,8 @@ char *output_primary_name(Output *output) {
 
 Output *get_output_for_con(Con *con) {
     Con *output_con = con_get_output(con);
-    if (output_con == NULL) {
-        ELOG("Could not get the output container for con = %p.\n", con);
-        return NULL;
-    }
-
     Output *output = get_output_by_name(output_con->name, true);
-    if (output == NULL) {
-        ELOG("Could not get output from name \"%s\".\n", output_con->name);
-        return NULL;
-    }
+    assert(output != NULL);
 
     return output;
 }
@@ -72,8 +64,15 @@ Output *get_output_for_con(Con *con) {
  * Iterates over all outputs and pushes sticky windows to the currently visible
  * workspace on that output.
  *
+ * old_focus is used to determine if a sticky window is going to be focused.
+ * old_focus might be different than the currently focused container because the
+ * caller might need to temporarily change the focus and then call
+ * output_push_sticky_windows. For example, workspace_show needs to set focus to
+ * one of its descendants first, then call output_push_sticky_windows that
+ * should focus a sticky window if it was the focused in the previous workspace.
+ *
  */
-void output_push_sticky_windows(Con *to_focus) {
+void output_push_sticky_windows(Con *old_focus) {
     Con *output;
     TAILQ_FOREACH(output, &(croot->focus_head), focused) {
         Con *workspace, *visible_ws = NULL;
@@ -95,18 +94,17 @@ void output_push_sticky_windows(Con *to_focus) {
                  child != TAILQ_END(&(current_ws->focus_head));) {
                 Con *current = child;
                 child = TAILQ_NEXT(child, focused);
-                if (current->type != CT_FLOATING_CON)
+                if (current->type != CT_FLOATING_CON || !con_is_sticky(current)) {
                     continue;
+                }
 
-                if (con_is_sticky(current)) {
-                    bool ignore_focus = (to_focus == NULL) || (current != to_focus->parent);
-                    con_move_to_workspace(current, visible_ws, true, false, ignore_focus);
-                    if (!ignore_focus) {
-                        Con *current_ws = con_get_workspace(focused);
-                        con_activate(con_descend_focused(current));
-                        /* Pushing sticky windows shouldn't change the focused workspace. */
-                        con_activate(con_descend_focused(current_ws));
-                    }
+                bool ignore_focus = (old_focus == NULL) || (current != old_focus->parent);
+                con_move_to_workspace(current, visible_ws, true, false, ignore_focus);
+                if (!ignore_focus) {
+                    Con *current_ws = con_get_workspace(focused);
+                    con_activate(con_descend_focused(current));
+                    /* Pushing sticky windows shouldn't change the focused workspace. */
+                    con_activate(con_descend_focused(current_ws));
                 }
             }
         }