From 726d187d3ce83431a2565cc1b423af99da5f7b6b Mon Sep 17 00:00:00 2001 From: Tudor Brindus Date: Thu, 7 May 2020 18:57:06 -0400 Subject: input/tablet: simplify parameter plumbing for tablet references This is a small cleanup commit for removing `sway_tablet` parameters from functions that already accept `sway_tablet_tool`, since the tablet reference can be accessed through `tool->tablet`. --- sway/input/seatop_default.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'sway/input/seatop_default.c') diff --git a/sway/input/seatop_default.c b/sway/input/seatop_default.c index e0838c04..64a17157 100644 --- a/sway/input/seatop_default.c +++ b/sway/input/seatop_default.c @@ -475,8 +475,7 @@ static void handle_pointer_motion(struct sway_seat *seat, uint32_t time_msec, } static void handle_tablet_tool_motion(struct sway_seat *seat, - struct sway_tablet *tablet, struct sway_tablet_tool *tool, - uint32_t time_msec, double dx, double dy) { + struct sway_tablet_tool *tool, uint32_t time_msec, double dx, double dy) { struct seatop_default_event *e = seat->seatop_data; struct sway_cursor *cursor = seat->cursor; @@ -492,7 +491,7 @@ static void handle_tablet_tool_motion(struct sway_seat *seat, if (surface) { if (seat_is_input_allowed(seat, surface)) { wlr_tablet_v2_tablet_tool_notify_proximity_in(tool->tablet_v2_tool, - tablet->tablet_v2, surface); + tool->tablet->tablet_v2, surface); wlr_tablet_v2_tablet_tool_notify_motion(tool->tablet_v2_tool, sx, sy); } } else { -- cgit v1.2.3