* 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 also: LICENSE)
*
* commands.c: all command functions (see commands_parser.c)
*
y(map_close); \
} \
} while (0)
-#define yerror(message) \
- do { \
- if (cmd_output->json_gen != NULL) { \
- y(map_open); \
- ystr("success"); \
- y(bool, false); \
- ystr("error"); \
- ystr(message); \
- y(map_close); \
- } \
+#define yerror(format, ...) \
+ do { \
+ if (cmd_output->json_gen != NULL) { \
+ char *message; \
+ sasprintf(&message, format, ##__VA_ARGS__); \
+ y(map_open); \
+ ystr("success"); \
+ y(bool, false); \
+ ystr("error"); \
+ ystr(message); \
+ y(map_close); \
+ free(message); \
+ } \
} while (0)
/** When the command did not include match criteria (!), we use the currently
return (a - b) > ((fabs(a) < fabs(b) ? fabs(b) : fabs(a)) * epsilon);
}
-/*
- * Returns an 'output' corresponding to one of left/right/down/up or a specific
- * output name.
- *
- */
-static Output *get_output_from_string(Output *current_output, const char *output_str) {
- Output *output;
-
- if (strcasecmp(output_str, "left") == 0)
- output = get_output_next_wrap(D_LEFT, current_output);
- else if (strcasecmp(output_str, "right") == 0)
- output = get_output_next_wrap(D_RIGHT, current_output);
- else if (strcasecmp(output_str, "up") == 0)
- output = get_output_next_wrap(D_UP, current_output);
- else if (strcasecmp(output_str, "down") == 0)
- output = get_output_next_wrap(D_DOWN, current_output);
- else
- output = get_output_by_name(output_str);
-
- return output;
-}
-
/*
* Returns the output containing the given container.
*/
* and return true, signaling that no further workspace switching should occur in the calling function.
*
*/
-static bool maybe_back_and_forth(struct CommandResultIR *cmd_output, char *name) {
+static bool maybe_back_and_forth(struct CommandResultIR *cmd_output, const char *name) {
Con *ws = con_get_workspace(focused);
/* If we switched to a different workspace, do nothing */
DLOG("doesnt match\n");
free(current);
}
- } 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 if (current_match->mark != NULL && !TAILQ_EMPTY(&(current->con->marks_head))) {
+ mark_t *mark;
+ TAILQ_FOREACH(mark, &(current->con->marks_head), marks) {
+ if (!regex_matches(current_match->mark, mark->name))
+ continue;
+
+ DLOG("match by mark\n");
+ TAILQ_INSERT_TAIL(&owindows, current, owindows);
+ break;
+ }
} else {
if (current->con->window && match_matches_window(current_match, current->con->window)) {
DLOG("matches window!\n");
* specification.
*
*/
-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;
- }
-
- if (strcmp(ctype, "instance") == 0) {
- current_match->instance = regex_new(cvalue);
- return;
- }
-
- if (strcmp(ctype, "window_role") == 0) {
- current_match->window_role = regex_new(cvalue);
- return;
- }
-
- 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;
- DLOG("id as int = %p\n", current_match->con_id);
- }
- return;
- }
-
- 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;
- DLOG("window id as int = %d\n", current_match->id);
- }
- return;
- }
-
- if (strcmp(ctype, "con_mark") == 0) {
- current_match->mark = regex_new(cvalue);
- return;
- }
-
- if (strcmp(ctype, "title") == 0) {
- current_match->title = regex_new(cvalue);
- return;
- }
-
- 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;
- }
-
- ELOG("Unknown criterion: %s\n", ctype);
+void cmd_criteria_add(I3_CMD, const char *ctype, const char *cvalue) {
+ match_parse_property(current_match, ctype, cvalue);
}
/*
* next|prev|next_on_output|prev_on_output|current'.
*
*/
-void cmd_move_con_to_workspace(I3_CMD, char *which) {
+void cmd_move_con_to_workspace(I3_CMD, const char *which) {
owindow *current;
DLOG("which=%s\n", which);
TAILQ_FOREACH(current, &owindows, owindows) {
DLOG("matching: %p / %s\n", current->con, current->con->name);
- con_move_to_workspace(current->con, ws, true, false);
+ con_move_to_workspace(current->con, ws, true, false, false);
}
cmd_output->needs_tree_render = true;
TAILQ_FOREACH(current, &owindows, owindows) {
DLOG("matching: %p / %s\n", current->con, current->con->name);
- con_move_to_workspace(current->con, ws, true, false);
+ con_move_to_workspace(current->con, ws, true, false, false);
}
cmd_output->needs_tree_render = true;
}
/*
- * Implementation of 'move [window|container] [to] workspace <name>'.
+ * Implementation of 'move [--no-auto-back-and-forth] [window|container] [to] workspace <name>'.
*
*/
-void cmd_move_con_to_workspace_name(I3_CMD, char *name) {
+void cmd_move_con_to_workspace_name(I3_CMD, const char *name, const char *_no_auto_back_and_forth) {
if (strncasecmp(name, "__", strlen("__")) == 0) {
LOG("You cannot move containers to i3-internal workspaces (\"%s\").\n", name);
ysuccess(false);
return;
}
+ const bool no_auto_back_and_forth = (_no_auto_back_and_forth != NULL);
owindow *current;
/* We have nothing to move:
LOG("should move window to workspace %s\n", name);
/* get the workspace */
- Con *ws = NULL;
- Con *output = NULL;
-
- /* first look for a workspace with this name */
- TAILQ_FOREACH(output, &(croot->nodes_head), nodes) {
- GREP_FIRST(ws, output_get_content(output), !strcasecmp(child->name, name));
- }
-
- /* if the name is plain digits, we interpret this as a "workspace number"
- * command */
- if (!ws && name_is_digits(name)) {
- long parsed_num = ws_name_to_number(name);
- TAILQ_FOREACH(output, &(croot->nodes_head), nodes) {
- GREP_FIRST(ws, output_get_content(output),
- child->num == parsed_num);
- }
- }
-
- /* if no workspace was found, make a new one */
- if (!ws)
- ws = workspace_get(name, NULL);
+ Con *ws = workspace_get(name, NULL);
- ws = maybe_auto_back_and_forth_workspace(ws);
+ if (!no_auto_back_and_forth)
+ ws = maybe_auto_back_and_forth_workspace(ws);
HANDLE_EMPTY_MATCH;
TAILQ_FOREACH(current, &owindows, owindows) {
DLOG("matching: %p / %s\n", current->con, current->con->name);
- con_move_to_workspace(current->con, ws, true, false);
+ con_move_to_workspace(current->con, ws, true, false, false);
}
cmd_output->needs_tree_render = true;
}
/*
- * Implementation of 'move [window|container] [to] workspace number <name>'.
+ * Implementation of 'move [--no-auto-back-and-forth] [window|container] [to] workspace number <name>'.
*
*/
-void cmd_move_con_to_workspace_number(I3_CMD, char *which) {
+void cmd_move_con_to_workspace_number(I3_CMD, const char *which, const char *_no_auto_back_and_forth) {
+ const bool no_auto_back_and_forth = (_no_auto_back_and_forth != NULL);
owindow *current;
/* We have nothing to move:
if (parsed_num == -1) {
LOG("Could not parse initial part of \"%s\" as a number.\n", which);
- // TODO: better error message
- yerror("Could not parse number");
+ yerror("Could not parse number \"%s\"", which);
return;
}
workspace = workspace_get(which, NULL);
}
- workspace = maybe_auto_back_and_forth_workspace(workspace);
+ if (!no_auto_back_and_forth)
+ workspace = maybe_auto_back_and_forth_workspace(workspace);
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);
+ con_move_to_workspace(current->con, workspace, true, false, false);
}
cmd_output->needs_tree_render = true;
ysuccess(true);
}
-static void cmd_resize_floating(I3_CMD, char *way, char *direction, Con *floating_con, int px) {
+static void cmd_resize_floating(I3_CMD, const char *way, const char *direction, Con *floating_con, int px) {
LOG("floating resize\n");
Rect old_rect = floating_con->rect;
Con *focused_con = con_descend_focused(floating_con);
/* ensure that resize will take place even if pixel increment is smaller than
* height increment or width increment.
* fixes #1011 */
- if (strcmp(direction, "up") == 0 || strcmp(direction, "down") == 0 ||
- strcmp(direction, "height") == 0) {
- if (px < 0)
- px = (-px < focused_con->height_increment) ? -focused_con->height_increment : px;
- else
- px = (px < focused_con->height_increment) ? focused_con->height_increment : px;
- } else if (strcmp(direction, "left") == 0 || strcmp(direction, "right") == 0) {
- if (px < 0)
- px = (-px < focused_con->width_increment) ? -focused_con->width_increment : px;
- else
- px = (px < focused_con->width_increment) ? focused_con->width_increment : px;
+ const i3Window *window = focused_con->window;
+ if (window != NULL) {
+ if (strcmp(direction, "up") == 0 || strcmp(direction, "down") == 0 ||
+ strcmp(direction, "height") == 0) {
+ if (px < 0)
+ px = (-px < window->height_increment) ? -window->height_increment : px;
+ else
+ px = (px < window->height_increment) ? window->height_increment : px;
+ } else if (strcmp(direction, "left") == 0 || strcmp(direction, "right") == 0) {
+ if (px < 0)
+ px = (-px < window->width_increment) ? -window->width_increment : px;
+ else
+ px = (px < window->width_increment) ? window->width_increment : px;
+ }
}
if (strcmp(direction, "up") == 0) {
floating_con->scratchpad_state = SCRATCHPAD_CHANGED;
}
-static bool cmd_resize_tiling_direction(I3_CMD, Con *current, char *way, char *direction, int ppt) {
+static bool cmd_resize_tiling_direction(I3_CMD, Con *current, const char *way, const char *direction, int ppt) {
LOG("tiling resize\n");
Con *second = NULL;
Con *first = current;
return true;
}
-static bool cmd_resize_tiling_width_height(I3_CMD, Con *current, char *way, char *direction, int ppt) {
+static bool cmd_resize_tiling_width_height(I3_CMD, Con *current, const char *way, const char *direction, int ppt) {
LOG("width/height resize\n");
/* get the appropriate current container (skip stacked/tabbed cons) */
while (current->parent->layout == L_STACKED ||
while (current->type != CT_WORKSPACE &&
current->type != CT_FLOATING_CON &&
- con_orientation(current->parent) != search_orientation)
+ (con_orientation(current->parent) != search_orientation || con_num_children(current->parent) == 1))
current = current->parent;
/* get the default percentage */
* 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);
+void cmd_resize(I3_CMD, const char *way, const char *direction, long resize_px, long resize_ppt) {
+ DLOG("resizing in way %s, direction %s, px %ld or ppt %ld\n", way, direction, resize_px, resize_ppt);
if (strcmp(way, "shrink") == 0) {
- px *= -1;
- ppt *= -1;
+ resize_px *= -1;
+ resize_ppt *= -1;
}
HANDLE_EMPTY_MATCH;
Con *floating_con;
if ((floating_con = con_inside_floating(current->con))) {
- cmd_resize_floating(current_match, cmd_output, way, direction, floating_con, px);
+ cmd_resize_floating(current_match, cmd_output, way, direction, floating_con, resize_px);
} else {
if (strcmp(direction, "width") == 0 ||
strcmp(direction, "height") == 0) {
- if (!cmd_resize_tiling_width_height(current_match, cmd_output, current->con, way, direction, ppt))
+ if (!cmd_resize_tiling_width_height(current_match, cmd_output,
+ current->con, way, direction, resize_ppt))
return;
} else {
- if (!cmd_resize_tiling_direction(current_match, cmd_output, current->con, way, direction, ppt))
+ if (!cmd_resize_tiling_direction(current_match, cmd_output,
+ current->con, way, direction, resize_ppt))
return;
}
}
}
/*
- * Implementation of 'border normal|none|1pixel|toggle|pixel'.
+ * Implementation of 'resize set <px> [px] <px> [px]'.
*
*/
-void cmd_border(I3_CMD, char *border_style_str, char *border_width) {
+void cmd_resize_set(I3_CMD, long cwidth, long cheight) {
+ DLOG("resizing to %ldx%ld px\n", cwidth, cheight);
+ if (cwidth <= 0 || cheight <= 0) {
+ ELOG("Resize failed: dimensions cannot be negative (was %ldx%ld)\n", cwidth, cheight);
+ return;
+ }
+
+ HANDLE_EMPTY_MATCH;
+
+ owindow *current;
+ TAILQ_FOREACH(current, &owindows, owindows) {
+ Con *floating_con;
+ if ((floating_con = con_inside_floating(current->con))) {
+ floating_resize(floating_con, cwidth, cheight);
+ } else {
+ ELOG("Resize failed: %p not a floating container\n", current->con);
+ }
+ }
+
+ cmd_output->needs_tree_render = true;
+ // XXX: default reply for now, make this a better reply
+ ysuccess(true);
+}
+
+/*
+ * Implementation of 'border normal|pixel [<n>]', 'border none|1pixel|toggle'.
+ *
+ */
+void cmd_border(I3_CMD, const char *border_style_str, const char *border_width) {
DLOG("border style should be changed to %s with border width %s\n", border_style_str, border_width);
owindow *current;
* Implementation of 'nop <comment>'.
*
*/
-void cmd_nop(I3_CMD, char *comment) {
+void cmd_nop(I3_CMD, const char *comment) {
LOG("-------------------------------------------------\n");
LOG(" NOP: %s\n", comment);
LOG("-------------------------------------------------\n");
* Implementation of 'append_layout <path>'.
*
*/
-void cmd_append_layout(I3_CMD, char *path) {
+void cmd_append_layout(I3_CMD, const char *cpath) {
+ char *path = sstrdup(cpath);
LOG("Appending layout \"%s\"\n", path);
+
+ /* Make sure we allow paths like '~/.i3/layout.json' */
+ path = resolve_tilde(path);
+
+ json_content_t content = json_determine_content(path);
+ LOG("JSON content = %d\n", content);
+ if (content == JSON_CONTENT_UNKNOWN) {
+ ELOG("Could not determine the contents of \"%s\", not loading.\n", path);
+ yerror("Could not determine the contents of \"%s\".", path);
+ free(path);
+ return;
+ }
+
Con *parent = focused;
- /* We need to append the layout to a split container, since a leaf
- * container must not have any children (by definition).
- * Note that we explicitly check for workspaces, since they are okay for
- * this purpose, but con_accepts_window() returns false for workspaces. */
- while (parent->type != CT_WORKSPACE && !con_accepts_window(parent))
- parent = parent->parent;
- DLOG("Appending to parent=%p instead of focused=%p\n",
- parent, focused);
+ if (content == JSON_CONTENT_WORKSPACE) {
+ parent = output_get_content(con_get_output(parent));
+ } else {
+ /* We need to append the layout to a split container, since a leaf
+ * container must not have any children (by definition).
+ * Note that we explicitly check for workspaces, since they are okay for
+ * this purpose, but con_accepts_window() returns false for workspaces. */
+ while (parent->type != CT_WORKSPACE && !con_accepts_window(parent))
+ parent = parent->parent;
+ }
+ DLOG("Appending to parent=%p instead of focused=%p\n", parent, focused);
char *errormsg = NULL;
tree_append_json(parent, path, &errormsg);
if (errormsg != NULL) {
restore_open_placeholder_windows(parent);
+ if (content == JSON_CONTENT_WORKSPACE)
+ ipc_send_workspace_event("restored", parent, NULL);
+
+ free(path);
cmd_output->needs_tree_render = true;
}
* Implementation of 'workspace next|prev|next_on_output|prev_on_output'.
*
*/
-void cmd_workspace(I3_CMD, char *which) {
+void cmd_workspace(I3_CMD, const char *which) {
Con *ws;
DLOG("which=%s\n", which);
+ if (con_get_fullscreen_con(croot, CF_GLOBAL)) {
+ LOG("Cannot switch workspace while in global fullscreen\n");
+ ysuccess(false);
+ return;
+ }
+
if (strcmp(which, "next") == 0)
ws = workspace_next();
else if (strcmp(which, "prev") == 0)
}
/*
- * Implementation of 'workspace number <name>'
+ * Implementation of 'workspace [--no-auto-back-and-forth] number <name>'
*
*/
-void cmd_workspace_number(I3_CMD, char *which) {
+void cmd_workspace_number(I3_CMD, const char *which, const char *_no_auto_back_and_forth) {
+ const bool no_auto_back_and_forth = (_no_auto_back_and_forth != NULL);
Con *output, *workspace = NULL;
+ if (con_get_fullscreen_con(croot, CF_GLOBAL)) {
+ LOG("Cannot switch workspace while in global fullscreen\n");
+ ysuccess(false);
+ return;
+ }
+
long parsed_num = ws_name_to_number(which);
if (parsed_num == -1) {
LOG("Could not parse initial part of \"%s\" as a number.\n", which);
- // TODO: better error message
- yerror("Could not parse number");
+ yerror("Could not parse number \"%s\"", which);
return;
}
cmd_output->needs_tree_render = true;
return;
}
- if (maybe_back_and_forth(cmd_output, workspace->name))
+ if (!no_auto_back_and_forth && maybe_back_and_forth(cmd_output, workspace->name))
return;
workspace_show(workspace);
*
*/
void cmd_workspace_back_and_forth(I3_CMD) {
+ if (con_get_fullscreen_con(croot, CF_GLOBAL)) {
+ LOG("Cannot switch workspace while in global fullscreen\n");
+ ysuccess(false);
+ return;
+ }
+
workspace_back_and_forth();
cmd_output->needs_tree_render = true;
}
/*
- * Implementation of 'workspace <name>'
+ * Implementation of 'workspace [--no-auto-back-and-forth] <name>'
*
*/
-void cmd_workspace_name(I3_CMD, char *name) {
+void cmd_workspace_name(I3_CMD, const char *name, const char *_no_auto_back_and_forth) {
+ const bool no_auto_back_and_forth = (_no_auto_back_and_forth != NULL);
+
if (strncasecmp(name, "__", strlen("__")) == 0) {
LOG("You cannot switch to the i3-internal workspaces (\"%s\").\n", name);
ysuccess(false);
return;
}
- DLOG("should switch to workspace %s\n", name);
- if (maybe_back_and_forth(cmd_output, name))
+ if (con_get_fullscreen_con(croot, CF_GLOBAL)) {
+ LOG("Cannot switch workspace while in global fullscreen\n");
+ ysuccess(false);
return;
-
- Con *ws = NULL;
- Con *output = NULL;
-
- /* first look for a workspace with this name */
- TAILQ_FOREACH(output, &(croot->nodes_head), nodes) {
- GREP_FIRST(ws, output_get_content(output), !strcasecmp(child->name, name));
- }
-
- /* if the name is only digits, we interpret this as a "workspace number"
- * command */
- if (!ws && name_is_digits(name)) {
- long parsed_num = ws_name_to_number(name);
- TAILQ_FOREACH(output, &(croot->nodes_head), nodes) {
- GREP_FIRST(ws, output_get_content(output),
- child->num == parsed_num);
- }
}
- /* if no workspace was found, make a new one */
- if (!ws)
- ws = workspace_get(name, NULL);
-
- workspace_show(ws);
+ DLOG("should switch to workspace %s\n", name);
+ if (!no_auto_back_and_forth && 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
}
/*
- * Implementation of 'mark <mark>'
+ * Implementation of 'mark [--add|--replace] [--toggle] <mark>'
*
*/
-void cmd_mark(I3_CMD, char *mark) {
- DLOG("Clearing all windows which have that mark first\n");
+void cmd_mark(I3_CMD, const char *mark, const char *mode, const char *toggle) {
+ HANDLE_EMPTY_MATCH;
- Con *con;
- TAILQ_FOREACH(con, &all_cons, all_cons) {
- if (con->mark && strcmp(con->mark, mark) == 0)
- FREE(con->mark);
+ owindow *current = TAILQ_FIRST(&owindows);
+ if (current == NULL) {
+ ysuccess(false);
+ return;
}
- DLOG("marking window with str %s\n", mark);
- owindow *current;
+ /* Marks must be unique, i.e., no two windows must have the same mark. */
+ if (current != TAILQ_LAST(&owindows, owindows_head)) {
+ yerror("A mark must not be put onto more than one window");
+ return;
+ }
- HANDLE_EMPTY_MATCH;
+ DLOG("matching: %p / %s\n", current->con, current->con->name);
- TAILQ_FOREACH(current, &owindows, owindows) {
- DLOG("matching: %p / %s\n", current->con, current->con->name);
- current->con->mark = sstrdup(mark);
+ mark_mode_t mark_mode = (mode == NULL || strcmp(mode, "--replace") == 0) ? MM_REPLACE : MM_ADD;
+ if (toggle != NULL) {
+ con_mark_toggle(current->con, mark, mark_mode);
+ } else {
+ con_mark(current->con, mark, mark_mode);
}
cmd_output->needs_tree_render = true;
* Implementation of 'unmark [mark]'
*
*/
-void cmd_unmark(I3_CMD, char *mark) {
- if (mark == NULL) {
- Con *con;
- TAILQ_FOREACH(con, &all_cons, all_cons) {
- FREE(con->mark);
- }
- DLOG("removed all window marks");
+void cmd_unmark(I3_CMD, const char *mark) {
+ if (match_is_empty(current_match)) {
+ con_unmark(NULL, mark);
} else {
- Con *con;
- TAILQ_FOREACH(con, &all_cons, all_cons) {
- if (con->mark && strcmp(con->mark, mark) == 0)
- FREE(con->mark);
+ owindow *current;
+ TAILQ_FOREACH(current, &owindows, owindows) {
+ con_unmark(current->con, mark);
}
- DLOG("removed window mark %s\n", mark);
}
cmd_output->needs_tree_render = true;
* Implementation of 'mode <string>'.
*
*/
-void cmd_mode(I3_CMD, char *mode) {
+void cmd_mode(I3_CMD, const char *mode) {
DLOG("mode=%s\n", mode);
switch_mode(mode);
* Implementation of 'move [window|container] [to] output <str>'.
*
*/
-void cmd_move_con_to_output(I3_CMD, char *name) {
- owindow *current;
-
- DLOG("should move window to output %s\n", name);
-
+void cmd_move_con_to_output(I3_CMD, const char *name) {
+ DLOG("Should move window to output \"%s\".\n", name);
HANDLE_EMPTY_MATCH;
- /* get the output */
- Output *current_output = NULL;
- Output *output;
+ owindow *current;
+ bool had_error = false;
+ TAILQ_FOREACH(current, &owindows, owindows) {
+ DLOG("matching: %p / %s\n", current->con, current->con->name);
- // TODO: fix the handling of criteria
- TAILQ_FOREACH(current, &owindows, owindows)
- current_output = get_output_of_con(current->con);
+ Output *current_output = get_output_of_con(current->con);
+ assert(current_output != NULL);
- assert(current_output != NULL);
+ Output *output = get_output_from_string(current_output, name);
+ if (output == NULL) {
+ ELOG("Could not find output \"%s\", skipping.\n", name);
+ had_error = true;
+ continue;
+ }
- // 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_wrap(D_UP, current_output);
- else if (strcasecmp(name, "down") == 0)
- output = get_output_next_wrap(D_DOWN, current_output);
- else if (strcasecmp(name, "left") == 0)
- output = get_output_next_wrap(D_LEFT, current_output);
- else if (strcasecmp(name, "right") == 0)
- output = get_output_next_wrap(D_RIGHT, current_output);
- else
- output = get_output_by_name(name);
+ Con *ws = NULL;
+ GREP_FIRST(ws, output_get_content(output->con), workspace_is_visible(child));
+ if (ws == NULL) {
+ ELOG("Could not find a visible workspace on output %p.\n", output);
+ had_error = true;
+ continue;
+ }
- if (!output) {
- LOG("No such output found.\n");
- ysuccess(false);
- return;
+ con_move_to_workspace(current->con, ws, true, false, false);
}
- /* get visible workspace on output */
- Con *ws = NULL;
- GREP_FIRST(ws, output_get_content(output->con), workspace_is_visible(child));
- if (!ws) {
- ysuccess(false);
- return;
- }
+ cmd_output->needs_tree_render = true;
+ ysuccess(!had_error);
+}
+/*
+ * Implementation of 'move [container|window] [to] mark <str>'.
+ *
+ */
+void cmd_move_con_to_mark(I3_CMD, const char *mark) {
+ DLOG("moving window to mark \"%s\"\n", mark);
+
+ HANDLE_EMPTY_MATCH;
+
+ bool result = true;
+ owindow *current;
TAILQ_FOREACH(current, &owindows, owindows) {
- DLOG("matching: %p / %s\n", current->con, current->con->name);
- con_move_to_workspace(current->con, ws, true, false);
+ DLOG("moving matched window %p / %s to mark \"%s\"\n", current->con, current->con->name, mark);
+ result &= con_move_to_mark(current->con, mark);
}
cmd_output->needs_tree_render = true;
- // XXX: default reply for now, make this a better reply
- ysuccess(true);
+ ysuccess(result);
}
/*
* Implementation of 'floating enable|disable|toggle'
*
*/
-void cmd_floating(I3_CMD, char *floating_mode) {
+void cmd_floating(I3_CMD, const char *floating_mode) {
owindow *current;
DLOG("floating_mode=%s\n", floating_mode);
* Implementation of 'move workspace to [output] <str>'.
*
*/
-void cmd_move_workspace_to_output(I3_CMD, char *name) {
+void cmd_move_workspace_to_output(I3_CMD, const 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_of_con(current->con);
- 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) {
- ELOG("Could not get output from string \"%s\"\n", name);
+ Con *ws = con_get_workspace(current->con);
+ bool success = workspace_move_to_output(ws, name);
+ if (!success) {
+ ELOG("Failed to move workspace to output.\n");
ysuccess(false);
return;
}
-
- Con *content = output_get_content(output->con);
- LOG("got output %p with content %p\n", output, content);
-
- Con *previously_visible_ws = TAILQ_FIRST(&(content->nodes_head));
- LOG("Previously visible workspace = %p / %s\n", previously_visible_ws, previously_visible_ws->name);
-
- Con *ws = con_get_workspace(current->con);
- LOG("should move workspace %p / %s\n", ws, ws->name);
- bool workspace_was_visible = workspace_is_visible(ws);
-
- 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\"}");
- }
- DLOG("Detaching\n");
-
- /* detach from the old output and attach to the new output */
- 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);
- }
- 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. */
- workspace_show(ws);
- }
-
- /* NB: We cannot simply work with previously_visible_ws since it might
- * have been cleaned up by workspace_show() already, depending on the
- * focus order/number of other workspaces on the output.
- * Instead, we loop through the available workspaces and only work with
- * previously_visible_ws if we still find it. */
- TAILQ_FOREACH(ws, &(content->nodes_head), nodes) {
- if (ws != previously_visible_ws)
- continue;
-
- /* Call the on_remove_child callback of the workspace which previously
- * was visible on the destination output. Since it is no longer
- * visible, it might need to get cleaned up. */
- CALL(previously_visible_ws, on_remove_child);
- break;
- }
}
cmd_output->needs_tree_render = true;
* Implementation of 'split v|h|vertical|horizontal'.
*
*/
-void cmd_split(I3_CMD, char *direction) {
+void cmd_split(I3_CMD, const char *direction) {
owindow *current;
/* TODO: use matches */
LOG("splitting in direction %c\n", direction[0]);
* Implementation of 'kill [window|client]'.
*
*/
-void cmd_kill(I3_CMD, char *kill_mode_str) {
+void cmd_kill(I3_CMD, const char *kill_mode_str) {
if (kill_mode_str == NULL)
kill_mode_str = "window";
owindow *current;
* Implementation of 'exec [--no-startup-id] <command>'.
*
*/
-void cmd_exec(I3_CMD, char *nosn, char *command) {
+void cmd_exec(I3_CMD, const char *nosn, const char *command) {
bool no_startup_id = (nosn != NULL);
DLOG("should execute %s, no_startup_id = %d\n", command, no_startup_id);
* Implementation of 'focus left|right|up|down'.
*
*/
-void cmd_focus_direction(I3_CMD, char *direction) {
+void cmd_focus_direction(I3_CMD, const char *direction) {
DLOG("direction = *%s*\n", direction);
if (strcmp(direction, "left") == 0)
* Implementation of 'focus tiling|floating|mode_toggle'.
*
*/
-void cmd_focus_window_mode(I3_CMD, char *window_mode) {
+void cmd_focus_window_mode(I3_CMD, const char *window_mode) {
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)
+ if (con_inside_floating(focused))
window_mode = "tiling";
else
window_mode = "floating";
}
+ Con *current;
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))
* Implementation of 'focus parent|child'.
*
*/
-void cmd_focus_level(I3_CMD, char *level) {
+void cmd_focus_level(I3_CMD, const char *level) {
DLOG("level = %s\n", level);
bool success = false;
count);
cmd_output->needs_tree_render = true;
- // XXX: default reply for now, make this a better reply
- ysuccess(true);
+ ysuccess(count > 0);
}
/*
- * Implementation of 'fullscreen [global]'.
+ * Implementation of 'fullscreen enable|toggle [global]' and
+ * 'fullscreen disable'
*
*/
-void cmd_fullscreen(I3_CMD, char *fullscreen_mode) {
- if (fullscreen_mode == NULL)
- fullscreen_mode = "output";
- DLOG("toggling fullscreen, mode = %s\n", fullscreen_mode);
+void cmd_fullscreen(I3_CMD, const char *action, const char *fullscreen_mode) {
+ fullscreen_mode_t mode = strcmp(fullscreen_mode, "global") == 0 ? CF_GLOBAL : CF_OUTPUT;
+ DLOG("%s fullscreen, mode = %s\n", action, fullscreen_mode);
owindow *current;
HANDLE_EMPTY_MATCH;
TAILQ_FOREACH(current, &owindows, owindows) {
DLOG("matching: %p / %s\n", current->con, current->con->name);
- con_toggle_fullscreen(current->con, (strcmp(fullscreen_mode, "global") == 0 ? CF_GLOBAL : CF_OUTPUT));
+ if (strcmp(action, "toggle") == 0) {
+ con_toggle_fullscreen(current->con, mode);
+ } else if (strcmp(action, "enable") == 0) {
+ con_enable_fullscreen(current->con, mode);
+ } else if (strcmp(action, "disable") == 0) {
+ con_disable_fullscreen(current->con);
+ }
}
cmd_output->needs_tree_render = true;
}
/*
- * Implementation of 'move <direction> [<pixels> [px]]'.
+ * Implementation of 'sticky enable|disable|toggle'.
*
*/
-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);
+void cmd_sticky(I3_CMD, const char *action) {
+ DLOG("%s sticky on window\n", action);
+ HANDLE_EMPTY_MATCH;
+ owindow *current;
+ TAILQ_FOREACH(current, &owindows, owindows) {
+ if (current->con->window == NULL) {
+ ELOG("only containers holding a window can be made sticky, skipping con = %p\n", current->con);
+ continue;
+ }
+ DLOG("setting sticky for container = %p / %s\n", current->con, current->con->name);
+
+ bool sticky = false;
+ if (strcmp(action, "enable") == 0)
+ sticky = true;
+ else if (strcmp(action, "disable") == 0)
+ sticky = false;
+ else if (strcmp(action, "toggle") == 0)
+ sticky = !current->con->sticky;
+
+ current->con->sticky = sticky;
+ ewmh_update_sticky(current->con->window->id, sticky);
+ }
+
+ /* A window we made sticky might not be on a visible workspace right now, so we need to make
+ * sure it gets pushed to the front now. */
+ output_push_sticky_windows(focused);
+
+ cmd_output->needs_tree_render = true;
+ ysuccess(true);
+}
+
+/*
+ * Implementation of 'move <direction> [<pixels> [px]]'.
+ *
+ */
+void cmd_move_direction(I3_CMD, const char *direction, long move_px) {
owindow *current;
HANDLE_EMPTY_MATCH;
Con *initially_focused = focused;
TAILQ_FOREACH(current, &owindows, owindows) {
- DLOG("moving in direction %s, px %s\n", direction, move_px);
+ DLOG("moving in direction %s, px %ld\n", direction, move_px);
if (con_is_floating(current->con)) {
- DLOG("floating move with %d pixels\n", px);
+ DLOG("floating move with %ld pixels\n", move_px);
Rect newrect = current->con->parent->rect;
if (strcmp(direction, "left") == 0) {
- newrect.x -= px;
+ newrect.x -= move_px;
} else if (strcmp(direction, "right") == 0) {
- newrect.x += px;
+ newrect.x += move_px;
} else if (strcmp(direction, "up") == 0) {
- newrect.y -= px;
+ newrect.y -= move_px;
} else if (strcmp(direction, "down") == 0) {
- newrect.y += px;
+ newrect.y += move_px;
}
floating_reposition(current->con->parent, newrect);
} else {
* Implementation of 'layout default|stacked|stacking|tabbed|splitv|splith'.
*
*/
-void cmd_layout(I3_CMD, char *layout_str) {
+void cmd_layout(I3_CMD, const char *layout_str) {
if (strcmp(layout_str, "stacking") == 0)
layout_str = "stacked";
owindow *current;
* Implementation of 'layout toggle [all|split]'.
*
*/
-void cmd_layout_toggle(I3_CMD, char *toggle_mode) {
+void cmd_layout_toggle(I3_CMD, const char *toggle_mode) {
owindow *current;
if (toggle_mode == NULL)
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\"}");
+ ipc_send_workspace_event("reload", NULL, NULL);
/* Send an update event for the barconfig just in case it has changed */
update_barconfig();
* Implementation of 'focus output <output>'.
*
*/
-void cmd_focus_output(I3_CMD, char *name) {
+void cmd_focus_output(I3_CMD, const char *name) {
owindow *current;
DLOG("name = %s\n", name);
* 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);
+void cmd_move_window_to_position(I3_CMD, const char *method, long x, long y) {
bool has_error = false;
owindow *current;
current->con->parent->rect.x = x;
current->con->parent->rect.y = y;
- DLOG("moving to absolute position %d %d\n", x, y);
+ DLOG("moving to absolute position %ld %ld\n", x, y);
floating_maybe_reassign_ws(current->con->parent);
cmd_output->needs_tree_render = true;
}
if (strcmp(method, "position") == 0) {
Rect newrect = current->con->parent->rect;
- DLOG("moving to position %d %d\n", x, y);
+ DLOG("moving to position %ld %ld\n", x, y);
newrect.x = x;
newrect.y = y;
* Implementation of 'move [window|container] [to] [absolute] position center
*
*/
-void cmd_move_window_to_center(I3_CMD, char *method) {
+void cmd_move_window_to_center(I3_CMD, const char *method) {
if (!con_is_floating(focused)) {
ELOG("Cannot change position. The window/container is not floating\n");
yerror("Cannot change position. The window/container is not floating.");
}
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_center(focused->parent, croot->rect);
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_center(focused->parent, con_get_workspace(focused)->rect);
- floating_reposition(focused->parent, newrect);
+ cmd_output->needs_tree_render = true;
}
// XXX: default reply for now, make this a better reply
ysuccess(true);
}
+/*
+ * Implementation of 'move [window|container] [to] position mouse'
+ *
+ */
+void cmd_move_window_to_mouse(I3_CMD) {
+ HANDLE_EMPTY_MATCH;
+
+ owindow *current;
+ TAILQ_FOREACH(current, &owindows, owindows) {
+ Con *floating_con = con_inside_floating(current->con);
+ if (floating_con == NULL) {
+ DLOG("con %p / %s is not floating, cannot move it to the mouse position.\n",
+ current->con, current->con->name);
+ continue;
+ }
+
+ DLOG("moving floating container %p / %s to cursor position\n", floating_con, floating_con->name);
+ floating_move_to_pointer(floating_con);
+ }
+
+ cmd_output->needs_tree_render = true;
+ ysuccess(true);
+}
+
/*
* Implementation of 'move scratchpad'.
*
ysuccess(true);
}
+/*
+ * Implementation of 'title_format <format>'
+ *
+ */
+void cmd_title_format(I3_CMD, const char *format) {
+ DLOG("setting title_format to \"%s\"\n", format);
+ HANDLE_EMPTY_MATCH;
+
+ owindow *current;
+ TAILQ_FOREACH(current, &owindows, owindows) {
+ if (current->con->window == NULL)
+ continue;
+
+ DLOG("setting title_format for %p / %s\n", current->con, current->con->name);
+ FREE(current->con->window->title_format);
+
+ /* If we only display the title without anything else, we can skip the parsing step,
+ * so we remove the title format altogether. */
+ if (strcasecmp(format, "%title") != 0) {
+ current->con->window->title_format = sstrdup(format);
+
+ i3String *formatted_title = window_parse_title_format(current->con->window);
+ ewmh_update_visible_name(current->con->window->id, i3string_as_utf8(formatted_title));
+ I3STRING_FREE(formatted_title);
+ } else {
+ /* We can remove _NET_WM_VISIBLE_NAME since we don't display a custom title. */
+ ewmh_update_visible_name(current->con->window->id, NULL);
+ }
+
+ /* Make sure the window title is redrawn immediately. */
+ current->con->window->name_x_changed = true;
+ }
+
+ cmd_output->needs_tree_render = true;
+ ysuccess(true);
+}
+
/*
* Implementation of 'rename workspace [<name>] to <name>'
*
*/
-void cmd_rename_workspace(I3_CMD, char *old_name, char *new_name) {
+void cmd_rename_workspace(I3_CMD, const char *old_name, const char *new_name) {
if (strncasecmp(new_name, "__", strlen("__")) == 0) {
- LOG("Cannot rename workspace to \"%s\": names starting with __ are i3-internal.", new_name);
+ LOG("Cannot rename workspace to \"%s\": names starting with __ are i3-internal.\n", new_name);
ysuccess(false);
return;
}
!strcasecmp(child->name, old_name));
} else {
workspace = con_get_workspace(focused);
+ old_name = workspace->name;
}
if (!workspace) {
- // TODO: we should include the old workspace name here and use yajl for
- // generating the reply.
- // TODO: better error message
- yerror("Old workspace not found");
+ yerror("Old workspace \"%s\" not found", old_name);
return;
}
!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.
- // TODO: better error message
- yerror("New workspace already exists");
+ yerror("New workspace \"%s\" already exists", new_name);
return;
}
Con *parent = workspace->parent;
con_detach(workspace);
con_attach(workspace, parent, false);
+
+ /* Move the workspace to the correct output if it has an assignment */
+ struct Workspace_Assignment *assignment = NULL;
+ TAILQ_FOREACH(assignment, &ws_assignments, ws_assignments) {
+ if (assignment->output == NULL)
+ continue;
+ if (strcmp(assignment->name, workspace->name) != 0 && (!name_is_digits(assignment->name) || ws_name_to_number(assignment->name) != workspace->num)) {
+ continue;
+ }
+
+ workspace_move_to_output(workspace, assignment->output);
+
+ if (previously_focused)
+ workspace_show(con_get_workspace(previously_focused));
+
+ break;
+ }
+
/* 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\"}");
+ ipc_send_workspace_event("rename", workspace, NULL);
ewmh_update_desktop_names();
ewmh_update_desktop_viewport();
ewmh_update_current_desktop();
+
+ startup_sequence_rename_workspace(old_name, new_name);
}
/*
* Implementation of 'bar mode dock|hide|invisible|toggle [<bar_id>]'
*
*/
-bool cmd_bar_mode(char *bar_mode, char *bar_id) {
+bool cmd_bar_mode(const char *bar_mode, const char *bar_id) {
int mode = M_DOCK;
bool toggle = false;
if (strcmp(bar_mode, "dock") == 0)
* Implementation of 'bar hidden_state hide|show|toggle [<bar_id>]'
*
*/
-bool cmd_bar_hidden_state(char *bar_hidden_state, char *bar_id) {
+bool cmd_bar_hidden_state(const char *bar_hidden_state, const char *bar_id) {
int hidden_state = S_SHOW;
bool toggle = false;
if (strcmp(bar_hidden_state, "hide") == 0)
* Implementation of 'bar (hidden_state hide|show|toggle)|(mode dock|hide|invisible|toggle) [<bar_id>]'
*
*/
-void cmd_bar(I3_CMD, char *bar_type, char *bar_value, char *bar_id) {
+void cmd_bar(I3_CMD, const char *bar_type, const char *bar_value, const char *bar_id) {
bool ret;
if (strcmp(bar_type, "mode") == 0)
ret = cmd_bar_mode(bar_value, bar_id);
* Implementation of 'shmlog <size>|toggle|on|off'
*
*/
-void cmd_shmlog(I3_CMD, char *argument) {
+void cmd_shmlog(I3_CMD, const char *argument) {
if (!strcmp(argument, "toggle"))
/* Toggle shm log, if size is not 0. If it is 0, set it to default. */
shmlog_size = shmlog_size ? -shmlog_size : default_shmlog_size;
* Implementation of 'debuglog toggle|on|off'
*
*/
-void cmd_debuglog(I3_CMD, char *argument) {
+void cmd_debuglog(I3_CMD, const char *argument) {
bool logging = get_debug_logging();
if (!strcmp(argument, "toggle")) {
LOG("%s debug logging\n", logging ? "Disabling" : "Enabling");
projects / i3 / i3 / blobdiff