jachym/dwl
1
0
Fork 0
mirror of https://codeberg.org/dwl/dwl.git synced 2026-09-19 22:02:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

let the focus leave an unmanaged surface

Browse Source 
Unmanaged clients spawned by a parent window, like menus, would not
close if the user changed workspace or focused another client while the
menu was selected, because the parent was never told that it lost the
focus. This remembers the last managed client and deactivates it on a
focus change, so that it closes the menu itself.

This also fixes a regression introduced by f6e3a28, where menus would
close immediately after being opened.
This commit is contained in:
save196
2026-09-18 09:17:40 +02:00
committed by Guido Cella
parent e451862544
commit 669b26d0a9
1 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dwl.c
+25 -17
View File
@@ -377,6 +377,7 @@ static void zoom(const Arg *arg);
static pid_t child_pid = -1; static pid_t child_pid = -1;
static int locked; static int locked;
static void *exclusive_focus; static void *exclusive_focus;
static Client *focused_client;
static struct wl_display *dpy; static struct wl_display *dpy;
static struct wl_event_loop *event_loop; static struct wl_event_loop *event_loop;
static struct wlr_backend *backend; static struct wlr_backend *backend;
@@ -1523,6 +1524,9 @@ focusclient(Client *c, int lift)
wlr_xdg_popup_destroy(popup); wlr_xdg_popup_destroy(popup);
} }
if (old_c && old_c == exclusive_focus && client_wants_focus(old_c))
exclusive_focus = NULL;
/* Put the new client atop the focus stack and select its monitor */ /* Put the new client atop the focus stack and select its monitor */
if (c && !client_is_unmanaged(c)) { if (c && !client_is_unmanaged(c)) {
wl_list_remove(&c->flink); wl_list_remove(&c->flink);
@@ -1536,24 +1540,23 @@ focusclient(Client *c, int lift)
client_set_border_color(c, focuscolor); client_set_border_color(c, focuscolor);
} }
/* Deactivate old client if focus is changing */ /* If an overlay is focused, don't focus or activate the client,
if (old && (!c || client_surface(c) != old)) { * but only update its position in fstack to render its border with focuscolor
/* If an overlay is focused, don't focus or activate the client, * and focus it after the overlay is closed. */
* but only update its position in fstack to render its border with focuscolor if (old && (!c || client_surface(c) != old)
* and focus it after the overlay is closed. */ && old_client_type == LayerShell && wlr_scene_node_coords(
if (old_client_type == LayerShell && wlr_scene_node_coords( &old_l->scene->node, &unused_lx, &unused_ly)
&old_l->scene->node, &unused_lx, &unused_ly) && old_l->layer_surface->current.layer >= ZWLR_LAYER_SHELL_V1_LAYER_TOP
&& old_l->layer_surface->current.layer >= ZWLR_LAYER_SHELL_V1_LAYER_TOP && old_l->layer_surface->current.keyboard_interactive == ZWLR_LAYER_SURFACE_V1_KEYBOARD_INTERACTIVITY_EXCLUSIVE)
&& old_l->layer_surface->current.keyboard_interactive == ZWLR_LAYER_SURFACE_V1_KEYBOARD_INTERACTIVITY_EXCLUSIVE) { return;
return;
} else if (old_c && old_c == exclusive_focus && client_wants_focus(old_c)) {
return;
} else if (old_c && !client_is_unmanaged(old_c)) {
if (c && !client_is_unmanaged(c))
client_set_border_color(old_c, bordercolor);
client_activate_surface(old, 0); if (focused_client && focused_client != c && !(c && client_is_unmanaged(c))) {
} struct wlr_surface *s = client_surface(focused_client);
if (c)
client_set_border_color(focused_client, bordercolor);
if (s && s->mapped)
client_activate_surface(s, 0);
focused_client = NULL;
} }
printstatus(); printstatus();
@@ -1574,6 +1577,9 @@ focusclient(Client *c, int lift)
/* Activate the new client */ /* Activate the new client */
client_activate_surface(client_surface(c), 1); client_activate_surface(client_surface(c), 1);
if (!client_is_unmanaged(c))
focused_client = c;
} }
void void
@@ -2980,6 +2986,8 @@ unmapnotify(struct wl_listener *listener, void *data)
cursor_mode = CurNormal; cursor_mode = CurNormal;
grabc = NULL; grabc = NULL;
} }
if (c == focused_client)
focused_client = NULL;
if (client_is_unmanaged(c)) { if (client_is_unmanaged(c)) {
if (c == exclusive_focus) { if (c == exclusive_focus) {