diff options
author | Tudor Brindus <me@tbrindus.ca> | 2020-05-02 12:15:39 -0400 |
---|---|---|
committer | Simon Ser <contact@emersion.fr> | 2020-05-02 18:28:06 +0200 |
commit | e262f93d0a93c52b72fa1e64c29021ef2784d5fb (patch) | |
tree | c7e091dae7181c289520b44f3984d9cd7854a8ca /include | |
parent | input: refactor tablet motion into seatop handler (diff) | |
download | sway-e262f93d0a93c52b72fa1e64c29021ef2784d5fb.tar.gz sway-e262f93d0a93c52b72fa1e64c29021ef2784d5fb.tar.zst sway-e262f93d0a93c52b72fa1e64c29021ef2784d5fb.zip |
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.
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/input/seat.h | 12 |
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 { | |||
16 | void (*button)(struct sway_seat *seat, uint32_t time_msec, | 16 | void (*button)(struct sway_seat *seat, uint32_t time_msec, |
17 | struct wlr_input_device *device, uint32_t button, | 17 | struct wlr_input_device *device, uint32_t button, |
18 | enum wlr_button_state state); | 18 | enum wlr_button_state state); |
19 | void (*motion)(struct sway_seat *seat, uint32_t time_msec, | 19 | void (*pointer_motion)(struct sway_seat *seat, uint32_t time_msec, |
20 | double dx, double dy); | 20 | double dx, double dy); |
21 | void (*axis)(struct sway_seat *seat, struct wlr_event_pointer_axis *event); | 21 | void (*pointer_axis)(struct sway_seat *seat, |
22 | struct wlr_event_pointer_axis *event); | ||
22 | void (*rebase)(struct sway_seat *seat, uint32_t time_msec); | 23 | void (*rebase)(struct sway_seat *seat, uint32_t time_msec); |
23 | void (*tablet_tool_motion)(struct sway_seat *seat, struct sway_tablet *tablet, | 24 | void (*tablet_tool_motion)(struct sway_seat *seat, struct sway_tablet *tablet, |
24 | struct sway_tablet_tool *tool, uint32_t time_msec, double dx, double dy); | 25 | 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, | |||
261 | /** | 262 | /** |
262 | * dx and dy are distances relative to previous position. | 263 | * dx and dy are distances relative to previous position. |
263 | */ | 264 | */ |
264 | void seatop_motion(struct sway_seat *seat, uint32_t time_msec, | 265 | void seatop_pointer_motion(struct sway_seat *seat, uint32_t time_msec, |
265 | double dx, double dy); | 266 | double dx, double dy); |
266 | 267 | ||
268 | void seatop_pointer_axis(struct sway_seat *seat, | ||
269 | struct wlr_event_pointer_axis *event); | ||
270 | |||
267 | void seatop_tablet_tool_motion(struct sway_seat *seat, | 271 | void seatop_tablet_tool_motion(struct sway_seat *seat, |
268 | struct sway_tablet *tablet, struct sway_tablet_tool *tool, | 272 | struct sway_tablet *tablet, struct sway_tablet_tool *tool, |
269 | uint32_t time_msec, double dx, double dy); | 273 | uint32_t time_msec, double dx, double dy); |
270 | 274 | ||
271 | void seatop_axis(struct sway_seat *seat, struct wlr_event_pointer_axis *event); | ||
272 | |||
273 | void seatop_rebase(struct sway_seat *seat, uint32_t time_msec); | 275 | void seatop_rebase(struct sway_seat *seat, uint32_t time_msec); |
274 | 276 | ||
275 | /** | 277 | /** |