From e262f93d0a93c52b72fa1e64c29021ef2784d5fb Mon Sep 17 00:00:00 2001 From: Tudor Brindus Date: Sat, 2 May 2020 12:15:39 -0400 Subject: input: rename pointer handlers to be unambiguous This commit renames `motion` and `axis` handlers to `pointer_motion` and `pointer_axis`, respectively, to disambiguate them from their tablet (and future touch) handlers. `button` is left as-is, as it is generic across input devices. --- sway/input/seat.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'sway/input/seat.c') diff --git a/sway/input/seat.c b/sway/input/seat.c index 27751c27..4abffb25 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c @@ -1449,16 +1449,17 @@ void seatop_button(struct sway_seat *seat, uint32_t time_msec, } } -void seatop_motion(struct sway_seat *seat, uint32_t time_msec, +void seatop_pointer_motion(struct sway_seat *seat, uint32_t time_msec, double dx, double dy) { - if (seat->seatop_impl->motion) { - seat->seatop_impl->motion(seat, time_msec, dx, dy); + if (seat->seatop_impl->pointer_motion) { + seat->seatop_impl->pointer_motion(seat, time_msec, dx, dy); } } -void seatop_axis(struct sway_seat *seat, struct wlr_event_pointer_axis *event) { - if (seat->seatop_impl->axis) { - seat->seatop_impl->axis(seat, event); +void seatop_pointer_axis(struct sway_seat *seat, + struct wlr_event_pointer_axis *event) { + if (seat->seatop_impl->pointer_axis) { + seat->seatop_impl->pointer_axis(seat, event); } } @@ -1468,7 +1469,7 @@ void seatop_tablet_tool_motion(struct sway_seat *seat, if (seat->seatop_impl->tablet_tool_motion) { seat->seatop_impl->tablet_tool_motion(seat, tablet, tool, time_msec, dx, dy); } else { - seatop_motion(seat, time_msec, dx, dy); + seatop_pointer_motion(seat, time_msec, dx, dy); } } -- cgit v1.2.3