41 files changed, 132 insertions, 73 deletions

diff --git a/.builds/alpine.yml b/.builds/alpine.yml
index 59df7737..055e5ffa 100644
--- a/.builds/alpine.yml
+++ b/.builds/alpine.yml
@@ -38,9 +38,14 @@ tasks:
       cd sway
       ninja -C build
   - build-no-xwayland: |
-      cd sway
+      cd wlroots
       meson configure build -Dxwayland=disabled
       ninja -C build
+      sudo ninja -C build install
+
+      cd ../sway
+      meson configure build --clearcache
+      ninja -C build
   - build-static: |
       cd sway
       mkdir subprojects
diff --git a/include/sway/criteria.h b/include/sway/criteria.h
index 8da345ea..ae546821 100644
--- a/include/sway/criteria.h
+++ b/include/sway/criteria.h
@@ -7,6 +7,10 @@
 #include "list.h"
 #include "tree/view.h"
 
+#if WLR_HAS_XWAYLAND
+#include "sway/xwayland.h"
+#endif
+
 enum criteria_type {
         CT_COMMAND                 = 1 << 0,
         CT_ASSIGN_OUTPUT           = 1 << 1,
@@ -36,7 +40,7 @@ struct criteria {
         struct pattern *app_id;
         struct pattern *con_mark;
         uint32_t con_id; // internal ID
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
         struct pattern *class;
         uint32_t id; // X11 window ID
         struct pattern *instance;
diff --git a/include/sway/input/input-manager.h b/include/sway/input/input-manager.h
index 45c75199..b014e18f 100644
--- a/include/sway/input/input-manager.h
+++ b/include/sway/input/input-manager.h
@@ -5,10 +5,11 @@
 #include <wlr/types/wlr_virtual_keyboard_v1.h>
 #include <wlr/types/wlr_virtual_pointer_v1.h>
 #include <wlr/types/wlr_transient_seat_v1.h>
-#include "sway/server.h"
 #include "sway/config.h"
 #include "list.h"
 
+struct sway_server;
+
 struct sway_input_device {
         char *identifier;
         struct wlr_input_device *wlr_device;
diff --git a/include/sway/server.h b/include/sway/server.h
index c71851f6..3a63df34 100644
--- a/include/sway/server.h
+++ b/include/sway/server.h
@@ -5,7 +5,7 @@
 #include "config.h"
 #include "list.h"
 #include "sway/desktop/idle_inhibit_v1.h"
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
 #include "sway/xwayland.h"
 #endif
 
@@ -59,7 +59,7 @@ struct sway_server {
 
         struct wlr_tablet_manager_v2 *tablet_v2;
 
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
         struct sway_xwayland xwayland;
         struct wl_listener xwayland_surface;
         struct wl_listener xwayland_ready;
@@ -81,6 +81,8 @@ struct sway_server {
         struct wlr_pointer_constraints_v1 *pointer_constraints;
         struct wl_listener pointer_constraint;
 
+        struct wlr_xdg_output_manager_v1 *xdg_output_manager_v1;
+
         struct wlr_output_manager_v1 *output_manager_v1;
         struct wl_listener output_manager_apply;
         struct wl_listener output_manager_test;
@@ -165,7 +167,7 @@ void sway_session_lock_add_output(struct sway_session_lock *lock,
 bool sway_session_lock_has_surface(struct sway_session_lock *lock,
         struct wlr_surface *surface);
 void handle_xdg_shell_toplevel(struct wl_listener *listener, void *data);
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
 void handle_xwayland_surface(struct wl_listener *listener, void *data);
 #endif
 void handle_server_decoration(struct wl_listener *listener, void *data);
diff --git a/include/sway/tree/root.h b/include/sway/tree/root.h
index 15df0f55..7de0abcd 100644
--- a/include/sway/tree/root.h
+++ b/include/sway/tree/root.h
@@ -2,12 +2,12 @@
 #define _SWAY_ROOT_H
 #include <wayland-server-core.h>
 #include <wayland-util.h>
+#include <wlr/config.h>
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_scene.h>
 #include <wlr/render/wlr_texture.h>
 #include "sway/tree/container.h"
 #include "sway/tree/node.h"
-#include "config.h"
 #include "list.h"
 
 extern struct sway_root *root;
@@ -47,7 +47,7 @@ struct sway_root {
                 struct wlr_scene_tree *shell_top;
                 struct wlr_scene_tree *fullscreen;
                 struct wlr_scene_tree *fullscreen_global;
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
                 struct wlr_scene_tree *unmanaged;
 #endif
                 struct wlr_scene_tree *shell_overlay;
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index 7faacdcc..3ae8cf22 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -1,10 +1,11 @@
 #ifndef _SWAY_VIEW_H
 #define _SWAY_VIEW_H
 #include <wayland-server-core.h>
+#include <wlr/config.h>
 #include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_scene.h>
 #include "sway/config.h"
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
 #include <wlr/xwayland.h>
 #endif
 #include "sway/input/input-manager.h"
@@ -15,7 +16,7 @@ struct sway_xdg_decoration;
 
 enum sway_view_type {
         SWAY_VIEW_XDG_SHELL,
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
         SWAY_VIEW_XWAYLAND,
 #endif
 };
@@ -27,7 +28,7 @@ enum sway_view_prop {
         VIEW_PROP_INSTANCE,
         VIEW_PROP_WINDOW_TYPE,
         VIEW_PROP_WINDOW_ROLE,
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
         VIEW_PROP_X11_WINDOW_ID,
         VIEW_PROP_X11_PARENT_ID,
 #endif
@@ -98,7 +99,7 @@ struct sway_view {
 
         union {
                 struct wlr_xdg_toplevel *wlr_xdg_toplevel;
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
                 struct wlr_xwayland_surface *wlr_xwayland_surface;
 #endif
         };
@@ -127,7 +128,7 @@ struct sway_xdg_shell_view {
         struct wl_listener unmap;
         struct wl_listener destroy;
 };
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
 struct sway_xwayland_view {
         struct sway_view view;
 
@@ -293,7 +294,7 @@ void view_center_and_clip_surface(struct sway_view *view);
 
 struct sway_view *view_from_wlr_xdg_surface(
         struct wlr_xdg_surface *xdg_surface);
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
 struct sway_view *view_from_wlr_xwayland_surface(
         struct wlr_xwayland_surface *xsurface);
 #endif
diff --git a/meson.build b/meson.build
index 1043e4ba..eb66506a 100644
--- a/meson.build
+++ b/meson.build
@@ -45,7 +45,7 @@ subproject(
         required: false,
         version: wlroots_version,
 )
-wlroots = dependency('wlroots', version: wlroots_version)
+wlroots = dependency('wlroots-0.18', version: wlroots_version, fallback: 'wlroots')
 wlroots_features = {
         'xwayland': false,
         'libinput_backend': false,
@@ -57,10 +57,6 @@ foreach name, _ : wlroots_features
         wlroots_features += { name: have }
 endforeach
 
-if get_option('xwayland').enabled() and not wlroots_features['xwayland']
-        error('Cannot enable Xwayland in sway: wlroots has been built without Xwayland support')
-endif
-
 null_dep = dependency('', required: false)
 
 jsonc = dependency('json-c', version: '>=0.13')
@@ -68,7 +64,7 @@ pcre2 = dependency('libpcre2-8')
 wayland_server = dependency('wayland-server', version: '>=1.21.0')
 wayland_client = dependency('wayland-client')
 wayland_cursor = dependency('wayland-cursor')
-wayland_protos = dependency('wayland-protocols', version: '>=1.24')
+wayland_protos = dependency('wayland-protocols', version: '>=1.24', default_options: ['tests=false'])
 xkbcommon = dependency('xkbcommon', version: '>=1.5.0')
 cairo = dependency('cairo')
 pango = dependency('pango')
@@ -77,16 +73,14 @@ gdk_pixbuf = dependency('gdk-pixbuf-2.0', required: get_option('gdk-pixbuf'))
 pixman = dependency('pixman-1')
 libevdev = dependency('libevdev')
 libinput = wlroots_features['libinput_backend'] ? dependency('libinput', version: '>=1.21.0') : null_dep
-xcb = dependency('xcb', required: get_option('xwayland'))
+xcb = wlroots_features['xwayland'] ? dependency('xcb') : null_dep
 drm = dependency('libdrm')
 libudev = wlroots_features['libinput_backend'] ? dependency('libudev') : null_dep
 math = cc.find_library('m')
 rt = cc.find_library('rt')
-xcb_icccm = dependency('xcb-icccm', required: get_option('xwayland'))
+xcb_icccm = wlroots_features['xwayland'] ? dependency('xcb-icccm') : null_dep
 threads = dependency('threads') # for pthread_setschedparam
 
-have_xwayland = xcb.found() and xcb_icccm.found() and wlroots_features['xwayland']
-
 if get_option('sd-bus-provider') == 'auto'
         if not get_option('tray').disabled()
                 assert(get_option('auto_features').auto(), 'sd-bus-provider must not be set to auto since auto_features != auto')
@@ -110,7 +104,6 @@ have_tray = (not get_option('tray').disabled()) and tray_deps_found
 
 conf_data = configuration_data()
 
-conf_data.set10('HAVE_XWAYLAND', have_xwayland)
 conf_data.set10('HAVE_GDK_PIXBUF', gdk_pixbuf.found())
 conf_data.set10('HAVE_LIBSYSTEMD', sdbus.found() and sdbus.name() == 'libsystemd')
 conf_data.set10('HAVE_LIBELOGIND', sdbus.found() and sdbus.name() == 'libelogind')
@@ -271,7 +264,6 @@ endif
 subdir('completions')
 
 summary({
-        'xwayland': have_xwayland,
         'gdk-pixbuf': gdk_pixbuf.found(),
         'tray': have_tray,
         'man-pages': scdoc.found(),
diff --git a/meson_options.txt b/meson_options.txt
index 8d0d6509..506ecc9a 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -4,7 +4,6 @@ option('bash-completions', type: 'boolean', value: true, description: 'Install b
 option('fish-completions', type: 'boolean', value: true, description: 'Install fish shell completions.')
 option('swaybar', type: 'boolean', value: true, description: 'Enable support for swaybar')
 option('swaynag', type: 'boolean', value: true, description: 'Enable support for swaynag')
-option('xwayland', type: 'feature', value: 'auto', description: 'Enable support for X11 applications')
 option('tray', type: 'feature', value: 'auto', description: 'Enable support for swaybar tray')
 option('gdk-pixbuf', type: 'feature', value: 'auto', description: 'Enable support for more image formats in swaybar tray')
 option('man-pages', type: 'feature', value: 'auto', description: 'Generate and install man pages')
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/xkb_switch_layout.c b/sway/commands/input/xkb_switch_layout.c
index ecac8e6c..8d600fca 100644
--- a/sway/commands/input/xkb_switch_layout.c
+++ b/sway/commands/input/xkb_switch_layout.c
@@ -3,6 +3,7 @@
 #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/move.c b/sway/commands/move.c
index 8addf26e..ff656cfb 100644
--- a/sway/commands/move.c
+++ b/sway/commands/move.c
@@ -11,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"
diff --git a/sway/commands/seat/cursor.c b/sway/commands/seat/cursor.c
index df7c379d..434e6bbb 100644
--- a/sway/commands/seat/cursor.c
+++ b/sway/commands/seat/cursor.c
@@ -5,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);
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/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/swap.c b/sway/commands/swap.c
index e142eede..c0b0d0b9 100644
--- a/sway/commands/swap.c
+++ b/sway/commands/swap.c
@@ -18,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
@@ -53,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/workspace.c b/sway/commands/workspace.c
index a14ebb20..37a201b4 100644
--- a/sway/commands/workspace.c
+++ b/sway/commands/workspace.c
@@ -157,6 +157,10 @@ struct cmd_results *cmd_workspace(int argc, char **argv) {
                         return cmd_results_new(CMD_FAILURE,
                                         "Unable to allocate workspace output");
                 }
+                if (output_location + 1 < argc) {
+                        list_free_items_and_destroy(wsc->outputs);
+                        wsc->outputs = create_list();
+                }
                 for (int i = output_location + 1; i < argc; ++i) {
                         list_add(wsc->outputs, strdup(argv[i]));
                 }
diff --git a/sway/commands/xwayland.c b/sway/commands/xwayland.c
index 584a8e3a..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;
diff --git a/sway/config.c b/sway/config.c
index f9131e0f..5058efcc 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -23,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"
diff --git a/sway/config/bar.c b/sway/config/bar.c
index 908b2865..ecefb61a 100644
--- a/sway/config/bar.c
+++ b/sway/config/bar.c
@@ -12,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 de3b21ed..613270df 100644
--- a/sway/config/input.c
+++ b/sway/config/input.c
@@ -3,6 +3,7 @@
 #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 fb1956df..9a447388 100644
--- a/sway/config/output.c
+++ b/sway/config/output.c
@@ -13,6 +13,7 @@
 #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"
@@ -448,7 +449,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);
         }
 
diff --git a/sway/criteria.c b/sway/criteria.c
index e16b4fa8..2b7290c0 100644
--- a/sway/criteria.c
+++ b/sway/criteria.c
@@ -7,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"
@@ -22,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
@@ -90,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);
@@ -110,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;
@@ -251,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) {
@@ -428,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;
@@ -461,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,
@@ -487,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) {
@@ -566,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;
@@ -674,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 28043d19..2362e1ba 100644
--- a/sway/desktop/launcher.c
+++ b/sway/desktop/launcher.c
@@ -4,6 +4,7 @@
 #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"
diff --git a/sway/desktop/layer_shell.c b/sway/desktop/layer_shell.c
index 4b2584b6..6221b7b9 100644
--- a/sway/desktop/layer_shell.c
+++ b/sway/desktop/layer_shell.c
@@ -2,6 +2,7 @@
 #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>
@@ -432,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/transaction.c b/sway/desktop/transaction.c
index 042141ab..d1898843 100644
--- a/sway/desktop/transaction.c
+++ b/sway/desktop/transaction.c
@@ -10,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"
@@ -761,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/input/cursor.c b/sway/input/cursor.c
index 3d04826c..235951d4 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -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"
@@ -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;
                         }
diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c
index f74d0658..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
diff --git a/sway/input/seat.c b/sway/input/seat.c
index 0c5672bc..da4bb12a 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -190,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);
@@ -1002,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) ||
diff --git a/sway/input/seatop_default.c b/sway/input/seatop_default.c
index 0c6f7c5e..f4a0f463 100644
--- a/sway/input/seatop_default.c
+++ b/sway/input/seatop_default.c
@@ -11,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
 
@@ -234,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)) &&
@@ -268,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 &&
@@ -514,7 +515,7 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
                 return;
         }
 
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
         // Handle clicking on xwayland unmanaged view
         struct wlr_xwayland_surface *xsurface;
         if (surface &&
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 2863642a..ec1e4f68 100644
--- a/sway/input/tablet.c
+++ b/sway/input/tablet.c
@@ -7,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 c38a3bb2..580a9f54 100644
--- a/sway/input/text_input.c
+++ b/sway/input/text_input.c
@@ -9,6 +9,8 @@
 #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(
@@ -66,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);
         }
 }
diff --git a/sway/ipc-json.c b/sway/ipc-json.c
index 81ca3483..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;
@@ -633,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)));
diff --git a/sway/meson.build b/sway/meson.build
index d937e425..47b51d0c 100644
--- a/sway/meson.build
+++ b/sway/meson.build
@@ -231,7 +231,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 180d3a6b..edbc1a4b 100644
--- a/sway/server.c
+++ b/sway/server.c
@@ -56,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
@@ -113,12 +113,13 @@ static bool is_privileged(const struct wl_global *global) {
                 global == server.input->keyboard_shortcuts_inhibit->global ||
                 global == server.input->virtual_keyboard->global ||
                 global == server.input->virtual_pointer->global ||
-                global == server.input->transient_seat_manager->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;
@@ -275,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();
@@ -437,7 +439,7 @@ 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);
@@ -447,7 +449,7 @@ void server_fini(struct sway_server *server) {
 }
 
 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_text_node.c b/sway/sway_text_node.c
index 5eba53ba..4b7ee999 100644
--- a/sway/sway_text_node.c
+++ b/sway/sway_text_node.c
@@ -58,7 +58,7 @@ struct text_buffer {
 
 static int get_text_width(struct sway_text_node *props) {
         int width = props->width;
-        if (props->max_width) {
+        if (props->max_width >= 0) {
                 width = MIN(width, props->max_width);
         }
         return MAX(width, 0);
@@ -81,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);
@@ -236,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/tree/container.c b/sway/tree/container.c
index 9224b4fb..80ef34fe 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -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/root.c b/sway/tree/root.c
index ae3c3cb2..20fcfa59 100644
--- a/sway/tree/root.c
+++ b/sway/tree/root.c
@@ -53,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 35b4b73f..1c1c8ee8 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -1,6 +1,7 @@
 #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>
@@ -9,8 +10,7 @@
 #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 HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
 #include <wlr/xwayland.h>
 #endif
 #include "list.h"
@@ -126,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);
@@ -159,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
@@ -499,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);
@@ -838,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) !=
@@ -927,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 {
@@ -940,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){
-                        .x = con->view->geometry.x,
-                        .y = con->view->geometry.y,
-                        .width = con->current.content_width,
-                        .height = con->current.content_height,
-                });
+                struct wlr_box clip = {0};
+                if (clip_to_geometry) {
+                        clip = (struct wlr_box){
+                                .x = con->view->geometry.x,
+                                .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);
         }
 }
 
@@ -954,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);
diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c
index a68dc927..52e48ad5 100644
--- a/sway/tree/workspace.c
+++ b/sway/tree/workspace.c
@@ -10,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"