alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

input/cursor: release simulated tool tip button when over v2 surface

Browse source 
d88460f addressed sending v2 tool tip up when over a non-v2 surface.
This commit addresses the other direction.

Fixes #5230.
This commit is contained in:
Tudor Brindus 2020-04-25 22:12:59 -04:00 committed by Simon Ser
parent 091f580b7c
commit 2913f39dcb
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/sway/input/cursor.h
View file

@ -55,6 +55,7 @@ struct sway_cursor {
struct wl_listener tool_tip; struct wl_listener tool_tip;
struct wl_listener tool_proximity; struct wl_listener tool_proximity;
struct wl_listener tool_button; struct wl_listener tool_button;
bool simulated_tool_tip_down;
uint32_t tool_buttons; uint32_t tool_buttons;
struct wl_listener request_set_cursor; struct wl_listener request_set_cursor;

9
sway/input/cursor.c
View file

@ -618,8 +618,9 @@ static void handle_tool_tip(struct wl_listener *listener, void *data) {
wlr_tablet_v2_tablet_tool_notify_up(sway_tool->tablet_v2_tool); wlr_tablet_v2_tablet_tool_notify_up(sway_tool->tablet_v2_tool);
} }
cursor->simulated_tool_tip_down = event->state == WLR_TABLET_TOOL_TIP_DOWN;
dispatch_cursor_button(cursor, event->device, event->time_msec, dispatch_cursor_button(cursor, event->device, event->time_msec,
BTN_LEFT, event->state == WLR_TABLET_TOOL_TIP_DOWN ? BTN_LEFT, cursor->simulated_tool_tip_down ?
WLR_BUTTON_PRESSED : WLR_BUTTON_RELEASED); WLR_BUTTON_PRESSED : WLR_BUTTON_RELEASED);
wlr_seat_pointer_notify_frame(cursor->seat->wlr_seat); wlr_seat_pointer_notify_frame(cursor->seat->wlr_seat);
transaction_commit_dirty(); transaction_commit_dirty();
@ -630,6 +631,12 @@ static void handle_tool_tip(struct wl_listener *listener, void *data) {
wlr_tablet_v2_tablet_tool_notify_down(sway_tool->tablet_v2_tool); wlr_tablet_v2_tablet_tool_notify_down(sway_tool->tablet_v2_tool);
wlr_tablet_tool_v2_start_implicit_grab(sway_tool->tablet_v2_tool); wlr_tablet_tool_v2_start_implicit_grab(sway_tool->tablet_v2_tool);
} else { } else {
if (cursor->simulated_tool_tip_down) {
dispatch_cursor_button(cursor, event->device, event->time_msec, BTN_LEFT,
WLR_BUTTON_RELEASED);
cursor->simulated_tool_tip_down = false;
}
wlr_tablet_v2_tablet_tool_notify_up(sway_tool->tablet_v2_tool); wlr_tablet_v2_tablet_tool_notify_up(sway_tool->tablet_v2_tool);
} }
} }