97 files changed, 1441 insertions, 643 deletions
diff --git a/sway/commands.c b/sway/commands.c
index 55eda183..8d003dfa 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809
 #include <ctype.h>
 #include <stdarg.h>
 #include <stdlib.h>
@@ -82,7 +81,6 @@ static const struct cmd_handler handlers[] = {
        { "no_focus", cmd_no_focus },
        { "output", cmd_output },
        { "popup_during_fullscreen", cmd_popup_during_fullscreen },
-        { "primary_selection", cmd_primary_selection },
        { "seat", cmd_seat },
        { "set", cmd_set },
        { "show_marks", cmd_show_marks },
@@ -105,6 +103,7 @@ static const struct cmd_handler handlers[] = {
 static const struct cmd_handler config_handlers[] = {
        { "default_orientation", cmd_default_orientation },
        { "include", cmd_include },
+        { "primary_selection", cmd_primary_selection },
        { "swaybg_command", cmd_swaybg_command },
        { "swaynag_command", cmd_swaynag_command },
        { "workspace_layout", cmd_workspace_layout },
diff --git a/sway/commands/assign.c b/sway/commands/assign.c
index f7d911f7..bf95cf00 100644
--- a/sway/commands/assign.c
+++ b/sway/commands/assign.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdio.h>
 #include <string.h>
 #include "sway/commands.h"
diff --git a/sway/commands/bar.c b/sway/commands/bar.c
index 22756acb..635e895b 100644
--- a/sway/commands/bar.c
+++ b/sway/commands/bar.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809
 #include <stdio.h>
 #include <string.h>
 #include <strings.h>
diff --git a/sway/commands/bar/font.c b/sway/commands/bar/font.c
index 891c87af..0c074679 100644
--- a/sway/commands/bar/font.c
+++ b/sway/commands/bar/font.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "sway/commands.h"
 #include "log.h"
diff --git a/sway/commands/bar/hidden_state.c b/sway/commands/bar/hidden_state.c
index 8b661e3a..7b38831e 100644
--- a/sway/commands/bar/hidden_state.c
+++ b/sway/commands/bar/hidden_state.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include <strings.h>
 #include "sway/commands.h"
diff --git a/sway/commands/bar/icon_theme.c b/sway/commands/bar/icon_theme.c
index 6ac07843..fee21709 100644
--- a/sway/commands/bar/icon_theme.c
+++ b/sway/commands/bar/icon_theme.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "config.h"
 #include "sway/commands.h"
diff --git a/sway/commands/bar/id.c b/sway/commands/bar/id.c
index a9a61743..46cf4ca9 100644
--- a/sway/commands/bar/id.c
+++ b/sway/commands/bar/id.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "sway/commands.h"
 #include "log.h"
diff --git a/sway/commands/bar/mode.c b/sway/commands/bar/mode.c
index 7c2f423b..d69e910b 100644
--- a/sway/commands/bar/mode.c
+++ b/sway/commands/bar/mode.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include <strings.h>
 #include "sway/commands.h"
diff --git a/sway/commands/bar/output.c b/sway/commands/bar/output.c
index cac1d056..51730176 100644
--- a/sway/commands/bar/output.c
+++ b/sway/commands/bar/output.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdbool.h>
 #include <string.h>
 #include "sway/commands.h"
diff --git a/sway/commands/bar/position.c b/sway/commands/bar/position.c
index b207de0b..94f530ec 100644
--- a/sway/commands/bar/position.c
+++ b/sway/commands/bar/position.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include <strings.h>
 #include "sway/commands.h"
diff --git a/sway/commands/bar/separator_symbol.c b/sway/commands/bar/separator_symbol.c
index 6737d4d2..50e9a873 100644
--- a/sway/commands/bar/separator_symbol.c
+++ b/sway/commands/bar/separator_symbol.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "sway/commands.h"
 #include "log.h"
diff --git a/sway/commands/bar/tray_output.c b/sway/commands/bar/tray_output.c
index eb3b486e..679facf7 100644
--- a/sway/commands/bar/tray_output.c
+++ b/sway/commands/bar/tray_output.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "config.h"
 #include "sway/commands.h"
diff --git a/sway/commands/bind.c b/sway/commands/bind.c
index 979e178f..268f2855 100644
--- a/sway/commands/bind.c
+++ b/sway/commands/bind.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <libevdev/libevdev.h>
 #include <linux/input-event-codes.h>
 #include <string.h>
diff --git a/sway/commands/exec_always.c b/sway/commands/exec_always.c
index 8fca1909..8bc1048c 100644
--- a/sway/commands/exec_always.c
+++ b/sway/commands/exec_always.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
diff --git a/sway/commands/font.c b/sway/commands/font.c
index 74bb6b9f..9920d03e 100644
--- a/sway/commands/font.c
+++ b/sway/commands/font.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "sway/commands.h"
 #include "sway/config.h"
diff --git a/sway/commands/gesture.c b/sway/commands/gesture.c
index d4442cc3..90a20716 100644
--- a/sway/commands/gesture.c
+++ b/sway/commands/gesture.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include "sway/config.h"
 #include "gesture.h"
diff --git a/sway/commands/input/calibration_matrix.c b/sway/commands/input/calibration_matrix.c
index 38749fbb..53fe2c35 100644
--- a/sway/commands/input/calibration_matrix.c
+++ b/sway/commands/input/calibration_matrix.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include <strings.h>
 #include "sway/config.h"
diff --git a/sway/commands/input/events.c b/sway/commands/input/events.c
index 08d99bf0..3cea026e 100644
--- a/sway/commands/input/events.c
+++ b/sway/commands/input/events.c
@@ -5,6 +5,7 @@
 #include "sway/config.h"
 #include "sway/commands.h"
 #include "sway/input/input-manager.h"
+#include "sway/server.h"
 #include "log.h"
 #if WLR_HAS_LIBINPUT_BACKEND
diff --git a/sway/commands/input/map_from_region.c b/sway/commands/input/map_from_region.c
index 4400e111..2f8f753d 100644
--- a/sway/commands/input/map_from_region.c
+++ b/sway/commands/input/map_from_region.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdbool.h>
 #include <string.h>
 #include <strings.h>
diff --git a/sway/commands/input/map_to_output.c b/sway/commands/input/map_to_output.c
index f60fb7d5..a7266baa 100644
--- a/sway/commands/input/map_to_output.c
+++ b/sway/commands/input/map_to_output.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include <strings.h>
 #include "sway/config.h"
diff --git a/sway/commands/input/map_to_region.c b/sway/commands/input/map_to_region.c
index ad535db2..9087c589 100644
--- a/sway/commands/input/map_to_region.c
+++ b/sway/commands/input/map_to_region.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdlib.h>
 #include <string.h>
 #include "sway/commands.h"
diff --git a/sway/commands/input/xkb_file.c b/sway/commands/input/xkb_file.c
index 493f94fb..056f00e5 100644
--- a/sway/commands/input/xkb_file.c
+++ b/sway/commands/input/xkb_file.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <unistd.h>
 #include <errno.h>
 #include "sway/config.h"
diff --git a/sway/commands/input/xkb_layout.c b/sway/commands/input/xkb_layout.c
index 22626517..1d01886c 100644
--- a/sway/commands/input/xkb_layout.c
+++ b/sway/commands/input/xkb_layout.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include "sway/config.h"
 #include "sway/commands.h"
 #include "log.h"
diff --git a/sway/commands/input/xkb_model.c b/sway/commands/input/xkb_model.c
index f4a33de3..a9144a8a 100644
--- a/sway/commands/input/xkb_model.c
+++ b/sway/commands/input/xkb_model.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include "sway/config.h"
 #include "sway/commands.h"
 #include "log.h"
diff --git a/sway/commands/input/xkb_numlock.c b/sway/commands/input/xkb_numlock.c
index 87d3e60c..bbe848fe 100644
--- a/sway/commands/input/xkb_numlock.c
+++ b/sway/commands/input/xkb_numlock.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include "sway/config.h"
 #include "sway/commands.h"
 #include "util.h"
diff --git a/sway/commands/input/xkb_options.c b/sway/commands/input/xkb_options.c
index d609293f..7ca20777 100644
--- a/sway/commands/input/xkb_options.c
+++ b/sway/commands/input/xkb_options.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include "sway/config.h"
 #include "sway/commands.h"
 #include "log.h"
diff --git a/sway/commands/input/xkb_rules.c b/sway/commands/input/xkb_rules.c
index 3b59622c..8fbd26fb 100644
--- a/sway/commands/input/xkb_rules.c
+++ b/sway/commands/input/xkb_rules.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include "sway/config.h"
 #include "sway/commands.h"
 #include "log.h"
diff --git a/sway/commands/input/xkb_switch_layout.c b/sway/commands/input/xkb_switch_layout.c
index 3cce4ec8..8d600fca 100644
--- a/sway/commands/input/xkb_switch_layout.c
+++ b/sway/commands/input/xkb_switch_layout.c
@@ -1,9 +1,9 @@
-#define _POSIX_C_SOURCE 200809L
 #include <assert.h>
 #include <wlr/interfaces/wlr_keyboard.h>
 #include "sway/config.h"
 #include "sway/commands.h"
 #include "sway/input/input-manager.h"
+#include "sway/server.h"
 #include "log.h"
 struct xkb_switch_layout_action {
diff --git a/sway/commands/input/xkb_variant.c b/sway/commands/input/xkb_variant.c
index d0e21d77..2d14ea9c 100644
--- a/sway/commands/input/xkb_variant.c
+++ b/sway/commands/input/xkb_variant.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include "sway/config.h"
 #include "sway/commands.h"
 #include "log.h"
diff --git a/sway/commands/mark.c b/sway/commands/mark.c
index 30cf458c..2bfc86b3 100644
--- a/sway/commands/mark.c
+++ b/sway/commands/mark.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "sway/commands.h"
 #include "sway/config.h"
diff --git a/sway/commands/mode.c b/sway/commands/mode.c
index 7263efcb..b3216967 100644
--- a/sway/commands/mode.c
+++ b/sway/commands/mode.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdbool.h>
 #include <string.h>
 #include "sway/commands.h"
diff --git a/sway/commands/move.c b/sway/commands/move.c
index 69ed06c0..ff656cfb 100644
--- a/sway/commands/move.c
+++ b/sway/commands/move.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <ctype.h>
 #include <math.h>
 #include <stdbool.h>
@@ -12,6 +11,7 @@
 #include "sway/input/seat.h"
 #include "sway/ipc-server.h"
 #include "sway/output.h"
+#include "sway/server.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/container.h"
 #include "sway/tree/root.h"
@@ -770,15 +770,6 @@ static struct cmd_results *cmd_move_in_direction(
                ipc_event_window(container, "move");
        }
-        // Hack to re-focus container
-        seat_set_raw_focus(config->handler_context.seat, &new_ws->node);
-        seat_set_focus_container(config->handler_context.seat, container);
-        if (old_ws != new_ws) {
-                ipc_event_workspace(old_ws, new_ws, "focus");
-                workspace_detect_urgent(old_ws);
-                workspace_detect_urgent(new_ws);
-        }
        container_end_mouse_operation(container);
        return cmd_results_new(CMD_SUCCESS, NULL);
diff --git a/sway/commands/output.c b/sway/commands/output.c
index df32c673..b822e770 100644
--- a/sway/commands/output.c
+++ b/sway/commands/output.c
@@ -10,6 +10,7 @@ static const struct cmd_handler output_handlers[] = {
        { "adaptive_sync", output_cmd_adaptive_sync },
        { "background", output_cmd_background },
        { "bg", output_cmd_background },
+        { "color_profile", output_cmd_color_profile },
        { "disable", output_cmd_disable },
        { "dpms", output_cmd_dpms },
        { "enable", output_cmd_enable },
@@ -103,15 +104,18 @@ struct cmd_results *cmd_output(int argc, char **argv) {
        bool background = output->background;
-        output = store_output_config(output);
+        store_output_config(output);
        // If reloading, the output configs will be applied after reading the
        // entire config and before the deferred commands so that an auto generated
        // workspace name is not given to re-enabled outputs.
        if (!config->reloading && !config->validating) {
-                apply_output_config_to_outputs(output);
+                apply_all_output_configs();
                if (background) {
-                        spawn_swaybg();
+                        if (!spawn_swaybg()) {
+                                return cmd_results_new(CMD_FAILURE,
+                                        "Failed to apply background configuration");
+                        }
                }
        }
diff --git a/sway/commands/output/background.c b/sway/commands/output/background.c
index d691295f..55bd7671 100644
--- a/sway/commands/output/background.c
+++ b/sway/commands/output/background.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <libgen.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/sway/commands/output/color_profile.c b/sway/commands/output/color_profile.c
new file mode 100644
index 00000000..792bd55f
--- /dev/null
+++ b/sway/commands/output/color_profile.c
@@ -0,0 +1,101 @@
+#include <fcntl.h>
+#include <strings.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <wlr/render/color.h>
+#include "sway/commands.h"
+#include "sway/config.h"
+static bool read_file_into_buf(const char *path, void **buf, size_t *size) {
+        /* Why not use fopen/fread directly? glibc will succesfully open directories,
+         * not just files, and supports seeking on them. Instead, we directly
+         * work with file descriptors and use the more consistent open/fstat/read. */
+        int fd = open(path, O_RDONLY | O_NOCTTY | O_CLOEXEC);
+        if (fd == -1) {
+                return false;
+        }
+        char *b = NULL;
+        struct stat info;
+        if (fstat(fd, &info) == -1) {
+                goto fail;
+        }
+        // only regular files, to avoid issues with e.g. opening pipes
+        if (!S_ISREG(info.st_mode)) {
+                goto fail;
+        }
+        off_t s = info.st_size;
+        if (s <= 0) {
+                goto fail;
+        }
+        b = calloc(1, s);
+        if (!b) {
+                goto fail;
+        }
+        size_t nread = 0;
+        while (nread < (size_t)s) {
+                size_t to_read = (size_t)s - nread;
+                ssize_t r = read(fd, b + nread, to_read);
+                if ((r == -1 && errno != EINTR) || r == 0) {
+                        goto fail;
+                }
+                nread += (size_t)r;
+        }
+        close(fd);
+        *buf = b;
+        *size = (size_t)s;
+        return true; // success
+fail:
+        free(b);
+        close(fd);
+        return false;
+}
+struct cmd_results *output_cmd_color_profile(int argc, char **argv) {
+        if (!config->handler_context.output_config) {
+                return cmd_results_new(CMD_FAILURE, "Missing output config");
+        }
+        if (!argc) {
+                return cmd_results_new(CMD_INVALID, "Missing color_profile first argument.");
+        }
+        if (strcmp(*argv, "srgb") == 0) {
+                wlr_color_transform_unref(config->handler_context.output_config->color_transform);
+                config->handler_context.output_config->color_transform = NULL;
+                config->handler_context.output_config->set_color_transform = true;
+                config->handler_context.leftovers.argc = argc - 1;
+                config->handler_context.leftovers.argv = argv + 1;
+        } else if (strcmp(*argv, "icc") == 0) {
+                if (argc < 2) {
+                        return cmd_results_new(CMD_INVALID,
+                                "Invalid color profile specification: icc type requires a file");
+                }
+                void *data = NULL;
+                size_t size = 0;
+                if (!read_file_into_buf(argv[1], &data, &size)) {
+                        return cmd_results_new(CMD_FAILURE,
+                                "Failed to load color profile: could not read ICC file");
+                }
+                struct wlr_color_transform *tmp =
+                        wlr_color_transform_init_linear_to_icc(data, size);
+                if (!tmp) {
+                        free(data);
+                        return cmd_results_new(CMD_FAILURE,
+                                "Failed to load color profile: failed to initialize transform from ICC");
+                }
+                free(data);
+                wlr_color_transform_unref(config->handler_context.output_config->color_transform);
+                config->handler_context.output_config->color_transform = tmp;
+                config->handler_context.output_config->set_color_transform = true;
+                config->handler_context.leftovers.argc = argc - 2;
+                config->handler_context.leftovers.argv = argv + 2;
+        } else {
+                return cmd_results_new(CMD_INVALID,
+                        "Invalid color profile specification: first argument should be icc|srgb");
+        }
+        return NULL;
+}
diff --git a/sway/commands/output/toggle.c b/sway/commands/output/toggle.c
index 6342d526..c6b72845 100644
--- a/sway/commands/output/toggle.c
+++ b/sway/commands/output/toggle.c
@@ -29,7 +29,7 @@ struct cmd_results *output_cmd_toggle(int argc, char **argv) {
                config->handler_context.output_config->enabled = 1;
        }
-        free(oc);
+        free_output_config(oc);
        config->handler_context.leftovers.argc = argc;
        config->handler_context.leftovers.argv = argv;
        return NULL;
diff --git a/sway/commands/primary_selection.c b/sway/commands/primary_selection.c
index 585b079d..9e2689c2 100644
--- a/sway/commands/primary_selection.c
+++ b/sway/commands/primary_selection.c
@@ -12,12 +12,14 @@ struct cmd_results *cmd_primary_selection(int argc, char **argv) {
        bool primary_selection = parse_boolean(argv[0], true);
+        // config->primary_selection is reset to the previous value on reload in
+        // load_main_config()
        if (config->reloading && config->primary_selection != primary_selection) {
                return cmd_results_new(CMD_FAILURE,
                                "primary_selection can only be enabled/disabled at launch");
        }
-        config->primary_selection = parse_boolean(argv[0], true);
+        config->primary_selection = primary_selection;
        return cmd_results_new(CMD_SUCCESS, NULL);
 }
diff --git a/sway/commands/reload.c b/sway/commands/reload.c
index 82967ca7..6c0aac26 100644
--- a/sway/commands/reload.c
+++ b/sway/commands/reload.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "sway/commands.h"
 #include "sway/config.h"
diff --git a/sway/commands/seat/attach.c b/sway/commands/seat/attach.c
index 00bfdab6..47d18546 100644
--- a/sway/commands/seat/attach.c
+++ b/sway/commands/seat/attach.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "sway/commands.h"
 #include "sway/config.h"
diff --git a/sway/commands/seat/cursor.c b/sway/commands/seat/cursor.c
index 5a8a3bc8..434e6bbb 100644
--- a/sway/commands/seat/cursor.c
+++ b/sway/commands/seat/cursor.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <linux/input-event-codes.h>
 #include <strings.h>
@@ -6,6 +5,7 @@
 #include <wlr/types/wlr_pointer.h>
 #include "sway/commands.h"
 #include "sway/input/cursor.h"
+#include "sway/server.h"
 static struct cmd_results *press_or_release(struct sway_cursor *cursor,
                char *action, char *button_str);
@@ -85,12 +85,12 @@ struct cmd_results *seat_cmd_cursor(int argc, char **argv) {
 static struct cmd_results *press_or_release(struct sway_cursor *cursor,
                char *action, char *button_str) {
-        enum wlr_button_state state;
+        enum wl_pointer_button_state state;
        uint32_t button;
        if (strcasecmp(action, "press") == 0) {
-                state = WLR_BUTTON_PRESSED;
+                state = WL_POINTER_BUTTON_STATE_PRESSED;
        } else if (strcasecmp(action, "release") == 0) {
-                state = WLR_BUTTON_RELEASED;
+                state = WL_POINTER_BUTTON_STATE_RELEASED;
        } else {
                return cmd_results_new(CMD_INVALID, "%s", expected_syntax);
        }
@@ -105,16 +105,16 @@ static struct cmd_results *press_or_release(struct sway_cursor *cursor,
        } else if (button == SWAY_SCROLL_UP || button == SWAY_SCROLL_DOWN
                        || button == SWAY_SCROLL_LEFT || button == SWAY_SCROLL_RIGHT) {
                // Dispatch axis event
-                enum wlr_axis_orientation orientation =
+                enum wl_pointer_axis orientation =
                        (button == SWAY_SCROLL_UP || button == SWAY_SCROLL_DOWN)
-                        ? WLR_AXIS_ORIENTATION_VERTICAL
+                        ? WL_POINTER_AXIS_VERTICAL_SCROLL
-                        : WLR_AXIS_ORIENTATION_HORIZONTAL;
+                        : WL_POINTER_AXIS_HORIZONTAL_SCROLL;
                double delta = (button == SWAY_SCROLL_UP || button == SWAY_SCROLL_LEFT)
                        ? -1 : 1;
                struct wlr_pointer_axis_event event = {
                        .pointer = NULL,
                        .time_msec = 0,
-                        .source = WLR_AXIS_SOURCE_WHEEL,
+                        .source = WL_POINTER_AXIS_SOURCE_WHEEL,
                        .orientation = orientation,
                        .delta = delta * 15,
                        .delta_discrete = delta
diff --git a/sway/commands/seat/hide_cursor.c b/sway/commands/seat/hide_cursor.c
index e09b82d9..f5177a47 100644
--- a/sway/commands/seat/hide_cursor.c
+++ b/sway/commands/seat/hide_cursor.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "sway/commands.h"
 #include "sway/config.h"
diff --git a/sway/commands/seat/idle.c b/sway/commands/seat/idle.c
index 62b94db2..2974453e 100644
--- a/sway/commands/seat/idle.c
+++ b/sway/commands/seat/idle.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <limits.h>
 #include <string.h>
 #include <strings.h>
diff --git a/sway/commands/seat/pointer_constraint.c b/sway/commands/seat/pointer_constraint.c
index 3890ebde..38f85bcd 100644
--- a/sway/commands/seat/pointer_constraint.c
+++ b/sway/commands/seat/pointer_constraint.c
@@ -4,6 +4,7 @@
 #include "sway/config.h"
 #include "sway/input/cursor.h"
 #include "sway/input/seat.h"
+#include "sway/server.h"
 enum operation {
        OP_ENABLE,
diff --git a/sway/commands/seat/shortcuts_inhibitor.c b/sway/commands/seat/shortcuts_inhibitor.c
index 7c7f99cf..df68618d 100644
--- a/sway/commands/seat/shortcuts_inhibitor.c
+++ b/sway/commands/seat/shortcuts_inhibitor.c
@@ -2,6 +2,7 @@
 #include "sway/commands.h"
 #include "sway/input/seat.h"
 #include "sway/input/input-manager.h"
+#include "sway/server.h"
 #include "util.h"
 static struct cmd_results *handle_action(struct seat_config *sc,
diff --git a/sway/commands/seat/xcursor_theme.c b/sway/commands/seat/xcursor_theme.c
index 202f35b9..61322a57 100644
--- a/sway/commands/seat/xcursor_theme.c
+++ b/sway/commands/seat/xcursor_theme.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "sway/commands.h"
 #include "sway/config.h"
diff --git a/sway/commands/set.c b/sway/commands/set.c
index c539e9fc..ba384c7c 100644
--- a/sway/commands/set.c
+++ b/sway/commands/set.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdio.h>
 #include <string.h>
 #include <strings.h>
diff --git a/sway/commands/shortcuts_inhibitor.c b/sway/commands/shortcuts_inhibitor.c
index ffa1a5c9..2dfd1b9f 100644
--- a/sway/commands/shortcuts_inhibitor.c
+++ b/sway/commands/shortcuts_inhibitor.c
@@ -3,6 +3,7 @@
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "sway/input/seat.h"
+#include "sway/server.h"
 #include "sway/tree/container.h"
 #include "sway/tree/view.h"
diff --git a/sway/commands/show_marks.c b/sway/commands/show_marks.c
index fecb5ade..60cef9fa 100644
--- a/sway/commands/show_marks.c
+++ b/sway/commands/show_marks.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "sway/commands.h"
 #include "sway/config.h"
diff --git a/sway/commands/swap.c b/sway/commands/swap.c
index d44eb006..c0b0d0b9 100644
--- a/sway/commands/swap.c
+++ b/sway/commands/swap.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <strings.h>
 #include "config.h"
 #include "log.h"
@@ -19,7 +18,7 @@ static bool test_con_id(struct sway_container *container, void *data) {
        return container->node.id == *con_id;
 }
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
 static bool test_id(struct sway_container *container, void *data) {
        xcb_window_t *wid = data;
        return (container->view && container->view->type == SWAY_VIEW_XWAYLAND
@@ -54,7 +53,7 @@ struct cmd_results *cmd_swap(int argc, char **argv) {
        char *value = join_args(argv + 3, argc - 3);
        if (strcasecmp(argv[2], "id") == 0) {
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
                xcb_window_t id = strtol(value, NULL, 0);
                other = root_find_container(test_id, &id);
 #endif
diff --git a/sway/commands/title_format.c b/sway/commands/title_format.c
index a2446b7e..0b2ea265 100644
--- a/sway/commands/title_format.c
+++ b/sway/commands/title_format.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "sway/commands.h"
 #include "sway/config.h"
diff --git a/sway/commands/unmark.c b/sway/commands/unmark.c
index c3a6ac4b..4aba5bae 100644
--- a/sway/commands/unmark.c
+++ b/sway/commands/unmark.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "sway/commands.h"
 #include "sway/config.h"
diff --git a/sway/commands/workspace.c b/sway/commands/workspace.c
index 8536929e..37a201b4 100644
--- a/sway/commands/workspace.c
+++ b/sway/commands/workspace.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <ctype.h>
 #include <limits.h>
 #include <string.h>
diff --git a/sway/commands/xwayland.c b/sway/commands/xwayland.c
index 6ca26923..c0b175fc 100644
--- a/sway/commands/xwayland.c
+++ b/sway/commands/xwayland.c
@@ -10,7 +10,7 @@ struct cmd_results *cmd_xwayland(int argc, char **argv) {
                return error;
        }
-#ifdef HAVE_XWAYLAND
+#ifdef WLR_HAS_XWAYLAND
        enum xwayland_mode xwayland;
        if (strcmp(argv[0], "force") == 0) {
                xwayland = XWAYLAND_MODE_IMMEDIATE;
@@ -20,6 +20,8 @@ struct cmd_results *cmd_xwayland(int argc, char **argv) {
                xwayland = XWAYLAND_MODE_DISABLED;
        }
+        // config->xwayland is reset to the previous value on reload in
+        // load_main_config()
        if (config->reloading && config->xwayland != xwayland) {
                return cmd_results_new(CMD_FAILURE,
                                "xwayland can only be enabled/disabled at launch");
diff --git a/sway/config.c b/sway/config.c
index 4b51dc73..5058efcc 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -1,3 +1,4 @@
+#undef _POSIX_C_SOURCE
 #define _XOPEN_SOURCE 700 // for realpath
 #include <stdio.h>
 #include <stdbool.h>
@@ -22,6 +23,7 @@
 #include "sway/config.h"
 #include "sway/criteria.h"
 #include "sway/desktop/transaction.h"
+#include "sway/server.h"
 #include "sway/swaynag.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/root.h"
@@ -36,19 +38,26 @@
 struct sway_config *config = NULL;
 static struct xkb_state *keysym_translation_state_create(
-                struct xkb_rule_names rules) {
+                struct xkb_rule_names rules, uint32_t context_flags) {
-        struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_SECURE_GETENV);
+        struct xkb_context *context = xkb_context_new(context_flags | XKB_CONTEXT_NO_SECURE_GETENV);
        struct xkb_keymap *xkb_keymap = xkb_keymap_new_from_names(
                context,
                &rules,
                XKB_KEYMAP_COMPILE_NO_FLAGS);
        xkb_context_unref(context);
+        if (xkb_keymap == NULL) {
+                sway_log(SWAY_ERROR, "Failed to compile keysym translation XKB keymap");
+                return NULL;
+        }
        return xkb_state_new(xkb_keymap);
 }
 static void keysym_translation_state_destroy(
                struct xkb_state *state) {
+        if (state == NULL) {
+                return;
+        }
        xkb_keymap_unref(xkb_state_get_keymap(state));
        xkb_state_unref(state);
 }
@@ -336,8 +345,14 @@ static void config_defaults(struct sway_config *config) {
        // The keysym to keycode translation
        struct xkb_rule_names rules = {0};
-        config->keysym_translation_state =
+        config->keysym_translation_state = keysym_translation_state_create(rules, 0);
-                keysym_translation_state_create(rules);
+        if (config->keysym_translation_state == NULL) {
+                config->keysym_translation_state = keysym_translation_state_create(rules,
+                        XKB_CONTEXT_NO_ENVIRONMENT_NAMES);
+        }
+        if (config->keysym_translation_state == NULL) {
+                goto cleanup;
+        }
        return;
 cleanup:
@@ -352,13 +367,7 @@ static char *config_path(const char *prefix, const char *config_folder) {
        if (!prefix || !prefix[0] || !config_folder || !config_folder[0]) {
                return NULL;
        }
+        return format_str("%s/%s/config", prefix, config_folder);
-        const char *filename = "config";
-        size_t size = 3 + strlen(prefix) + strlen(config_folder) + strlen(filename);
-        char *path = calloc(size, sizeof(char));
-        snprintf(path, size, "%s/%s/%s", prefix, config_folder, filename);
-        return path;
 }
 static char *get_config_path(void) {
@@ -368,10 +377,7 @@ static char *get_config_path(void) {
        const char *config_home = getenv("XDG_CONFIG_HOME");
        if ((config_home == NULL || config_home[0] == '\0') && home != NULL) {
-                size_t size_fallback = 1 + strlen(home) + strlen("/.config");
+                config_home_fallback = format_str("%s/.config", home);
-                config_home_fallback = calloc(size_fallback, sizeof(char));
-                if (config_home_fallback != NULL)
-                        snprintf(config_home_fallback, size_fallback, "%s/.config", home);
                config_home = config_home_fallback;
        }
@@ -475,6 +481,11 @@ bool load_main_config(const char *file, bool is_active, bool validating) {
                                old_config->xwayland ? "enabled" : "disabled");
                config->xwayland = old_config->xwayland;
+                // primary_selection can only be enabled/disabled at launch
+                sway_log(SWAY_DEBUG, "primary_selection will remain %s",
+                                old_config->primary_selection ? "enabled" : "disabled");
+                config->primary_selection = old_config->primary_selection;
                if (!config->validating) {
                        if (old_config->swaybg_client != NULL) {
                                wl_client_destroy(old_config->swaybg_client);
@@ -494,56 +505,7 @@ bool load_main_config(const char *file, bool is_active, bool validating) {
        config->reading = true;
-        // Read security configs
+        bool success = load_config(path, config, &config->swaynag_config_errors);
-        // TODO: Security
-        bool success = true;
-        /*
-        DIR *dir = opendir(SYSCONFDIR "/sway/security.d");
-        if (!dir) {
-                sway_log(SWAY_ERROR,
-                        "%s does not exist, sway will have no security configuration"
-                        " and will probably be broken", SYSCONFDIR "/sway/security.d");
-        } else {
-                list_t *secconfigs = create_list();
-                char *base = SYSCONFDIR "/sway/security.d/";
-                struct dirent *ent = readdir(dir);
-                struct stat s;
-                while (ent != NULL) {
-                        char *_path = malloc(strlen(ent->d_name) + strlen(base) + 1);
-                        strcpy(_path, base);
-                        strcat(_path, ent->d_name);
-                        lstat(_path, &s);
-                        if (S_ISREG(s.st_mode) && ent->d_name[0] != '.') {
-                                list_add(secconfigs, _path);
-                        }
-                        else {
-                                free(_path);
-                        }
-                        ent = readdir(dir);
-                }
-                closedir(dir);
-                list_qsort(secconfigs, qstrcmp);
-                for (int i = 0; i < secconfigs->length; ++i) {
-                        char *_path = secconfigs->items[i];
-                        if (stat(_path, &s) || s.st_uid != 0 || s.st_gid != 0 ||
-                                        (((s.st_mode & 0777) != 0644) &&
-                                        (s.st_mode & 0777) != 0444)) {
-                                sway_log(SWAY_ERROR,
-                                        "Refusing to load %s - it must be owned by root "
-                                        "and mode 644 or 444", _path);
-                                success = false;
-                        } else {
-                                success = success && load_config(_path, config);
-                        }
-                }
-                list_free_items_and_destroy(secconfigs);
-        }
-        */
-        success = success && load_config(path, config,
-                        &config->swaynag_config_errors);
        if (validating) {
                free_config(config);
@@ -571,7 +533,7 @@ bool load_main_config(const char *file, bool is_active, bool validating) {
                }
                sway_switch_retrigger_bindings_for_all();
-                reset_outputs();
+                apply_all_output_configs();
                spawn_swaybg();
                config->reloading = false;
@@ -1037,8 +999,12 @@ void translate_keysyms(struct input_config *input_config) {
        struct xkb_rule_names rules = {0};
        input_config_fill_rule_names(input_config, &rules);
-        config->keysym_translation_state =
+        config->keysym_translation_state = keysym_translation_state_create(rules, 0);
-                keysym_translation_state_create(rules);
+        if (config->keysym_translation_state == NULL) {
+                sway_log(SWAY_ERROR, "Failed to create keysym translation XKB state "
+                        "for device '%s'", input_config->identifier);
+                return;
+        }
        for (int i = 0; i < config->modes->length; ++i) {
                struct sway_mode *mode = config->modes->items[i];
diff --git a/sway/config/bar.c b/sway/config/bar.c
index a8389244..ecefb61a 100644
--- a/sway/config/bar.c
+++ b/sway/config/bar.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <signal.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -13,6 +12,7 @@
 #include "sway/config.h"
 #include "sway/input/keyboard.h"
 #include "sway/output.h"
+#include "sway/server.h"
 #include "config.h"
 #include "list.h"
 #include "log.h"
diff --git a/sway/config/input.c b/sway/config/input.c
index 44c2be28..613270df 100644
--- a/sway/config/input.c
+++ b/sway/config/input.c
@@ -1,9 +1,9 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdlib.h>
 #include <limits.h>
 #include <float.h>
 #include "sway/config.h"
 #include "sway/input/keyboard.h"
+#include "sway/server.h"
 #include "log.h"
 struct input_config *new_input_config(const char* identifier) {
diff --git a/sway/config/output.c b/sway/config/output.c
index 1a5215fe..16be49c8 100644
--- a/sway/config/output.c
+++ b/sway/config/output.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <assert.h>
 #include <drm_fourcc.h>
 #include <stdbool.h>
@@ -10,9 +9,11 @@
 #include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_output.h>
+#include <wlr/types/wlr_output_swapchain_manager.h>
 #include "sway/config.h"
 #include "sway/input/cursor.h"
 #include "sway/output.h"
+#include "sway/server.h"
 #include "sway/tree/root.h"
 #include "log.h"
 #include "util.h"
@@ -75,11 +76,78 @@ struct output_config *new_output_config(const char *name) {
        oc->max_render_time = -1;
        oc->adaptive_sync = -1;
        oc->render_bit_depth = RENDER_BIT_DEPTH_DEFAULT;
+        oc->set_color_transform = false;
+        oc->color_transform = NULL;
        oc->power = -1;
        return oc;
 }
-void merge_output_config(struct output_config *dst, struct output_config *src) {
+// supersede_output_config clears all fields in dst that were set in src
+static void supersede_output_config(struct output_config *dst, struct output_config *src) {
+        if (src->enabled != -1) {
+                dst->enabled = -1;
+        }
+        if (src->width != -1) {
+                dst->width = -1;
+        }
+        if (src->height != -1) {
+                dst->height = -1;
+        }
+        if (src->x != -1) {
+                dst->x = -1;
+        }
+        if (src->y != -1) {
+                dst->y = -1;
+        }
+        if (src->scale != -1) {
+                dst->scale = -1;
+        }
+        if (src->scale_filter != SCALE_FILTER_DEFAULT) {
+                dst->scale_filter = SCALE_FILTER_DEFAULT;
+        }
+        if (src->subpixel != WL_OUTPUT_SUBPIXEL_UNKNOWN) {
+                dst->subpixel = WL_OUTPUT_SUBPIXEL_UNKNOWN;
+        }
+        if (src->refresh_rate != -1) {
+                dst->refresh_rate = -1;
+        }
+        if (src->custom_mode != -1) {
+                dst->custom_mode = -1;
+        }
+        if (src->drm_mode.type != (uint32_t) -1) {
+                dst->drm_mode.type = -1;
+        }
+        if (src->transform != -1) {
+                dst->transform = -1;
+        }
+        if (src->max_render_time != -1) {
+                dst->max_render_time = -1;
+        }
+        if (src->adaptive_sync != -1) {
+                dst->adaptive_sync = -1;
+        }
+        if (src->render_bit_depth != RENDER_BIT_DEPTH_DEFAULT) {
+                dst->render_bit_depth = RENDER_BIT_DEPTH_DEFAULT;
+        }
+        if (src->background) {
+                free(dst->background);
+                dst->background = NULL;
+        }
+        if (src->background_option) {
+                free(dst->background_option);
+                dst->background_option = NULL;
+        }
+        if (src->background_fallback) {
+                free(dst->background_fallback);
+                dst->background_fallback = NULL;
+        }
+        if (src->power != -1) {
+                dst->power = -1;
+        }
+}
+// merge_output_config sets all fields in dst that were set in src
+static void merge_output_config(struct output_config *dst, struct output_config *src) {
        if (src->enabled != -1) {
                dst->enabled = src->enabled;
        }
@@ -125,6 +193,14 @@ void merge_output_config(struct output_config *dst, struct output_config *src) {
        if (src->render_bit_depth != RENDER_BIT_DEPTH_DEFAULT) {
                dst->render_bit_depth = src->render_bit_depth;
        }
+        if (src->set_color_transform) {
+                if (src->color_transform) {
+                        wlr_color_transform_ref(src->color_transform);
+                }
+                wlr_color_transform_unref(dst->color_transform);
+                dst->set_color_transform = true;
+                dst->color_transform = src->color_transform;
+        }
        if (src->background) {
                free(dst->background);
                dst->background = strdup(src->background);
@@ -142,94 +218,42 @@ void merge_output_config(struct output_config *dst, struct output_config *src) {
        }
 }
-static void merge_wildcard_on_all(struct output_config *wildcard) {
+void store_output_config(struct output_config *oc) {
-        for (int i = 0; i < config->output_configs->length; i++) {
+        bool merged = false;
-                struct output_config *oc = config->output_configs->items[i];
+        bool wildcard = strcmp(oc->name, "*") == 0;
-                if (strcmp(wildcard->name, oc->name) != 0) {
+        struct sway_output *output = wildcard ? NULL : all_output_by_name_or_id(oc->name);
-                        sway_log(SWAY_DEBUG, "Merging output * config on %s", oc->name);
-                        merge_output_config(oc, wildcard);
-                }
-        }
-}
-static void merge_id_on_name(struct output_config *oc) {
-        struct sway_output *output = all_output_by_name_or_id(oc->name);
-        if (output == NULL) {
-                return;
-        }
-        const char *name = output->wlr_output->name;
        char id[128];
-        output_get_identifier(id, sizeof(id), output);
+        if (output) {
+                output_get_identifier(id, sizeof(id), output);
-        char *id_on_name = format_str("%s on %s", id, name);
-        if (!id_on_name) {
-                return;
        }
-        int i = list_seq_find(config->output_configs, output_name_cmp, id_on_name);
+        for (int i = 0; i < config->output_configs->length; i++) {
-        if (i >= 0) {
+                struct output_config *old = config->output_configs->items[i];
-                sway_log(SWAY_DEBUG, "Merging on top of existing id on name config");
-                merge_output_config(config->output_configs->items[i], oc);
+                // If the old config matches the new config's name, regardless of
-        } else {
+                // whether it was name or identifier, merge on top of the existing
-                // If both a name and identifier config, exist generate an id on name
+                // config. If the new config is a wildcard, this also merges on top of
-                int ni = list_seq_find(config->output_configs, output_name_cmp, name);
+                // old wildcard configs.
-                int ii = list_seq_find(config->output_configs, output_name_cmp, id);
+                if (strcmp(old->name, oc->name) == 0) {
-                if ((ni >= 0 && ii >= 0) || (ni >= 0 && strcmp(oc->name, id) == 0)
+                        merge_output_config(old, oc);
-                                || (ii >= 0 && strcmp(oc->name, name) == 0)) {
+                        merged = true;
-                        struct output_config *ion_oc = new_output_config(id_on_name);
+                        continue;
-                        if (ni >= 0) {
-                                merge_output_config(ion_oc, config->output_configs->items[ni]);
-                        }
-                        if (ii >= 0) {
-                                merge_output_config(ion_oc, config->output_configs->items[ii]);
-                        }
-                        merge_output_config(ion_oc, oc);
-                        list_add(config->output_configs, ion_oc);
-                        sway_log(SWAY_DEBUG, "Generated id on name output config \"%s\""
-                                " (enabled: %d) (%dx%d@%fHz position %d,%d scale %f "
-                                "transform %d) (bg %s %s) (power %d) (max render time: %d)",
-                                ion_oc->name, ion_oc->enabled, ion_oc->width, ion_oc->height,
-                                ion_oc->refresh_rate, ion_oc->x, ion_oc->y, ion_oc->scale,
-                                ion_oc->transform, ion_oc->background,
-                                ion_oc->background_option, ion_oc->power,
-                                ion_oc->max_render_time);
                }
-        }
-        free(id_on_name);
-}
-struct output_config *store_output_config(struct output_config *oc) {
+                // If the new config is a wildcard config we supersede all non-wildcard
-        bool wildcard = strcmp(oc->name, "*") == 0;
+                // configs. Old wildcard configs have already been handled above.
-        if (wildcard) {
+                if (wildcard) {
-                merge_wildcard_on_all(oc);
+                        supersede_output_config(old, oc);
-        } else {
+                        continue;
-                merge_id_on_name(oc);
+                }
-        }
-        int i = list_seq_find(config->output_configs, output_name_cmp, oc->name);
+                // If the new config matches an output's name, and the old config
-        if (i >= 0) {
+                // matches on that output's identifier, supersede it.
-                sway_log(SWAY_DEBUG, "Merging on top of existing output config");
+                if (output && strcmp(old->name, id) == 0 &&
-                struct output_config *current = config->output_configs->items[i];
+                                strcmp(oc->name, output->wlr_output->name) == 0) {
-                merge_output_config(current, oc);
+                        supersede_output_config(old, oc);
-                free_output_config(oc);
-                oc = current;
-        } else if (!wildcard) {
-                sway_log(SWAY_DEBUG, "Adding non-wildcard output config");
-                i = list_seq_find(config->output_configs, output_name_cmp, "*");
-                if (i >= 0) {
-                        sway_log(SWAY_DEBUG, "Merging on top of output * config");
-                        struct output_config *current = new_output_config(oc->name);
-                        merge_output_config(current, config->output_configs->items[i]);
-                        merge_output_config(current, oc);
-                        free_output_config(oc);
-                        oc = current;
                }
-                list_add(config->output_configs, oc);
-        } else {
-                // New wildcard config. Just add it
-                sway_log(SWAY_DEBUG, "Adding output * config");
-                list_add(config->output_configs, oc);
        }
        sway_log(SWAY_DEBUG, "Config stored for output %s (enabled: %d) (%dx%d@%fHz "
@@ -240,7 +264,13 @@ struct output_config *store_output_config(struct output_config *oc) {
                oc->transform, oc->background, oc->background_option, oc->power,
                oc->max_render_time);
-        return oc;
+        // If the configuration was not merged into an existing configuration, add
+        // it to the list. Otherwise we're done with it and can free it.
+        if (!merged) {
+                list_add(config->output_configs, oc);
+        } else {
+                free_output_config(oc);
+        }
 }
 static void set_mode(struct wlr_output *output, struct wlr_output_state *pending,
@@ -367,22 +397,18 @@ static int compute_default_scale(struct wlr_output *output,
        return 2;
 }
-/* Lists of formats to try, in order, when a specific render bit depth has
+static bool render_format_is_10bit(uint32_t render_format) {
- * been asked for. The second to last format in each list should always
+        return render_format == DRM_FORMAT_XRGB2101010 ||
- * be XRGB8888, as a reliable backup in case the others are not available;
+                render_format == DRM_FORMAT_XBGR2101010;
- * the last should be DRM_FORMAT_INVALID, to indicate the end of the list. */
+}
-static const uint32_t *bit_depth_preferences[] = {
-        [RENDER_BIT_DEPTH_8] = (const uint32_t []){
+static bool render_format_is_bgr(uint32_t fmt) {
-                DRM_FORMAT_XRGB8888,
+        return fmt == DRM_FORMAT_XBGR2101010 || fmt == DRM_FORMAT_XBGR8888;
-                DRM_FORMAT_INVALID,
+}
-        },
-        [RENDER_BIT_DEPTH_10] = (const uint32_t []){
+static bool output_config_is_disabling(struct output_config *oc) {
-                DRM_FORMAT_XRGB2101010,
+        return oc && (!oc->enabled || oc->power == 0);
-                DRM_FORMAT_XBGR2101010,
+}
-                DRM_FORMAT_XRGB8888,
-                DRM_FORMAT_INVALID,
-        },
-};
 static void queue_output_config(struct output_config *oc,
                struct sway_output *output, struct wlr_output_state *pending) {
@@ -392,7 +418,7 @@ static void queue_output_config(struct output_config *oc,
        struct wlr_output *wlr_output = output->wlr_output;
-        if (oc && (!oc->enabled || oc->power == 0)) {
+        if (output_config_is_disabling(oc)) {
                sway_log(SWAY_DEBUG, "Turning off output %s", wlr_output->name);
                wlr_output_state_set_enabled(pending, false);
                return;
@@ -415,22 +441,6 @@ static void queue_output_config(struct output_config *oc,
                struct wlr_output_mode *preferred_mode =
                        wlr_output_preferred_mode(wlr_output);
                wlr_output_state_set_mode(pending, preferred_mode);
-                if (!wlr_output_test_state(wlr_output, pending)) {
-                        sway_log(SWAY_DEBUG, "Preferred mode rejected, "
-                                "falling back to another mode");
-                        struct wlr_output_mode *mode;
-                        wl_list_for_each(mode, &wlr_output->modes, link) {
-                                if (mode == preferred_mode) {
-                                        continue;
-                                }
-                                wlr_output_state_set_mode(pending, mode);
-                                if (wlr_output_test_state(wlr_output, pending)) {
-                                        break;
-                                }
-                        }
-                }
        }
        if (oc && (oc->subpixel != WL_OUTPUT_SUBPIXEL_UNKNOWN || config->reloading)) {
@@ -449,7 +459,7 @@ static void queue_output_config(struct output_config *oc,
 #endif
        }
        if (wlr_output->transform != tr) {
-                sway_log(SWAY_DEBUG, "Set %s transform to %d", oc->name, tr);
+                sway_log(SWAY_DEBUG, "Set %s transform to %d", wlr_output->name, tr);
                wlr_output_state_set_transform(pending, tr);
        }
@@ -481,54 +491,27 @@ static void queue_output_config(struct output_config *oc,
                sway_log(SWAY_DEBUG, "Set %s adaptive sync to %d", wlr_output->name,
                        oc->adaptive_sync);
                wlr_output_state_set_adaptive_sync_enabled(pending, oc->adaptive_sync == 1);
-                if (oc->adaptive_sync == 1 && !wlr_output_test_state(wlr_output, pending)) {
-                        sway_log(SWAY_DEBUG, "Adaptive sync failed, ignoring");
-                        wlr_output_state_set_adaptive_sync_enabled(pending, false);
-                }
        }
        if (oc && oc->render_bit_depth != RENDER_BIT_DEPTH_DEFAULT) {
-                const uint32_t *fmts = bit_depth_preferences[oc->render_bit_depth];
+                if (oc->render_bit_depth == RENDER_BIT_DEPTH_10 &&
-                assert(fmts);
+                        render_format_is_10bit(output->wlr_output->render_format)) {
+                        // 10-bit was set successfully before, try to save some tests by reusing the format
-                for (size_t i = 0; fmts[i] != DRM_FORMAT_INVALID; i++) {
+                        wlr_output_state_set_render_format(pending, output->wlr_output->render_format);
-                        wlr_output_state_set_render_format(pending, fmts[i]);
+                } else if (oc->render_bit_depth == RENDER_BIT_DEPTH_10) {
-                        if (wlr_output_test_state(wlr_output, pending)) {
+                        wlr_output_state_set_render_format(pending, DRM_FORMAT_XRGB2101010);
-                                break;
+                } else {
-                        }
+                        wlr_output_state_set_render_format(pending, DRM_FORMAT_XRGB8888);
-                        sway_log(SWAY_DEBUG, "Preferred output format 0x%08x "
-                                "failed to work, falling back to next in "
-                                "list, 0x%08x", fmts[i], fmts[i + 1]);
                }
        }
 }
-bool apply_output_config(struct output_config *oc, struct sway_output *output) {
+static bool finalize_output_config(struct output_config *oc, struct sway_output *output) {
        if (output == root->fallback_output) {
                return false;
        }
        struct wlr_output *wlr_output = output->wlr_output;
-        // Flag to prevent the output mode event handler from calling us
-        output->enabling = (!oc || oc->enabled);
-        struct wlr_output_state pending = {0};
-        queue_output_config(oc, output, &pending);
-        sway_log(SWAY_DEBUG, "Committing output %s", wlr_output->name);
-        if (!wlr_output_commit_state(wlr_output, &pending)) {
-                // Failed to commit output changes, maybe the output is missing a CRTC.
-                // Leave the output disabled for now and try again when the output gets
-                // the mode we asked for.
-                sway_log(SWAY_ERROR, "Failed to commit output %s", wlr_output->name);
-                output->enabling = false;
-                return false;
-        }
-        output->enabling = false;
        if (oc && !oc->enabled) {
                sway_log(SWAY_DEBUG, "Disabling output %s", oc->name);
                if (output->enabled) {
@@ -584,23 +567,14 @@ bool apply_output_config(struct output_config *oc, struct sway_output *output) {
                output->max_render_time = oc->max_render_time;
        }
-        // Reconfigure all devices, since input config may have been applied before
+        if (oc && oc->set_color_transform) {
-        // this output came online, and some config items (like map_to_output) are
+                if (oc->color_transform) {
-        // dependent on an output being present.
+                        wlr_color_transform_ref(oc->color_transform);
-        input_manager_configure_all_input_mappings();
+                }
-        // Reconfigure the cursor images, since the scale may have changed.
+                wlr_color_transform_unref(output->color_transform);
-        input_manager_configure_xcursor();
+                output->color_transform = oc->color_transform;
-        return true;
-}
-bool test_output_config(struct output_config *oc, struct sway_output *output) {
-        if (output == root->fallback_output) {
-                return false;
        }
+        return true;
-        struct wlr_output_state pending = {0};
-        queue_output_config(oc, output, &pending);
-        return wlr_output_test_state(output->wlr_output, &pending);
 }
 static void default_output_config(struct output_config *oc,
@@ -622,140 +596,416 @@ static void default_output_config(struct output_config *oc,
        oc->max_render_time = 0;
 }
-static struct output_config *get_output_config(char *identifier,
+// find_output_config returns a merged output_config containing all stored
-                struct sway_output *sway_output) {
+// configuration that applies to the specified output.
+struct output_config *find_output_config(struct sway_output *sway_output) {
        const char *name = sway_output->wlr_output->name;
+        struct output_config *oc = NULL;
+        struct output_config *result = new_output_config(name);
+        if (config->reloading) {
+                default_output_config(result, sway_output->wlr_output);
+        }
-        struct output_config *oc_id_on_name = NULL;
+        char id[128];
-        struct output_config *oc_name = NULL;
+        output_get_identifier(id, sizeof(id), sway_output);
-        struct output_config *oc_id = NULL;
-        char *id_on_name = format_str("%s on %s", identifier, name);
+        int i;
-        int i = list_seq_find(config->output_configs, output_name_cmp, id_on_name);
+        bool match = false;
-        if (i >= 0) {
+        if ((i = list_seq_find(config->output_configs, output_name_cmp, "*")) >= 0) {
-                oc_id_on_name = config->output_configs->items[i];
+                match = true;
-        } else {
+                oc = config->output_configs->items[i];
-                i = list_seq_find(config->output_configs, output_name_cmp, name);
+                merge_output_config(result, oc);
-                if (i >= 0) {
+        }
-                        oc_name = config->output_configs->items[i];
+        if ((i = list_seq_find(config->output_configs, output_name_cmp, name)) >= 0) {
+                match = true;
+                oc = config->output_configs->items[i];
+                merge_output_config(result, oc);
+        }
+        if ((i = list_seq_find(config->output_configs, output_name_cmp, id)) >= 0) {
+                match = true;
+                oc = config->output_configs->items[i];
+                merge_output_config(result, oc);
+        }
+        if (!match && !config->reloading) {
+                // No name, identifier, or wildcard config. Since we are not
+                // reloading with defaults, the output config will be empty, so
+                // just return NULL
+                free_output_config(result);
+                return NULL;
+        }
+        return result;
+}
+static bool config_has_auto_mode(struct output_config *oc) {
+        if (!oc) {
+                return true;
+        }
+        if (oc->drm_mode.type != 0 && oc->drm_mode.type != (uint32_t)-1) {
+                return true;
+        } else if (oc->width > 0 && oc->height > 0) {
+                return true;
+        }
+        return false;
+}
+struct search_context {
+        struct wlr_output_swapchain_manager *swapchain_mgr;
+        struct wlr_backend_output_state *states;
+        struct matched_output_config *configs;
+        size_t configs_len;
+        bool degrade_to_off;
+};
+static void dump_output_state(struct wlr_output *wlr_output, struct wlr_output_state *state) {
+        sway_log(SWAY_DEBUG, "Output state for %s", wlr_output->name);
+        if (state->committed & WLR_OUTPUT_STATE_ENABLED) {
+                sway_log(SWAY_DEBUG, "    enabled:       %s", state->enabled ? "yes" : "no");
+        }
+        if (state->committed & WLR_OUTPUT_STATE_RENDER_FORMAT) {
+                sway_log(SWAY_DEBUG, "    render_format: %d", state->render_format);
+        }
+        if (state->committed & WLR_OUTPUT_STATE_MODE) {
+                if (state->mode_type == WLR_OUTPUT_STATE_MODE_CUSTOM) {
+                        sway_log(SWAY_DEBUG, "    custom mode:   %dx%d@%dmHz",
+                                state->custom_mode.width, state->custom_mode.height, state->custom_mode.refresh);
+                } else {
+                        sway_log(SWAY_DEBUG, "    mode:          %dx%d@%dmHz%s",
+                                state->mode->width, state->mode->height, state->mode->refresh,
+                                state->mode->preferred ? " (preferred)" : "");
                }
+        }
+        if (state->committed & WLR_OUTPUT_STATE_ADAPTIVE_SYNC_ENABLED) {
+                sway_log(SWAY_DEBUG, "    adaptive_sync: %s",
+                        state->adaptive_sync_enabled ? "enabled": "disabled");
+        }
+}
+static bool search_valid_config(struct search_context *ctx, size_t output_idx);
+static void reset_output_state(struct wlr_output_state *state) {
+        wlr_output_state_finish(state);
+        wlr_output_state_init(state);
+        state->committed = 0;
+}
+static void clear_later_output_states(struct wlr_backend_output_state *states,
+                size_t configs_len, size_t output_idx) {
-                i = list_seq_find(config->output_configs, output_name_cmp, identifier);
+        // Clear and disable all output states after this one to avoid conflict
-                if (i >= 0) {
+        // with previous tests.
-                        oc_id = config->output_configs->items[i];
+        for (size_t idx = output_idx+1; idx < configs_len; idx++) {
+                struct wlr_backend_output_state *backend_state = &states[idx];
+                struct wlr_output_state *state = &backend_state->base;
+                reset_output_state(state);
+                wlr_output_state_set_enabled(state, false);
+        }
+}
+static bool search_finish(struct search_context *ctx, size_t output_idx) {
+        struct wlr_backend_output_state *backend_state = &ctx->states[output_idx];
+        struct wlr_output_state *state = &backend_state->base;
+        struct wlr_output *wlr_output = backend_state->output;
+        clear_later_output_states(ctx->states, ctx->configs_len, output_idx);
+        dump_output_state(wlr_output, state);
+        return wlr_output_swapchain_manager_prepare(ctx->swapchain_mgr, ctx->states, ctx->configs_len) &&
+                search_valid_config(ctx, output_idx+1);
+}
+static bool search_adaptive_sync(struct search_context *ctx, size_t output_idx) {
+        struct matched_output_config *cfg = &ctx->configs[output_idx];
+        struct wlr_backend_output_state *backend_state = &ctx->states[output_idx];
+        struct wlr_output_state *state = &backend_state->base;
+        if (cfg->config && cfg->config->adaptive_sync == 1) {
+                wlr_output_state_set_adaptive_sync_enabled(state, true);
+                if (search_finish(ctx, output_idx)) {
+                        return true;
                }
        }
+        if (!cfg->config || cfg->config->adaptive_sync != -1) {
+                wlr_output_state_set_adaptive_sync_enabled(state, false);
+                if (search_finish(ctx, output_idx)) {
+                        return true;
+                }
+        }
+        // If adaptive sync has not been set, or fallback in case we are on a
+        // backend that cannot disable adaptive sync such as the wayland backend.
+        state->committed &= ~WLR_OUTPUT_STATE_ADAPTIVE_SYNC_ENABLED;
+        return search_finish(ctx, output_idx);
+}
-        struct output_config *result = new_output_config("temp");
+static bool search_mode(struct search_context *ctx, size_t output_idx) {
-        if (config->reloading) {
+        struct matched_output_config *cfg = &ctx->configs[output_idx];
-                default_output_config(result, sway_output->wlr_output);
+        struct wlr_backend_output_state *backend_state = &ctx->states[output_idx];
+        struct wlr_output_state *state = &backend_state->base;
+        struct wlr_output *wlr_output = backend_state->output;
+        if (!config_has_auto_mode(cfg->config)) {
+                return search_adaptive_sync(ctx, output_idx);
        }
-        if (oc_id_on_name) {
-                // Already have an identifier on name config, use that
+        struct wlr_output_mode *preferred_mode = wlr_output_preferred_mode(wlr_output);
-                free(result->name);
+        if (preferred_mode) {
-                result->name = strdup(id_on_name);
+                wlr_output_state_set_mode(state, preferred_mode);
-                merge_output_config(result, oc_id_on_name);
+                if (search_adaptive_sync(ctx, output_idx)) {
-        } else if (oc_name && oc_id) {
+                        return true;
-                // Generate a config named `<identifier> on <name>` which contains a
-                // merged copy of the identifier on name. This will make sure that both
-                // identifier and name configs are respected, with identifier getting
-                // priority
-                struct output_config *temp = new_output_config(id_on_name);
-                merge_output_config(temp, oc_name);
-                merge_output_config(temp, oc_id);
-                list_add(config->output_configs, temp);
-                free(result->name);
-                result->name = strdup(id_on_name);
-                merge_output_config(result, temp);
-                sway_log(SWAY_DEBUG, "Generated output config \"%s\" (enabled: %d)"
-                        " (%dx%d@%fHz position %d,%d scale %f transform %d) (bg %s %s)"
-                        " (power %d) (max render time: %d)", result->name, result->enabled,
-                        result->width, result->height, result->refresh_rate,
-                        result->x, result->y, result->scale, result->transform,
-                        result->background, result->background_option, result->power,
-                        result->max_render_time);
-        } else if (oc_name) {
-                // No identifier config, just return a copy of the name config
-                free(result->name);
-                result->name = strdup(name);
-                merge_output_config(result, oc_name);
-        } else if (oc_id) {
-                // No name config, just return a copy of the identifier config
-                free(result->name);
-                result->name = strdup(identifier);
-                merge_output_config(result, oc_id);
-        } else {
-                i = list_seq_find(config->output_configs, output_name_cmp, "*");
-                if (i >= 0) {
-                        // No name or identifier config, but there is a wildcard config
-                        free(result->name);
-                        result->name = strdup("*");
-                        merge_output_config(result, config->output_configs->items[i]);
-                } else if (!config->reloading) {
-                        // No name, identifier, or wildcard config. Since we are not
-                        // reloading with defaults, the output config will be empty, so
-                        // just return NULL
-                        free_output_config(result);
-                        result = NULL;
                }
        }
-        free(id_on_name);
+        if (wl_list_empty(&wlr_output->modes)) {
-        return result;
+                state->committed &= ~WLR_OUTPUT_STATE_MODE;
+                return search_adaptive_sync(ctx, output_idx);
+        }
+        struct wlr_output_mode *mode;
+        wl_list_for_each(mode, &backend_state->output->modes, link) {
+                if (mode == preferred_mode) {
+                        continue;
+                }
+                wlr_output_state_set_mode(state, mode);
+                if (search_adaptive_sync(ctx, output_idx)) {
+                        return true;
+                }
+        }
+        return false;
 }
-struct output_config *find_output_config(struct sway_output *output) {
+static bool search_render_format(struct search_context *ctx, size_t output_idx) {
-        char id[128];
+        struct matched_output_config *cfg = &ctx->configs[output_idx];
-        output_get_identifier(id, sizeof(id), output);
+        struct wlr_backend_output_state *backend_state = &ctx->states[output_idx];
-        return get_output_config(id, output);
+        struct wlr_output_state *state = &backend_state->base;
+        struct wlr_output *wlr_output = backend_state->output;
+        uint32_t fmts[] = {
+                DRM_FORMAT_XRGB2101010,
+                DRM_FORMAT_XBGR2101010,
+                DRM_FORMAT_XRGB8888,
+                DRM_FORMAT_INVALID,
+        };
+        if (render_format_is_bgr(wlr_output->render_format)) {
+                // Start with BGR in the unlikely event that we previously required it.
+                fmts[0] = DRM_FORMAT_XBGR2101010;
+                fmts[1] = DRM_FORMAT_XRGB2101010;
+        }
+        const struct wlr_drm_format_set *primary_formats =
+                wlr_output_get_primary_formats(wlr_output, WLR_BUFFER_CAP_DMABUF);
+        bool need_10bit = cfg->config && cfg->config->render_bit_depth == RENDER_BIT_DEPTH_10;
+        for (size_t idx = 0; fmts[idx] != DRM_FORMAT_INVALID; idx++) {
+                if (!need_10bit && render_format_is_10bit(fmts[idx])) {
+                        continue;
+                }
+                if (!wlr_drm_format_set_get(primary_formats, fmts[idx])) {
+                        // This is not a supported format for this output
+                        continue;
+                }
+                wlr_output_state_set_render_format(state, fmts[idx]);
+                if (search_mode(ctx, output_idx)) {
+                        return true;
+                }
+        }
+        return false;
 }
-void apply_output_config_to_outputs(struct output_config *oc) {
+static bool search_valid_config(struct search_context *ctx, size_t output_idx) {
-        // Try to find the output container and apply configuration now. If
+        if (output_idx >= ctx->configs_len) {
-        // this is during startup then there will be no container and config
+                // We reached the end of the search, all good!
-        // will be applied during normal "new output" event from wlroots.
+                return true;
-        bool wildcard = strcmp(oc->name, "*") == 0;
+        }
-        struct sway_output *sway_output, *tmp;
-        wl_list_for_each_safe(sway_output, tmp, &root->all_outputs, link) {
-                if (output_match_name_or_id(sway_output, oc->name)) {
-                        char id[128];
-                        output_get_identifier(id, sizeof(id), sway_output);
-                        struct output_config *current = get_output_config(id, sway_output);
-                        if (!current) {
-                                // No stored output config matched, apply oc directly
-                                sway_log(SWAY_DEBUG, "Applying oc directly");
-                                current = new_output_config(oc->name);
-                                merge_output_config(current, oc);
-                        }
-                        apply_output_config(current, sway_output);
-                        free_output_config(current);
-                        if (!wildcard) {
+        struct matched_output_config *cfg = &ctx->configs[output_idx];
-                                // Stop looking if the output config isn't applicable to all
+        struct wlr_backend_output_state *backend_state = &ctx->states[output_idx];
-                                // outputs
+        struct wlr_output_state *state = &backend_state->base;
-                                break;
+        struct wlr_output *wlr_output = backend_state->output;
-                        }
+        if (!output_config_is_disabling(cfg->config)) {
+                // Search through our possible configurations, doing a depth-first
+                // through render_format, modes, adaptive_sync and the next output's
+                // config.
+                queue_output_config(cfg->config, cfg->output, &backend_state->base);
+                if (search_render_format(ctx, output_idx)) {
+                        return true;
+                } else if (!ctx->degrade_to_off) {
+                        return false;
                }
+                // We could not get anything to work, try to disable this output to see
+                // if we can at least make the outputs before us work.
+                sway_log(SWAY_DEBUG, "Unable to find valid config with output %s, disabling",
+                        wlr_output->name);
+                reset_output_state(state);
+        }
+        wlr_output_state_set_enabled(state, false);
+        return search_finish(ctx, output_idx);
+}
+static int compare_matched_output_config_priority(const void *a, const void *b) {
+        const struct matched_output_config *amc = a;
+        const struct matched_output_config *bmc = b;
+        bool a_disabling = output_config_is_disabling(amc->config);
+        bool b_disabling = output_config_is_disabling(bmc->config);
+        bool a_enabled = amc->output->enabled;
+        bool b_enabled = bmc->output->enabled;
+        // We want to give priority to existing enabled outputs. To do so, we want
+        // the configuration order to be:
+        // 1. Existing, enabled outputs
+        // 2. Outputs that need to be enabled
+        // 3. Disabled or disabling outputs
+        if (a_enabled && !a_disabling) {
+                return -1;
+        } else if (b_enabled && !b_disabling) {
+                return 1;
+        } else if (b_disabling && !a_disabling) {
+                return -1;
+        } else if (a_disabling && !b_disabling) {
+                return 1;
+        }
+        return 0;
+}
+void sort_output_configs_by_priority(struct matched_output_config *configs,
+                size_t configs_len) {
+        qsort(configs, configs_len, sizeof(*configs), compare_matched_output_config_priority);
+}
+bool apply_output_configs(struct matched_output_config *configs,
+                size_t configs_len, bool test_only, bool degrade_to_off) {
+        struct wlr_backend_output_state *states = calloc(configs_len, sizeof(*states));
+        if (!states) {
+                return false;
+        }
+        sway_log(SWAY_DEBUG, "Committing %zd outputs", configs_len);
+        for (size_t idx = 0; idx < configs_len; idx++) {
+                struct matched_output_config *cfg = &configs[idx];
+                struct wlr_backend_output_state *backend_state = &states[idx];
+                backend_state->output = cfg->output->wlr_output;
+                wlr_output_state_init(&backend_state->base);
+                sway_log(SWAY_DEBUG, "Preparing config for %s",
+                        cfg->output->wlr_output->name);
+                queue_output_config(cfg->config, cfg->output, &backend_state->base);
+        }
+        struct wlr_output_swapchain_manager swapchain_mgr;
+        wlr_output_swapchain_manager_init(&swapchain_mgr, server.backend);
+        bool ok = wlr_output_swapchain_manager_prepare(&swapchain_mgr, states, configs_len);
+        if (!ok) {
+                sway_log(SWAY_ERROR, "Requested backend configuration failed, searching for valid fallbacks");
+                struct search_context ctx = {
+                        .swapchain_mgr = &swapchain_mgr,
+                        .states = states,
+                        .configs = configs,
+                        .configs_len = configs_len,
+                        .degrade_to_off = degrade_to_off,
+                };
+                if (!search_valid_config(&ctx, 0)) {
+                        sway_log(SWAY_ERROR, "Search for valid config failed");
+                        goto out;
+                }
+        }
+        if (test_only) {
+                // The swapchain manager already did a test for us
+                goto out;
        }
+        for (size_t idx = 0; idx < configs_len; idx++) {
+                struct matched_output_config *cfg = &configs[idx];
+                struct wlr_backend_output_state *backend_state = &states[idx];
+                struct wlr_scene_output_state_options opts = {
+                        .swapchain = wlr_output_swapchain_manager_get_swapchain(
+                                &swapchain_mgr, backend_state->output),
+                        .color_transform = cfg->output->color_transform,
+                };
+                struct wlr_scene_output *scene_output = cfg->output->scene_output;
+                struct wlr_output_state *state = &backend_state->base;
+                if (!wlr_scene_output_build_state(scene_output, state, &opts)) {
+                        sway_log(SWAY_ERROR, "Building output state for '%s' failed",
+                                backend_state->output->name);
+                        goto out;
+                }
+        }
+        ok = wlr_backend_commit(server.backend, states, configs_len);
+        if (!ok) {
+                sway_log(SWAY_ERROR, "Backend commit failed");
+                goto out;
+        }
+        sway_log(SWAY_DEBUG, "Commit of %zd outputs succeeded", configs_len);
+        wlr_output_swapchain_manager_apply(&swapchain_mgr);
+        for (size_t idx = 0; idx < configs_len; idx++) {
+                struct matched_output_config *cfg = &configs[idx];
+                sway_log(SWAY_DEBUG, "Finalizing config for %s",
+                        cfg->output->wlr_output->name);
+                finalize_output_config(cfg->config, cfg->output);
+        }
+out:
+        wlr_output_swapchain_manager_finish(&swapchain_mgr);
+        for (size_t idx = 0; idx < configs_len; idx++) {
+                struct wlr_backend_output_state *backend_state = &states[idx];
+                wlr_output_state_finish(&backend_state->base);
+        }
+        free(states);
+        // Reconfigure all devices, since input config may have been applied before
+        // this output came online, and some config items (like map_to_output) are
+        // dependent on an output being present.
+        input_manager_configure_all_input_mappings();
+        // Reconfigure the cursor images, since the scale may have changed.
+        input_manager_configure_xcursor();
        struct sway_seat *seat;
        wl_list_for_each(seat, &server.input->seats, link) {
                wlr_seat_pointer_notify_clear_focus(seat->wlr_seat);
                cursor_rebase(seat->cursor);
        }
+        return ok;
 }
-void reset_outputs(void) {
+void apply_all_output_configs(void) {
-        struct output_config *oc = NULL;
+        size_t configs_len = wl_list_length(&root->all_outputs);
-        int i = list_seq_find(config->output_configs, output_name_cmp, "*");
+        struct matched_output_config *configs = calloc(configs_len, sizeof(*configs));
-        if (i >= 0) {
+        if (!configs) {
-                oc = config->output_configs->items[i];
+                return;
-        } else {
-                oc = store_output_config(new_output_config("*"));
        }
-        apply_output_config_to_outputs(oc);
+        int config_idx = 0;
+        struct sway_output *sway_output;
+        wl_list_for_each(sway_output, &root->all_outputs, link) {
+                if (sway_output == root->fallback_output) {
+                        configs_len--;
+                        continue;
+                }
+                struct matched_output_config *config = &configs[config_idx++];
+                config->output = sway_output;
+                config->config = find_output_config(sway_output);
+        }
+        sort_output_configs_by_priority(configs, configs_len);
+        apply_output_configs(configs, configs_len, false, true);
+        for (size_t idx = 0; idx < configs_len; idx++) {
+                struct matched_output_config *cfg = &configs[idx];
+                free_output_config(cfg->config);
+        }
+        free(configs);
 }
 void free_output_config(struct output_config *oc) {
@@ -765,6 +1015,7 @@ void free_output_config(struct output_config *oc) {
        free(oc->name);
        free(oc->background);
        free(oc->background_option);
+        wlr_color_transform_unref(oc->color_transform);
        free(oc);
 }
@@ -822,7 +1073,9 @@ static bool _spawn_swaybg(char **command) {
                        setenv("WAYLAND_SOCKET", wayland_socket_str, true);
                        execvp(command[0], command);
-                        sway_log_errno(SWAY_ERROR, "execvp failed");
+                        sway_log_errno(SWAY_ERROR, "failed to execute '%s' "
+                                "(background configuration probably not applied)",
+                                command[0]);
                        _exit(EXIT_FAILURE);
                }
                _exit(EXIT_SUCCESS);
@@ -832,12 +1085,13 @@ static bool _spawn_swaybg(char **command) {
                sway_log_errno(SWAY_ERROR, "close failed");
                return false;
        }
-        if (waitpid(pid, NULL, 0) < 0) {
+        int fork_status = 0;
+        if (waitpid(pid, &fork_status, 0) < 0) {
                sway_log_errno(SWAY_ERROR, "waitpid failed");
                return false;
        }
-        return true;
+        return WIFEXITED(fork_status) && WEXITSTATUS(fork_status) == EXIT_SUCCESS;
 }
 bool spawn_swaybg(void) {
diff --git a/sway/config/seat.c b/sway/config/seat.c
index 6d5d91ae..f2326189 100644
--- a/sway/config/seat.c
+++ b/sway/config/seat.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/sway/criteria.c b/sway/criteria.c
index 78ea8b8a..2b7290c0 100644
--- a/sway/criteria.c
+++ b/sway/criteria.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdbool.h>
@@ -8,6 +7,7 @@
 #include "sway/criteria.h"
 #include "sway/tree/container.h"
 #include "sway/config.h"
+#include "sway/server.h"
 #include "sway/tree/root.h"
 #include "sway/tree/view.h"
 #include "sway/tree/workspace.h"
@@ -23,7 +23,7 @@ bool criteria_is_empty(struct criteria *criteria) {
                && !criteria->app_id
                && !criteria->con_mark
                && !criteria->con_id
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
                && !criteria->class
                && !criteria->id
                && !criteria->instance
@@ -91,7 +91,7 @@ void criteria_destroy(struct criteria *criteria) {
        pattern_destroy(criteria->title);
        pattern_destroy(criteria->shell);
        pattern_destroy(criteria->app_id);
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
        pattern_destroy(criteria->class);
        pattern_destroy(criteria->instance);
        pattern_destroy(criteria->window_role);
@@ -111,7 +111,7 @@ static int regex_cmp(const char *item, const pcre2_code *regex) {
        return result;
 }
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
 static bool view_has_window_type(struct sway_view *view, enum atom_name name) {
        if (view->type != SWAY_VIEW_XWAYLAND) {
                return false;
@@ -252,7 +252,7 @@ static bool criteria_matches_view(struct criteria *criteria,
                return false;
        }
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
        if (criteria->id) { // X11 window ID
                uint32_t x11_window_id = view_get_x11_window_id(view);
                if (!x11_window_id || x11_window_id != criteria->id) {
@@ -429,7 +429,7 @@ list_t *criteria_get_containers(struct criteria *criteria) {
        return matches;
 }
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
 static enum atom_name parse_window_type(const char *type) {
        if (strcasecmp(type, "normal") == 0) {
                return NET_WM_WINDOW_TYPE_NORMAL;
@@ -462,7 +462,7 @@ enum criteria_token {
        T_CON_ID,
        T_CON_MARK,
        T_FLOATING,
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
        T_CLASS,
        T_ID,
        T_INSTANCE,
@@ -488,7 +488,7 @@ static enum criteria_token token_from_name(char *name) {
                return T_CON_ID;
        } else if (strcmp(name, "con_mark") == 0) {
                return T_CON_MARK;
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
        } else if (strcmp(name, "class") == 0) {
                return T_CLASS;
        } else if (strcmp(name, "id") == 0) {
@@ -567,7 +567,7 @@ static bool parse_token(struct criteria *criteria, char *name, char *value) {
        case T_CON_MARK:
                pattern_create(&criteria->con_mark, value);
                break;
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
        case T_CLASS:
                pattern_create(&criteria->class, value);
                break;
@@ -675,7 +675,7 @@ struct criteria *criteria_parse(char *raw, char **error_arg) {
        ++head;
        struct criteria *criteria = calloc(1, sizeof(struct criteria));
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
        criteria->window_type = ATOM_LAST; // default value
 #endif
        char *name = NULL, *value = NULL;
diff --git a/sway/desktop/launcher.c b/sway/desktop/launcher.c
index 00a7e38a..2362e1ba 100644
--- a/sway/desktop/launcher.c
+++ b/sway/desktop/launcher.c
@@ -1,10 +1,10 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdlib.h>
 #include <string.h>
 #include <wlr/types/wlr_xdg_activation_v1.h>
 #include "sway/input/seat.h"
 #include "sway/output.h"
 #include "sway/desktop/launcher.h"
+#include "sway/server.h"
 #include "sway/tree/node.h"
 #include "sway/tree/container.h"
 #include "sway/tree/workspace.h"
@@ -67,6 +67,9 @@ void launcher_ctx_destroy(struct launcher_ctx *ctx) {
        }
        wl_list_remove(&ctx->node_destroy.link);
        wl_list_remove(&ctx->token_destroy.link);
+        if (ctx->seat) {
+                wl_list_remove(&ctx->seat_destroy.link);
+        }
        wl_list_remove(&ctx->link);
        wlr_xdg_activation_token_v1_destroy(ctx->token);
        free(ctx->fallback_name);
@@ -213,6 +216,8 @@ struct launcher_ctx *launcher_ctx_create(struct wlr_xdg_activation_token_v1 *tok
        ctx->fallback_name = strdup(fallback_name);
        ctx->token = token;
        ctx->node = node;
+        // Having surface set means that the focus check in wlroots has passed
+        ctx->had_focused_surface = token->surface != NULL;
        ctx->node_destroy.notify = ctx_handle_node_destroy;
        wl_signal_add(&ctx->node->events.destroy, &ctx->node_destroy);
@@ -227,6 +232,12 @@ struct launcher_ctx *launcher_ctx_create(struct wlr_xdg_activation_token_v1 *tok
        return ctx;
 }
+static void launch_ctx_handle_seat_destroy(struct wl_listener *listener, void *data) {
+        struct launcher_ctx *ctx = wl_container_of(listener, ctx, seat_destroy);
+        ctx->seat = NULL;
+        wl_list_remove(&ctx->seat_destroy.link);
+}
 // Creates a context with a new token for the internal launcher
 struct launcher_ctx *launcher_ctx_create_internal(void) {
        struct sway_seat *seat = input_manager_current_seat();
@@ -238,13 +249,15 @@ struct launcher_ctx *launcher_ctx_create_internal(void) {
        struct wlr_xdg_activation_token_v1 *token =
                wlr_xdg_activation_token_v1_create(server.xdg_activation_v1);
-        token->seat = seat->wlr_seat;
        struct launcher_ctx *ctx = launcher_ctx_create(token, &ws->node);
        if (!ctx) {
                wlr_xdg_activation_token_v1_destroy(token);
                return NULL;
        }
+        ctx->seat = seat;
+        ctx->seat_destroy.notify = launch_ctx_handle_seat_destroy;
+        wl_signal_add(&seat->wlr_seat->events.destroy, &ctx->seat_destroy);
        return ctx;
 }
diff --git a/sway/desktop/layer_shell.c b/sway/desktop/layer_shell.c
index c71abce7..6221b7b9 100644
--- a/sway/desktop/layer_shell.c
+++ b/sway/desktop/layer_shell.c
@@ -2,9 +2,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wayland-server-core.h>
+#include <wlr/types/wlr_fractional_scale_v1.h>
 #include <wlr/types/wlr_layer_shell_v1.h>
 #include <wlr/types/wlr_output.h>
+#include <wlr/types/wlr_scene.h>
 #include <wlr/types/wlr_subcompositor.h>
+#include <wlr/types/wlr_xdg_shell.h>
 #include "log.h"
 #include "sway/scene_descriptor.h"
 #include "sway/desktop/transaction.h"
@@ -16,7 +19,6 @@
 #include "sway/server.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/workspace.h"
-#include <wlr/types/wlr_scene.h>
 struct wlr_layer_surface_v1 *toplevel_layer_surface_from_surface(
                struct wlr_surface *surface) {
@@ -85,6 +87,8 @@ void arrange_layers(struct sway_output *output) {
                sway_log(SWAY_DEBUG, "Usable area changed, rearranging output");
                output->usable_area = usable_area;
                arrange_output(output);
+        } else {
+                arrange_popups(root->layers.popup);
        }
 }
@@ -120,10 +124,21 @@ static struct sway_layer_surface *sway_layer_surface_create(
                return NULL;
        }
+        surface->desc.relative = &scene->tree->node;
+        if (!scene_descriptor_assign(&popups->node,
+                        SWAY_SCENE_DESC_POPUP, &surface->desc)) {
+                sway_log(SWAY_ERROR, "Failed to allocate a popup scene descriptor");
+                wlr_scene_node_destroy(&popups->node);
+                free(surface);
+                return NULL;
+        }
        surface->tree = scene->tree;
        surface->scene = scene;
        surface->layer_surface = scene->layer_surface;
        surface->popups = popups;
+        surface->layer_surface->data = surface;
        return surface;
 }
@@ -197,6 +212,8 @@ static void handle_node_destroy(struct wl_listener *listener, void *data) {
        wl_list_remove(&layer->node_destroy.link);
        wl_list_remove(&layer->output_destroy.link);
+        layer->layer_surface->data = NULL;
        free(layer);
 }
@@ -222,10 +239,6 @@ static void handle_surface_commit(struct wl_listener *listener, void *data) {
                arrange_layers(surface->output);
                transaction_commit_dirty();
        }
-        int lx, ly;
-        wlr_scene_node_coords(&surface->scene->tree->node, &lx, &ly);
-        wlr_scene_node_set_position(&surface->popups->node, lx, ly);
 }
 static void handle_map(struct wl_listener *listener, void *data) {
@@ -420,6 +433,12 @@ void handle_layer_shell_surface(struct wl_listener *listener, void *data) {
        surface->output = output;
+        // now that the surface's output is known, we can advertise its scale
+        wlr_fractional_scale_v1_notify_scale(surface->layer_surface->surface,
+                layer_surface->output->scale);
+        wlr_surface_set_preferred_buffer_scale(surface->layer_surface->surface,
+                ceil(layer_surface->output->scale));
        surface->surface_commit.notify = handle_surface_commit;
        wl_signal_add(&layer_surface->surface->events.commit,
                &surface->surface_commit);
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index 9c4baafd..6bf77d17 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <assert.h>
 #include <stdlib.h>
 #include <strings.h>
@@ -12,6 +11,8 @@
 #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>
 #include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_presentation_time.h>
 #include <wlr/types/wlr_compositor.h>
@@ -182,7 +183,15 @@ static void send_frame_done_iterator(struct wlr_scene_buffer *buffer,
        }
 }
-static enum wlr_scale_filter_mode get_scale_filter(struct sway_output *output) {
+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->buffer_width ||
+                        buffer->dst_height < buffer->buffer_height)) {
+                return WLR_SCALE_FILTER_BILINEAR;
+        }
        switch (output->scale_filter) {
        case SCALE_FILTER_LINEAR:
                return WLR_SCALE_FILTER_BILINEAR;
@@ -211,7 +220,7 @@ static 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
-                buffer->filter_mode = get_scale_filter(output);
+                buffer->filter_mode = get_scale_filter(output, buffer);
                wlr_scene_buffer_set_opacity(buffer, opacity);
        } else if (node->type == WLR_SCENE_NODE_TREE) {
@@ -234,10 +243,14 @@ static int output_repaint_timer_handler(void *data) {
        output_configure_scene(output, &root->root_scene->tree.node, 1.0f);
+        struct wlr_scene_output_state_options opts = {
+                .color_transform = output->color_transform,
+        };
        if (output->gamma_lut_changed) {
                struct wlr_output_state pending;
                wlr_output_state_init(&pending);
-                if (!wlr_scene_output_build_state(output->scene_output, &pending, NULL)) {
+                if (!wlr_scene_output_build_state(output->scene_output, &pending, &opts)) {
                        return 0;
                }
@@ -260,7 +273,7 @@ static int output_repaint_timer_handler(void *data) {
                return 0;
        }
-        wlr_scene_output_commit(output->scene_output, NULL);
+        wlr_scene_output_commit(output->scene_output, &opts);
        return 0;
 }
@@ -512,9 +525,7 @@ void handle_new_output(struct wl_listener *listener, void *data) {
                sway_session_lock_add_output(server->session_lock.lock, output);
        }
-        struct output_config *oc = find_output_config(output);
+        apply_all_output_configs();
-        apply_output_config(oc, output);
-        free_output_config(oc);
        transaction_commit_dirty();
@@ -543,63 +554,89 @@ void handle_gamma_control_set_gamma(struct wl_listener *listener, void *data) {
        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 sway_output *output) {
+        struct output_config *oc = new_output_config(output->wlr_output->name);
+        oc->enabled = config_head->state.enabled;
+        if (!oc->enabled) {
+                return oc;
+        }
+        if (config_head->state.mode != NULL) {
+                struct wlr_output_mode *mode = config_head->state.mode;
+                oc->width = mode->width;
+                oc->height = mode->height;
+                oc->refresh_rate = mode->refresh / 1000.f;
+        } else {
+                oc->width = config_head->state.custom_mode.width;
+                oc->height = config_head->state.custom_mode.height;
+                oc->refresh_rate =
+                        config_head->state.custom_mode.refresh / 1000.f;
+        }
+        oc->x = config_head->state.x;
+        oc->y = config_head->state.y;
+        oc->transform = config_head->state.transform;
+        oc->scale = config_head->state.scale;
+        oc->adaptive_sync = config_head->state.adaptive_sync_enabled;
+        return oc;
+}
 static void output_manager_apply(struct sway_server *server,
                struct wlr_output_configuration_v1 *config, bool test_only) {
-        // TODO: perform atomic tests on the whole backend atomically
+        size_t configs_len = wl_list_length(&root->all_outputs);
+        struct matched_output_config *configs = calloc(configs_len, sizeof(*configs));
-        struct wlr_output_configuration_head_v1 *config_head;
+        if (!configs) {
-        // First disable outputs we need to disable
+                return;
-        bool ok = true;
+        }
-        wl_list_for_each(config_head, &config->heads, link) {
-                struct wlr_output *wlr_output = config_head->state.output;
+        int config_idx = 0;
-                struct sway_output *output = wlr_output->data;
+        struct sway_output *sway_output;
-                if (!output->enabled || config_head->state.enabled) {
+        wl_list_for_each(sway_output, &root->all_outputs, link) {
+                if (sway_output == root->fallback_output) {
+                        configs_len--;
                        continue;
                }
-                struct output_config *oc = new_output_config(output->wlr_output->name);
-                oc->enabled = false;
-                if (test_only) {
+                struct matched_output_config *cfg = &configs[config_idx++];
-                        ok &= test_output_config(oc, output);
+                cfg->output = sway_output;
-                } else {
-                        oc = store_output_config(oc);
+                struct wlr_output_configuration_head_v1 *config_head;
-                        ok &= apply_output_config(oc, output);
+                wl_list_for_each(config_head, &config->heads, link) {
+                        if (config_head->state.output == sway_output->wlr_output) {
+                                cfg->config = output_config_for_config_head(config_head, sway_output);
+                                break;
+                        }
+                }
+                if (!cfg->config) {
+                        cfg->config = find_output_config(sway_output);
                }
        }
-        // Then enable outputs that need to
+        sort_output_configs_by_priority(configs, configs_len);
-        wl_list_for_each(config_head, &config->heads, link) {
+        bool ok = apply_output_configs(configs, configs_len, test_only, false);
-                struct wlr_output *wlr_output = config_head->state.output;
+        for (size_t idx = 0; idx < configs_len; idx++) {
-                struct sway_output *output = wlr_output->data;
+                struct matched_output_config *cfg = &configs[idx];
-                if (!config_head->state.enabled) {
-                        continue;
+                // Only store new configs for successful non-test commits. Old configs,
-                }
+                // test-only and failed commits just get freed.
-                struct output_config *oc = new_output_config(output->wlr_output->name);
+                bool store_config = false;
-                oc->enabled = true;
+                if (!test_only && ok) {
-                if (config_head->state.mode != NULL) {
+                        struct wlr_output_configuration_head_v1 *config_head;
-                        struct wlr_output_mode *mode = config_head->state.mode;
+                        wl_list_for_each(config_head, &config->heads, link) {
-                        oc->width = mode->width;
+                                if (config_head->state.output == cfg->output->wlr_output) {
-                        oc->height = mode->height;
+                                        store_config = true;
-                        oc->refresh_rate = mode->refresh / 1000.f;
+                                        break;
-                } else {
+                                }
-                        oc->width = config_head->state.custom_mode.width;
+                        }
-                        oc->height = config_head->state.custom_mode.height;
-                        oc->refresh_rate =
-                                config_head->state.custom_mode.refresh / 1000.f;
                }
-                oc->x = config_head->state.x;
+                if (store_config) {
-                oc->y = config_head->state.y;
+                        store_output_config(cfg->config);
-                oc->transform = config_head->state.transform;
-                oc->scale = config_head->state.scale;
-                oc->adaptive_sync = config_head->state.adaptive_sync_enabled;
-                if (test_only) {
-                        ok &= test_output_config(oc, output);
                } else {
-                        oc = store_output_config(oc);
+                        free_output_config(cfg->config);
-                        ok &= apply_output_config(oc, output);
                }
        }
+        free(configs);
        if (ok) {
                wlr_output_configuration_v1_send_succeeded(config);
@@ -643,6 +680,6 @@ void handle_output_power_manager_set_mode(struct wl_listener *listener,
                oc->power = 1;
                break;
        }
-        oc = store_output_config(oc);
+        store_output_config(oc);
-        apply_output_config(oc, output);
+        apply_all_output_configs();
 }
diff --git a/sway/desktop/transaction.c b/sway/desktop/transaction.c
index acc3e3f9..d1898843 100644
--- a/sway/desktop/transaction.c
+++ b/sway/desktop/transaction.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
@@ -11,6 +10,7 @@
 #include "sway/input/cursor.h"
 #include "sway/input/input-manager.h"
 #include "sway/output.h"
+#include "sway/server.h"
 #include "sway/tree/container.h"
 #include "sway/tree/node.h"
 #include "sway/tree/view.h"
@@ -606,21 +606,15 @@ static void arrange_output(struct sway_output *output, int width, int height) {
        }
 }
-static void arrange_popup(struct wlr_scene_tree *popup) {
+void arrange_popups(struct wlr_scene_tree *popups) {
        struct wlr_scene_node *node;
-        wl_list_for_each(node, &popup->children, link) {
+        wl_list_for_each(node, &popups->children, link) {
-                struct sway_xdg_popup *popup = scene_descriptor_try_get(node,
+                struct sway_popup_desc *popup = scene_descriptor_try_get(node,
                        SWAY_SCENE_DESC_POPUP);
-                // the popup layer may have popups from layer_shell surfaces, in this
+                int lx, ly;
-                // case those don't have a scene descriptor, so lets skip those here.
+                wlr_scene_node_coords(popup->relative, &lx, &ly);
-                if (popup) {
+                wlr_scene_node_set_position(node, lx, ly);
-                        struct wlr_scene_tree *tree = popup->view->content_tree;
-                        int lx, ly;
-                        wlr_scene_node_coords(&tree->node, &lx, &ly);
-                        wlr_scene_node_set_position(&popup->scene_tree->node, lx, ly);
-                }
        }
 }
@@ -679,7 +673,7 @@ static void arrange_root(struct sway_root *root) {
                }
        }
-        arrange_popup(root->layers.popup);
+        arrange_popups(root->layers.popup);
 }
 /**
@@ -768,7 +762,7 @@ static bool should_configure(struct sway_node *node,
        }
        struct sway_container_state *cstate = &node->sway_container->current;
        struct sway_container_state *istate = &instruction->container_state;
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
        // Xwayland views are position-aware and need to be reconfigured
        // when their position changes.
        if (node->sway_container->view->type == SWAY_VIEW_XWAYLAND) {
diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c
index 7cdd97c8..7c417891 100644
--- a/sway/desktop/xdg_shell.c
+++ b/sway/desktop/xdg_shell.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 199309L
 #include <float.h>
 #include <stdbool.h>
 #include <stdlib.h>
@@ -36,6 +35,7 @@ static void popup_handle_destroy(struct wl_listener *listener, void *data) {
        wl_list_remove(&popup->new_popup.link);
        wl_list_remove(&popup->destroy.link);
        wl_list_remove(&popup->surface_commit.link);
+        wl_list_remove(&popup->reposition.link);
        wlr_scene_node_destroy(&popup->scene_tree->node);
        free(popup);
 }
@@ -71,6 +71,11 @@ static void popup_handle_surface_commit(struct wl_listener *listener, void *data
        }
 }
+static void popup_handle_reposition(struct wl_listener *listener, void *data) {
+        struct sway_xdg_popup *popup = wl_container_of(listener, popup, reposition);
+        popup_unconstrain(popup);
+}
 static struct sway_xdg_popup *popup_create(struct wlr_xdg_popup *wlr_popup,
                struct sway_view *view, struct wlr_scene_tree *parent) {
        struct wlr_xdg_surface *xdg_surface = wlr_popup->base;
@@ -97,8 +102,11 @@ static struct sway_xdg_popup *popup_create(struct wlr_xdg_popup *wlr_popup,
                return NULL;
        }
+        popup->desc.relative = &view->content_tree->node;
+        popup->desc.view = view;
        if (!scene_descriptor_assign(&popup->scene_tree->node,
-                        SWAY_SCENE_DESC_POPUP, popup)) {
+                        SWAY_SCENE_DESC_POPUP, &popup->desc)) {
                sway_log(SWAY_ERROR, "Failed to allocate a popup scene descriptor");
                wlr_scene_node_destroy(&popup->scene_tree->node);
                free(popup);
@@ -114,6 +122,8 @@ static struct sway_xdg_popup *popup_create(struct wlr_xdg_popup *wlr_popup,
        popup->surface_commit.notify = popup_handle_surface_commit;
        wl_signal_add(&xdg_surface->events.new_popup, &popup->new_popup);
        popup->new_popup.notify = popup_handle_new_popup;
+        wl_signal_add(&wlr_popup->events.reposition, &popup->reposition);
+        popup->reposition.notify = popup_handle_reposition;
        wl_signal_add(&wlr_popup->events.destroy, &popup->destroy);
        popup->destroy.notify = popup_handle_destroy;
@@ -279,6 +289,7 @@ static void handle_commit(struct wl_listener *listener, void *data) {
                }
                // XXX: https://github.com/swaywm/sway/issues/2176
                wlr_xdg_surface_schedule_configure(xdg_surface);
+                // TODO: wlr_xdg_toplevel_set_bounds()
                return;
        }
@@ -337,6 +348,7 @@ static void handle_set_app_id(struct wl_listener *listener, void *data) {
        struct sway_xdg_shell_view *xdg_shell_view =
                wl_container_of(listener, xdg_shell_view, set_app_id);
        struct sway_view *view = &xdg_shell_view->view;
+        view_update_app_id(view);
        view_execute_criteria(view);
 }
@@ -563,4 +575,7 @@ void handle_xdg_shell_toplevel(struct wl_listener *listener, void *data) {
        wlr_scene_xdg_surface_create(xdg_shell_view->view.content_tree, xdg_toplevel->base);
        xdg_toplevel->base->data = xdg_shell_view;
+        wlr_xdg_toplevel_set_wm_capabilities(xdg_toplevel,
+                XDG_TOPLEVEL_WM_CAPABILITIES_FULLSCREEN);
 }
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c
index 9f3f4d5f..270cf08f 100644
--- a/sway/desktop/xwayland.c
+++ b/sway/desktop/xwayland.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 199309L
 #include <float.h>
 #include <stdbool.h>
 #include <stdlib.h>
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 404c1eed..235951d4 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <assert.h>
 #include <math.h>
 #include <libevdev/libevdev.h>
@@ -9,6 +8,7 @@
 #include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_cursor_shape_v1.h>
 #include <wlr/types/wlr_pointer.h>
+#include <wlr/types/wlr_relative_pointer_v1.h>
 #include <wlr/types/wlr_touch.h>
 #include <wlr/types/wlr_tablet_v2.h>
 #include <wlr/types/wlr_tablet_pad.h>
@@ -25,6 +25,7 @@
 #include "sway/layers.h"
 #include "sway/output.h"
 #include "sway/scene_descriptor.h"
+#include "sway/server.h"
 #include "sway/tree/container.h"
 #include "sway/tree/root.h"
 #include "sway/tree/view.h"
@@ -90,9 +91,9 @@ struct sway_node *node_at_coords(
                        }
                        if (!con) {
-                                struct sway_xdg_popup *popup =
+                                struct sway_popup_desc *popup =
                                        scene_descriptor_try_get(current, SWAY_SCENE_DESC_POPUP);
-                                if (popup) {
+                                if (popup && popup->view) {
                                        con = popup->view->container;
                                }
                        }
@@ -107,7 +108,7 @@ struct sway_node *node_at_coords(
                                return NULL;
                        }
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
                        if (scene_descriptor_try_get(current, SWAY_SCENE_DESC_XWAYLAND_UNMANAGED)) {
                                return NULL;
                        }
@@ -243,7 +244,7 @@ static enum sway_input_idle_source idle_source_from_device(
                return IDLE_SOURCE_POINTER;
        case WLR_INPUT_DEVICE_TOUCH:
                return IDLE_SOURCE_TOUCH;
-        case WLR_INPUT_DEVICE_TABLET_TOOL:
+        case WLR_INPUT_DEVICE_TABLET:
                return IDLE_SOURCE_TABLET_TOOL;
        case WLR_INPUT_DEVICE_TABLET_PAD:
                return IDLE_SOURCE_TABLET_PAD;
@@ -356,7 +357,7 @@ static void handle_pointer_motion_absolute(
 void dispatch_cursor_button(struct sway_cursor *cursor,
                struct wlr_input_device *device, uint32_t time_msec, uint32_t button,
-                enum wlr_button_state state) {
+                enum wl_pointer_button_state state) {
        if (time_msec == 0) {
                time_msec = get_current_time_msec();
        }
@@ -368,7 +369,7 @@ static void handle_pointer_button(struct wl_listener *listener, void *data) {
        struct sway_cursor *cursor = wl_container_of(listener, cursor, button);
        struct wlr_pointer_button_event *event = data;
-        if (event->state == WLR_BUTTON_PRESSED) {
+        if (event->state == WL_POINTER_BUTTON_STATE_PRESSED) {
                cursor->pressed_button_count++;
        } else {
                if (cursor->pressed_button_count > 0) {
@@ -430,7 +431,7 @@ static void handle_touch_up(struct wl_listener *listener, void *data) {
                if (cursor->pointer_touch_id == cursor->seat->touch_id) {
                        cursor->pointer_touch_up = true;
                        dispatch_cursor_button(cursor, &event->touch->base,
-                                event->time_msec, BTN_LEFT, WLR_BUTTON_RELEASED);
+                                event->time_msec, BTN_LEFT, WL_POINTER_BUTTON_STATE_RELEASED);
                }
        } else {
                seatop_touch_up(seat, event);
@@ -448,7 +449,7 @@ static void handle_touch_cancel(struct wl_listener *listener, void *data) {
                if (cursor->pointer_touch_id == cursor->seat->touch_id) {
                        cursor->pointer_touch_up = true;
                        dispatch_cursor_button(cursor, &event->touch->base,
-                                event->time_msec, BTN_LEFT, WLR_BUTTON_RELEASED);
+                                event->time_msec, BTN_LEFT, WL_POINTER_BUTTON_STATE_RELEASED);
                }
        } else {
                seatop_touch_cancel(seat, event);
@@ -518,7 +519,7 @@ static void apply_mapping_from_region(struct wlr_input_device *device,
        double x1 = region->x1, x2 = region->x2;
        double y1 = region->y1, y2 = region->y2;
-        if (region->mm && device->type == WLR_INPUT_DEVICE_TABLET_TOOL) {
+        if (region->mm && device->type == WLR_INPUT_DEVICE_TABLET) {
                struct wlr_tablet *tablet = wlr_tablet_from_input_device(device);
                if (tablet->width_mm == 0 || tablet->height_mm == 0) {
                        return;
@@ -661,7 +662,7 @@ static void handle_tool_tip(struct wl_listener *listener, void *data) {
                        event->state == WLR_TABLET_TOOL_TIP_UP) {
                cursor->simulating_pointer_from_tool_tip = false;
                dispatch_cursor_button(cursor, &event->tablet->base, event->time_msec,
-                        BTN_LEFT, WLR_BUTTON_RELEASED);
+                        BTN_LEFT, WL_POINTER_BUTTON_STATE_RELEASED);
                wlr_seat_pointer_notify_frame(cursor->seat->wlr_seat);
        } else if (!surface || !wlr_surface_accepts_tablet_v2(tablet_v2, surface)) {
                // If we started holding the tool tip down on a surface that accepts
@@ -673,7 +674,7 @@ static void handle_tool_tip(struct wl_listener *listener, void *data) {
                } else {
                        cursor->simulating_pointer_from_tool_tip = true;
                        dispatch_cursor_button(cursor, &event->tablet->base,
-                                event->time_msec, BTN_LEFT, WLR_BUTTON_PRESSED);
+                                event->time_msec, BTN_LEFT, WL_POINTER_BUTTON_STATE_PRESSED);
                        wlr_seat_pointer_notify_frame(cursor->seat->wlr_seat);
                }
        } else {
@@ -776,13 +777,13 @@ static void handle_tool_button(struct wl_listener *listener, void *data) {
                case WLR_BUTTON_PRESSED:
                        if (cursor->tool_buttons == 0) {
                                dispatch_cursor_button(cursor, &event->tablet->base,
-                                                event->time_msec, BTN_RIGHT, event->state);
+                                        event->time_msec, BTN_RIGHT, WL_POINTER_BUTTON_STATE_PRESSED);
                        }
                        break;
                case WLR_BUTTON_RELEASED:
                        if (cursor->tool_buttons <= 1) {
                                dispatch_cursor_button(cursor, &event->tablet->base,
-                                                event->time_msec, BTN_RIGHT, event->state);
+                                        event->time_msec, BTN_RIGHT, WL_POINTER_BUTTON_STATE_RELEASED);
                        }
                        break;
                }
diff --git a/sway/input/input-manager.c b/sway/input/input-manager.c
index c1bbdde0..248ca34e 100644
--- a/sway/input/input-manager.c
+++ b/sway/input/input-manager.c
@@ -1,9 +1,10 @@
-#define _POSIX_C_SOURCE 200809L
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
+#include <assert.h>
 #include <wlr/config.h>
+#include <wlr/backend/libinput.h>
 #include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_keyboard_group.h>
 #include <wlr/types/wlr_virtual_keyboard_v1.h>
@@ -66,8 +67,15 @@ struct sway_seat *input_manager_sway_seat_from_wlr_seat(struct wlr_seat *wlr_sea
 }
 char *input_device_get_identifier(struct wlr_input_device *device) {
-        int vendor = device->vendor;
+        int vendor = 0, product = 0;
-        int product = device->product;
+#if WLR_HAS_LIBINPUT_BACKEND
+        if (wlr_input_device_is_libinput(device)) {
+                struct libinput_device *libinput_dev = wlr_libinput_get_device_handle(device);
+                vendor = libinput_device_get_id_vendor(libinput_dev);
+                product = libinput_device_get_id_product(libinput_dev);
+        }
+#endif
        char *name = strdup(device->name ? device->name : "");
        strip_whitespace(name);
@@ -112,7 +120,7 @@ const char *input_device_get_type(struct sway_input_device *device) {
                return "keyboard";
        case WLR_INPUT_DEVICE_TOUCH:
                return "touch";
-        case WLR_INPUT_DEVICE_TABLET_TOOL:
+        case WLR_INPUT_DEVICE_TABLET:
                return "tablet_tool";
        case WLR_INPUT_DEVICE_TABLET_PAD:
                return "tablet_pad";
@@ -425,6 +433,20 @@ void handle_virtual_pointer(struct wl_listener *listener, void *data) {
        }
 }
+static void handle_transient_seat_manager_create_seat(
+                struct wl_listener *listener, void *data) {
+        struct wlr_transient_seat_v1 *transient_seat = data;
+        static uint64_t i;
+        char name[256];
+        snprintf(name, sizeof(name), "transient-%"PRIx64, i++);
+        struct sway_seat *seat = seat_create(name);
+        if (seat && seat->wlr_seat) {
+                wlr_transient_seat_v1_ready(transient_seat, seat->wlr_seat);
+        } else {
+                wlr_transient_seat_v1_deny(transient_seat);
+        }
+}
 struct sway_input_manager *input_manager_create(struct sway_server *server) {
        struct sway_input_manager *input =
                calloc(1, sizeof(struct sway_input_manager));
@@ -460,6 +482,15 @@ struct sway_input_manager *input_manager_create(struct sway_server *server) {
        input->pointer_gestures = wlr_pointer_gestures_v1_create(server->wl_display);
+        input->transient_seat_manager =
+                wlr_transient_seat_manager_v1_create(server->wl_display);
+        assert(input->transient_seat_manager);
+        input->transient_seat_create.notify =
+                handle_transient_seat_manager_create_seat;
+        wl_signal_add(&input->transient_seat_manager->events.create_seat,
+                        &input->transient_seat_create);
        return input;
 }
diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c
index b97f0152..9ac21664 100644
--- a/sway/input/keyboard.c
+++ b/sway/input/keyboard.c
@@ -13,6 +13,7 @@
 #include "sway/input/seat.h"
 #include "sway/input/cursor.h"
 #include "sway/ipc-server.h"
+#include "sway/server.h"
 #include "log.h"
 #if WLR_HAS_SESSION
@@ -32,6 +33,7 @@ static struct modifier_key {
        { XKB_MOD_NAME_NUM, WLR_MODIFIER_MOD2 },
        { "Mod3", WLR_MODIFIER_MOD3 },
        { XKB_MOD_NAME_LOGO, WLR_MODIFIER_LOGO },
+        { "Super", WLR_MODIFIER_LOGO },
        { "Mod5", WLR_MODIFIER_MOD5 },
 };
diff --git a/sway/input/seat.c b/sway/input/seat.c
index 75fea484..da4bb12a 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <assert.h>
 #include <linux/input-event-codes.h>
 #include <string.h>
@@ -68,6 +67,12 @@ static void seat_node_destroy(struct sway_seat_node *seat_node) {
 }
 void seat_destroy(struct sway_seat *seat) {
+        wlr_seat_destroy(seat->wlr_seat);
+}
+static void handle_seat_destroy(struct wl_listener *listener, void *data) {
+        struct sway_seat *seat = wl_container_of(listener, seat, destroy);
        if (seat == config->handler_context.seat) {
                config->handler_context.seat = input_manager_get_default_seat();
        }
@@ -88,7 +93,7 @@ void seat_destroy(struct sway_seat *seat) {
        wl_list_remove(&seat->request_set_selection.link);
        wl_list_remove(&seat->request_set_primary_selection.link);
        wl_list_remove(&seat->link);
-        wlr_seat_destroy(seat->wlr_seat);
+        wl_list_remove(&seat->destroy.link);
        for (int i = 0; i < seat->deferred_bindings->length; i++) {
                free_sway_binding(seat->deferred_bindings->items[i]);
        }
@@ -185,7 +190,7 @@ static void seat_send_focus(struct sway_node *node, struct sway_seat *seat) {
                node->sway_container->view : NULL;
        if (view && seat_is_input_allowed(seat, view->surface)) {
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
                if (view->type == SWAY_VIEW_XWAYLAND) {
                        struct wlr_xwayland *xwayland = server.xwayland.wlr_xwayland;
                        wlr_xwayland_set_seat(xwayland, seat->wlr_seat);
@@ -535,6 +540,9 @@ struct sway_seat *seat_create(const char *seat_name) {
                return NULL;
        }
+        seat->destroy.notify = handle_seat_destroy;
+        wl_signal_add(&seat->wlr_seat->events.destroy, &seat->destroy);
        seat->idle_inhibit_sources = seat->idle_wake_sources =
                IDLE_SOURCE_KEYBOARD |
                IDLE_SOURCE_POINTER |
@@ -608,7 +616,7 @@ static void seat_update_capabilities(struct sway_seat *seat) {
                case WLR_INPUT_DEVICE_TOUCH:
                        caps |= WL_SEAT_CAPABILITY_TOUCH;
                        break;
-                case WLR_INPUT_DEVICE_TABLET_TOOL:
+                case WLR_INPUT_DEVICE_TABLET:
                        caps |= WL_SEAT_CAPABILITY_POINTER;
                        break;
                case WLR_INPUT_DEVICE_SWITCH:
@@ -666,7 +674,7 @@ static const char *get_builtin_output_name(void) {
 static bool is_touch_or_tablet_tool(struct sway_seat_device *seat_device) {
        switch (seat_device->input_device->wlr_device->type) {
        case WLR_INPUT_DEVICE_TOUCH:
-        case WLR_INPUT_DEVICE_TABLET_TOOL:
+        case WLR_INPUT_DEVICE_TABLET:
                return true;
        default:
                return false;
@@ -681,7 +689,7 @@ static void seat_apply_input_mapping(struct sway_seat *seat,
        switch (sway_device->input_device->wlr_device->type) {
        case WLR_INPUT_DEVICE_POINTER:
        case WLR_INPUT_DEVICE_TOUCH:
-        case WLR_INPUT_DEVICE_TABLET_TOOL:
+        case WLR_INPUT_DEVICE_TABLET:
                break;
        default:
                return; // these devices don't support mappings
@@ -874,7 +882,7 @@ void seat_configure_device(struct sway_seat *seat,
                case WLR_INPUT_DEVICE_TOUCH:
                        seat_configure_touch(seat, seat_device);
                        break;
-                case WLR_INPUT_DEVICE_TABLET_TOOL:
+                case WLR_INPUT_DEVICE_TABLET:
                        seat_configure_tablet_tool(seat, seat_device);
                        break;
                case WLR_INPUT_DEVICE_TABLET_PAD:
@@ -913,7 +921,7 @@ void seat_reset_device(struct sway_seat *seat,
                case WLR_INPUT_DEVICE_TOUCH:
                        seat_reset_input_config(seat, seat_device);
                        break;
-                case WLR_INPUT_DEVICE_TABLET_TOOL:
+                case WLR_INPUT_DEVICE_TABLET:
                        seat_reset_input_config(seat, seat_device);
                        break;
                case WLR_INPUT_DEVICE_TABLET_PAD:
@@ -994,7 +1002,7 @@ void seat_configure_xcursor(struct sway_seat *seat) {
                        setenv("XCURSOR_THEME", cursor_theme, 1);
                }
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
                if (server.xwayland.wlr_xwayland && (!server.xwayland.xcursor_manager ||
                                !xcursor_manager_is_named(server.xwayland.xcursor_manager,
                                        cursor_theme) ||
@@ -1521,7 +1529,7 @@ struct seat_config *seat_get_config_by_name(const char *name) {
 }
 void seat_pointer_notify_button(struct sway_seat *seat, uint32_t time_msec,
-                uint32_t button, enum wlr_button_state state) {
+                uint32_t button, enum wl_pointer_button_state state) {
        seat->last_button_serial = wlr_seat_pointer_notify_button(seat->wlr_seat,
                        time_msec, button, state);
 }
@@ -1558,7 +1566,7 @@ void seatop_unref(struct sway_seat *seat, struct sway_container *con) {
 void seatop_button(struct sway_seat *seat, uint32_t time_msec,
                struct wlr_input_device *device, uint32_t button,
-                enum wlr_button_state state) {
+                enum wl_pointer_button_state state) {
        if (seat->seatop_impl->button) {
                seat->seatop_impl->button(seat, time_msec, device, button, state);
        }
diff --git a/sway/input/seatop_default.c b/sway/input/seatop_default.c
index c56330fd..f4a0f463 100644
--- a/sway/input/seatop_default.c
+++ b/sway/input/seatop_default.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <float.h>
 #include <libevdev/libevdev.h>
 #include <wlr/types/wlr_cursor.h>
@@ -12,11 +11,12 @@
 #include "sway/input/tablet.h"
 #include "sway/layers.h"
 #include "sway/output.h"
+#include "sway/server.h"
 #include "sway/scene_descriptor.h"
 #include "sway/tree/view.h"
 #include "sway/tree/workspace.h"
 #include "log.h"
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
 #include "sway/xwayland.h"
 #endif
@@ -235,7 +235,7 @@ static void handle_tablet_tool_tip(struct sway_seat *seat,
                node->sway_container : NULL;
        struct wlr_layer_surface_v1 *layer;
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
        struct wlr_xwayland_surface *xsurface;
 #endif
        if ((layer = wlr_layer_surface_v1_try_from_wlr_surface(surface)) &&
@@ -269,7 +269,7 @@ static void handle_tablet_tool_tip(struct sway_seat *seat,
                seat_set_focus_container(seat, cont);
                seatop_begin_down(seat, node->sway_container, sx, sy);
        }
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
        // Handle tapping on an xwayland unmanaged view
        else if ((xsurface = wlr_xwayland_surface_try_from_wlr_surface(surface)) &&
                        xsurface->override_redirect &&
@@ -291,7 +291,7 @@ static void handle_tablet_tool_tip(struct sway_seat *seat,
 static bool trigger_pointer_button_binding(struct sway_seat *seat,
                struct wlr_input_device *device, uint32_t button,
-                enum wlr_button_state state, uint32_t modifiers,
+                enum wl_pointer_button_state state, uint32_t modifiers,
                bool on_titlebar, bool on_border, bool on_contents, bool on_workspace) {
        // We can reach this for non-pointer devices if we're currently emulating
        // pointer input for one. Emulated input should not trigger bindings. The
@@ -305,7 +305,7 @@ static bool trigger_pointer_button_binding(struct sway_seat *seat,
        char *device_identifier = device ? input_device_get_identifier(device)
                : strdup("*");
        struct sway_binding *binding = NULL;
-        if (state == WLR_BUTTON_PRESSED) {
+        if (state == WL_POINTER_BUTTON_STATE_PRESSED) {
                state_add_button(e, button);
                binding = get_active_mouse_binding(e,
                        config->current_mode->mouse_bindings, modifiers, false,
@@ -330,7 +330,7 @@ static bool trigger_pointer_button_binding(struct sway_seat *seat,
 static void handle_button(struct sway_seat *seat, uint32_t time_msec,
                struct wlr_input_device *device, uint32_t button,
-                enum wlr_button_state state) {
+                enum wl_pointer_button_state state) {
        struct sway_cursor *cursor = seat->cursor;
        // Determine what's under the cursor
@@ -363,7 +363,7 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
        // Handle clicking an empty workspace
        if (node && node->type == N_WORKSPACE) {
-                if (state == WLR_BUTTON_PRESSED) {
+                if (state == WL_POINTER_BUTTON_STATE_PRESSED) {
                        seat_set_focus(seat, node);
                        transaction_commit_dirty();
                }
@@ -378,7 +378,7 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
                        seat_set_focus_layer(seat, layer);
                        transaction_commit_dirty();
                }
-                if (state == WLR_BUTTON_PRESSED) {
+                if (state == WL_POINTER_BUTTON_STATE_PRESSED) {
                        seatop_begin_down_on_surface(seat, surface, sx, sy);
                }
                seat_pointer_notify_button(seat, time_msec, button, state);
@@ -387,7 +387,7 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
        // Handle tiling resize via border
        if (cont && resize_edge && button == BTN_LEFT &&
-                        state == WLR_BUTTON_PRESSED && !is_floating) {
+                        state == WL_POINTER_BUTTON_STATE_PRESSED && !is_floating) {
                // If a resize is triggered on a tabbed or stacked container, change
                // focus to the tab which already had inactive focus -- otherwise, we'd
                // change the active tab when the user probably just wanted to resize.
@@ -405,7 +405,7 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
        // Handle tiling resize via mod
        bool mod_pressed = modifiers & config->floating_mod;
        if (cont && !is_floating_or_child && mod_pressed &&
-                        state == WLR_BUTTON_PRESSED) {
+                        state == WL_POINTER_BUTTON_STATE_PRESSED) {
                uint32_t btn_resize = config->floating_mod_inverse ?
                        BTN_LEFT : BTN_RIGHT;
                if (button == btn_resize) {
@@ -433,7 +433,7 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
        }
        // Handle changing focus when clicking on a container
-        if (cont && state == WLR_BUTTON_PRESSED) {
+        if (cont && state == WL_POINTER_BUTTON_STATE_PRESSED) {
                // Default case: focus the container that was just clicked.
                node = &cont->node;
@@ -454,7 +454,7 @@ 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 == WLR_BUTTON_PRESSED) {
+                        state == WL_POINTER_BUTTON_STATE_PRESSED) {
                uint32_t btn_move = config->floating_mod_inverse ? BTN_RIGHT : BTN_LEFT;
                if (button == btn_move && (mod_pressed || on_titlebar)) {
                        seatop_begin_move_floating(seat, container_toplevel_ancestor(cont));
@@ -464,7 +464,7 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
        // Handle beginning floating resize
        if (cont && is_floating_or_child && !is_fullscreen_or_child &&
-                        state == WLR_BUTTON_PRESSED) {
+                        state == WL_POINTER_BUTTON_STATE_PRESSED) {
                // Via border
                if (button == BTN_LEFT && resize_edge != WLR_EDGE_NONE) {
                        seat_set_focus_container(seat, cont);
@@ -490,7 +490,7 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
        // Handle moving a tiling container
        if (config->tiling_drag && (mod_pressed || on_titlebar) &&
-                        state == WLR_BUTTON_PRESSED && !is_floating_or_child &&
+                        state == WL_POINTER_BUTTON_STATE_PRESSED && !is_floating_or_child &&
                        cont && cont->pending.fullscreen_mode == FULLSCREEN_NONE) {
                // If moving a container by its title bar, use a threshold for the drag
                if (!mod_pressed && config->tiling_drag_threshold > 0) {
@@ -503,19 +503,19 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
        }
        // Handle mousedown on a container surface
-        if (surface && cont && state == WLR_BUTTON_PRESSED) {
+        if (surface && cont && state == WL_POINTER_BUTTON_STATE_PRESSED) {
                seatop_begin_down(seat, cont, sx, sy);
-                seat_pointer_notify_button(seat, time_msec, button, WLR_BUTTON_PRESSED);
+                seat_pointer_notify_button(seat, time_msec, button, WL_POINTER_BUTTON_STATE_PRESSED);
                return;
        }
        // Handle clicking a container surface or decorations
-        if (cont && state == WLR_BUTTON_PRESSED) {
+        if (cont && state == WL_POINTER_BUTTON_STATE_PRESSED) {
                seat_pointer_notify_button(seat, time_msec, button, state);
                return;
        }
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
        // Handle clicking on xwayland unmanaged view
        struct wlr_xwayland_surface *xsurface;
        if (surface &&
@@ -685,7 +685,7 @@ static void handle_touch_down(struct sway_seat *seat,
                pointer_motion(cursor, event->time_msec, &event->touch->base, dx, dy,
                                dx, dy);
                dispatch_cursor_button(cursor, &event->touch->base, event->time_msec,
-                                BTN_LEFT, WLR_BUTTON_PRESSED);
+                                BTN_LEFT, WL_POINTER_BUTTON_STATE_PRESSED);
        }
 }
@@ -695,9 +695,9 @@ static void handle_touch_down(struct sway_seat *seat,
 static uint32_t wl_axis_to_button(struct wlr_pointer_axis_event *event) {
        switch (event->orientation) {
-        case WLR_AXIS_ORIENTATION_VERTICAL:
+        case WL_POINTER_AXIS_VERTICAL_SCROLL:
                return event->delta < 0 ? SWAY_SCROLL_UP : SWAY_SCROLL_DOWN;
-        case WLR_AXIS_ORIENTATION_HORIZONTAL:
+        case WL_POINTER_AXIS_HORIZONTAL_SCROLL:
                return event->delta < 0 ? SWAY_SCROLL_LEFT : SWAY_SCROLL_RIGHT;
        default:
                sway_log(SWAY_DEBUG, "Unknown axis orientation");
diff --git a/sway/input/seatop_down.c b/sway/input/seatop_down.c
index b4421fe6..340e334b 100644
--- a/sway/input/seatop_down.c
+++ b/sway/input/seatop_down.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <float.h>
 #include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_tablet_v2.h>
@@ -118,7 +117,11 @@ static void handle_touch_cancel(struct sway_seat *seat,
        }
        if (e->surface) {
-                wlr_seat_touch_notify_cancel(seat->wlr_seat, e->surface);
+                struct wl_client *client = wl_resource_get_client(e->surface->resource);
+                struct wlr_seat_client *seat_client = wlr_seat_client_for_wl_client(seat->wlr_seat, client);
+                if (seat_client != NULL) {
+                        wlr_seat_touch_notify_cancel(seat->wlr_seat, seat_client);
+                }
        }
        if (wl_list_empty(&e->point_events)) {
@@ -143,7 +146,7 @@ static void handle_pointer_axis(struct sway_seat *seat,
 static void handle_button(struct sway_seat *seat, uint32_t time_msec,
                struct wlr_input_device *device, uint32_t button,
-                enum wlr_button_state state) {
+                enum wl_pointer_button_state state) {
        seat_pointer_notify_button(seat, time_msec, button, state);
        if (seat->cursor->pressed_button_count == 0) {
diff --git a/sway/input/seatop_move_floating.c b/sway/input/seatop_move_floating.c
index 21d048ce..83668d88 100644
--- a/sway/input/seatop_move_floating.c
+++ b/sway/input/seatop_move_floating.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <wlr/types/wlr_cursor.h>
 #include "sway/desktop/transaction.h"
 #include "sway/input/cursor.h"
@@ -22,7 +21,7 @@ static void finalize_move(struct sway_seat *seat) {
 static void handle_button(struct sway_seat *seat, uint32_t time_msec,
                struct wlr_input_device *device, uint32_t button,
-                enum wlr_button_state state) {
+                enum wl_pointer_button_state state) {
        if (seat->cursor->pressed_button_count == 0) {
                finalize_move(seat);
        }
diff --git a/sway/input/seatop_move_tiling.c b/sway/input/seatop_move_tiling.c
index 7de39ff6..c525b77a 100644
--- a/sway/input/seatop_move_tiling.c
+++ b/sway/input/seatop_move_tiling.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <limits.h>
 #include <wlr/types/wlr_cursor.h>
 #include <wlr/util/edges.h>
@@ -406,7 +405,7 @@ static void finalize_move(struct sway_seat *seat) {
 static void handle_button(struct sway_seat *seat, uint32_t time_msec,
                struct wlr_input_device *device, uint32_t button,
-                enum wlr_button_state state) {
+                enum wl_pointer_button_state state) {
        if (seat->cursor->pressed_button_count == 0) {
                finalize_move(seat);
        }
diff --git a/sway/input/seatop_resize_floating.c b/sway/input/seatop_resize_floating.c
index df683026..bec86e33 100644
--- a/sway/input/seatop_resize_floating.c
+++ b/sway/input/seatop_resize_floating.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <limits.h>
 #include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_xcursor_manager.h>
@@ -21,7 +20,7 @@ struct seatop_resize_floating_event {
 static void handle_button(struct sway_seat *seat, uint32_t time_msec,
                struct wlr_input_device *device, uint32_t button,
-                enum wlr_button_state state) {
+                enum wl_pointer_button_state state) {
        struct seatop_resize_floating_event *e = seat->seatop_data;
        struct sway_container *con = e->con;
diff --git a/sway/input/seatop_resize_tiling.c b/sway/input/seatop_resize_tiling.c
index 869d11b5..15fd333b 100644
--- a/sway/input/seatop_resize_tiling.c
+++ b/sway/input/seatop_resize_tiling.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <wlr/types/wlr_cursor.h>
 #include <wlr/util/edges.h>
 #include "sway/commands.h"
@@ -46,7 +45,7 @@ static struct sway_container *container_get_resize_sibling(
 static void handle_button(struct sway_seat *seat, uint32_t time_msec,
                struct wlr_input_device *device, uint32_t button,
-                enum wlr_button_state state) {
+                enum wl_pointer_button_state state) {
        struct seatop_resize_tiling_event *e = seat->seatop_data;
        if (seat->cursor->pressed_button_count == 0) {
diff --git a/sway/input/switch.c b/sway/input/switch.c
index 831f4dbf..6aab4ad0 100644
--- a/sway/input/switch.c
+++ b/sway/input/switch.c
@@ -1,5 +1,6 @@
 #include "sway/config.h"
 #include "sway/input/switch.h"
+#include "sway/server.h"
 #include "log.h"
 struct sway_switch *sway_switch_create(struct sway_seat *seat,
diff --git a/sway/input/tablet.c b/sway/input/tablet.c
index 902cb7ed..ec1e4f68 100644
--- a/sway/input/tablet.c
+++ b/sway/input/tablet.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdlib.h>
 #include <wlr/config.h>
 #include <wlr/types/wlr_tablet_v2.h>
@@ -8,6 +7,7 @@
 #include "sway/input/cursor.h"
 #include "sway/input/seat.h"
 #include "sway/input/tablet.h"
+#include "sway/server.h"
 #if WLR_HAS_LIBINPUT_BACKEND
 #include <wlr/backend/libinput.h>
diff --git a/sway/input/text_input.c b/sway/input/text_input.c
index 58911c2d..580a9f54 100644
--- a/sway/input/text_input.c
+++ b/sway/input/text_input.c
@@ -2,7 +2,16 @@
 #include <stdlib.h>
 #include "log.h"
 #include "sway/input/seat.h"
+#include "sway/scene_descriptor.h"
+#include "sway/tree/root.h"
+#include "sway/tree/view.h"
+#include "sway/output.h"
 #include "sway/input/text_input.h"
+#include "sway/input/text_input_popup.h"
+#include "sway/layers.h"
+#include "sway/server.h"
+static void input_popup_update(struct sway_input_popup *popup);
 static struct sway_text_input *relay_get_focusable_text_input(
                struct sway_input_method_relay *relay) {
@@ -59,11 +68,13 @@ static void handle_im_keyboard_grab_destroy(struct wl_listener *listener, void *
        struct sway_input_method_relay *relay = wl_container_of(listener, relay,
                input_method_keyboard_grab_destroy);
        struct wlr_input_method_keyboard_grab_v2 *keyboard_grab = data;
+        struct wlr_seat *wlr_seat = keyboard_grab->input_method->seat;
        wl_list_remove(&relay->input_method_keyboard_grab_destroy.link);
        if (keyboard_grab->keyboard) {
                // send modifier state to original client
-                wlr_seat_keyboard_notify_modifiers(keyboard_grab->input_method->seat,
+                wlr_seat_set_keyboard(wlr_seat, keyboard_grab->keyboard);
+                wlr_seat_keyboard_notify_modifiers(wlr_seat,
                        &keyboard_grab->keyboard->modifiers);
        }
 }
@@ -102,6 +113,10 @@ static void handle_im_destroy(struct wl_listener *listener, void *data) {
                input_method_destroy);
        struct wlr_input_method_v2 *context = data;
        assert(context == relay->input_method);
+        wl_list_remove(&relay->input_method_commit.link);
+        wl_list_remove(&relay->input_method_grab_keyboard.link);
+        wl_list_remove(&relay->input_method_destroy.link);
+        wl_list_remove(&relay->input_method_new_popup_surface.link);
        relay->input_method = NULL;
        struct sway_text_input *text_input = relay_get_focused_text_input(relay);
        if (text_input) {
@@ -133,6 +148,11 @@ static void relay_send_im_state(struct sway_input_method_relay *relay,
                        input->current.content_type.hint,
                        input->current.content_type.purpose);
        }
+        struct sway_input_popup *popup;
+        wl_list_for_each(popup, &relay->input_popups, link) {
+                // send_text_input_rectangle is called in this function
+                input_popup_update(popup);
+        }
        wlr_input_method_v2_send_done(input_method);
        // TODO: pass intent, display popup size
 }
@@ -255,6 +275,211 @@ static void relay_handle_text_input(struct wl_listener *listener,
        sway_text_input_create(relay, wlr_text_input);
 }
+static void input_popup_update(struct sway_input_popup *popup) {
+        struct sway_text_input *text_input =
+                relay_get_focused_text_input(popup->relay);
+        if (text_input == NULL || text_input->input->focused_surface == NULL) {
+                return;
+        }
+        if (popup->scene_tree != NULL) {
+                wlr_scene_node_destroy(&popup->scene_tree->node);
+                popup->scene_tree = NULL;
+        }
+        if (popup->desc.relative != NULL) {
+                wlr_scene_node_destroy(popup->desc.relative);
+                popup->desc.relative = NULL;
+        }
+        popup->desc.view = NULL;
+        if (!popup->popup_surface->surface->mapped) {
+                return;
+        }
+        bool cursor_rect = text_input->input->current.features
+                & WLR_TEXT_INPUT_V3_FEATURE_CURSOR_RECTANGLE;
+        struct wlr_surface *focused_surface = text_input->input->focused_surface;
+        struct wlr_box cursor_area = text_input->input->current.cursor_rectangle;
+        struct wlr_box output_box;
+        struct wlr_box parent = {0};
+        struct wlr_layer_surface_v1 *layer_surface =
+                wlr_layer_surface_v1_try_from_wlr_surface(focused_surface);
+        struct wlr_scene_tree *relative_parent;
+        struct wlr_box geo = {0};
+        popup->scene_tree = wlr_scene_subsurface_tree_create(root->layers.popup, popup->popup_surface->surface);
+        if (layer_surface != NULL) {
+                struct sway_layer_surface *layer =
+                        layer_surface->data;
+                if (layer == NULL) {
+                        return;
+                }
+                relative_parent = layer->scene->tree;
+                struct wlr_output *output = layer->layer_surface->output;
+                wlr_output_layout_get_box(root->output_layout, output, &output_box);
+                int lx, ly;
+                wlr_scene_node_coords(&layer->tree->node, &lx, &ly);
+                parent.x = lx;
+                parent.y = ly;
+                popup->desc.view = NULL;
+        } else {
+                struct sway_view *view = view_from_wlr_surface(focused_surface);
+                relative_parent = view->scene_tree;
+                geo = view->geometry;
+                int lx, ly;
+                wlr_scene_node_coords(&view->scene_tree->node, &lx, &ly);
+                struct wlr_output *output = wlr_output_layout_output_at(root->output_layout,
+                        view->container->pending.content_x + view->geometry.x,
+                        view->container->pending.content_y + view->geometry.y);
+                wlr_output_layout_get_box(root->output_layout, output, &output_box);
+                parent.x = lx;
+                parent.y = ly;
+                parent.width = view->geometry.width;
+                parent.height = view->geometry.height;
+                popup->desc.view = view;
+        }
+        struct wlr_scene_tree *relative = wlr_scene_tree_create(relative_parent);
+        popup->desc.relative = &relative->node;
+        if (!scene_descriptor_assign(&popup->scene_tree->node,
+                        SWAY_SCENE_DESC_POPUP, &popup->desc)) {
+                wlr_scene_node_destroy(&popup->scene_tree->node);
+                popup->scene_tree = NULL;
+                return;
+        }
+        if (!cursor_rect) {
+                cursor_area.x = 0;
+                cursor_area.y = 0;
+                cursor_area.width = parent.width;
+                cursor_area.height = parent.height;
+        }
+        int popup_width = popup->popup_surface->surface->current.width;
+        int popup_height = popup->popup_surface->surface->current.height;
+        int x1 = parent.x + cursor_area.x;
+        int x2 = parent.x + cursor_area.x + cursor_area.width;
+        int y1 = parent.y + cursor_area.y;
+        int y2 = parent.y + cursor_area.y + cursor_area.height;
+        int x = x1;
+        int y = y2;
+        int available_right = output_box.x + output_box.width - x1;
+        int available_left = x2 - output_box.x;
+        if (available_right < popup_width && available_left > available_right) {
+                x = x2 - popup_width;
+        }
+        int available_down = output_box.y + output_box.height - y2;
+        int available_up = y1 - output_box.y;
+        if (available_down < popup_height && available_up > available_down) {
+                y = y1 - popup_height;
+        }
+        wlr_scene_node_set_position(&relative->node, x - parent.x - geo.x, y - parent.y - geo.y);
+        if (cursor_rect) {
+                struct wlr_box box = {
+                        .x = x1 - x,
+                        .y = y1 - y,
+                        .width = cursor_area.width,
+                        .height = cursor_area.height,
+                };
+                wlr_input_popup_surface_v2_send_text_input_rectangle(
+                        popup->popup_surface, &box);
+        }
+        wlr_scene_node_set_position(&popup->scene_tree->node, x - geo.x, y - geo.y);
+}
+static void input_popup_set_focus(struct sway_input_popup *popup,
+                struct wlr_surface *surface) {
+        wl_list_remove(&popup->focused_surface_unmap.link);
+        if (surface == NULL) {
+                wl_list_init(&popup->focused_surface_unmap.link);
+                input_popup_update(popup);
+                return;
+        }
+        struct wlr_layer_surface_v1 *layer_surface =
+                wlr_layer_surface_v1_try_from_wlr_surface(surface);
+        if (layer_surface != NULL) {
+                wl_signal_add(
+                        &layer_surface->surface->events.unmap, &popup->focused_surface_unmap);
+                input_popup_update(popup);
+                return;
+        }
+        struct sway_view *view = view_from_wlr_surface(surface);
+        wl_signal_add(&view->events.unmap, &popup->focused_surface_unmap);
+}
+static void handle_im_popup_destroy(struct wl_listener *listener, void *data) {
+        struct sway_input_popup *popup =
+                wl_container_of(listener, popup, popup_destroy);
+        wl_list_remove(&popup->focused_surface_unmap.link);
+        wl_list_remove(&popup->popup_surface_commit.link);
+        wl_list_remove(&popup->popup_destroy.link);
+        wl_list_remove(&popup->link);
+        free(popup);
+}
+static void handle_im_popup_surface_commit(struct wl_listener *listener,
+                void *data) {
+        struct sway_input_popup *popup =
+                wl_container_of(listener, popup, popup_surface_commit);
+        input_popup_update(popup);
+}
+static void handle_im_focused_surface_unmap(
+                struct wl_listener *listener, void *data) {
+        struct sway_input_popup *popup =
+                wl_container_of(listener, popup, focused_surface_unmap);
+        input_popup_update(popup);
+}
+static void handle_im_new_popup_surface(struct wl_listener *listener,
+                void *data) {
+        struct sway_input_method_relay *relay = wl_container_of(listener, relay,
+                input_method_new_popup_surface);
+        struct sway_input_popup *popup = calloc(1, sizeof(*popup));
+        popup->relay = relay;
+        popup->popup_surface = data;
+        popup->popup_surface->data = popup;
+        wl_signal_add(
+                &popup->popup_surface->events.destroy, &popup->popup_destroy);
+        popup->popup_destroy.notify = handle_im_popup_destroy;
+        wl_signal_add(&popup->popup_surface->surface->events.commit,
+                &popup->popup_surface_commit);
+        popup->popup_surface_commit.notify = handle_im_popup_surface_commit;
+        wl_list_init(&popup->focused_surface_unmap.link);
+        popup->focused_surface_unmap.notify = handle_im_focused_surface_unmap;
+        struct sway_text_input *text_input = relay_get_focused_text_input(relay);
+        if (text_input != NULL) {
+                input_popup_set_focus(popup, text_input->input->focused_surface);
+        } else {
+                input_popup_set_focus(popup, NULL);
+        }
+        wl_list_insert(&relay->input_popups, &popup->link);
+}
+static void text_input_send_enter(struct sway_text_input *text_input,
+                struct wlr_surface *surface) {
+        wlr_text_input_v3_send_enter(text_input->input, surface);
+        struct sway_input_popup *popup;
+        wl_list_for_each(popup, &text_input->relay->input_popups, link) {
+                input_popup_set_focus(popup, surface);
+        }
+}
 static void relay_handle_input_method(struct wl_listener *listener,
                void *data) {
        struct sway_input_method_relay *relay = wl_container_of(listener, relay,
@@ -280,10 +505,13 @@ static void relay_handle_input_method(struct wl_listener *listener,
        wl_signal_add(&relay->input_method->events.destroy,
                &relay->input_method_destroy);
        relay->input_method_destroy.notify = handle_im_destroy;
+        wl_signal_add(&relay->input_method->events.new_popup_surface,
+                &relay->input_method_new_popup_surface);
+        relay->input_method_new_popup_surface.notify = handle_im_new_popup_surface;
        struct sway_text_input *text_input = relay_get_focusable_text_input(relay);
        if (text_input) {
-                wlr_text_input_v3_send_enter(text_input->input,
+                text_input_send_enter(text_input,
                        text_input->pending_focused_surface);
                text_input_set_pending_focused_surface(text_input, NULL);
        }
@@ -293,6 +521,7 @@ void sway_input_method_relay_init(struct sway_seat *seat,
                struct sway_input_method_relay *relay) {
        relay->seat = seat;
        wl_list_init(&relay->text_inputs);
+        wl_list_init(&relay->input_popups);
        relay->text_input_new.notify = relay_handle_text_input;
        wl_signal_add(&server.text_input->events.text_input,
diff --git a/sway/ipc-json.c b/sway/ipc-json.c
index 58356d4e..1ee39124 100644
--- a/sway/ipc-json.c
+++ b/sway/ipc-json.c
@@ -11,6 +11,7 @@
 #include "log.h"
 #include "sway/config.h"
 #include "sway/ipc-json.h"
+#include "sway/server.h"
 #include "sway/tree/container.h"
 #include "sway/tree/view.h"
 #include "sway/tree/workspace.h"
@@ -154,7 +155,7 @@ static json_object *ipc_json_output_mode_description(
        return mode_object;
 }
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
 static const char *ipc_json_xwindow_type_description(struct sway_view *view) {
        struct wlr_xwayland_surface *surface = view->wlr_xwayland_surface;
        struct sway_xwayland *xwayland = &server.xwayland;
@@ -288,6 +289,8 @@ static json_object *ipc_json_create_node(int id, const char* type, char *name,
        json_object_object_add(object, "focus", focus);
        json_object_object_add(object, "fullscreen_mode", json_object_new_int(0));
        json_object_object_add(object, "sticky", json_object_new_boolean(false));
+        json_object_object_add(object, "floating", NULL);
+        json_object_object_add(object, "scratchpad_state", NULL);
        return object;
 }
@@ -631,7 +634,7 @@ static void ipc_json_describe_view(struct sway_container *c, json_object *object
                        json_object_new_string(ipc_json_content_type_description(content_type)));
        }
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
        if (c->view->type == SWAY_VIEW_XWAYLAND) {
                json_object_object_add(object, "window",
                                json_object_new_int(view_get_x11_window_id(c->view)));
@@ -675,7 +678,8 @@ static void ipc_json_describe_view(struct sway_container *c, json_object *object
 static void ipc_json_describe_container(struct sway_container *c, json_object *object) {
        json_object_object_add(object, "name",
                        c->title ? json_object_new_string(c->title) : NULL);
-        if (container_is_floating(c)) {
+        bool floating = container_is_floating(c);
+        if (floating) {
                json_object_object_add(object, "type",
                                json_object_new_string("floating_con"));
        }
@@ -693,9 +697,17 @@ static void ipc_json_describe_container(struct sway_container *c, json_object *o
        json_object_object_add(object, "urgent", json_object_new_boolean(urgent));
        json_object_object_add(object, "sticky", json_object_new_boolean(c->is_sticky));
+        // sway doesn't track the floating reason, so we can't use "auto_on" or "user_off"
+        json_object_object_add(object, "floating",
+                        json_object_new_string(floating ? "user_on" : "auto_off"));
        json_object_object_add(object, "fullscreen_mode",
                        json_object_new_int(c->pending.fullscreen_mode));
+        // sway doesn't track if window was resized in scratchpad, so we can't use "changed"
+        json_object_object_add(object, "scratchpad_state",
+                        json_object_new_string(!c->scratchpad ? "none" : "fresh"));
        struct sway_node *parent = node_get_parent(&c->node);
        struct wlr_box parent_box = {0, 0, 0, 0};
@@ -1086,10 +1098,6 @@ json_object *ipc_json_describe_input(struct sway_input_device *device) {
                json_object_new_string(device->identifier));
        json_object_object_add(object, "name",
                json_object_new_string(device->wlr_device->name));
-        json_object_object_add(object, "vendor",
-                json_object_new_int(device->wlr_device->vendor));
-        json_object_object_add(object, "product",
-                json_object_new_int(device->wlr_device->product));
        json_object_object_add(object, "type",
                json_object_new_string(
                        input_device_get_type(device)));
@@ -1143,6 +1151,10 @@ json_object *ipc_json_describe_input(struct sway_input_device *device) {
                libinput_dev = wlr_libinput_get_device_handle(device->wlr_device);
                json_object_object_add(object, "libinput",
                                describe_libinput_device(libinput_dev));
+                json_object_object_add(object, "vendor",
+                        json_object_new_int(libinput_device_get_id_vendor(libinput_dev)));
+                json_object_object_add(object, "product",
+                        json_object_new_int(libinput_device_get_id_product(libinput_dev)));
        }
 #endif
diff --git a/sway/ipc-server.c b/sway/ipc-server.c
index 9692a77f..7f353c0e 100644
--- a/sway/ipc-server.c
+++ b/sway/ipc-server.c
@@ -1,5 +1,4 @@
 // See https://i3wm.org/docs/ipc.html for protocol information
-#define _POSIX_C_SOURCE 200112L
 #include <linux/input-event-codes.h>
 #include <assert.h>
 #include <errno.h>
diff --git a/sway/lock.c b/sway/lock.c
index 8ad9c3f6..289e8ca4 100644
--- a/sway/lock.c
+++ b/sway/lock.c
@@ -1,6 +1,6 @@
-#define _POSIX_C_SOURCE 200809L
 #include <assert.h>
 #include <wlr/types/wlr_scene.h>
+#include <wlr/types/wlr_session_lock_v1.h>
 #include "log.h"
 #include "sway/input/cursor.h"
 #include "sway/input/keyboard.h"
diff --git a/sway/main.c b/sway/main.c
index 73254dc2..1c4939aa 100644
--- a/sway/main.c
+++ b/sway/main.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <getopt.h>
 #include <pango/pangocairo.h>
 #include <signal.h>
diff --git a/sway/meson.build b/sway/meson.build
index d937e425..a189fe9a 100644
--- a/sway/meson.build
+++ b/sway/meson.build
@@ -202,6 +202,7 @@ sway_sources = files(
        'commands/output/toggle.c',
        'commands/output/transform.c',
        'commands/output/unplug.c',
+        'commands/output/color_profile.c',
        'tree/arrange.c',
        'tree/container.c',
@@ -231,7 +232,7 @@ sway_deps = [
        xcb_icccm,
 ]
-if have_xwayland
+if wlroots_features['xwayland']
        sway_sources += 'desktop/xwayland.c'
 endif
diff --git a/sway/server.c b/sway/server.c
index cc20e89d..edbc1a4b 100644
--- a/sway/server.c
+++ b/sway/server.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <assert.h>
 #include <stdbool.h>
 #include <stdlib.h>
@@ -8,24 +7,32 @@
 #include <wlr/backend/headless.h>
 #include <wlr/backend/multi.h>
 #include <wlr/config.h>
+#include <wlr/render/allocator.h>
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_compositor.h>
 #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_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_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_output_management_v1.h>
+#include <wlr/types/wlr_output_power_management_v1.h>
 #include <wlr/types/wlr_pointer_constraints_v1.h>
+#include <wlr/types/wlr_presentation_time.h>
 #include <wlr/types/wlr_primary_selection_v1.h>
 #include <wlr/types/wlr_relative_pointer_v1.h>
 #include <wlr/types/wlr_screencopy_v1.h>
 #include <wlr/types/wlr_security_context_v1.h>
 #include <wlr/types/wlr_server_decoration.h>
+#include <wlr/types/wlr_session_lock_v1.h>
 #include <wlr/types/wlr_single_pixel_buffer_v1.h>
 #include <wlr/types/wlr_subcompositor.h>
 #include <wlr/types/wlr_tablet_v2.h>
@@ -49,7 +56,7 @@
 #include "sway/input/cursor.h"
 #include "sway/tree/root.h"
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
 #include <wlr/xwayland/shell.h>
 #include "sway/xwayland.h"
 #endif
@@ -58,8 +65,9 @@
 #include <wlr/types/wlr_drm_lease_v1.h>
 #endif
-#define SWAY_XDG_SHELL_VERSION 2
+#define SWAY_XDG_SHELL_VERSION 5
 #define SWAY_LAYER_SHELL_VERSION 4
+#define SWAY_FOREIGN_TOPLEVEL_LIST_VERSION 1
 bool allow_unsupported_gpu = false;
@@ -93,6 +101,7 @@ static bool is_privileged(const struct wl_global *global) {
                global == server.output_manager_v1->global ||
                global == server.output_power_manager_v1->global ||
                global == server.input_method->global ||
+                global == server.foreign_toplevel_list->global ||
                global == server.foreign_toplevel_manager->global ||
                global == server.data_control_manager_v1->global ||
                global == server.screencopy_manager_v1->global ||
@@ -103,12 +112,14 @@ static bool is_privileged(const struct wl_global *global) {
                global == server.session_lock.manager->global ||
                global == server.input->keyboard_shortcuts_inhibit->global ||
                global == server.input->virtual_keyboard->global ||
-                global == server.input->virtual_pointer->global;
+                global == server.input->virtual_pointer->global ||
+                global == server.input->transient_seat_manager->global ||
+                global == server.xdg_output_manager_v1->global;
 }
 static bool filter_global(const struct wl_client *client,
                const struct wl_global *global, void *data) {
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
        struct wlr_xwayland *xwayland = server.xwayland.wlr_xwayland;
        if (xwayland && global == xwayland->shell_v1->global) {
                return xwayland->server != NULL && client == xwayland->server->client;
@@ -163,6 +174,45 @@ static void detect_proprietary(struct wlr_backend *backend, void *data) {
        drmFreeVersion(version);
 }
+static void handle_renderer_lost(struct wl_listener *listener, void *data) {
+        struct sway_server *server = wl_container_of(listener, server, renderer_lost);
+        sway_log(SWAY_INFO, "Re-creating renderer after GPU reset");
+        struct wlr_renderer *renderer = wlr_renderer_autocreate(server->backend);
+        if (renderer == NULL) {
+                sway_log(SWAY_ERROR, "Unable to create renderer");
+                return;
+        }
+        struct wlr_allocator *allocator =
+                wlr_allocator_autocreate(server->backend, renderer);
+        if (allocator == NULL) {
+                sway_log(SWAY_ERROR, "Unable to create allocator");
+                wlr_renderer_destroy(renderer);
+                return;
+        }
+        struct wlr_renderer *old_renderer = server->renderer;
+        struct wlr_allocator *old_allocator = server->allocator;
+        server->renderer = renderer;
+        server->allocator = allocator;
+        wl_list_remove(&server->renderer_lost.link);
+        wl_signal_add(&server->renderer->events.lost, &server->renderer_lost);
+        wlr_compositor_set_renderer(server->compositor, renderer);
+        for (int i = 0; i < root->outputs->length; ++i) {
+                struct sway_output *output = root->outputs->items[i];
+                wlr_output_init_render(output->wlr_output,
+                        server->allocator, server->renderer);
+        }
+        wlr_allocator_destroy(old_allocator);
+        wlr_renderer_destroy(old_renderer);
+}
 bool server_init(struct sway_server *server) {
        sway_log(SWAY_DEBUG, "Initializing Wayland server");
        server->wl_display = wl_display_create();
@@ -186,15 +236,17 @@ bool server_init(struct sway_server *server) {
                return false;
        }
+        server->renderer_lost.notify = handle_renderer_lost;
+        wl_signal_add(&server->renderer->events.lost, &server->renderer_lost);
        wlr_renderer_init_wl_shm(server->renderer, server->wl_display);
-        if (wlr_renderer_get_dmabuf_texture_formats(server->renderer) != NULL) {
+        if (wlr_renderer_get_texture_formats(server->renderer, WLR_BUFFER_CAP_DMABUF) != NULL) {
                server->linux_dmabuf_v1 = wlr_linux_dmabuf_v1_create_with_renderer(
                        server->wl_display, 4, server->renderer);
-        }
+                if (debug.legacy_wl_drm) {
-        if (wlr_renderer_get_dmabuf_texture_formats(server->renderer) != NULL &&
+                        wlr_drm_create(server->wl_display, server->renderer);
-                        debug.legacy_wl_drm) {
+                }
-                wlr_drm_create(server->wl_display, server->renderer);
        }
        server->allocator = wlr_allocator_autocreate(server->backend,
@@ -224,7 +276,8 @@ bool server_init(struct sway_server *server) {
        wl_signal_add(&root->output_layout->events.change,
                &server->output_layout_change);
-        wlr_xdg_output_manager_v1_create(server->wl_display, root->output_layout);
+        server->xdg_output_manager_v1 =
+                wlr_xdg_output_manager_v1_create(server->wl_display, root->output_layout);
        server->idle_notifier_v1 = wlr_idle_notifier_v1_create(server->wl_display);
        sway_idle_inhibit_manager_v1_init();
@@ -289,6 +342,8 @@ bool server_init(struct sway_server *server) {
                &server->output_power_manager_set_mode);
        server->input_method = wlr_input_method_manager_v2_create(server->wl_display);
        server->text_input = wlr_text_input_manager_v3_create(server->wl_display);
+        server->foreign_toplevel_list =
+                wlr_ext_foreign_toplevel_list_v1_create(server->wl_display, SWAY_FOREIGN_TOPLEVEL_LIST_VERSION);
        server->foreign_toplevel_manager =
                wlr_foreign_toplevel_manager_v1_create(server->wl_display);
@@ -384,16 +439,17 @@ bool server_init(struct sway_server *server) {
 void server_fini(struct sway_server *server) {
        // TODO: free sway-specific resources
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
        wlr_xwayland_destroy(server->xwayland.wlr_xwayland);
 #endif
        wl_display_destroy_clients(server->wl_display);
+        wlr_backend_destroy(server->backend);
        wl_display_destroy(server->wl_display);
        list_free(server->dirty_nodes);
 }
 bool server_start(struct sway_server *server) {
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
        if (config->xwayland != XWAYLAND_MODE_DISABLED) {
                sway_log(SWAY_DEBUG, "Initializing Xwayland (lazy=%d)",
                                config->xwayland == XWAYLAND_MODE_LAZY);
diff --git a/sway/sway-ipc.7.scd b/sway/sway-ipc.7.scd
index f4a5ccff..2f697248 100644
--- a/sway/sway-ipc.7.scd
+++ b/sway/sway-ipc.7.scd
@@ -376,6 +376,12 @@ node and will have the following properties:
 :  integer
 :  (Only containers and views) The fullscreen mode of the node. 0 means none, 1 means
   full workspace, and 2 means global fullscreen
+|- floating
+:  string
+:  Floating state of container. Can be either "auto_off" or "user_on"
+|- scratchpad_state
+:  string
+:  Whether the window is in the scratchpad. Can be either "none" or "fresh"
 |- app_id
 :  string
 :  (Only views) For an xdg-shell view, the name of the application, if set.
@@ -1040,7 +1046,7 @@ An object with a single string property containing the contents of the config
 *Example Reply:*
 ```
 {
-        "config": "set $mod Mod4\nbindsym $mod+q exit\n"
+        "config": "set $mod Mod4\\nbindsym $mod+q exit\\n"
 }
 ```
diff --git a/sway/sway-output.5.scd b/sway/sway-output.5.scd
index 028cb7ab..6d7c0860 100644
--- a/sway/sway-output.5.scd
+++ b/sway/sway-output.5.scd
@@ -72,13 +72,11 @@ must be separated by one space. For example:
 *output* <name> scale <factor>
        Scales the specified output by the specified scale _factor_. An integer is
-        recommended, but fractional values are also supported. If a fractional
+        recommended, but fractional values are also supported. You may be better
-        value are specified, be warned that it is not possible to faithfully
+        served by setting an integer scale factor and adjusting the font size of
-        represent the contents of your windows - they will be rendered at the next
+        your applications to taste. HiDPI isn't supported with Xwayland clients
-        highest integer scale factor and downscaled. You may be better served by
+        (windows will blur). A fractional scale may be slightly adjusted to match
-        setting an integer scale factor and adjusting the font size of your
+        requirements of the protocol.
-        applications to taste. HiDPI isn't supported with Xwayland clients (windows
-        will blur).
 *output* <name> scale_filter linear|nearest|smart
        Indicates how to scale application buffers that are rendered at a scale
@@ -180,6 +178,18 @@ must be separated by one space. For example:
        updated to work with different bit depths. This command is experimental,
        and may be removed or changed in the future.
+*output* <name> color_profile srgb|[icc <file>]
+        Sets the color profile for an output. The default is _srgb_. <file> should be a
+        path to a display ICC profile.
+        Not all renderers support this feature; currently it only works with the
+        the Vulkan renderer. Even where supported, the application of the color
+        profile may be inaccurate.
+        This command is experimental, and may be removed or changed in the future. It
+        may have no effect or produce unexpected output when used together with future
+        HDR support features.
 # SEE ALSO
 *sway*(5) *sway-input*(5)
diff --git a/sway/sway.5.scd b/sway/sway.5.scd
index 7e58b528..9f823947 100644
--- a/sway/sway.5.scd
+++ b/sway/sway.5.scd
@@ -400,6 +400,12 @@ runtime.
        only be available for that group. By default, if you overwrite a binding,
        swaynag will give you a warning. To silence this, use the _--no-warn_ flag.
+        For specifying modifier keys, you can use the XKB modifier names _Shift_,
+        _Lock_ (for Caps Lock), _Control_, _Mod1_ (for Alt), _Mod2_ (for Num Lock),
+        _Mod3_ (for XKB modifier Mod3), _Mod4_ (for the Logo key), and _Mod5_ (for
+        AltGr). In addition, you can use the aliases  _Ctrl_ (for Control), _Alt_
+        (for Alt), and _Super_ (for the Logo key).
        Unless the flag _--locked_ is set, the command will not be run when a
        screen locking program is active. If there is a matching binding with
        and without _--locked_, the one with will be preferred when locked and the
diff --git a/sway/sway_text_node.c b/sway/sway_text_node.c
index b9a77d94..4b7ee999 100644
--- a/sway/sway_text_node.c
+++ b/sway/sway_text_node.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <drm_fourcc.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -58,11 +57,11 @@ struct text_buffer {
 };
 static int get_text_width(struct sway_text_node *props) {
-        if (props->max_width) {
+        int width = props->width;
-                return MIN(props->max_width, props->width);
+        if (props->max_width >= 0) {
+                width = MIN(width, props->max_width);
        }
+        return MAX(width, 0);
-        return props->width;
 }
 static void update_source_box(struct text_buffer *buffer) {
@@ -82,6 +81,11 @@ static void render_backing_buffer(struct text_buffer *buffer) {
                return;
        }
+        if (buffer->props.max_width == 0) {
+                wlr_scene_buffer_set_buffer(buffer->buffer_node, NULL);
+                return;
+        }
        float scale = buffer->scale;
        int width = ceil(buffer->props.width * scale);
        int height = ceil(buffer->props.height * scale);
@@ -237,6 +241,7 @@ struct sway_text_node *sway_text_node_create(struct wlr_scene_tree *parent,
        buffer->buffer_node = node;
        buffer->props.node = &node->node;
+        buffer->props.max_width = -1;
        buffer->text = strdup(text);
        if (!buffer->text) {
                free(buffer);
diff --git a/sway/swaynag.c b/sway/swaynag.c
index 6031174d..bc5e23ea 100644
--- a/sway/swaynag.c
+++ b/sway/swaynag.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <signal.h>
 #include <stdbool.h>
 #include <stdlib.h>
diff --git a/sway/tree/arrange.c b/sway/tree/arrange.c
index af925d05..d4003fe6 100644
--- a/sway/tree/arrange.c
+++ b/sway/tree/arrange.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <ctype.h>
 #include <stdbool.h>
 #include <stdlib.h>
diff --git a/sway/tree/container.c b/sway/tree/container.c
index 30cb97ba..80ef34fe 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -1,9 +1,9 @@
-#define _POSIX_C_SOURCE 200809L
 #include <assert.h>
 #include <drm_fourcc.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <wayland-server-core.h>
+#include <wlr/types/wlr_foreign_toplevel_management_v1.h>
 #include <wlr/types/wlr_linux_dmabuf_v1.h>
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_subcompositor.h>
@@ -352,6 +352,8 @@ void container_arrange_title_bar(struct sway_container *con) {
                int alloc_width = MIN((int)node->width,
                        width - h_padding - config->titlebar_h_padding);
+                alloc_width = MAX(alloc_width, 0);
                sway_text_node_set_max_width(node, alloc_width);
                wlr_scene_node_set_position(node->node,
                        h_padding, (height - node->height) >> 1);
@@ -376,6 +378,8 @@ void container_arrange_title_bar(struct sway_container *con) {
                int alloc_width = MIN((int) node->width,
                        width - h_padding - config->titlebar_h_padding);
+                alloc_width = MAX(alloc_width, 0);
                sway_text_node_set_max_width(node, alloc_width);
                wlr_scene_node_set_position(node->node,
                        h_padding, (height - node->height) >> 1);
diff --git a/sway/tree/node.c b/sway/tree/node.c
index 213cf0a6..7aaf9762 100644
--- a/sway/tree/node.c
+++ b/sway/tree/node.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include "sway/output.h"
 #include "sway/server.h"
 #include "sway/tree/container.h"
diff --git a/sway/tree/output.c b/sway/tree/output.c
index cd7bf0c2..6c8dd6dc 100644
--- a/sway/tree/output.c
+++ b/sway/tree/output.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <assert.h>
 #include <ctype.h>
 #include <string.h>
@@ -280,6 +279,7 @@ void output_destroy(struct sway_output *output) {
        list_free(output->workspaces);
        list_free(output->current.workspaces);
        wl_event_source_remove(output->repaint_timer);
+        wlr_color_transform_unref(output->color_transform);
        free(output);
 }
diff --git a/sway/tree/root.c b/sway/tree/root.c
index e9cea5e2..20fcfa59 100644
--- a/sway/tree/root.c
+++ b/sway/tree/root.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
@@ -54,7 +53,7 @@ struct sway_root *root_create(struct wl_display *wl_display) {
        root->layers.shell_top = alloc_scene_tree(root->layer_tree, &failed);
        root->layers.fullscreen = alloc_scene_tree(root->layer_tree, &failed);
        root->layers.fullscreen_global = alloc_scene_tree(root->layer_tree, &failed);
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
        root->layers.unmanaged = alloc_scene_tree(root->layer_tree, &failed);
 #endif
        root->layers.shell_overlay = alloc_scene_tree(root->layer_tree, &failed);
diff --git a/sway/tree/view.c b/sway/tree/view.c
index d6984178..086a8ff3 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -1,15 +1,16 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdlib.h>
 #include <strings.h>
 #include <wayland-server-core.h>
+#include <wlr/config.h>
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_buffer.h>
+#include <wlr/types/wlr_ext_foreign_toplevel_list_v1.h>
+#include <wlr/types/wlr_foreign_toplevel_management_v1.h>
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_server_decoration.h>
 #include <wlr/types/wlr_subcompositor.h>
 #include <wlr/types/wlr_xdg_decoration_v1.h>
-#include "config.h"
+#if WLR_HAS_XWAYLAND
-#if HAVE_XWAYLAND
 #include <wlr/xwayland.h>
 #endif
 #include "list.h"
@@ -125,7 +126,7 @@ const char *view_get_instance(struct sway_view *view) {
        }
        return NULL;
 }
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
 uint32_t view_get_x11_window_id(struct sway_view *view) {
        if (view->impl->get_int_prop) {
                return view->impl->get_int_prop(view, VIEW_PROP_X11_WINDOW_ID);
@@ -158,7 +159,7 @@ const char *view_get_shell(struct sway_view *view) {
        switch(view->type) {
        case SWAY_VIEW_XDG_SHELL:
                return "xdg_shell";
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
        case SWAY_VIEW_XWAYLAND:
                return "xwayland";
 #endif
@@ -172,9 +173,9 @@ void view_get_constraints(struct sway_view *view, double *min_width,
                view->impl->get_constraints(view,
                                min_width, max_width, min_height, max_height);
        } else {
-                *min_width = DBL_MIN;
+                *min_width = 1;
                *max_width = DBL_MAX;
-                *min_height = DBL_MIN;
+                *min_height = 1;
                *max_height = DBL_MAX;
        }
 }
@@ -364,8 +365,8 @@ void view_autoconfigure(struct sway_view *view) {
        con->pending.content_x = x;
        con->pending.content_y = y;
-        con->pending.content_width = width;
+        con->pending.content_width = fmax(width, 1);
-        con->pending.content_height = height;
+        con->pending.content_height = fmax(height, 1);
 }
 void view_set_activated(struct sway_view *view, bool activated) {
@@ -410,6 +411,12 @@ void view_request_activate(struct sway_view *view, struct sway_seat *seat) {
        transaction_commit_dirty();
 }
+void view_request_urgent(struct sway_view *view) {
+        if (config->focus_on_window_activation != FOWA_NONE) {
+                view_set_urgent(view, true);
+        }
+}
 void view_set_csd_from_server(struct sway_view *view, bool enabled) {
        sway_log(SWAY_DEBUG, "Telling view %p to set CSD to %i", view, enabled);
        if (view->xdg_decoration) {
@@ -492,7 +499,7 @@ void view_execute_criteria(struct sway_view *view) {
 static void view_populate_pid(struct sway_view *view) {
        pid_t pid;
        switch (view->type) {
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
        case SWAY_VIEW_XWAYLAND:;
                struct wlr_xwayland_surface *surf =
                        wlr_xwayland_surface_try_from_wlr_surface(view->surface);
@@ -582,6 +589,14 @@ static struct sway_workspace *select_workspace(struct sway_view *view) {
        return NULL;
 }
+static void update_ext_foreign_toplevel(struct sway_view *view) {
+        struct wlr_ext_foreign_toplevel_handle_v1_state toplevel_state = {
+                .app_id = view_get_app_id(view),
+                .title = view_get_title(view),
+        };
+        wlr_ext_foreign_toplevel_handle_v1_update_state(view->ext_foreign_toplevel, &toplevel_state);
+}
 static bool should_focus(struct sway_view *view) {
        struct sway_seat *seat = input_manager_current_seat();
        struct sway_container *prev_con = seat_get_focused_container(seat);
@@ -751,6 +766,13 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface,
                }
        }
+        struct wlr_ext_foreign_toplevel_handle_v1_state foreign_toplevel_state = {
+                .app_id = view_get_app_id(view),
+                .title = view_get_title(view),
+        };
+        view->ext_foreign_toplevel =
+                wlr_ext_foreign_toplevel_handle_v1_create(server.foreign_toplevel_list, &foreign_toplevel_state);
        view->foreign_toplevel =
                wlr_foreign_toplevel_handle_v1_create(server.foreign_toplevel_manager);
        view->foreign_activate_request.notify = handle_foreign_activate_request;
@@ -816,7 +838,7 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface,
        bool set_focus = should_focus(view);
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
        struct wlr_xwayland_surface *xsurface;
        if ((xsurface = wlr_xwayland_surface_try_from_wlr_surface(wlr_surface))) {
                set_focus &= wlr_xwayland_icccm_input_model(xsurface) !=
@@ -828,6 +850,10 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface,
                input_manager_set_focus(&view->container->node);
        }
+        if (view->ext_foreign_toplevel) {
+                update_ext_foreign_toplevel(view);
+        }
        const char *app_id;
        const char *class;
        if ((app_id = view_get_app_id(view)) != NULL) {
@@ -847,6 +873,11 @@ void view_unmap(struct sway_view *view) {
                view->urgent_timer = NULL;
        }
+        if (view->ext_foreign_toplevel) {
+                wlr_ext_foreign_toplevel_handle_v1_destroy(view->ext_foreign_toplevel);
+                view->ext_foreign_toplevel = NULL;
+        }
        if (view->foreign_toplevel) {
                wlr_foreign_toplevel_handle_v1_destroy(view->foreign_toplevel);
                view->foreign_toplevel = NULL;
@@ -896,11 +927,14 @@ void view_update_size(struct sway_view *view) {
 void view_center_and_clip_surface(struct sway_view *view) {
        struct sway_container *con = view->container;
+        bool clip_to_geometry = true;
        if (container_is_floating(con)) {
                // We always center the current coordinates rather than the next, as the
                // geometry immediately affects the currently active rendering.
                int x = (int) fmax(0, (con->current.content_width - view->geometry.width) / 2);
                int y = (int) fmax(0, (con->current.content_height - view->geometry.height) / 2);
+                clip_to_geometry = !view->using_csd;
                wlr_scene_node_set_position(&view->content_tree->node, x, y);
        } else {
@@ -909,12 +943,16 @@ void view_center_and_clip_surface(struct sway_view *view) {
        // only make sure to clip the content if there is content to clip
        if (!wl_list_empty(&con->view->content_tree->children)) {
-                wlr_scene_subsurface_tree_set_clip(&con->view->content_tree->node, &(struct wlr_box){
+                struct wlr_box clip = {0};
-                        .x = con->view->geometry.x,
+                if (clip_to_geometry) {
-                        .y = con->view->geometry.y,
+                        clip = (struct wlr_box){
-                        .width = con->current.content_width,
+                                .x = con->view->geometry.x,
-                        .height = con->current.content_height,
+                                .y = con->view->geometry.y,
-                });
+                                .width = con->current.content_width,
+                                .height = con->current.content_height,
+                        };
+                }
+                wlr_scene_subsurface_tree_set_clip(&con->view->content_tree->node, &clip);
        }
 }
@@ -923,7 +961,7 @@ struct sway_view *view_from_wlr_surface(struct wlr_surface *wlr_surface) {
        if ((xdg_surface = wlr_xdg_surface_try_from_wlr_surface(wlr_surface))) {
                return view_from_wlr_xdg_surface(xdg_surface);
        }
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
        struct wlr_xwayland_surface *xsurface;
        if ((xsurface = wlr_xwayland_surface_try_from_wlr_surface(wlr_surface))) {
                return view_from_wlr_xwayland_surface(xsurface);
@@ -1014,6 +1052,18 @@ static size_t parse_title_format(struct sway_view *view, char *buffer) {
        return len;
 }
+void view_update_app_id(struct sway_view *view) {
+        const char *app_id = view_get_app_id(view);
+        if (view->foreign_toplevel && app_id) {
+                wlr_foreign_toplevel_handle_v1_set_app_id(view->foreign_toplevel, app_id);
+        }
+        if (view->ext_foreign_toplevel) {
+                update_ext_foreign_toplevel(view);
+        }
+}
 void view_update_title(struct sway_view *view, bool force) {
        const char *title = view_get_title(view);
@@ -1060,6 +1110,10 @@ void view_update_title(struct sway_view *view, bool force) {
        if (view->foreign_toplevel && title) {
                wlr_foreign_toplevel_handle_v1_set_title(view->foreign_toplevel, title);
        }
+        if (view->ext_foreign_toplevel) {
+                update_ext_foreign_toplevel(view);
+        }
 }
 bool view_is_visible(struct sway_view *view) {
@@ -1131,7 +1185,7 @@ void view_set_urgent(struct sway_view *view, bool enable) {
        ipc_event_window(view->container, "urgent");
-        if (!container_is_scratchpad_hidden(view->container)) {
+        if (!container_is_scratchpad_hidden_or_child(view->container)) {
                workspace_detect_urgent(view->container->pending.workspace);
        }
 }
diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c
index 40d33435..f8709a4c 100644
--- a/sway/tree/workspace.c
+++ b/sway/tree/workspace.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809
 #include <ctype.h>
 #include <limits.h>
 #include <stdbool.h>
@@ -11,6 +10,7 @@
 #include "sway/input/seat.h"
 #include "sway/ipc-server.h"
 #include "sway/output.h"
+#include "sway/server.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/container.h"
 #include "sway/tree/node.h"
@@ -708,6 +708,11 @@ void workspace_for_each_container(struct sway_workspace *ws,
 struct sway_container *workspace_find_container(struct sway_workspace *ws,
                bool (*test)(struct sway_container *con, void *data), void *data) {
        struct sway_container *result = NULL;
+    if (ws == NULL){
+        sway_log(SWAY_ERROR, "Cannot find container with no workspace.");
+        return NULL;
+    }
        // Tiling
        for (int i = 0; i < ws->tiling->length; ++i) {
                struct sway_container *child = ws->tiling->items[i];
diff --git a/sway/xdg_activation_v1.c b/sway/xdg_activation_v1.c
index c26ee19a..b7c80dd4 100644
--- a/sway/xdg_activation_v1.c
+++ b/sway/xdg_activation_v1.c
@@ -1,4 +1,5 @@
 #include <wlr/types/wlr_xdg_activation_v1.h>
+#include <wlr/types/wlr_xdg_shell.h>
 #include "sway/desktop/launcher.h"
 #include "sway/tree/view.h"
 #include "sway/tree/workspace.h"
@@ -17,11 +18,15 @@ void xdg_activation_v1_handle_request_activate(struct wl_listener *listener,
                return;
        }
+        struct launcher_ctx *ctx = event->token->data;
+        if (ctx == NULL) {
+                return;
+        }
        if (!xdg_surface->surface->mapped) {
                // This is a startup notification. If we are tracking it, the data
                // field is a launcher_ctx.
-                struct launcher_ctx *ctx = event->token->data;
+                if (ctx->activated) {
-                if (!ctx || ctx->activated) {
                        // This ctx has already been activated and cannot be used again
                        // for a startup notification. It will be destroyed
                        return;
@@ -32,9 +37,19 @@ void xdg_activation_v1_handle_request_activate(struct wl_listener *listener,
                return;
        }
-        struct wlr_seat *wlr_seat = event->token->seat;
+        // This is an activation request. If this context is internal we have ctx->seat.
-        struct sway_seat *seat = wlr_seat ? wlr_seat->data : NULL;
+        struct sway_seat *seat = ctx->seat;
-        view_request_activate(view, seat);
+        if (!seat) {
+                // Otherwise, use the seat indicated by the launcher client in set_serial
+                seat = ctx->token->seat ? ctx->token->seat->data : NULL;
+        }
+        if (seat && ctx->had_focused_surface) {
+                view_request_activate(view, seat);
+        } else {
+                // The token is valid, but cannot be used to activate a window
+                view_request_urgent(view);
+        }
 }
 void xdg_activation_v1_handle_new_token(struct wl_listener *listener, void *data) {