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

input/cursor: correctly transfer focus when using tablet pen

Browse source 
Fixes #4819.

This commit ensures that `seat_set_focus` is called to transfer focus
when a window is selected via a pen. Previously, it would race with
`node_at_coords`, and only properly transfer focus if its returned
`surface` was NULL.
This commit is contained in:
Tudor Brindus 2020-03-14 15:40:57 -04:00 committed by Simon Ser
parent 3de1a3958e
commit d77247117c
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sway/input/cursor.c
View file

@ -520,8 +520,8 @@ static void handle_tablet_tool_position(struct sway_cursor *cursor,
double sx, sy; double sx, sy;
struct wlr_surface *surface = NULL; struct wlr_surface *surface = NULL;
struct sway_seat *seat = cursor->seat; struct sway_seat *seat = cursor->seat;
node_at_coords(seat, cursor->cursor->x, cursor->cursor->y, struct sway_node *focused_node = node_at_coords(seat, cursor->cursor->x,
&surface, &sx, &sy); cursor->cursor->y, &surface, &sx, &sy);
struct sway_tablet_tool *sway_tool = tool->data; struct sway_tablet_tool *sway_tool = tool->data;
if (!surface || !wlr_surface_accepts_tablet_v2(tablet->tablet_v2, surface)) { if (!surface || !wlr_surface_accepts_tablet_v2(tablet->tablet_v2, surface)) {
@ -534,6 +534,10 @@ static void handle_tablet_tool_position(struct sway_cursor *cursor,
wlr_tablet_v2_tablet_tool_notify_proximity_in(sway_tool->tablet_v2_tool, wlr_tablet_v2_tablet_tool_notify_proximity_in(sway_tool->tablet_v2_tool,
tablet->tablet_v2, surface); tablet->tablet_v2, surface);
if (focused_node && config->focus_follows_mouse != FOLLOWS_NO) {
seat_set_focus(seat, focused_node);
}
wlr_tablet_v2_tablet_tool_notify_motion(sway_tool->tablet_v2_tool, sx, sy); wlr_tablet_v2_tablet_tool_notify_motion(sway_tool->tablet_v2_tool, sx, sy);
} }