Convert to wlr_xwayland_surface_try_from_wlr_surface()

Accomodate for the breaking changes in [1].

[1]: https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/fbf5982e3838ee28b5345e98832f6956c402b225

1 files changed, 20 insertions, 22 deletions

diff --git a/sway/input/seatop_default.c b/sway/input/seatop_default.c
index 6c69a0ea..a1c1d319 100644
--- a/sway/input/seatop_default.c
+++ b/sway/input/seatop_default.c
@@ -228,6 +228,9 @@ static void handle_tablet_tool_tip(struct sway_seat *seat,
         struct sway_container *cont = node && node->type == N_CONTAINER ?
                 node->sway_container : NULL;
 
+#if HAVE_XWAYLAND
+        struct wlr_xwayland_surface *xsurface;
+#endif
         if (wlr_surface_is_layer_surface(surface)) {
                 // Handle tapping a layer surface
                 struct wlr_layer_surface_v1 *layer =
@@ -264,16 +267,13 @@ static void handle_tablet_tool_tip(struct sway_seat *seat,
         }
 #if HAVE_XWAYLAND
         // Handle tapping on an xwayland unmanaged view
-        else if (wlr_surface_is_xwayland_surface(surface)) {
-                struct wlr_xwayland_surface *xsurface =
-                                wlr_xwayland_surface_from_wlr_surface(surface);
-                if (xsurface->override_redirect &&
-                                wlr_xwayland_or_surface_wants_focus(xsurface)) {
-                        struct wlr_xwayland *xwayland = server.xwayland.wlr_xwayland;
-                        wlr_xwayland_set_seat(xwayland, seat->wlr_seat);
-                        seat_set_focus_surface(seat, xsurface->surface, false);
-                        transaction_commit_dirty();
-                }
+        else if ((xsurface = wlr_xwayland_surface_try_from_wlr_surface(surface)) &&
+                        xsurface->override_redirect &&
+                        wlr_xwayland_or_surface_wants_focus(xsurface)) {
+                struct wlr_xwayland *xwayland = server.xwayland.wlr_xwayland;
+                wlr_xwayland_set_seat(xwayland, seat->wlr_seat);
+                seat_set_focus_surface(seat, xsurface->surface, false);
+                transaction_commit_dirty();
         }
 #endif
 
@@ -514,18 +514,16 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
 
 #if HAVE_XWAYLAND
         // Handle clicking on xwayland unmanaged view
-        if (surface && wlr_surface_is_xwayland_surface(surface)) {
-                struct wlr_xwayland_surface *xsurface =
-                        wlr_xwayland_surface_from_wlr_surface(surface);
-                if (xsurface->override_redirect &&
-                                wlr_xwayland_or_surface_wants_focus(xsurface)) {
-                        struct wlr_xwayland *xwayland = server.xwayland.wlr_xwayland;
-                        wlr_xwayland_set_seat(xwayland, seat->wlr_seat);
-                        seat_set_focus_surface(seat, xsurface->surface, false);
-                        transaction_commit_dirty();
-                        seat_pointer_notify_button(seat, time_msec, button, state);
-                        return;
-                }
+        struct wlr_xwayland_surface *xsurface;
+        if (surface &&
+                        (xsurface = wlr_xwayland_surface_try_from_wlr_surface(surface)) &&
+                        xsurface->override_redirect &&
+                        wlr_xwayland_or_surface_wants_focus(xsurface)) {
+                struct wlr_xwayland *xwayland = server.xwayland.wlr_xwayland;
+                wlr_xwayland_set_seat(xwayland, seat->wlr_seat);
+                seat_set_focus_surface(seat, xsurface->surface, false);
+                transaction_commit_dirty();
+                seat_pointer_notify_button(seat, time_msec, button, state);
         }
 #endif