Skip to content

Commit

Permalink
Fix dwl freezing when resizing
Browse files Browse the repository at this point in the history
  • Loading branch information
PalanixYT authored and sevz17 committed Mar 23, 2022
1 parent 326eee1 commit 7d724dc
Showing 1 changed file with 22 additions and 6 deletions.
28 changes: 22 additions & 6 deletions dwl.c
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ struct Monitor {
unsigned int tagset[2];
double mfact;
int nmaster;
int un_map; /* If a map/unmap happened on this monitor, then this should be true */
};

typedef struct {
Expand Down Expand Up @@ -1379,6 +1380,8 @@ mapnotify(struct wl_listener *listener, void *data)

if (c->isfullscreen)
setfullscreen(c, 1);

c->mon->un_map = 1;
}

void
Expand Down Expand Up @@ -1648,17 +1651,27 @@ rendermon(struct wl_listener *listener, void *data)
int skip = 0;
struct timespec now;

clock_gettime(CLOCK_MONOTONIC, &now);

/* Render if no XDG clients have an outstanding resize and are visible on
* this monitor.
*/
wl_list_for_each(c, &clients, link)
skip = skip || (c->resize && VISIBLEON(c, m));
* this monitor. */
/* Checking m->un_map for every client is not optimal but works */
wl_list_for_each(c, &clients, link) {
if ((c->resize && m->un_map) || (c->type == XDGShell
&& (c->surface.xdg->pending.geometry.width !=
c->surface.xdg->current.geometry.width
|| c->surface.xdg->pending.geometry.height !=
c->surface.xdg->current.geometry.height))) {
/* Lie */
wlr_surface_send_frame_done(client_surface(c), &now);
skip = 1;
}
}
if (!skip && !wlr_scene_output_commit(m->scene_output))
return;

/* Let clients know a frame has been rendered */
clock_gettime(CLOCK_MONOTONIC, &now);
wlr_scene_output_send_frame_done(m->scene_output, &now);
m->un_map = 0;
}

void
Expand Down Expand Up @@ -2196,6 +2209,9 @@ unmapnotify(struct wl_listener *listener, void *data)
grabc = NULL;
}

if (c->mon)
c->mon->un_map = 1;

if (client_is_unmanaged(c)) {
wlr_scene_node_destroy(c->scene);
return;
Expand Down

0 comments on commit 7d724dc

Please sign in to comment.