diff options
| author |  Tudor Brindus <me@tbrindus.ca> | 2020-04-25 21:30:19 -0400 |
|---|---|---|
| committer |  Simon Ser <contact@emersion.fr> | 2020-04-26 09:14:54 +0200 |
| commit | a5c26e6a05329ab1a626fe03e617e59982c0067d (patch) | |
| tree | 826685019185798215811decad42680fab5fda1f | |
| parent | config/output: reconfigure input devices after full output init (diff) | |
| download | sway-a5c26e6a05329ab1a626fe03e617e59982c0067d.tar.gz sway-a5c26e6a05329ab1a626fe03e617e59982c0067d.tar.zst sway-a5c26e6a05329ab1a626fe03e617e59982c0067d.zip | |
input/tablet: query tablet focused surface for cursor image check
`handle_tablet_tool_set_cursor` was copied from input/cursor.c's
`handle_request_set_cursor`, but the focused surface check was not
adjusted appropriately.
Fixes #5257.
| -rw-r--r-- | sway/input/tablet.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sway/input/tablet.c b/sway/input/tablet.c index 8d6e95b3..b74347aa 100644 --- a/sway/input/tablet.c +++ b/sway/input/tablet.c | |||
| @@ -106,8 +106,7 @@ static void handle_tablet_tool_set_cursor(struct wl_listener *listener, void *da | |||
| 106 | } | 106 | } |
| 107 | 107 | ||
| 108 | struct wl_client *focused_client = NULL; | 108 | struct wl_client *focused_client = NULL; |
| 109 | struct wlr_surface *focused_surface = | 109 | struct wlr_surface *focused_surface = tool->tablet_v2_tool->focused_surface; |
| 110 | cursor->seat->wlr_seat->pointer_state.focused_surface; | ||
| 111 | if (focused_surface != NULL) { | 110 | if (focused_surface != NULL) { |
| 112 | focused_client = wl_resource_get_client(focused_surface->resource); | 111 | focused_client = wl_resource_get_client(focused_surface->resource); |
| 113 | } | 112 | } |