From 7b138e5ef0f679c9bb0078019d7c9c63fef36273 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Mon, 24 Sep 2018 20:54:57 +1000 Subject: Add CSD to border modes This replaces view.using_csd with a new border mode: B_CSD. This also removes sway_xdg_shell{_v6}_view.deco_mode and view->has_client_side_decorations as we can now get these from the border. You can use `border toggle` to cycle through the modes including CSD, or use `border csd` to set it directly. The client must support the xdg-decoration protocol, and the only client I know of that does is the example in wlroots. If the client switches from SSD to CSD without us expecting it (via the server-decoration protocol), we stash the previous border type into view.saved_border so we can restore it if the client returns to SSD. I haven't found a way to test this though. --- sway/commands/border.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'sway/commands') diff --git a/sway/commands/border.c b/sway/commands/border.c index 95498b2f..673fea08 100644 --- a/sway/commands/border.c +++ b/sway/commands/border.c @@ -7,6 +7,17 @@ #include "sway/tree/container.h" #include "sway/tree/view.h" +static void set_border(struct sway_view *view, + enum sway_container_border new_border) { + if (view->border == B_CSD && new_border != B_CSD) { + view_set_csd_from_server(view, false); + } else if (view->border != B_CSD && new_border == B_CSD) { + view_set_csd_from_server(view, true); + } + view->saved_border = view->border; + view->border = new_border; +} + struct cmd_results *cmd_border(int argc, char **argv) { struct cmd_results *error = NULL; if ((error = checkarg(argc, "border", EXPECTED_AT_LEAST, 1))) { @@ -21,13 +32,15 @@ struct cmd_results *cmd_border(int argc, char **argv) { struct sway_view *view = container->view; if (strcmp(argv[0], "none") == 0) { - view->border = B_NONE; + set_border(view, B_NONE); } else if (strcmp(argv[0], "normal") == 0) { - view->border = B_NORMAL; + set_border(view, B_NORMAL); } else if (strcmp(argv[0], "pixel") == 0) { - view->border = B_PIXEL; + set_border(view, B_PIXEL); + } else if (strcmp(argv[0], "csd") == 0) { + set_border(view, B_CSD); } else if (strcmp(argv[0], "toggle") == 0) { - view->border = (view->border + 1) % 3; + set_border(view, (view->border + 1) % 4); } else { return cmd_results_new(CMD_INVALID, "border", "Expected 'border ' " -- cgit v1.2.3 From efcfe57b1072283c94a74d074f0e38efc3b57af8 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Tue, 25 Sep 2018 19:34:53 +1000 Subject: Remove CSD from toggle list if client doesn't support it --- sway/commands/border.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'sway/commands') diff --git a/sway/commands/border.c b/sway/commands/border.c index 673fea08..5e101564 100644 --- a/sway/commands/border.c +++ b/sway/commands/border.c @@ -38,9 +38,14 @@ struct cmd_results *cmd_border(int argc, char **argv) { } else if (strcmp(argv[0], "pixel") == 0) { set_border(view, B_PIXEL); } else if (strcmp(argv[0], "csd") == 0) { + if (!view->xdg_decoration) { + return cmd_results_new(CMD_INVALID, "border", + "This window doesn't support client side decorations"); + } set_border(view, B_CSD); } else if (strcmp(argv[0], "toggle") == 0) { - set_border(view, (view->border + 1) % 4); + int num_available = view->xdg_decoration ? 4 : 3; + set_border(view, (view->border + 1) % num_available); } else { return cmd_results_new(CMD_INVALID, "border", "Expected 'border ' " -- cgit v1.2.3 From 21ff87d72b44604d348cf71da3175b85ac5b2f75 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Thu, 27 Sep 2018 22:44:57 +1000 Subject: 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. --- sway/commands/border.c | 45 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 39 insertions(+), 6 deletions(-) (limited to 'sway/commands') 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 @@ #include "sway/tree/container.h" #include "sway/tree/view.h" +// A couple of things here: +// - view->border should never be B_CSD when the view is tiled, even when CSD is +// in use (we set using_csd instead and render a sway border). +// - view->saved_border should be the last applied border when switching to CSD. +// - view->using_csd should always reflect whether CSD is applied or not. static void set_border(struct sway_view *view, enum sway_container_border new_border) { - if (view->border == B_CSD && new_border != B_CSD) { + if (view->using_csd && new_border != B_CSD) { view_set_csd_from_server(view, false); - } else if (view->border != B_CSD && new_border == B_CSD) { + } else if (!view->using_csd && new_border == B_CSD) { view_set_csd_from_server(view, true); + view->saved_border = view->border; + } + if (new_border != B_CSD || container_is_floating(view->container)) { + view->border = new_border; + } + view->using_csd = new_border == B_CSD; +} + +static void border_toggle(struct sway_view *view) { + if (view->using_csd) { + set_border(view, B_NONE); + return; + } + switch (view->border) { + case B_NONE: + set_border(view, B_PIXEL); + break; + case B_PIXEL: + set_border(view, B_NORMAL); + break; + case B_NORMAL: + if (view->xdg_decoration) { + set_border(view, B_CSD); + } else { + set_border(view, B_NONE); + } + break; + case B_CSD: + // view->using_csd should be true so it would have returned above + sway_assert(false, "Unreachable"); + break; } - view->saved_border = view->border; - view->border = new_border; } struct cmd_results *cmd_border(int argc, char **argv) { @@ -44,8 +78,7 @@ struct cmd_results *cmd_border(int argc, char **argv) { } set_border(view, B_CSD); } else if (strcmp(argv[0], "toggle") == 0) { - int num_available = view->xdg_decoration ? 4 : 3; - set_border(view, (view->border + 1) % num_available); + border_toggle(view); } else { return cmd_results_new(CMD_INVALID, "border", "Expected 'border ' " -- cgit v1.2.3