chase wlroots: wlr_surface_accepts args MR 2434

Ref: 5ecbd23c1d44119cb32b345782d50c9664853109
("wlr_surface: fix argument order consistency")

diff --git a/src/input/tablet.c b/src/input/tablet.c
index acf1f01ea637d8451dabd68156317a7a374279b5..ea707308c9a7bfa934edbfc3c4766c3c3d6af60d 100644 (file)
--- a/src/input/tablet.c
+++ b/src/input/tablet.c
@@ -169,7 +169,7 @@ tablet_get_coords(struct drawing_tablet *tablet, double *x, double *y, double *d
        /* find the surface and return it if it accepts tablet events */
        struct wlr_surface *surface = lab_wlr_surface_from_node(node);
 
-       if (surface && !wlr_surface_accepts_tablet_v2(tablet->tablet_v2, surface)) {
+       if (surface && !wlr_surface_accepts_tablet_v2(surface, tablet->tablet_v2)) {
                return NULL;
        }
        return surface;

diff --git a/src/input/touch.c b/src/input/touch.c
index a8a9b9e103561d775ccbbdec808807b9e94d447f..740df726b7b066f9b9f77438edadf4cdd92abd35 100644 (file)
--- a/src/input/touch.c
+++ b/src/input/touch.c
@@ -50,7 +50,7 @@ touch_get_coords(struct seat *seat, struct wlr_touch *touch, double x, double y,
        /* Find the surface and return it if it accepts touch events */
        struct wlr_surface *surface = lab_wlr_surface_from_node(node);
 
-       if (surface && !wlr_surface_accepts_touch(seat->seat, surface)) {
+       if (surface && !wlr_surface_accepts_touch(surface, seat->seat)) {
                surface = NULL;
        }
        return surface;

diff --git a/subprojects/wlroots.wrap b/subprojects/wlroots.wrap
index ea1ae44ac46a4ea3ae94dec05078d7e442f82163..45cba1dc7ca2238362e18e944207743ff7436da6 100644 (file)
--- a/subprojects/wlroots.wrap
+++ b/subprojects/wlroots.wrap
@@ -1,6 +1,6 @@
 [wrap-git]
 url = https://gitlab.freedesktop.org/wlroots/wlroots.git
-revision = b10516e1e8352f3140d68fa580b0ed32e13c2d58
+revision = 5ecbd23c1d44119cb32b345782d50c9664853109
 
 [provide]
 dependency_names = wlroots-0.19