diff options
| author | Drew DeVault <sir@cmpwn.com> | 2016-07-18 08:50:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-18 08:50:53 -0400 |
| commit | c0e45222023e1a0ca0a37b73bb79931ac45f67aa (patch) | |
| tree | 6840765daed668ac273d4296f9123547ab4bd7b4 | |
| parent | 295664571882abe839fa48f1c21d7bcd9b17f4b0 (diff) | |
| parent | d9eb49f3b1b07a06300c40cb4dae0535279d0302 (diff) | |
| download | sway-c0e45222023e1a0ca0a37b73bb79931ac45f67aa.tar.xz | |
Merge pull request #764 from deklov/move-position-bug-02
Do not crash when handling the command 'move position'
| -rw-r--r-- | sway/commands.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sway/commands.c b/sway/commands.c index 73f245c1..aaacf0fc 100644 --- a/sway/commands.c +++ b/sway/commands.c @@ -1011,7 +1011,8 @@ static struct cmd_results *cmd_move(int argc, char **argv) { } const char* expected_syntax = "Expected 'move <left|right|up|down>' or " "'move <container|window> to workspace <name>' or " - "'move <container|window|workspace> to output <name|direction>'"; + "'move <container|window|workspace> to output <name|direction>' or " + "'move position mouse'"; swayc_t *view = get_focused_container(&root_container); if (strcasecmp(argv[0], "left") == 0) { @@ -1115,7 +1116,14 @@ static struct cmd_results *cmd_move(int argc, char **argv) { focused = swayc_active_workspace(); } set_focused_container(focused); - } else if (strcasecmp(argv[0], "position") == 0 && strcasecmp(argv[1], "mouse") == 0) { + } else if (strcasecmp(argv[0], "position") == 0) { + if ((error = checkarg(argc, "move workspace", EXPECTED_EQUAL_TO, 2))) { + return error; + } + if (strcasecmp(argv[1], "mouse")) { + return cmd_results_new(CMD_INVALID, "move", expected_syntax); + } + if (view->is_floating) { swayc_t *output = swayc_parent_by_type(view, C_OUTPUT); struct wlc_geometry g; |