From a5db63c472e621ade75ca5eebb091f36169fb358 Mon Sep 17 00:00:00 2001 From: Consolatis <35009135+Consolatis@users.noreply.github.com> Date: Wed, 27 Nov 2024 03:35:45 +0100 Subject: [PATCH] chase wlroots: wlr_surface_accepts args MR 2434 Ref: 5ecbd23c1d44119cb32b345782d50c9664853109 ("wlr_surface: fix argument order consistency") --- src/input/tablet.c | 2 +- src/input/touch.c | 2 +- subprojects/wlroots.wrap | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/input/tablet.c b/src/input/tablet.c index acf1f01e..ea707308 100644 --- 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 a8a9b9e1..740df726 100644 --- 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 ea1ae44a..45cba1dc 100644 --- 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 -- 2.52.0