semfault/dwl
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

refactor focusclient

Browse source
This commit is contained in:
Devin J. Pohly 2020-08-02 18:43:29 -05:00
parent 7856cdc1bf
commit ef7a37649c
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
dwl.c
View file

@ -673,6 +673,16 @@ focusclient(Client *old, Client *c, int lift)
{ {
struct wlr_keyboard *kb = wlr_seat_get_keyboard(seat); struct wlr_keyboard *kb = wlr_seat_get_keyboard(seat);
/* Raise client in stacking order if requested */
if (c && lift) {
wl_list_remove(&c->slink);
wl_list_insert(&stack, &c->slink);
}
/* Nothing else to do? */
if (c == old)
return;
/* Deactivate old client if focus is changing */ /* Deactivate old client if focus is changing */
if (c != old && old) { if (c != old && old) {
if (old->type != XDGShell) if (old->type != XDGShell)
@ -692,15 +702,10 @@ focusclient(Client *old, Client *c, int lift)
wlr_seat_keyboard_notify_enter(seat, WLR_SURFACE(c), wlr_seat_keyboard_notify_enter(seat, WLR_SURFACE(c),
kb->keycodes, kb->num_keycodes, &kb->modifiers); kb->keycodes, kb->num_keycodes, &kb->modifiers);
/* Select client's monitor, move it to the top of the focus stack, and /* Put the new client atop the focus stack and select its monitor */
* raise it in the stacking order if requested. */
selmon = c->mon;
wl_list_remove(&c->flink); wl_list_remove(&c->flink);
wl_list_insert(&fstack, &c->flink); wl_list_insert(&fstack, &c->flink);
if (lift) { selmon = c->mon;
wl_list_remove(&c->slink);
wl_list_insert(&stack, &c->slink);
}
/* Activate the new client */ /* Activate the new client */
if (c->type != XDGShell) if (c->type != XDGShell)