Merge branch 'release-4.16.1'

[i3/i3] / src / output.c

diff --git a/src/output.c b/src/output.c
index 62b146a74150fa65e094e09a6b4e4570552700b1..ebba5c77d40670afefe7b83f92245a5afea3b71f 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -1,5 +1,3 @@
-#undef I3__FILE__
-#define I3__FILE__ "output.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *
@@ -12,7 +10,7 @@
 #include "all.h"
 
 /*
- * Returns the output container below the given output container.
+ * Returns the content container below the given output container.
  *
  */
 Con *output_get_content(Con *output) {
@@ -31,18 +29,41 @@ Con *output_get_content(Con *output) {
  *
  */
 Output *get_output_from_string(Output *current_output, const char *output_str) {
-    Output *output;
+    if (strcasecmp(output_str, "current") == 0) {
+        return get_output_for_con(focused);
+    } else if (strcasecmp(output_str, "left") == 0) {
+        return get_output_next_wrap(D_LEFT, current_output);
+    } else if (strcasecmp(output_str, "right") == 0) {
+        return get_output_next_wrap(D_RIGHT, current_output);
+    } else if (strcasecmp(output_str, "up") == 0) {
+        return get_output_next_wrap(D_UP, current_output);
+    } else if (strcasecmp(output_str, "down") == 0) {
+        return get_output_next_wrap(D_DOWN, current_output);
+    }
+
+    return get_output_by_name(output_str, true);
+}
 
-    if (strcasecmp(output_str, "left") == 0)
-        output = get_output_next_wrap(D_LEFT, current_output);
-    else if (strcasecmp(output_str, "right") == 0)
-        output = get_output_next_wrap(D_RIGHT, current_output);
-    else if (strcasecmp(output_str, "up") == 0)
-        output = get_output_next_wrap(D_UP, current_output);
-    else if (strcasecmp(output_str, "down") == 0)
-        output = get_output_next_wrap(D_DOWN, current_output);
-    else
-        output = get_output_by_name(output_str);
+/*
+ * Retrieves the primary name of an output.
+ *
+ */
+char *output_primary_name(Output *output) {
+    return SLIST_FIRST(&output->names_head)->name;
+}
+
+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;
+    }
 
     return output;
 }
@@ -51,8 +72,15 @@ Output *get_output_from_string(Output *current_output, const char *output_str) {
  * 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;
@@ -74,11 +102,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)) {
-                    con_move_to_workspace(current, visible_ws, true, false, current != to_focus->parent);
+                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));
                 }
             }
         }