nordic-dev.net/wlroots
2
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2024-11-21 22:52:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

wlr_surface: fix argument order consistency

Browse Source 
This swaps the argument order of wlr_surface_accepts_touch() and
wlr_surface_accepts_tablet_v2(), putting the wlr_surface argument first
as should be the case for functions namespaced with wlr_surface_*.
This commit is contained in:
Isaac Freund 2020-10-15 15:11:52 +02:00 committed by Simon Zeni
parent b10516e1e8
commit 5ecbd23c1d
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wlr/types/wlr_seat.h
View File

@ -748,6 +748,6 @@ struct wlr_seat_client *wlr_seat_client_from_pointer_resource(
/** /**
* Check whether a surface has bound to touch events. * Check whether a surface has bound to touch events.
*/ */
bool wlr_surface_accepts_touch(struct wlr_seat *wlr_seat, struct wlr_surface *surface); bool wlr_surface_accepts_touch(struct wlr_surface *surface, struct wlr_seat *wlr_seat);
#endif #endif

4
include/wlr/types/wlr_tablet_v2.h
View File

@ -327,6 +327,6 @@ struct wlr_tablet_pad_v2_grab_interface {
void wlr_tablet_v2_end_grab(struct wlr_tablet_v2_tablet_pad *pad); void wlr_tablet_v2_end_grab(struct wlr_tablet_v2_tablet_pad *pad);
void wlr_tablet_v2_start_grab(struct wlr_tablet_v2_tablet_pad *pad, struct wlr_tablet_pad_v2_grab *grab); void wlr_tablet_v2_start_grab(struct wlr_tablet_v2_tablet_pad *pad, struct wlr_tablet_pad_v2_grab *grab);
bool wlr_surface_accepts_tablet_v2(struct wlr_tablet_v2_tablet *tablet, bool wlr_surface_accepts_tablet_v2(struct wlr_surface *surface,
struct wlr_surface *surface); struct wlr_tablet_v2_tablet *tablet);
#endif /* WLR_TYPES_WLR_TABLET_V2_H */ #endif /* WLR_TYPES_WLR_TABLET_V2_H */

2
types/seat/wlr_seat_touch.c
View File

@ -476,7 +476,7 @@ bool wlr_seat_validate_touch_grab_serial(struct wlr_seat *seat,
return false; return false;
} }
bool wlr_surface_accepts_touch(struct wlr_seat *wlr_seat, struct wlr_surface *surface) { bool wlr_surface_accepts_touch(struct wlr_surface *surface, struct wlr_seat *wlr_seat) {
struct wl_client *client = wl_resource_get_client(surface->resource); struct wl_client *client = wl_resource_get_client(surface->resource);
struct wlr_seat_client *seat_client = wlr_seat_client_for_wl_client(wlr_seat, client); struct wlr_seat_client *seat_client = wlr_seat_client_for_wl_client(wlr_seat, client);
if (!seat_client) { if (!seat_client) {

4
types/tablet_v2/wlr_tablet_v2_pad.c
View File

@ -560,8 +560,8 @@ uint32_t wlr_send_tablet_v2_tablet_pad_mode(struct wlr_tablet_v2_tablet_pad *pad
return serial; return serial;
} }
bool wlr_surface_accepts_tablet_v2(struct wlr_tablet_v2_tablet *tablet, bool wlr_surface_accepts_tablet_v2(struct wlr_surface *surface,
struct wlr_surface *surface) { struct wlr_tablet_v2_tablet *tablet) {
struct wl_client *client = wl_resource_get_client(surface->resource); struct wl_client *client = wl_resource_get_client(surface->resource);
if (tablet->current_client && if (tablet->current_client &&