X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Foutput.c;h=0f2bd61726d3930194ac5a7edf4d420db3fde9db;hb=f354f534357798eb3ba497b7143132f41ff090f6;hp=822a0f8891004b5c8c8b14cc4c8f68deace51f3b;hpb=5b80713233a70ab1bb4a6e5b4e676d4cf29b05b7;p=i3%2Fi3

diff --git a/src/output.c b/src/output.c
index 822a0f88..0f2bd617 100644
--- a/src/output.c
+++ b/src/output.c
@@ -1,10 +1,8 @@
-#undef I3__FILE__
-#define I3__FILE__ "output.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
- * © 2009-2013 Michael Stapelberg and contributors (see also: LICENSE)
+ * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * output.c: Output (monitor) related functions.
  *
@@ -31,18 +29,71 @@ Con *output_get_content(Con *output) {
  *
  */
 Output *get_output_from_string(Output *current_output, const char *output_str) {
-    Output *output;
-
-    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);
+    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);
+}
+
+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);
+    if (output == NULL) {
+        ELOG("Could not get output from name \"%s\".\n", output_con->name);
+        return NULL;
+    }
 
     return output;
 }
+
+/*
+ * Iterates over all outputs and pushes sticky windows to the currently visible
+ * workspace on that output.
+ *
+ */
+void output_push_sticky_windows(Con *to_focus) {
+    Con *output;
+    TAILQ_FOREACH(output, &(croot->focus_head), focused) {
+        Con *workspace, *visible_ws = NULL;
+        GREP_FIRST(visible_ws, output_get_content(output), workspace_is_visible(child));
+
+        /* We use this loop instead of TAILQ_FOREACH to avoid problems if the
+         * sticky window was the last window on that workspace as moving it in
+         * this case will close the workspace. */
+        for (workspace = TAILQ_FIRST(&(output_get_content(output)->focus_head));
+             workspace != TAILQ_END(&(output_get_content(output)->focus_head));) {
+            Con *current_ws = workspace;
+            workspace = TAILQ_NEXT(workspace, focused);
+
+            /* Since moving the windows actually removes them from the list of
+             * floating windows on this workspace, here too we need to use
+             * another loop than TAILQ_FOREACH. */
+            Con *child;
+            for (child = TAILQ_FIRST(&(current_ws->focus_head));
+                 child != TAILQ_END(&(current_ws->focus_head));) {
+                Con *current = child;
+                child = TAILQ_NEXT(child, focused);
+                if (current->type != CT_FLOATING_CON)
+                    continue;
+
+                if (con_is_sticky(current)) {
+                    con_move_to_workspace(current, visible_ws, true, false, current != to_focus->parent);
+                }
+            }
+        }
+    }
+}