mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-22 06:46:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

input: rename pointer handlers to be unambiguous

Browse source 
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.
This commit is contained in:
Tudor Brindus 2020-05-02 12:15:39 -04:00 • committed by Simon Ser
parent ae3ec745f8
commit e262f93d0a
9 changed files with 39 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

20
sway/input/seatop_default.c
View file

@ -405,9 +405,9 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
seat_pointer_notify_button(seat, time_msec, button, state);
}
/*----------------------------------\
* Functions used by handle_motion /
*--------------------------------*/
/*------------------------------------------\
* Functions used by handle_pointer_motion /
*----------------------------------------*/
static void check_focus_follows_mouse(struct sway_seat *seat,
struct seatop_default_event *e, struct sway_node *hovered_node) {
@ -439,7 +439,7 @@ static void check_focus_follows_mouse(struct sway_seat *seat,
}
}
static void handle_motion(struct sway_seat *seat, uint32_t time_msec,
static void handle_pointer_motion(struct sway_seat *seat, uint32_t time_msec,
double dx, double dy) {
struct seatop_default_event *e = seat->seatop_data;
struct sway_cursor *cursor = seat->cursor;
@ -510,9 +510,9 @@ static void handle_tablet_tool_motion(struct sway_seat *seat,
e->previous_node = node;
}
/*--------------------------------\
* Functions used by handle_axis /
*------------------------------*/
/*----------------------------------------\
* Functions used by handle_pointer_axis /
*--------------------------------------*/
static uint32_t wl_axis_to_button(struct wlr_event_pointer_axis *event) {
switch (event->orientation) {
@ -526,7 +526,7 @@ static uint32_t wl_axis_to_button(struct wlr_event_pointer_axis *event) {
}
}
static void handle_axis(struct sway_seat *seat,
static void handle_pointer_axis(struct sway_seat *seat,
struct wlr_event_pointer_axis *event) {
struct sway_input_device *input_device =
event->device ? event->device->data : NULL;
@ -648,8 +648,8 @@ static void handle_rebase(struct sway_seat *seat, uint32_t time_msec) {
static const struct sway_seatop_impl seatop_impl = {
.button = handle_button,
.motion = handle_motion,
.axis = handle_axis,
.pointer_motion = handle_pointer_motion,
.pointer_axis = handle_pointer_axis,
.tablet_tool_motion = handle_tablet_tool_motion,
.rebase = handle_rebase,
.allow_set_cursor = true,