aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Tudor Brindus <me@tbrindus.ca>2020-05-28 19:15:25 -0400
committerLibravatar Simon Ser <contact@emersion.fr>2020-05-29 08:44:56 +0200
commit6da1631090d29b11c068b930a392a86dd207be4f (patch)
treeccabeffcd637eb4e10a4b84118e626cc4dfda572
parentipc: invert output transformation when necessary (diff)
downloadsway-6da1631090d29b11c068b930a392a86dd207be4f.tar.gz
sway-6da1631090d29b11c068b930a392a86dd207be4f.tar.zst
sway-6da1631090d29b11c068b930a392a86dd207be4f.zip
input/cursor: rename `simulated_tool_tip_down` to be more accurate
This is a tiny cleanup commit that renames `simulated_tool_tip_down` to `simulating_pointer_from_tool_tip`, making it match `simulating_pointer_from_touch`. This is a better name since it makes it clear that it's the *pointer* that's being simulated, not the tool tip.
-rw-r--r--include/sway/input/cursor.h2
-rw-r--r--sway/input/cursor.c12
2 files changed, 7 insertions, 7 deletions
diff --git a/include/sway/input/cursor.h b/include/sway/input/cursor.h
index ddece700..774921c8 100644
--- a/include/sway/input/cursor.h
+++ b/include/sway/input/cursor.h
@@ -58,7 +58,7 @@ struct sway_cursor {
58 struct wl_listener tool_tip; 58 struct wl_listener tool_tip;
59 struct wl_listener tool_proximity; 59 struct wl_listener tool_proximity;
60 struct wl_listener tool_button; 60 struct wl_listener tool_button;
61 bool simulated_tool_tip_down; 61 bool simulating_pointer_from_tool_tip;
62 uint32_t tool_buttons; 62 uint32_t tool_buttons;
63 63
64 struct wl_listener request_set_cursor; 64 struct wl_listener request_set_cursor;
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index b9643535..85d0e825 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -574,7 +574,7 @@ static void handle_tablet_tool_position(struct sway_cursor *cursor,
574 574
575 // The logic for whether we should send a tablet event or an emulated pointer 575 // The logic for whether we should send a tablet event or an emulated pointer
576 // event is tricky. It comes down to: 576 // event is tricky. It comes down to:
577 // * If we began a drag on a non-tablet surface (simulated_tool_tip_down), 577 // * If we began a drag on a non-tablet surface (simulating_pointer_from_tool_tip),
578 // then we should continue sending emulated pointer events regardless of 578 // then we should continue sending emulated pointer events regardless of
579 // whether the surface currently under us accepts tablet or not. 579 // whether the surface currently under us accepts tablet or not.
580 // * Otherwise, if we are over a surface that accepts tablet, then we should 580 // * Otherwise, if we are over a surface that accepts tablet, then we should
@@ -582,7 +582,7 @@ static void handle_tablet_tool_position(struct sway_cursor *cursor,
582 // * If we began a drag over a tablet surface, we should continue sending 582 // * If we began a drag over a tablet surface, we should continue sending
583 // tablet events until the drag is released, even if we are now over a 583 // tablet events until the drag is released, even if we are now over a
584 // non-tablet surface. 584 // non-tablet surface.
585 if (!cursor->simulated_tool_tip_down && 585 if (!cursor->simulating_pointer_from_tool_tip &&
586 ((surface && wlr_surface_accepts_tablet_v2(tablet->tablet_v2, surface)) || 586 ((surface && wlr_surface_accepts_tablet_v2(tablet->tablet_v2, surface)) ||
587 wlr_tablet_tool_v2_has_implicit_grab(tool->tablet_v2_tool))) { 587 wlr_tablet_tool_v2_has_implicit_grab(tool->tablet_v2_tool))) {
588 seatop_tablet_tool_motion(seat, tool, time_msec, dx, dy); 588 seatop_tablet_tool_motion(seat, tool, time_msec, dx, dy);
@@ -671,9 +671,9 @@ static void handle_tool_tip(struct wl_listener *listener, void *data) {
671 wlr_tablet_v2_tablet_tool_notify_up(sway_tool->tablet_v2_tool); 671 wlr_tablet_v2_tablet_tool_notify_up(sway_tool->tablet_v2_tool);
672 } 672 }
673 673
674 cursor->simulated_tool_tip_down = event->state == WLR_TABLET_TOOL_TIP_DOWN; 674 cursor->simulating_pointer_from_tool_tip = event->state == WLR_TABLET_TOOL_TIP_DOWN;
675 dispatch_cursor_button(cursor, event->device, event->time_msec, 675 dispatch_cursor_button(cursor, event->device, event->time_msec,
676 BTN_LEFT, cursor->simulated_tool_tip_down ? 676 BTN_LEFT, cursor->simulating_pointer_from_tool_tip ?
677 WLR_BUTTON_PRESSED : WLR_BUTTON_RELEASED); 677 WLR_BUTTON_PRESSED : WLR_BUTTON_RELEASED);
678 wlr_seat_pointer_notify_frame(cursor->seat->wlr_seat); 678 wlr_seat_pointer_notify_frame(cursor->seat->wlr_seat);
679 transaction_commit_dirty(); 679 transaction_commit_dirty();
@@ -684,10 +684,10 @@ static void handle_tool_tip(struct wl_listener *listener, void *data) {
684 wlr_tablet_v2_tablet_tool_notify_down(sway_tool->tablet_v2_tool); 684 wlr_tablet_v2_tablet_tool_notify_down(sway_tool->tablet_v2_tool);
685 wlr_tablet_tool_v2_start_implicit_grab(sway_tool->tablet_v2_tool); 685 wlr_tablet_tool_v2_start_implicit_grab(sway_tool->tablet_v2_tool);
686 } else { 686 } else {
687 if (cursor->simulated_tool_tip_down) { 687 if (cursor->simulating_pointer_from_tool_tip) {
688 dispatch_cursor_button(cursor, event->device, event->time_msec, BTN_LEFT, 688 dispatch_cursor_button(cursor, event->device, event->time_msec, BTN_LEFT,
689 WLR_BUTTON_RELEASED); 689 WLR_BUTTON_RELEASED);
690 cursor->simulated_tool_tip_down = false; 690 cursor->simulating_pointer_from_tool_tip = false;
691 } 691 }
692 692
693 wlr_tablet_v2_tablet_tool_notify_up(sway_tool->tablet_v2_tool); 693 wlr_tablet_v2_tablet_tool_notify_up(sway_tool->tablet_v2_tool);