Merge branch 'master' into next

[i3/i3] / src / workspace.c

diff --git a/src/workspace.c b/src/workspace.c
index 4fc8ba1bda3c421905c7a3b1720cd1cc7e506879..3d08fa4c8db51031d1fcf005c59e44287a6069a5 100644 (file)
--- a/src/workspace.c
+++ b/src/workspace.c
@@ -52,8 +52,8 @@ Con *workspace_get(const char *num, bool *created) {
         workspace->type = CT_WORKSPACE;
         FREE(workspace->name);
         workspace->name = sstrdup(num);
-        /* We set ->num to the number if this workspace’s name consists only of
-         * a positive number. Otherwise it’s a named ws and num will be -1. */
+        /* We set ->num to the number if this workspace’s name begins with a
+         * positive number. Otherwise it’s a named ws and num will be -1. */
         char *endptr = NULL;
         long parsed_num = strtol(num, &endptr, 10);
         if (parsed_num == LONG_MIN ||
@@ -112,15 +112,17 @@ Con *create_workspace_on_output(Output *output, Con *content) {
         DLOG("relevant command = %s\n", bind->command);
         char *target = bind->command + strlen("workspace ");
         /* We check if this is the workspace
-         * next/prev/next_on_output/prev_on_output/back_and_forth command.
+         * next/prev/next_on_output/prev_on_output/back_and_forth/number command.
          * Beware: The workspace names "next", "prev", "next_on_output",
-         * "prev_on_output" and "back_and_forth" are OK, so we check before
-         * stripping the double quotes */
+         * "prev_on_output", "number", "back_and_forth" and "current" are OK,
+         * so we check before stripping the double quotes */
         if (strncasecmp(target, "next", strlen("next")) == 0 ||
             strncasecmp(target, "prev", strlen("prev")) == 0 ||
             strncasecmp(target, "next_on_output", strlen("next_on_output")) == 0 ||
             strncasecmp(target, "prev_on_output", strlen("prev_on_output")) == 0 ||
-            strncasecmp(target, "back_and_forth", strlen("back_and_forth")) == 0)
+            strncasecmp(target, "number", strlen("number")) == 0 ||
+            strncasecmp(target, "back_and_forth", strlen("back_and_forth")) == 0 ||
+            strncasecmp(target, "current", strlen("current")) == 0)
             continue;
         if (*target == '"')
             target++;
@@ -303,7 +305,7 @@ static void workspace_reassign_sticky(Con *con) {
 }
 
 
-static void _workspace_show(Con *workspace, bool changed_num_workspaces) {
+static void _workspace_show(Con *workspace) {
     Con *current, *old = NULL;
 
     /* safe-guard against showing i3-internal workspaces like __i3_scratch */
@@ -347,7 +349,6 @@ static void _workspace_show(Con *workspace, bool changed_num_workspaces) {
             LOG("Closing old workspace (%p / %s), it is empty\n", old, old->name);
             tree_close(old, DONT_KILL_WINDOW, false, false);
             ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"empty\"}");
-            changed_num_workspaces = true;
         }
     }
 
@@ -375,7 +376,7 @@ static void _workspace_show(Con *workspace, bool changed_num_workspaces) {
  *
  */
 void workspace_show(Con *workspace) {
-    _workspace_show(workspace, false);
+    _workspace_show(workspace);
 }
 
 /*
@@ -386,14 +387,14 @@ void workspace_show_by_name(const char *num) {
     Con *workspace;
     bool changed_num_workspaces;
     workspace = workspace_get(num, &changed_num_workspaces);
-    _workspace_show(workspace, changed_num_workspaces);
+    _workspace_show(workspace);
 }
 
 /*
  * Focuses the next workspace.
  *
  */
-Con* workspace_next() {
+Con* workspace_next(void) {
     Con *current = con_get_workspace(focused);
     Con *next = NULL;
     Con *output;
@@ -463,7 +464,7 @@ workspace_next_end:
  * Focuses the previous workspace.
  *
  */
-Con* workspace_prev() {
+Con* workspace_prev(void) {
     Con *current = con_get_workspace(focused);
     Con *prev = NULL;
     Con *output;
@@ -535,7 +536,7 @@ workspace_prev_end:
  * Focuses the next workspace on the same output.
  *
  */
-Con* workspace_next_on_output() {
+Con* workspace_next_on_output(void) {
     Con *current = con_get_workspace(focused);
     Con *next = NULL;
     Con *output  = con_get_output(focused);
@@ -590,10 +591,11 @@ workspace_next_on_output_end:
  * Focuses the previous workspace on same output.
  *
  */
-Con* workspace_prev_on_output() {
+Con* workspace_prev_on_output(void) {
     Con *current = con_get_workspace(focused);
     Con *prev = NULL;
     Con *output  = con_get_output(focused);
+    DLOG("output = %s\n", output->name);
 
     if (current->num == -1) {
         /* If named workspace, find previous named workspace. */
@@ -646,7 +648,7 @@ workspace_prev_on_output_end:
  * Focuses the previously focused workspace.
  *
  */
-void workspace_back_and_forth() {
+void workspace_back_and_forth(void) {
     if (!previous_workspace_name) {
         DLOG("No previous workspace name set. Not switching.");
         return;