diff options
Diffstat (limited to 'sway/commands/border.c')
-rw-r--r-- | sway/commands/border.c | 59 |
1 files changed, 55 insertions, 4 deletions
diff --git a/sway/commands/border.c b/sway/commands/border.c index 95498b2f..bfd3b9ed 100644 --- a/sway/commands/border.c +++ b/sway/commands/border.c | |||
@@ -7,6 +7,51 @@ | |||
7 | #include "sway/tree/container.h" | 7 | #include "sway/tree/container.h" |
8 | #include "sway/tree/view.h" | 8 | #include "sway/tree/view.h" |
9 | 9 | ||
10 | // A couple of things here: | ||
11 | // - view->border should never be B_CSD when the view is tiled, even when CSD is | ||
12 | // in use (we set using_csd instead and render a sway border). | ||
13 | // - view->saved_border should be the last applied border when switching to CSD. | ||
14 | // - view->using_csd should always reflect whether CSD is applied or not. | ||
15 | static void set_border(struct sway_view *view, | ||
16 | enum sway_container_border new_border) { | ||
17 | if (view->using_csd && new_border != B_CSD) { | ||
18 | view_set_csd_from_server(view, false); | ||
19 | } else if (!view->using_csd && new_border == B_CSD) { | ||
20 | view_set_csd_from_server(view, true); | ||
21 | view->saved_border = view->border; | ||
22 | } | ||
23 | if (new_border != B_CSD || container_is_floating(view->container)) { | ||
24 | view->border = new_border; | ||
25 | } | ||
26 | view->using_csd = new_border == B_CSD; | ||
27 | } | ||
28 | |||
29 | static void border_toggle(struct sway_view *view) { | ||
30 | if (view->using_csd) { | ||
31 | set_border(view, B_NONE); | ||
32 | return; | ||
33 | } | ||
34 | switch (view->border) { | ||
35 | case B_NONE: | ||
36 | set_border(view, B_PIXEL); | ||
37 | break; | ||
38 | case B_PIXEL: | ||
39 | set_border(view, B_NORMAL); | ||
40 | break; | ||
41 | case B_NORMAL: | ||
42 | if (view->xdg_decoration) { | ||
43 | set_border(view, B_CSD); | ||
44 | } else { | ||
45 | set_border(view, B_NONE); | ||
46 | } | ||
47 | break; | ||
48 | case B_CSD: | ||
49 | // view->using_csd should be true so it would have returned above | ||
50 | sway_assert(false, "Unreachable"); | ||
51 | break; | ||
52 | } | ||
53 | } | ||
54 | |||
10 | struct cmd_results *cmd_border(int argc, char **argv) { | 55 | struct cmd_results *cmd_border(int argc, char **argv) { |
11 | struct cmd_results *error = NULL; | 56 | struct cmd_results *error = NULL; |
12 | if ((error = checkarg(argc, "border", EXPECTED_AT_LEAST, 1))) { | 57 | if ((error = checkarg(argc, "border", EXPECTED_AT_LEAST, 1))) { |
@@ -21,13 +66,19 @@ struct cmd_results *cmd_border(int argc, char **argv) { | |||
21 | struct sway_view *view = container->view; | 66 | struct sway_view *view = container->view; |
22 | 67 | ||
23 | if (strcmp(argv[0], "none") == 0) { | 68 | if (strcmp(argv[0], "none") == 0) { |
24 | view->border = B_NONE; | 69 | set_border(view, B_NONE); |
25 | } else if (strcmp(argv[0], "normal") == 0) { | 70 | } else if (strcmp(argv[0], "normal") == 0) { |
26 | view->border = B_NORMAL; | 71 | set_border(view, B_NORMAL); |
27 | } else if (strcmp(argv[0], "pixel") == 0) { | 72 | } else if (strcmp(argv[0], "pixel") == 0) { |
28 | view->border = B_PIXEL; | 73 | set_border(view, B_PIXEL); |
74 | } else if (strcmp(argv[0], "csd") == 0) { | ||
75 | if (!view->xdg_decoration) { | ||
76 | return cmd_results_new(CMD_INVALID, "border", | ||
77 | "This window doesn't support client side decorations"); | ||
78 | } | ||
79 | set_border(view, B_CSD); | ||
29 | } else if (strcmp(argv[0], "toggle") == 0) { | 80 | } else if (strcmp(argv[0], "toggle") == 0) { |
30 | view->border = (view->border + 1) % 3; | 81 | border_toggle(view); |
31 | } else { | 82 | } else { |
32 | return cmd_results_new(CMD_INVALID, "border", | 83 | return cmd_results_new(CMD_INVALID, "border", |
33 | "Expected 'border <none|normal|pixel|toggle>' " | 84 | "Expected 'border <none|normal|pixel|toggle>' " |