mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-16 08:21:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0d84c753b2 into 81246fc6dc

Browse source
This commit is contained in:
Okami 2026-04-12 16:03:00 +03:00 • committed by GitHub
commit 82a801cc32
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

18
sway/lock.c
View file

@ -26,6 +26,7 @@ struct sway_session_lock_output {
// invalid if surface is NULL
struct wl_listener surface_destroy;
struct wl_listener surface_map;
struct wl_listener surface_commit;
};
static void focus_surface(struct sway_session_lock *lock,
@ -64,7 +65,15 @@ static void handle_surface_map(struct wl_listener *listener, void *data) {
if (surf->lock->focused == NULL) {
focus_surface(surf->lock, surf->surface->surface);
}
}
static void handle_surface_commit(struct wl_listener *listener, void *data) {
// We need to rebase cursor after surface_reconfigure, which is called after the commit event.
// If we rebase cursor earlier, wlr_scene_node_at won't get the session lock scene node.
cursor_rebase_all();
struct sway_session_lock_output *surf = wl_container_of(listener, surf, surface_commit);
wl_list_remove(&surf->surface_commit.link);
wl_list_init(&surf->surface_commit.link);
}
static void handle_surface_destroy(struct wl_listener *listener, void *data) {
@ -76,6 +85,7 @@ static void handle_surface_destroy(struct wl_listener *listener, void *data) {
output->surface = NULL;
wl_list_remove(&output->surface_destroy.link);
wl_list_remove(&output->surface_map.link);
wl_list_remove(&output->surface_commit.link);
}
static void lock_output_reconfigure(struct sway_session_lock_output *output) {
@ -125,6 +135,8 @@ static void handle_new_surface(struct wl_listener *listener, void *data) {
wl_signal_add(&lock_surface->events.destroy, &lock_output->surface_destroy);
lock_output->surface_map.notify = handle_surface_map;
wl_signal_add(&lock_surface->surface->events.map, &lock_output->surface_map);
lock_output->surface_commit.notify = handle_surface_commit;
wl_signal_add(&lock_surface->surface->events.commit, &lock_output->surface_commit);
lock_output_reconfigure(lock_output);
}
@ -134,6 +146,7 @@ static void sway_session_lock_output_destroy(struct sway_session_lock_output *ou
refocus_output(output);
wl_list_remove(&output->surface_destroy.link);
wl_list_remove(&output->surface_map.link);
wl_list_remove(&output->surface_commit.link);
}
wl_list_remove(&output->destroy.link);
@ -237,6 +250,8 @@ static void handle_unlock(struct wl_listener *listener, void *data) {
// Views are now visible, so check if we need to activate inhibition again.
sway_idle_inhibit_v1_check_active();
cursor_rebase_all();
}
static void handle_abandon(struct wl_listener *listener, void *data) {
@ -335,8 +350,9 @@ void sway_session_lock_add_output(struct sway_session_lock *lock,
bool sway_session_lock_has_surface(struct sway_session_lock *lock,
struct wlr_surface *surface) {
struct sway_session_lock_output *lock_output;
struct wlr_surface *root_surface = wlr_surface_get_root_surface(surface);
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 == root_surface) {
return true;
}
}