Switch and Move to next workspace on the same Output. As requested in \#554

[i3/i3] / src / cmdparse.y

diff --git a/src/cmdparse.y b/src/cmdparse.y
index 7425c31ddd344577f556b31051aaa6b155c239d0..28aa564e4b131704501715e7493ecf649b6400c5 100644 (file)
--- a/src/cmdparse.y
+++ b/src/cmdparse.y
@@ -3,7 +3,7 @@
  * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
- * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
+ * © 2009-2012 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * cmdparse.y: the parser for commands you send to i3 (or bind on keys)
  *
@@ -155,6 +155,8 @@ bool definitelyGreaterThan(float a, float b, float epsilon) {
 %token              TOK_OPEN            "open"
 %token              TOK_NEXT            "next"
 %token              TOK_PREV            "prev"
+%token              TOK_NEXT_ON_OUTPUT  "next_on_output"
+%token              TOK_PREV_ON_OUTPUT  "prev_on_output"
 %token              TOK_SCRATCHPAD      "scratchpad"
 %token              TOK_SHOW            "show"
 %token              TOK_SPLIT           "split"
@@ -528,6 +530,54 @@ focus:
 
         tree_render();
     }
+    | TOK_FOCUS TOK_OUTPUT STR
+    {
+        owindow *current;
+
+        HANDLE_EMPTY_MATCH;
+
+        /* get the output */
+        Output *current_output = NULL;
+        Output *output;
+
+        TAILQ_FOREACH(current, &owindows, owindows)
+            current_output = get_output_containing(current->con->rect.x, current->con->rect.y);
+        assert(current_output != NULL);
+
+        if (strcasecmp($3, "left") == 0) {
+            output = get_output_next(D_LEFT, current_output);
+            if (!output)
+                output = get_output_most(D_RIGHT, current_output);
+        } else if (strcasecmp($3, "right") == 0) {
+            output = get_output_next(D_RIGHT, current_output);
+            if (!output)
+                output = get_output_most(D_LEFT, current_output);
+        } else if (strcasecmp($3, "up") == 0) {
+            output = get_output_next(D_UP, current_output);
+            if (!output)
+                output = get_output_most(D_DOWN, current_output);
+        } else if (strcasecmp($3, "down") == 0) {
+            output = get_output_next(D_DOWN, current_output);
+            if (!output)
+                output = get_output_most(D_UP, current_output);
+        } else output = get_output_by_name($3);
+
+        free($3);
+
+        if (!output) {
+            printf("No such output found.\n");
+            break;
+        }
+
+        /* get visible workspace on output */
+        Con *ws = NULL;
+        GREP_FIRST(ws, output_get_content(output->con), workspace_is_visible(child));
+        if (!ws)
+            break;
+
+        workspace_show(ws);
+        tree_render();
+    }
     | TOK_FOCUS window_mode
     {
         if (focused &&
@@ -632,6 +682,16 @@ workspace:
         workspace_show(workspace_prev());
         tree_render();
     }
+    | TOK_WORKSPACE TOK_NEXT_ON_OUTPUT
+    {
+        workspace_show(workspace_next_on_output());
+        tree_render();
+    }
+    | TOK_WORKSPACE TOK_PREV_ON_OUTPUT
+    {
+        workspace_show(workspace_prev_on_output());
+        tree_render();
+    }
     | TOK_WORKSPACE TOK_BACK_AND_FORTH
     {
         workspace_back_and_forth();
@@ -864,6 +924,38 @@ move:
 
         tree_render();
     }
+    | TOK_MOVE TOK_WORKSPACE TOK_NEXT_ON_OUTPUT
+    {
+        owindow *current;
+
+        /* get the workspace */
+        Con *ws = workspace_next_on_output();
+
+        HANDLE_EMPTY_MATCH;
+
+        TAILQ_FOREACH(current, &owindows, owindows) {
+            printf("matching: %p / %s\n", current->con, current->con->name);
+            con_move_to_workspace(current->con, ws, true, false);
+        }
+
+        tree_render();
+    }
+    | TOK_MOVE TOK_WORKSPACE TOK_PREV_ON_OUTPUT
+    {
+        owindow *current;
+
+        /* get the workspace */
+        Con *ws = workspace_prev_on_output();
+
+        HANDLE_EMPTY_MATCH;
+
+        TAILQ_FOREACH(current, &owindows, owindows) {
+            printf("matching: %p / %s\n", current->con, current->con->name);
+            con_move_to_workspace(current->con, ws, true, false);
+        }
+
+        tree_render();
+    }
     | TOK_MOVE TOK_OUTPUT STR
     {
         owindow *current;