diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-09-01 21:28:13 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-09-01 21:28:13 +1000 |
commit | 016d0455f809ac3b8da8a040611d691b96502c15 (patch) | |
tree | 3b6131e483dfb9abb40de08c03d19b82d5c20137 | |
parent | Merge pull request #2546 from RyanDwyer/fix-transaction-spamming (diff) | |
download | sway-016d0455f809ac3b8da8a040611d691b96502c15.tar.gz sway-016d0455f809ac3b8da8a040611d691b96502c15.tar.zst sway-016d0455f809ac3b8da8a040611d691b96502c15.zip |
Implement deprecated new_window and new_float commands
May as well make it as easy as possible for users who are coming from
i3.
This also changes the `border` command to accept a thickness when
setting the border to normal. This makes it work the same way as the
`default_border` command. Eg. `border normal 5`
-rw-r--r-- | sway/commands.c | 2 | ||||
-rw-r--r-- | sway/commands/border.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sway/commands.c b/sway/commands.c index d9c54adc..13f5983e 100644 --- a/sway/commands.c +++ b/sway/commands.c | |||
@@ -118,6 +118,8 @@ static struct cmd_handler handlers[] = { | |||
118 | { "input", cmd_input }, | 118 | { "input", cmd_input }, |
119 | { "mode", cmd_mode }, | 119 | { "mode", cmd_mode }, |
120 | { "mouse_warping", cmd_mouse_warping }, | 120 | { "mouse_warping", cmd_mouse_warping }, |
121 | { "new_float", cmd_default_floating_border }, | ||
122 | { "new_window", cmd_default_border }, | ||
121 | { "no_focus", cmd_no_focus }, | 123 | { "no_focus", cmd_no_focus }, |
122 | { "output", cmd_output }, | 124 | { "output", cmd_output }, |
123 | { "seat", cmd_seat }, | 125 | { "seat", cmd_seat }, |
diff --git a/sway/commands/border.c b/sway/commands/border.c index 9c19e20a..9502c877 100644 --- a/sway/commands/border.c +++ b/sway/commands/border.c | |||
@@ -27,9 +27,6 @@ struct cmd_results *cmd_border(int argc, char **argv) { | |||
27 | view->border = B_NORMAL; | 27 | view->border = B_NORMAL; |
28 | } else if (strcmp(argv[0], "pixel") == 0) { | 28 | } else if (strcmp(argv[0], "pixel") == 0) { |
29 | view->border = B_PIXEL; | 29 | view->border = B_PIXEL; |
30 | if (argc == 2) { | ||
31 | view->border_thickness = atoi(argv[1]); | ||
32 | } | ||
33 | } else if (strcmp(argv[0], "toggle") == 0) { | 30 | } else if (strcmp(argv[0], "toggle") == 0) { |
34 | view->border = (view->border + 1) % 3; | 31 | view->border = (view->border + 1) % 3; |
35 | } else { | 32 | } else { |
@@ -37,6 +34,9 @@ struct cmd_results *cmd_border(int argc, char **argv) { | |||
37 | "Expected 'border <none|normal|pixel|toggle>' " | 34 | "Expected 'border <none|normal|pixel|toggle>' " |
38 | "or 'border pixel <px>'"); | 35 | "or 'border pixel <px>'"); |
39 | } | 36 | } |
37 | if (argc == 2) { | ||
38 | view->border_thickness = atoi(argv[1]); | ||
39 | } | ||
40 | 40 | ||
41 | if (container_is_floating(view->swayc)) { | 41 | if (container_is_floating(view->swayc)) { |
42 | container_set_geometry_from_floating_view(view->swayc); | 42 | container_set_geometry_from_floating_view(view->swayc); |