aboutsummaryrefslogtreecommitdiffstats
path: root/sway/input/seatop_move_tiling.c
diff options
context:
space:
mode:
authorLibravatar Tudor Brindus <me@tbrindus.ca>2020-05-02 12:15:39 -0400
committerLibravatar Simon Ser <contact@emersion.fr>2020-05-02 18:28:06 +0200
commite262f93d0a93c52b72fa1e64c29021ef2784d5fb (patch)
treec7e091dae7181c289520b44f3984d9cd7854a8ca /sway/input/seatop_move_tiling.c
parentinput: refactor tablet motion into seatop handler (diff)
downloadsway-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 'sway/input/seatop_move_tiling.c')
-rw-r--r--sway/input/seatop_move_tiling.c5
1 files changed, 2 insertions, 3 deletions
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) {
206 desktop_damage_box(&e->drop_box); 206 desktop_damage_box(&e->drop_box);
207} 207}
208 208
209static void handle_motion(struct sway_seat *seat, uint32_t time_msec, 209static void handle_pointer_motion(struct sway_seat *seat, uint32_t time_msec,
210 double dx, double dy) { 210 double dx, double dy) {
211 struct seatop_move_tiling_event *e = seat->seatop_data; 211 struct seatop_move_tiling_event *e = seat->seatop_data;
212 if (e->threshold_reached) { 212 if (e->threshold_reached) {
@@ -251,7 +251,6 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
251 container_detach(con); 251 container_detach(con);
252 } 252 }
253 253
254
255 // Moving container into empty workspace 254 // Moving container into empty workspace
256 if (target_node->type == N_WORKSPACE && edge == WLR_EDGE_NONE) { 255 if (target_node->type == N_WORKSPACE && edge == WLR_EDGE_NONE) {
257 workspace_add_tiling(new_ws, con); 256 workspace_add_tiling(new_ws, con);
@@ -315,7 +314,7 @@ static void handle_unref(struct sway_seat *seat, struct sway_container *con) {
315 314
316static const struct sway_seatop_impl seatop_impl = { 315static const struct sway_seatop_impl seatop_impl = {
317 .button = handle_button, 316 .button = handle_button,
318 .motion = handle_motion, 317 .pointer_motion = handle_pointer_motion,
319 .unref = handle_unref, 318 .unref = handle_unref,
320 .render = handle_render, 319 .render = handle_render,
321}; 320};