X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fcommands.c;h=393d70185e5a8e9e8d779c3ecee657d9fadba459;hb=5f9a5e8d7d0eb3123fd7068452090b72b9096bea;hp=af72f5bbc3c8443f1c3bf300d2560d159bf1f57d;hpb=e2d1f0f567bc986307ebde3ccd934d96e7c04808;p=i3%2Fi3 diff --git a/src/commands.c b/src/commands.c index af72f5bb..393d7018 100644 --- a/src/commands.c +++ b/src/commands.c @@ -1,5 +1,3 @@ -#undef I3__FILE__ -#define I3__FILE__ "commands.c" /* * vim:ts=4:sw=4:expandtab * @@ -9,6 +7,9 @@ * commands.c: all command functions (see commands_parser.c) * */ +#include "all.h" + +#include #include #include @@ -16,7 +17,6 @@ #include #endif -#include "all.h" #include "shmlog.h" // Macros to make the YAJL API a bit easier to use. @@ -46,7 +46,7 @@ } \ } while (0) -/** If an error occured during parsing of the criteria, we want to exit instead +/** 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 { \ @@ -86,17 +86,6 @@ 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 @@ -153,7 +142,9 @@ static Con *maybe_auto_back_and_forth_workspace(Con *workspace) { */ typedef struct owindow { Con *con; - TAILQ_ENTRY(owindow) owindows; + + TAILQ_ENTRY(owindow) + owindows; } owindow; typedef TAILQ_HEAD(owindows_head, owindow) owindows_head; @@ -902,8 +893,10 @@ void cmd_workspace_number(I3_CMD, const char *which, const char *_no_auto_back_a cmd_output->needs_tree_render = true; return; } - if (!no_auto_back_and_forth && 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; @@ -949,8 +942,10 @@ void cmd_workspace_name(I3_CMD, const char *name, const char *_no_auto_back_and_ } DLOG("should switch to workspace %s\n", name); - if (!no_auto_back_and_forth && 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; @@ -1035,7 +1030,7 @@ void cmd_move_con_to_output(I3_CMD, const char *name) { TAILQ_FOREACH(current, &owindows, owindows) { DLOG("matching: %p / %s\n", current->con, current->con->name); - Output *current_output = get_output_of_con(current->con); + Output *current_output = get_output_for_con(current->con); assert(current_output != NULL); Output *output = get_output_from_string(current_output, name); @@ -1494,21 +1489,8 @@ void cmd_move_direction(I3_CMD, const char *direction, long move_px) { void cmd_layout(I3_CMD, const char *layout_str) { HANDLE_EMPTY_MATCH; - if (strcmp(layout_str, "stacking") == 0) - layout_str = "stacked"; 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; } @@ -1567,7 +1549,7 @@ void cmd_exit(I3_CMD) { #ifdef I3_ASAN_ENABLED __lsan_do_leak_check(); #endif - ipc_shutdown(); + ipc_shutdown(SHUTDOWN_REASON_EXIT); unlink(config.ipc_socket_path); xcb_disconnect(conn); exit(0); @@ -1600,7 +1582,7 @@ void cmd_reload(I3_CMD) { */ 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 */ @@ -1625,7 +1607,7 @@ void cmd_open(I3_CMD) { 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; @@ -1647,7 +1629,7 @@ void cmd_focus_output(I3_CMD, const char *name) { 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); @@ -1830,6 +1812,65 @@ void cmd_scratchpad_show(I3_CMD) { ysuccess(true); } +/* + * Implementation of 'swap [container] [with] id|con_id|mark '. + * + */ +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 *)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 ' * @@ -1909,7 +1950,9 @@ void cmd_rename_workspace(I3_CMD, const char *old_name, const char *new_name) { 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; }