diff options
| author | emersion <contact@emersion.fr> | 2018-05-23 22:54:52 +0100 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2018-05-23 22:54:52 +0100 |
| commit | cd0fca2ebf81c252b3743c4474a5fdbcd3e2afad (patch) | |
| tree | 595f1e80551b64de0d4e24f5721bae27acc195d9 /sway/commands | |
| parent | b7ab7c0e66433aacaaccce08d6e40304e6f6593c (diff) | |
| parent | 12a12878b9883c345dd73752a9cf714aeb245b8a (diff) | |
Merge branch 'master' into fix-swaylock-hotplugging
Diffstat (limited to 'sway/commands')
| -rw-r--r-- | sway/commands/border.c | 2 | ||||
| -rw-r--r-- | sway/commands/layout.c | 4 | ||||
| -rw-r--r-- | sway/commands/seat/cursor.c | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/sway/commands/border.c b/sway/commands/border.c index 1eb06a21..4ba361da 100644 --- a/sway/commands/border.c +++ b/sway/commands/border.c @@ -41,7 +41,7 @@ struct cmd_results *cmd_border(int argc, char **argv) { struct sway_seat *seat = input_manager_current_seat(input_manager); if (seat->cursor) { - cursor_send_pointer_motion(seat->cursor, 0); + cursor_send_pointer_motion(seat->cursor, 0, false); } return cmd_results_new(CMD_SUCCESS, NULL, NULL); diff --git a/sway/commands/layout.c b/sway/commands/layout.c index bb36bb18..58728f16 100644 --- a/sway/commands/layout.c +++ b/sway/commands/layout.c @@ -39,6 +39,10 @@ struct cmd_results *cmd_layout(int argc, char **argv) { parent->layout = L_HORIZ; } else if (strcasecmp(argv[0], "splitv") == 0) { parent->layout = L_VERT; + } else if (strcasecmp(argv[0], "tabbed") == 0) { + parent->layout = L_TABBED; + } else if (strcasecmp(argv[0], "stacking") == 0) { + parent->layout = L_STACKED; } else if (strcasecmp(argv[0], "toggle") == 0 && argc == 2 && strcasecmp(argv[1], "split") == 0) { if (parent->layout == L_HORIZ) { parent->layout = L_VERT; diff --git a/sway/commands/seat/cursor.c b/sway/commands/seat/cursor.c index 929384b0..4d0a22c7 100644 --- a/sway/commands/seat/cursor.c +++ b/sway/commands/seat/cursor.c @@ -36,7 +36,7 @@ struct cmd_results *seat_cmd_cursor(int argc, char **argv) { int delta_x = strtol(argv[1], NULL, 10); int delta_y = strtol(argv[2], NULL, 10); wlr_cursor_move(cursor->cursor, NULL, delta_x, delta_y); - cursor_send_pointer_motion(cursor, 0); + cursor_send_pointer_motion(cursor, 0, true); } else if (strcasecmp(argv[0], "set") == 0) { if (argc < 3) { return cmd_results_new(CMD_INVALID, "cursor", expected_syntax); @@ -45,7 +45,7 @@ struct cmd_results *seat_cmd_cursor(int argc, char **argv) { float x = strtof(argv[1], NULL) / root_container.width; float y = strtof(argv[2], NULL) / root_container.height; wlr_cursor_warp_absolute(cursor->cursor, NULL, x, y); - cursor_send_pointer_motion(cursor, 0); + cursor_send_pointer_motion(cursor, 0, true); } else { if (argc < 2) { return cmd_results_new(CMD_INVALID, "cursor", expected_syntax); |