Merge pull request #2703 from RyanDwyer/csd-border

Add CSD to border modes

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 @@
 #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->using_csd && new_border != B_CSD) {
+		view_set_csd_from_server(view, false);
+	} 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;
+	}
+}
+
 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 +66,19 @@ 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) {
+		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) {
-		view->border = (view->border + 1) % 3;
+		border_toggle(view);
 	} else {
 		return cmd_results_new(CMD_INVALID, "border",
 				"Expected 'border <none|normal|pixel|toggle>' "