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/seatop_move_tiling.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'sway/input/seatop_move_tiling.c') diff --git a/sway/input/seatop_move_tiling.c b/sway/input/seatop_move_tiling.c index 4201ae37..3f31e4b1 100644 --- a/sway/input/seatop_move_tiling.c +++ b/sway/input/seatop_move_tiling.c @@ -206,7 +206,7 @@ static void handle_motion_postthreshold(struct sway_seat *seat) { desktop_damage_box(&e->drop_box); } -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_move_tiling_event *e = seat->seatop_data; if (e->threshold_reached) { @@ -251,7 +251,6 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec, container_detach(con); } - // Moving container into empty workspace if (target_node->type == N_WORKSPACE && edge == WLR_EDGE_NONE) { workspace_add_tiling(new_ws, con); @@ -315,7 +314,7 @@ static void handle_unref(struct sway_seat *seat, struct sway_container *con) { static const struct sway_seatop_impl seatop_impl = { .button = handle_button, - .motion = handle_motion, + .pointer_motion = handle_pointer_motion, .unref = handle_unref, .render = handle_render, }; -- cgit v1.2.3