]> 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 4fb6e702f2702f03ecaf26449aac9b71c7eae06c..f570d6d8a78524ec0ab59d6ba0b6008d6f82ea9e 100644 (file)
 /*
- * vim:ts=8:expandtab
+ * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
+ * © 2009-2012 Michael Stapelberg and contributors (see also: LICENSE)
  *
- * © 2009 Michael Stapelberg and contributors
- *
- * See file LICENSE for license information.
+ * commands.c: all command functions (see commands_parser.c)
  *
  */
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <unistd.h>
-#include <string.h>
+#include <float.h>
+#include <stdarg.h>
 
-#include <xcb/xcb.h>
+#include "all.h"
 
-#include "util.h"
-#include "data.h"
-#include "table.h"
-#include "layout.h"
-#include "i3.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
+ * criteria but which did not match any windows. This macro has to be called in
+ * every command.
+ */
+#define HANDLE_EMPTY_MATCH do { \
+    if (match_is_empty(current_match)) { \
+        owindow *ow = smalloc(sizeof(owindow)); \
+        ow->con = focused; \
+        TAILQ_INIT(&owindows); \
+        TAILQ_INSERT_TAIL(&owindows, ow, owindows); \
+    } \
+} while (0)
 
-static bool focus_window_in_container(xcb_connection_t *connection, Container *container,
-                direction_t direction) {
-        /* If this container is empty, we’re done */
-        if (container->currently_focused == NULL)
-                return false;
+static owindows_head owindows;
 
-        Client *candidate = NULL;
-        if (direction == D_UP)
-                candidate = CIRCLEQ_PREV(container->currently_focused, clients);
-        else if (direction == D_DOWN)
-                candidate = CIRCLEQ_NEXT(container->currently_focused, clients);
-        else printf("Direction not implemented!\n");
+/*
+ * Returns true if a is definitely greater than b (using the given epsilon)
+ *
+ */
+static bool definitelyGreaterThan(float a, float b, float epsilon) {
+    return (a - b) > ( (fabs(a) < fabs(b) ? fabs(b) : fabs(a)) * epsilon);
+}
 
-        /* If we don’t have anything to select, we’re done */
-        if (candidate == CIRCLEQ_END(&(container->clients)))
-                return false;
+/*
+ * 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;
+
+    if (strcasecmp(output_str, "left") == 0) {
+        output = get_output_next(D_LEFT, current_output);
+        if (!output)
+            output = get_output_most(D_RIGHT, current_output);
+    } else if (strcasecmp(output_str, "right") == 0) {
+        output = get_output_next(D_RIGHT, current_output);
+        if (!output)
+            output = get_output_most(D_LEFT, current_output);
+    } else if (strcasecmp(output_str, "up") == 0) {
+        output = get_output_next(D_UP, current_output);
+        if (!output)
+            output = get_output_most(D_DOWN, current_output);
+    } else if (strcasecmp(output_str, "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(output_str);
+
+    return output;
+}
 
-        /* Set focus if we could successfully move */
-        set_focus(connection, candidate);
+// 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;
 
-        return true;
+/*
+ * Handler which will be called when we get a SIGCHLD for the nagbar, meaning
+ * it exited (or could not be started, depending on the exit code).
+ *
+ */
+static void nagbar_exited(EV_P_ ev_child *watcher, int revents) {
+    ev_child_stop(EV_A_ watcher);
+    if (!WIFEXITED(watcher->rstatus)) {
+        fprintf(stderr, "ERROR: i3-nagbar did not exit normally.\n");
+        return;
+    }
+
+    int exitcode = WEXITSTATUS(watcher->rstatus);
+    printf("i3-nagbar process exited with status %d\n", exitcode);
+    if (exitcode == 2) {
+        fprintf(stderr, "ERROR: i3-nagbar could not be found. Is it correctly installed on your system?\n");
+    }
+
+    migration_pid = -1;
 }
 
-static void focus_window(xcb_connection_t *connection, direction_t direction) {
-        printf("focusing direction %d\n", direction);
-
-        int new_row = current_row,
-            new_col = current_col;
+/* We need ev >= 4 for the following code. Since it is not *that* important (it
+ * only makes sure that there are no i3-nagbar instances left behind) we still
+ * support old systems with libev 3. */
+#if EV_VERSION_MAJOR >= 4
+/*
+ * Cleanup handler. Will be called when i3 exits. Kills i3-nagbar with signal
+ * SIGKILL (9) to make sure there are no left-over i3-nagbar processes.
+ *
+ */
+static void nagbar_cleanup(EV_P_ ev_cleanup *watcher, int revent) {
+    if (migration_pid != -1) {
+        LOG("Sending SIGKILL (9) to i3-nagbar with PID %d\n", migration_pid);
+        kill(migration_pid, SIGKILL);
+    }
+}
+#endif
+
+void cmd_MIGRATION_start_nagbar() {
+    if (migration_pid != -1) {
+        fprintf(stderr, "i3-nagbar already running.\n");
+        return;
+    }
+    fprintf(stderr, "Starting i3-nagbar, command parsing differs from expected output.\n");
+    ELOG("Please report this on IRC or in the bugtracker. Make sure to include the full debug level logfile:\n");
+    ELOG("i3-dump-log | gzip -9c > /tmp/i3.log.gz\n");
+    ELOG("FYI: Your i3 version is " I3_VERSION "\n");
+    migration_pid = fork();
+    if (migration_pid == -1) {
+        warn("Could not fork()");
+        return;
+    }
+
+    /* child */
+    if (migration_pid == 0) {
+        char *pageraction;
+        sasprintf(&pageraction, "i3-sensible-terminal -e i3-sensible-pager \"%s\"", errorfilename);
+        char *argv[] = {
+            NULL, /* will be replaced by the executable path */
+            "-t",
+            "error",
+            "-m",
+            "You found a parsing error. Please, please, please, report it!",
+            "-b",
+            "show errors",
+            pageraction,
+            NULL
+        };
+        exec_i3_utility("i3-nagbar", argv);
+    }
+
+    /* parent */
+    /* install a child watcher */
+    ev_child *child = smalloc(sizeof(ev_child));
+    ev_child_init(child, &nagbar_exited, migration_pid, 0);
+    ev_child_start(main_loop, child);
+
+/* We need ev >= 4 for the following code. Since it is not *that* important (it
+ * only makes sure that there are no i3-nagbar instances left behind) we still
+ * support old systems with libev 3. */
+#if EV_VERSION_MAJOR >= 4
+    /* install a cleanup watcher (will be called when i3 exits and i3-nagbar is
+     * still running) */
+    ev_cleanup *cleanup = smalloc(sizeof(ev_cleanup));
+    ev_cleanup_init(cleanup, nagbar_cleanup);
+    ev_cleanup_start(main_loop, cleanup);
+#endif
+}
 
-        /* TODO: for horizontal default layout, this has to be expanded to LEFT/RIGHT */
-        if (direction == D_UP || direction == D_DOWN) {
-                /* Let’s see if we can perform up/down focus in the current container */
-                Container *container = CUR_CELL;
+#endif
 
-                /* There always is a container. If not, current_col or current_row is wrong */
-                assert(container != NULL);
+/*******************************************************************************
+ * Criteria functions.
+ ******************************************************************************/
 
-                if (focus_window_in_container(connection, container, direction))
-                        return;
+/*
+ * 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 */
+    TAILQ_FOREACH(con, &all_cons, all_cons) {
+        ow = smalloc(sizeof(owindow));
+        ow->con = con;
+        TAILQ_INSERT_TAIL(&owindows, ow, owindows);
+    }
+
+    /* This command is internal and does not generate a JSON reply. */
+    return NULL;
+}
 
-                if (direction == D_DOWN && cell_exists(current_col, current_row+1))
-                        new_row++;
-                else if (direction == D_UP && cell_exists(current_col, current_row-1))
-                        new_row--;
-        } else if (direction == D_LEFT || direction == D_RIGHT) {
-                if (direction == D_RIGHT && cell_exists(current_col+1, current_row))
-                        new_col++;
-                else if (direction == D_LEFT && cell_exists(current_col-1, current_row))
-                        new_col--;
-                else {
-                        printf("nah, not possible\n");
-                        return;
-                }
+/*
+ * 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;
+
+    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 */
+    struct owindows_head old = owindows;
+    TAILQ_INIT(&owindows);
+    for (next = TAILQ_FIRST(&old); next != TAILQ_END(&old);) {
+        /* make a copy of the next pointer and advance the pointer to the
+         * next element as we are going to invalidate the element’s
+         * next/prev pointers by calling TAILQ_INSERT_TAIL later */
+        current = next;
+        next = TAILQ_NEXT(next, owindows);
+
+        DLOG("checking if con %p / %s matches\n", current->con, current->con->name);
+        if (current_match->con_id != NULL) {
+            if (current_match->con_id == current->con) {
+                DLOG("matches container!\n");
+                TAILQ_INSERT_TAIL(&owindows, current, owindows);
+            }
+        } else if (current_match->mark != NULL && current->con->mark != NULL &&
+                   regex_matches(current_match->mark, current->con->mark)) {
+            DLOG("match by mark\n");
+            TAILQ_INSERT_TAIL(&owindows, current, owindows);
         } else {
-                printf("direction unhandled\n");
-                return;
+            if (current->con->window == NULL)
+                continue;
+            if (match_matches_window(current_match, current->con->window)) {
+                DLOG("matches window!\n");
+                TAILQ_INSERT_TAIL(&owindows, current, owindows);
+            } else {
+                DLOG("doesnt match\n");
+                free(current);
+            }
         }
+    }
+
+    TAILQ_FOREACH(current, &owindows, owindows) {
+        DLOG("matching: %p / %s\n", current->con, current->con->name);
+    }
 
-        if (c_ws->table[new_col][new_row]->currently_focused != NULL)
-                set_focus(connection, c_ws->table[new_col][new_row]->currently_focused);
+    /* This command is internal and does not generate a JSON reply. */
+    return NULL;
 }
 
 /*
- * Tries to move the window inside its current container.
- *
- * Returns true if the window could be moved, false otherwise.
+ * Interprets a ctype=cvalue pair and adds it to the current match
+ * specification.
  *
  */
-static bool move_current_window_in_container(xcb_connection_t *connection, Client *client,
-                direction_t direction) {
-        assert(client->container != NULL);
-
-        Client *other = (direction == D_UP ? CIRCLEQ_PREV(client, clients) :
-                                             CIRCLEQ_NEXT(client, clients));
+char *cmd_criteria_add(Match *current_match, char *ctype, char *cvalue) {
+    DLOG("ctype=*%s*, cvalue=*%s*\n", ctype, cvalue);
+
+    if (strcmp(ctype, "class") == 0) {
+        current_match->class = regex_new(cvalue);
+        return NULL;
+    }
+
+    if (strcmp(ctype, "instance") == 0) {
+        current_match->instance = regex_new(cvalue);
+        return NULL;
+    }
+
+    if (strcmp(ctype, "window_role") == 0) {
+        current_match->role = regex_new(cvalue);
+        return NULL;
+    }
+
+    if (strcmp(ctype, "con_id") == 0) {
+        char *end;
+        long parsed = strtol(cvalue, &end, 10);
+        if (parsed == LONG_MIN ||
+            parsed == LONG_MAX ||
+            parsed < 0 ||
+            (end && *end != '\0')) {
+            ELOG("Could not parse con id \"%s\"\n", cvalue);
+        } else {
+            current_match->con_id = (Con*)parsed;
+            printf("id as int = %p\n", current_match->con_id);
+        }
+        return NULL;
+    }
+
+    if (strcmp(ctype, "id") == 0) {
+        char *end;
+        long parsed = strtol(cvalue, &end, 10);
+        if (parsed == LONG_MIN ||
+            parsed == LONG_MAX ||
+            parsed < 0 ||
+            (end && *end != '\0')) {
+            ELOG("Could not parse window id \"%s\"\n", cvalue);
+        } else {
+            current_match->id = parsed;
+            printf("window id as int = %d\n", current_match->id);
+        }
+        return NULL;
+    }
+
+    if (strcmp(ctype, "con_mark") == 0) {
+        current_match->mark = regex_new(cvalue);
+        return NULL;
+    }
+
+    if (strcmp(ctype, "title") == 0) {
+        current_match->title = regex_new(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;
+    }
 
-        if (other == CIRCLEQ_END(&(client->container->clients)))
-                return false;
+    ELOG("Unknown criterion: %s\n", ctype);
 
-        printf("i can do that\n");
-        /* We can move the client inside its current container */
-        CIRCLEQ_REMOVE(&(client->container->clients), client, clients);
-        if (direction == D_UP)
-                CIRCLEQ_INSERT_BEFORE(&(client->container->clients), other, client, clients);
-        else CIRCLEQ_INSERT_AFTER(&(client->container->clients), other, client, clients);
-        render_layout(connection);
-        return true;
+    /* This command is internal and does not generate a JSON reply. */
+    return NULL;
 }
 
 /*
- * Moves the current window to the given direction, creating a column/row if
- * necessary
+ * Implementation of 'move [window|container] [to] workspace
+ * next|prev|next_on_output|prev_on_output'.
  *
  */
-static void move_current_window(xcb_connection_t *connection, direction_t direction) {
-        printf("moving window to direction %s\n", (direction == D_UP ? "up" : (direction == D_DOWN ? "down" :
-                                        (direction == D_LEFT ? "left" : "right"))));
-        /* Get current window */
-        Container *container = CUR_CELL,
-                  *new = NULL;
+char *cmd_move_con_to_workspace(Match *current_match, char *which) {
+    owindow *current;
+
+    DLOG("which=%s\n", which);
+
+    HANDLE_EMPTY_MATCH;
+
+    /* get the workspace */
+    Con *ws;
+    if (strcmp(which, "next") == 0)
+        ws = workspace_next();
+    else if (strcmp(which, "prev") == 0)
+        ws = workspace_prev();
+    else if (strcmp(which, "next_on_output") == 0)
+        ws = workspace_next_on_output();
+    else if (strcmp(which, "prev_on_output") == 0)
+        ws = workspace_prev_on_output();
+    else {
+        ELOG("BUG: called with which=%s\n", which);
+        return sstrdup("{\"sucess\": false}");
+    }
+
+    TAILQ_FOREACH(current, &owindows, owindows) {
+        DLOG("matching: %p / %s\n", current->con, current->con->name);
+        con_move_to_workspace(current->con, ws, true, false);
+    }
+
+    tree_render();
+
+    // XXX: default reply for now, make this a better reply
+    return sstrdup("{\"success\": true}");
+}
 
-        /* There has to be a container, see focus_window() */
-        assert(container != NULL);
+/*
+ * Implementation of 'move [window|container] [to] workspace <name>'.
+ *
+ */
+char *cmd_move_con_to_workspace_name(Match *current_match, char *name) {
+    if (strncasecmp(name, "__i3_", strlen("__i3_")) == 0) {
+        LOG("You cannot switch to the i3 internal workspaces.\n");
+        return sstrdup("{\"sucess\": false}");
+    }
 
-        /* If there is no window or the dock window is focused, we’re done */
-        if (container->currently_focused == NULL ||
-            container->currently_focused->dock)
-                return;
+    owindow *current;
 
-        /* As soon as the client is moved away, the next client in the old
-         * container needs to get focus, if any. Therefore, we save it here. */
-        Client *current_client = container->currently_focused;
-        Client *to_focus = CIRCLEQ_NEXT_OR_NULL(&(container->clients), current_client, clients);
-        if (to_focus == NULL)
-                to_focus = CIRCLEQ_PREV_OR_NULL(&(container->clients), current_client, clients);
+    /* Error out early to not create a non-existing workspace (in
+     * workspace_get()) if we are not actually able to move anything. */
+    if (match_is_empty(current_match) && focused->type == CT_WORKSPACE)
+        return sstrdup("{\"sucess\": false}");
 
-        switch (direction) {
-                case D_LEFT:
-                        /* TODO: If we’re at the left-most position, move the rest of the table right */
-                        if (current_col == 0)
-                                return;
+    LOG("should move window to workspace %s\n", name);
+    /* get the workspace */
+    Con *ws = workspace_get(name, NULL);
 
-                        new = CUR_TABLE[--current_col][current_row];
-                        break;
-                case D_RIGHT:
-                        if (current_col == (c_ws->cols-1))
-                                expand_table_cols(c_ws);
+    HANDLE_EMPTY_MATCH;
 
-                        new = CUR_TABLE[++current_col][current_row];
-                        break;
-                case D_UP:
-                        /* TODO: if we’re at the up-most position, move the rest of the table down */
-                        if (move_current_window_in_container(connection, current_client, D_UP) ||
-                                current_row == 0)
-                                return;
+    TAILQ_FOREACH(current, &owindows, owindows) {
+        DLOG("matching: %p / %s\n", current->con, current->con->name);
+        con_move_to_workspace(current->con, ws, true, false);
+    }
 
-                        new = CUR_TABLE[current_col][--current_row];
-                        break;
-                case D_DOWN:
-                        if (move_current_window_in_container(connection, current_client, D_DOWN))
-                                return;
+    tree_render();
 
-                        if (current_row == (c_ws->rows-1))
-                                expand_table_rows(c_ws);
+    // XXX: default reply for now, make this a better reply
+    return sstrdup("{\"success\": true}");
+}
 
-                        new = CUR_TABLE[current_col][++current_row];
-                        break;
+/*
+ * 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) {
+    /* 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
+    int px = atoi(resize_px);
+    int ppt = atoi(resize_ppt);
+    if (strcmp(way, "shrink") == 0) {
+        px *= -1;
+        ppt *= -1;
+    }
+
+    Con *floating_con;
+    if ((floating_con = con_inside_floating(focused))) {
+        printf("floating resize\n");
+        if (strcmp(direction, "up") == 0) {
+            floating_con->rect.y -= px;
+            floating_con->rect.height += px;
+        } else if (strcmp(direction, "down") == 0) {
+            floating_con->rect.height += px;
+        } else if (strcmp(direction, "left") == 0) {
+            floating_con->rect.x -= px;
+            floating_con->rect.width += px;
+        } else {
+            floating_con->rect.width += px;
+        }
+    } else {
+        LOG("tiling resize\n");
+        /* get the appropriate current container (skip stacked/tabbed cons) */
+        Con *current = focused;
+        while (current->parent->layout == L_STACKED ||
+               current->parent->layout == L_TABBED)
+            current = current->parent;
+
+        /* Then further go up until we find one with the matching orientation. */
+        orientation_t search_orientation =
+            (strcmp(direction, "left") == 0 || strcmp(direction, "right") == 0 ? HORIZ : VERT);
+
+        while (current->type != CT_WORKSPACE &&
+               current->type != CT_FLOATING_CON &&
+               current->parent->orientation != search_orientation)
+            current = current->parent;
+
+        /* get the default percentage */
+        int children = con_num_children(current->parent);
+        Con *other;
+        LOG("ins. %d children\n", children);
+        double percentage = 1.0 / children;
+        LOG("default percentage = %f\n", percentage);
+
+        orientation_t orientation = current->parent->orientation;
+
+        if ((orientation == HORIZ &&
+             (strcmp(direction, "up") == 0 || strcmp(direction, "down") == 0)) ||
+            (orientation == VERT &&
+             (strcmp(direction, "left") == 0 || strcmp(direction, "right") == 0))) {
+            LOG("You cannot resize in that direction. Your focus is in a %s split container currently.\n",
+                (orientation == HORIZ ? "horizontal" : "vertical"));
+            return sstrdup("{\"sucess\": false}");
         }
 
-        /* Remove it from the old container and put it into the new one */
-        CIRCLEQ_REMOVE(&(container->clients), current_client, clients);
-        CIRCLEQ_INSERT_TAIL(&(new->clients), current_client, clients);
-
-        /* Update data structures */
-        current_client->container = new;
-        container->currently_focused = to_focus;
-        new->currently_focused = current_client;
-
-        /* delete all empty columns/rows */
-        cleanup_table(connection, container->workspace);
-        render_layout(connection);
-
-        set_focus(connection, current_client);
-}
-
-/*
- * "Snaps" the current container (not possible for windows, because it works at table base)
- * to the given direction, that is, adjusts cellspan/rowspan
- *
- */
-static void snap_current_container(xcb_connection_t *connection, direction_t direction) {
-        printf("snapping container to direction %d\n", direction);
-
-        Container *container = CUR_CELL;
-
-        assert(container != NULL);
-
-        switch (direction) {
-                case D_LEFT:
-                        /* Snap to the left is actually a move to the left and then a snap right */
-                        move_current_window(connection, D_LEFT);
-                        snap_current_container(connection, D_RIGHT);
-                        return;
-                case D_RIGHT:
-                        /* Check if the cell is used */
-                        if (!cell_exists(container->col + 1, container->row) ||
-                                CUR_TABLE[container->col+1][container->row]->currently_focused != NULL) {
-                                printf("cannot snap to right - the cell is already used\n");
-                                return;
-                        }
-
-                        /* Check if there are other cells with rowspan, which are in our way.
-                         * If so, reduce their rowspan. */
-                        for (int i = container->row-1; i >= 0; i--) {
-                                printf("we got cell %d, %d with rowspan %d\n",
-                                                container->col+1, i, CUR_TABLE[container->col+1][i]->rowspan);
-                                while ((CUR_TABLE[container->col+1][i]->rowspan-1) >= (container->row - i))
-                                        CUR_TABLE[container->col+1][i]->rowspan--;
-                                printf("new rowspan = %d\n", CUR_TABLE[container->col+1][i]->rowspan);
-                        }
-
-                        container->colspan++;
-                        break;
-                case D_UP:
-                        move_current_window(connection, D_UP);
-                        snap_current_container(connection, D_DOWN);
-                        return;
-                case D_DOWN:
-                        printf("snapping down\n");
-                        if (!cell_exists(container->col, container->row+1) ||
-                                CUR_TABLE[container->col][container->row+1]->currently_focused != NULL) {
-                                printf("cannot snap down - the cell is already used\n");
-                                return;
-                        }
-
-                        for (int i = container->col-1; i >= 0; i--) {
-                                printf("we got cell %d, %d with colspan %d\n",
-                                                i, container->row+1, CUR_TABLE[i][container->row+1]->colspan);
-                                while ((CUR_TABLE[i][container->row+1]->colspan-1) >= (container->col - i))
-                                        CUR_TABLE[i][container->row+1]->colspan--;
-                                printf("new colspan = %d\n", CUR_TABLE[i][container->row+1]->colspan);
-
-                        }
-
-                        container->rowspan++;
-                        break;
+        if (strcmp(direction, "up") == 0 || strcmp(direction, "left") == 0) {
+            other = TAILQ_PREV(current, nodes_head, nodes);
+        } else {
+            other = TAILQ_NEXT(current, nodes);
+        }
+        if (other == TAILQ_END(workspaces)) {
+            LOG("No other container in this direction found, cannot resize.\n");
+            return sstrdup("{\"sucess\": false}");
+        }
+        LOG("other->percent = %f\n", other->percent);
+        LOG("current->percent before = %f\n", current->percent);
+        if (current->percent == 0.0)
+            current->percent = percentage;
+        if (other->percent == 0.0)
+            other->percent = percentage;
+        double new_current_percent = current->percent + ((double)ppt / 100.0);
+        double new_other_percent = other->percent - ((double)ppt / 100.0);
+        LOG("new_current_percent = %f\n", new_current_percent);
+        LOG("new_other_percent = %f\n", new_other_percent);
+        /* Ensure that the new percentages are positive and greater than
+         * 0.05 to have a reasonable minimum size. */
+        if (definitelyGreaterThan(new_current_percent, 0.05, DBL_EPSILON) &&
+            definitelyGreaterThan(new_other_percent, 0.05, DBL_EPSILON)) {
+            current->percent += ((double)ppt / 100.0);
+            other->percent -= ((double)ppt / 100.0);
+            LOG("current->percent after = %f\n", current->percent);
+            LOG("other->percent after = %f\n", other->percent);
+        } else {
+            LOG("Not resizing, already at minimum size\n");
         }
+    }
 
-        render_layout(connection);
+    tree_render();
+
+    // XXX: default reply for now, make this a better reply
+    return sstrdup("{\"success\": true}");
 }
 
 /*
- * Moves the currently selected window to the given workspace
+ * Implementation of 'border normal|none|1pixel|toggle'.
  *
  */
-static void move_current_window_to_workspace(xcb_connection_t *connection, int workspace) {
-        printf("Moving current window to workspace %d\n", workspace);
+char *cmd_border(Match *current_match, char *border_style_str) {
+    DLOG("border style should be changed to %s\n", border_style_str);
+    owindow *current;
+
+    HANDLE_EMPTY_MATCH;
+
+    TAILQ_FOREACH(current, &owindows, owindows) {
+        DLOG("matching: %p / %s\n", current->con, current->con->name);
+        int border_style = current->con->border_style;
+        if (strcmp(border_style_str, "toggle") == 0) {
+            border_style++;
+            border_style %= 3;
+        } else {
+            if (strcmp(border_style_str, "normal") == 0)
+                border_style = BS_NORMAL;
+            else if (strcmp(border_style_str, "none") == 0)
+                border_style = BS_NONE;
+            else if (strcmp(border_style_str, "1pixel") == 0)
+                border_style = BS_1PIXEL;
+            else {
+                ELOG("BUG: called with border_style=%s\n", border_style_str);
+                return sstrdup("{\"sucess\": false}");
+            }
+        }
+        con_set_border_style(current->con, border_style);
+    }
 
-        Container *container = CUR_CELL;
+    tree_render();
 
-        assert(container != NULL);
+    // XXX: default reply for now, make this a better reply
+    return sstrdup("{\"success\": true}");
+}
 
-        /* t_ws (to workspace) is just a container pointer to the workspace we’re switching to */
-        Workspace *t_ws = &(workspaces[workspace-1]);
+/*
+ * Implementation of 'nop <comment>'.
+ *
+ */
+char *cmd_nop(Match *current_match, char *comment) {
+    LOG("-------------------------------------------------\n");
+    LOG("  NOP: %s\n", comment);
+    LOG("-------------------------------------------------\n");
 
-        Client *current_client = container->currently_focused;
-        if (current_client == NULL) {
-                printf("No currently focused client in current container.\n");
-                return;
-        }
-        Client *to_focus = CIRCLEQ_NEXT_OR_NULL(&(container->clients), current_client, clients);
-        if (to_focus == NULL)
-                to_focus = CIRCLEQ_PREV_OR_NULL(&(container->clients), current_client, clients);
-
-        if (t_ws->screen == NULL) {
-                printf("initializing new workspace, setting num to %d\n", workspace-1);
-                t_ws->screen = container->workspace->screen;
-                /* Copy the dimensions from the virtual screen */
-               memcpy(&(t_ws->rect), &(container->workspace->screen->rect), sizeof(Rect));
-        }
+    return NULL;
+}
 
-        Container *to_container = t_ws->table[t_ws->current_col][t_ws->current_row];
+/*
+ * Implementation of 'append_layout <path>'.
+ *
+ */
+char *cmd_append_layout(Match *current_match, char *path) {
+    LOG("Appending layout \"%s\"\n", path);
+    tree_append_json(path);
+    tree_render();
 
-        assert(to_container != NULL);
+    // XXX: default reply for now, make this a better reply
+    return sstrdup("{\"success\": true}");
+}
 
-        CIRCLEQ_REMOVE(&(container->clients), current_client, clients);
-        CIRCLEQ_INSERT_TAIL(&(to_container->clients), current_client, clients);
-        printf("Moved.\n");
+/*
+ * Implementation of 'workspace next|prev|next_on_output|prev_on_output'.
+ *
+ */
+char *cmd_workspace(Match *current_match, char *which) {
+    Con *ws;
+
+    DLOG("which=%s\n", which);
+
+    if (strcmp(which, "next") == 0)
+        ws = workspace_next();
+    else if (strcmp(which, "prev") == 0)
+        ws = workspace_prev();
+    else if (strcmp(which, "next_on_output") == 0)
+        ws = workspace_next_on_output();
+    else if (strcmp(which, "prev_on_output") == 0)
+        ws = workspace_prev_on_output();
+    else {
+        ELOG("BUG: called with which=%s\n", which);
+        return sstrdup("{\"sucess\": false}");
+    }
+
+    workspace_show(ws);
+    tree_render();
+
+    // XXX: default reply for now, make this a better reply
+    return sstrdup("{\"success\": true}");
+}
 
-        current_client->container = to_container;
-        container->currently_focused = to_focus;
-        to_container->currently_focused = current_client;
+/*
+ * Implementation of 'workspace back_and_forth'.
+ *
+ */
+char *cmd_workspace_back_and_forth(Match *current_match) {
+    workspace_back_and_forth();
+    tree_render();
+
+    // XXX: default reply for now, make this a better reply
+    return sstrdup("{\"success\": true}");
+}
 
-        /* If we’re moving it to an invisible screen, we need to unmap it */
-        if (to_container->workspace->screen->current_workspace != to_container->workspace->num) {
-                printf("This workspace is not visible, unmapping\n");
-                xcb_unmap_window(connection, current_client->frame);
+/*
+ * Implementation of 'workspace <name>'
+ *
+ */
+char *cmd_workspace_name(Match *current_match, char *name) {
+    if (strncasecmp(name, "__i3_", strlen("__i3_")) == 0) {
+        LOG("You cannot switch to the i3 internal workspaces.\n");
+        return sstrdup("{\"sucess\": false}");
+    }
+
+    DLOG("should switch to workspace %s\n", name);
+
+    Con *ws = con_get_workspace(focused);
+
+    /* Check if the command wants to switch to the current workspace */
+    if (strcmp(ws->name, name) == 0) {
+        DLOG("This workspace is already focused.\n");
+        if (config.workspace_auto_back_and_forth) {
+            workspace_back_and_forth();
+            tree_render();
         }
+        return sstrdup("{\"sucess\": false}");
+    }
+
+    workspace_show_by_name(name);
 
-        /* delete all empty columns/rows */
-        cleanup_table(connection, container->workspace);
+    tree_render();
 
-        render_layout(connection);
+    // XXX: default reply for now, make this a better reply
+    return sstrdup("{\"success\": true}");
 }
 
-static void show_workspace(xcb_connection_t *conn, int workspace) {
-        Client *client;
-        xcb_window_t root = xcb_setup_roots_iterator(xcb_get_setup(conn)).data->root;
-        /* t_ws (to workspace) is just a convenience pointer to the workspace we’re switching to */
-        Workspace *t_ws = &(workspaces[workspace-1]);
+/*
+ * Implementation of 'mark <mark>'
+ *
+ */
+char *cmd_mark(Match *current_match, char *mark) {
+    DLOG("Clearing all windows which have that mark first\n");
 
-        printf("show_workspace(%d)\n", workspace);
+    Con *con;
+    TAILQ_FOREACH(con, &all_cons, all_cons) {
+        if (con->mark && strcmp(con->mark, mark) == 0)
+            FREE(con->mark);
+    }
 
-        /* Store current_row/current_col */
-        c_ws->current_row = current_row;
-        c_ws->current_col = current_col;
+    DLOG("marking window with str %s\n", mark);
+    owindow *current;
 
-        /* Check if the workspace has not been used yet */
-        if (t_ws->screen == NULL) {
-                printf("initializing new workspace, setting num to %d\n", workspace);
-                t_ws->screen = c_ws->screen;
-                /* Copy the dimensions from the virtual screen */
-               memcpy(&(t_ws->rect), &(t_ws->screen->rect), sizeof(Rect));
-        }
+    HANDLE_EMPTY_MATCH;
 
-        if (c_ws->screen != t_ws->screen) {
-                /* We need to switch to the other screen first */
-                printf("moving over to other screen.\n");
-                c_ws = &(workspaces[t_ws->screen->current_workspace]);
-                current_col = c_ws->current_col;
-                current_row = c_ws->current_row;
-                if (CUR_CELL->currently_focused != NULL)
-                        warp_pointer_into(conn, CUR_CELL->currently_focused);
-                else {
-                        Rect *dims = &(c_ws->screen->rect);
-                        xcb_warp_pointer(conn, XCB_NONE, root, 0, 0, 0, 0,
-                                         dims->x + (dims->width / 2), dims->y + (dims->height / 2));
-                }
-        }
+    TAILQ_FOREACH(current, &owindows, owindows) {
+        DLOG("matching: %p / %s\n", current->con, current->con->name);
+        current->con->mark = sstrdup(mark);
+    }
 
-        /* Check if we need to change something or if we’re already there */
-        if (c_ws->screen->current_workspace == (workspace-1))
-                return;
+    tree_render();
 
-        t_ws->screen->current_workspace = workspace-1;
+    // XXX: default reply for now, make this a better reply
+    return sstrdup("{\"success\": true}");
+}
 
-        /* TODO: does grabbing the server actually bring us any (speed)advantages? */
-        //xcb_grab_server(conn);
+/*
+ * Implementation of 'mode <string>'.
+ *
+ */
+char *cmd_mode(Match *current_match, char *mode) {
+    DLOG("mode=%s\n", mode);
+    switch_mode(mode);
 
-        /* Unmap all clients of the current workspace */
-        for (int cols = 0; cols < c_ws->cols; cols++)
-                for (int rows = 0; rows < c_ws->rows; rows++)
-                        CIRCLEQ_FOREACH(client, &(c_ws->table[cols][rows]->clients), clients)
-                                xcb_unmap_window(conn, client->frame);
+    // XXX: default reply for now, make this a better reply
+    return sstrdup("{\"success\": true}");
+}
 
-        /* Unmap the stack windows on the current workspace, if any */
-        struct Stack_Window *stack_win;
-        SLIST_FOREACH(stack_win, &stack_wins, stack_windows)
-                if (stack_win->container->workspace == c_ws)
-                        xcb_unmap_window(conn, stack_win->window);
+/*
+ * Implementation of 'move [window|container] [to] output <str>'.
+ *
+ */
+char *cmd_move_con_to_output(Match *current_match, char *name) {
+    owindow *current;
+
+    DLOG("should move window to output %s\n", name);
+
+    HANDLE_EMPTY_MATCH;
+
+    /* get the output */
+    Output *current_output = NULL;
+    Output *output;
+
+    // TODO: fix the handling of criteria
+    TAILQ_FOREACH(current, &owindows, owindows)
+        current_output = get_output_containing(current->con->rect.x, current->con->rect.y);
+
+    assert(current_output != NULL);
+
+    // TODO: clean this up with commands.spec as soon as we switched away from the lex/yacc command parser
+    if (strcasecmp(name, "up") == 0)
+        output = get_output_next(D_UP, current_output);
+    else if (strcasecmp(name, "down") == 0)
+        output = get_output_next(D_DOWN, current_output);
+    else if (strcasecmp(name, "left") == 0)
+        output = get_output_next(D_LEFT, current_output);
+    else if (strcasecmp(name, "right") == 0)
+        output = get_output_next(D_RIGHT, current_output);
+    else
+        output = get_output_by_name(name);
+
+    if (!output) {
+        LOG("No such output found.\n");
+        return sstrdup("{\"sucess\": false}");
+    }
+
+    /* get visible workspace on output */
+    Con *ws = NULL;
+    GREP_FIRST(ws, output_get_content(output->con), workspace_is_visible(child));
+    if (!ws)
+        return sstrdup("{\"sucess\": false}");
+
+    TAILQ_FOREACH(current, &owindows, owindows) {
+        DLOG("matching: %p / %s\n", current->con, current->con->name);
+        con_move_to_workspace(current->con, ws, true, false);
+    }
+
+    tree_render();
+
+    // XXX: default reply for now, make this a better reply
+    return sstrdup("{\"success\": true}");
+}
 
-        c_ws = &workspaces[workspace-1];
-        current_row = c_ws->current_row;
-        current_col = c_ws->current_col;
-        printf("new current row = %d, current col = %d\n", current_row, current_col);
+/*
+ * Implementation of 'floating enable|disable|toggle'
+ *
+ */
+char *cmd_floating(Match *current_match, char *floating_mode) {
+    owindow *current;
 
-        /* Map all clients on the new workspace */
-        for (int cols = 0; cols < c_ws->cols; cols++)
-                for (int rows = 0; rows < c_ws->rows; rows++)
-                        CIRCLEQ_FOREACH(client, &(c_ws->table[cols][rows]->clients), clients)
-                                xcb_map_window(conn, client->frame);
+    DLOG("floating_mode=%s\n", floating_mode);
 
-        /* Map all stack windows, if any */
-        SLIST_FOREACH(stack_win, &stack_wins, stack_windows)
-                if (stack_win->container->workspace == c_ws)
-                        xcb_map_window(conn, stack_win->window);
+    HANDLE_EMPTY_MATCH;
 
-        /* Restore focus on the new workspace */
-        if (CUR_CELL->currently_focused != NULL)
-                set_focus(conn, CUR_CELL->currently_focused);
-        else xcb_set_input_focus(conn, XCB_INPUT_FOCUS_POINTER_ROOT, root, XCB_CURRENT_TIME);
+    TAILQ_FOREACH(current, &owindows, owindows) {
+        DLOG("matching: %p / %s\n", current->con, current->con->name);
+        if (strcmp(floating_mode, "toggle") == 0) {
+            DLOG("should toggle mode\n");
+            toggle_floating_mode(current->con, false);
+        } else {
+            DLOG("should switch mode to %s\n", floating_mode);
+            if (strcmp(floating_mode, "enable") == 0) {
+                floating_enable(current->con, false);
+            } else {
+                floating_disable(current->con, false);
+            }
+        }
+    }
 
-        //xcb_ungrab_server(conn);
+    tree_render();
 
-        render_layout(conn);
+    // XXX: default reply for now, make this a better reply
+    return sstrdup("{\"success\": true}");
 }
 
 /*
- * Parses a command, see file CMDMODE for more information
+ * Implementation of 'move workspace to [output] <str>'.
  *
  */
-void parse_command(xcb_connection_t *conn, const char *command) {
-        printf("--- parsing command \"%s\" ---\n", command);
-        /* Hmm, just to be sure */
-        if (command[0] == '\0')
-                return;
-
-        /* Is it an <exec>? */
-        if (strncmp(command, "exec ", strlen("exec ")) == 0) {
-                printf("starting \"%s\"\n", command + strlen("exec "));
-                start_application(command+strlen("exec "));
-                return;
+char *cmd_move_workspace_to_output(Match *current_match, char *name) {
+    DLOG("should move workspace to output %s\n", name);
+
+    HANDLE_EMPTY_MATCH;
+
+    owindow *current;
+    TAILQ_FOREACH(current, &owindows, owindows) {
+        Output *current_output = get_output_containing(current->con->rect.x,
+                                                       current->con->rect.y);
+        Output *output = get_output_from_string(current_output, name);
+        if (!output) {
+            LOG("No such output\n");
+            return sstrdup("{\"sucess\": false}");
         }
 
-        /* Is it <restart>? */
-        if (strncmp(command, "restart", strlen("restart")) == 0) {
-                printf("restarting \"%s\"...\n", application_path);
-                execl(application_path, application_path, NULL);
-                /* not reached */
+        Con *content = output_get_content(output->con);
+        LOG("got output %p with content %p\n", output, content);
+
+        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("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\"}");
         }
 
-        /* Is it 'f' for fullscreen? */
-        if (command[0] == 'f') {
-                if (CUR_CELL->currently_focused == NULL)
-                        return;
-                toggle_fullscreen(conn, CUR_CELL->currently_focused);
-                return;
+        bool workspace_was_visible = workspace_is_visible(ws);
+        Con *old_content = ws->parent;
+        con_detach(ws);
+        if (workspace_was_visible) {
+            /* The workspace which we just detached was visible, so focus
+             * the next one in the focus-stack. */
+            Con *focus_ws = TAILQ_FIRST(&(old_content->focus_head));
+            LOG("workspace was visible, focusing %p / %s now\n", focus_ws, focus_ws->name);
+            workspace_show(focus_ws);
         }
-
-        /* Is it just 's' for stacking or 'd' for default? */
-        if ((command[0] == 's' || command[0] == 'd') && (command[1] == '\0')) {
-                printf("Switching mode for current container\n");
-                switch_layout_mode(conn, CUR_CELL, (command[0] == 's' ? MODE_STACK : MODE_DEFAULT));
-                return;
+        con_attach(ws, content, false);
+        ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"move\"}");
+        if (workspace_was_visible) {
+            /* Focus the moved workspace on the destination output. */
+            workspace_show(ws);
         }
+    }
 
-        /* Is it a <with>? */
-        if (command[0] == 'w') {
-                /* TODO: implement */
-                printf("not yet implemented.\n");
-                return;
-        }
+    tree_render();
 
-        /* It's a normal <cmd> */
-        char *rest = NULL;
-        enum { ACTION_FOCUS, ACTION_MOVE, ACTION_SNAP } action = ACTION_FOCUS;
-        direction_t direction;
-        int times = strtol(command, &rest, 10);
-        if (rest == NULL) {
-                printf("Invalid command (\"%s\")\n", command);
-                return;
+    // XXX: default reply for now, make this a better reply
+    return sstrdup("{\"success\": true}");
+}
+
+/*
+ * Implementation of 'split v|h|vertical|horizontal'.
+ *
+ */
+char *cmd_split(Match *current_match, char *direction) {
+    /* TODO: use matches */
+    LOG("splitting in direction %c\n", direction[0]);
+    tree_split(focused, (direction[0] == 'v' ? VERT : HORIZ));
+
+    tree_render();
+
+    // XXX: default reply for now, make this a better reply
+    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";
+    owindow *current;
+
+    DLOG("kill_mode=%s\n", kill_mode_str);
+
+    int kill_mode;
+    if (strcmp(kill_mode_str, "window") == 0)
+        kill_mode = KILL_WINDOW;
+    else if (strcmp(kill_mode_str, "client") == 0)
+        kill_mode = KILL_CLIENT;
+    else {
+        ELOG("BUG: called with kill_mode=%s\n", kill_mode_str);
+        return sstrdup("{\"sucess\": false}");
+    }
+
+    /* check if the match is empty, not if the result is empty */
+    if (match_is_empty(current_match))
+        tree_close_con(kill_mode);
+    else {
+        TAILQ_FOREACH(current, &owindows, owindows) {
+            DLOG("matching: %p / %s\n", current->con, current->con->name);
+            tree_close(current->con, kill_mode, false, false);
         }
+    }
+
+    tree_render();
+
+    // XXX: default reply for now, make this a better reply
+    return sstrdup("{\"success\": true}");
+}
+
+/*
+ * Implementation of 'exec [--no-startup-id] <command>'.
+ *
+ */
+char *cmd_exec(Match *current_match, char *nosn, char *command) {
+    bool no_startup_id = (nosn != NULL);
 
-        if (*rest == '\0') {
-                /* No rest? This was a tag number, not a times specification */
-                show_workspace(conn, times);
-                return;
+    DLOG("should execute %s, no_startup_id = %d\n", command, no_startup_id);
+    start_application(command, no_startup_id);
+
+    // XXX: default reply for now, make this a better reply
+    return sstrdup("{\"success\": true}");
+}
+
+/*
+ * Implementation of 'focus left|right|up|down'.
+ *
+ */
+char *cmd_focus_direction(Match *current_match, char *direction) {
+    if (focused &&
+        focused->type != CT_WORKSPACE &&
+        focused->fullscreen_mode != CF_NONE) {
+        LOG("Cannot change focus while in fullscreen mode.\n");
+        return sstrdup("{\"sucess\": false}");
+    }
+
+    DLOG("direction = *%s*\n", direction);
+
+    if (strcmp(direction, "left") == 0)
+        tree_next('p', HORIZ);
+    else if (strcmp(direction, "right") == 0)
+        tree_next('n', HORIZ);
+    else if (strcmp(direction, "up") == 0)
+        tree_next('p', VERT);
+    else if (strcmp(direction, "down") == 0)
+        tree_next('n', VERT);
+    else {
+        ELOG("Invalid focus direction (%s)\n", direction);
+        return sstrdup("{\"sucess\": false}");
+    }
+
+    tree_render();
+
+    // XXX: default reply for now, make this a better reply
+    return sstrdup("{\"success\": true}");
+}
+
+/*
+ * Implementation of 'focus tiling|floating|mode_toggle'.
+ *
+ */
+char *cmd_focus_window_mode(Match *current_match, char *window_mode) {
+    if (focused &&
+        focused->type != CT_WORKSPACE &&
+        focused->fullscreen_mode != CF_NONE) {
+        LOG("Cannot change focus while in fullscreen mode.\n");
+        return sstrdup("{\"sucess\": false}");
+    }
+
+    DLOG("window_mode = %s\n", window_mode);
+
+    Con *ws = con_get_workspace(focused);
+    Con *current;
+    if (ws != NULL) {
+        if (strcmp(window_mode, "mode_toggle") == 0) {
+            current = TAILQ_FIRST(&(ws->focus_head));
+            if (current != NULL && current->type == CT_FLOATING_CON)
+                window_mode = "tiling";
+            else window_mode = "floating";
         }
+        TAILQ_FOREACH(current, &(ws->focus_head), focused) {
+            if ((strcmp(window_mode, "floating") == 0 && current->type != CT_FLOATING_CON) ||
+                (strcmp(window_mode, "tiling") == 0 && current->type == CT_FLOATING_CON))
+                continue;
 
-        if (*rest == 'm' || *rest == 's') {
-                action = (*rest == 'm' ? ACTION_MOVE : ACTION_SNAP);
-                rest++;
+            con_focus(con_descend_focused(current));
+            break;
         }
+    }
+
+    tree_render();
+
+    // XXX: default reply for now, make this a better reply
+    return sstrdup("{\"success\": true}");
+}
+
+/*
+ * Implementation of 'focus parent|child'.
+ *
+ */
+char *cmd_focus_level(Match *current_match, char *level) {
+    if (focused &&
+        focused->type != CT_WORKSPACE &&
+        focused->fullscreen_mode != CF_NONE) {
+        LOG("Cannot change focus while in fullscreen mode.\n");
+        return sstrdup("{\"sucess\": false}");
+    }
 
-        int workspace = strtol(rest, &rest, 10);
+    DLOG("level = %s\n", level);
 
-        if (rest == NULL) {
-                printf("Invalid command (\"%s\")\n", command);
-                return;
+    if (strcmp(level, "parent") == 0)
+        level_up();
+    else level_down();
+
+    tree_render();
+
+    // XXX: default reply for now, make this a better reply
+    return sstrdup("{\"success\": true}");
+}
+
+/*
+ * Implementation of 'focus'.
+ *
+ */
+char *cmd_focus(Match *current_match) {
+    DLOG("current_match = %p\n", current_match);
+    if (focused &&
+        focused->type != CT_WORKSPACE &&
+        focused->fullscreen_mode != CF_NONE) {
+        LOG("Cannot change focus while in fullscreen mode.\n");
+        return sstrdup("{\"sucess\": false}");
+    }
+
+    owindow *current;
+
+    if (match_is_empty(current_match)) {
+        ELOG("You have to specify which window/container should be focused.\n");
+        ELOG("Example: [class=\"urxvt\" title=\"irssi\"] focus\n");
+
+        char *json_output;
+        sasprintf(&json_output, "{\"success\":false, \"error\":\"You have to "
+                  "specify which window/container should be focused\"}");
+        return json_output;
+    }
+
+    int count = 0;
+    TAILQ_FOREACH(current, &owindows, owindows) {
+        Con *ws = con_get_workspace(current->con);
+        /* If no workspace could be found, this was a dock window.
+         * Just skip it, you cannot focus dock windows. */
+        if (!ws)
+            continue;
+
+        /* If the container is not on the current workspace,
+         * workspace_show() will switch to a different workspace and (if
+         * enabled) trigger a mouse pointer warp to the currently focused
+         * container (!) on the target workspace.
+         *
+         * Therefore, before calling workspace_show(), we make sure that
+         * 'current' will be focused on the workspace. However, we cannot
+         * just con_focus(current) because then the pointer will not be
+         * warped at all (the code thinks we are already there).
+         *
+         * So we focus 'current' to make it the currently focused window of
+         * the target workspace, then revert focus. */
+        Con *currently_focused = focused;
+        con_focus(current->con);
+        con_focus(currently_focused);
+
+        /* Now switch to the workspace, then focus */
+        workspace_show(ws);
+        LOG("focusing %p / %s\n", current->con, current->con->name);
+        con_focus(current->con);
+        count++;
+    }
+
+    if (count > 1)
+        LOG("WARNING: Your criteria for the focus command matches %d containers, "
+            "while only exactly one container can be focused at a time.\n", count);
+
+    tree_render();
+
+    // XXX: default reply for now, make this a better reply
+    return sstrdup("{\"success\": true}");
+}
+
+/*
+ * Implementation of 'fullscreen [global]'.
+ *
+ */
+char *cmd_fullscreen(Match *current_match, char *fullscreen_mode) {
+    if (fullscreen_mode == NULL)
+        fullscreen_mode = "output";
+    DLOG("toggling fullscreen, mode = %s\n", fullscreen_mode);
+    owindow *current;
+
+    HANDLE_EMPTY_MATCH;
+
+    TAILQ_FOREACH(current, &owindows, owindows) {
+        printf("matching: %p / %s\n", current->con, current->con->name);
+        con_toggle_fullscreen(current->con, (strcmp(fullscreen_mode, "global") == 0 ? CF_GLOBAL : CF_OUTPUT));
+    }
+
+    tree_render();
+
+    // XXX: default reply for now, make this a better reply
+    return sstrdup("{\"success\": true}");
+}
+
+/*
+ * Implementation of 'move <direction> [<pixels> [px]]'.
+ *
+ */
+char *cmd_move_direction(Match *current_match, char *direction, char *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);
+
+    /* TODO: make 'move' work with criteria. */
+    DLOG("moving in direction %s, px %s\n", direction, move_px);
+    if (con_is_floating(focused)) {
+        DLOG("floating move with %d pixels\n", px);
+        Rect newrect = focused->parent->rect;
+        if (strcmp(direction, "left") == 0) {
+            newrect.x -= px;
+        } else if (strcmp(direction, "right") == 0) {
+            newrect.x += px;
+        } else if (strcmp(direction, "up") == 0) {
+            newrect.y -= px;
+        } else if (strcmp(direction, "down") == 0) {
+            newrect.y += px;
         }
+        floating_reposition(focused->parent, newrect);
+    } else {
+        tree_move((strcmp(direction, "right") == 0 ? D_RIGHT :
+                   (strcmp(direction, "left") == 0 ? D_LEFT :
+                    (strcmp(direction, "up") == 0 ? D_UP :
+                     D_DOWN))));
+        tree_render();
+    }
+
+
+    // XXX: default reply for now, make this a better reply
+    return sstrdup("{\"success\": true}");
+}
 
-        if (*rest == '\0') {
-                move_current_window_to_workspace(conn, workspace);
-                return;
+/*
+ * 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";
+    DLOG("changing layout to %s\n", layout_str);
+    owindow *current;
+    int layout = (strcmp(layout_str, "default") == 0 ? L_DEFAULT :
+                  (strcmp(layout_str, "stacked") == 0 ? L_STACKED :
+                   L_TABBED));
+
+    /* check if the match is empty, not if the result is empty */
+    if (match_is_empty(current_match))
+        con_set_layout(focused->parent, layout);
+    else {
+        TAILQ_FOREACH(current, &owindows, owindows) {
+            DLOG("matching: %p / %s\n", current->con, current->con->name);
+            con_set_layout(current->con, layout);
         }
+    }
+
+    tree_render();
 
-        /* Now perform action to <where> */
-        while (*rest != '\0') {
-                if (*rest == 'h')
-                        direction = D_LEFT;
-                else if (*rest == 'j')
-                        direction = D_DOWN;
-                else if (*rest == 'k')
-                        direction = D_UP;
-                else if (*rest == 'l')
-                        direction = D_RIGHT;
-                else {
-                        printf("unknown direction: %c\n", *rest);
-                        return;
-                }
-
-                if (action == ACTION_FOCUS)
-                        focus_window(conn, direction);
-                else if (action == ACTION_MOVE)
-                        move_current_window(conn, direction);
-                else if (action == ACTION_SNAP)
-                        snap_current_container(conn, direction);
-
-                rest++;
+    // XXX: default reply for now, make this a better reply
+    return sstrdup("{\"success\": true}");
+}
+
+/*
+ * Implementaiton of 'exit'.
+ *
+ */
+char *cmd_exit(Match *current_match) {
+    LOG("Exiting due to user command.\n");
+    exit(0);
+
+    /* unreached */
+}
+
+/*
+ * Implementaiton of 'reload'.
+ *
+ */
+char *cmd_reload(Match *current_match) {
+    LOG("reloading\n");
+    kill_configerror_nagbar(false);
+    load_configuration(conn, NULL, true);
+    x_set_i3_atoms();
+    /* Send an IPC event just in case the ws names have changed */
+    ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"reload\"}");
+
+    // XXX: default reply for now, make this a better reply
+    return sstrdup("{\"success\": true}");
+}
+
+/*
+ * Implementaiton of 'restart'.
+ *
+ */
+char *cmd_restart(Match *current_match) {
+    LOG("restarting i3\n");
+    i3_restart(false);
+
+    // XXX: default reply for now, make this a better reply
+    return sstrdup("{\"success\": true}");
+}
+
+/*
+ * Implementaiton of 'open'.
+ *
+ */
+char *cmd_open(Match *current_match) {
+    LOG("opening new container\n");
+    Con *con = tree_open_con(NULL, NULL);
+    con_focus(con);
+    char *json_output;
+    sasprintf(&json_output, "{\"success\":true, \"id\":%ld}", (long int)con);
+
+    tree_render();
+
+    return json_output;
+}
+
+/*
+ * Implementation of 'focus output <output>'.
+ *
+ */
+char *cmd_focus_output(Match *current_match, char *name) {
+    owindow *current;
+
+    DLOG("name = %s\n", name);
+
+    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);
+
+    output = get_output_from_string(current_output, name);
+
+    if (!output) {
+        LOG("No such output found.\n");
+        return sstrdup("{\"sucess\": false}");
+    }
+
+    /* get visible workspace on output */
+    Con *ws = NULL;
+    GREP_FIRST(ws, output_get_content(output->con), workspace_is_visible(child));
+    if (!ws)
+        return sstrdup("{\"sucess\": false}");
+
+    workspace_show(ws);
+    tree_render();
+
+    // XXX: default reply for now, make this a better reply
+    return sstrdup("{\"success\": true}");
+}
+
+/*
+ * Implementation of 'move scratchpad'.
+ *
+ */
+char *cmd_move_scratchpad(Match *current_match) {
+    DLOG("should move window to scratchpad\n");
+    owindow *current;
+
+    HANDLE_EMPTY_MATCH;
+
+    TAILQ_FOREACH(current, &owindows, owindows) {
+        DLOG("matching: %p / %s\n", current->con, current->con->name);
+        scratchpad_move(current->con);
+    }
+
+    tree_render();
+
+    // XXX: default reply for now, make this a better reply
+    return sstrdup("{\"success\": true}");
+}
+
+/*
+ * Implementation of 'scratchpad show'.
+ *
+ */
+char *cmd_scratchpad_show(Match *current_match) {
+    DLOG("should show scratchpad window\n");
+    owindow *current;
+
+    if (match_is_empty(current_match)) {
+        scratchpad_show(NULL);
+    } else {
+        TAILQ_FOREACH(current, &owindows, owindows) {
+            DLOG("matching: %p / %s\n", current->con, current->con->name);
+            scratchpad_show(current->con);
         }
+    }
+
+    tree_render();
 
-        printf("--- done ---\n");
+    // XXX: default reply for now, make this a better reply
+    return sstrdup("{\"success\": true}");
 }