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

move ugglyness to client.h

Browse source
This commit is contained in:
Leonardo Hernández Hernández 2022-06-16 15:54:13 -05:00
parent 2ef5abfb72
commit 4ae6d0f387
Failed to generate hash of commit
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
client.h
View file

@ -231,6 +231,17 @@ client_min_size(Client *c, int *width, int *height)
*height = state->min_height; *height = state->min_height;
} }
static inline void
client_restack_surface(Client *c)
{
#ifdef XWAYLAND
if (client_is_x11(c))
wlr_xwayland_surface_restack(c->surface.xwayland, NULL,
XCB_STACK_MODE_ABOVE);
#endif
return;
}
static inline Client * static inline Client *
client_from_wlr_surface(struct wlr_surface *s) client_from_wlr_surface(struct wlr_surface *s)
{ {

10
dwl.c
View file

@ -1129,6 +1129,7 @@ focusclient(Client *c, int lift)
wl_list_insert(&fstack, &c->flink); wl_list_insert(&fstack, &c->flink);
selmon = c->mon; selmon = c->mon;
c->isurgent = 0; c->isurgent = 0;
client_restack_surface(c);
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
wlr_scene_rect_set_color(c->border[i], focuscolor); wlr_scene_rect_set_color(c->border[i], focuscolor);
@ -1169,15 +1170,6 @@ focusclient(Client *c, int lift)
return; return;
} }
#ifdef XWAYLAND
/* This resolves an issue where the last spawned xwayland client
* receives all pointer activity.
*/
if (c->type == X11Managed)
wlr_xwayland_surface_restack(c->surface.xwayland, NULL,
XCB_STACK_MODE_ABOVE);
#endif
/* Have a client, so focus its top-level wlr_surface */ /* Have a client, so focus its top-level wlr_surface */
kb = wlr_seat_get_keyboard(seat); kb = wlr_seat_get_keyboard(seat);
if (kb) if (kb)