build: bump version to 1.10.1

(cherry picked from commit 30c858423d)

.builds/alpine.yml

@@ -25,7 +25,7 @@ packages:
   - hwdata-dev
 sources:
   - https://github.com/swaywm/sway
-  - https://gitlab.freedesktop.org/wlroots/wlroots.git
+  - https://gitlab.freedesktop.org/wlroots/wlroots.git#0.18
 tasks:
   - wlroots: |
       cd wlroots

.builds/archlinux.yml

@@ -22,7 +22,7 @@ packages:
   - hwdata
 sources:
   - https://github.com/swaywm/sway
-  - https://gitlab.freedesktop.org/wlroots/wlroots.git
+  - https://gitlab.freedesktop.org/wlroots/wlroots.git#0.18
 tasks:
   - wlroots: |
       cd wlroots

.builds/freebsd.yml

@@ -31,7 +31,7 @@ packages:
 - misc/hwdata
 sources:
 - https://github.com/swaywm/sway
-- https://gitlab.freedesktop.org/wlroots/wlroots.git
+- https://gitlab.freedesktop.org/wlroots/wlroots.git#0.18
 tasks:
 - setup: |
     cd sway

README.cs.md

@@ -1,5 +1,7 @@
 # sway
 
+[English][en] - [عربي][ar] - **[Česky][cs]** - [Deutsch][de] - [Dansk][dk] - [Español][es] - [Français][fr] - [ქართული][ge] - [Ελληνικά][gr] - [हिन्दी][hi] - [Magyar][hu] - [فارسی][ir] - [Italiano][it] - [日本語][ja] - [한국어][ko] - [Nederlands][nl] - [Norsk][no] - [Polski][pl] - [Português][pt] - [Română][ro] - [Русский][ru] - [Svenska][sv] - [Türkçe][tr] - [Українська][uk] - [中文-简体][zh-CN] - [中文-繁體][zh-TW]
+
 sway je s [i3] kompatibilní [Wayland] kompozitor. Přečtěte si [FAQ]. Připojte se na
 [IRC kanál][IRC channel] \(#sway na irc.libera.chat).
 

README.hu.md

@@ -1,10 +1,10 @@
 # sway
 
-A Sway egy [i3]-kompatibilis [Wayland]-kompozitor. Olvasd el a [Gyarkan Ismételt Kérdéseket][FAQ]. Csatlakozz az [IRC-csatornához][IRC channel] \(`#sway` az `irc.libera.chat`-en).
+A Sway egy [i3]-kompatibilis [Wayland] kompozitor. Olvasd el a [Gyarkan Ismételt Kérdéseket][FAQ]. Csatlakozz az [IRC csatornához][IRC channel] \(`#sway` az `irc.libera.chat`-en).
 
-## Csomagaláírások
+## Csomag aláírások
 
-A kiadott csomagok az [E88F5E48] kulccsal vannak aláírva, és [GitHubon][GitHub releases] publikálva.
+A kiadott csomagok az [E88F5E48] kulccsal vannak aláírva és [GitHub-on][GitHub releases] publikálva.
 
 ## Telepítés
 
@@ -13,12 +13,12 @@ A kiadott csomagok az [E88F5E48] kulccsal vannak aláírva, és [GitHubon][GitHu
 A Sway sok disztribúció csomagkezelőjéből elérhető, próbáld meg a "sway"
 csomagot telepíteni az általad használt eszközzel.
 
-Ha szeretnél csomagot készíteni a saját disztribúciódhoz, ugorj be az IRC-
+Ha szeretnél csomagot készíteni a saját disztribúciódhoz, ugorj be az IRC
 csatornára, vagy küldj levelet a sir@cmpwn.com címre tanácsokért.
 
 ### Fordítás forráskódból
 
-Olvasd el [ezt a wikioldalt][Development setup], ha szeretnéd tesztelési vagy
+Olvasd el [ezt a wiki oldalt][Development setup], ha szeretnéd tesztelési vagy
 fejlesztési célokból lefordítani az aktuális (HEAD) állapotát a `sway`-nek és a
 `wlroots`-nak.
 
@@ -46,7 +46,7 @@ Futtasd ezeket a parancsokat:
 
 ## Konfiguráció
 
-Ha előzőleg i3-at használtál, akkor átmásolhatod az i3-beállításaidat a
+Ha előzőleg i3-mat használtál, akkor átmásolhatod az i3 beállításaidat a
 `~/.config/sway/config` file-ba és ugyanúgy működni fognak. Egyéb esetben másold
 le kiindulási alapnak a mintát, ami általában az `etc/sway/config` elérési
 útvonalon található.
@@ -55,7 +55,7 @@ kapcsolatban.
 
 ## Futtatás
 
-Futtasd a `sway` parancsot egy TTY-felületről. Néhány bejelentkezéskezelő
+Futtasd a `sway` parancsot egy TTY felületről. Néhány bejelentkezéskezelő
 (display manager) működhet, de alapvetően nem támogatottak a sway által. (A
 gdm-ről ismeretes, hogy egész jól működik.)
 

README.sv.md

@@ -1,5 +1,7 @@
 # sway
 
+[English][en] - [Deutsch][de] - [Dansk][dk] - [Español][es] - [Français][fr] - **[Svenska][sv]** - [Ελληνικά][gr] - [Magyar][hu] - [فارسی][ir] - [Italiano][it] - [日本語][ja] - [한국어][ko] - [Nederlands][nl] - [Polski][pl] - [Português][pt] - [Română][ro] - [Русский][ru] - [Türkçe][tr] - [Українська][uk] - [中文-简体][zh-CN] - [中文-繁體][zh-TW]
+
 sway är en [i3]-kompatibel [Wayland] compositor. Läs våran [FAQ]-sida. Gå med i vår
 [IRC-kanal] \(#sway på irc.libera.chat).
 

common/stringop.c

@@ -360,7 +360,3 @@ char *format_str(const char *fmt, ...) {
 	va_end(args);
 	return str;
 }
-
-bool has_prefix(const char *str, const char *prefix) {
-	return strncmp(str, prefix, strlen(prefix)) == 0;
-}

include/stringop.h

@@ -40,6 +40,4 @@ bool expand_path(char **path);
 char *vformat_str(const char *fmt, va_list args) _SWAY_ATTRIB_PRINTF(1, 0);
 char *format_str(const char *fmt, ...) _SWAY_ATTRIB_PRINTF(1, 2);
 
-bool has_prefix(const char *str, const char *prefix);
-
 #endif

include/sway/criteria.h

@@ -53,9 +53,6 @@ struct criteria {
 	char urgent; // 'l' for latest or 'o' for oldest
 	struct pattern *workspace;
 	pid_t pid;
-	struct pattern *sandbox_engine;
-	struct pattern *sandbox_app_id;
-	struct pattern *sandbox_instance_id;
 };
 
 bool criteria_is_empty(struct criteria *criteria);

include/sway/output.h

@@ -57,6 +57,7 @@ struct sway_output {
 
 	struct wl_listener layout_destroy;
 	struct wl_listener destroy;
+	struct wl_listener commit;
 	struct wl_listener present;
 	struct wl_listener frame;
 	struct wl_listener request_state;
@@ -71,6 +72,7 @@ struct sway_output {
 	uint32_t refresh_nsec;
 	int max_render_time; // In milliseconds
 	struct wl_event_source *repaint_timer;
+	bool gamma_lut_changed;
 	bool allow_tearing;
 };
 
@@ -91,9 +93,6 @@ struct sway_output *output_from_wlr_output(struct wlr_output *output);
 struct sway_output *output_get_in_direction(struct sway_output *reference,
 		enum wlr_direction direction);
 
-void output_configure_scene(struct sway_output *output,
-	struct wlr_scene_node *node, float opacity);
-
 void output_add_workspace(struct sway_output *output,
 		struct sway_workspace *workspace);
 
@@ -137,6 +136,9 @@ enum sway_container_layout output_get_default_layout(
 
 enum wlr_direction opposite_direction(enum wlr_direction d);
 
+
+void handle_gamma_control_set_gamma(struct wl_listener *listener, void *data);
+
 void handle_output_manager_apply(struct wl_listener *listener, void *data);
 
 void handle_output_manager_test(struct wl_listener *listener, void *data);

include/sway/server.h

@@ -104,10 +104,8 @@ struct sway_server {
 	struct wlr_ext_foreign_toplevel_list_v1 *foreign_toplevel_list;
 	struct wlr_foreign_toplevel_manager_v1 *foreign_toplevel_manager;
 	struct wlr_content_type_manager_v1 *content_type_manager_v1;
-	struct wlr_data_control_manager_v1 *wlr_data_control_manager_v1;
+	struct wlr_data_control_manager_v1 *data_control_manager_v1;
-	struct wlr_ext_data_control_manager_v1 *ext_data_control_manager_v1;
 	struct wlr_screencopy_manager_v1 *screencopy_manager_v1;
-	struct wlr_ext_image_copy_capture_manager_v1 *ext_image_copy_capture_manager_v1;
 	struct wlr_export_dmabuf_manager_v1 *export_dmabuf_manager_v1;
 	struct wlr_security_context_manager_v1 *security_context_manager_v1;
 
@@ -163,7 +161,6 @@ bool server_start(struct sway_server *server);
 void server_run(struct sway_server *server);
 
 void restore_nofile_limit(void);
-void restore_signals(void);
 
 void handle_new_output(struct wl_listener *listener, void *data);
 

include/sway/tree/view.h

@@ -221,12 +221,6 @@ const char *view_get_window_role(struct sway_view *view);
 
 uint32_t view_get_window_type(struct sway_view *view);
 
-const char *view_get_sandbox_engine(struct sway_view *view);
-
-const char *view_get_sandbox_app_id(struct sway_view *view);
-
-const char *view_get_sandbox_instance_id(struct sway_view *view);
-
 const char *view_get_shell(struct sway_view *view);
 
 void view_get_constraints(struct sway_view *view, double *min_width,

meson.build

@@ -1,9 +1,9 @@
 project(
 	'sway',
 	'c',
-	version: '1.10-dev',
+	version: '1.10.1',
 	license: 'MIT',
-	meson_version: '>=1.3',
+	meson_version: '>=0.60.0',
 	default_options: [
 		'c_std=c11',
 		'warning_level=2',
@@ -38,14 +38,14 @@ if is_freebsd
 endif
 
 # Execute the wlroots subproject, if any
-wlroots_version = ['>=0.19.0', '<0.20.0']
+wlroots_version = ['>=0.18.0', '<0.19.0']
 subproject(
 	'wlroots',
 	default_options: ['examples=false'],
 	required: false,
 	version: wlroots_version,
 )
-wlroots = dependency('wlroots-0.19', version: wlroots_version, fallback: 'wlroots')
+wlroots = dependency('wlroots-0.18', version: wlroots_version, fallback: 'wlroots')
 wlroots_features = {
 	'xwayland': false,
 	'libinput_backend': false,
@@ -170,10 +170,31 @@ if git.found()
 endif
 add_project_arguments('-DSWAY_VERSION=@0@'.format(version), language: 'c')
 
-fs = import('fs')
+# Compute the relative path used by compiler invocations.
+source_root = meson.current_source_dir().split('/')
+build_root = meson.global_build_root().split('/')
+relative_dir_parts = []
+i = 0
+in_prefix = true
+foreach p : build_root
+	if i >= source_root.length() or not in_prefix or p != source_root[i]
+		in_prefix = false
+		relative_dir_parts += '..'
+	endif
+	i += 1
+endforeach
+i = 0
+in_prefix = true
+foreach p : source_root
+	if i >= build_root.length() or not in_prefix or build_root[i] != p
+		in_prefix = false
+		relative_dir_parts += p
+	endif
+	i += 1
+endforeach
+relative_dir = join_paths(relative_dir_parts) + '/'
 
 # Strip relative path prefixes from the code if possible, otherwise hide them.
-relative_dir = fs.relative_to(meson.current_source_dir(), meson.global_build_root()) + '/'
 if cc.has_argument('-fmacro-prefix-map=/prefix/to/hide=')
 	add_project_arguments(
 		'-fmacro-prefix-map=@0@='.format(relative_dir),

protocols/meson.build

@@ -9,15 +9,12 @@ wayland_scanner = find_program(
 protocols = [
 	wl_protocol_dir / 'stable/tablet/tablet-v2.xml',
 	wl_protocol_dir / 'stable/xdg-shell/xdg-shell.xml',
+	wl_protocol_dir / 'unstable/xdg-output/xdg-output-unstable-v1.xml',
+	wl_protocol_dir / 'unstable/pointer-constraints/pointer-constraints-unstable-v1.xml',
+	wl_protocol_dir / 'unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml',
 	wl_protocol_dir / 'staging/content-type/content-type-v1.xml',
 	wl_protocol_dir / 'staging/cursor-shape/cursor-shape-v1.xml',
-	wl_protocol_dir / 'staging/ext-foreign-toplevel-list/ext-foreign-toplevel-list-v1.xml',
-	wl_protocol_dir / 'staging/ext-image-capture-source/ext-image-capture-source-v1.xml',
-	wl_protocol_dir / 'staging/ext-image-copy-capture/ext-image-copy-capture-v1.xml',
 	wl_protocol_dir / 'staging/tearing-control/tearing-control-v1.xml',
-	wl_protocol_dir / 'unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml',
-	wl_protocol_dir / 'unstable/pointer-constraints/pointer-constraints-unstable-v1.xml',
-	wl_protocol_dir / 'unstable/xdg-output/xdg-output-unstable-v1.xml',
 	'wlr-layer-shell-unstable-v1.xml',
 	'idle.xml',
 	'wlr-output-power-management-unstable-v1.xml',

sway.desktop

@@ -3,4 +3,3 @@ Name=Sway
 Comment=An i3-compatible Wayland compositor
 Exec=sway
 Type=Application
-DesktopNames=sway;wlroots

sway/commands/assign.c

@@ -23,7 +23,7 @@ struct cmd_results *cmd_assign(int argc, char **argv) {
 
 	--argc; ++argv;
 
-	if (has_prefix(*argv, "→")) {
+	if (strncmp(*argv, "→", strlen("→")) == 0) {
 		if (argc < 2) {
 			free(criteria);
 			return cmd_results_new(CMD_INVALID, "Missing workspace");

sway/commands/bar/font.c

@@ -11,7 +11,7 @@ struct cmd_results *bar_cmd_font(int argc, char **argv) {
 	char *font = join_args(argv, argc);
 	free(config->current_bar->font);
 
-	if (has_prefix(font, "pango:")) {
+	if (strncmp(font, "pango:", 6) == 0) {
 		if (config->current_bar->pango_markup == PANGO_MARKUP_DEFAULT) {
 			config->current_bar->pango_markup = true;
 		}

sway/commands/bind.c

@@ -367,7 +367,8 @@ static struct cmd_results *cmd_bindsym_or_bindcode(int argc, char **argv,
 			}
 		} else if (strcmp("--exclude-titlebar", argv[0]) == 0) {
 			exclude_titlebar = true;
-		} else if (has_prefix(argv[0], "--input-device=")) {
+		} else if (strncmp("--input-device=", argv[0],
+					strlen("--input-device=")) == 0) {
 			free(binding->input);
 			binding->input = strdup(argv[0] + strlen("--input-device="));
 			strip_quotes(binding->input);
@@ -398,7 +399,7 @@ static struct cmd_results *cmd_bindsym_or_bindcode(int argc, char **argv,
 	list_t *split = split_string(argv[0], "+");
 	for (int i = 0; i < split->length; ++i) {
 		// Check for group
-		if (has_prefix(split->items[i], "Group")) {
+		if (strncmp(split->items[i], "Group", strlen("Group")) == 0) {
 			if (binding->group != XKB_LAYOUT_INVALID) {
 				free_sway_binding(binding);
 				list_free_items_and_destroy(split);

sway/commands/exec_always.c

@@ -25,6 +25,16 @@ struct cmd_results *cmd_exec_validate(int argc, char **argv) {
 	return error;
 }
 
+static void export_xdga_token(struct launcher_ctx *ctx) {
+	const char *token = launcher_ctx_get_token_name(ctx);
+	setenv("XDG_ACTIVATION_TOKEN", token, 1);
+}
+
+static void export_startup_id(struct launcher_ctx *ctx) {
+	const char *token = launcher_ctx_get_token_name(ctx);
+	setenv("DESKTOP_STARTUP_ID", token, 1);
+}
+
 struct cmd_results *cmd_exec_process(int argc, char **argv) {
 	struct cmd_results *error = NULL;
 	char *cmd = NULL;
@@ -46,39 +56,67 @@ struct cmd_results *cmd_exec_process(int argc, char **argv) {
 
 	sway_log(SWAY_DEBUG, "Executing %s", cmd);
 
+	int fd[2];
+	if (pipe(fd) != 0) {
+		sway_log(SWAY_ERROR, "Unable to create pipe for fork");
+	}
+
+	pid_t pid, child;
 	struct launcher_ctx *ctx = launcher_ctx_create_internal();
-
 	// Fork process
-	pid_t child = fork();
+	if ((pid = fork()) == 0) {
-	if (child == 0) {
+		// Fork child process again
 		restore_nofile_limit();
-		restore_signals();
 		setsid();
-
+		sigset_t set;
-		if (ctx) {
+		sigemptyset(&set);
-			const char *token = launcher_ctx_get_token_name(ctx);
+		sigprocmask(SIG_SETMASK, &set, NULL);
-			setenv("XDG_ACTIVATION_TOKEN", token, 1);
+		signal(SIGPIPE, SIG_DFL);
-			if (!no_startup_id) {
+		close(fd[0]);
-				setenv("DESKTOP_STARTUP_ID", token, 1);
+		if ((child = fork()) == 0) {
+			close(fd[1]);
+			if (ctx) {
+				export_xdga_token(ctx);
 			}
+			if (ctx && !no_startup_id) {
+				export_startup_id(ctx);
+			}
+			execlp("sh", "sh", "-c", cmd, (void *)NULL);
+			sway_log_errno(SWAY_ERROR, "execlp failed");
+			_exit(1);
 		}
-
+		ssize_t s = 0;
-		execlp("sh", "sh", "-c", cmd, (void*)NULL);
+		while ((size_t)s < sizeof(pid_t)) {
-		sway_log_errno(SWAY_ERROR, "execve failed");
+			s += write(fd[1], ((uint8_t *)&child) + s, sizeof(pid_t) - s);
+		}
+		close(fd[1]);
 		_exit(0); // Close child process
-	} else if (child < 0) {
+	} else if (pid < 0) {
-		launcher_ctx_destroy(ctx);
 		free(cmd);
+		close(fd[0]);
+		close(fd[1]);
 		return cmd_results_new(CMD_FAILURE, "fork() failed");
 	}
-
+	free(cmd);
-	sway_log(SWAY_DEBUG, "Child process created with pid %d", child);
+	close(fd[1]); // close write
-	if (ctx != NULL) {
+	ssize_t s = 0;
-		sway_log(SWAY_DEBUG, "Recording workspace for process %d", child);
+	while ((size_t)s < sizeof(pid_t)) {
-		ctx->pid = child;
+		s += read(fd[0], ((uint8_t *)&child) + s, sizeof(pid_t) - s);
+	}
+	close(fd[0]);
+	// cleanup child process
+	waitpid(pid, NULL, 0);
+	if (child > 0) {
+		sway_log(SWAY_DEBUG, "Child process created with pid %d", child);
+		if (ctx != NULL) {
+			sway_log(SWAY_DEBUG, "Recording workspace for process %d", child);
+			ctx->pid = child;
+		}
+	} else {
+		launcher_ctx_destroy(ctx);
+		return cmd_results_new(CMD_FAILURE, "Second fork() failed");
 	}
 
-	free(cmd);
 	return cmd_results_new(CMD_SUCCESS, NULL);
 }
 

sway/commands/font.c

@@ -13,9 +13,9 @@ struct cmd_results *cmd_font(int argc, char **argv) {
 	char *font = join_args(argv, argc);
 	free(config->font);
 
-	if (has_prefix(font, "pango:")) {
+	if (strncmp(font, "pango:", 6) == 0) {
 		config->pango_markup = true;
-		config->font = strdup(font + strlen("pango:"));
+		config->font = strdup(font + 6);
 		free(font);
 	} else {
 		config->pango_markup = false;

sway/commands/gesture.c

@@ -121,7 +121,8 @@ static struct cmd_results *cmd_bind_or_unbind_gesture(int argc, char **argv, boo
 			binding->flags |= BINDING_EXACT;
 		} else if (strcmp("--no-warn", argv[0]) == 0) {
 			warn = false;
-		} else if (has_prefix(argv[0], "--input-device=")) {
+		} else if (strncmp("--input-device=", argv[0],
+					strlen("--input-device=")) == 0) {
 			free(binding->input);
 			binding->input = strdup(argv[0] + strlen("--input-device="));
 		} else {

sway/commands/include.c

@@ -3,12 +3,12 @@
 
 struct cmd_results *cmd_include(int argc, char **argv) {
 	struct cmd_results *error = NULL;
-	if ((error = checkarg(argc, "include", EXPECTED_AT_LEAST, 1))) {
+	if ((error = checkarg(argc, "include", EXPECTED_EQUAL_TO, 1))) {
 		return error;
 	}
-	char *files = join_args(argv, argc);
+
 	// We don't care if the included config(s) fails to load.
-	load_include_configs(files, config, &config->swaynag_config_errors);
+	load_include_configs(argv[0], config, &config->swaynag_config_errors);
 
 	return cmd_results_new(CMD_SUCCESS, NULL);
 }

sway/commands/input/drag_lock.c

@@ -15,11 +15,6 @@ struct cmd_results *input_cmd_drag_lock(int argc, char **argv) {
 		return cmd_results_new(CMD_FAILURE, "No input device defined.");
 	}
 
-#if HAVE_LIBINPUT_CONFIG_DRAG_LOCK_ENABLED_STICKY
-	if (strcmp(argv[0], "enabled_sticky") == 0) {
-		ic->drag_lock = LIBINPUT_CONFIG_DRAG_LOCK_ENABLED_STICKY;
-	} else
-#endif
 	if (parse_boolean(argv[0], true)) {
 		ic->drag_lock = LIBINPUT_CONFIG_DRAG_LOCK_ENABLED;
 	} else {

sway/commands/input/events.c

@@ -86,7 +86,7 @@ static void toggle_select_send_events_for_device(struct input_config *ic,
 static void toggle_send_events(int argc, char **argv) {
 	struct input_config *ic = config->handler_context.input_config;
 	bool wildcard = strcmp(ic->identifier, "*") == 0;
-	const char *type = has_prefix(ic->identifier, "type:")
+	const char *type = strncmp(ic->identifier, "type:", strlen("type:")) == 0
 		? ic->identifier + strlen("type:") : NULL;
 	struct sway_input_device *device = NULL;
 	wl_list_for_each(device, &server.input->devices, link) {
@@ -146,7 +146,8 @@ struct cmd_results *input_cmd_events(int argc, char **argv) {
 
 		toggle_send_events(argc - 1, argv + 1);
 
-		if (strcmp(ic->identifier, "*") == 0 || has_prefix(ic->identifier, "type:")) {
+		if (strcmp(ic->identifier, "*") == 0 ||
+				strncmp(ic->identifier, "type:", strlen("type:")) == 0) {
 			// Update the device input configs and then reset the type/wildcard
 			// config send events mode so that is does not override the device
 			// ones. The device ones will be applied when attempting to apply

sway/commands/mark.c

@@ -23,7 +23,7 @@ struct cmd_results *cmd_mark(int argc, char **argv) {
 	}
 
 	bool add = false, toggle = false;
-	while (argc > 0 && has_prefix(*argv, "--")) {
+	while (argc > 0 && strncmp(*argv, "--", 2) == 0) {
 		if (strcmp(*argv, "--add") == 0) {
 			add = true;
 		} else if (strcmp(*argv, "--replace") == 0) {

sway/commands/opacity.c

@@ -2,8 +2,7 @@
 #include <stdlib.h>
 #include <strings.h>
 #include "sway/commands.h"
-#include "sway/tree/container.h"
+#include "sway/tree/view.h"
-#include "sway/output.h"
 #include "log.h"
 
 struct cmd_results *cmd_opacity(int argc, char **argv) {
@@ -38,7 +37,6 @@ struct cmd_results *cmd_opacity(int argc, char **argv) {
 	}
 
 	con->alpha = val;
-	output_configure_scene(NULL, &con->scene_tree->node, 1);
 	container_update(con);
 
 	return cmd_results_new(CMD_SUCCESS, NULL);

sway/commands/output/background.c

@@ -3,8 +3,10 @@
 #include <string.h>
 #include <strings.h>
 #include <unistd.h>
+#include <errno.h>
 #include "sway/commands.h"
 #include "sway/config.h"
+#include "sway/swaynag.h"
 #include "log.h"
 #include "stringop.h"
 
@@ -40,14 +42,14 @@ struct cmd_results *output_cmd_background(int argc, char **argv) {
 	}
 
 	struct output_config *output = config->handler_context.output_config;
-	char *src = NULL;
+
 	if (strcasecmp(argv[1], "solid_color") == 0) {
 		if (!validate_color(argv[0])) {
 			return cmd_results_new(CMD_INVALID,
 					"Colors should be of the form #RRGGBB");
 		}
-		if (!(output->background = strdup(argv[0]))) goto cleanup;
+		output->background = strdup(argv[0]);
-		if (!(output->background_option = strdup("solid_color"))) goto cleanup;
+		output->background_option = strdup("solid_color");
 		output->background_fallback = NULL;
 		argc -= 2; argv += 2;
 	} else {
@@ -75,25 +77,37 @@ struct cmd_results *output_cmd_background(int argc, char **argv) {
 			return cmd_results_new(CMD_INVALID, "Missing background file");
 		}
 
-		if (!(src = join_args(argv, j))) goto cleanup;
+		char *src = join_args(argv, j);
 		if (!expand_path(&src)) {
 			struct cmd_results *cmd_res = cmd_results_new(CMD_INVALID,
 				"Invalid syntax (%s)", src);
 			free(src);
 			return cmd_res;
 		}
+		if (!src) {
+			sway_log(SWAY_ERROR, "Failed to allocate expanded path");
+			return cmd_results_new(CMD_FAILURE, "Unable to allocate resource");
+		}
 
 		if (config->reading && *src != '/') {
 			// src file is inside configuration dir
 
 			char *conf = strdup(config->current_config_path);
-			if (!conf) goto cleanup;
+			if (!conf) {
+				sway_log(SWAY_ERROR, "Failed to duplicate string");
+				free(src);
+				return cmd_results_new(CMD_FAILURE,
+						"Unable to allocate resources");
+			}
 
 			char *conf_path = dirname(conf);
 			char *real_src = malloc(strlen(conf_path) + strlen(src) + 2);
 			if (!real_src) {
+				free(src);
 				free(conf);
-				goto cleanup;
+				sway_log(SWAY_ERROR, "Unable to allocate memory");
+				return cmd_results_new(CMD_FAILURE,
+						"Unable to allocate resources");
 			}
 
 			snprintf(real_src, strlen(conf_path) + strlen(src) + 2, "%s/%s", conf_path, src);
@@ -103,48 +117,40 @@ struct cmd_results *output_cmd_background(int argc, char **argv) {
 		}
 
 		bool can_access = access(src, F_OK) != -1;
-		argc -= j + 1; argv += j + 1;
-		free(output->background_option);
-		free(output->background_fallback);
-		free(output->background);
-		output->background = output->background_option = output->background_fallback = NULL;
-		char *fallback = NULL;
-
-		if (argc && *argv[0] == '#') {
-			if (validate_color(argv[0])) {
-				if (!(fallback = strdup(argv[0]))) goto cleanup;
-				output->background_fallback = fallback;
-			} else {
-				sway_log(SWAY_ERROR, "fallback '%s' should be of the form #RRGGBB", argv[0]);
-				config_add_swaynag_warning("fallback '%s' should be of the form #RRGGBB\n", argv[0]);
-			}
-			argc--; argv++;
-		}
-
 		if (!can_access) {
-			if (!fallback) {
+			sway_log_errno(SWAY_ERROR, "Unable to access background file '%s'",
-				sway_log(SWAY_ERROR, "Unable to access background file '%s' "
+					src);
-				   "and no valid fallback provided", src);
+			config_add_swaynag_warning("Unable to access background file '%s'",
-				struct cmd_results *res = cmd_results_new(CMD_FAILURE, "Unable to access "
+					src);
-											  "background file '%s' and no valid fallback provided", src);
+			struct cmd_results *result = cmd_results_new(CMD_FAILURE,
-				free(src);
+					"unable to access background file '%s'", src);
-				return res;
+			free(src);
-			}
+			return result;
-			sway_log(SWAY_DEBUG, "Cannot access file '%s', using fallback '%s'", src, fallback);
-			output->background = fallback;
-			if (!(output->background_option = strdup("solid_color"))) goto cleanup;
-			output->background_fallback = NULL;
 		} else {
 			output->background = src;
-			if (!(output->background_option = strdup(mode))) goto cleanup;
+			output->background_option = strdup(mode);
+		}
+		argc -= j + 1; argv += j + 1;
+
+		output->background_fallback = NULL;
+		if (argc && *argv[0] == '#') {
+			if (!validate_color(argv[0])) {
+				return cmd_results_new(CMD_INVALID,
+						"fallback color should be of the form #RRGGBB");
+			}
+
+			output->background_fallback = strdup(argv[0]);
+			argc--; argv++;
+
+			if (!can_access) {
+				output->background = output->background_fallback;
+				output->background_option = strdup("solid_color");
+				output->background_fallback = NULL;
+			}
 		}
 	}
+
 	config->handler_context.leftovers.argc = argc;
 	config->handler_context.leftovers.argv = argv;
 	return NULL;
-
-cleanup:
-	free(src);
-	sway_log(SWAY_ERROR, "Failed to allocate resources");
-	return cmd_results_new(CMD_FAILURE, "Unable to allocate resources");
 }

sway/commands/scratchpad.c

@@ -118,10 +118,10 @@ struct cmd_results *cmd_scratchpad(int argc, char **argv) {
 
 		// If using criteria, this command is executed for every container which
 		// matches the criteria. If this container isn't in the scratchpad,
-		// we'll return an error. The same is true if the
+		// we'll just silently return a success. The same is true if the
 		// overridden node is not a container.
 		if (!con || !con->scratchpad) {
-			return cmd_results_new(CMD_INVALID, "Container is not in scratchpad.");
+			return cmd_results_new(CMD_SUCCESS, NULL);
 		}
 		scratchpad_toggle_container(con);
 	} else {

sway/config.c

@@ -925,8 +925,8 @@ char *do_var_replacement(char *str) {
 		// Find matching variable
 		for (i = 0; i < config->symbols->length; ++i) {
 			struct sway_variable *var = config->symbols->items[i];
-			if (has_prefix(find, var->name)) {
+			int vnlen = strlen(var->name);
-				int vnlen = strlen(var->name);
+			if (strncmp(find, var->name, vnlen) == 0) {
 				int vvlen = strlen(var->value);
 				char *newstr = malloc(strlen(str) - vnlen + vvlen + 1);
 				if (!newstr) {

sway/config/bar.c

@@ -213,23 +213,36 @@ static void invoke_swaybar(struct bar_config *bar) {
 		sway_log(SWAY_ERROR, "Failed to create fork for swaybar");
 		return;
 	} else if (pid == 0) {
+		// Remove the SIGUSR1 handler that wlroots adds for xwayland
+		sigset_t set;
+		sigemptyset(&set);
+		sigprocmask(SIG_SETMASK, &set, NULL);
+		signal(SIGPIPE, SIG_DFL);
+
 		restore_nofile_limit();
-		restore_signals();
+
-		if (!sway_set_cloexec(sockets[1], false)) {
+		pid = fork();
+		if (pid < 0) {
+			sway_log_errno(SWAY_ERROR, "fork failed");
+			_exit(EXIT_FAILURE);
+		} else if (pid == 0) {
+			if (!sway_set_cloexec(sockets[1], false)) {
+				_exit(EXIT_FAILURE);
+			}
+
+			char wayland_socket_str[16];
+			snprintf(wayland_socket_str, sizeof(wayland_socket_str),
+					"%d", sockets[1]);
+			setenv("WAYLAND_SOCKET", wayland_socket_str, true);
+
+			// run custom swaybar
+			char *const cmd[] = {
+					bar->swaybar_command ? bar->swaybar_command : "swaybar",
+					"-b", bar->id, NULL};
+			execvp(cmd[0], cmd);
 			_exit(EXIT_FAILURE);
 		}
-
+		_exit(EXIT_SUCCESS);
-		char wayland_socket_str[16];
-		snprintf(wayland_socket_str, sizeof(wayland_socket_str),
-				"%d", sockets[1]);
-		setenv("WAYLAND_SOCKET", wayland_socket_str, true);
-
-		// run custom swaybar
-		char *const cmd[] = {
-				bar->swaybar_command ? bar->swaybar_command : "swaybar",
-				"-b", bar->id, NULL};
-		execvp(cmd[0], cmd);
-		_exit(EXIT_FAILURE);
 	}
 
 	if (close(sockets[1]) != 0) {
@@ -237,6 +250,11 @@ static void invoke_swaybar(struct bar_config *bar) {
 		return;
 	}
 
+	if (waitpid(pid, NULL, 0) < 0) {
+		sway_log_errno(SWAY_ERROR, "waitpid failed");
+		return;
+	}
+
 	sway_log(SWAY_DEBUG, "Spawned swaybar %s", bar->id);
 }
 

sway/config/input.c

@@ -300,7 +300,7 @@ struct input_config *store_input_config(struct input_config *ic,
 		return NULL;
 	}
 
-	bool type = has_prefix(ic->identifier, "type:");
+	bool type = strncmp(ic->identifier, "type:", strlen("type:")) == 0;
 	if (type && error && !validate_type_on_existing(ic, error)) {
 		return NULL;
 	}

sway/config/output.c

@@ -1061,28 +1061,41 @@ static bool _spawn_swaybg(char **command) {
 		return false;
 	} else if (pid == 0) {
 		restore_nofile_limit();
-		restore_signals();
+
-		if (!sway_set_cloexec(sockets[1], false)) {
+		pid = fork();
+		if (pid < 0) {
+			sway_log_errno(SWAY_ERROR, "fork failed");
+			_exit(EXIT_FAILURE);
+		} else if (pid == 0) {
+			if (!sway_set_cloexec(sockets[1], false)) {
+				_exit(EXIT_FAILURE);
+			}
+
+			char wayland_socket_str[16];
+			snprintf(wayland_socket_str, sizeof(wayland_socket_str),
+				"%d", sockets[1]);
+			setenv("WAYLAND_SOCKET", wayland_socket_str, true);
+
+			execvp(command[0], command);
+			sway_log_errno(SWAY_ERROR, "failed to execute '%s' "
+				"(background configuration probably not applied)",
+				command[0]);
 			_exit(EXIT_FAILURE);
 		}
-
+		_exit(EXIT_SUCCESS);
-		char wayland_socket_str[16];
-		snprintf(wayland_socket_str, sizeof(wayland_socket_str),
-			"%d", sockets[1]);
-		setenv("WAYLAND_SOCKET", wayland_socket_str, true);
-
-		execvp(command[0], command);
-		sway_log_errno(SWAY_ERROR, "failed to execute '%s' "
-			"(background configuration probably not applied)",
-			command[0]);
-		_exit(EXIT_FAILURE);
 	}
 
 	if (close(sockets[1]) != 0) {
 		sway_log_errno(SWAY_ERROR, "close failed");
 		return false;
 	}
-	return true;
+	int fork_status = 0;
+	if (waitpid(pid, &fork_status, 0) < 0) {
+		sway_log_errno(SWAY_ERROR, "waitpid failed");
+		return false;
+	}
+
+	return WIFEXITED(fork_status) && WEXITSTATUS(fork_status) == EXIT_SUCCESS;
 }
 
 bool spawn_swaybg(void) {

sway/criteria.c

@@ -34,10 +34,7 @@ bool criteria_is_empty(struct criteria *criteria) {
 		&& !criteria->tiling
 		&& !criteria->urgent
 		&& !criteria->workspace
-		&& !criteria->pid
+		&& !criteria->pid;
-		&& !criteria->sandbox_engine
-		&& !criteria->sandbox_app_id
-		&& !criteria->sandbox_instance_id;
 }
 
 // The error pointer is used for parsing functions, and saves having to pass it
@@ -101,9 +98,6 @@ void criteria_destroy(struct criteria *criteria) {
 #endif
 	pattern_destroy(criteria->con_mark);
 	pattern_destroy(criteria->workspace);
-	pattern_destroy(criteria->sandbox_engine);
-	pattern_destroy(criteria->sandbox_app_id);
-	pattern_destroy(criteria->sandbox_instance_id);
 	free(criteria->target);
 	free(criteria->cmdlist);
 	free(criteria->raw);
@@ -254,66 +248,6 @@ static bool criteria_matches_view(struct criteria *criteria,
 		}
 	}
 
-	if (criteria->sandbox_engine) {
-		const char *sandbox_engine = view_get_sandbox_engine(view);
-		if (!sandbox_engine) {
-			return false;
-		}
-
-		switch (criteria->sandbox_engine->match_type) {
-		case PATTERN_FOCUSED:
-			if (focused && lenient_strcmp(sandbox_engine, view_get_sandbox_engine(focused))) {
-				return false;
-			}
-			break;
-		case PATTERN_PCRE2:
-			if (regex_cmp(sandbox_engine, criteria->sandbox_engine->regex) < 0) {
-				return false;
-			}
-			break;
-		}
-	}
-
-	if (criteria->sandbox_app_id) {
-		const char *sandbox_app_id = view_get_sandbox_app_id(view);
-		if (!sandbox_app_id) {
-			return false;
-		}
-
-		switch (criteria->sandbox_app_id->match_type) {
-		case PATTERN_FOCUSED:
-			if (focused && lenient_strcmp(sandbox_app_id, view_get_sandbox_app_id(focused))) {
-				return false;
-			}
-			break;
-		case PATTERN_PCRE2:
-			if (regex_cmp(sandbox_app_id, criteria->sandbox_app_id->regex) < 0) {
-				return false;
-			}
-			break;
-		}
-	}
-
-	if (criteria->sandbox_instance_id) {
-		const char *sandbox_instance_id = view_get_sandbox_instance_id(view);
-		if (!sandbox_instance_id) {
-			return false;
-		}
-
-		switch (criteria->sandbox_instance_id->match_type) {
-		case PATTERN_FOCUSED:
-			if (focused && lenient_strcmp(sandbox_instance_id, view_get_sandbox_instance_id(focused))) {
-				return false;
-			}
-			break;
-		case PATTERN_PCRE2:
-			if (regex_cmp(sandbox_instance_id, criteria->sandbox_instance_id->regex) < 0) {
-				return false;
-			}
-			break;
-		}
-	}
-
 	if (!criteria_matches_container(criteria, view->container)) {
 		return false;
 	}
@@ -541,9 +475,6 @@ enum criteria_token {
 	T_URGENT,
 	T_WORKSPACE,
 	T_PID,
-	T_SANDBOX_ENGINE,
-	T_SANDBOX_APP_ID,
-	T_SANDBOX_INSTANCE_ID,
 
 	T_INVALID,
 };
@@ -583,12 +514,6 @@ static enum criteria_token token_from_name(char *name) {
 		return T_FLOATING;
 	} else if (strcmp(name, "pid") == 0) {
 		return T_PID;
-	} else if (strcmp(name, "sandbox_engine") == 0) {
-		return T_SANDBOX_ENGINE;
-	} else if (strcmp(name, "sandbox_app_id") == 0) {
-		return T_SANDBOX_APP_ID;
-	} else if (strcmp(name, "sandbox_instance_id") == 0) {
-		return T_SANDBOX_INSTANCE_ID;
 	}
 	return T_INVALID;
 }
@@ -630,7 +555,8 @@ static bool parse_token(struct criteria *criteria, char *name, char *value) {
 		if (strcmp(value, "__focused__") == 0) {
 			struct sway_seat *seat = input_manager_current_seat();
 			struct sway_container *focus = seat_get_focused_container(seat);
-			criteria->con_id = focus ? focus->node.id : 0;
+			struct sway_view *view = focus ? focus->view : NULL;
+			criteria->con_id = view ? view->container->node.id : 0;
 		} else {
 			criteria->con_id = strtoul(value, &endptr, 10);
 			if (*endptr != 0) {
@@ -691,15 +617,6 @@ static bool parse_token(struct criteria *criteria, char *name, char *value) {
 			error = strdup("The value for 'pid' should be numeric");
 		}
 		break;
-	case T_SANDBOX_ENGINE:
-		pattern_create(&criteria->sandbox_engine, value);
-		break;
-	case T_SANDBOX_APP_ID:
-		pattern_create(&criteria->sandbox_app_id, value);
-		break;
-	case T_SANDBOX_INSTANCE_ID:
-		pattern_create(&criteria->sandbox_instance_id, value);
-		break;
 	case T_INVALID:
 		break;
 	}

sway/desktop/output.c

@@ -10,6 +10,7 @@
 #include <wlr/types/wlr_buffer.h>
 #include <wlr/types/wlr_alpha_modifier_v1.h>
 #include <wlr/types/wlr_gamma_control_v1.h>
+#include <wlr/types/wlr_matrix.h>
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_output_management_v1.h>
 #include <wlr/types/wlr_output_power_management_v1.h>
@@ -187,8 +188,8 @@ static enum wlr_scale_filter_mode get_scale_filter(struct sway_output *output,
 		struct wlr_scene_buffer *buffer) {
 	// if we are scaling down, we should always choose linear
 	if (buffer->dst_width > 0 && buffer->dst_height > 0 && (
-			buffer->dst_width < buffer->WLR_PRIVATE.buffer_width ||
+			buffer->dst_width < buffer->buffer_width ||
-			buffer->dst_height < buffer->WLR_PRIVATE.buffer_height)) {
+			buffer->dst_height < buffer->buffer_height)) {
 		return WLR_SCALE_FILTER_BILINEAR;
 	}
 
@@ -202,7 +203,7 @@ static enum wlr_scale_filter_mode get_scale_filter(struct sway_output *output,
 	}
 }
 
-void output_configure_scene(struct sway_output *output,
+static void output_configure_scene(struct sway_output *output,
 		struct wlr_scene_node *node, float opacity) {
 	if (!node->enabled) {
 		return;
@@ -229,9 +230,7 @@ void output_configure_scene(struct sway_output *output,
 		// hack: don't call the scene setter because that will damage all outputs
 		// We don't want to damage outputs that aren't our current output that
 		// we're configuring
-		if (output) {
+		buffer->filter_mode = get_scale_filter(output, buffer);
-			buffer->filter_mode = get_scale_filter(output, buffer);
-		}
 
 		wlr_scene_buffer_set_opacity(buffer, opacity);
 	} else if (node->type == WLR_SCENE_NODE_TREE) {
@@ -264,7 +263,7 @@ static int output_repaint_timer_handler(void *data) {
 	struct sway_output *output = data;
 
 	output->wlr_output->frame_pending = false;
-	if (!output->wlr_output->enabled) {
+	if (!output->enabled) {
 		return 0;
 	}
 
@@ -274,8 +273,10 @@ static int output_repaint_timer_handler(void *data) {
 		.color_transform = output->color_transform,
 	};
 
+	struct wlr_output *wlr_output = output->wlr_output;
 	struct wlr_scene_output *scene_output = output->scene_output;
-	if (!wlr_scene_output_needs_frame(scene_output)) {
+	if (!wlr_output->needs_frame && !output->gamma_lut_changed &&
+			!pixman_region32_not_empty(&scene_output->pending_commit_damage)) {
 		return 0;
 	}
 
@@ -286,6 +287,22 @@ static int output_repaint_timer_handler(void *data) {
 		return 0;
 	}
 
+	if (output->gamma_lut_changed) {
+		output->gamma_lut_changed = false;
+		struct wlr_gamma_control_v1 *gamma_control =
+			wlr_gamma_control_manager_v1_get_control(
+			server.gamma_control_manager_v1, output->wlr_output);
+		if (!wlr_gamma_control_v1_apply(gamma_control, &pending)) {
+			wlr_output_state_finish(&pending);
+			return 0;
+		}
+
+		if (!wlr_output_test_state(output->wlr_output, &pending)) {
+			wlr_gamma_control_v1_send_failed_and_destroy(gamma_control);
+			wlr_output_state_set_gamma_lut(&pending, 0, NULL, NULL, NULL);
+		}
+	}
+
 	if (output_can_tear(output)) {
 		pending.tearing_page_flip = true;
 
@@ -432,6 +449,7 @@ static void begin_destroy(struct sway_output *output) {
 
 	wl_list_remove(&output->layout_destroy.link);
 	wl_list_remove(&output->destroy.link);
+	wl_list_remove(&output->commit.link);
 	wl_list_remove(&output->present.link);
 	wl_list_remove(&output->frame.link);
 	wl_list_remove(&output->request_state.link);
@@ -457,6 +475,20 @@ static void handle_layout_destroy(struct wl_listener *listener, void *data) {
 	begin_destroy(output);
 }
 
+static void handle_commit(struct wl_listener *listener, void *data) {
+	struct sway_output *output = wl_container_of(listener, output, commit);
+	struct wlr_output_event_commit *event = data;
+
+	if (!output->enabled) {
+		return;
+	}
+
+	// Next time the output is enabled, try to re-apply the gamma LUT
+	if ((event->state->committed & WLR_OUTPUT_STATE_ENABLED) && !output->wlr_output->enabled) {
+		output->gamma_lut_changed = true;
+	}
+}
+
 static void handle_present(struct wl_listener *listener, void *data) {
 	struct sway_output *output = wl_container_of(listener, output, present);
 	struct wlr_output_event_present *output_event = data;
@@ -465,7 +497,7 @@ static void handle_present(struct wl_listener *listener, void *data) {
 		return;
 	}
 
-	output->last_presentation = output_event->when;
+	output->last_presentation = *output_event->when;
 	output->refresh_nsec = output_event->refresh;
 }
 
@@ -574,6 +606,8 @@ void handle_new_output(struct wl_listener *listener, void *data) {
 	output->layout_destroy.notify = handle_layout_destroy;
 	wl_signal_add(&wlr_output->events.destroy, &output->destroy);
 	output->destroy.notify = handle_destroy;
+	wl_signal_add(&wlr_output->events.commit, &output->commit);
+	output->commit.notify = handle_commit;
 	wl_signal_add(&wlr_output->events.present, &output->present);
 	output->present.notify = handle_present;
 	wl_signal_add(&wlr_output->events.frame, &output->frame);
@@ -591,6 +625,21 @@ void handle_new_output(struct wl_listener *listener, void *data) {
 	request_modeset();
 }
 
+void handle_gamma_control_set_gamma(struct wl_listener *listener, void *data) {
+	struct sway_server *server =
+		wl_container_of(listener, server, gamma_control_set_gamma);
+	const struct wlr_gamma_control_manager_v1_set_gamma_event *event = data;
+
+	struct sway_output *output = event->output->data;
+
+	if(!output) {
+		return;
+	}
+
+	output->gamma_lut_changed = true;
+	wlr_output_schedule_frame(output->wlr_output);
+}
+
 static struct output_config *output_config_for_config_head(
 		struct wlr_output_configuration_head_v1 *config_head) {
 	struct output_config *oc = new_output_config(config_head->state.output->name);

sway/desktop/transaction.c

@@ -312,9 +312,9 @@ static void arrange_children(enum sway_container_layout layout, list_t *children
 			wlr_scene_node_set_position(&child->scene_tree->node, 0, title_bar_height);
 			wlr_scene_node_reparent(&child->scene_tree->node, content);
 
-			int net_height = height - title_bar_height;
+			if (activated) {
-			if (activated && width > 0 && net_height > 0) {
+				arrange_container(child, width, height - title_bar_height,
-				arrange_container(child, width, net_height, title_bar_height == 0, 0);
+					title_bar_height == 0, 0);
 			} else {
 				disable_container(child);
 			}
@@ -341,9 +341,9 @@ static void arrange_children(enum sway_container_layout layout, list_t *children
 			wlr_scene_node_set_position(&child->scene_tree->node, 0, title_height);
 			wlr_scene_node_reparent(&child->scene_tree->node, content);
 
-			int net_height = height - title_bar_height;
+			if (activated) {
-			if (activated && width > 0 && net_height > 0) {
+				arrange_container(child, width, height - title_height,
-				arrange_container(child, width, net_height, title_bar_height == 0, 0);
+					title_bar_height == 0, 0);
 			} else {
 				disable_container(child);
 			}
@@ -359,12 +359,8 @@ static void arrange_children(enum sway_container_layout layout, list_t *children
 			wlr_scene_node_set_enabled(&child->border.tree->node, true);
 			wlr_scene_node_set_position(&child->scene_tree->node, 0, off);
 			wlr_scene_node_reparent(&child->scene_tree->node, content);
-			if (width > 0 && cheight > 0) {
+			arrange_container(child, width, cheight, true, gaps);
-				arrange_container(child, width, cheight, true, gaps);
+			off += cheight + gaps;
-				off += cheight + gaps;
-			} else {
-				disable_container(child);
-			}
 		}
 	} else if (layout == L_HORIZ) {
 		int off = 0;
@@ -376,12 +372,7 @@ static void arrange_children(enum sway_container_layout layout, list_t *children
 			wlr_scene_node_set_position(&child->scene_tree->node, off, 0);
 			wlr_scene_node_reparent(&child->scene_tree->node, content);
 			arrange_container(child, cwidth, height, true, gaps);
-			if (cwidth > 0 && height > 0) {
+			off += cwidth + gaps;
-				arrange_container(child, cwidth, height, true, gaps);
-				off += cwidth + gaps;
-			} else {
-				disable_container(child);
-			}
 		}
 	} else {
 		sway_assert(false, "unreachable");
@@ -661,8 +652,6 @@ static void arrange_root(struct sway_root *root) {
 			struct sway_output *output = root->outputs->items[i];
 			struct sway_workspace *ws = output->current.active_workspace;
 
-			wlr_scene_output_set_position(output->scene_output, output->lx, output->ly);
-
 			if (ws) {
 				arrange_workspace_floating(ws);
 			}

sway/desktop/xdg_shell.c

@@ -299,17 +299,18 @@ static void handle_commit(struct wl_listener *listener, void *data) {
 		return;
 	}
 
-	struct wlr_box *new_geo = &xdg_surface->geometry;
+	struct wlr_box new_geo;
-	bool new_size = new_geo->width != view->geometry.width ||
+	wlr_xdg_surface_get_geometry(xdg_surface, &new_geo);
-			new_geo->height != view->geometry.height ||
+	bool new_size = new_geo.width != view->geometry.width ||
-			new_geo->x != view->geometry.x ||
+			new_geo.height != view->geometry.height ||
-			new_geo->y != view->geometry.y;
+			new_geo.x != view->geometry.x ||
+			new_geo.y != view->geometry.y;
 
 	if (new_size) {
 		// The client changed its surface size in this commit. For floating
 		// containers, we resize the container to match. For tiling containers,
 		// we only recenter the surface.
-		memcpy(&view->geometry, new_geo, sizeof(struct wlr_box));
+		memcpy(&view->geometry, &new_geo, sizeof(struct wlr_box));
 		if (container_is_floating(view->container)) {
 			view_update_size(view);
 			// Only set the toplevel size the current container actually has a size.
@@ -462,8 +463,12 @@ static void handle_map(struct wl_listener *listener, void *data) {
 	struct sway_view *view = &xdg_shell_view->view;
 	struct wlr_xdg_toplevel *toplevel = view->wlr_xdg_toplevel;
 
-	view->natural_width = toplevel->base->geometry.width;
+	view->natural_width = toplevel->base->current.geometry.width;
-	view->natural_height = toplevel->base->geometry.height;
+	view->natural_height = toplevel->base->current.geometry.height;
+	if (!view->natural_width && !view->natural_height) {
+		view->natural_width = toplevel->base->surface->current.width;
+		view->natural_height = toplevel->base->surface->current.height;
+	}
 
 	bool csd = false;
 

sway/desktop/xwayland.c

@@ -71,7 +71,7 @@ static void unmanaged_handle_map(struct wl_listener *listener, void *data) {
 		surface->set_geometry.notify = unmanaged_handle_set_geometry;
 	}
 
-	if (wlr_xwayland_surface_override_redirect_wants_focus(xsurface)) {
+	if (wlr_xwayland_or_surface_wants_focus(xsurface)) {
 		struct sway_seat *seat = input_manager_current_seat();
 		struct wlr_xwayland *xwayland = server.xwayland.wlr_xwayland;
 		wlr_xwayland_set_seat(xwayland, seat->wlr_seat);
@@ -96,7 +96,7 @@ static void unmanaged_handle_unmap(struct wl_listener *listener, void *data) {
 		// This simply returns focus to the parent surface if there's one available.
 		// This seems to handle JetBrains issues.
 		if (xsurface->parent && xsurface->parent->surface
-				&& wlr_xwayland_surface_override_redirect_wants_focus(xsurface->parent)) {
+				&& wlr_xwayland_or_surface_wants_focus(xsurface->parent)) {
 			seat_set_focus_surface(seat, xsurface->parent->surface, false);
 			return;
 		}
@@ -289,6 +289,9 @@ static void set_activated(struct sway_view *view, bool activated) {
 	}
 
 	wlr_xwayland_surface_activate(surface, activated);
+	if (activated) {
+		wlr_xwayland_surface_restack(surface, NULL, XCB_STACK_MODE_ABOVE);
+	}
 }
 
 static void set_tiled(struct sway_view *view, bool tiled) {
@@ -296,7 +299,7 @@ static void set_tiled(struct sway_view *view, bool tiled) {
 		return;
 	}
 	struct wlr_xwayland_surface *surface = view->wlr_xwayland_surface;
-	wlr_xwayland_surface_set_maximized(surface, tiled, tiled);
+	wlr_xwayland_surface_set_maximized(surface, tiled);
 }
 
 static void set_fullscreen(struct sway_view *view, bool fullscreen) {

sway/input/cursor.c

@@ -578,7 +578,7 @@ static void handle_tablet_tool_position(struct sway_cursor *cursor,
 	//   tablet events until the drag is released, even if we are now over a
 	//   non-tablet surface.
 	if (!cursor->simulating_pointer_from_tool_tip &&
-			((surface && wlr_surface_accepts_tablet_v2(surface, tablet->tablet_v2)) ||
+			((surface && wlr_surface_accepts_tablet_v2(tablet->tablet_v2, surface)) ||
 				wlr_tablet_tool_v2_has_implicit_grab(tool->tablet_v2_tool))) {
 		seatop_tablet_tool_motion(seat, tool, time_msec);
 	} else {
@@ -664,7 +664,7 @@ static void handle_tool_tip(struct wl_listener *listener, void *data) {
 		dispatch_cursor_button(cursor, &event->tablet->base, event->time_msec,
 			BTN_LEFT, WL_POINTER_BUTTON_STATE_RELEASED);
 		wlr_seat_pointer_notify_frame(cursor->seat->wlr_seat);
-	} else if (!surface || !wlr_surface_accepts_tablet_v2(surface, tablet_v2)) {
+	} else if (!surface || !wlr_surface_accepts_tablet_v2(tablet_v2, surface)) {
 		// If we started holding the tool tip down on a surface that accepts
 		// tablet v2, we should notify that surface if it gets released over a
 		// surface that doesn't support v2.
@@ -749,7 +749,7 @@ static void handle_tool_button(struct wl_listener *listener, void *data) {
 	bool mod_pressed = modifiers & config->floating_mod;
 
 	bool surface_supports_tablet_events =
-		surface && wlr_surface_accepts_tablet_v2(surface, tablet_v2);
+		surface && wlr_surface_accepts_tablet_v2(tablet_v2, surface);
 
 	// Simulate pointer when:
 	// 1. The modifier key is pressed, OR
@@ -1047,7 +1047,6 @@ void sway_cursor_destroy(struct sway_cursor *cursor) {
 	wl_list_remove(&cursor->touch_frame.link);
 	wl_list_remove(&cursor->tool_axis.link);
 	wl_list_remove(&cursor->tool_tip.link);
-	wl_list_remove(&cursor->tool_proximity.link);
 	wl_list_remove(&cursor->tool_button.link);
 	wl_list_remove(&cursor->request_set_cursor.link);
 
@@ -1213,7 +1212,7 @@ uint32_t get_mouse_bindsym(const char *name, char **error) {
 			SWAY_SCROLL_UP, SWAY_SCROLL_DOWN, SWAY_SCROLL_LEFT,
 			SWAY_SCROLL_RIGHT, BTN_SIDE, BTN_EXTRA};
 		return buttons[number - 1];
-	} else if (has_prefix(name, "BTN_")) {
+	} else if (strncmp(name, "BTN_", strlen("BTN_")) == 0) {
 		// Get event code from name
 		int code = libevdev_event_code_from_name(EV_KEY, name);
 		if (code == -1) {
@@ -1238,7 +1237,7 @@ uint32_t get_mouse_bindcode(const char *name, char **error) {
 		return 0;
 	}
 	const char *event = libevdev_event_code_get_name(EV_KEY, code);
-	if (!event || !has_prefix(event, "BTN_")) {
+	if (!event || strncmp(event, "BTN_", strlen("BTN_")) != 0) {
 		*error = format_str("Event code %d (%s) is not a button",
 			code, event ? event : "(null)");
 		return 0;

sway/input/input-manager.c

@@ -577,7 +577,7 @@ void input_manager_configure_all_input_mappings(void) {
 void input_manager_apply_input_config(struct input_config *input_config) {
 	struct sway_input_device *input_device = NULL;
 	bool wildcard = strcmp(input_config->identifier, "*") == 0;
-	bool type_wildcard = has_prefix(input_config->identifier, "type:");
+	bool type_wildcard = strncmp(input_config->identifier, "type:", 5) == 0;
 	wl_list_for_each(input_device, &server.input->devices, link) {
 		bool type_matches = type_wildcard &&
 			strcmp(input_device_get_type(input_device), input_config->identifier + 5) == 0;

sway/input/keyboard.c

@@ -4,7 +4,6 @@
 #include <wlr/config.h>
 #include <wlr/backend/multi.h>
 #include <wlr/interfaces/wlr_keyboard.h>
-#include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_keyboard.h>
 #include <wlr/types/wlr_keyboard_group.h>
 #include <xkbcommon/xkbcommon-names.h>
@@ -268,7 +267,6 @@ static bool keyboard_execute_compositor_binding(struct sway_keyboard *keyboard,
 		const xkb_keysym_t *pressed_keysyms, uint32_t modifiers, size_t keysyms_len) {
 	for (size_t i = 0; i < keysyms_len; ++i) {
 		xkb_keysym_t keysym = pressed_keysyms[i];
-
 		if (keysym >= XKB_KEY_XF86Switch_VT_1 &&
 				keysym <= XKB_KEY_XF86Switch_VT_12) {
 #if WLR_HAS_SESSION
@@ -284,36 +282,6 @@ static bool keyboard_execute_compositor_binding(struct sway_keyboard *keyboard,
 	return false;
 }
 
-static bool keyboard_execute_pointer_keysyms(struct sway_keyboard *keyboard,
-		uint32_t time, const xkb_keysym_t *pressed_keysyms, size_t keysyms_len,
-		enum wl_keyboard_key_state state) {
-	struct sway_cursor *cursor = keyboard->seat_device->sway_seat->cursor;
-
-	for (size_t i = 0; i < keysyms_len; ++i) {
-		xkb_keysym_t keysym = pressed_keysyms[i];
-
-		uint32_t button = wlr_keyboard_keysym_to_pointer_button(keysym);
-		if (button != 0) {
-			dispatch_cursor_button(cursor, &keyboard->wlr->base, time, button,
-				(enum wl_pointer_button_state)state);
-			wlr_seat_pointer_notify_frame(cursor->seat->wlr_seat);
-			return true;
-		}
-
-		int dx, dy;
-		wlr_keyboard_keysym_to_pointer_motion(keysym, &dx, &dy);
-		if (state == WL_KEYBOARD_KEY_STATE_PRESSED && (dx != 0 || dy != 0)) {
-			dx *= 10;
-			dy *= 10;
-			pointer_motion(cursor, time, &keyboard->wlr->base, dx, dy, dx, dy);
-			wlr_seat_pointer_notify_frame(cursor->seat->wlr_seat);
-			return true;
-		}
-	}
-
-	return false;
-}
-
 /**
  * Get keysyms and modifiers from the keyboard as xkb sees them.
  *
@@ -539,11 +507,6 @@ static void handle_key_event(struct sway_keyboard *keyboard,
 				keyboard, keyinfo.raw_keysyms, keyinfo.raw_modifiers,
 				keyinfo.raw_keysyms_len);
 	}
-	if (!handled) {
-		handled = keyboard_execute_pointer_keysyms(keyboard, event->time_msec,
-			keyinfo.translated_keysyms, keyinfo.translated_keysyms_len,
-			event->state);
-	}
 
 	if (event->state == WL_KEYBOARD_KEY_STATE_RELEASED) {
 		// If the pressed event was sent to a client and we have a focused

sway/input/libinput.c

@@ -272,10 +272,6 @@ bool sway_input_configure_libinput_device(struct sway_input_device *input_device
 	}
 	if (ic->drag_lock != INT_MIN) {
 		changed |= set_tap_drag_lock(device, ic->drag_lock);
-	} else {
-#if HAVE_LIBINPUT_CONFIG_DRAG_LOCK_ENABLED_STICKY
-		changed |= set_tap_drag_lock(device, LIBINPUT_CONFIG_DRAG_LOCK_ENABLED_STICKY);
-#endif
 	}
 	if (ic->pointer_accel != FLT_MIN) {
 		changed |= set_accel_speed(device, ic->pointer_accel);
@@ -358,12 +354,8 @@ void sway_input_reset_libinput_device(struct sway_input_device *input_device) {
 		libinput_device_config_tap_get_default_button_map(device));
 	changed |= set_tap_drag(device,
 		libinput_device_config_tap_get_default_drag_enabled(device));
-#if HAVE_LIBINPUT_CONFIG_DRAG_LOCK_ENABLED_STICKY
-	changed |= set_tap_drag_lock(device, LIBINPUT_CONFIG_DRAG_LOCK_ENABLED_STICKY);
-#else
 	changed |= set_tap_drag_lock(device,
 		libinput_device_config_tap_get_default_drag_lock_enabled(device));
-#endif
 	changed |= set_accel_speed(device,
 		libinput_device_config_accel_get_default_speed(device));
 	changed |= set_rotation_angle(device,
@@ -417,9 +409,13 @@ bool sway_libinput_device_is_builtin(struct sway_input_device *sway_device) {
 		return false;
 	}
 
-	if (has_prefix(id_path, "platform-")) {
+	const char prefix_platform[] = "platform-";
+	if (strncmp(id_path, prefix_platform, strlen(prefix_platform)) == 0) {
 		return true;
 	}
 
-	return has_prefix(id_path, "pci-") && strstr(id_path, "-platform-");
+	const char prefix_pci[] = "pci-";
+	const char infix_platform[] = "-platform-";
+	return (strncmp(id_path, prefix_pci, strlen(prefix_pci)) == 0) &&
+		strstr(id_path, infix_platform);
 }

sway/input/seat.c

@@ -647,6 +647,10 @@ static void seat_reset_input_config(struct sway_seat *seat,
 		sway_device->input_device->wlr_device, NULL);
 }
 
+static bool has_prefix(const char *str, const char *prefix) {
+	return strncmp(str, prefix, strlen(prefix)) == 0;
+}
+
 /**
  * Get the name of the built-in output, if any. Returns NULL if there isn't
  * exactly one built-in output.

sway/input/seatop_default.c

@@ -273,7 +273,7 @@ static void handle_tablet_tool_tip(struct sway_seat *seat,
 	// Handle tapping on an xwayland unmanaged view
 	else if ((xsurface = wlr_xwayland_surface_try_from_wlr_surface(surface)) &&
 			xsurface->override_redirect &&
-			wlr_xwayland_surface_override_redirect_wants_focus(xsurface)) {
+			wlr_xwayland_or_surface_wants_focus(xsurface)) {
 		struct wlr_xwayland *xwayland = server.xwayland.wlr_xwayland;
 		wlr_xwayland_set_seat(xwayland, seat->wlr_seat);
 		seat_set_focus_surface(seat, xsurface->surface, false);
@@ -355,13 +355,6 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
 	struct wlr_keyboard *keyboard = wlr_seat_get_keyboard(seat->wlr_seat);
 	uint32_t modifiers = keyboard ? wlr_keyboard_get_modifiers(keyboard) : 0;
 
-	bool mod_pressed = modifiers & config->floating_mod;
-	uint32_t mod_move_btn = config->floating_mod_inverse ? BTN_RIGHT : BTN_LEFT;
-	uint32_t mod_resize_btn = config->floating_mod_inverse ? BTN_LEFT : BTN_RIGHT;
-	bool mod_move_btn_pressed = mod_pressed && button == mod_move_btn;
-	bool mod_resize_btn_pressed = mod_pressed && button == mod_resize_btn;
-	bool titlebar_left_btn_pressed = on_titlebar && button == BTN_LEFT;
-
 	// Handle mouse bindings
 	if (trigger_pointer_button_binding(seat, device, button, state, modifiers,
 			on_titlebar, on_border, on_contents, on_workspace)) {
@@ -410,28 +403,33 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
 	}
 
 	// Handle tiling resize via mod
-	if (cont && !is_floating_or_child && mod_pressed && mod_resize_btn_pressed &&
+	bool mod_pressed = modifiers & config->floating_mod;
+	if (cont && !is_floating_or_child && mod_pressed &&
 			state == WL_POINTER_BUTTON_STATE_PRESSED) {
-		edge = 0;
+		uint32_t btn_resize = config->floating_mod_inverse ?
-		edge |= cursor->cursor->x > cont->pending.x + cont->pending.width / 2 ?
+			BTN_LEFT : BTN_RIGHT;
-			WLR_EDGE_RIGHT : WLR_EDGE_LEFT;
+		if (button == btn_resize) {
-		edge |= cursor->cursor->y > cont->pending.y + cont->pending.height / 2 ?
+			edge = 0;
-			WLR_EDGE_BOTTOM : WLR_EDGE_TOP;
+			edge |= cursor->cursor->x > cont->pending.x + cont->pending.width / 2 ?
+				WLR_EDGE_RIGHT : WLR_EDGE_LEFT;
+			edge |= cursor->cursor->y > cont->pending.y + cont->pending.height / 2 ?
+				WLR_EDGE_BOTTOM : WLR_EDGE_TOP;
 
-		const char *image = NULL;
+			const char *image = NULL;
-		if (edge == (WLR_EDGE_LEFT | WLR_EDGE_TOP)) {
+			if (edge == (WLR_EDGE_LEFT | WLR_EDGE_TOP)) {
-			image = "nw-resize";
+				image = "nw-resize";
-		} else if (edge == (WLR_EDGE_TOP | WLR_EDGE_RIGHT)) {
+			} else if (edge == (WLR_EDGE_TOP | WLR_EDGE_RIGHT)) {
-			image = "ne-resize";
+				image = "ne-resize";
-		} else if (edge == (WLR_EDGE_RIGHT | WLR_EDGE_BOTTOM)) {
+			} else if (edge == (WLR_EDGE_RIGHT | WLR_EDGE_BOTTOM)) {
-			image = "se-resize";
+				image = "se-resize";
-		} else if (edge == (WLR_EDGE_BOTTOM | WLR_EDGE_LEFT)) {
+			} else if (edge == (WLR_EDGE_BOTTOM | WLR_EDGE_LEFT)) {
-			image = "sw-resize";
+				image = "sw-resize";
+			}
+			cursor_set_image(seat->cursor, image, NULL);
+			seat_set_focus_container(seat, cont);
+			seatop_begin_resize_tiling(seat, cont, edge);
+			return;
 		}
-		cursor_set_image(seat->cursor, image, NULL);
-		seat_set_focus_container(seat, cont);
-		seatop_begin_resize_tiling(seat, cont, edge);
-		return;
 	}
 
 	// Handle changing focus when clicking on a container
@@ -456,10 +454,12 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
 
 	// Handle beginning floating move
 	if (cont && is_floating_or_child && !is_fullscreen_or_child &&
-			state == WL_POINTER_BUTTON_STATE_PRESSED &&
+			state == WL_POINTER_BUTTON_STATE_PRESSED) {
-			(mod_move_btn_pressed || titlebar_left_btn_pressed)) {
+		uint32_t btn_move = config->floating_mod_inverse ? BTN_RIGHT : BTN_LEFT;
-		seatop_begin_move_floating(seat, container_toplevel_ancestor(cont));
+		if (button == btn_move && (mod_pressed || on_titlebar)) {
-		return;
+			seatop_begin_move_floating(seat, container_toplevel_ancestor(cont));
+			return;
+		}
 	}
 
 	// Handle beginning floating resize
@@ -473,7 +473,9 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
 		}
 
 		// Via mod+click
-		if (mod_resize_btn_pressed) {
+		uint32_t btn_resize = config->floating_mod_inverse ?
+			BTN_LEFT : BTN_RIGHT;
+		if (mod_pressed && button == btn_resize) {
 			struct sway_container *floater = container_toplevel_ancestor(cont);
 			edge = 0;
 			edge |= cursor->cursor->x > floater->pending.x + floater->pending.width / 2 ?
@@ -487,15 +489,18 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
 	}
 
 	// Handle moving a tiling container
-	if (config->tiling_drag && (mod_move_btn_pressed || titlebar_left_btn_pressed) &&
+	if (config->tiling_drag && (mod_pressed || on_titlebar) &&
 			state == WL_POINTER_BUTTON_STATE_PRESSED && !is_floating_or_child &&
-			cont && cont->pending.fullscreen_mode == FULLSCREEN_NONE) {
+			cont && cont->pending.fullscreen_mode == FULLSCREEN_NONE &&
+			button == (config->floating_mod_inverse ? BTN_RIGHT : BTN_LEFT)) {
+
 		// If moving a container by its title bar, use a threshold for the drag
 		if (!mod_pressed && config->tiling_drag_threshold > 0) {
 			seatop_begin_move_tiling_threshold(seat, cont);
 		} else {
 			seatop_begin_move_tiling(seat, cont);
 		}
+
 		return;
 	}
 
@@ -518,7 +523,7 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
 	if (surface &&
 			(xsurface = wlr_xwayland_surface_try_from_wlr_surface(surface)) &&
 			xsurface->override_redirect &&
-			wlr_xwayland_surface_override_redirect_wants_focus(xsurface)) {
+			wlr_xwayland_or_surface_wants_focus(xsurface)) {
 		struct wlr_xwayland *xwayland = server.xwayland.wlr_xwayland;
 		wlr_xwayland_set_seat(xwayland, seat->wlr_seat);
 		seat_set_focus_surface(seat, xsurface->surface, false);
@@ -664,7 +669,7 @@ static void handle_touch_down(struct sway_seat *seat,
 	double sx, sy;
 	node_at_coords(seat, seat->touch_x, seat->touch_y, &surface, &sx, &sy);
 
-	if (surface && wlr_surface_accepts_touch(surface, wlr_seat)) {
+	if (surface && wlr_surface_accepts_touch(wlr_seat, surface)) {
 		if (seat_is_input_allowed(seat, surface)) {
 			cursor->simulating_pointer_from_touch = false;
 			seatop_begin_touch_down(seat, surface, event, sx, sy, lx, ly);

sway/input/tablet.c

@@ -363,7 +363,7 @@ void sway_tablet_pad_set_focus(struct sway_tablet_pad *tablet_pad,
 	}
 
 	if (surface == NULL ||
-			!wlr_surface_accepts_tablet_v2(surface, tablet_pad->tablet->tablet_v2)) {
+			!wlr_surface_accepts_tablet_v2(tablet_pad->tablet->tablet_v2, surface)) {
 		return;
 	}
 

sway/input/text_input.c

@@ -10,7 +10,6 @@
 #include "sway/input/text_input_popup.h"
 #include "sway/layers.h"
 #include "sway/server.h"
-#include <wlr/types/wlr_session_lock_v1.h>
 
 static struct sway_text_input *relay_get_focusable_text_input(
 		struct sway_input_method_relay *relay) {
@@ -386,8 +385,6 @@ static void input_popup_set_focus(struct sway_input_popup *popup,
 
 	struct wlr_layer_surface_v1 *layer_surface =
 		wlr_layer_surface_v1_try_from_wlr_surface(surface);
-	struct wlr_session_lock_surface_v1 *lock_surface =
-		wlr_session_lock_surface_v1_try_from_wlr_surface(surface);
 
 	struct wlr_scene_tree *relative_parent;
 	if (layer_surface) {
@@ -407,30 +404,8 @@ static void input_popup_set_focus(struct sway_input_popup *popup,
 		// surface. Layer surfaces get destroyed as part of the output being
 		// destroyed, thus also trickling down to popups.
 		popup->fixed_output = layer->layer_surface->output;
-	} else if (lock_surface) {
-		wl_signal_add(&lock_surface->surface->events.unmap,
-			&popup->focused_surface_unmap);
-
-		struct sway_layer_surface *lock = lock_surface->data;
-		if (lock == NULL) {
-			return;
-		}
-
-		relative_parent = lock->scene->tree;
-		popup->desc.view = NULL;
-
-		// we don't need to add an event here to NULL out this field because
-		// this field will only be initialized if the popup is part of a layer
-		// surface. Layer surfaces get destroyed as part of the output being
-		// destroyed, thus also trickling down to popups.
-		popup->fixed_output = lock->layer_surface->output;
 	} else {
 		struct sway_view *view = view_from_wlr_surface(surface);
-		// In the future there may be other shells been added, so we also need to check here.
-		if (view == NULL) {
-			sway_log(SWAY_DEBUG, "Unsupported IME focus surface");
-			return;
-		}
 		wl_signal_add(&view->events.unmap, &popup->focused_surface_unmap);
 		relative_parent = view->scene_tree;
 		popup->desc.view = view;

sway/ipc-json.c

@@ -6,7 +6,6 @@
 #include <wlr/config.h>
 #include <wlr/types/wlr_content_type_v1.h>
 #include <wlr/types/wlr_output.h>
-#include <wlr/types/wlr_ext_foreign_toplevel_list_v1.h>
 #include <xkbcommon/xkbcommon.h>
 #include "config.h"
 #include "log.h"
@@ -578,10 +577,6 @@ static void ipc_json_describe_view(struct sway_container *c, json_object *object
 	json_object_object_add(object, "app_id",
 			app_id ? json_object_new_string(app_id) : NULL);
 
-	json_object_object_add(object, "foreign_toplevel_identifier",
-		c->view->ext_foreign_toplevel ?
-			json_object_new_string(c->view->ext_foreign_toplevel->identifier) : NULL);
-
 	bool visible = view_is_visible(c->view);
 	json_object_object_add(object, "visible", json_object_new_boolean(visible));
 
@@ -607,18 +602,6 @@ static void ipc_json_describe_view(struct sway_container *c, json_object *object
 	json_object_object_add(object, "inhibit_idle",
 		json_object_new_boolean(view_inhibit_idle(c->view)));
 
-	const char *sandbox_engine = view_get_sandbox_engine(c->view);
-	json_object_object_add(object, "sandbox_engine",
-			sandbox_engine ? json_object_new_string(sandbox_engine) : NULL);
-
-	const char *sandbox_app_id = view_get_sandbox_app_id(c->view);
-	json_object_object_add(object, "sandbox_app_id",
-			sandbox_app_id ? json_object_new_string(sandbox_app_id) : NULL);
-
-	const char *sandbox_instance_id = view_get_sandbox_instance_id(c->view);
-	json_object_object_add(object, "sandbox_instance_id",
-			sandbox_instance_id ? json_object_new_string(sandbox_instance_id) : NULL);
-
 	json_object *idle_inhibitors = json_object_new_object();
 
 	struct sway_idle_inhibitor_v1 *user_inhibitor =

sway/main.c

@@ -152,14 +152,6 @@ void restore_nofile_limit(void) {
 	}
 }
 
-void restore_signals(void) {
-	sigset_t set;
-	sigemptyset(&set);
-	sigprocmask(SIG_SETMASK, &set, NULL);
-	signal(SIGCHLD, SIG_DFL);
-	signal(SIGPIPE, SIG_DFL);
-}
-
 void enable_debug_flag(const char *flag) {
 	if (strcmp(flag, "noatomic") == 0) {
 		debug.noatomic = true;
@@ -167,8 +159,8 @@ void enable_debug_flag(const char *flag) {
 		debug.txn_wait = true;
 	} else if (strcmp(flag, "txn-timings") == 0) {
 		debug.txn_timings = true;
-	} else if (has_prefix(flag, "txn-timeout=")) {
+	} else if (strncmp(flag, "txn-timeout=", 12) == 0) {
-		server.txn_timeout_ms = atoi(&flag[strlen("txn-timeout=")]);
+		server.txn_timeout_ms = atoi(&flag[12]);
 	} else if (strcmp(flag, "legacy-wl-drm") == 0) {
 		debug.legacy_wl_drm = true;
 	} else {
@@ -334,9 +326,6 @@ int main(int argc, char **argv) {
 	signal(SIGTERM, sig_handler);
 	signal(SIGINT, sig_handler);
 
-	// avoid need to reap children
-	signal(SIGCHLD, SIG_IGN);
-
 	// prevent ipc from crashing sway
 	signal(SIGPIPE, SIG_IGN);
 

sway/server.c

@@ -14,20 +14,16 @@
 #include <wlr/types/wlr_content_type_v1.h>
 #include <wlr/types/wlr_cursor_shape_v1.h>
 #include <wlr/types/wlr_data_control_v1.h>
-#include <wlr/types/wlr_ext_data_control_v1.h>
 #include <wlr/types/wlr_data_device.h>
 #include <wlr/types/wlr_drm.h>
 #include <wlr/types/wlr_export_dmabuf_v1.h>
 #include <wlr/types/wlr_ext_foreign_toplevel_list_v1.h>
 #include <wlr/types/wlr_foreign_toplevel_management_v1.h>
-#include <wlr/types/wlr_ext_image_capture_source_v1.h>
-#include <wlr/types/wlr_ext_image_copy_capture_v1.h>
 #include <wlr/types/wlr_fractional_scale_v1.h>
 #include <wlr/types/wlr_gamma_control_v1.h>
 #include <wlr/types/wlr_idle_notify_v1.h>
 #include <wlr/types/wlr_layer_shell_v1.h>
 #include <wlr/types/wlr_linux_dmabuf_v1.h>
-#include <wlr/types/wlr_linux_drm_syncobj_v1.h>
 #include <wlr/types/wlr_output_management_v1.h>
 #include <wlr/types/wlr_output_power_management_v1.h>
 #include <wlr/types/wlr_pointer_constraints_v1.h>
@@ -73,7 +69,6 @@
 #define SWAY_XDG_SHELL_VERSION 5
 #define SWAY_LAYER_SHELL_VERSION 4
 #define SWAY_FOREIGN_TOPLEVEL_LIST_VERSION 1
-#define SWAY_PRESENTATION_VERSION 2
 
 bool allow_unsupported_gpu = false;
 
@@ -109,10 +104,8 @@ static bool is_privileged(const struct wl_global *global) {
 		global == server.input_method->global ||
 		global == server.foreign_toplevel_list->global ||
 		global == server.foreign_toplevel_manager->global ||
-		global == server.wlr_data_control_manager_v1->global ||
+		global == server.data_control_manager_v1->global ||
-		global == server.ext_data_control_manager_v1->global ||
 		global == server.screencopy_manager_v1->global ||
-		global == server.ext_image_copy_capture_manager_v1->global ||
 		global == server.export_dmabuf_manager_v1->global ||
 		global == server.security_context_manager_v1->global ||
 		global == server.gamma_control_manager_v1->global ||
@@ -227,7 +220,6 @@ bool server_init(struct sway_server *server) {
 	server->wl_event_loop = wl_display_get_event_loop(server->wl_display);
 
 	wl_display_set_global_filter(server->wl_display, filter_global, NULL);
-	wl_display_set_default_max_buffer_size(server->wl_display, 1024 * 1024);
 
 	root = root_create(server->wl_display);
 
@@ -257,12 +249,6 @@ bool server_init(struct sway_server *server) {
 			wlr_drm_create(server->wl_display, server->renderer);
 		}
 	}
-	if (wlr_renderer_get_drm_fd(server->renderer) >= 0 &&
-			server->renderer->features.timeline &&
-			server->backend->features.timeline) {
-		wlr_linux_drm_syncobj_manager_v1_create(server->wl_display, 1,
-			wlr_renderer_get_drm_fd(server->renderer));
-	}
 
 	server->allocator = wlr_allocator_autocreate(server->backend,
 		server->renderer);
@@ -281,8 +267,9 @@ bool server_init(struct sway_server *server) {
 
 	server->gamma_control_manager_v1 =
 		wlr_gamma_control_manager_v1_create(server->wl_display);
-	wlr_scene_set_gamma_control_manager_v1(root->root_scene,
+	server->gamma_control_set_gamma.notify = handle_gamma_control_set_gamma;
-		server->gamma_control_manager_v1);
+	wl_signal_add(&server->gamma_control_manager_v1->events.set_gamma,
+		&server->gamma_control_set_gamma);
 
 	server->new_output.notify = handle_new_output;
 	wl_signal_add(&server->backend->events.new_output, &server->new_output);
@@ -334,7 +321,7 @@ bool server_init(struct sway_server *server) {
 	wl_signal_add(&server->pointer_constraints->events.new_constraint,
 		&server->pointer_constraint);
 
-	wlr_presentation_create(server->wl_display, server->backend, SWAY_PRESENTATION_VERSION);
+	wlr_presentation_create(server->wl_display, server->backend);
 	wlr_alpha_modifier_v1_create(server->wl_display);
 
 	server->output_manager_v1 =
@@ -376,10 +363,7 @@ bool server_init(struct sway_server *server) {
 
 	server->export_dmabuf_manager_v1 = wlr_export_dmabuf_manager_v1_create(server->wl_display);
 	server->screencopy_manager_v1 = wlr_screencopy_manager_v1_create(server->wl_display);
-	server->ext_image_copy_capture_manager_v1 = wlr_ext_image_copy_capture_manager_v1_create(server->wl_display, 1);
+	server->data_control_manager_v1 = wlr_data_control_manager_v1_create(server->wl_display);
-	wlr_ext_output_image_capture_source_manager_v1_create(server->wl_display, 1);
-	server->wlr_data_control_manager_v1 = wlr_data_control_manager_v1_create(server->wl_display);
-	server->ext_data_control_manager_v1 = wlr_ext_data_control_manager_v1_create(server->wl_display, 1);
 	server->security_context_manager_v1 = wlr_security_context_manager_v1_create(server->wl_display);
 	wlr_viewporter_create(server->wl_display);
 	wlr_single_pixel_buffer_manager_v1_create(server->wl_display);

sway/sway-bar.5.scd

@@ -143,12 +143,6 @@ runtime.
 
 	This setting also applies to the current binding mode indicator.
 
-The following commands may only be used at runtime.
-
-*mode* toggle [<bar_id>]
-	Toggles the current mode between _hide_ and _dock_. Any other mode
-	is treated as _hide_.
-
 ## TRAY
 
 Swaybar provides a system tray where third-party applications may place icons.

sway/sway-input.5.scd

@@ -152,9 +152,8 @@ The following commands may only be used in the configuration file.
 *input* <identifier> drag enabled|disabled
 	Enables or disables tap-and-drag for specified input device.
 
-*input* <identifier> drag_lock enabled|disabled|enabled_sticky
+*input* <identifier> drag_lock enabled|disabled
-	Enables or disables drag lock for specified input device. The default is
+	Enables or disables drag lock for specified input device.
-	_enabled_sticky_.
 
 *input* <identifier> dwt enabled|disabled
 	Enables or disables disable-while-typing for the specified input device.

sway/sway-ipc.7.scd

@@ -138,7 +138,7 @@ has the following properties:
 :  Whether the workspace is currently focused by the default seat (_seat0_)
 |- urgent
 :  boolean
-:  Whether a window on the workspace has the urgent flag set
+:  Whether a view on the workspace has the urgent flag set
 |- rect
 :  object
 :  The bounds of the workspace. It consists of _x_, _y_, _width_, and _height_
@@ -374,7 +374,7 @@ node and will have the following properties:
    that can be used as an aid in submitting reproduction steps for bug reports
 |- fullscreen_mode
 :  integer
-:  (Only containers and windows) The fullscreen mode of the node. 0 means none, 1 means
+:  (Only containers and views) The fullscreen mode of the node. 0 means none, 1 means
    full workspace, and 2 means global fullscreen
 |- floating
 :  string
@@ -384,45 +384,32 @@ node and will have the following properties:
 :  Whether the window is in the scratchpad. Can be either "none" or "fresh"
 |- app_id
 :  string
-:  (Only windows) For an xdg-shell window, the name of the application, if set.
+:  (Only views) For an xdg-shell view, the name of the application, if set.
    Otherwise, _null_
 |- pid
 :  integer
-:  (Only windows) The PID of the application that owns the window
+:  (Only views) The PID of the application that owns the view
-|- foreign_toplevel_identifier
-:  string
-:  (Only windows) The ext-foreign-toplevel-list-v1 toplevel identifier of this node.
 |- visible
 :  boolean
-:  (Only windows) Whether the node is visible
+:  (Only views) Whether the node is visible
 |- shell
 :  string
-:  (Only windows) The shell of the window, such as _xdg\_shell_ or _xwayland_
+:  (Only views) The shell of the view, such as _xdg\_shell_ or _xwayland_
 |- inhibit_idle
 :  boolean
-:  (Only windows) Whether the window is inhibiting the idle state
+:  (Only views) Whether the view is inhibiting the idle state
 |- idle_inhibitors
 :  object
-:  (Only windows) An object containing the state of the _application_ and _user_ idle inhibitors.
+:  (Only views) An object containing the state of the _application_ and _user_ idle inhibitors.
     _application_ can be _enabled_ or _none_.
     _user_ can be _focus_, _fullscreen_, _open_, _visible_ or _none_.
-|- sandbox_engine
-:  string
-:  (Only windows) The associated sandbox engine (or _null_)
-|- sandbox_app_id
-:  string
-:  (Only windows) The app ID provided by the associated sandbox engine (or _null_)
-|- sandbox_instance_id
-:  string
-:  (Only windows) The instance ID provided by the associated sandbox engine (or
-   _null_)
 |- window
 :  integer
-:  (Only xwayland windows) The X11 window ID for the xwayland window
+:  (Only xwayland views) The X11 window ID for the xwayland view
 |- window_properties
 :  object
-:  (Only xwayland windows) An object containing the _title_, _class_, _instance_,
+:  (Only xwayland views) An object containing the _title_, _class_, _instance_,
-   _window\_role_, _window\_type_, and _transient\_for_ for the window
+   _window\_role_, _window\_type_, and _transient\_for_ for the view
 
 
 *Example Reply:*
@@ -927,13 +914,13 @@ containing the _#RRGGBBAA_ representation of the color:
    that are not visible
 |- urgent_workspace_text
 :  The color to use for the text of the workspace buttons for workspaces that
-   contain an urgent window
+   contain an urgent view
 |- urgent_workspace_bg
 :  The color to use for the background of the workspace buttons for workspaces
-   that contain an urgent window
+   that contain an urgent view
 |- urgent_workspace_border
 :  The color to use for the border of the workspace buttons for workspaces that
-   contain an urgent window
+   contain an urgent view
 |- binding_mode_text
 :  The color to use for the text of the binding mode indicator
 |- binding_mode_bg
@@ -1187,8 +1174,7 @@ following properties will be included for devices that support them:
 :  Whether tap-and-drag is enabled. It can be _enabled_ or _disabled_
 |- tap_drag_lock
 :  string
-:  Whether drag-lock is enabled. It can be _enabled_, _disabled_ or
+:  Whether drag-lock is enabled. It can be _enabled_ or _disabled_
-   _enabled_sticky_
 |- accel_speed
 :  double
 :  The pointer-acceleration in use
@@ -1480,7 +1466,7 @@ available:
 :  Sent whenever the binding mode changes
 |- 0x80000003
 :  window
-:  Sent whenever an event involving a window occurs such as being reparented,
+:  Sent whenever an event involving a view occurs such as being reparented,
    focused, or closed
 |- 0x80000004
 :  barconfig_update
@@ -1536,8 +1522,8 @@ The following change types are currently available:
 |- rename
 :  The workspace was renamed
 |- urgent
-:  A window on the workspace has had their urgency hint set or all urgency hints
+:  A view on the workspace has had their urgency hint set or all urgency hints
-   for windows on the workspace have been cleared
+   for views on the workspace have been cleared
 |- reload
 :  The configuration file has been reloaded
 
@@ -1635,7 +1621,7 @@ with the following properties:
 
 ## 0x80000003. WINDOW
 
-Sent whenever a change involving a window occurs. The event consists of a single
+Sent whenever a change involving a view occurs. The event consists of a single
 object with the following properties:
 
 [- *PROPERTY*
@@ -1646,30 +1632,30 @@ object with the following properties:
 :[ The type of change that occurred. See below for more information
 |- container
 :  object
-:  An object representing the window effected
+:  An object representing the view effected
 
 
 The following change types are currently available:
 [- *TYPE*
 :- *DESCRIPTION*
 |- new
-:[ The window was created
+:[ The view was created
 |- close
-:  The window was closed
+:  The view was closed
 |- focus
-:  The window was focused
+:  The view was focused
 |- title
-:  The window's title has changed
+:  The view's title has changed
 |- fullscreen_mode
-:  The window's fullscreen mode has changed
+:  The view's fullscreen mode has changed
 |- move
-:  The window has been reparented in the tree
+:  The view has been reparented in the tree
 |- floating
-:  The window has become floating or is no longer floating
+:  The view has become floating or is no longer floating
 |- urgent
-:  The window's urgency hint has changed status
+:  The view's urgency hint has changed status
 |- mark
-:  A mark has been added or removed from the window
+:  A mark has been added or removed from the view
 
 
 *Example Event:*

sway/sway.5.scd

@@ -66,8 +66,8 @@ The following commands may only be used in the configuration file.
 *default_orientation* horizontal|vertical|auto
 	Sets the default container layout for tiled containers.
 
-*include* <paths...>
+*include* <path>
-	Include files from _paths_. _paths_ can include either a full path or a
+	Includes another file from _path_. _path_ can be either a full path or a
 	path relative to the parent config, and expands shell syntax (see
 	*wordexp*(3) for details). The same include file can only be included once;
 	subsequent attempts will be ignored.
@@ -117,7 +117,7 @@ They are expected to be used with *bindsym* or at runtime through *swaymsg*(1).
 	Exit sway and end your Wayland session.
 
 *floating* enable|disable|toggle
-	Make focused window floating, non-floating, or the opposite of what it is now.
+	Make focused view floating, non-floating, or the opposite of what it is now.
 
 <criteria> *focus*
 	Moves focus to the container that matches the specified criteria.
@@ -152,9 +152,9 @@ They are expected to be used with *bindsym* or at runtime through *swaymsg*(1).
 	Moves focus between the floating and tiled layers.
 
 *fullscreen* [enable|disable|toggle] [global]
-	Makes focused window fullscreen, non-fullscreen, or the opposite of what it
+	Makes focused view fullscreen, non-fullscreen, or the opposite of what it
 	is now. If no argument is given, it does the same as _toggle_. If _global_
-	is specified, the window will be fullscreen across all outputs.
+	is specified, the view will be fullscreen across all outputs.
 
 *gaps* inner|outer|horizontal|vertical|top|right|bottom|left all|current
 set|plus|minus|toggle <amount>
@@ -164,16 +164,16 @@ set|plus|minus|toggle <amount>
 	_vertical_.
 
 *inhibit_idle* focus|fullscreen|open|none|visible
-	Set/unset an idle inhibitor for the window. _focus_ will inhibit idle when
+	Set/unset an idle inhibitor for the view. _focus_ will inhibit idle when
-	the window is focused by any seat. _fullscreen_ will inhibit idle when the
+	the view is focused by any seat. _fullscreen_ will inhibit idle when the
 	view is fullscreen (or a descendant of a fullscreen container) and is
-	visible. _open_ will inhibit idle until the window is closed (or the
+	visible. _open_ will inhibit idle until the view is closed (or the
-	inhibitor is unset/changed). _visible_ will inhibit idle when the window is
+	inhibitor is unset/changed). _visible_ will inhibit idle when the view is
 	visible on any output. _none_ will remove any existing idle inhibitor for
-	the window.
+	the view.
 
 	This can also be used with criteria to set an idle inhibitor for any
-	existing window or with _for_window_ to set idle inhibitors for future windows.
+	existing view or with _for_window_ to set idle inhibitors for future views.
 
 *layout* default|splith|splitv|stacking|tabbed
 	Sets the layout mode of the focused container.
@@ -331,12 +331,12 @@ set|plus|minus|toggle <amount>
 
 *shortcuts_inhibitor* enable|disable
 	Enables or disables the ability of clients to inhibit keyboard
-	shortcuts for a window. This is primarily useful for virtualization and
+	shortcuts for a view. This is primarily useful for virtualization and
-	remote desktop software. It affects either the currently focused window
+	remote desktop software. It affects either the currently focused view
-	or a set of windows selected by criteria. Subcommand _disable_
+	or a set of views selected by criteria. Subcommand _disable_
-	additionally deactivates any active inhibitors for the given window(s).
+	additionally deactivates any active inhibitors for the given view(s).
 	Criteria are particularly useful with the *for_window* command to
-	configure a class of windows differently from the per-seat defaults
+	configure a class of views differently from the per-seat defaults
 	established by the *seat* subcommand of the same name. See
 	*sway-input*(5) for more ways to affect inhibitors.
 
@@ -364,7 +364,7 @@ set|plus|minus|toggle <amount>
 	Swaps the position, geometry, and fullscreen status of two containers. The
 	first container can be selected either by criteria or focus. The second
 	container can be selected by _id_, _con_id_, or _mark_. _id_ can only be
-	used with xwayland windows. If the first container has focus, it will retain
+	used with xwayland views. If the first container has focus, it will retain
 	focus unless it is moved to a different workspace or the second container
 	becomes fullscreen on the same workspace as the first container. In either
 	of those cases, the second container will gain focus.
@@ -372,29 +372,12 @@ set|plus|minus|toggle <amount>
 *title_format* <format>
 	Sets the format of window titles. The following placeholders may be used:
 
-	*%title*
+		%title - The title supplied by the window ++
-		The title supplied by the window
+		%app_id - The wayland app ID (applicable to wayland windows only) ++
-
+		%class - The X11 classname (applicable to xwayland windows only) ++
-	*%app_id*
+		%instance - The X11 instance (applicable to xwayland windows only) ++
-		The wayland app ID (applicable to wayland windows only)
+		%shell - The protocol the window is using (typically xwayland or
-
+			xdg_shell)
-	*%class*
-		The X11 classname (applicable to xwayland windows only)
-
-	*%instance*
-		The X11 instance (applicable to xwayland windows only)
-
-	*%shell*
-		The protocol the window is using (typically xwayland or xdg_shell)
-
-	*%sandbox_engine*
-		The associated sandbox engine
-
-	*%sandbox_app_id*
-		The app ID provided by the associated sandbox engine
-
-	*%sandbox_instance_id*
-		The instance ID provided by the associated sandbox engine
 
 	This command is typically used with *for_window* criteria. For example:
 
@@ -409,14 +392,14 @@ The following commands may be used either in the configuration file or at
 runtime.
 
 *assign* <criteria> [→] [workspace] [number] <workspace>
-	Assigns windows matching _criteria_ (see *CRITERIA* for details) to
+	Assigns views matching _criteria_ (see *CRITERIA* for details) to
 	_workspace_. The → (U+2192) is optional and cosmetic. This command is
 	equivalent to:
 
 		for_window <criteria> move container to workspace <workspace>
 
 *assign* <criteria> [→] output left|right|up|down|<name>
-	Assigns windows matching _criteria_ (see *CRITERIA* for details) to the
+	Assigns views matching _criteria_ (see *CRITERIA* for details) to the
 	specified output. The → (U+2192) is optional and cosmetic. This command is
 	equivalent to:
 
@@ -599,10 +582,10 @@ runtime.
 		The window that has focus.
 
 	*client.focused_inactive*
-		The most recently focused window within a container which is not focused.
+		The most recently focused view within a container which is not focused.
 
 	*client.focused_tab_title*
-		A window that has focused descendant container.
+		A view that has focused descendant container.
 		Tab or stack container title that is the parent of the focused container
 		but is not directly focused. Defaults to focused_inactive if not
 		specified and does not use the indicator and child_border colors.
@@ -611,10 +594,10 @@ runtime.
 		Ignored (present for i3 compatibility).
 
 	*client.unfocused*
-		A window that does not have focus.
+		A view that does not have focus.
 
 	*client.urgent*
-		A window with an urgency hint. *Note*: Native Wayland windows do not
+		A view with an urgency hint. *Note*: Native Wayland windows do not
 		support urgency. Urgency only works for Xwayland windows.
 
 	The meaning of each color is:
@@ -629,12 +612,12 @@ runtime.
 		The text color of the title bar.
 
 	_indicator_
-		The color used to indicate where a new window will open. In a tiled
+		The color used to indicate where a new view will open. In a tiled
-		container, this would paint the right border of the current window if a
+		container, this would paint the right border of the current view if a
-		new window would be opened to the right.
+		new view would be opened to the right.
 
 	_child_border_
-		The border around the window itself.
+		The border around the view itself.
 
 The default colors are:
 
@@ -772,7 +755,7 @@ The default colors are:
 
 *gaps* inner|outer|horizontal|vertical|top|right|bottom|left <amount>
 	Sets default _amount_ pixels of _inner_ or _outer_ gap, where the inner
-	affects spacing around each window and outer affects the spacing around each
+	affects spacing around each view and outer affects the spacing around each
 	workspace. Outer gaps are in addition to inner gaps. To reduce or remove
 	outer gaps, outer gaps can be set to a negative value. _outer_ gaps can
 	also be specified per side with _top_, _right_, _bottom_, and _left_ or
@@ -844,9 +827,9 @@ The default colors are:
 	A list of output names may be obtained via *swaymsg -t get_outputs*.
 
 *popup_during_fullscreen* smart|ignore|leave_fullscreen
-	Determines what to do when a fullscreen window opens a dialog.
+	Determines what to do when a fullscreen view opens a dialog.
 	If _smart_ (the default), the dialog will be displayed. If _ignore_, the
-	dialog will not be rendered. If _leave_fullscreen_, the window will exit
+	dialog will not be rendered. If _leave_fullscreen_, the view will exit
 	fullscreen mode and the dialog will be rendered.
 
 *primary_selection* enabled|disabled
@@ -972,18 +955,18 @@ The default colors are:
 A criteria is a string in the form of, for example:
 
 ```
-[app_id="some-application" title="[Rr]egex.*"]
+[class="[Rr]egex.*" title="some title"]
 ```
 
 The string contains one or more (space separated) attribute/value pairs. They
-are used by some commands to choose which windows to execute actions on. All
+are used by some commands to choose which views to execute actions on. All
 attributes must match for the criteria to match. Criteria is retained across
 commands separated by a *,*, but will be reset (and allow for new criteria, if
 desired) for commands separated by a *;*.
 
 Criteria may be used with either the *for_window* or *assign* commands to
-specify operations to perform on new windows. A criteria may also be used to
+specify operations to perform on new views. A criteria may also be used to
-perform specific commands (ones that normally act upon one window) on all windows
+perform specific commands (ones that normally act upon one window) on all views
 that match that criteria. For example:
 
 Focus on a window with the mark "IRC":
@@ -992,19 +975,10 @@ Focus on a window with the mark "IRC":
 [con_mark="IRC"] focus
 ```
 
-Kill all windows where the title contains "Emacs":
+Kill all windows with the title "Emacs":
 
 ```
-[title="Emacs"] kill
+[class="Emacs"] kill
-```
-
-Several attributes allow regular expressions. These use Perl-compatible regular
-expressions (PCRE2), which are documented in *pcre2pattern*(3) and summarized in
-*pcre2syntax*(3). For example, this moves all windows with titles ending in
-"sway" or "Sway" to workspace 1:
-
-```
-[title="[Ss]way$"] move workspace 1
 ```
 
 You may like to use swaymsg -t get_tree for finding the values of these
@@ -1080,27 +1054,10 @@ The following attributes may be matched with:
 	applications and requires XWayland.
 
 *workspace*
-	Compare against the workspace name for this window. Can be a regular
+	Compare against the workspace name for this view. Can be a regular
-	expression. If the value is \_\_focused\_\_, then all the windows on the
+	expression. If the value is \_\_focused\_\_, then all the views on the
 	currently focused workspace matches.
 
-*sandbox_engine*
-	Compare against the associated sandbox engine. Can be a regular expression.
-	If the value is \_\_focused\_\_, then the sandbox engine must be the same as
-	that of the currently focused window.
-
-*sandbox_app_id*
-	Compare against the app ID provided by the associated sandbox engine. Can be
-	a regular expression. If the value is \_\_focused\_\_, then the sandbox app
-	ID must be the same as that of the currently focused window.
-
-*sandbox_instance_id*
-	Compare against the instance ID provided by the associated sandbox engine.
-	Can be a regular expression. If the value is \_\_focused\_\_, then the
-	sandbox instance ID must be the same as that of the currently focused
-	window.
-
 # SEE ALSO
 
 *sway*(1) *sway-input*(5) *sway-output*(5) *sway-bar*(5) *sway-ipc*(7)
-*pcre2pattern*(3) *pcre2syntax*(3)

sway/sway_text_node.c

@@ -64,6 +64,18 @@ static int get_text_width(struct sway_text_node *props) {
 	return MAX(width, 0);
 }
 
+static void update_source_box(struct text_buffer *buffer) {
+	struct sway_text_node *props = &buffer->props;
+	struct wlr_fbox source_box = {
+		.x = 0,
+		.y = 0,
+		.width = ceil(get_text_width(props) * buffer->scale),
+		.height = ceil(props->height * buffer->scale),
+	};
+
+	wlr_scene_buffer_set_source_box(buffer->buffer_node, &source_box);
+}
+
 static void render_backing_buffer(struct text_buffer *buffer) {
 	if (!buffer->visible) {
 		return;
@@ -75,7 +87,7 @@ static void render_backing_buffer(struct text_buffer *buffer) {
 	}
 
 	float scale = buffer->scale;
-	int width = ceil(get_text_width(&buffer->props) * scale);
+	int width = ceil(buffer->props.width * scale);
 	int height = ceil(buffer->props.height * scale);
 	float *color = (float *)&buffer->props.color;
 	float *background = (float *)&buffer->props.background;
@@ -135,12 +147,13 @@ static void render_backing_buffer(struct text_buffer *buffer) {
 
 	wlr_scene_buffer_set_buffer(buffer->buffer_node, &cairo_buffer->base);
 	wlr_buffer_drop(&cairo_buffer->base);
+	update_source_box(buffer);
 
 	pixman_region32_t opaque;
 	pixman_region32_init(&opaque);
 	if (background[3] == 1) {
 		pixman_region32_union_rect(&opaque, &opaque, 0, 0,
-			get_text_width(&buffer->props), buffer->props.height);
+			buffer->props.width, buffer->props.height);
 	}
 	wlr_scene_buffer_set_opaque_region(buffer->buffer_node, &opaque);
 	pixman_region32_fini(&opaque);
@@ -287,6 +300,7 @@ void sway_text_node_set_max_width(struct sway_text_node *node, int max_width) {
 	buffer->props.max_width = max_width;
 	wlr_scene_buffer_set_dest_size(buffer->buffer_node,
 		get_text_width(&buffer->props), buffer->props.height);
+	update_source_box(buffer);
 	render_backing_buffer(buffer);
 }
 

sway/swaynag.c

@@ -64,27 +64,35 @@ bool swaynag_spawn(const char *swaynag_command,
 		goto failed;
 	} else if (pid == 0) {
 		restore_nofile_limit();
-		if (!sway_set_cloexec(sockets[1], false)) {
+
+		pid = fork();
+		if (pid < 0) {
+			sway_log_errno(SWAY_ERROR, "fork failed");
+			_exit(EXIT_FAILURE);
+		} else if (pid == 0) {
+			if (!sway_set_cloexec(sockets[1], false)) {
+				_exit(EXIT_FAILURE);
+			}
+
+			if (swaynag->detailed) {
+				close(swaynag->fd[1]);
+				dup2(swaynag->fd[0], STDIN_FILENO);
+				close(swaynag->fd[0]);
+			}
+
+			char wayland_socket_str[16];
+			snprintf(wayland_socket_str, sizeof(wayland_socket_str),
+					"%d", sockets[1]);
+			setenv("WAYLAND_SOCKET", wayland_socket_str, true);
+
+			size_t length = strlen(swaynag_command) + strlen(swaynag->args) + 2;
+			char *cmd = malloc(length);
+			snprintf(cmd, length, "%s %s", swaynag_command, swaynag->args);
+			execlp("sh", "sh", "-c", cmd, NULL);
+			sway_log_errno(SWAY_ERROR, "execlp failed");
 			_exit(EXIT_FAILURE);
 		}
-
+		_exit(EXIT_SUCCESS);
-		if (swaynag->detailed) {
-			close(swaynag->fd[1]);
-			dup2(swaynag->fd[0], STDIN_FILENO);
-			close(swaynag->fd[0]);
-		}
-
-		char wayland_socket_str[16];
-		snprintf(wayland_socket_str, sizeof(wayland_socket_str),
-				"%d", sockets[1]);
-		setenv("WAYLAND_SOCKET", wayland_socket_str, true);
-
-		size_t length = strlen(swaynag_command) + strlen(swaynag->args) + 2;
-		char *cmd = malloc(length);
-		snprintf(cmd, length, "%s %s", swaynag_command, swaynag->args);
-		execlp("sh", "sh", "-c", cmd, NULL);
-		sway_log_errno(SWAY_ERROR, "execlp failed");
-		_exit(EXIT_FAILURE);
 	}
 
 	if (swaynag->detailed) {
@@ -99,6 +107,11 @@ bool swaynag_spawn(const char *swaynag_command,
 		return false;
 	}
 
+	if (waitpid(pid, NULL, 0) < 0) {
+		sway_log_errno(SWAY_ERROR, "waitpid failed");
+		return false;
+	}
+
 	return true;
 
 failed:

sway/tree/arrange.c

@@ -29,7 +29,7 @@ static void apply_horiz_layout(list_t *children, struct wlr_box *parent) {
 		}
 	}
 
-	// Calculate each width fraction
+	// Calculate each height fraction
 	double total_width_fraction = 0;
 	for (int i = 0; i < children->length; ++i) {
 		struct sway_container *child = children->items[i];
@@ -82,18 +82,12 @@ static void apply_horiz_layout(list_t *children, struct wlr_box *parent) {
 		child->pending.y = parent->y;
 		child->pending.width = round(child->width_fraction * child_total_width);
 		child->pending.height = parent->height;
+		child_x += child->pending.width + inner_gap;
 
 		// Make last child use remaining width of parent
 		if (i == children->length - 1) {
 			child->pending.width = parent->x + parent->width - child->pending.x;
 		}
-
-		// Arbitrary lower bound for window size
-		if (child->pending.width < 10 || child->pending.height < 10) {
-			child->pending.width = 0;
-			child->pending.height = 0;
-		}
-		child_x += child->pending.width + inner_gap;
 	}
 }
 
@@ -167,18 +161,12 @@ static void apply_vert_layout(list_t *children, struct wlr_box *parent) {
 		child->pending.y = child_y;
 		child->pending.width = parent->width;
 		child->pending.height = round(child->height_fraction * child_total_height);
+		child_y += child->pending.height + inner_gap;
 
 		// Make last child use remaining height of parent
 		if (i == children->length - 1) {
 			child->pending.height = parent->y + parent->height - child->pending.y;
 		}
-
-		// Arbitrary lower bound for window size
-		if (child->pending.width < 10 || child->pending.height < 10) {
-			child->pending.width = 0;
-			child->pending.height = 0;
-		}
-		child_y += child->pending.height + inner_gap;
 	}
 }
 

sway/tree/container.c

@@ -508,8 +508,6 @@ void container_destroy(struct sway_container *con) {
 
 	if (con->view && con->view->container == con) {
 		con->view->container = NULL;
-		wl_list_remove(&con->output_enter.link);
-		wl_list_remove(&con->output_leave.link);
 		wlr_scene_node_destroy(&con->output_handler->node);
 		if (con->view->destroying) {
 			view_destroy(con->view);
@@ -696,35 +694,26 @@ size_t parse_title_format(struct sway_container *container, char *buffer) {
 		len += next - format;
 		format = next;
 
-		if (has_prefix(next, "%title")) {
+		if (strncmp(next, "%title", 6) == 0) {
 			if (container->view) {
 				len += append_prop(buffer, view_get_title(container->view));
 			} else {
 				len += container_build_representation(container->pending.layout, container->pending.children, buffer);
 			}
-			format += strlen("%title");
+			format += 6;
 		} else if (container->view) {
-			if (has_prefix(next, "%app_id")) {
+			if (strncmp(next, "%app_id", 7) == 0) {
 				len += append_prop(buffer, view_get_app_id(container->view));
-				format += strlen("%app_id");
+				format += 7;
-			} else if (has_prefix(next, "%class")) {
+			} else if (strncmp(next, "%class", 6) == 0) {
 				len += append_prop(buffer, view_get_class(container->view));
-				format += strlen("%class");
+				format += 6;
-			} else if (has_prefix(next, "%instance")) {
+			} else if (strncmp(next, "%instance", 9) == 0) {
 				len += append_prop(buffer, view_get_instance(container->view));
-				format += strlen("%instance");
+				format += 9;
-			} else if (has_prefix(next, "%shell")) {
+			} else if (strncmp(next, "%shell", 6) == 0) {
 				len += append_prop(buffer, view_get_shell(container->view));
-				format += strlen("%shell");
+				format += 6;
-			} else if (has_prefix(next, "%sandbox_engine")) {
-				len += append_prop(buffer, view_get_sandbox_engine(container->view));
-				format += strlen("%sandbox_engine");
-			} else if (has_prefix(next, "%sandbox_app_id")) {
-				len += append_prop(buffer, view_get_sandbox_app_id(container->view));
-				format += strlen("%sandbox_app_id");
-			} else if (has_prefix(next, "%sandbox_instance_id")) {
-				len += append_prop(buffer, view_get_sandbox_instance_id(container->view));
-				format += strlen("%sandbox_instance_id");
 			} else {
 				lenient_strcat(buffer, "%");
 				++format;
@@ -787,7 +776,7 @@ size_t container_build_representation(enum sway_container_layout layout,
 			len += strlen(identifier);
 			lenient_strcat(buffer, identifier);
 		} else {
-			len += strlen("(null)");
+			len += 6;
 			lenient_strcat(buffer, "(null)");
 		}
 	}

sway/tree/view.c

@@ -8,11 +8,9 @@
 #include <wlr/types/wlr_foreign_toplevel_management_v1.h>
 #include <wlr/types/wlr_fractional_scale_v1.h>
 #include <wlr/types/wlr_output_layout.h>
-#include <wlr/types/wlr_security_context_v1.h>
 #include <wlr/types/wlr_server_decoration.h>
 #include <wlr/types/wlr_subcompositor.h>
 #include <wlr/types/wlr_xdg_decoration_v1.h>
-#include <wlr/types/wlr_session_lock_v1.h>
 #if WLR_HAS_XWAYLAND
 #include <wlr/xwayland.h>
 #endif
@@ -156,34 +154,6 @@ uint32_t view_get_window_type(struct sway_view *view) {
 	return 0;
 }
 
-static const struct wlr_security_context_v1_state *security_context_from_view(
-		struct sway_view *view) {
-	const struct wl_client *client =
-		wl_resource_get_client(view->surface->resource);
-	const struct wlr_security_context_v1_state *security_context =
-		wlr_security_context_manager_v1_lookup_client(
-				server.security_context_manager_v1, client);
-	return security_context;
-}
-
-const char *view_get_sandbox_engine(struct sway_view *view) {
-	const struct wlr_security_context_v1_state *security_context =
-		security_context_from_view(view);
-	return security_context ? security_context->sandbox_engine : NULL;
-}
-
-const char *view_get_sandbox_app_id(struct sway_view *view) {
-	const struct wlr_security_context_v1_state *security_context =
-		security_context_from_view(view);
-	return security_context ? security_context->app_id : NULL;
-}
-
-const char *view_get_sandbox_instance_id(struct sway_view *view) {
-	const struct wlr_security_context_v1_state *security_context =
-		security_context_from_view(view);
-	return security_context ? security_context->instance_id : NULL;
-}
-
 const char *view_get_shell(struct sway_view *view) {
 	switch(view->type) {
 	case SWAY_VIEW_XDG_SHELL:
@@ -878,7 +848,7 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface,
 #if WLR_HAS_XWAYLAND
 	struct wlr_xwayland_surface *xsurface;
 	if ((xsurface = wlr_xwayland_surface_try_from_wlr_surface(wlr_surface))) {
-		set_focus &= wlr_xwayland_surface_icccm_input_model(xsurface) !=
+		set_focus &= wlr_xwayland_icccm_input_model(xsurface) !=
 				WLR_ICCCM_INPUT_MODEL_NONE;
 	}
 #endif
@@ -1011,9 +981,6 @@ struct sway_view *view_from_wlr_surface(struct wlr_surface *wlr_surface) {
 	if (wlr_layer_surface_v1_try_from_wlr_surface(wlr_surface) != NULL) {
 		return NULL;
 	}
-	if (wlr_session_lock_surface_v1_try_from_wlr_surface(wlr_surface) != NULL) {
-		return NULL;
-	}
 
 	const char *role = wlr_surface->role ? wlr_surface->role->name : NULL;
 	sway_log(SWAY_DEBUG, "Surface of unknown type (role %s): %p",

sway/tree/workspace.c

@@ -246,7 +246,7 @@ static void workspace_name_from_binding(const struct sway_binding * binding,
 		}
 
 		// If the command is workspace number <name>, isolate the name
-		if (has_prefix(_target, "number ")) {
+		if (strncmp(_target, "number ", strlen("number ")) == 0) {
 			size_t length = strlen(_target) - strlen("number ") + 1;
 			char *temp = malloc(length);
 			strncpy(temp, _target + strlen("number "), length - 1);

swaybar/ipc.c

@@ -15,7 +15,6 @@
 #include "list.h"
 #include "log.h"
 #include "loop.h"
-#include "stringop.h"
 #include "util.h"
 
 void ipc_send_workspace_command(struct swaybar *bar, const char *ws) {
@@ -46,8 +45,8 @@ void ipc_send_workspace_command(struct swaybar *bar, const char *ws) {
 
 char *parse_font(const char *font) {
 	char *new_font = NULL;
-	if (has_prefix(font, "pango:")) {
+	if (strncmp("pango:", font, 6) == 0) {
-		font += strlen("pango:");
+		font += 6;
 	}
 	new_font = strdup(font);
 	return new_font;

swaybar/render.c

@@ -293,11 +293,11 @@ static uint32_t render_status_block(struct render_context *ctx,
 	}
 
 	double offset = 0;
-	if (has_prefix(block->align, "left")) {
+	if (strncmp(block->align, "left", 4) == 0) {
 		offset = x_pos;
-	} else if (has_prefix(block->align, "right")) {
+	} else if (strncmp(block->align, "right", 5) == 0) {
 		offset = x_pos + width - text_width;
-	} else if (has_prefix(block->align, "center")) {
+	} else if (strncmp(block->align, "center", 6) == 0) {
 		offset = x_pos + (width - text_width) / 2;
 	}
 	double text_y = height / 2.0 - text_height / 2.0;

swaybar/tray/item.c

@@ -15,7 +15,6 @@
 #include "cairo_util.h"
 #include "list.h"
 #include "log.h"
-#include "stringop.h"
 #include "wlr-layer-shell-unstable-v1-client-protocol.h"
 
 // TODO menu
@@ -162,7 +161,7 @@ static int get_property_callback(sd_bus_message *msg, void *data,
 	}
 
 	if (strcmp(prop, "Status") == 0 || (sni->status && (sni->status[0] == 'N' ?
-				prop[0] == 'A' : has_prefix(prop, "Icon")))) {
+				prop[0] == 'A' : strncmp(prop, "Icon", 4) == 0))) {
 		set_sni_dirty(sni);
 	}
 cleanup:
@@ -365,7 +364,7 @@ static void handle_click(struct swaybar_sni *sni, int x, int y,
 		method = "ContextMenu";
 	}
 
-	if (has_prefix(method, "Scroll")) {
+	if (strncmp(method, "Scroll", strlen("Scroll")) == 0) {
 		char dir = method[strlen("Scroll")];
 		char *orientation = (dir == 'U' || dir == 'D') ? "vertical" : "horizontal";
 		int sign = (dir == 'U' || dir == 'L') ? -1 : 1;

swaybar/tray/watcher.c

@@ -31,9 +31,9 @@ static int handle_lost_service(sd_bus_message *msg,
 		struct swaybar_watcher *watcher = data;
 		for (int idx = 0; idx < watcher->items->length; ++idx) {
 			char *id = watcher->items->items[idx];
-			bool cmp_res = using_standard_protocol(watcher) ?
+			int cmp_res = using_standard_protocol(watcher) ?
-				cmp_id(id, service) == 0 : has_prefix(id, service);
+				cmp_id(id, service) : strncmp(id, service, strlen(service));
-			if (cmp_res) {
+			if (cmp_res == 0) {
 				sway_log(SWAY_DEBUG, "Unregistering Status Notifier Item '%s'", id);
 				list_del(watcher->items, idx--);
 				sd_bus_emit_signal(watcher->bus, obj_path, watcher->interface,

swaymsg/main.c

@@ -330,10 +330,6 @@ static void pretty_print_tree(json_object *obj, int indent) {
 		const char *instance = json_object_get_string(json_object_object_get(window_props_obj, "instance"));
 		const char *class = json_object_get_string(json_object_object_get(window_props_obj, "class"));
 		int x11_id = json_object_get_int(json_object_object_get(obj, "window"));
-		const char *foreign_toplevel_id = json_object_get_string(json_object_object_get(obj, "foreign_toplevel_identifier"));
-		const char *sandbox_engine = json_object_get_string(json_object_object_get(obj, "sandbox_engine"));
-		const char *sandbox_app_id = json_object_get_string(json_object_object_get(obj, "sandbox_app_id"));
-		const char *sandbox_instance_id = json_object_get_string(json_object_object_get(obj, "sandbox_instance_id"));
 
 		printf(" (%s, pid: %d", shell, pid);
 		if (app_id != NULL) {
@@ -348,18 +344,6 @@ static void pretty_print_tree(json_object *obj, int indent) {
 		if (x11_id != 0) {
 			printf(", X11 window: 0x%X", x11_id);
 		}
-		if (foreign_toplevel_id != NULL) {
-			printf(", foreign_toplevel_id: \"%s\"", foreign_toplevel_id);
-		}
-		if (sandbox_engine != NULL) {
-			printf(", sandbox_engine: \"%s\"", sandbox_engine);
-		}
-		if (sandbox_app_id != NULL) {
-			printf(", sandbox_app_id: \"%s\"", sandbox_app_id);
-		}
-		if (sandbox_instance_id != NULL) {
-			printf(", sandbox_instance_id: \"%s\"", sandbox_instance_id);
-		}
 		printf(")");
 	}