aboutsummaryrefslogtreecommitdiffstats
path: root/sway/input/seatop_default.c
diff options
context:
space:
mode:
authorLibravatar Tudor Brindus <me@tbrindus.ca>2020-05-07 18:57:06 -0400
committerLibravatar Simon Ser <contact@emersion.fr>2020-05-10 16:49:35 +0200
commit726d187d3ce83431a2565cc1b423af99da5f7b6b (patch)
tree0e24b86e18f4e5abd20aff47eb14dfbf81f897b7 /sway/input/seatop_default.c
parentinput/keyboard: use wlr_keyboard_keymaps_match from wlroots (diff)
downloadsway-726d187d3ce83431a2565cc1b423af99da5f7b6b.tar.gz
sway-726d187d3ce83431a2565cc1b423af99da5f7b6b.tar.zst
sway-726d187d3ce83431a2565cc1b423af99da5f7b6b.zip
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`.
Diffstat (limited to 'sway/input/seatop_default.c')
-rw-r--r--sway/input/seatop_default.c5
1 files changed, 2 insertions, 3 deletions
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,
475} 475}
476 476
477static void handle_tablet_tool_motion(struct sway_seat *seat, 477static void handle_tablet_tool_motion(struct sway_seat *seat,
478 struct sway_tablet *tablet, struct sway_tablet_tool *tool, 478 struct sway_tablet_tool *tool, uint32_t time_msec, double dx, double dy) {
479 uint32_t time_msec, double dx, double dy) {
480 struct seatop_default_event *e = seat->seatop_data; 479 struct seatop_default_event *e = seat->seatop_data;
481 struct sway_cursor *cursor = seat->cursor; 480 struct sway_cursor *cursor = seat->cursor;
482 481
@@ -492,7 +491,7 @@ static void handle_tablet_tool_motion(struct sway_seat *seat,
492 if (surface) { 491 if (surface) {
493 if (seat_is_input_allowed(seat, surface)) { 492 if (seat_is_input_allowed(seat, surface)) {
494 wlr_tablet_v2_tablet_tool_notify_proximity_in(tool->tablet_v2_tool, 493 wlr_tablet_v2_tablet_tool_notify_proximity_in(tool->tablet_v2_tool,
495 tablet->tablet_v2, surface); 494 tool->tablet->tablet_v2, surface);
496 wlr_tablet_v2_tablet_tool_notify_motion(tool->tablet_v2_tool, sx, sy); 495 wlr_tablet_v2_tablet_tool_notify_motion(tool->tablet_v2_tool, sx, sy);
497 } 496 }
498 } else { 497 } else {