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.

1 files changed, 7 insertions, 5 deletions

diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h
index 1e255b47..2e98a244 100644
--- a/include/sway/input/seat.h
+++ b/include/sway/input/seat.h
@@ -16,9 +16,10 @@ struct sway_seatop_impl {
         void (*button)(struct sway_seat *seat, uint32_t time_msec,
                         struct wlr_input_device *device, uint32_t button,
                         enum wlr_button_state state);
-        void (*motion)(struct sway_seat *seat, uint32_t time_msec,
+        void (*pointer_motion)(struct sway_seat *seat, uint32_t time_msec,
                         double dx, double dy);
-        void (*axis)(struct sway_seat *seat, struct wlr_event_pointer_axis *event);
+        void (*pointer_axis)(struct sway_seat *seat,
+                        struct wlr_event_pointer_axis *event);
         void (*rebase)(struct sway_seat *seat, uint32_t time_msec);
         void (*tablet_tool_motion)(struct sway_seat *seat, struct sway_tablet *tablet,
                         struct sway_tablet_tool *tool, uint32_t time_msec, double dx, double dy);
@@ -261,15 +262,16 @@ void seatop_button(struct sway_seat *seat, uint32_t time_msec,
 /**
  * dx and dy are distances relative to previous position.
  */
-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);
 
+void seatop_pointer_axis(struct sway_seat *seat,
+                struct wlr_event_pointer_axis *event);
+
 void seatop_tablet_tool_motion(struct sway_seat *seat,
                 struct sway_tablet *tablet, struct sway_tablet_tool *tool,
                 uint32_t time_msec, double dx, double dy);
 
-void seatop_axis(struct sway_seat *seat, struct wlr_event_pointer_axis *event);
-
 void seatop_rebase(struct sway_seat *seat, uint32_t time_msec);
 
 /**