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

Layer shell: Prevent infinte configure/commit loop

Browse source 
Check the wlr_layer_surface_v1_state.committed bitmask to see if we need
to rearrange. This is also what sway does.

Without this check, every commit request (even if only the attached buffer
changed) will lead to another configure event, which will lead to another
commit, etc.

This loop results in swaybg consuming 100% CPU.

Co-authored-by: Owen Rafferty <owen@owenrafferty.com>
This commit is contained in:
Raphael Robatsch 2021-11-06 19:51:17 +01:00 committed by Leonardo Hernández Hernández
parent b424602ebc
commit 79b7e755b0
Failed to generate hash of commit
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
dwl.c
View file

@ -140,6 +140,7 @@ typedef struct {
typedef struct { typedef struct {
/* Must be first */ /* Must be first */
unsigned int type; /* LayerShell */ unsigned int type; /* LayerShell */
int mapped;
struct wlr_scene_node *scene; struct wlr_scene_node *scene;
struct wl_list link; struct wl_list link;
struct wlr_layer_surface_v1 *layer_surface; struct wlr_layer_surface_v1 *layer_surface;
@ -758,6 +759,12 @@ commitlayersurfacenotify(struct wl_listener *listener, void *data)
if (!wlr_output || !(m = wlr_output->data)) if (!wlr_output || !(m = wlr_output->data))
return; return;
if (wlr_layer_surface->current.committed == 0
&& layersurface->mapped == wlr_layer_surface->mapped)
return;
layersurface->mapped = wlr_layer_surface->mapped;
if (layers[wlr_layer_surface->current.layer] != layersurface->scene) { if (layers[wlr_layer_surface->current.layer] != layersurface->scene) {
wl_list_remove(&layersurface->link); wl_list_remove(&layersurface->link);
wl_list_insert(&m->layers[wlr_layer_surface->current.layer], wl_list_insert(&m->layers[wlr_layer_surface->current.layer],