-#undef I3__FILE__
-#define I3__FILE__ "commands.c"
/*
* vim:ts=4:sw=4:expandtab
*
* commands.c: all command functions (see commands_parser.c)
*
*/
+#include "all.h"
+
+#include <stdint.h>
#include <float.h>
#include <stdarg.h>
-#include "all.h"
+#ifdef I3_ASAN_ENABLED
+#include <sanitizer/lsan_interface.h>
+#endif
+
#include "shmlog.h"
// Macros to make the YAJL API a bit easier to use.
} \
} while (0)
+/** If an error occurred during parsing of the criteria, we want to exit instead
+ * of relying on fallback behavior. See #2091. */
+#define HANDLE_INVALID_MATCH \
+ do { \
+ if (current_match->error != NULL) { \
+ yerror("Invalid match: %s", current_match->error); \
+ return; \
+ } \
+ } while (0)
+
/** When the command did not include match criteria (!), we use the currently
* 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
*/
#define HANDLE_EMPTY_MATCH \
do { \
+ HANDLE_INVALID_MATCH; \
+ \
if (match_is_empty(current_match)) { \
+ while (!TAILQ_EMPTY(&owindows)) { \
+ owindow *ow = TAILQ_FIRST(&owindows); \
+ TAILQ_REMOVE(&owindows, ow, owindows); \
+ free(ow); \
+ } \
owindow *ow = smalloc(sizeof(owindow)); \
ow->con = focused; \
TAILQ_INIT(&owindows); \
} \
} while (0)
-/*
- * Returns true if a is definitely greater than b (using the given epsilon)
- *
- */
-static bool definitelyGreaterThan(float a, float b, float epsilon) {
- return (a - b) > ((fabs(a) < fabs(b) ? fabs(b) : fabs(a)) * epsilon);
-}
-
-/*
- * Returns the output containing the given container.
- */
-static Output *get_output_of_con(Con *con) {
- Con *output_con = con_get_output(con);
- Output *output = get_output_by_name(output_con->name);
- assert(output != NULL);
-
- 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
return workspace;
}
-// This code is commented out because we might recycle it for popping up error
-// messages on parser errors.
-#if 0
-static pid_t migration_pid = -1;
-
-/*
- * Handler which will be called when we get a SIGCHLD for the nagbar, meaning
- * it exited (or could not be started, depending on the exit code).
- *
- */
-static void nagbar_exited(EV_P_ ev_child *watcher, int revents) {
- ev_child_stop(EV_A_ watcher);
- if (!WIFEXITED(watcher->rstatus)) {
- fprintf(stderr, "ERROR: i3-nagbar did not exit normally.\n");
- return;
- }
-
- int exitcode = WEXITSTATUS(watcher->rstatus);
- printf("i3-nagbar process exited with status %d\n", exitcode);
- if (exitcode == 2) {
- fprintf(stderr, "ERROR: i3-nagbar could not be found. Is it correctly installed on your system?\n");
- }
-
- migration_pid = -1;
-}
-
-/* We need ev >= 4 for the following code. Since it is not *that* important (it
- * only makes sure that there are no i3-nagbar instances left behind) we still
- * support old systems with libev 3. */
-#if EV_VERSION_MAJOR >= 4
-/*
- * Cleanup handler. Will be called when i3 exits. Kills i3-nagbar with signal
- * SIGKILL (9) to make sure there are no left-over i3-nagbar processes.
- *
- */
-static void nagbar_cleanup(EV_P_ ev_cleanup *watcher, int revent) {
- if (migration_pid != -1) {
- LOG("Sending SIGKILL (9) to i3-nagbar with PID %d\n", migration_pid);
- kill(migration_pid, SIGKILL);
- }
-}
-#endif
-
-void cmd_MIGRATION_start_nagbar(void) {
- if (migration_pid != -1) {
- fprintf(stderr, "i3-nagbar already running.\n");
- return;
- }
- fprintf(stderr, "Starting i3-nagbar, command parsing differs from expected output.\n");
- ELOG("Please report this on IRC or in the bugtracker. Make sure to include the full debug level logfile:\n");
- ELOG("i3-dump-log | gzip -9c > /tmp/i3.log.gz\n");
- ELOG("FYI: Your i3 version is " I3_VERSION "\n");
- migration_pid = fork();
- if (migration_pid == -1) {
- warn("Could not fork()");
- return;
- }
-
- /* child */
- if (migration_pid == 0) {
- char *pageraction;
- sasprintf(&pageraction, "i3-sensible-terminal -e i3-sensible-pager \"%s\"", errorfilename);
- char *argv[] = {
- NULL, /* will be replaced by the executable path */
- "-t",
- "error",
- "-m",
- "You found a parsing error. Please, please, please, report it!",
- "-b",
- "show errors",
- pageraction,
- NULL
- };
- exec_i3_utility("i3-nagbar", argv);
- }
-
- /* parent */
- /* install a child watcher */
- ev_child *child = smalloc(sizeof(ev_child));
- ev_child_init(child, &nagbar_exited, migration_pid, 0);
- ev_child_start(main_loop, child);
-
-/* We need ev >= 4 for the following code. Since it is not *that* important (it
- * only makes sure that there are no i3-nagbar instances left behind) we still
- * support old systems with libev 3. */
-#if EV_VERSION_MAJOR >= 4
- /* install a cleanup watcher (will be called when i3 exits and i3-nagbar is
- * still running) */
- ev_cleanup *cleanup = smalloc(sizeof(ev_cleanup));
- ev_cleanup_init(cleanup, nagbar_cleanup);
- ev_cleanup_start(main_loop, cleanup);
-#endif
-}
-
-#endif
-
/*******************************************************************************
* Criteria functions.
******************************************************************************/
*/
typedef struct owindow {
Con *con;
- TAILQ_ENTRY(owindow) owindows;
+
+ TAILQ_ENTRY(owindow)
+ owindows;
} owindow;
typedef TAILQ_HEAD(owindows_head, owindow) owindows_head;
next = TAILQ_NEXT(next, owindows);
DLOG("checking if con %p / %s matches\n", current->con, current->con->name);
+
+ /* We use this flag to prevent matching on window-less containers if
+ * only window-specific criteria were specified. */
+ bool accept_match = false;
+
if (current_match->con_id != NULL) {
+ accept_match = true;
+
if (current_match->con_id == current->con) {
- DLOG("matches container!\n");
- TAILQ_INSERT_TAIL(&owindows, current, owindows);
+ DLOG("con_id matched.\n");
} else {
- DLOG("doesnt match\n");
- free(current);
+ DLOG("con_id does not match.\n");
+ FREE(current);
+ continue;
}
- } 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->con->window && match_matches_window(current_match, current->con->window)) {
+ }
+
+ if (current_match->mark != NULL && !TAILQ_EMPTY(&(current->con->marks_head))) {
+ accept_match = true;
+ bool matched_by_mark = false;
+
+ 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");
+ matched_by_mark = true;
+ break;
+ }
+
+ if (!matched_by_mark) {
+ DLOG("mark does not match.\n");
+ FREE(current);
+ continue;
+ }
+ }
+
+ if (current->con->window != NULL) {
+ if (match_matches_window(current_match, current->con->window)) {
DLOG("matches window!\n");
- TAILQ_INSERT_TAIL(&owindows, current, owindows);
+ accept_match = true;
} else {
- DLOG("doesnt match\n");
- free(current);
+ DLOG("doesn't match\n");
+ FREE(current);
+ continue;
}
}
+
+ if (accept_match) {
+ TAILQ_INSERT_TAIL(&owindows, current, owindows);
+ } else {
+ FREE(current);
+ continue;
+ }
}
TAILQ_FOREACH(current, &owindows, owindows) {
}
/*
- * 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, const 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:
/* get the workspace */
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;
}
/*
- * 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, const 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:
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;
else
search_direction = D_DOWN;
- bool res = resize_find_tiling_participants(&first, &second, search_direction);
+ bool res = resize_find_tiling_participants(&first, &second, search_direction, false);
if (!res) {
LOG("No second container in this direction found.\n");
ysuccess(false);
LOG("default percentage = %f\n", percentage);
/* resize */
- LOG("second->percent = %f\n", second->percent);
LOG("first->percent before = %f\n", first->percent);
+ LOG("second->percent before = %f\n", second->percent);
if (first->percent == 0.0)
first->percent = percentage;
if (second->percent == 0.0)
double new_second_percent = second->percent - ((double)ppt / 100.0);
LOG("new_first_percent = %f\n", new_first_percent);
LOG("new_second_percent = %f\n", new_second_percent);
- /* Ensure that the new percentages are positive and greater than
- * 0.05 to have a reasonable minimum size. */
- if (definitelyGreaterThan(new_first_percent, 0.05, DBL_EPSILON) &&
- definitelyGreaterThan(new_second_percent, 0.05, DBL_EPSILON)) {
- first->percent += ((double)ppt / 100.0);
- second->percent -= ((double)ppt / 100.0);
+ /* Ensure that the new percentages are positive. */
+ if (new_first_percent > 0.0 && new_second_percent > 0.0) {
+ first->percent = new_first_percent;
+ second->percent = new_second_percent;
LOG("first->percent after = %f\n", first->percent);
LOG("second->percent after = %f\n", second->percent);
} else {
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 ||
- 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 appropriate current container (skip stacked/tabbed cons) */
+ Con *dummy = NULL;
+ direction_t search_direction = (strcmp(direction, "width") == 0 ? D_LEFT : D_DOWN);
+ bool search_result = resize_find_tiling_participants(¤t, &dummy, search_direction, true);
+ if (search_result == false) {
+ ysuccess(false);
+ return false;
+ }
/* get the default percentage */
int children = con_num_children(current->parent);
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) {
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. */
+ /* Ensure that the new percentages are positive. */
TAILQ_FOREACH(child, &(current->parent->nodes_head), nodes) {
if (child == current)
continue;
- if (!definitelyGreaterThan(child->percent - subtract_percent, 0.05, DBL_EPSILON)) {
+ if (child->percent - subtract_percent <= 0.0) {
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;
}
}
- if (!definitelyGreaterThan(new_current_percent, 0.05, DBL_EPSILON)) {
+ if (new_current_percent <= 0.0) {
LOG("Not resizing, already at minimum size\n");
ysuccess(false);
return false;
}
- current->percent += ((double)ppt / 100.0);
+ current->percent = new_current_percent;
LOG("current->percent after = %f\n", current->percent);
TAILQ_FOREACH(child, &(current->parent->nodes_head), nodes) {
}
/*
- * Implementation of 'resize set <px> [px] <px> [px]'.
+ * Implementation of 'resize set <width> [px | ppt] <height> [px | ppt]'.
*
*/
-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);
+void cmd_resize_set(I3_CMD, long cwidth, const char *mode_width, long cheight, const char *mode_height) {
+ DLOG("resizing to %ld %s x %ld %s\n", cwidth, mode_width, cheight, mode_height);
+ if (cwidth < 0 || cheight < 0) {
+ ELOG("Resize failed: dimensions cannot be negative (was %ld %s x %ld %s)\n", cwidth, mode_width, cheight, mode_height);
return;
}
HANDLE_EMPTY_MATCH;
owindow *current;
+ bool success = true;
TAILQ_FOREACH(current, &owindows, owindows) {
Con *floating_con;
if ((floating_con = con_inside_floating(current->con))) {
+ Con *output = con_get_output(floating_con);
+ if (cwidth == 0) {
+ cwidth = output->rect.width;
+ } else if (mode_width && strcmp(mode_width, "ppt") == 0) {
+ cwidth = output->rect.width * ((double)cwidth / 100.0);
+ }
+ if (cheight == 0) {
+ cheight = output->rect.height;
+ } else if (mode_height && strcmp(mode_height, "ppt") == 0) {
+ cheight = output->rect.height * ((double)cheight / 100.0);
+ }
floating_resize(floating_con, cwidth, cheight);
} else {
- ELOG("Resize failed: %p not a floating container\n", current->con);
+ if (current->con->window && current->con->window->dock) {
+ DLOG("This is a dock window. Not resizing (con = %p)\n)", current->con);
+ continue;
+ }
+
+ if (cwidth > 0 && mode_width && strcmp(mode_width, "ppt") == 0) {
+ /* get the appropriate current container (skip stacked/tabbed cons) */
+ Con *target = current->con;
+ Con *dummy;
+ resize_find_tiling_participants(&target, &dummy, D_LEFT, true);
+
+ /* Calculate new size for the target container */
+ double current_percent = target->percent;
+ char *action_string;
+ long adjustment;
+
+ if (current_percent > cwidth) {
+ action_string = "shrink";
+ adjustment = (int)(current_percent * 100) - cwidth;
+ } else {
+ action_string = "grow";
+ adjustment = cwidth - (int)(current_percent * 100);
+ }
+
+ /* perform resizing and report failure if not possible */
+ if (!cmd_resize_tiling_width_height(current_match, cmd_output,
+ target, action_string, "width", adjustment)) {
+ success = false;
+ }
+ }
+
+ if (cheight > 0 && mode_width && strcmp(mode_width, "ppt") == 0) {
+ /* get the appropriate current container (skip stacked/tabbed cons) */
+ Con *target = current->con;
+ Con *dummy;
+ resize_find_tiling_participants(&target, &dummy, D_DOWN, true);
+
+ /* Calculate new size for the target container */
+ double current_percent = target->percent;
+ char *action_string;
+ long adjustment;
+
+ if (current_percent > cheight) {
+ action_string = "shrink";
+ adjustment = (int)(current_percent * 100) - cheight;
+ } else {
+ action_string = "grow";
+ adjustment = cheight - (int)(current_percent * 100);
+ }
+
+ /* perform resizing and report failure if not possible */
+ if (!cmd_resize_tiling_width_height(current_match, cmd_output,
+ target, action_string, "height", adjustment)) {
+ success = false;
+ }
+ }
}
}
cmd_output->needs_tree_render = true;
- // XXX: default reply for now, make this a better reply
- ysuccess(true);
+ ysuccess(success);
}
/*
* 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);
+void cmd_border(I3_CMD, const char *border_style_str, long border_width) {
+ DLOG("border style should be changed to %s with border width %ld\n", border_style_str, border_width);
owindow *current;
HANDLE_EMPTY_MATCH;
TAILQ_FOREACH(current, &owindows, owindows) {
DLOG("matching: %p / %s\n", current->con, current->con->name);
int border_style = current->con->border_style;
- char *end;
- int tmp_border_width = -1;
- tmp_border_width = strtol(border_width, &end, 10);
- if (end == border_width) {
- /* no valid digits found */
- tmp_border_width = -1;
- }
+ int con_border_width = border_width;
+
if (strcmp(border_style_str, "toggle") == 0) {
border_style++;
border_style %= 3;
if (border_style == BS_NORMAL)
- tmp_border_width = 2;
+ con_border_width = 2;
else if (border_style == BS_NONE)
- tmp_border_width = 0;
+ con_border_width = 0;
else if (border_style == BS_PIXEL)
- tmp_border_width = 1;
+ con_border_width = 1;
} else {
- if (strcmp(border_style_str, "normal") == 0)
+ if (strcmp(border_style_str, "normal") == 0) {
border_style = BS_NORMAL;
- else if (strcmp(border_style_str, "pixel") == 0)
+ } else if (strcmp(border_style_str, "pixel") == 0) {
border_style = BS_PIXEL;
- else if (strcmp(border_style_str, "1pixel") == 0) {
+ } else if (strcmp(border_style_str, "1pixel") == 0) {
border_style = BS_PIXEL;
- tmp_border_width = 1;
- } else if (strcmp(border_style_str, "none") == 0)
+ con_border_width = 1;
+ } else if (strcmp(border_style_str, "none") == 0) {
border_style = BS_NONE;
- else {
+ } else {
ELOG("BUG: called with border_style=%s\n", border_style_str);
ysuccess(false);
return;
}
}
- con_set_border_style(current->con, border_style, tmp_border_width);
+
+ con_set_border_style(current->con, border_style, logical_px(con_border_width));
}
cmd_output->needs_tree_render = true;
LOG("-------------------------------------------------\n");
LOG(" NOP: %s\n", comment);
LOG("-------------------------------------------------\n");
+ ysuccess(true);
}
/*
/* Make sure we allow paths like '~/.i3/layout.json' */
path = resolve_tilde(path);
- json_content_t content = json_determine_content(path);
+ char *buf = NULL;
+ ssize_t len;
+ if ((len = slurp(path, &buf)) < 0) {
+ /* slurp already logged an error. */
+ goto out;
+ }
+
+ if (!json_validate(buf, len)) {
+ ELOG("Could not parse \"%s\" as JSON, not loading.\n", path);
+ yerror("Could not parse \"%s\" as JSON.", path);
+ goto out;
+ }
+
+ json_content_t content = json_determine_content(buf, len);
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;
+ goto out;
}
Con *parent = focused;
}
DLOG("Appending to parent=%p instead of focused=%p\n", parent, focused);
char *errormsg = NULL;
- tree_append_json(parent, path, &errormsg);
+ tree_append_json(parent, buf, len, &errormsg);
if (errormsg != NULL) {
yerror(errormsg);
free(errormsg);
if (content == JSON_CONTENT_WORKSPACE)
ipc_send_workspace_event("restored", parent, NULL);
- free(path);
cmd_output->needs_tree_render = true;
+out:
+ free(path);
+ free(buf);
}
/*
}
/*
- * Implementation of 'workspace number <name>'
+ * Implementation of 'workspace [--no-auto-back-and-forth] number <name>'
*
*/
-void cmd_workspace_number(I3_CMD, const 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)) {
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)) {
+ ysuccess(true);
return;
+ }
workspace_show(workspace);
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, const 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);
}
DLOG("should switch to workspace %s\n", name);
- if (maybe_back_and_forth(cmd_output, name))
+ if (!no_auto_back_and_forth && maybe_back_and_forth(cmd_output, name)) {
+ ysuccess(true);
return;
+ }
workspace_show_by_name(name);
cmd_output->needs_tree_render = true;
}
/*
- * Implementation of 'mark [--toggle] <mark>'
+ * Implementation of 'mark [--add|--replace] [--toggle] <mark>'
*
*/
-void cmd_mark(I3_CMD, const char *mark, const char *toggle) {
+void cmd_mark(I3_CMD, const char *mark, const char *mode, const char *toggle) {
HANDLE_EMPTY_MATCH;
owindow *current = TAILQ_FIRST(&owindows);
}
DLOG("matching: %p / %s\n", current->con, current->con->name);
+
+ mark_mode_t mark_mode = (mode == NULL || strcmp(mode, "--replace") == 0) ? MM_REPLACE : MM_ADD;
if (toggle != NULL) {
- con_mark_toggle(current->con, mark);
+ con_mark_toggle(current->con, mark, mark_mode);
} else {
- con_mark(current->con, mark);
+ con_mark(current->con, mark, mark_mode);
}
cmd_output->needs_tree_render = true;
*
*/
void cmd_unmark(I3_CMD, const char *mark) {
- con_unmark(mark);
+ if (match_is_empty(current_match)) {
+ con_unmark(NULL, mark);
+ } else {
+ owindow *current;
+ TAILQ_FOREACH(current, &owindows, owindows) {
+ con_unmark(current->con, mark);
+ }
+ }
cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
TAILQ_FOREACH(current, &owindows, owindows) {
DLOG("matching: %p / %s\n", current->con, current->con->name);
- Output *current_output = get_output_of_con(current->con);
- 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;
- }
-
- 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;
- }
-
- con_move_to_workspace(current->con, ws, true, false, false);
+ had_error |= !con_move_to_output_name(current->con, name, true);
}
cmd_output->needs_tree_render = true;
owindow *current;
TAILQ_FOREACH(current, &owindows, owindows) {
Con *ws = con_get_workspace(current->con);
+ if (con_is_internal(ws)) {
+ continue;
+ }
+
bool success = workspace_move_to_output(ws, name);
if (!success) {
ELOG("Failed to move workspace to output.\n");
}
/*
- * Implementation of 'split v|h|vertical|horizontal'.
+ * Implementation of 'split v|h|t|vertical|horizontal|toggle'.
*
*/
void cmd_split(I3_CMD, const char *direction) {
+ HANDLE_EMPTY_MATCH;
+
owindow *current;
- /* TODO: use matches */
LOG("splitting in direction %c\n", direction[0]);
- if (match_is_empty(current_match))
- tree_split(focused, (direction[0] == 'v' ? VERT : HORIZ));
- else {
- TAILQ_FOREACH(current, &owindows, owindows) {
- DLOG("matching: %p / %s\n", current->con, current->con->name);
+ TAILQ_FOREACH(current, &owindows, owindows) {
+ if (con_is_docked(current->con)) {
+ ELOG("Cannot split a docked container, skipping.\n");
+ continue;
+ }
+
+ DLOG("matching: %p / %s\n", current->con, current->con->name);
+ if (direction[0] == 't') {
+ layout_t current_layout;
+ if (current->con->type == CT_WORKSPACE) {
+ current_layout = current->con->layout;
+ } else {
+ current_layout = current->con->parent->layout;
+ }
+ /* toggling split orientation */
+ if (current_layout == L_SPLITH) {
+ tree_split(current->con, VERT);
+ } else {
+ tree_split(current->con, HORIZ);
+ }
+ } else {
tree_split(current->con, (direction[0] == 'v' ? VERT : HORIZ));
}
}
void cmd_kill(I3_CMD, const char *kill_mode_str) {
if (kill_mode_str == NULL)
kill_mode_str = "window";
- owindow *current;
DLOG("kill_mode=%s\n", kill_mode_str);
return;
}
- /* check if the match is empty, not if the result is empty */
- if (match_is_empty(current_match))
- tree_close_con(kill_mode);
- else {
- TAILQ_FOREACH(current, &owindows, owindows) {
- DLOG("matching: %p / %s\n", current->con, current->con->name);
- tree_close(current->con, kill_mode, false, false);
- }
+ HANDLE_EMPTY_MATCH;
+
+ owindow *current;
+ TAILQ_FOREACH(current, &owindows, owindows) {
+ con_close(current->con, kill_mode);
}
cmd_output->needs_tree_render = true;
ysuccess(true);
}
+/*
+ * Focus a container and disable any other fullscreen container not permitting the focus.
+ *
+ */
+static void cmd_focus_force_focus(Con *con) {
+ /* Disable fullscreen container in workspace with container to be focused. */
+ Con *ws = con_get_workspace(con);
+ Con *fullscreen_on_ws = (focused && focused->fullscreen_mode == CF_GLOBAL) ? focused : con_get_fullscreen_con(ws, CF_OUTPUT);
+ if (fullscreen_on_ws && fullscreen_on_ws != con && !con_has_parent(con, fullscreen_on_ws)) {
+ con_disable_fullscreen(fullscreen_on_ws);
+ }
+ con_activate(con);
+}
+
/*
* Implementation of 'focus tiling|floating|mode_toggle'.
*
void cmd_focus_window_mode(I3_CMD, const char *window_mode) {
DLOG("window_mode = %s\n", window_mode);
+ bool to_floating = false;
+ if (strcmp(window_mode, "mode_toggle") == 0) {
+ to_floating = !con_inside_floating(focused);
+ } else if (strcmp(window_mode, "floating") == 0) {
+ to_floating = true;
+ } else if (strcmp(window_mode, "tiling") == 0) {
+ to_floating = false;
+ }
+
Con *ws = con_get_workspace(focused);
- if (ws != NULL) {
- if (strcmp(window_mode, "mode_toggle") == 0) {
- 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))
- continue;
+ Con *current;
+ bool success = false;
+ TAILQ_FOREACH(current, &(ws->focus_head), focused) {
+ if ((to_floating && current->type != CT_FLOATING_CON) ||
+ (!to_floating && current->type == CT_FLOATING_CON))
+ continue;
- con_focus(con_descend_focused(current));
- break;
- }
+ cmd_focus_force_focus(con_descend_focused(current));
+ success = true;
+ break;
}
- cmd_output->needs_tree_render = true;
- // XXX: default reply for now, make this a better reply
- ysuccess(true);
+ if (success) {
+ cmd_output->needs_tree_render = true;
+ ysuccess(true);
+ } else {
+ yerror("Failed to find a %s container in workspace.", to_floating ? "floating" : "tiling");
+ }
}
/*
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;
- }
-
/* In case this is a scratchpad window, call scratchpad_show(). */
if (ws == __i3_scratch) {
scratchpad_show(current->con);
* So we focus 'current' to make it the currently focused window of
* the target workspace, then revert focus. */
Con *currently_focused = focused;
- con_focus(current->con);
- con_focus(currently_focused);
+ cmd_focus_force_focus(current->con);
+ con_activate(currently_focused);
/* Now switch to the workspace, then focus */
workspace_show(ws);
LOG("focusing %p / %s\n", current->con, current->con->name);
- con_focus(current->con);
+ con_activate(current->con);
count++;
}
* sure it gets pushed to the front now. */
output_push_sticky_windows(focused);
+ ewmh_update_wm_desktop();
+
cmd_output->needs_tree_render = true;
ysuccess(true);
}
/* the move command should not disturb focus */
if (focused != initially_focused)
- con_focus(initially_focused);
+ con_activate(initially_focused);
// XXX: default reply for now, make this a better reply
ysuccess(true);
*
*/
void cmd_layout(I3_CMD, const char *layout_str) {
- if (strcmp(layout_str, "stacking") == 0)
- layout_str = "stacked";
- owindow *current;
+ HANDLE_EMPTY_MATCH;
+
layout_t 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;
- else {
+ if (!layout_from_name(layout_str, &layout)) {
ELOG("Unknown layout \"%s\", this is a mismatch between code and parser spec.\n", layout_str);
return;
}
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))
- con_set_layout(focused, layout);
- else {
- TAILQ_FOREACH(current, &owindows, owindows) {
- DLOG("matching: %p / %s\n", current->con, current->con->name);
- con_set_layout(current->con, layout);
+ owindow *current;
+ TAILQ_FOREACH(current, &owindows, owindows) {
+ if (con_is_docked(current->con)) {
+ ELOG("cannot change layout of a docked container, skipping it.\n");
+ continue;
}
+
+ DLOG("matching: %p / %s\n", current->con, current->con->name);
+ con_set_layout(current->con, layout);
}
cmd_output->needs_tree_render = true;
*/
void cmd_exit(I3_CMD) {
LOG("Exiting due to user command.\n");
- ipc_shutdown();
+#ifdef I3_ASAN_ENABLED
+ __lsan_do_leak_check();
+#endif
+ ipc_shutdown(SHUTDOWN_REASON_EXIT);
unlink(config.ipc_socket_path);
xcb_disconnect(conn);
exit(0);
*/
void cmd_restart(I3_CMD) {
LOG("restarting i3\n");
- ipc_shutdown();
+ ipc_shutdown(SHUTDOWN_REASON_RESTART);
unlink(config.ipc_socket_path);
/* We need to call this manually since atexit handlers don’t get called
* when exec()ing */
LOG("opening new container\n");
Con *con = tree_open_con(NULL, NULL);
con->layout = L_SPLITH;
- con_focus(con);
+ con_activate(con);
y(map_open);
ystr("success");
y(bool, true);
ystr("id");
- y(integer, (long int)con);
+ y(integer, (uintptr_t)con);
y(map_close);
cmd_output->needs_tree_render = true;
Output *output;
TAILQ_FOREACH(current, &owindows, owindows)
- current_output = get_output_of_con(current->con);
+ current_output = get_output_for_con(current->con);
assert(current_output != NULL);
output = get_output_from_string(current_output, name);
*
*/
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.");
- return;
- }
+ bool has_error = false;
+ HANDLE_EMPTY_MATCH;
- if (strcmp(method, "absolute") == 0) {
- DLOG("moving to absolute center\n");
- floating_center(focused->parent, croot->rect);
+ owindow *current;
+ TAILQ_FOREACH(current, &owindows, owindows) {
+ Con *floating_con = con_inside_floating(current->con);
+ if (floating_con == NULL) {
+ ELOG("con %p / %s is not floating, cannot move it to the center.\n",
+ current->con, current->con->name);
- floating_maybe_reassign_ws(focused->parent);
- cmd_output->needs_tree_render = true;
- }
+ if (!has_error) {
+ yerror("Cannot change position of a window/container because it is not floating.");
+ has_error = true;
+ }
- if (strcmp(method, "position") == 0) {
- DLOG("moving to center\n");
- floating_center(focused->parent, con_get_workspace(focused)->rect);
+ continue;
+ }
- cmd_output->needs_tree_render = true;
+ if (strcmp(method, "absolute") == 0) {
+ DLOG("moving to absolute center\n");
+ floating_center(floating_con, croot->rect);
+
+ floating_maybe_reassign_ws(floating_con);
+ cmd_output->needs_tree_render = true;
+ }
+
+ if (strcmp(method, "position") == 0) {
+ DLOG("moving to center\n");
+ floating_center(floating_con, con_get_workspace(floating_con)->rect);
+
+ cmd_output->needs_tree_render = true;
+ }
}
// XXX: default reply for now, make this a better reply
- ysuccess(true);
+ if (!has_error)
+ ysuccess(true);
}
/*
ysuccess(true);
}
+/*
+ * Implementation of 'swap [container] [with] id|con_id|mark <arg>'.
+ *
+ */
+void cmd_swap(I3_CMD, const char *mode, const char *arg) {
+ HANDLE_EMPTY_MATCH;
+
+ owindow *match = TAILQ_FIRST(&owindows);
+ if (match == NULL) {
+ DLOG("No match found for swapping.\n");
+ return;
+ }
+
+ Con *con;
+ if (strcmp(mode, "id") == 0) {
+ long target;
+ if (!parse_long(arg, &target, 0)) {
+ yerror("Failed to parse %s into a window id.\n", arg);
+ return;
+ }
+
+ con = con_by_window_id(target);
+ } else if (strcmp(mode, "con_id") == 0) {
+ long target;
+ if (!parse_long(arg, &target, 0)) {
+ yerror("Failed to parse %s into a container id.\n", arg);
+ return;
+ }
+
+ con = con_by_con_id(target);
+ } else if (strcmp(mode, "mark") == 0) {
+ con = con_by_mark(arg);
+ } else {
+ yerror("Unhandled swap mode \"%s\". This is a bug.\n", mode);
+ return;
+ }
+
+ if (con == NULL) {
+ yerror("Could not find container for %s = %s\n", mode, arg);
+ return;
+ }
+
+ if (match != TAILQ_LAST(&owindows, owindows_head)) {
+ DLOG("More than one container matched the swap command, only using the first one.");
+ }
+
+ if (match->con == NULL) {
+ DLOG("Match %p has no container.\n", match);
+ ysuccess(false);
+ return;
+ }
+
+ DLOG("Swapping %p with %p.\n", match->con, con);
+ bool result = con_swap(match->con, con);
+
+ cmd_output->needs_tree_render = true;
+ ysuccess(result);
+}
+
/*
* Implementation of 'title_format <format>'
*
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);
+ FREE(current->con->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);
+ current->con->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);
+ if (current->con->window != NULL) {
+ i3String *formatted_title = con_parse_title_format(current->con);
+ 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);
+ if (current->con->window != NULL) {
+ /* 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;
+ if (current->con->window != NULL) {
+ /* Make sure the window title is redrawn immediately. */
+ current->con->window->name_x_changed = true;
+ } else {
+ /* For windowless containers we also need to force the redrawing. */
+ FREE(current->con->deco_render_params);
+ }
}
cmd_output->needs_tree_render = true;
GREP_FIRST(check_dest, output_get_content(output),
!strcasecmp(child->name, new_name));
- if (check_dest != NULL) {
+ /* If check_dest == workspace, the user might be changing the case of the
+ * workspace, or it might just be a no-op. */
+ if (check_dest != NULL && check_dest != workspace) {
yerror("New workspace \"%s\" already exists", new_name);
return;
}
/* Change the name and try to parse it as a number. */
+ /* old_name might refer to workspace->name, so copy it before free()ing */
+ char *old_name_copy = sstrdup(old_name);
FREE(workspace->name);
workspace->name = sstrdup(new_name);
}
/* Restore the previous focus since con_attach messes with the focus. */
- con_focus(previously_focused);
+ con_activate(previously_focused);
cmd_output->needs_tree_render = true;
ysuccess(true);
ewmh_update_desktop_viewport();
ewmh_update_current_desktop();
- startup_sequence_rename_workspace(old_name, new_name);
+ startup_sequence_rename_workspace(old_name_copy, new_name);
+ free(old_name_copy);
}
/*
projects / i3 / i3 / blobdiff