]> git.sur5r.net Git - i3/i3/blobdiff - src/commands.c
If moving the last ws, create a new one in its place.
[i3/i3] / src / commands.c
index 4071097f18bb1e849612a3da91ede95bfc52b1dd..f570d6d8a78524ec0ab59d6ba0b6008d6f82ea9e 100644 (file)
@@ -11,7 +11,6 @@
 #include <stdarg.h>
 
 #include "all.h"
-#include "cmdparse.tab.h"
 
 /** When the command did not include match criteria (!), we use the currently
  * focused command. Do not confuse this case with a command which included
@@ -37,6 +36,11 @@ static bool definitelyGreaterThan(float a, float b, float epsilon) {
     return (a - b) > ( (fabs(a) < fabs(b) ? fabs(b) : fabs(a)) * epsilon);
 }
 
+/*
+ * Returns an 'output' corresponding to one of left/right/down/up or a specific
+ * output name.
+ *
+ */
 static Output *get_output_from_string(Output *current_output, const char *output_str) {
     Output *output;
 
@@ -61,113 +65,9 @@ static Output *get_output_from_string(Output *current_output, const char *output
     return output;
 }
 
-/*******************************************************************************
- * Helper functions for the migration testing. We let the new parser call every
- * function here and save the stack (current_match plus all parameters. Then we
- * let the old parser call every function and actually execute the code. When
- * there are differences between the first and the second invocation (or if
- * there has not been a first invocation at all), we generate an error.
- ******************************************************************************/
-
-static bool migration_test = false;
-typedef struct stackframe {
-    Match match;
-    int n_args;
-    char *args[10];
-    TAILQ_ENTRY(stackframe) stackframes;
-} stackframe;
-static TAILQ_HEAD(stackframes_head, stackframe) old_stackframes =
-  TAILQ_HEAD_INITIALIZER(old_stackframes);
-static struct stackframes_head new_stackframes =
-  TAILQ_HEAD_INITIALIZER(new_stackframes);
-/* We use this char* to uniquely terminate the list of parameters to save. */
-static char *last_parameter = "0";
-
-void cmd_MIGRATION_enable() {
-    migration_test = true;
-    /* clear the current stack */
-    while (!TAILQ_EMPTY(&old_stackframes)) {
-        stackframe *current = TAILQ_FIRST(&old_stackframes);
-        for (int c = 0; c < current->n_args; c++)
-            if (current->args[c])
-                free(current->args[c]);
-        TAILQ_REMOVE(&old_stackframes, current, stackframes);
-        free(current);
-    }
-    while (!TAILQ_EMPTY(&new_stackframes)) {
-        stackframe *current = TAILQ_FIRST(&new_stackframes);
-        for (int c = 0; c < current->n_args; c++)
-            if (current->args[c])
-                free(current->args[c]);
-        TAILQ_REMOVE(&new_stackframes, current, stackframes);
-        free(current);
-    }
-}
-
-void cmd_MIGRATION_disable() {
-    migration_test = false;
-}
-
-void cmd_MIGRATION_save_new_parameters(Match *current_match, ...) {
-    va_list args;
-
-    DLOG("saving parameters.\n");
-    stackframe *frame = scalloc(sizeof(stackframe));
-    match_copy(&(frame->match), current_match);
-
-    /* All parameters are char*s */
-    va_start(args, current_match);
-    while (true) {
-        char *parameter = va_arg(args, char*);
-        if (parameter == last_parameter)
-            break;
-        DLOG("parameter = %s\n", parameter);
-        if (parameter)
-            frame->args[frame->n_args] = sstrdup(parameter);
-        frame->n_args++;
-    }
-    va_end(args);
-
-    TAILQ_INSERT_TAIL(&new_stackframes, frame, stackframes);
-}
-
-void cmd_MIGRATION_save_old_parameters(Match *current_match, ...) {
-    va_list args;
-
-    DLOG("saving new parameters.\n");
-    stackframe *frame = scalloc(sizeof(stackframe));
-    match_copy(&(frame->match), current_match);
-
-    /* All parameters are char*s */
-    va_start(args, current_match);
-    while (true) {
-        char *parameter = va_arg(args, char*);
-        if (parameter == last_parameter)
-            break;
-        DLOG("parameter = %s\n", parameter);
-        if (parameter)
-            frame->args[frame->n_args] = sstrdup(parameter);
-        frame->n_args++;
-    }
-    va_end(args);
-
-    TAILQ_INSERT_TAIL(&old_stackframes, frame, stackframes);
-}
-
-static bool re_differ(struct regex *new, struct regex *old) {
-    return ((new == NULL && old != NULL) ||
-        (new != NULL && old == NULL) ||
-        (new != NULL && old != NULL &&
-         strcmp(new->pattern, old->pattern) != 0));
-}
-
-static bool str_differ(char *new, char *old) {
-    return ((new == NULL && old != NULL) ||
-        (new != NULL && old == NULL) ||
-        (new != NULL && old != NULL &&
-         strcmp(new, old) != 0));
-}
-
+// This code is commented out because we might recycle it for popping up error
+// messages on parser errors.
+#if 0
 static pid_t migration_pid = -1;
 
 /*
@@ -259,82 +159,32 @@ void cmd_MIGRATION_start_nagbar() {
 #endif
 }
 
-void cmd_MIGRATION_validate() {
-    DLOG("validating the different stacks now\n");
-    int old_count = 0;
-    int new_count = 0;
-    stackframe *current;
-    TAILQ_FOREACH(current, &new_stackframes, stackframes)
-        new_count++;
-    TAILQ_FOREACH(current, &old_stackframes, stackframes)
-        old_count++;
-    if (new_count != old_count) {
-        ELOG("FAILED, new_count == %d != old_count == %d\n", new_count, old_count);
-        cmd_MIGRATION_start_nagbar();
-        return;
-    }
-    DLOG("parameter count matching, comparing one by one...\n");
-
-    stackframe *new_frame = TAILQ_FIRST(&new_stackframes),
-               *old_frame = TAILQ_FIRST(&old_stackframes);
-    for (int i = 0; i < new_count; i++) {
-        if (new_frame->match.dock != old_frame->match.dock ||
-            new_frame->match.id != old_frame->match.id ||
-            new_frame->match.con_id != old_frame->match.con_id ||
-            new_frame->match.floating != old_frame->match.floating ||
-            new_frame->match.insert_where != old_frame->match.insert_where ||
-            re_differ(new_frame->match.title, old_frame->match.title)  ||
-            re_differ(new_frame->match.application, old_frame->match.application)  ||
-            re_differ(new_frame->match.class, old_frame->match.class)  ||
-            re_differ(new_frame->match.instance, old_frame->match.instance)  ||
-            re_differ(new_frame->match.mark, old_frame->match.mark)  ||
-            re_differ(new_frame->match.role, old_frame->match.role) ) {
-            ELOG("FAILED, new_frame->match != old_frame->match (frame %d)\n", i);
-            cmd_MIGRATION_start_nagbar();
-            return;
-        }
-        if (new_frame->n_args != old_frame->n_args) {
-            ELOG("FAILED, new_frame->n_args == %d != old_frame->n_args == %d (frame %d)\n",
-                 new_frame->n_args, old_frame->n_args, i);
-            cmd_MIGRATION_start_nagbar();
-            return;
-        }
-        for (int j = 0; j < new_frame->n_args; j++) {
-            if (str_differ(new_frame->args[j], old_frame->args[j])) {
-                ELOG("FAILED, new_frame->args[%d] == %s != old_frame->args[%d] == %s (frame %d)\n",
-                     j, new_frame->args[j], j, old_frame->args[j], i);
-                cmd_MIGRATION_start_nagbar();
-                return;
-            }
-        }
-        new_frame = TAILQ_NEXT(new_frame, stackframes);
-        old_frame = TAILQ_NEXT(old_frame, stackframes);
-    }
-    DLOG("OK\n");
-}
-
-#define MIGRATION_init(x, ...) do { \
-    if (migration_test) { \
-        cmd_MIGRATION_save_new_parameters(current_match, __FUNCTION__, ##__VA_ARGS__ , last_parameter); \
-        return NULL; \
-    } else { \
-        cmd_MIGRATION_save_old_parameters(current_match, __FUNCTION__, ##__VA_ARGS__ , last_parameter); \
-    } \
-} while (0)
-
+#endif
 
 /*******************************************************************************
  * Criteria functions.
  ******************************************************************************/
 
+/*
+ * Initializes the specified 'Match' data structure and the initial state of
+ * commands.c for matching target windows of a command.
+ *
+ */
 char *cmd_criteria_init(Match *current_match) {
+    Con *con;
+    owindow *ow;
+
     DLOG("Initializing criteria, current_match = %p\n", current_match);
     match_init(current_match);
+    while (!TAILQ_EMPTY(&owindows)) {
+        ow = TAILQ_FIRST(&owindows);
+        TAILQ_REMOVE(&owindows, ow, owindows);
+        free(ow);
+    }
     TAILQ_INIT(&owindows);
     /* copy all_cons */
-    Con *con;
     TAILQ_FOREACH(con, &all_cons, all_cons) {
-        owindow *ow = smalloc(sizeof(owindow));
+        ow = smalloc(sizeof(owindow));
         ow->con = con;
         TAILQ_INSERT_TAIL(&owindows, ow, owindows);
     }
@@ -343,16 +193,14 @@ char *cmd_criteria_init(Match *current_match) {
     return NULL;
 }
 
+/*
+ * A match specification just finished (the closing square bracket was found),
+ * so we filter the list of owindows.
+ *
+ */
 char *cmd_criteria_match_windows(Match *current_match) {
     owindow *next, *current;
 
-    /* The same as MIGRATION_init, but doesn’t return */
-    if (migration_test) {
-        cmd_MIGRATION_save_new_parameters(current_match, __FUNCTION__, last_parameter);
-    } else {
-        cmd_MIGRATION_save_old_parameters(current_match, __FUNCTION__, last_parameter);
-    }
-
     DLOG("match specification finished, matching...\n");
     /* copy the old list head to iterate through it and start with a fresh
      * list which will contain only matching windows */
@@ -396,14 +244,12 @@ char *cmd_criteria_match_windows(Match *current_match) {
     return NULL;
 }
 
+/*
+ * Interprets a ctype=cvalue pair and adds it to the current match
+ * specification.
+ *
+ */
 char *cmd_criteria_add(Match *current_match, char *ctype, char *cvalue) {
-    /* The same as MIGRATION_init, but doesn’t return */
-    if (migration_test) {
-        cmd_MIGRATION_save_new_parameters(current_match, __FUNCTION__, last_parameter);
-    } else {
-        cmd_MIGRATION_save_old_parameters(current_match, __FUNCTION__, last_parameter);
-    }
-
     DLOG("ctype=*%s*, cvalue=*%s*\n", ctype, cvalue);
 
     if (strcmp(ctype, "class") == 0) {
@@ -461,17 +307,33 @@ char *cmd_criteria_add(Match *current_match, char *ctype, char *cvalue) {
         return NULL;
     }
 
+    if (strcmp(ctype, "urgent") == 0) {
+        if (strcasecmp(cvalue, "latest") == 0 ||
+            strcasecmp(cvalue, "newest") == 0 ||
+            strcasecmp(cvalue, "recent") == 0 ||
+            strcasecmp(cvalue, "last") == 0) {
+            current_match->urgent = U_LATEST;
+        } else if (strcasecmp(cvalue, "oldest") == 0 ||
+                   strcasecmp(cvalue, "first") == 0) {
+            current_match->urgent = U_OLDEST;
+        }
+        return NULL;
+    }
+
     ELOG("Unknown criterion: %s\n", ctype);
 
     /* This command is internal and does not generate a JSON reply. */
     return NULL;
 }
 
+/*
+ * Implementation of 'move [window|container] [to] workspace
+ * next|prev|next_on_output|prev_on_output'.
+ *
+ */
 char *cmd_move_con_to_workspace(Match *current_match, char *which) {
     owindow *current;
 
-    MIGRATION_init(x, which);
-
     DLOG("which=%s\n", which);
 
     HANDLE_EMPTY_MATCH;
@@ -502,9 +364,11 @@ char *cmd_move_con_to_workspace(Match *current_match, char *which) {
     return sstrdup("{\"success\": true}");
 }
 
+/*
+ * Implementation of 'move [window|container] [to] workspace <name>'.
+ *
+ */
 char *cmd_move_con_to_workspace_name(Match *current_match, char *name) {
-    MIGRATION_init(x, name);
-
     if (strncasecmp(name, "__i3_", strlen("__i3_")) == 0) {
         LOG("You cannot switch to the i3 internal workspaces.\n");
         return sstrdup("{\"sucess\": false}");
@@ -534,8 +398,11 @@ char *cmd_move_con_to_workspace_name(Match *current_match, char *name) {
     return sstrdup("{\"success\": true}");
 }
 
+/*
+ * Implementation of 'resize grow|shrink <direction> [<px> px] [or <ppt> ppt]'.
+ *
+ */
 char *cmd_resize(Match *current_match, char *way, char *direction, char *resize_px, char *resize_ppt) {
-    MIGRATION_init(x, way, direction, resize_px, resize_ppt);
     /* resize <grow|shrink> <direction> [<px> px] [or <ppt> ppt] */
     DLOG("resizing in way %s, direction %s, px %s or ppt %s\n", way, direction, resize_px, resize_ppt);
     // TODO: We could either handle this in the parser itself as a separate token (and make the stack typed) or we need a better way to convert a string to a number with error checking
@@ -633,8 +500,11 @@ char *cmd_resize(Match *current_match, char *way, char *direction, char *resize_
     return sstrdup("{\"success\": true}");
 }
 
+/*
+ * Implementation of 'border normal|none|1pixel|toggle'.
+ *
+ */
 char *cmd_border(Match *current_match, char *border_style_str) {
-    MIGRATION_init(x, border_style_str);
     DLOG("border style should be changed to %s\n", border_style_str);
     owindow *current;
 
@@ -667,8 +537,11 @@ char *cmd_border(Match *current_match, char *border_style_str) {
     return sstrdup("{\"success\": true}");
 }
 
+/*
+ * Implementation of 'nop <comment>'.
+ *
+ */
 char *cmd_nop(Match *current_match, char *comment) {
-    MIGRATION_init(x, comment);
     LOG("-------------------------------------------------\n");
     LOG("  NOP: %s\n", comment);
     LOG("-------------------------------------------------\n");
@@ -676,8 +549,11 @@ char *cmd_nop(Match *current_match, char *comment) {
     return NULL;
 }
 
+/*
+ * Implementation of 'append_layout <path>'.
+ *
+ */
 char *cmd_append_layout(Match *current_match, char *path) {
-    MIGRATION_init(x, path);
     LOG("Appending layout \"%s\"\n", path);
     tree_append_json(path);
     tree_render();
@@ -686,8 +562,11 @@ char *cmd_append_layout(Match *current_match, char *path) {
     return sstrdup("{\"success\": true}");
 }
 
+/*
+ * Implementation of 'workspace next|prev|next_on_output|prev_on_output'.
+ *
+ */
 char *cmd_workspace(Match *current_match, char *which) {
-    MIGRATION_init(x, which);
     Con *ws;
 
     DLOG("which=%s\n", which);
@@ -712,8 +591,11 @@ char *cmd_workspace(Match *current_match, char *which) {
     return sstrdup("{\"success\": true}");
 }
 
+/*
+ * Implementation of 'workspace back_and_forth'.
+ *
+ */
 char *cmd_workspace_back_and_forth(Match *current_match) {
-    MIGRATION_init(x);
     workspace_back_and_forth();
     tree_render();
 
@@ -721,8 +603,11 @@ char *cmd_workspace_back_and_forth(Match *current_match) {
     return sstrdup("{\"success\": true}");
 }
 
+/*
+ * Implementation of 'workspace <name>'
+ *
+ */
 char *cmd_workspace_name(Match *current_match, char *name) {
-    MIGRATION_init(x, name);
     if (strncasecmp(name, "__i3_", strlen("__i3_")) == 0) {
         LOG("You cannot switch to the i3 internal workspaces.\n");
         return sstrdup("{\"sucess\": false}");
@@ -750,8 +635,11 @@ char *cmd_workspace_name(Match *current_match, char *name) {
     return sstrdup("{\"success\": true}");
 }
 
+/*
+ * Implementation of 'mark <mark>'
+ *
+ */
 char *cmd_mark(Match *current_match, char *mark) {
-    MIGRATION_init(x, mark);
     DLOG("Clearing all windows which have that mark first\n");
 
     Con *con;
@@ -776,8 +664,11 @@ char *cmd_mark(Match *current_match, char *mark) {
     return sstrdup("{\"success\": true}");
 }
 
+/*
+ * Implementation of 'mode <string>'.
+ *
+ */
 char *cmd_mode(Match *current_match, char *mode) {
-    MIGRATION_init(x, mode);
     DLOG("mode=%s\n", mode);
     switch_mode(mode);
 
@@ -785,8 +676,11 @@ char *cmd_mode(Match *current_match, char *mode) {
     return sstrdup("{\"success\": true}");
 }
 
+/*
+ * Implementation of 'move [window|container] [to] output <str>'.
+ *
+ */
 char *cmd_move_con_to_output(Match *current_match, char *name) {
-    MIGRATION_init(x, name);
     owindow *current;
 
     DLOG("should move window to output %s\n", name);
@@ -837,8 +731,11 @@ char *cmd_move_con_to_output(Match *current_match, char *name) {
     return sstrdup("{\"success\": true}");
 }
 
+/*
+ * Implementation of 'floating enable|disable|toggle'
+ *
+ */
 char *cmd_floating(Match *current_match, char *floating_mode) {
-    MIGRATION_init(x, floating_mode);
     owindow *current;
 
     DLOG("floating_mode=%s\n", floating_mode);
@@ -866,8 +763,11 @@ char *cmd_floating(Match *current_match, char *floating_mode) {
     return sstrdup("{\"success\": true}");
 }
 
+/*
+ * Implementation of 'move workspace to [output] <str>'.
+ *
+ */
 char *cmd_move_workspace_to_output(Match *current_match, char *name) {
-    MIGRATION_init(x, name);
     DLOG("should move workspace to output %s\n", name);
 
     HANDLE_EMPTY_MATCH;
@@ -887,10 +787,41 @@ char *cmd_move_workspace_to_output(Match *current_match, char *name) {
 
         Con *ws = con_get_workspace(current->con);
         LOG("should move workspace %p / %s\n", ws, ws->name);
+
         if (con_num_children(ws->parent) == 1) {
-            LOG("Not moving workspace \"%s\", it is the only workspace on its output.\n", ws->name);
-            continue;
+            LOG("Creating a new workspace to replace \"%s\" (last on its output).\n", ws->name);
+
+            /* check if we can find a workspace assigned to this output */
+            bool used_assignment = false;
+            struct Workspace_Assignment *assignment;
+            TAILQ_FOREACH(assignment, &ws_assignments, ws_assignments) {
+                if (strcmp(assignment->output, current_output->name) != 0)
+                    continue;
+
+                /* check if this workspace is already attached to the tree */
+                Con *workspace = NULL, *out;
+                TAILQ_FOREACH(out, &(croot->nodes_head), nodes)
+                    GREP_FIRST(workspace, output_get_content(out),
+                               !strcasecmp(child->name, assignment->name));
+                if (workspace != NULL)
+                    continue;
+
+                /* so create the workspace referenced to by this assignment */
+                LOG("Creating workspace from assignment %s.\n", assignment->name);
+                workspace_get(assignment->name, NULL);
+                used_assignment = true;
+                break;
+            }
+
+            /* if we couldn't create the workspace using an assignment, create
+             * it on the output */
+            if (!used_assignment)
+                create_workspace_on_output(current_output, ws->parent);
+
+            /* notify the IPC listeners */
+            ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"init\"}");
         }
+
         bool workspace_was_visible = workspace_is_visible(ws);
         Con *old_content = ws->parent;
         con_detach(ws);
@@ -915,8 +846,11 @@ char *cmd_move_workspace_to_output(Match *current_match, char *name) {
     return sstrdup("{\"success\": true}");
 }
 
+/*
+ * Implementation of 'split v|h|vertical|horizontal'.
+ *
+ */
 char *cmd_split(Match *current_match, char *direction) {
-    MIGRATION_init(x, direction);
     /* TODO: use matches */
     LOG("splitting in direction %c\n", direction[0]);
     tree_split(focused, (direction[0] == 'v' ? VERT : HORIZ));
@@ -927,10 +861,13 @@ char *cmd_split(Match *current_match, char *direction) {
     return sstrdup("{\"success\": true}");
 }
 
+/*
+ * Implementaiton of 'kill [window|client]'.
+ *
+ */
 char *cmd_kill(Match *current_match, char *kill_mode_str) {
     if (kill_mode_str == NULL)
         kill_mode_str = "window";
-    MIGRATION_init(x, kill_mode_str);
     owindow *current;
 
     DLOG("kill_mode=%s\n", kill_mode_str);
@@ -961,8 +898,11 @@ char *cmd_kill(Match *current_match, char *kill_mode_str) {
     return sstrdup("{\"success\": true}");
 }
 
+/*
+ * Implementation of 'exec [--no-startup-id] <command>'.
+ *
+ */
 char *cmd_exec(Match *current_match, char *nosn, char *command) {
-    MIGRATION_init(x, nosn, command);
     bool no_startup_id = (nosn != NULL);
 
     DLOG("should execute %s, no_startup_id = %d\n", command, no_startup_id);
@@ -972,8 +912,11 @@ char *cmd_exec(Match *current_match, char *nosn, char *command) {
     return sstrdup("{\"success\": true}");
 }
 
+/*
+ * Implementation of 'focus left|right|up|down'.
+ *
+ */
 char *cmd_focus_direction(Match *current_match, char *direction) {
-    MIGRATION_init(x, direction);
     if (focused &&
         focused->type != CT_WORKSPACE &&
         focused->fullscreen_mode != CF_NONE) {
@@ -1002,8 +945,11 @@ char *cmd_focus_direction(Match *current_match, char *direction) {
     return sstrdup("{\"success\": true}");
 }
 
+/*
+ * Implementation of 'focus tiling|floating|mode_toggle'.
+ *
+ */
 char *cmd_focus_window_mode(Match *current_match, char *window_mode) {
-    MIGRATION_init(x, window_mode);
     if (focused &&
         focused->type != CT_WORKSPACE &&
         focused->fullscreen_mode != CF_NONE) {
@@ -1038,8 +984,11 @@ char *cmd_focus_window_mode(Match *current_match, char *window_mode) {
     return sstrdup("{\"success\": true}");
 }
 
+/*
+ * Implementation of 'focus parent|child'.
+ *
+ */
 char *cmd_focus_level(Match *current_match, char *level) {
-    MIGRATION_init(x, level);
     if (focused &&
         focused->type != CT_WORKSPACE &&
         focused->fullscreen_mode != CF_NONE) {
@@ -1059,8 +1008,11 @@ char *cmd_focus_level(Match *current_match, char *level) {
     return sstrdup("{\"success\": true}");
 }
 
+/*
+ * Implementation of 'focus'.
+ *
+ */
 char *cmd_focus(Match *current_match) {
-    MIGRATION_init(x);
     DLOG("current_match = %p\n", current_match);
     if (focused &&
         focused->type != CT_WORKSPACE &&
@@ -1122,10 +1074,13 @@ char *cmd_focus(Match *current_match) {
     return sstrdup("{\"success\": true}");
 }
 
+/*
+ * Implementation of 'fullscreen [global]'.
+ *
+ */
 char *cmd_fullscreen(Match *current_match, char *fullscreen_mode) {
     if (fullscreen_mode == NULL)
         fullscreen_mode = "output";
-    MIGRATION_init(x, fullscreen_mode);
     DLOG("toggling fullscreen, mode = %s\n", fullscreen_mode);
     owindow *current;
 
@@ -1142,8 +1097,11 @@ char *cmd_fullscreen(Match *current_match, char *fullscreen_mode) {
     return sstrdup("{\"success\": true}");
 }
 
+/*
+ * Implementation of 'move <direction> [<pixels> [px]]'.
+ *
+ */
 char *cmd_move_direction(Match *current_match, char *direction, char *move_px) {
-    MIGRATION_init(x, direction, move_px);
     // TODO: We could either handle this in the parser itself as a separate token (and make the stack typed) or we need a better way to convert a string to a number with error checking
     int px = atoi(move_px);
 
@@ -1163,10 +1121,10 @@ char *cmd_move_direction(Match *current_match, char *direction, char *move_px) {
         }
         floating_reposition(focused->parent, newrect);
     } else {
-        tree_move((strcmp(direction, "right") == 0 ? TOK_RIGHT :
-                   (strcmp(direction, "left") == 0 ? TOK_LEFT :
-                    (strcmp(direction, "up") == 0 ? TOK_UP :
-                     TOK_DOWN))));
+        tree_move((strcmp(direction, "right") == 0 ? D_RIGHT :
+                   (strcmp(direction, "left") == 0 ? D_LEFT :
+                    (strcmp(direction, "up") == 0 ? D_UP :
+                     D_DOWN))));
         tree_render();
     }
 
@@ -1175,10 +1133,13 @@ char *cmd_move_direction(Match *current_match, char *direction, char *move_px) {
     return sstrdup("{\"success\": true}");
 }
 
+/*
+ * Implementation of 'layout default|stacked|stacking|tabbed'.
+ *
+ */
 char *cmd_layout(Match *current_match, char *layout_str) {
     if (strcmp(layout_str, "stacking") == 0)
         layout_str = "stacked";
-    MIGRATION_init(x, layout_str);
     DLOG("changing layout to %s\n", layout_str);
     owindow *current;
     int layout = (strcmp(layout_str, "default") == 0 ? L_DEFAULT :
@@ -1201,16 +1162,22 @@ char *cmd_layout(Match *current_match, char *layout_str) {
     return sstrdup("{\"success\": true}");
 }
 
+/*
+ * Implementaiton of 'exit'.
+ *
+ */
 char *cmd_exit(Match *current_match) {
-    MIGRATION_init(x);
     LOG("Exiting due to user command.\n");
     exit(0);
 
     /* unreached */
 }
 
+/*
+ * Implementaiton of 'reload'.
+ *
+ */
 char *cmd_reload(Match *current_match) {
-    MIGRATION_init(x);
     LOG("reloading\n");
     kill_configerror_nagbar(false);
     load_configuration(conn, NULL, true);
@@ -1222,8 +1189,11 @@ char *cmd_reload(Match *current_match) {
     return sstrdup("{\"success\": true}");
 }
 
+/*
+ * Implementaiton of 'restart'.
+ *
+ */
 char *cmd_restart(Match *current_match) {
-    MIGRATION_init(x);
     LOG("restarting i3\n");
     i3_restart(false);
 
@@ -1231,8 +1201,11 @@ char *cmd_restart(Match *current_match) {
     return sstrdup("{\"success\": true}");
 }
 
+/*
+ * Implementaiton of 'open'.
+ *
+ */
 char *cmd_open(Match *current_match) {
-    MIGRATION_init(x);
     LOG("opening new container\n");
     Con *con = tree_open_con(NULL, NULL);
     con_focus(con);
@@ -1244,8 +1217,11 @@ char *cmd_open(Match *current_match) {
     return json_output;
 }
 
+/*
+ * Implementation of 'focus output <output>'.
+ *
+ */
 char *cmd_focus_output(Match *current_match, char *name) {
-    MIGRATION_init(x, name);
     owindow *current;
 
     DLOG("name = %s\n", name);
@@ -1280,8 +1256,11 @@ char *cmd_focus_output(Match *current_match, char *name) {
     return sstrdup("{\"success\": true}");
 }
 
+/*
+ * Implementation of 'move scratchpad'.
+ *
+ */
 char *cmd_move_scratchpad(Match *current_match) {
-    MIGRATION_init(x);
     DLOG("should move window to scratchpad\n");
     owindow *current;
 
@@ -1298,8 +1277,11 @@ char *cmd_move_scratchpad(Match *current_match) {
     return sstrdup("{\"success\": true}");
 }
 
+/*
+ * Implementation of 'scratchpad show'.
+ *
+ */
 char *cmd_scratchpad_show(Match *current_match) {
-    MIGRATION_init(x);
     DLOG("should show scratchpad window\n");
     owindow *current;