#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
* criteria but which did not match any windows. This macro has to be called in
}
#endif
-void cmd_MIGRATION_start_nagbar() {
+void cmd_MIGRATION_start_nagbar(void) {
if (migration_pid != -1) {
fprintf(stderr, "i3-nagbar already running.\n");
return;
* commands.c for matching target windows of a command.
*
*/
-char *cmd_criteria_init(Match *current_match) {
+void cmd_criteria_init(I3_CMD) {
Con *con;
owindow *ow;
ow->con = con;
TAILQ_INSERT_TAIL(&owindows, ow, owindows);
}
-
- /* This command is internal and does not generate a JSON reply. */
- return NULL;
}
/*
* so we filter the list of owindows.
*
*/
-char *cmd_criteria_match_windows(Match *current_match) {
+void cmd_criteria_match_windows(I3_CMD) {
owindow *next, *current;
DLOG("match specification finished, matching...\n");
TAILQ_FOREACH(current, &owindows, owindows) {
DLOG("matching: %p / %s\n", current->con, current->con->name);
}
-
- /* This command is internal and does not generate a JSON reply. */
- return NULL;
}
/*
* specification.
*
*/
-char *cmd_criteria_add(Match *current_match, char *ctype, char *cvalue) {
+void cmd_criteria_add(I3_CMD, 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;
+ return;
}
if (strcmp(ctype, "instance") == 0) {
current_match->instance = regex_new(cvalue);
- return NULL;
+ return;
}
if (strcmp(ctype, "window_role") == 0) {
current_match->role = regex_new(cvalue);
- return NULL;
+ return;
}
if (strcmp(ctype, "con_id") == 0) {
current_match->con_id = (Con*)parsed;
printf("id as int = %p\n", current_match->con_id);
}
- return NULL;
+ return;
}
if (strcmp(ctype, "id") == 0) {
current_match->id = parsed;
printf("window id as int = %d\n", current_match->id);
}
- return NULL;
+ return;
}
if (strcmp(ctype, "con_mark") == 0) {
current_match->mark = regex_new(cvalue);
- return NULL;
+ return;
}
if (strcmp(ctype, "title") == 0) {
current_match->title = regex_new(cvalue);
- return NULL;
+ return;
}
if (strcmp(ctype, "urgent") == 0) {
strcasecmp(cvalue, "first") == 0) {
current_match->urgent = U_OLDEST;
}
- return NULL;
+ return;
}
ELOG("Unknown criterion: %s\n", ctype);
-
- /* This command is internal and does not generate a JSON reply. */
- return NULL;
}
/*
* next|prev|next_on_output|prev_on_output'.
*
*/
-char *cmd_move_con_to_workspace(Match *current_match, char *which) {
+void cmd_move_con_to_workspace(I3_CMD, char *which) {
owindow *current;
DLOG("which=%s\n", which);
ws = workspace_prev_on_output();
else {
ELOG("BUG: called with which=%s\n", which);
- return sstrdup("{\"sucess\": false}");
+ ysuccess(false);
+ return;
}
TAILQ_FOREACH(current, &owindows, owindows) {
con_move_to_workspace(current->con, ws, true, false);
}
- tree_render();
-
+ cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
* Implementation of 'move [window|container] [to] workspace <name>'.
*
*/
-char *cmd_move_con_to_workspace_name(Match *current_match, char *name) {
+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");
- return 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)
- return sstrdup("{\"sucess\": false}");
+ if (match_is_empty(current_match) && focused->type == CT_WORKSPACE) {
+ ysuccess(false);
+ return;
+ }
LOG("should move window to workspace %s\n", name);
/* get the workspace */
con_move_to_workspace(current->con, ws, true, false);
}
- tree_render();
+ cmd_output->needs_tree_render = true;
+ // XXX: default reply for now, make this a better reply
+ ysuccess(true);
+}
+
+/*
+ * Implementation of 'move [window|container] [to] workspace number <number>'.
+ *
+ */
+void cmd_move_con_to_workspace_number(I3_CMD, char *which) {
+ 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) {
+ ysuccess(false);
+ return;
+ }
+
+ 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;
+
+ 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
- return sstrdup("{\"success\": true}");
+ ysuccess(true);
+}
+
+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 void 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;
+ 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"));
+ ysuccess(false);
+ return;
+ }
+
+ 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");
+ ysuccess(false);
+ return;
+ }
+ 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");
+ }
+}
+
+static void 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 &&
+ current->parent->orientation != 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 = current->parent->orientation;
+
+ 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;
+ }
+
+ if (children == 1) {
+ LOG("This is the only container, cannot resize.\n");
+ ysuccess(false);
+ return;
+ }
+
+ /* 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;
+ }
+ }
+ if (!definitelyGreaterThan(new_current_percent, 0.05, DBL_EPSILON)) {
+ LOG("Not resizing, already at minimum size\n");
+ ysuccess(false);
+ return;
+ }
+
+ 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);
+ }
}
/*
* 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) {
+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
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;
- }
+ cmd_resize_floating(current_match, cmd_output, way, direction, floating_con, 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}");
- }
-
- 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");
- }
+ if (strcmp(direction, "width") == 0 ||
+ strcmp(direction, "height") == 0)
+ cmd_resize_tiling_width_height(current_match, cmd_output, way, direction, ppt);
+ else cmd_resize_tiling_direction(current_match, cmd_output, way, direction, ppt);
}
- tree_render();
-
+ cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
* Implementation of 'border normal|none|1pixel|toggle'.
*
*/
-char *cmd_border(Match *current_match, char *border_style_str) {
+void cmd_border(I3_CMD, char *border_style_str) {
DLOG("border style should be changed to %s\n", border_style_str);
owindow *current;
border_style = BS_1PIXEL;
else {
ELOG("BUG: called with border_style=%s\n", border_style_str);
- return sstrdup("{\"sucess\": false}");
+ ysuccess(false);
+ return;
}
}
con_set_border_style(current->con, border_style);
}
- tree_render();
-
+ cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
* Implementation of 'nop <comment>'.
*
*/
-char *cmd_nop(Match *current_match, char *comment) {
+void cmd_nop(I3_CMD, char *comment) {
LOG("-------------------------------------------------\n");
LOG(" NOP: %s\n", comment);
LOG("-------------------------------------------------\n");
-
- return NULL;
}
/*
* Implementation of 'append_layout <path>'.
*
*/
-char *cmd_append_layout(Match *current_match, char *path) {
+void cmd_append_layout(I3_CMD, char *path) {
LOG("Appending layout \"%s\"\n", path);
tree_append_json(path);
- tree_render();
+ cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
* Implementation of 'workspace next|prev|next_on_output|prev_on_output'.
*
*/
-char *cmd_workspace(Match *current_match, char *which) {
+void cmd_workspace(I3_CMD, char *which) {
Con *ws;
DLOG("which=%s\n", which);
ws = workspace_prev_on_output();
else {
ELOG("BUG: called with which=%s\n", which);
- return sstrdup("{\"sucess\": false}");
+ ysuccess(false);
+ return;
}
workspace_show(ws);
- tree_render();
+ cmd_output->needs_tree_render = true;
+ // XXX: default reply for now, make this a better reply
+ 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.\n", parsed_num);
+ y(map_open);
+ ystr("success");
+ y(bool, false);
+ ystr("error");
+ ystr("No such workspace");
+ y(map_close);
+ return;
+ }
+
+ workspace_show(workspace);
+
+ cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
* Implementation of 'workspace back_and_forth'.
*
*/
-char *cmd_workspace_back_and_forth(Match *current_match) {
+void cmd_workspace_back_and_forth(I3_CMD) {
workspace_back_and_forth();
- tree_render();
+ cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
* Implementation of 'workspace <name>'
*
*/
-char *cmd_workspace_name(Match *current_match, char *name) {
+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");
- return sstrdup("{\"sucess\": false}");
+ ysuccess(false);
+ return;
}
DLOG("should switch to workspace %s\n", name);
workspace_back_and_forth();
tree_render();
}
- return sstrdup("{\"sucess\": false}");
+ ysuccess(false);
+ return;
}
workspace_show_by_name(name);
- tree_render();
-
+ cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
* Implementation of 'mark <mark>'
*
*/
-char *cmd_mark(Match *current_match, char *mark) {
+void cmd_mark(I3_CMD, char *mark) {
DLOG("Clearing all windows which have that mark first\n");
Con *con;
current->con->mark = sstrdup(mark);
}
- tree_render();
-
+ cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
* Implementation of 'mode <string>'.
*
*/
-char *cmd_mode(Match *current_match, char *mode) {
+void cmd_mode(I3_CMD, char *mode) {
DLOG("mode=%s\n", mode);
switch_mode(mode);
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
* Implementation of 'move [window|container] [to] output <str>'.
*
*/
-char *cmd_move_con_to_output(Match *current_match, char *name) {
+void cmd_move_con_to_output(I3_CMD, char *name) {
owindow *current;
DLOG("should move window to output %s\n", name);
if (!output) {
LOG("No such output found.\n");
- return sstrdup("{\"sucess\": false}");
+ ysuccess(false);
+ return;
}
/* 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}");
+ if (!ws) {
+ ysuccess(false);
+ 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);
}
- tree_render();
-
+ cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
* Implementation of 'floating enable|disable|toggle'
*
*/
-char *cmd_floating(Match *current_match, char *floating_mode) {
+void cmd_floating(I3_CMD, char *floating_mode) {
owindow *current;
DLOG("floating_mode=%s\n", floating_mode);
}
}
- tree_render();
-
+ cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
* Implementation of 'move workspace to [output] <str>'.
*
*/
-char *cmd_move_workspace_to_output(Match *current_match, char *name) {
+void cmd_move_workspace_to_output(I3_CMD, char *name) {
DLOG("should move workspace to output %s\n", name);
HANDLE_EMPTY_MATCH;
Output *output = get_output_from_string(current_output, name);
if (!output) {
LOG("No such output\n");
- return sstrdup("{\"sucess\": false}");
+ ysuccess(false);
+ return;
}
Con *content = output_get_content(output->con);
Con *ws = con_get_workspace(current->con);
LOG("should move workspace %p / %s\n", ws, ws->name);
+
if (con_num_children(ws->parent) == 1) {
- LOG("Not moving workspace \"%s\", it is the only workspace on its output.\n", ws->name);
- continue;
+ LOG("Creating a new workspace to replace \"%s\" (last on its output).\n", ws->name);
+
+ /* check if we can find a workspace assigned to this output */
+ bool used_assignment = false;
+ struct Workspace_Assignment *assignment;
+ TAILQ_FOREACH(assignment, &ws_assignments, ws_assignments) {
+ if (strcmp(assignment->output, current_output->name) != 0)
+ continue;
+
+ /* check if this workspace is already attached to the tree */
+ Con *workspace = NULL, *out;
+ TAILQ_FOREACH(out, &(croot->nodes_head), nodes)
+ GREP_FIRST(workspace, output_get_content(out),
+ !strcasecmp(child->name, assignment->name));
+ if (workspace != NULL)
+ continue;
+
+ /* so create the workspace referenced to by this assignment */
+ LOG("Creating workspace from assignment %s.\n", assignment->name);
+ workspace_get(assignment->name, NULL);
+ used_assignment = true;
+ break;
+ }
+
+ /* if we couldn't create the workspace using an assignment, create
+ * it on the output */
+ if (!used_assignment)
+ create_workspace_on_output(current_output, ws->parent);
+
+ /* notify the IPC listeners */
+ ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"init\"}");
}
+
+ /* detach from the old output and attach to the new output */
bool workspace_was_visible = workspace_is_visible(ws);
Con *old_content = ws->parent;
con_detach(ws);
workspace_show(focus_ws);
}
con_attach(ws, content, false);
+
+ /* fix the coordinates of the floating containers */
+ Con *floating_con;
+ TAILQ_FOREACH(floating_con, &(ws->floating_head), floating_windows)
+ floating_fix_coordinates(floating_con, &(old_content->rect), &(content->rect));
+
ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"move\"}");
if (workspace_was_visible) {
/* Focus the moved workspace on the destination output. */
}
}
- tree_render();
-
+ cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
* Implementation of 'split v|h|vertical|horizontal'.
*
*/
-char *cmd_split(Match *current_match, char *direction) {
+void cmd_split(I3_CMD, char *direction) {
/* TODO: use matches */
LOG("splitting in direction %c\n", direction[0]);
tree_split(focused, (direction[0] == 'v' ? VERT : HORIZ));
- tree_render();
-
+ cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
* Implementaiton of 'kill [window|client]'.
*
*/
-char *cmd_kill(Match *current_match, char *kill_mode_str) {
+void cmd_kill(I3_CMD, char *kill_mode_str) {
if (kill_mode_str == NULL)
kill_mode_str = "window";
owindow *current;
kill_mode = KILL_CLIENT;
else {
ELOG("BUG: called with kill_mode=%s\n", kill_mode_str);
- return sstrdup("{\"sucess\": false}");
+ ysuccess(false);
+ return;
}
/* check if the match is empty, not if the result is empty */
}
}
- tree_render();
-
+ cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
* Implementation of 'exec [--no-startup-id] <command>'.
*
*/
-char *cmd_exec(Match *current_match, char *nosn, char *command) {
+void cmd_exec(I3_CMD, char *nosn, char *command) {
bool no_startup_id = (nosn != NULL);
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}");
+ ysuccess(true);
}
/*
* Implementation of 'focus left|right|up|down'.
*
*/
-char *cmd_focus_direction(Match *current_match, char *direction) {
+void cmd_focus_direction(I3_CMD, 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}");
+ ysuccess(false);
+ return;
}
DLOG("direction = *%s*\n", direction);
tree_next('n', VERT);
else {
ELOG("Invalid focus direction (%s)\n", direction);
- return sstrdup("{\"sucess\": false}");
+ ysuccess(false);
+ return;
}
- tree_render();
-
+ cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
* Implementation of 'focus tiling|floating|mode_toggle'.
*
*/
-char *cmd_focus_window_mode(Match *current_match, char *window_mode) {
+void cmd_focus_window_mode(I3_CMD, 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}");
+ ysuccess(false);
+ return;
}
DLOG("window_mode = %s\n", window_mode);
}
}
- tree_render();
-
+ cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
* Implementation of 'focus parent|child'.
*
*/
-char *cmd_focus_level(Match *current_match, char *level) {
+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");
- return sstrdup("{\"sucess\": false}");
+ ysuccess(false);
+ return;
}
DLOG("level = %s\n", level);
level_up();
else level_down();
- tree_render();
-
+ cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
* Implementation of 'focus'.
*
*/
-char *cmd_focus(Match *current_match) {
+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");
- return sstrdup("{\"sucess\": false}");
+ ysuccess(false);
+ return;
}
owindow *current;
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;
+ 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;
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();
-
+ cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
* Implementation of 'fullscreen [global]'.
*
*/
-char *cmd_fullscreen(Match *current_match, char *fullscreen_mode) {
+void cmd_fullscreen(I3_CMD, char *fullscreen_mode) {
if (fullscreen_mode == NULL)
fullscreen_mode = "output";
DLOG("toggling fullscreen, mode = %s\n", fullscreen_mode);
con_toggle_fullscreen(current->con, (strcmp(fullscreen_mode, "global") == 0 ? CF_GLOBAL : CF_OUTPUT));
}
- tree_render();
-
+ cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
* Implementation of 'move <direction> [<pixels> [px]]'.
*
*/
-char *cmd_move_direction(Match *current_match, char *direction, char *move_px) {
+void cmd_move_direction(I3_CMD, 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);
(strcmp(direction, "left") == 0 ? D_LEFT :
(strcmp(direction, "up") == 0 ? D_UP :
D_DOWN))));
- tree_render();
+ cmd_output->needs_tree_render = true;
}
-
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
* Implementation of 'layout default|stacked|stacking|tabbed'.
*
*/
-char *cmd_layout(Match *current_match, char *layout_str) {
+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);
}
}
- tree_render();
-
+ cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
* Implementaiton of 'exit'.
*
*/
-char *cmd_exit(Match *current_match) {
+void cmd_exit(I3_CMD) {
LOG("Exiting due to user command.\n");
exit(0);
* Implementaiton of 'reload'.
*
*/
-char *cmd_reload(Match *current_match) {
+void cmd_reload(I3_CMD) {
LOG("reloading\n");
kill_configerror_nagbar(false);
load_configuration(conn, NULL, true);
ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"reload\"}");
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
* Implementaiton of 'restart'.
*
*/
-char *cmd_restart(Match *current_match) {
+void cmd_restart(I3_CMD) {
LOG("restarting i3\n");
i3_restart(false);
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
* Implementaiton of 'open'.
*
*/
-char *cmd_open(Match *current_match) {
+void cmd_open(I3_CMD) {
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();
+ y(map_open);
+ ystr("success");
+ y(bool, true);
+ ystr("id");
+ y(integer, (long int)con);
+ y(map_close);
- return json_output;
+ cmd_output->needs_tree_render = true;
}
/*
* Implementation of 'focus output <output>'.
*
*/
-char *cmd_focus_output(Match *current_match, char *name) {
+void cmd_focus_output(I3_CMD, char *name) {
owindow *current;
DLOG("name = %s\n", name);
if (!output) {
LOG("No such output found.\n");
- return sstrdup("{\"sucess\": false}");
+ ysuccess(false);
+ return;
}
/* 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}");
+ if (!ws) {
+ ysuccess(false);
+ return;
+ }
workspace_show(ws);
- tree_render();
+
+ cmd_output->needs_tree_render = true;
+ // XXX: default reply for now, make this a better reply
+ 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
- return sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
* Implementation of 'move scratchpad'.
*
*/
-char *cmd_move_scratchpad(Match *current_match) {
+void cmd_move_scratchpad(I3_CMD) {
DLOG("should move window to scratchpad\n");
owindow *current;
scratchpad_move(current->con);
}
- tree_render();
-
+ cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
* Implementation of 'scratchpad show'.
*
*/
-char *cmd_scratchpad_show(Match *current_match) {
+void cmd_scratchpad_show(I3_CMD) {
DLOG("should show scratchpad window\n");
owindow *current;
}
}
- tree_render();
-
+ cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- return 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\"}");
}