Make xwayland scale factor configurable via xwayland scale command.

Author: Dirbaio

.gitignore

@@ -9,5 +9,3 @@ build-*/
 .lvimrc
 config-debug
 wayland-*-protocol.*
-/subprojects/wlroots
-subprojects

include/sway/commands.h

@@ -290,6 +290,11 @@ sway_cmd seat_cmd_keyboard_grouping;
 sway_cmd seat_cmd_pointer_constraint;
 sway_cmd seat_cmd_xcursor_theme;
 
+sway_cmd xwayland_cmd_enable;
+sway_cmd xwayland_cmd_disable;
+sway_cmd xwayland_cmd_force;
+sway_cmd xwayland_cmd_scale;
+
 sway_cmd cmd_ipc_cmd;
 sway_cmd cmd_ipc_events;
 sway_cmd cmd_ipc_event_cmd;

include/sway/config.h

@@ -513,6 +513,7 @@ struct sway_config {
 	enum sway_fowa focus_on_window_activation;
 	enum sway_popup_during_fullscreen popup_during_fullscreen;
 	enum xwayland_mode xwayland;
+	int32_t xwayland_scale;
 
 	// swaybg
 	char *swaybg_command;

sway/commands.c

@@ -97,6 +97,7 @@ static struct cmd_handler handlers[] = {
 	{ "unbindsym", cmd_unbindsym },
 	{ "workspace", cmd_workspace },
 	{ "workspace_auto_back_and_forth", cmd_ws_auto_back_and_forth },
+	{ "xwayland", cmd_xwayland },
 };
 
 /* Config-time only commands. Keep alphabetized */
@@ -105,7 +106,6 @@ static struct cmd_handler config_handlers[] = {
 	{ "swaybg_command", cmd_swaybg_command },
 	{ "swaynag_command", cmd_swaynag_command },
 	{ "workspace_layout", cmd_workspace_layout },
-	{ "xwayland", cmd_xwayland },
 };
 
 /* Runtime-only commands. Keep alphabetized */

sway/commands/xwayland.c

@@ -4,27 +4,39 @@
 #include "sway/server.h"
 #include "util.h"
 
-struct cmd_results *cmd_xwayland(int argc, char **argv) {
-	struct cmd_results *error = NULL;
-	if ((error = checkarg(argc, "xwayland", EXPECTED_EQUAL_TO, 1))) {
-		return error;
-	}
+// must be in order for the bsearch
+static struct cmd_handler xwayland_handlers[] = {
+	{ "enable", xwayland_cmd_enable },
+	{ "disable", xwayland_cmd_disable },
+	{ "force", xwayland_cmd_force },
+	{ "scale", xwayland_cmd_scale },
+};
 
+struct cmd_results *cmd_xwayland(int argc, char **argv) {
 #ifdef HAVE_XWAYLAND
-	enum xwayland_mode xwayland;
-	if (strcmp(argv[0], "force") == 0) {
-		xwayland = XWAYLAND_MODE_IMMEDIATE;
-	} else if (parse_boolean(argv[0], true)) {
-		xwayland = XWAYLAND_MODE_LAZY;
-	} else {
-		xwayland = XWAYLAND_MODE_DISABLED;
-	}
+	struct cmd_results *error;
+	while (argc > 0) {
+		config->handler_context.leftovers.argc = 0;
+		config->handler_context.leftovers.argv = NULL;
 
-	if (config->reloading && config->xwayland != xwayland) {
-		return cmd_results_new(CMD_FAILURE,
-				"xwayland can only be enabled/disabled at launch");
+		if (find_handler(*argv, xwayland_handlers, sizeof(xwayland_handlers))) {
+			error = config_subcommand(argv, argc, xwayland_handlers,
+					sizeof(xwayland_handlers));
+		} else {
+			error = cmd_results_new(CMD_INVALID,
+				"Invalid output subcommand: %s.", *argv);
+		}
+
+		if (error != NULL) {
+			return error;
+		}
+
+		argc = config->handler_context.leftovers.argc;
+		argv = config->handler_context.leftovers.argv;
 	}
-	config->xwayland = xwayland;
+
+	config->handler_context.leftovers.argc = 0;
+	config->handler_context.leftovers.argv = NULL;
 #else
 	sway_log(SWAY_INFO, "Ignoring `xwayland` command, "
 		"sway hasn't been built with Xwayland support");

sway/commands/xwayland/disable.c

@@ -0,0 +1,15 @@
+#include "sway/commands.h"
+#include "sway/config.h"
+
+struct cmd_results *xwayland_cmd_disable(int argc, char **argv) {
+	if (config->reloading && config->xwayland != XWAYLAND_MODE_DISABLED) {
+		return cmd_results_new(CMD_FAILURE,
+				"xwayland can only be enabled/disabled at launch");
+	}
+
+	config->xwayland = XWAYLAND_MODE_DISABLED;
+
+	config->handler_context.leftovers.argc = argc;
+	config->handler_context.leftovers.argv = argv;
+	return NULL;
+}

sway/commands/xwayland/enable.c

@@ -0,0 +1,15 @@
+#include "sway/commands.h"
+#include "sway/config.h"
+
+struct cmd_results *xwayland_cmd_enable(int argc, char **argv) {
+	if (config->reloading && config->xwayland != XWAYLAND_MODE_LAZY) {
+		return cmd_results_new(CMD_FAILURE,
+				"xwayland can only be enabled/disabled at launch");
+	}
+	config->xwayland = XWAYLAND_MODE_LAZY;
+
+	config->handler_context.leftovers.argc = argc;
+	config->handler_context.leftovers.argv = argv;
+	return NULL;
+}
+

sway/commands/xwayland/force.c

@@ -0,0 +1,15 @@
+#include "sway/commands.h"
+#include "sway/config.h"
+
+struct cmd_results *xwayland_cmd_force(int argc, char **argv) {
+	if (config->reloading && config->xwayland != XWAYLAND_MODE_IMMEDIATE) {
+		return cmd_results_new(CMD_FAILURE,
+				"xwayland can only be enabled/disabled at launch");
+	}
+	config->xwayland = XWAYLAND_MODE_IMMEDIATE;
+
+	config->handler_context.leftovers.argc = argc;
+	config->handler_context.leftovers.argv = argv;
+	return NULL;
+}
+

sway/commands/xwayland/scale.c

@@ -0,0 +1,31 @@
+#include <strings.h>
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/server.h"
+#include "log.h"
+
+struct cmd_results *xwayland_cmd_scale(int argc, char **argv) {
+	if (!argc) {
+		return cmd_results_new(CMD_INVALID, "Missing scale argument.");
+	}
+
+	char *end;
+	int32_t scale = strtol(*argv, &end, 10);
+	if (*end) {
+		return cmd_results_new(CMD_INVALID, "Invalid scale.");
+	}
+	if(scale < 1) {
+		return cmd_results_new(CMD_INVALID, "Invalid scale: must be 1 or higher");
+	}
+	
+	config->xwayland_scale = scale;
+
+	if(server.xwayland.wlr_xwayland != NULL) {
+		wlr_xwayland_set_scale(server.xwayland.wlr_xwayland, scale);
+	}
+
+	config->handler_context.leftovers.argc = argc - 1;
+	config->handler_context.leftovers.argv = argv + 1;
+
+	return NULL;
+}

sway/config.c

@@ -243,6 +243,7 @@ static void config_defaults(struct sway_config *config) {
 	config->urgent_timeout = 500;
 	config->popup_during_fullscreen = POPUP_SMART;
 	config->xwayland = XWAYLAND_MODE_LAZY;
+	config->xwayland_scale = 1;
 
 	config->titlebar_border_thickness = 1;
 	config->titlebar_h_padding = 5;