12 files changed, 73 insertions, 43 deletions

diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml
index 8084574c..977fe467 100644
--- a/.builds/freebsd.yml
+++ b/.builds/freebsd.yml
@@ -27,7 +27,7 @@ packages:
 - x11/libX11
 - x11/pixman
 - x11/xcb-util-wm
-- x11-servers/xwayland-devel
+- x11-servers/xwayland
 - misc/hwdata
 sources:
 - https://github.com/swaywm/sway
diff --git a/common/pango.c b/common/pango.c
index 288569b3..e52b52b9 100644
--- a/common/pango.c
+++ b/common/pango.c
@@ -53,6 +53,8 @@ size_t escape_markup_text(const char *src, char *dest) {
 PangoLayout *get_pango_layout(cairo_t *cairo, const PangoFontDescription *desc,
                 const char *text, double scale, bool markup) {
         PangoLayout *layout = pango_cairo_create_layout(cairo);
+        pango_context_set_round_glyph_positions(pango_layout_get_context(layout), false);
+
         PangoAttrList *attrs;
         if (markup) {
                 char *buf;
@@ -104,6 +106,7 @@ void get_text_size(cairo_t *cairo, const PangoFontDescription *desc, int *width,
 void get_text_metrics(const PangoFontDescription *description, int *height, int *baseline) {
         cairo_t *cairo = cairo_create(NULL);
         PangoContext *pango = pango_cairo_create_context(cairo);
+        pango_context_set_round_glyph_positions(pango, false);
         // When passing NULL as a language, pango uses the current locale.
         PangoFontMetrics *metrics = pango_context_get_metrics(pango, description, NULL);
 
diff --git a/meson.build b/meson.build
index c602d008..0d5b0cc6 100644
--- a/meson.build
+++ b/meson.build
@@ -3,7 +3,7 @@ project(
         'c',
         version: '1.10-dev',
         license: 'MIT',
-        meson_version: '>=0.60.0',
+        meson_version: '>=1.3',
         default_options: [
                 'c_std=c11',
                 'warning_level=2',
@@ -38,14 +38,14 @@ if is_freebsd
 endif
 
 # Execute the wlroots subproject, if any
-wlroots_version = ['>=0.18.0', '<0.19.0']
+wlroots_version = ['>=0.19.0', '<0.20.0']
 subproject(
         'wlroots',
         default_options: ['examples=false'],
         required: false,
         version: wlroots_version,
 )
-wlroots = dependency('wlroots-0.18', version: wlroots_version, fallback: 'wlroots')
+wlroots = dependency('wlroots-0.19', version: wlroots_version, fallback: 'wlroots')
 wlroots_features = {
         'xwayland': false,
         'libinput_backend': false,
@@ -172,31 +172,10 @@ if git.found()
 endif
 add_project_arguments('-DSWAY_VERSION=@0@'.format(version), language: 'c')
 
-# Compute the relative path used by compiler invocations.
-source_root = meson.current_source_dir().split('/')
-build_root = meson.global_build_root().split('/')
-relative_dir_parts = []
-i = 0
-in_prefix = true
-foreach p : build_root
-        if i >= source_root.length() or not in_prefix or p != source_root[i]
-                in_prefix = false
-                relative_dir_parts += '..'
-        endif
-        i += 1
-endforeach
-i = 0
-in_prefix = true
-foreach p : source_root
-        if i >= build_root.length() or not in_prefix or build_root[i] != p
-                in_prefix = false
-                relative_dir_parts += p
-        endif
-        i += 1
-endforeach
-relative_dir = join_paths(relative_dir_parts) + '/'
+fs = import('fs')
 
 # Strip relative path prefixes from the code if possible, otherwise hide them.
+relative_dir = fs.relative_to(meson.current_source_dir(), meson.global_build_root()) + '/'
 if cc.has_argument('-fmacro-prefix-map=/prefix/to/hide=')
         add_project_arguments(
                 '-fmacro-prefix-map=@0@='.format(relative_dir),
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/desktop/layer_shell.c b/sway/desktop/layer_shell.c
index 6221b7b9..b136a24e 100644
--- a/sway/desktop/layer_shell.c
+++ b/sway/desktop/layer_shell.c
@@ -90,6 +90,43 @@ void arrange_layers(struct sway_output *output) {
         } else {
                 arrange_popups(root->layers.popup);
         }
+
+        // Find topmost keyboard interactive layer, if such a layer exists
+        struct wlr_scene_tree *layers_above_shell[] = {
+                output->layers.shell_overlay,
+                output->layers.shell_top,
+        };
+        size_t nlayers = sizeof(layers_above_shell) / sizeof(layers_above_shell[0]);
+        struct wlr_scene_node *node;
+        struct sway_layer_surface *topmost = NULL;
+        for (size_t i = 0; i < nlayers; ++i) {
+                wl_list_for_each_reverse(node,
+                                &layers_above_shell[i]->children, link) {
+                        struct sway_layer_surface *surface = scene_descriptor_try_get(node,
+                                SWAY_SCENE_DESC_LAYER_SHELL);
+                        if (surface && surface->layer_surface->current.keyboard_interactive
+                                        == ZWLR_LAYER_SURFACE_V1_KEYBOARD_INTERACTIVITY_EXCLUSIVE &&
+                                        surface->layer_surface->surface->mapped) {
+                                topmost = surface;
+                                break;
+                        }
+                }
+                if (topmost != NULL) {
+                        break;
+                }
+        }
+
+        struct sway_seat *seat;
+        wl_list_for_each(seat, &server.input->seats, link) {
+                seat->has_exclusive_layer = false;
+                if (topmost != NULL) {
+                        seat_set_focus_layer(seat, topmost->layer_surface);
+                } else if (seat->focused_layer &&
+                                seat->focused_layer->current.keyboard_interactive
+                                        != ZWLR_LAYER_SURFACE_V1_KEYBOARD_INTERACTIVITY_EXCLUSIVE) {
+                        seat_set_focus_layer(seat, NULL);
+                }
+        }
 }
 
 static struct wlr_scene_tree *sway_layer_get_scene(struct sway_output *output,
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index f936b2a8..27ede68e 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -247,6 +247,13 @@ static int output_repaint_timer_handler(void *data) {
                 .color_transform = output->color_transform,
         };
 
+        struct wlr_output *wlr_output = output->wlr_output;
+        struct wlr_scene_output *scene_output = output->scene_output;
+        if (!wlr_output->needs_frame && !output->gamma_lut_changed &&
+                        !pixman_region32_not_empty(&scene_output->pending_commit_damage)) {
+                return 0;
+        }
+
         struct wlr_output_state pending;
         wlr_output_state_init(&pending);
         if (!wlr_scene_output_build_state(output->scene_output, &pending, &opts)) {
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c
index 270cf08f..0d45543a 100644
--- a/sway/desktop/xwayland.c
+++ b/sway/desktop/xwayland.c
@@ -71,7 +71,7 @@ static void unmanaged_handle_map(struct wl_listener *listener, void *data) {
                 surface->set_geometry.notify = unmanaged_handle_set_geometry;
         }
 
-        if (wlr_xwayland_or_surface_wants_focus(xsurface)) {
+        if (wlr_xwayland_surface_override_redirect_wants_focus(xsurface)) {
                 struct sway_seat *seat = input_manager_current_seat();
                 struct wlr_xwayland *xwayland = server.xwayland.wlr_xwayland;
                 wlr_xwayland_set_seat(xwayland, seat->wlr_seat);
@@ -96,7 +96,7 @@ static void unmanaged_handle_unmap(struct wl_listener *listener, void *data) {
                 // This simply returns focus to the parent surface if there's one available.
                 // This seems to handle JetBrains issues.
                 if (xsurface->parent && xsurface->parent->surface
-                                && wlr_xwayland_or_surface_wants_focus(xsurface->parent)) {
+                                && wlr_xwayland_surface_override_redirect_wants_focus(xsurface->parent)) {
                         seat_set_focus_surface(seat, xsurface->parent->surface, false);
                         return;
                 }
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 235951d4..bbd16717 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -578,7 +578,7 @@ static void handle_tablet_tool_position(struct sway_cursor *cursor,
         //   tablet events until the drag is released, even if we are now over a
         //   non-tablet surface.
         if (!cursor->simulating_pointer_from_tool_tip &&
-                        ((surface && wlr_surface_accepts_tablet_v2(tablet->tablet_v2, surface)) ||
+                        ((surface && wlr_surface_accepts_tablet_v2(surface, tablet->tablet_v2)) ||
                                 wlr_tablet_tool_v2_has_implicit_grab(tool->tablet_v2_tool))) {
                 seatop_tablet_tool_motion(seat, tool, time_msec);
         } else {
@@ -664,7 +664,7 @@ static void handle_tool_tip(struct wl_listener *listener, void *data) {
                 dispatch_cursor_button(cursor, &event->tablet->base, event->time_msec,
                         BTN_LEFT, WL_POINTER_BUTTON_STATE_RELEASED);
                 wlr_seat_pointer_notify_frame(cursor->seat->wlr_seat);
-        } else if (!surface || !wlr_surface_accepts_tablet_v2(tablet_v2, surface)) {
+        } else if (!surface || !wlr_surface_accepts_tablet_v2(surface, tablet_v2)) {
                 // If we started holding the tool tip down on a surface that accepts
                 // tablet v2, we should notify that surface if it gets released over a
                 // surface that doesn't support v2.
@@ -749,7 +749,7 @@ static void handle_tool_button(struct wl_listener *listener, void *data) {
         bool mod_pressed = modifiers & config->floating_mod;
 
         bool surface_supports_tablet_events =
-                surface && wlr_surface_accepts_tablet_v2(tablet_v2, surface);
+                surface && wlr_surface_accepts_tablet_v2(surface, tablet_v2);
 
         // Simulate pointer when:
         // 1. The modifier key is pressed, OR
diff --git a/sway/input/seatop_default.c b/sway/input/seatop_default.c
index f4a0f463..42ce333b 100644
--- a/sway/input/seatop_default.c
+++ b/sway/input/seatop_default.c
@@ -273,7 +273,7 @@ static void handle_tablet_tool_tip(struct sway_seat *seat,
         // Handle tapping on an xwayland unmanaged view
         else if ((xsurface = wlr_xwayland_surface_try_from_wlr_surface(surface)) &&
                         xsurface->override_redirect &&
-                        wlr_xwayland_or_surface_wants_focus(xsurface)) {
+                        wlr_xwayland_surface_override_redirect_wants_focus(xsurface)) {
                 struct wlr_xwayland *xwayland = server.xwayland.wlr_xwayland;
                 wlr_xwayland_set_seat(xwayland, seat->wlr_seat);
                 seat_set_focus_surface(seat, xsurface->surface, false);
@@ -521,7 +521,7 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
         if (surface &&
                         (xsurface = wlr_xwayland_surface_try_from_wlr_surface(surface)) &&
                         xsurface->override_redirect &&
-                        wlr_xwayland_or_surface_wants_focus(xsurface)) {
+                        wlr_xwayland_surface_override_redirect_wants_focus(xsurface)) {
                 struct wlr_xwayland *xwayland = server.xwayland.wlr_xwayland;
                 wlr_xwayland_set_seat(xwayland, seat->wlr_seat);
                 seat_set_focus_surface(seat, xsurface->surface, false);
@@ -667,7 +667,7 @@ static void handle_touch_down(struct sway_seat *seat,
         double sx, sy;
         node_at_coords(seat, seat->touch_x, seat->touch_y, &surface, &sx, &sy);
 
-        if (surface && wlr_surface_accepts_touch(wlr_seat, surface)) {
+        if (surface && wlr_surface_accepts_touch(surface, wlr_seat)) {
                 if (seat_is_input_allowed(seat, surface)) {
                         cursor->simulating_pointer_from_touch = false;
                         seatop_begin_touch_down(seat, surface, event, sx, sy, lx, ly);
diff --git a/sway/input/tablet.c b/sway/input/tablet.c
index ec1e4f68..19d5debf 100644
--- a/sway/input/tablet.c
+++ b/sway/input/tablet.c
@@ -363,7 +363,7 @@ void sway_tablet_pad_set_focus(struct sway_tablet_pad *tablet_pad,
         }
 
         if (surface == NULL ||
-                        !wlr_surface_accepts_tablet_v2(tablet_pad->tablet->tablet_v2, surface)) {
+                        !wlr_surface_accepts_tablet_v2(surface, tablet_pad->tablet->tablet_v2)) {
                 return;
         }
 
diff --git a/sway/tree/view.c b/sway/tree/view.c
index 4f757acf..229d765e 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -850,7 +850,7 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface,
 #if WLR_HAS_XWAYLAND
         struct wlr_xwayland_surface *xsurface;
         if ((xsurface = wlr_xwayland_surface_try_from_wlr_surface(wlr_surface))) {
-                set_focus &= wlr_xwayland_icccm_input_model(xsurface) !=
+                set_focus &= wlr_xwayland_surface_icccm_input_model(xsurface) !=
                                 WLR_ICCCM_INPUT_MODEL_NONE;
         }
 #endif
diff --git a/sway/xdg_activation_v1.c b/sway/xdg_activation_v1.c
index b7c80dd4..fd604874 100644
--- a/sway/xdg_activation_v1.c
+++ b/sway/xdg_activation_v1.c
@@ -38,14 +38,14 @@ void xdg_activation_v1_handle_request_activate(struct wl_listener *listener,
         }
 
         // This is an activation request. If this context is internal we have ctx->seat.
-        struct sway_seat *seat = ctx->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 (ctx->seat) {
+                view_request_activate(view, ctx->seat);
+                return;
         }
 
-        if (seat && ctx->had_focused_surface) {
-                view_request_activate(view, seat);
+        // Otherwise, activate if passed from another focused client
+        if (ctx->token->seat && ctx->had_focused_surface) {
+                view_request_activate(view, ctx->token->seat->data);
         } else {
                 // The token is valid, but cannot be used to activate a window
                 view_request_urgent(view);