mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-28 02:41:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix cursor events on lock/unlock

Browse source 
See https://github.com/labwc/labwc/pull/1858

Delay refocus operations because only the role-specific surface
commit/map handler has been processed in wlroots at this moment and
node_at_coords returns the WLR_SCENE_NODE_RECT as a buffer has not
been actually attached to the surface.
This commit is contained in:
ookami 2024-11-13 16:02:04 +08:00 committed by ookami
parent 5312376077
commit 625127d5d3
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sway/lock.c
View file

@ -59,7 +59,8 @@ static void refocus_output(struct sway_session_lock_output *output) {
} }
} }
static void handle_surface_map(struct wl_listener *listener, void *data) { static void update_focus(void *data) {
struct wl_listener *listener = data;
struct sway_session_lock_output *surf = wl_container_of(listener, surf, surface_map); struct sway_session_lock_output *surf = wl_container_of(listener, surf, surface_map);
if (surf->lock->focused == NULL) { if (surf->lock->focused == NULL) {
focus_surface(surf->lock, surf->surface->surface); focus_surface(surf->lock, surf->surface->surface);
@ -67,6 +68,10 @@ static void handle_surface_map(struct wl_listener *listener, void *data) {
cursor_rebase_all(); cursor_rebase_all();
} }
static void handle_surface_map(struct wl_listener *listener, void *data) {
wl_event_loop_add_idle(server.wl_event_loop, update_focus, listener);
}
static void handle_surface_destroy(struct wl_listener *listener, void *data) { static void handle_surface_destroy(struct wl_listener *listener, void *data) {
struct sway_session_lock_output *output = struct sway_session_lock_output *output =
wl_container_of(listener, output, surface_destroy); wl_container_of(listener, output, surface_destroy);
@ -234,6 +239,7 @@ static void handle_unlock(struct wl_listener *listener, void *data) {
struct sway_output *output = root->outputs->items[i]; struct sway_output *output = root->outputs->items[i];
arrange_layers(output); arrange_layers(output);
} }
cursor_rebase_all();
} }
static void handle_abandon(struct wl_listener *listener, void *data) { static void handle_abandon(struct wl_listener *listener, void *data) {