X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fcommands.c;h=eecd59fc063f4f7cff0ff9c398ce1bcc3c205c3c;hb=e4d2b385529847b926a716731be4a8c22ed79007;hp=1263a56b22b2e4dc7a86a693b11147c89cc8f6fe;hpb=7b59da8a4f9e7aa93ec0cc68ee60bebf3d97a604;p=i3%2Fi3 diff --git a/src/commands.c b/src/commands.c index 1263a56b..eecd59fc 100644 --- a/src/commands.c +++ b/src/commands.c @@ -78,14 +78,6 @@ } \ } 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); -} - /* * 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 @@ -269,27 +261,50 @@ void cmd_criteria_add(I3_CMD, const char *ctype, const char *cvalue) { match_parse_property(current_match, ctype, cvalue); } +static void move_matches_to_workspace(Con *ws) { + 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, false); + } +} + +#define CHECK_MOVE_CON_TO_WORKSPACE \ + do { \ + HANDLE_EMPTY_MATCH; \ + if (TAILQ_EMPTY(&owindows)) { \ + yerror("Nothing to move: specified criteria don't match any window"); \ + return; \ + } else { \ + bool found = false; \ + owindow *current = TAILQ_FIRST(&owindows); \ + while (current) { \ + owindow *next = TAILQ_NEXT(current, owindows); \ + \ + if (current->con->type == CT_WORKSPACE && !con_has_children(current->con)) { \ + TAILQ_REMOVE(&owindows, current, owindows); \ + } else { \ + found = true; \ + } \ + \ + current = next; \ + } \ + if (!found) { \ + yerror("Nothing to move: workspace empty"); \ + return; \ + } \ + } \ + } while (0) + /* * Implementation of 'move [window|container] [to] workspace * next|prev|next_on_output|prev_on_output|current'. * */ void cmd_move_con_to_workspace(I3_CMD, const char *which) { - owindow *current; - DLOG("which=%s\n", which); - /* We have nothing to move: - * when criteria was specified but didn't match any window or - * when criteria wasn't specified and we don't have any window focused. */ - if ((!match_is_empty(current_match) && TAILQ_EMPTY(&owindows)) || - (match_is_empty(current_match) && focused->type == CT_WORKSPACE && - !con_has_children(focused))) { - ysuccess(false); - return; - } - - HANDLE_EMPTY_MATCH; + CHECK_MOVE_CON_TO_WORKSPACE; /* get the workspace */ Con *ws; @@ -304,31 +319,23 @@ void cmd_move_con_to_workspace(I3_CMD, const char *which) { else if (strcmp(which, "current") == 0) ws = con_get_workspace(focused); else { - ELOG("BUG: called with which=%s\n", which); - ysuccess(false); + yerror("BUG: called with which=%s", which); 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, false); - } + move_matches_to_workspace(ws); 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 back_and_forth'. * */ void cmd_move_con_to_workspace_back_and_forth(I3_CMD) { - owindow *current; - Con *ws; - - ws = workspace_back_and_forth_get(); - + Con *ws = workspace_back_and_forth_get(); if (ws == NULL) { yerror("No workspace was previously active."); return; @@ -336,10 +343,7 @@ void cmd_move_con_to_workspace_back_and_forth(I3_CMD) { 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, false); - } + move_matches_to_workspace(ws); cmd_output->needs_tree_render = true; // XXX: default reply for now, make this a better reply @@ -350,43 +354,24 @@ void cmd_move_con_to_workspace_back_and_forth(I3_CMD) { * Implementation of 'move [--no-auto-back-and-forth] [window|container] [to] workspace '. * */ -void cmd_move_con_to_workspace_name(I3_CMD, const char *name, const char *_no_auto_back_and_forth) { +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); + yerror("You cannot move containers to i3-internal workspaces (\"%s\").", name); return; } - const bool no_auto_back_and_forth = (_no_auto_back_and_forth != NULL); - owindow *current; - - /* We have nothing to move: - * when criteria was specified but didn't match any window or - * when criteria wasn't specified and we don't have any window focused. */ - if (!match_is_empty(current_match) && TAILQ_EMPTY(&owindows)) { - ELOG("No windows match your criteria, cannot move.\n"); - ysuccess(false); - return; - } else if (match_is_empty(current_match) && focused->type == CT_WORKSPACE && - !con_has_children(focused)) { - ysuccess(false); - return; - } + CHECK_MOVE_CON_TO_WORKSPACE; LOG("should move window to workspace %s\n", name); /* get the workspace */ Con *ws = workspace_get(name, NULL); - if (!no_auto_back_and_forth) + if (no_auto_back_and_forth == NULL) { 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, false); } + move_matches_to_workspace(ws); + cmd_output->needs_tree_render = true; // XXX: default reply for now, make this a better reply ysuccess(true); @@ -396,161 +381,132 @@ void cmd_move_con_to_workspace_name(I3_CMD, const char *name, const char *_no_au * Implementation of 'move [--no-auto-back-and-forth] [window|container] [to] workspace number '. * */ -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: - * when criteria was specified but didn't match any window or - * when criteria wasn't specified and we don't have any window focused. */ - if ((!match_is_empty(current_match) && TAILQ_EMPTY(&owindows)) || - (match_is_empty(current_match) && focused->type == CT_WORKSPACE && - !con_has_children(focused))) { - ysuccess(false); - return; - } +void cmd_move_con_to_workspace_number(I3_CMD, const char *which, const char *no_auto_back_and_forth) { + CHECK_MOVE_CON_TO_WORKSPACE; LOG("should move window to workspace %s\n", which); - /* get the workspace */ - Con *output, *workspace = NULL; 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); yerror("Could not parse number \"%s\"", which); return; } - TAILQ_FOREACH(output, &(croot->nodes_head), nodes) - GREP_FIRST(workspace, output_get_content(output), - child->num == parsed_num); - - if (!workspace) { - workspace = workspace_get(which, NULL); + Con *ws = get_existing_workspace_by_num(parsed_num); + if (!ws) { + ws = workspace_get(which, NULL); } - 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, false); + if (no_auto_back_and_forth == NULL) { + ws = maybe_auto_back_and_forth_workspace(ws); } + move_matches_to_workspace(ws); + cmd_output->needs_tree_render = true; // XXX: default reply for now, make this a better reply ysuccess(true); } -static void cmd_resize_floating(I3_CMD, const char *way, const char *direction, Con *floating_con, int px) { - LOG("floating resize\n"); +/* + * Convert a string direction ("left", "right", etc.) to a direction_t. Assumes + * valid direction string. + */ +static direction_t parse_direction(const char *str) { + if (strcmp(str, "left") == 0) { + return D_LEFT; + } else if (strcmp(str, "right") == 0) { + return D_RIGHT; + } else if (strcmp(str, "up") == 0) { + return D_UP; + } else if (strcmp(str, "down") == 0) { + return D_DOWN; + } else { + ELOG("Invalid direction. This is a parser bug.\n"); + assert(false); + } +} + +static void cmd_resize_floating(I3_CMD, const char *way, const char *direction_str, Con *floating_con, int px) { Rect old_rect = floating_con->rect; Con *focused_con = con_descend_focused(floating_con); + direction_t direction; + if (strcmp(direction_str, "height") == 0) { + direction = D_DOWN; + } else if (strcmp(direction_str, "width") == 0) { + direction = D_RIGHT; + } else { + direction = parse_direction(direction_str); + } + orientation_t orientation = orientation_from_direction(direction); + /* ensure that resize will take place even if pixel increment is smaller than * height increment or width increment. * fixes #1011 */ 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) + if (orientation == VERT) { + if (px < 0) { px = (-px < window->height_increment) ? -window->height_increment : px; - else + } else { px = (px < window->height_increment) ? window->height_increment : px; - } else if (strcmp(direction, "left") == 0 || strcmp(direction, "right") == 0) { - if (px < 0) + } + } else { + if (px < 0) { px = (-px < window->width_increment) ? -window->width_increment : px; - else + } else { px = (px < window->width_increment) ? window->width_increment : px; + } } } - if (strcmp(direction, "up") == 0) { - floating_con->rect.height += px; - } else if (strcmp(direction, "down") == 0 || strcmp(direction, "height") == 0) { + if (orientation == VERT) { floating_con->rect.height += px; - } else if (strcmp(direction, "left") == 0) { - floating_con->rect.width += px; } else { floating_con->rect.width += px; } - floating_check_size(floating_con); /* Did we actually resize anything or did the size constraints prevent us? * If we could not resize, exit now to not move the window. */ - if (memcmp(&old_rect, &(floating_con->rect), sizeof(Rect)) == 0) + if (memcmp(&old_rect, &(floating_con->rect), sizeof(Rect)) == 0) { return; + } - if (strcmp(direction, "up") == 0) { + if (direction == D_UP) { floating_con->rect.y -= (floating_con->rect.height - old_rect.height); - } else if (strcmp(direction, "left") == 0) { + } else if (direction == D_LEFT) { floating_con->rect.x -= (floating_con->rect.width - old_rect.width); } /* If this is a scratchpad window, don't auto center it from now on. */ - if (floating_con->scratchpad_state == SCRATCHPAD_FRESH) + if (floating_con->scratchpad_state == SCRATCHPAD_FRESH) { floating_con->scratchpad_state = SCRATCHPAD_CHANGED; + } } -static bool cmd_resize_tiling_direction(I3_CMD, Con *current, const char *way, const char *direction, int ppt) { - LOG("tiling resize\n"); +static bool cmd_resize_tiling_direction(I3_CMD, Con *current, const char *direction, int px, int ppt) { Con *second = NULL; Con *first = current; - direction_t search_direction; - if (!strcmp(direction, "left")) - search_direction = D_LEFT; - else if (!strcmp(direction, "right")) - search_direction = D_RIGHT; - else if (!strcmp(direction, "up")) - search_direction = D_UP; - else - search_direction = D_DOWN; + direction_t search_direction = parse_direction(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); + yerror("No second container found in this direction."); return false; } - /* get the default percentage */ - int children = con_num_children(first->parent); - LOG("ins. %d children\n", children); - double percentage = 1.0 / children; - LOG("default percentage = %f\n", percentage); - - /* resize */ - LOG("second->percent = %f\n", second->percent); - LOG("first->percent before = %f\n", first->percent); - if (first->percent == 0.0) - first->percent = percentage; - if (second->percent == 0.0) - second->percent = percentage; - double new_first_percent = first->percent + ((double)ppt / 100.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); - LOG("first->percent after = %f\n", first->percent); - LOG("second->percent after = %f\n", second->percent); - } else { - LOG("Not resizing, already at minimum size\n"); + if (ppt) { + /* For backwards compatibility, 'X px or Y ppt' means that ppt is + * preferred. */ + px = 0; } - - return true; + return resize_neighboring_cons(first, second, px, ppt); } -static bool cmd_resize_tiling_width_height(I3_CMD, Con *current, const char *way, const char *direction, int ppt) { +static bool cmd_resize_tiling_width_height(I3_CMD, Con *current, const char *direction, int px, double ppt) { LOG("width/height resize\n"); /* get the appropriate current container (skip stacked/tabbed cons) */ @@ -558,7 +514,7 @@ static bool cmd_resize_tiling_width_height(I3_CMD, Con *current, const char *way 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); + yerror("Failed to find appropriate tiling containers for resize operation"); return false; } @@ -576,28 +532,36 @@ static bool cmd_resize_tiling_width_height(I3_CMD, Con *current, const char *way child->percent = percentage; } - double new_current_percent = current->percent + ((double)ppt / 100.0); - double subtract_percent = ((double)ppt / 100.0) / (children - 1); + double new_current_percent; + double subtract_percent; + if (ppt != 0.0) { + new_current_percent = current->percent + ppt; + } else { + new_current_percent = px_resize_to_percent(current, px); + ppt = new_current_percent - current->percent; + } + subtract_percent = ppt / (children - 1); + if (ppt < 0.0 && new_current_percent < percent_for_1px(current)) { + yerror("Not resizing, container would end with less than 1px"); + return false; + } + LOG("new_current_percent = %f\n", new_current_percent); LOG("subtract_percent = %f\n", subtract_percent); - /* Ensure that the new percentages are positive and greater than - * 0.05 to have a reasonable minimum size. */ - TAILQ_FOREACH(child, &(current->parent->nodes_head), nodes) { - if (child == current) - continue; - if (!definitelyGreaterThan(child->percent - subtract_percent, 0.05, DBL_EPSILON)) { - LOG("Not resizing, already at minimum size (child %p would end up with a size of %.f\n", child, child->percent - subtract_percent); - ysuccess(false); - return false; + /* Ensure that the new percentages are positive. */ + if (subtract_percent >= 0.0) { + TAILQ_FOREACH(child, &(current->parent->nodes_head), nodes) { + if (child == current) { + continue; + } + if (child->percent - subtract_percent < percent_for_1px(child)) { + yerror("Not resizing, already at minimum size (child %p would end up with a size of %.f", child, child->percent - subtract_percent); + return false; + } } } - if (!definitelyGreaterThan(new_current_percent, 0.05, DBL_EPSILON)) { - LOG("Not resizing, already at minimum size\n"); - ysuccess(false); - return false; - } - current->percent += ((double)ppt / 100.0); + current->percent = new_current_percent; LOG("current->percent after = %f\n", current->percent); TAILQ_FOREACH(child, &(current->parent->nodes_head), nodes) { @@ -637,12 +601,15 @@ void cmd_resize(I3_CMD, const char *way, const char *direction, long resize_px, } else { if (strcmp(direction, "width") == 0 || strcmp(direction, "height") == 0) { + const double ppt = (double)resize_ppt / 100.0; if (!cmd_resize_tiling_width_height(current_match, cmd_output, - current->con, way, direction, resize_ppt)) + current->con, direction, + resize_px, ppt)) return; } else { if (!cmd_resize_tiling_direction(current_match, cmd_output, - current->con, way, direction, resize_ppt)) + current->con, direction, + resize_px, resize_ppt)) return; } } @@ -653,6 +620,35 @@ void cmd_resize(I3_CMD, const char *way, const char *direction, long resize_px, ysuccess(true); } +static bool resize_set_tiling(I3_CMD, Con *target, orientation_t resize_orientation, bool is_ppt, long target_size) { + direction_t search_direction; + char *mode; + if (resize_orientation == HORIZ) { + search_direction = D_LEFT; + mode = "width"; + } else { + search_direction = D_DOWN; + mode = "height"; + } + + /* Get the appropriate current container (skip stacked/tabbed cons) */ + Con *dummy; + resize_find_tiling_participants(&target, &dummy, search_direction, true); + + /* Calculate new size for the target container */ + double ppt = 0.0; + int px = 0; + if (is_ppt) { + ppt = (double)target_size / 100.0 - target->percent; + } else { + px = target_size - (resize_orientation == HORIZ ? target->rect.width : target->rect.height); + } + + /* Perform resizing and report failure if not possible */ + return cmd_resize_tiling_width_height(current_match, cmd_output, + target, mode, px, ppt); +} + /* * Implementation of 'resize set [px | ppt] [px | ppt]'. * @@ -673,12 +669,12 @@ void cmd_resize_set(I3_CMD, long cwidth, const char *mode_width, long cheight, c if ((floating_con = con_inside_floating(current->con))) { Con *output = con_get_output(floating_con); if (cwidth == 0) { - cwidth = output->rect.width; + cwidth = floating_con->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; + cheight = floating_con->rect.height; } else if (mode_height && strcmp(mode_height, "ppt") == 0) { cheight = output->rect.height * ((double)cheight / 100.0); } @@ -689,56 +685,15 @@ void cmd_resize_set(I3_CMD, long cwidth, const char *mode_width, long cheight, c 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 (cwidth > 0) { + bool is_ppt = mode_width && strcmp(mode_width, "ppt") == 0; + success &= resize_set_tiling(current_match, cmd_output, current->con, + HORIZ, is_ppt, cwidth); } - - 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; - } + if (cheight > 0) { + bool is_ppt = mode_height && strcmp(mode_height, "ppt") == 0; + success &= resize_set_tiling(current_match, cmd_output, current->con, + VERT, is_ppt, cheight); } } } @@ -747,6 +702,26 @@ void cmd_resize_set(I3_CMD, long cwidth, const char *mode_width, long cheight, c ysuccess(success); } +static int border_width_from_style(border_style_t border_style, long border_width, Con *con) { + if (border_style == BS_NONE) { + return 0; + } + if (border_width >= 0) { + return logical_px(border_width); + } + + const bool is_floating = con_inside_floating(con) != NULL; + /* Load the configured defaults. */ + if (is_floating && border_style == config.default_floating_border) { + return config.default_floating_border_width; + } else if (!is_floating && border_style == config.default_border) { + return config.default_border_width; + } else { + /* Use some hardcoded values. */ + return logical_px(border_style == BS_NORMAL ? 2 : 1); + } +} + /* * Implementation of 'border normal|pixel []', 'border none|1pixel|toggle'. * @@ -759,40 +734,26 @@ void cmd_border(I3_CMD, const char *border_style_str, long border_width) { TAILQ_FOREACH(current, &owindows, owindows) { DLOG("matching: %p / %s\n", current->con, current->con->name); - int border_style = current->con->border_style; - int con_border_width = border_width; + border_style_t border_style; if (strcmp(border_style_str, "toggle") == 0) { - border_style++; - border_style %= 3; - if (border_style == BS_NORMAL) - con_border_width = 2; - else if (border_style == BS_NONE) - con_border_width = 0; - else if (border_style == BS_PIXEL) - con_border_width = 1; + border_style = (current->con->border_style + 1) % 3; + } else if (strcmp(border_style_str, "normal") == 0) { + border_style = BS_NORMAL; + } else if (strcmp(border_style_str, "pixel") == 0) { + border_style = BS_PIXEL; + } else if (strcmp(border_style_str, "none") == 0) { + border_style = BS_NONE; } else { - if (strcmp(border_style_str, "normal") == 0) { - border_style = BS_NORMAL; - } else if (strcmp(border_style_str, "pixel") == 0) { - border_style = BS_PIXEL; - } else if (strcmp(border_style_str, "1pixel") == 0) { - border_style = BS_PIXEL; - con_border_width = 1; - } else if (strcmp(border_style_str, "none") == 0) { - border_style = BS_NONE; - } else { - ELOG("BUG: called with border_style=%s\n", border_style_str); - ysuccess(false); - return; - } + yerror("BUG: called with border_style=%s", border_style_str); + return; } - con_set_border_style(current->con, border_style, logical_px(con_border_width)); + const int con_border_width = border_width_from_style(border_style, border_width, current->con); + con_set_border_style(current->con, border_style, con_border_width); } cmd_output->needs_tree_render = true; - // XXX: default reply for now, make this a better reply ysuccess(true); } @@ -812,11 +773,10 @@ void cmd_nop(I3_CMD, const char *comment) { * */ void cmd_append_layout(I3_CMD, const char *cpath) { - char *path = sstrdup(cpath); - LOG("Appending layout \"%s\"\n", path); + LOG("Appending layout \"%s\"\n", cpath); /* Make sure we allow paths like '~/.i3/layout.json' */ - path = resolve_tilde(path); + char *path = resolve_tilde(cpath); char *buf = NULL; ssize_t len; @@ -893,8 +853,7 @@ void cmd_workspace(I3_CMD, const char *which) { DLOG("which=%s\n", which); if (con_get_fullscreen_con(croot, CF_GLOBAL)) { - LOG("Cannot switch workspace while in global fullscreen\n"); - ysuccess(false); + yerror("Cannot switch workspace while in global fullscreen"); return; } @@ -907,8 +866,7 @@ void cmd_workspace(I3_CMD, const char *which) { else if (strcmp(which, "prev_on_output") == 0) ws = workspace_prev_on_output(); else { - ELOG("BUG: called with which=%s\n", which); - ysuccess(false); + yerror("BUG: called with which=%s", which); return; } @@ -925,26 +883,19 @@ void cmd_workspace(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)) { - LOG("Cannot switch workspace while in global fullscreen\n"); - ysuccess(false); + yerror("Cannot switch workspace while in global fullscreen"); 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); - yerror("Could not parse number \"%s\"", which); + yerror("Could not parse initial part of \"%s\" as a number.", which); return; } - TAILQ_FOREACH(output, &(croot->nodes_head), nodes) - GREP_FIRST(workspace, output_get_content(output), - child->num == parsed_num); - + Con *workspace = get_existing_workspace_by_num(parsed_num); if (!workspace) { LOG("There is no workspace with number %ld, creating a new one.\n", parsed_num); ysuccess(true); @@ -969,8 +920,7 @@ void cmd_workspace_number(I3_CMD, const char *which, const char *_no_auto_back_a */ 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); + yerror("Cannot switch workspace while in global fullscreen"); return; } @@ -989,14 +939,12 @@ void cmd_workspace_name(I3_CMD, const char *name, const char *_no_auto_back_and_ 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); + yerror("You cannot switch to the i3-internal workspaces (\"%s\").", name); return; } if (con_get_fullscreen_con(croot, CF_GLOBAL)) { - LOG("Cannot switch workspace while in global fullscreen\n"); - ysuccess(false); + yerror("Cannot switch workspace while in global fullscreen"); return; } @@ -1021,7 +969,7 @@ void cmd_mark(I3_CMD, const char *mark, const char *mode, const char *toggle) { owindow *current = TAILQ_FIRST(&owindows); if (current == NULL) { - ysuccess(false); + yerror("Given criteria don't match a window"); return; } @@ -1163,16 +1111,26 @@ void cmd_move_workspace_to_output(I3_CMD, const char *name) { continue; } - bool success = workspace_move_to_output(ws, name); + Output *current_output = get_output_for_con(ws); + if (current_output == NULL) { + yerror("Cannot get current output. This is a bug in i3."); + return; + } + + Output *target_output = get_output_from_string(current_output, name); + if (!target_output) { + yerror("Could not get output from string \"%s\"", name); + return; + } + + bool success = workspace_move_to_output(ws, target_output); if (!success) { - ELOG("Failed to move workspace to output.\n"); - ysuccess(false); + yerror("Failed to move workspace to output."); return; } } cmd_output->needs_tree_render = true; - // XXX: default reply for now, make this a better reply ysuccess(true); } @@ -1231,8 +1189,7 @@ void cmd_kill(I3_CMD, const char *kill_mode_str) { else if (strcmp(kill_mode_str, "client") == 0) kill_mode = KILL_CLIENT; else { - ELOG("BUG: called with kill_mode=%s\n", kill_mode_str); - ysuccess(false); + yerror("BUG: called with kill_mode=%s", kill_mode_str); return; } @@ -1258,7 +1215,6 @@ void cmd_exec(I3_CMD, const char *nosn, const char *command) { 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 ysuccess(true); } @@ -1267,20 +1223,19 @@ void cmd_exec(I3_CMD, const char *nosn, const char *command) { * */ void cmd_focus_direction(I3_CMD, const char *direction) { - DLOG("direction = *%s*\n", direction); - - if (strcmp(direction, "left") == 0) - tree_next('p', HORIZ); - else if (strcmp(direction, "right") == 0) - tree_next('n', HORIZ); - else if (strcmp(direction, "up") == 0) - tree_next('p', VERT); - else if (strcmp(direction, "down") == 0) - tree_next('n', VERT); - else { - ELOG("Invalid focus direction (%s)\n", direction); - ysuccess(false); - return; + switch (parse_direction(direction)) { + case D_LEFT: + tree_next('p', HORIZ); + break; + case D_RIGHT: + tree_next('n', HORIZ); + break; + case D_UP: + tree_next('p', VERT); + break; + case D_DOWN: + tree_next('n', VERT); + break; } cmd_output->needs_tree_render = true; @@ -1295,11 +1250,11 @@ void cmd_focus_direction(I3_CMD, const char *direction) { 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); + Con *fullscreen_on_ws = con_get_fullscreen_covering_ws(ws); if (fullscreen_on_ws && fullscreen_on_ws != con && !con_has_parent(con, fullscreen_on_ws)) { con_disable_fullscreen(fullscreen_on_ws); } - con_focus(con); + con_activate(con); } /* @@ -1417,12 +1372,12 @@ void cmd_focus(I3_CMD) { * the target workspace, then revert focus. */ Con *currently_focused = focused; cmd_focus_force_focus(current->con); - con_focus(currently_focused); + 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++; } @@ -1505,36 +1460,44 @@ void cmd_sticky(I3_CMD, const char *action) { * Implementation of 'move [ [px]]'. * */ -void cmd_move_direction(I3_CMD, const char *direction, long move_px) { +void cmd_move_direction(I3_CMD, const char *direction_str, long move_px) { owindow *current; HANDLE_EMPTY_MATCH; Con *initially_focused = focused; + direction_t direction = parse_direction(direction_str); TAILQ_FOREACH(current, &owindows, owindows) { - DLOG("moving in direction %s, px %ld\n", direction, move_px); + DLOG("moving in direction %s, px %ld\n", direction_str, move_px); if (con_is_floating(current->con)) { DLOG("floating move with %ld pixels\n", move_px); Rect newrect = current->con->parent->rect; - if (strcmp(direction, "left") == 0) { - newrect.x -= move_px; - } else if (strcmp(direction, "right") == 0) { - newrect.x += move_px; - } else if (strcmp(direction, "up") == 0) { - newrect.y -= move_px; - } else if (strcmp(direction, "down") == 0) { - newrect.y += move_px; + + switch (direction) { + case D_LEFT: + newrect.x -= move_px; + break; + case D_RIGHT: + newrect.x += move_px; + break; + case D_UP: + newrect.y -= move_px; + break; + case D_DOWN: + newrect.y += move_px; + break; } + floating_reposition(current->con->parent, newrect); } else { - tree_move(current->con, (strcmp(direction, "right") == 0 ? D_RIGHT : (strcmp(direction, "left") == 0 ? D_LEFT : (strcmp(direction, "up") == 0 ? D_UP : D_DOWN)))); + tree_move(current->con, direction); cmd_output->needs_tree_render = 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); @@ -1659,7 +1622,7 @@ void cmd_open(I3_CMD) { 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"); @@ -1693,8 +1656,7 @@ void cmd_focus_output(I3_CMD, const char *name) { output = get_output_from_string(current_output, name); if (!output) { - LOG("No such output found.\n"); - ysuccess(false); + yerror("No such output found."); return; } @@ -1702,7 +1664,7 @@ void cmd_focus_output(I3_CMD, const char *name) { Con *ws = NULL; GREP_FIRST(ws, output_get_content(output->con), workspace_is_visible(child)); if (!ws) { - ysuccess(false); + yerror("BUG: No workspace found on output."); return; } @@ -1717,7 +1679,7 @@ void cmd_focus_output(I3_CMD, const char *name) { * Implementation of 'move [window|container] [to] [absolute] position [px] [px] * */ -void cmd_move_window_to_position(I3_CMD, const char *method, long x, long y) { +void cmd_move_window_to_position(I3_CMD, long x, long y) { bool has_error = false; owindow *current; @@ -1735,27 +1697,18 @@ void cmd_move_window_to_position(I3_CMD, const char *method, long x, long y) { continue; } - if (strcmp(method, "absolute") == 0) { - current->con->parent->rect.x = x; - current->con->parent->rect.y = 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; + Rect newrect = current->con->parent->rect; - DLOG("moving to position %ld %ld\n", x, y); - newrect.x = x; - newrect.y = y; + DLOG("moving to position %ld %ld\n", x, y); + newrect.x = x; + newrect.y = y; - floating_reposition(current->con->parent, newrect); + if (!floating_reposition(current->con->parent, newrect)) { + yerror("Cannot move window/container out of bounds."); + has_error = true; } } - // XXX: default reply for now, make this a better reply if (!has_error) ysuccess(true); } @@ -1855,19 +1808,20 @@ void cmd_move_scratchpad(I3_CMD) { void cmd_scratchpad_show(I3_CMD) { DLOG("should show scratchpad window\n"); owindow *current; + bool result = false; if (match_is_empty(current_match)) { - scratchpad_show(NULL); + result = scratchpad_show(NULL); } else { TAILQ_FOREACH(current, &owindows, owindows) { DLOG("matching: %p / %s\n", current->con, current->con->name); - scratchpad_show(current->con); + result |= scratchpad_show(current->con); } } cmd_output->needs_tree_render = true; - // XXX: default reply for now, make this a better reply - ysuccess(true); + + ysuccess(result); } /* @@ -1879,7 +1833,11 @@ void cmd_swap(I3_CMD, const char *mode, const char *arg) { owindow *match = TAILQ_FIRST(&owindows); if (match == NULL) { - DLOG("No match found for swapping.\n"); + yerror("No match found for swapping."); + return; + } + if (match->con == NULL) { + yerror("Match %p has no container.", match); return; } @@ -1887,7 +1845,7 @@ void cmd_swap(I3_CMD, const char *mode, const char *arg) { if (strcmp(mode, "id") == 0) { long target; if (!parse_long(arg, &target, 0)) { - yerror("Failed to parse %s into a window id.\n", arg); + yerror("Failed to parse %s into a window id.", arg); return; } @@ -1895,7 +1853,7 @@ void cmd_swap(I3_CMD, const char *mode, const char *arg) { } 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); + yerror("Failed to parse %s into a container id.", arg); return; } @@ -1903,29 +1861,24 @@ void cmd_swap(I3_CMD, const char *mode, const char *arg) { } else if (strcmp(mode, "mark") == 0) { con = con_by_mark(arg); } else { - yerror("Unhandled swap mode \"%s\". This is a bug.\n", mode); + yerror("Unhandled swap mode \"%s\". This is a bug.", mode); return; } if (con == NULL) { - yerror("Could not find container for %s = %s\n", mode, arg); + yerror("Could not find container for %s = %s", 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; + LOG("More than one container matched the swap command, only using the first one."); } DLOG("Swapping %p with %p.\n", match->con, con); bool result = con_swap(match->con, con); cmd_output->needs_tree_render = true; + // XXX: default reply for now, make this a better reply ysuccess(result); } @@ -1978,8 +1931,7 @@ void cmd_title_format(I3_CMD, const char *format) { */ 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.\n", new_name); - ysuccess(false); + yerror("Cannot rename workspace to \"%s\": names starting with __ are i3-internal.", new_name); return; } if (old_name) { @@ -1988,11 +1940,9 @@ void cmd_rename_workspace(I3_CMD, const char *old_name, const char *new_name) { LOG("Renaming current workspace to \"%s\"\n", new_name); } - Con *output, *workspace = NULL; + Con *workspace; if (old_name) { - TAILQ_FOREACH(output, &(croot->nodes_head), nodes) - GREP_FIRST(workspace, output_get_content(output), - !strcasecmp(child->name, old_name)); + workspace = get_existing_workspace_by_name(old_name); } else { workspace = con_get_workspace(focused); old_name = workspace->name; @@ -2003,10 +1953,7 @@ void cmd_rename_workspace(I3_CMD, const char *old_name, const char *new_name) { 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)); + Con *check_dest = get_existing_workspace_by_name(new_name); /* If check_dest == workspace, the user might be changing the case of the * workspace, or it might just be a no-op. */ @@ -2026,9 +1973,11 @@ void cmd_rename_workspace(I3_CMD, const char *old_name, const char *new_name) { /* By re-attaching, the sort order will be correct afterwards. */ Con *previously_focused = focused; + Con *previously_focused_content = focused->type == CT_WORKSPACE ? focused->parent : NULL; Con *parent = workspace->parent; con_detach(workspace); con_attach(workspace, parent, false); + ipc_send_workspace_event("rename", workspace, NULL); /* Move the workspace to the correct output if it has an assignment */ struct Workspace_Assignment *assignment = NULL; @@ -2039,21 +1988,40 @@ void cmd_rename_workspace(I3_CMD, const char *old_name, const char *new_name) { continue; } - workspace_move_to_output(workspace, assignment->output); - - if (previously_focused) - workspace_show(con_get_workspace(previously_focused)); + Output *target_output = get_output_by_name(assignment->output, true); + if (!target_output) { + LOG("Could not get output named \"%s\"\n", assignment->output); + continue; + } + if (!output_triggers_assignment(target_output, assignment)) { + continue; + } + workspace_move_to_output(workspace, target_output); break; } - /* Restore the previous focus since con_attach messes with the focus. */ - con_focus(previously_focused); + bool can_restore_focus = previously_focused != NULL; + /* NB: If previously_focused is a workspace we can't work directly with it + * 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 focus + * previously_focused if we still find it. */ + if (previously_focused_content) { + Con *workspace = NULL; + GREP_FIRST(workspace, previously_focused_content, child == previously_focused); + can_restore_focus &= (workspace != NULL); + } + + if (can_restore_focus) { + /* Restore the previous focus since con_attach messes with the focus. */ + workspace_show(con_get_workspace(previously_focused)); + con_focus(previously_focused); + } cmd_output->needs_tree_render = true; ysuccess(true); - ipc_send_workspace_event("rename", workspace, NULL); ewmh_update_desktop_names(); ewmh_update_desktop_viewport(); ewmh_update_current_desktop(); @@ -2066,7 +2034,7 @@ void cmd_rename_workspace(I3_CMD, const char *old_name, const char *new_name) { * Implementation of 'bar mode dock|hide|invisible|toggle []' * */ -bool cmd_bar_mode(const char *bar_mode, const char *bar_id) { +static 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) @@ -2111,7 +2079,7 @@ bool cmd_bar_mode(const char *bar_mode, const char *bar_id) { * Implementation of 'bar hidden_state hide|show|toggle []' * */ -bool cmd_bar_hidden_state(const char *bar_hidden_state, const char *bar_id) { +static 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) @@ -2185,21 +2153,22 @@ void cmd_shmlog(I3_CMD, const char *argument) { else if (!strcmp(argument, "off")) shmlog_size = 0; else { + long new_size = 0; + if (!parse_long(argument, &new_size, 0)) { + yerror("Failed to parse %s into a shmlog size.", argument); + return; + } /* If shm logging now, restart logging with the new size. */ if (shmlog_size > 0) { shmlog_size = 0; LOG("Restarting shm logging...\n"); init_logging(); } - shmlog_size = atoi(argument); - /* Make a weakly attempt at ensuring the argument is valid. */ - if (shmlog_size <= 0) - shmlog_size = default_shmlog_size; + shmlog_size = (int)new_size; } LOG("%s shm logging\n", shmlog_size > 0 ? "Enabling" : "Disabling"); init_logging(); update_shmlog_atom(); - // XXX: default reply for now, make this a better reply ysuccess(true); }