X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fcommands.c;h=44e6a23d4533f275b6ddffd15c96dd905c3899ea;hb=fb4ee17b054afa2f85ad64480353f554e5eae2d3;hp=8fc80a199c3b0c11efbe58583982d5006f8fc99b;hpb=e09e077b763bb1ff1975998c87d017afa9c319c3;p=i3%2Fi3

diff --git a/src/commands.c b/src/commands.c
index 8fc80a19..44e6a23d 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -12,8 +12,18 @@
 
 #include "all.h"
 
+// Macros to make the YAJL API a bit easier to use.
+#define y(x, ...) yajl_gen_ ## x (cmd_output->json_gen, ##__VA_ARGS__)
+#define ystr(str) yajl_gen_string(cmd_output->json_gen, (unsigned char*)str, strlen(str))
+#define ysuccess(success) do { \
+    y(map_open); \
+    ystr("success"); \
+    y(bool, success); \
+    y(map_close); \
+} while (0)
+
 /** When the command did not include match criteria (!), we use the currently
- * focused command. Do not confuse this case with a command which included
+ * focused container. 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.
  */
@@ -65,6 +75,28 @@ static Output *get_output_from_string(Output *current_output, const char *output
     return output;
 }
 
+/*
+ * Checks whether we switched to a new workspace and returns false in that case,
+ * signaling that further workspace switching should be done by the calling function
+ * If not, calls workspace_back_and_forth() if workspace_auto_back_and_forth is set
+ * and return true, signaling that no further workspace switching should occur in the calling function.
+ *
+ */
+static bool maybe_back_and_forth(struct CommandResult *cmd_output, char *name) {
+    Con *ws = con_get_workspace(focused);
+
+    /* If we switched to a different workspace, do nothing */
+    if (strcmp(ws->name, name) != 0)
+        return false;
+
+    DLOG("This workspace is already focused.\n");
+    if (config.workspace_auto_back_and_forth) {
+        workspace_back_and_forth();
+        cmd_output->needs_tree_render = true;
+    }
+    return true;
+}
+
 // This code is commented out because we might recycle it for popping up error
 // messages on parser errors.
 #if 0
@@ -108,7 +140,7 @@ static void nagbar_cleanup(EV_P_ ev_cleanup *watcher, int revent) {
 }
 #endif
 
-void cmd_MIGRATION_start_nagbar() {
+void cmd_MIGRATION_start_nagbar(void) {
     if (migration_pid != -1) {
         fprintf(stderr, "i3-nagbar already running.\n");
         return;
@@ -319,7 +351,7 @@ void cmd_criteria_add(I3_CMD, char *ctype, char *cvalue) {
 
 /*
  * Implementation of 'move [window|container] [to] workspace
- * next|prev|next_on_output|prev_on_output'.
+ * next|prev|next_on_output|prev_on_output|current'.
  *
  */
 void cmd_move_con_to_workspace(I3_CMD, char *which) {
@@ -327,6 +359,15 @@ void cmd_move_con_to_workspace(I3_CMD, char *which) {
 
     DLOG("which=%s\n", which);
 
+    /* We have nothing to move:
+     *  when criteria was specified but didn't match any window or
+     *  when criteria wasn't specified and we don't have any window focused. */
+    if ((!match_is_empty(current_match) && TAILQ_EMPTY(&owindows)) ||
+        (match_is_empty(current_match) && focused->type == CT_WORKSPACE)) {
+        ysuccess(false);
+        return;
+    }
+
     HANDLE_EMPTY_MATCH;
 
     /* get the workspace */
@@ -339,9 +380,11 @@ void cmd_move_con_to_workspace(I3_CMD, char *which) {
         ws = workspace_next_on_output();
     else if (strcmp(which, "prev_on_output") == 0)
         ws = workspace_prev_on_output();
+    else if (strcmp(which, "current") == 0)
+        ws = con_get_workspace(focused);
     else {
         ELOG("BUG: called with which=%s\n", which);
-        cmd_output->json_output = sstrdup("{\"sucess\": false}");
+        ysuccess(false);
         return;
     }
 
@@ -352,7 +395,7 @@ void cmd_move_con_to_workspace(I3_CMD, char *which) {
 
     cmd_output->needs_tree_render = true;
     // XXX: default reply for now, make this a better reply
-    cmd_output->json_output = sstrdup("{\"success\": true}");
+    ysuccess(true);
 }
 
 /*
@@ -362,16 +405,18 @@ void cmd_move_con_to_workspace(I3_CMD, char *which) {
 void cmd_move_con_to_workspace_name(I3_CMD, char *name) {
     if (strncasecmp(name, "__i3_", strlen("__i3_")) == 0) {
         LOG("You cannot switch to the i3 internal workspaces.\n");
-        cmd_output->json_output = sstrdup("{\"sucess\": false}");
+        ysuccess(false);
         return;
     }
 
     owindow *current;
 
-    /* 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) {
-        cmd_output->json_output = sstrdup("{\"sucess\": false}");
+    /* We have nothing to move:
+     *  when criteria was specified but didn't match any window or
+     *  when criteria wasn't specified and we don't have any window focused. */
+    if ((!match_is_empty(current_match) && TAILQ_EMPTY(&owindows)) ||
+        (match_is_empty(current_match) && focused->type == CT_WORKSPACE)) {
+        ysuccess(false);
         return;
     }
 
@@ -388,63 +433,115 @@ void cmd_move_con_to_workspace_name(I3_CMD, char *name) {
 
     cmd_output->needs_tree_render = true;
     // XXX: default reply for now, make this a better reply
-    cmd_output->json_output = sstrdup("{\"success\": true}");
+    ysuccess(true);
 }
 
 /*
- * Implementation of 'resize grow|shrink <direction> [<px> px] [or <ppt> ppt]'.
+ * Implementation of 'move [window|container] [to] workspace number <number>'.
  *
  */
-void cmd_resize(I3_CMD, 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;
+void cmd_move_con_to_workspace_number(I3_CMD, char *which) {
+    owindow *current;
+
+    /* We have nothing to move:
+     *  when criteria was specified but didn't match any window or
+     *  when criteria wasn't specified and we don't have any window focused. */
+    if ((!match_is_empty(current_match) && TAILQ_EMPTY(&owindows)) ||
+        (match_is_empty(current_match) && focused->type == CT_WORKSPACE)) {
+        ysuccess(false);
+        return;
     }
 
-    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;
+    LOG("should move window to workspace with number %d\n", which);
+    /* get the workspace */
+    Con *output, *workspace = NULL;
+
+    char *endptr = NULL;
+    long parsed_num = strtol(which, &endptr, 10);
+    if (parsed_num == LONG_MIN ||
+        parsed_num == LONG_MAX ||
+        parsed_num < 0 ||
+        *endptr != '\0') {
+        LOG("Could not parse \"%s\" as a number.\n", which);
+        y(map_open);
+        ystr("success");
+        y(bool, false);
+        ystr("error");
+        // TODO: better error message
+        ystr("Could not parse number");
+        y(map_close);
+        return;
+    }
+
+    TAILQ_FOREACH(output, &(croot->nodes_head), nodes)
+        GREP_FIRST(workspace, output_get_content(output),
+            child->num == parsed_num);
+
+    if (!workspace) {
+        y(map_open);
+        ystr("success");
+        y(bool, false);
+        ystr("error");
+        // TODO: better error message
+        ystr("No such workspace");
+        y(map_close);
+        return;
+    }
+
+    HANDLE_EMPTY_MATCH;
 
-        /* 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);
+    TAILQ_FOREACH(current, &owindows, owindows) {
+        DLOG("matching: %p / %s\n", current->con, current->con->name);
+        con_move_to_workspace(current->con, workspace, true, false);
+    }
+
+    cmd_output->needs_tree_render = true;
+    // XXX: default reply for now, make this a better reply
+    ysuccess(true);
+}
 
-        while (current->type != CT_WORKSPACE &&
-               current->type != CT_FLOATING_CON &&
-               current->parent->orientation != search_orientation)
+static void cmd_resize_floating(I3_CMD, char *way, char *direction, Con *floating_con, int px) {
+    LOG("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;
+    }
+}
+
+static bool cmd_resize_tiling_direction(I3_CMD, char *way, char *direction, int ppt) {
+    LOG("tiling resize\n");
+    /* get the appropriate current container (skip stacked/tabbed cons) */
+    Con *current = focused;
+    Con *other = NULL;
+    double percentage = 0;
+    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);
+
+    do {
+        if (con_orientation(current->parent) != search_orientation) {
             current = current->parent;
+            continue;
+        }
 
         /* get the default percentage */
         int children = con_num_children(current->parent);
-        Con *other;
         LOG("ins. %d children\n", children);
-        double percentage = 1.0 / children;
+        percentage = 1.0 / children;
         LOG("default percentage = %f\n", percentage);
 
-        orientation_t orientation = current->parent->orientation;
+        orientation_t orientation = con_orientation(current->parent);
 
         if ((orientation == HORIZ &&
              (strcmp(direction, "up") == 0 || strcmp(direction, "down") == 0)) ||
@@ -452,8 +549,8 @@ void cmd_resize(I3_CMD, char *way, char *direction, char *resize_px, char *resiz
              (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"));
-            cmd_output->json_output = sstrdup("{\"sucess\": false}");
-            return;
+            ysuccess(false);
+            return false;
         }
 
         if (strcmp(direction, "up") == 0 || strcmp(direction, "left") == 0) {
@@ -462,36 +559,160 @@ void cmd_resize(I3_CMD, char *way, char *direction, char *resize_px, char *resiz
             other = TAILQ_NEXT(current, nodes);
         }
         if (other == TAILQ_END(workspaces)) {
-            LOG("No other container in this direction found, cannot resize.\n");
-            cmd_output->json_output = sstrdup("{\"sucess\": false}");
-            return;
+            LOG("No other container in this direction found, trying to look further up in the tree...\n");
+            current = current->parent;
+            continue;
+        }
+        break;
+    } while (current->type != CT_WORKSPACE &&
+             current->type != CT_FLOATING_CON);
+
+    if (other == NULL) {
+        LOG("No other container in this direction found, trying to look further up in the tree...\n");
+        ysuccess(false);
+        return 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");
+    }
+
+    return true;
+}
+
+static bool cmd_resize_tiling_width_height(I3_CMD, char *way, char *direction, int ppt) {
+    LOG("width/height 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, "width") == 0 ? HORIZ : VERT);
+
+    while (current->type != CT_WORKSPACE &&
+           current->type != CT_FLOATING_CON &&
+           con_orientation(current->parent) != search_orientation)
+        current = current->parent;
+
+    /* get the default percentage */
+    int children = con_num_children(current->parent);
+    LOG("ins. %d children\n", children);
+    double percentage = 1.0 / children;
+    LOG("default percentage = %f\n", percentage);
+
+    orientation_t orientation = con_orientation(current->parent);
+
+    if ((orientation == HORIZ &&
+         strcmp(direction, "height") == 0) ||
+        (orientation == VERT &&
+         strcmp(direction, "width") == 0)) {
+        LOG("You cannot resize in that direction. Your focus is in a %s split container currently.\n",
+            (orientation == HORIZ ? "horizontal" : "vertical"));
+        ysuccess(false);
+        return false;
+    }
+
+    if (children == 1) {
+        LOG("This is the only container, cannot resize.\n");
+        ysuccess(false);
+        return false;
+    }
+
+    /* Ensure all the other children have a percentage set. */
+    Con *child;
+    TAILQ_FOREACH(child, &(current->parent->nodes_head), nodes) {
+        LOG("child->percent = %f (child %p)\n", child->percent, child);
+        if (child->percent == 0.0)
+            child->percent = percentage;
+    }
+
+    double new_current_percent = current->percent + ((double)ppt / 100.0);
+    double subtract_percent = ((double)ppt / 100.0) / (children - 1);
+    LOG("new_current_percent = %f\n", new_current_percent);
+    LOG("subtract_percent = %f\n", subtract_percent);
+    /* Ensure that the new percentages are positive and greater than
+     * 0.05 to have a reasonable minimum size. */
+    TAILQ_FOREACH(child, &(current->parent->nodes_head), nodes) {
+        if (child == current)
+            continue;
+        if (!definitelyGreaterThan(child->percent - subtract_percent, 0.05, DBL_EPSILON)) {
+            LOG("Not resizing, already at minimum size (child %p would end up with a size of %.f\n", child, child->percent - subtract_percent);
+            ysuccess(false);
+            return 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);
+    }
+    if (!definitelyGreaterThan(new_current_percent, 0.05, DBL_EPSILON)) {
+        LOG("Not resizing, already at minimum size\n");
+        ysuccess(false);
+        return false;
+    }
+
+    current->percent += ((double)ppt / 100.0);
+    LOG("current->percent after = %f\n", current->percent);
+
+    TAILQ_FOREACH(child, &(current->parent->nodes_head), nodes) {
+        if (child == current)
+            continue;
+        child->percent -= subtract_percent;
+        LOG("child->percent after (%p) = %f\n", child, child->percent);
+    }
+
+    return true;
+}
+
+/*
+ * Implementation of 'resize grow|shrink <direction> [<px> px] [or <ppt> ppt]'.
+ *
+ */
+void cmd_resize(I3_CMD, 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))) {
+        cmd_resize_floating(current_match, cmd_output, way, direction, floating_con, px);
+    } else {
+        if (strcmp(direction, "width") == 0 ||
+            strcmp(direction, "height") == 0) {
+            if (!cmd_resize_tiling_width_height(current_match, cmd_output, way, direction, ppt))
+                return;
         } else {
-            LOG("Not resizing, already at minimum size\n");
+            if (!cmd_resize_tiling_direction(current_match, cmd_output, way, direction, ppt))
+                return;
         }
     }
 
     cmd_output->needs_tree_render = true;
     // XXX: default reply for now, make this a better reply
-    cmd_output->json_output = sstrdup("{\"success\": true}");
+    ysuccess(true);
 }
 
 /*
@@ -519,7 +740,7 @@ void cmd_border(I3_CMD, char *border_style_str) {
                 border_style = BS_1PIXEL;
             else {
                 ELOG("BUG: called with border_style=%s\n", border_style_str);
-                cmd_output->json_output = sstrdup("{\"sucess\": false}");
+                ysuccess(false);
                 return;
             }
         }
@@ -528,7 +749,7 @@ void cmd_border(I3_CMD, char *border_style_str) {
 
     cmd_output->needs_tree_render = true;
     // XXX: default reply for now, make this a better reply
-    cmd_output->json_output = sstrdup("{\"success\": true}");
+    ysuccess(true);
 }
 
 /*
@@ -551,7 +772,7 @@ void cmd_append_layout(I3_CMD, char *path) {
 
     cmd_output->needs_tree_render = true;
     // XXX: default reply for now, make this a better reply
-    cmd_output->json_output = sstrdup("{\"success\": true}");
+    ysuccess(true);
 }
 
 /*
@@ -573,7 +794,7 @@ void cmd_workspace(I3_CMD, char *which) {
         ws = workspace_prev_on_output();
     else {
         ELOG("BUG: called with which=%s\n", which);
-        cmd_output->json_output = sstrdup("{\"sucess\": false}");
+        ysuccess(false);
         return;
     }
 
@@ -581,7 +802,56 @@ void cmd_workspace(I3_CMD, char *which) {
 
     cmd_output->needs_tree_render = true;
     // XXX: default reply for now, make this a better reply
-    cmd_output->json_output = sstrdup("{\"success\": true}");
+    ysuccess(true);
+}
+
+/*
+ * Implementation of 'workspace number <number>'
+ *
+ */
+void cmd_workspace_number(I3_CMD, char *which) {
+    Con *output, *workspace = NULL;
+
+    char *endptr = NULL;
+    long parsed_num = strtol(which, &endptr, 10);
+    if (parsed_num == LONG_MIN ||
+        parsed_num == LONG_MAX ||
+        parsed_num < 0 ||
+        *endptr != '\0') {
+        LOG("Could not parse \"%s\" as a number.\n", which);
+        y(map_open);
+        ystr("success");
+        y(bool, false);
+        ystr("error");
+        // TODO: better error message
+        ystr("Could not parse number");
+        y(map_close);
+
+        return;
+    }
+
+    TAILQ_FOREACH(output, &(croot->nodes_head), nodes)
+        GREP_FIRST(workspace, output_get_content(output),
+            child->num == parsed_num);
+
+    if (!workspace) {
+        LOG("There is no workspace with number %d, creating a new one.\n", parsed_num);
+        ysuccess(true);
+        /* terminate the which string after the endposition of the number */
+        *endptr = '\0';
+        if (maybe_back_and_forth(cmd_output, which))
+            return;
+        workspace_show_by_name(which);
+        cmd_output->needs_tree_render = true;
+        return;
+    }
+    if (maybe_back_and_forth(cmd_output, which))
+        return;
+    workspace_show(workspace);
+
+    cmd_output->needs_tree_render = true;
+    // XXX: default reply for now, make this a better reply
+    ysuccess(true);
 }
 
 /*
@@ -593,7 +863,7 @@ void cmd_workspace_back_and_forth(I3_CMD) {
 
     cmd_output->needs_tree_render = true;
     // XXX: default reply for now, make this a better reply
-    cmd_output->json_output = sstrdup("{\"success\": true}");
+    ysuccess(true);
 }
 
 /*
@@ -603,30 +873,18 @@ void cmd_workspace_back_and_forth(I3_CMD) {
 void cmd_workspace_name(I3_CMD, char *name) {
     if (strncasecmp(name, "__i3_", strlen("__i3_")) == 0) {
         LOG("You cannot switch to the i3 internal workspaces.\n");
-        cmd_output->json_output = sstrdup("{\"sucess\": false}");
+        ysuccess(false);
         return;
     }
 
     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();
-        }
-        cmd_output->json_output = sstrdup("{\"sucess\": false}");
-        return;
-    }
-
+    if (maybe_back_and_forth(cmd_output, name))
+       return;
     workspace_show_by_name(name);
 
     cmd_output->needs_tree_render = true;
     // XXX: default reply for now, make this a better reply
-    cmd_output->json_output = sstrdup("{\"success\": true}");
+    ysuccess(true);
 }
 
 /*
@@ -654,7 +912,7 @@ void cmd_mark(I3_CMD, char *mark) {
 
     cmd_output->needs_tree_render = true;
     // XXX: default reply for now, make this a better reply
-    cmd_output->json_output = sstrdup("{\"success\": true}");
+    ysuccess(true);
 }
 
 /*
@@ -666,7 +924,7 @@ void cmd_mode(I3_CMD, char *mode) {
     switch_mode(mode);
 
     // XXX: default reply for now, make this a better reply
-    cmd_output->json_output = sstrdup("{\"success\": true}");
+    ysuccess(true);
 }
 
 /*
@@ -704,7 +962,7 @@ void cmd_move_con_to_output(I3_CMD, char *name) {
 
     if (!output) {
         LOG("No such output found.\n");
-        cmd_output->json_output = sstrdup("{\"sucess\": false}");
+        ysuccess(false);
         return;
     }
 
@@ -712,7 +970,7 @@ void cmd_move_con_to_output(I3_CMD, char *name) {
     Con *ws = NULL;
     GREP_FIRST(ws, output_get_content(output->con), workspace_is_visible(child));
     if (!ws) {
-        cmd_output->json_output = sstrdup("{\"sucess\": false}");
+        ysuccess(false);
         return;
     }
 
@@ -723,7 +981,7 @@ void cmd_move_con_to_output(I3_CMD, char *name) {
 
     cmd_output->needs_tree_render = true;
     // XXX: default reply for now, make this a better reply
-    cmd_output->json_output = sstrdup("{\"success\": true}");
+    ysuccess(true);
 }
 
 /*
@@ -754,7 +1012,7 @@ void cmd_floating(I3_CMD, char *floating_mode) {
 
     cmd_output->needs_tree_render = true;
     // XXX: default reply for now, make this a better reply
-    cmd_output->json_output = sstrdup("{\"success\": true}");
+    ysuccess(true);
 }
 
 /*
@@ -770,10 +1028,15 @@ void cmd_move_workspace_to_output(I3_CMD, char *name) {
     TAILQ_FOREACH(current, &owindows, owindows) {
         Output *current_output = get_output_containing(current->con->rect.x,
                                                        current->con->rect.y);
+        if (!current_output) {
+            ELOG("Cannot get current output. This is a bug in i3.\n");
+            ysuccess(false);
+            return;
+        }
         Output *output = get_output_from_string(current_output, name);
         if (!output) {
-            LOG("No such output\n");
-            cmd_output->json_output = sstrdup("{\"sucess\": false}");
+            ELOG("Could not get output from string \"%s\"\n", name);
+            ysuccess(false);
             return;
         }
 
@@ -844,7 +1107,7 @@ void cmd_move_workspace_to_output(I3_CMD, char *name) {
 
     cmd_output->needs_tree_render = true;
     // XXX: default reply for now, make this a better reply
-    cmd_output->json_output = sstrdup("{\"success\": true}");
+    ysuccess(true);
 }
 
 /*
@@ -858,7 +1121,7 @@ void cmd_split(I3_CMD, char *direction) {
 
     cmd_output->needs_tree_render = true;
     // XXX: default reply for now, make this a better reply
-    cmd_output->json_output = sstrdup("{\"success\": true}");
+    ysuccess(true);
 }
 
 /*
@@ -879,7 +1142,7 @@ void cmd_kill(I3_CMD, char *kill_mode_str) {
         kill_mode = KILL_CLIENT;
     else {
         ELOG("BUG: called with kill_mode=%s\n", kill_mode_str);
-        cmd_output->json_output = sstrdup("{\"sucess\": false}");
+        ysuccess(false);
         return;
     }
 
@@ -895,7 +1158,7 @@ void cmd_kill(I3_CMD, char *kill_mode_str) {
 
     cmd_output->needs_tree_render = true;
     // XXX: default reply for now, make this a better reply
-    cmd_output->json_output = sstrdup("{\"success\": true}");
+    ysuccess(true);
 }
 
 /*
@@ -909,7 +1172,7 @@ void cmd_exec(I3_CMD, char *nosn, char *command) {
     start_application(command, no_startup_id);
 
     // XXX: default reply for now, make this a better reply
-    cmd_output->json_output = sstrdup("{\"success\": true}");
+    ysuccess(true);
 }
 
 /*
@@ -921,7 +1184,7 @@ void cmd_focus_direction(I3_CMD, char *direction) {
         focused->type != CT_WORKSPACE &&
         focused->fullscreen_mode != CF_NONE) {
         LOG("Cannot change focus while in fullscreen mode.\n");
-        cmd_output->json_output = sstrdup("{\"sucess\": false}");
+        ysuccess(false);
         return;
     }
 
@@ -937,13 +1200,13 @@ void cmd_focus_direction(I3_CMD, char *direction) {
         tree_next('n', VERT);
     else {
         ELOG("Invalid focus direction (%s)\n", direction);
-        cmd_output->json_output = sstrdup("{\"sucess\": false}");
+        ysuccess(false);
         return;
     }
 
     cmd_output->needs_tree_render = true;
     // XXX: default reply for now, make this a better reply
-    cmd_output->json_output = sstrdup("{\"success\": true}");
+    ysuccess(true);
 }
 
 /*
@@ -955,7 +1218,7 @@ void cmd_focus_window_mode(I3_CMD, char *window_mode) {
         focused->type != CT_WORKSPACE &&
         focused->fullscreen_mode != CF_NONE) {
         LOG("Cannot change focus while in fullscreen mode.\n");
-        cmd_output->json_output = sstrdup("{\"sucess\": false}");
+        ysuccess(false);
         return;
     }
 
@@ -982,7 +1245,7 @@ void cmd_focus_window_mode(I3_CMD, char *window_mode) {
 
     cmd_output->needs_tree_render = true;
     // XXX: default reply for now, make this a better reply
-    cmd_output->json_output = sstrdup("{\"success\": true}");
+    ysuccess(true);
 }
 
 /*
@@ -990,23 +1253,26 @@ void cmd_focus_window_mode(I3_CMD, char *window_mode) {
  *
  */
 void cmd_focus_level(I3_CMD, char *level) {
-    if (focused &&
-        focused->type != CT_WORKSPACE &&
-        focused->fullscreen_mode != CF_NONE) {
-        LOG("Cannot change focus while in fullscreen mode.\n");
-        cmd_output->json_output = sstrdup("{\"sucess\": false}");
-        return;
-    }
-
     DLOG("level = %s\n", level);
+    bool success = false;
+
+    /* Focusing the parent can only be allowed if the newly
+     * focused container won't escape the fullscreen container. */
+    if (strcmp(level, "parent") == 0) {
+        if (focused && focused->parent) {
+            if (con_fullscreen_permits_focusing(focused->parent))
+                success = level_up();
+            else
+                LOG("Currently in fullscreen, not going up\n");
+        }
+    }
 
-    if (strcmp(level, "parent") == 0)
-        level_up();
-    else level_down();
+    /* Focusing a child should always be allowed. */
+    else success = level_down();
 
-    cmd_output->needs_tree_render = true;
+    cmd_output->needs_tree_render = success;
     // XXX: default reply for now, make this a better reply
-    cmd_output->json_output = sstrdup("{\"success\": true}");
+    ysuccess(success);
 }
 
 /*
@@ -1015,27 +1281,23 @@ void cmd_focus_level(I3_CMD, char *level) {
  */
 void cmd_focus(I3_CMD) {
     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");
-        cmd_output->json_output = sstrdup("{\"sucess\": false}");
-        return;
-    }
-
-    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");
 
-        sasprintf(&(cmd_output->json_output),
-                  "{\"success\":false, \"error\":\"You have to "
-                  "specify which window/container should be focused\"}");
+        y(map_open);
+        ystr("success");
+        y(bool, false);
+        ystr("error");
+        ystr("You have to specify which window/container should be focused");
+        y(map_close);
+
         return;
     }
 
     int count = 0;
+    owindow *current;
     TAILQ_FOREACH(current, &owindows, owindows) {
         Con *ws = con_get_workspace(current->con);
         /* If no workspace could be found, this was a dock window.
@@ -1043,6 +1305,13 @@ void cmd_focus(I3_CMD) {
         if (!ws)
             continue;
 
+        /* Check the fullscreen focus constraints. */
+        if (!con_fullscreen_permits_focusing(current->con)) {
+            LOG("Cannot change focus while in fullscreen mode (fullscreen rules).\n");
+            ysuccess(false);
+            return;
+        }
+
         /* 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
@@ -1072,7 +1341,7 @@ void cmd_focus(I3_CMD) {
 
     cmd_output->needs_tree_render = true;
     // XXX: default reply for now, make this a better reply
-    cmd_output->json_output = sstrdup("{\"success\": true}");
+    ysuccess(true);
 }
 
 /*
@@ -1094,7 +1363,7 @@ void cmd_fullscreen(I3_CMD, char *fullscreen_mode) {
 
     cmd_output->needs_tree_render = true;
     // XXX: default reply for now, make this a better reply
-    cmd_output->json_output = sstrdup("{\"success\": true}");
+    ysuccess(true);
 }
 
 /*
@@ -1129,21 +1398,31 @@ void cmd_move_direction(I3_CMD, char *direction, char *move_px) {
     }
 
     // XXX: default reply for now, make this a better reply
-    cmd_output->json_output = sstrdup("{\"success\": true}");
+    ysuccess(true);
 }
 
 /*
- * Implementation of 'layout default|stacked|stacking|tabbed'.
+ * Implementation of 'layout default|stacked|stacking|tabbed|splitv|splith'.
  *
  */
 void cmd_layout(I3_CMD, 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));
+    int layout;
+    /* default is a special case which will be handled in con_set_layout(). */
+    if (strcmp(layout_str, "default") == 0)
+        layout = L_DEFAULT;
+    else if (strcmp(layout_str, "stacked") == 0)
+        layout = L_STACKED;
+    else if (strcmp(layout_str, "tabbed") == 0)
+        layout = L_TABBED;
+    else if (strcmp(layout_str, "splitv") == 0)
+        layout = L_SPLITV;
+    else if (strcmp(layout_str, "splith") == 0)
+        layout = L_SPLITH;
+
+    DLOG("changing layout to %s (%d)\n", layout_str, layout);
 
     /* check if the match is empty, not if the result is empty */
     if (match_is_empty(current_match))
@@ -1157,7 +1436,34 @@ void cmd_layout(I3_CMD, char *layout_str) {
 
     cmd_output->needs_tree_render = true;
     // XXX: default reply for now, make this a better reply
-    cmd_output->json_output = sstrdup("{\"success\": true}");
+    ysuccess(true);
+}
+
+/*
+ * Implementation of 'layout toggle [all|split]'.
+ *
+ */
+void cmd_layout_toggle(I3_CMD, char *toggle_mode) {
+    owindow *current;
+
+    if (toggle_mode == NULL)
+        toggle_mode = "default";
+
+    DLOG("toggling layout (mode = %s)\n", toggle_mode);
+
+    /* check if the match is empty, not if the result is empty */
+    if (match_is_empty(current_match))
+        con_toggle_layout(focused->parent, toggle_mode);
+    else {
+        TAILQ_FOREACH(current, &owindows, owindows) {
+            DLOG("matching: %p / %s\n", current->con, current->con->name);
+            con_toggle_layout(current->con, toggle_mode);
+        }
+    }
+
+    cmd_output->needs_tree_render = true;
+    // XXX: default reply for now, make this a better reply
+    ysuccess(true);
 }
 
 /*
@@ -1166,6 +1472,7 @@ void cmd_layout(I3_CMD, char *layout_str) {
  */
 void cmd_exit(I3_CMD) {
     LOG("Exiting due to user command.\n");
+    xcb_disconnect(conn);
     exit(0);
 
     /* unreached */
@@ -1178,13 +1485,14 @@ void cmd_exit(I3_CMD) {
 void cmd_reload(I3_CMD) {
     LOG("reloading\n");
     kill_configerror_nagbar(false);
+    kill_commanderror_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
-    cmd_output->json_output = sstrdup("{\"success\": true}");
+    ysuccess(true);
 }
 
 /*
@@ -1196,7 +1504,7 @@ void cmd_restart(I3_CMD) {
     i3_restart(false);
 
     // XXX: default reply for now, make this a better reply
-    cmd_output->json_output = sstrdup("{\"success\": true}");
+    ysuccess(true);
 }
 
 /*
@@ -1206,9 +1514,15 @@ void cmd_restart(I3_CMD) {
 void cmd_open(I3_CMD) {
     LOG("opening new container\n");
     Con *con = tree_open_con(NULL, NULL);
+    con->layout = L_SPLITH;
     con_focus(con);
-    sasprintf(&(cmd_output->json_output),
-              "{\"success\":true, \"id\":%ld}", (long int)con);
+
+    y(map_open);
+    ystr("success");
+    y(bool, true);
+    ystr("id");
+    y(integer, (long int)con);
+    y(map_close);
 
     cmd_output->needs_tree_render = true;
 }
@@ -1236,7 +1550,7 @@ void cmd_focus_output(I3_CMD, char *name) {
 
     if (!output) {
         LOG("No such output found.\n");
-        cmd_output->json_output = sstrdup("{\"sucess\": false}");
+        ysuccess(false);
         return;
     }
 
@@ -1244,7 +1558,7 @@ void cmd_focus_output(I3_CMD, char *name) {
     Con *ws = NULL;
     GREP_FIRST(ws, output_get_content(output->con), workspace_is_visible(child));
     if (!ws) {
-        cmd_output->json_output = sstrdup("{\"sucess\": false}");
+        ysuccess(false);
         return;
     }
 
@@ -1252,7 +1566,92 @@ void cmd_focus_output(I3_CMD, char *name) {
 
     cmd_output->needs_tree_render = true;
     // XXX: default reply for now, make this a better reply
-    cmd_output->json_output = sstrdup("{\"success\": true}");
+    ysuccess(true);
+}
+
+/*
+ * Implementation of 'move [window|container] [to] [absolute] position <px> [px] <px> [px]
+ *
+ */
+void cmd_move_window_to_position(I3_CMD, char *method, char *cx, char *cy) {
+
+    int x = atoi(cx);
+    int y = atoi(cy);
+
+    if (!con_is_floating(focused)) {
+        ELOG("Cannot change position. The window/container is not floating\n");
+        y(map_open);
+        ystr("success");
+        y(bool, false);
+        ystr("error");
+        ystr("Cannot change position. The window/container is not floating.");
+        y(map_close);
+        return;
+    }
+
+    if (strcmp(method, "absolute") == 0) {
+        focused->parent->rect.x = x;
+        focused->parent->rect.y = y;
+
+        DLOG("moving to absolute position %d %d\n", x, y);
+        floating_maybe_reassign_ws(focused->parent);
+        cmd_output->needs_tree_render = true;
+    }
+
+    if (strcmp(method, "position") == 0) {
+        Rect newrect = focused->parent->rect;
+
+        DLOG("moving to position %d %d\n", x, y);
+        newrect.x = x;
+        newrect.y = y;
+
+        floating_reposition(focused->parent, newrect);
+    }
+
+    // XXX: default reply for now, make this a better reply
+    ysuccess(true);
+}
+
+/*
+ * Implementation of 'move [window|container] [to] [absolute] position center
+ *
+ */
+void cmd_move_window_to_center(I3_CMD, char *method) {
+
+    if (!con_is_floating(focused)) {
+        ELOG("Cannot change position. The window/container is not floating\n");
+        y(map_open);
+        ystr("success");
+        y(bool, false);
+        ystr("error");
+        ystr("Cannot change position. The window/container is not floating.");
+        y(map_close);
+    }
+
+    if (strcmp(method, "absolute") == 0) {
+        Rect *rect = &focused->parent->rect;
+
+        DLOG("moving to absolute center\n");
+        rect->x = croot->rect.width/2 - rect->width/2;
+        rect->y = croot->rect.height/2 - rect->height/2;
+
+        floating_maybe_reassign_ws(focused->parent);
+        cmd_output->needs_tree_render = true;
+    }
+
+    if (strcmp(method, "position") == 0) {
+        Rect *wsrect = &con_get_workspace(focused)->rect;
+        Rect newrect = focused->parent->rect;
+
+        DLOG("moving to center\n");
+        newrect.x = wsrect->width/2 - newrect.width/2;
+        newrect.y = wsrect->height/2 - newrect.height/2;
+
+        floating_reposition(focused->parent, newrect);
+    }
+
+    // XXX: default reply for now, make this a better reply
+    ysuccess(true);
 }
 
 /*
@@ -1272,7 +1671,7 @@ void cmd_move_scratchpad(I3_CMD) {
 
     cmd_output->needs_tree_render = true;
     // XXX: default reply for now, make this a better reply
-    cmd_output->json_output = sstrdup("{\"success\": true}");
+    ysuccess(true);
 }
 
 /*
@@ -1294,5 +1693,75 @@ void cmd_scratchpad_show(I3_CMD) {
 
     cmd_output->needs_tree_render = true;
     // XXX: default reply for now, make this a better reply
-    cmd_output->json_output = sstrdup("{\"success\": true}");
+    ysuccess(true);
+}
+
+/*
+ * Implementation of 'rename workspace <name> to <name>'
+ *
+ */
+void cmd_rename_workspace(I3_CMD, char *old_name, char *new_name) {
+    LOG("Renaming workspace \"%s\" to \"%s\"\n", old_name, new_name);
+
+    Con *output, *workspace = NULL;
+    TAILQ_FOREACH(output, &(croot->nodes_head), nodes)
+        GREP_FIRST(workspace, output_get_content(output),
+            !strcasecmp(child->name, old_name));
+
+    if (!workspace) {
+        // TODO: we should include the old workspace name here and use yajl for
+        // generating the reply.
+        y(map_open);
+        ystr("success");
+        y(bool, false);
+        ystr("error");
+        // TODO: better error message
+        ystr("Old workspace not found");
+        y(map_close);
+        return;
+    }
+
+    Con *check_dest = NULL;
+    TAILQ_FOREACH(output, &(croot->nodes_head), nodes)
+        GREP_FIRST(check_dest, output_get_content(output),
+            !strcasecmp(child->name, new_name));
+
+    if (check_dest != NULL) {
+        // TODO: we should include the new workspace name here and use yajl for
+        // generating the reply.
+        y(map_open);
+        ystr("success");
+        y(bool, false);
+        ystr("error");
+        // TODO: better error message
+        ystr("New workspace already exists");
+        y(map_close);
+        return;
+    }
+
+    /* Change the name and try to parse it as a number. */
+    FREE(workspace->name);
+    workspace->name = sstrdup(new_name);
+    char *endptr = NULL;
+    long parsed_num = strtol(new_name, &endptr, 10);
+    if (parsed_num == LONG_MIN ||
+        parsed_num == LONG_MAX ||
+        parsed_num < 0 ||
+        endptr == new_name)
+        workspace->num = -1;
+    else workspace->num = parsed_num;
+    LOG("num = %d\n", workspace->num);
+
+    /* By re-attaching, the sort order will be correct afterwards. */
+    Con *previously_focused = focused;
+    Con *parent = workspace->parent;
+    con_detach(workspace);
+    con_attach(workspace, parent, false);
+    /* Restore the previous focus since con_attach messes with the focus. */
+    con_focus(previously_focused);
+
+    cmd_output->needs_tree_render = true;
+    ysuccess(true);
+
+    ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"rename\"}");
 }