4 Commits
Author SHA1 Message Date
guyuming a6e2c155de fix focustop(): prefer a visible fullscreen client
Problem (reproducible on vanilla 0.9, unrelated to any local patch):
1. fullscreen client A on tag 3 (MOD+e);
2. MOD+0 to view all tags;
3. MOD+1 to switch to tag 1, focus lands on client B;
4. MOD+0 again: client A is displayed fullscreen, covering everything,
   but the focused client is the invisible B;
5. so MOD+e / MOD+q act on B behind A and the user thinks MOD+e does
   not work on A until A is clicked with the mouse.

Root cause: focustop() returns the first VISIBLEON() client on the
fstack, but VISIBLEON() only checks whether the client is on a
currently visible tag; it does not check whether the client is covered
by a fullscreen client. When switching back to tag 0, the last focused
client B is first on the fstack, so B gets the focus while A is still
displayed fullscreen.

Fix: focustop() first looks for a visible fullscreen client on the
fstack (at most one fullscreen client per monitor is actually shown,
and it always sits on top, covering the whole monitor), and only falls
back to the previous "first visible client" if there is none. As a
result:
- after a tag switch the focus goes back to the fullscreen client that
  actually occupies the screen, so MOD+e / MOD+q behave as expected;
- the fullscreen_bg decision in arrange() is fixed as a side effect
  (it used to be turned off when the focus was not on the fullscreen
  client, so a non-opaque fullscreen surface could reveal other
  clients behind it, which violates the protocol);
- focusstack() already returns early when the focused client is
  fullscreen, so MOD+j/k and the arrow keys no longer move the focus
  to a covered client either.

Verified with headless dwl, two foot clients and keys injected through
zwp_virtual_keyboard_v1: before the fix the last step gives
focal = winB / fullscreen 0; after the fix focal = winA / fullscreen 1,
and MOD+e then restores A as expected.

ta: 20261031_022753
2026-11-02 15:34:33 +08:00
Guido Cella be2bd72314 remove old comment
This was added 4 years in ago in 8cdb997. New users won't understand
what "old behavior" refers to, so this line is confusing. And it is
self-evident that you should change the alpha value if you want
transparency.
2026-10-29 17:51:48 +01:00
Guido Cella 12a5856427 don't allocate memory for drag_icon_destroy
Not needed since dwl supports only one drag icon at a time.
2026-10-27 23:14:43 +01:00
save196 4ecb2a9df5 fix the focused border color after leaving an unmanaged client
Clients focused after an unmanaged client that wants focus didn't get
the focused border color. Regression from 87029e2.
2026-10-26 15:49:23 +02:00
2 changed files with 8 additions and 6 deletions
-1
View File
@@ -12,7 +12,6 @@ static const float rootcolor[] = COLOR(0x222222ff);
static const float bordercolor[] = COLOR(0x444444ff);
static const float focuscolor[] = COLOR(0x005577ff);
static const float urgentcolor[] = COLOR(0xff0000ff);
/* This conforms to the xdg-protocol. Set the alpha to zero to restore the old behavior */
static const float fullscreen_bg[] = {0.0f, 0.0f, 0.0f, 1.0f}; /* You can also use glsl colors */
/* tagging - TAGCOUNT must be no greater than 31 */
+8 -5
View File
@@ -482,6 +482,7 @@ static struct wl_listener request_set_sel = {.notify = setsel};
static struct wl_listener request_set_cursor_shape = {.notify = setcursorshape};
static struct wl_listener request_start_drag = {.notify = requeststartdrag};
static struct wl_listener start_drag = {.notify = startdrag};
static struct wl_listener drag_icon_destroy = {.notify = destroydragicon};
static struct wl_listener new_session_lock = {.notify = locksession};
static struct wl_listener new_foreign_toplevel_capture_request = {.notify = capturerequest};
@@ -1423,7 +1424,6 @@ destroydragicon(struct wl_listener *listener, void *data)
focusclient(focustop(selmon), NULL, 1);
motionnotify(0, NULL, 0, 0, 0, 0);
wl_list_remove(&listener->link);
free(listener);
}
void
@@ -1610,7 +1610,6 @@ focusclient(Client *c, LayerSurface *l, int lift)
/* Don't change border color if there is an exclusive focus or we are
* handling a drag operation */
if (!(old_l && old_l->layer_surface->current.keyboard_interactive == ZWLR_LAYER_SURFACE_V1_KEYBOARD_INTERACTIVITY_EXCLUSIVE)
&& !(old_c && client_wants_focus(old_c))
&& !seat->drag)
client_set_border_color(c, focuscolor);
}
@@ -1701,10 +1700,14 @@ Client *
focustop(Monitor *m)
{
Client *c;
wl_list_for_each(c, &fstack, flink) {
wl_list_for_each(c, &fstack, flink)
if (VISIBLEON(c, m) && c->isfullscreen)
return c;
wl_list_for_each(c, &fstack, flink)
if (VISIBLEON(c, m))
return c;
}
return NULL;
}
@@ -3023,7 +3026,7 @@ startdrag(struct wl_listener *listener, void *data)
return;
drag->icon->data = &wlr_scene_drag_icon_create(drag_icon, drag->icon)->node;
LISTEN_STATIC(&drag->icon->events.destroy, destroydragicon);
wl_signal_add(&drag->icon->events.destroy, &drag_icon_destroy);
}
void