diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-09-27 22:44:57 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-09-27 22:51:37 +1000 |
commit | 21ff87d72b44604d348cf71da3175b85ac5b2f75 (patch) | |
tree | de0ecfd66fd3a6957e0f8a2eb5038c785b3965c2 /sway/commands/border.c | |
parent | Rename view_set_csd_from_client to view_update_csd_from_client (diff) | |
download | sway-21ff87d72b44604d348cf71da3175b85ac5b2f75.tar.gz sway-21ff87d72b44604d348cf71da3175b85ac5b2f75.tar.zst sway-21ff87d72b44604d348cf71da3175b85ac5b2f75.zip |
Improve CSD logic
This does the following:
* Removes the xdg-decoration surface_commit listener. I was under the
impression the client could ignore the server's preference and set
whatever decoration they like using this protocol, but I don't think
that's right.
* Adds a listener for the xdg-decoration request_mode signal. The
protocol states that the server should respond to this with its
preference. We'll always respond with SSD here.
* Makes it so tiled views which use CSD will still have sway decorations
rendered. To do this, using_csd had to be added back to the view struct,
and the border is changed when floating or unfloating a view.
Diffstat (limited to 'sway/commands/border.c')
-rw-r--r-- | sway/commands/border.c | 45 |
1 files changed, 39 insertions, 6 deletions
diff --git a/sway/commands/border.c b/sway/commands/border.c index 5e101564..bfd3b9ed 100644 --- a/sway/commands/border.c +++ b/sway/commands/border.c | |||
@@ -7,15 +7,49 @@ | |||
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. | ||
10 | static void set_border(struct sway_view *view, | 15 | static void set_border(struct sway_view *view, |
11 | enum sway_container_border new_border) { | 16 | enum sway_container_border new_border) { |
12 | if (view->border == B_CSD && new_border != B_CSD) { | 17 | if (view->using_csd && new_border != B_CSD) { |
13 | view_set_csd_from_server(view, false); | 18 | view_set_csd_from_server(view, false); |
14 | } else if (view->border != B_CSD && new_border == B_CSD) { | 19 | } else if (!view->using_csd && new_border == B_CSD) { |
15 | view_set_csd_from_server(view, true); | 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; | ||
16 | } | 52 | } |
17 | view->saved_border = view->border; | ||
18 | view->border = new_border; | ||
19 | } | 53 | } |
20 | 54 | ||
21 | struct cmd_results *cmd_border(int argc, char **argv) { | 55 | struct cmd_results *cmd_border(int argc, char **argv) { |
@@ -44,8 +78,7 @@ struct cmd_results *cmd_border(int argc, char **argv) { | |||
44 | } | 78 | } |
45 | set_border(view, B_CSD); | 79 | set_border(view, B_CSD); |
46 | } else if (strcmp(argv[0], "toggle") == 0) { | 80 | } else if (strcmp(argv[0], "toggle") == 0) { |
47 | int num_available = view->xdg_decoration ? 4 : 3; | 81 | border_toggle(view); |
48 | set_border(view, (view->border + 1) % num_available); | ||
49 | } else { | 82 | } else { |
50 | return cmd_results_new(CMD_INVALID, "border", | 83 | return cmd_results_new(CMD_INVALID, "border", |
51 | "Expected 'border <none|normal|pixel|toggle>' " | 84 | "Expected 'border <none|normal|pixel|toggle>' " |