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

add a new function to get a client from a wlr_surface

Browse source
This commit is contained in:
Leonardo Hernández Hernández 2022-05-23 09:14:21 -05:00
parent ecbc2c61db
commit 40449fa64f
Failed to generate hash of commit
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
client.h
View file

@ -231,6 +231,13 @@ client_min_size(Client *c, int *width, int *height)
*height = state->min_height; *height = state->min_height;
} }
static inline Client *
client_from_wlr_surface(struct wlr_surface *surface)
{
struct wlr_scene_node *n = surface->data;
return n ? n->data : NULL;
}
static inline Client * static inline Client *
client_from_popup(struct wlr_xdg_popup *popup) client_from_popup(struct wlr_xdg_popup *popup)
{ {

9
dwl.c
View file

@ -1142,8 +1142,7 @@ focusclient(Client *c, int lift)
return; return;
} else { } else {
Client *w; Client *w;
struct wlr_scene_node *node = old->data; if (old->role_data && (w = client_from_wlr_surface(old)))
if (old->role_data && (w = node->data))
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
wlr_scene_rect_set_color(w->border[i], bordercolor); wlr_scene_rect_set_color(w->border[i], bordercolor);
@ -2336,11 +2335,7 @@ void
urgent(struct wl_listener *listener, void *data) urgent(struct wl_listener *listener, void *data)
{ {
struct wlr_xdg_activation_v1_request_activate_event *event = data; struct wlr_xdg_activation_v1_request_activate_event *event = data;
Client *c; Client *c = client_from_wlr_surface(event->surface);
if (!wlr_surface_is_xdg_surface(event->surface))
return;
c = wlr_xdg_surface_from_wlr_surface(event->surface)->data;
if (c != selclient()) { if (c != selclient()) {
c->isurgent = 1; c->isurgent = 1;
printstatus(); printstatus();