From 814e88e453e2ab7f7cb362546dac74e09f2379c3 Mon Sep 17 00:00:00 2001 From: ookami Date: Sun, 17 Nov 2024 03:15:14 +0800 Subject: [PATCH] Fix sway_session_lock_has_surface Before this commit, if the cursor is at screen center, and the lock is swaylock, the cursor would be at swaylock's subsurface(the indicator). Since it's not the lock surface, `handle_rebase` would refuse to rebase the cursor to there. Thereby the cursor enter event won't be sent to swaylock. This commit fix the issue. --- sway/lock.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/sway/lock.c b/sway/lock.c index 168d469a19..700d09d0e6 100644 --- a/sway/lock.c +++ b/sway/lock.c @@ -1,6 +1,7 @@ #include #include #include +#include #include "log.h" #include "sway/input/cursor.h" #include "sway/input/keyboard.h" @@ -331,11 +332,26 @@ void sway_session_lock_add_output(struct sway_session_lock *lock, } } +static bool wlr_surface_has_subsurface(struct wlr_surface *surface, struct wlr_surface *sub) { + struct wlr_subsurface *subsurface = wlr_subsurface_try_from_wlr_surface(sub); + if (!subsurface) { + return false; + } + if (!subsurface->parent) { + return false; + } + if (subsurface->parent == surface) { + return true; + } + return wlr_surface_has_subsurface(subsurface->parent, surface); +} + bool sway_session_lock_has_surface(struct sway_session_lock *lock, struct wlr_surface *surface) { struct sway_session_lock_output *lock_output; wl_list_for_each(lock_output, &lock->outputs, link) { - if (lock_output->surface && lock_output->surface->surface == surface) { + if (lock_output->surface && (lock_output->surface->surface == surface + || wlr_surface_has_subsurface(lock_output->surface->surface, surface))) { return true; } }