jachym/dwl
1
0
Fork 0
mirror of https://codeberg.org/dwl/dwl.git synced 2025-12-18 02:43:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix flickering on map/unmap, fix 'overshoot' of clients when resizing

Browse Source
This commit is contained in:
Palanix 2022-04-01 22:57:32 +02:00
parent 2ad87169d1
commit 0eee8e253c
1 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
dwl.c
View File

@ -181,7 +181,7 @@ struct Monitor {
unsigned int tagset[2]; unsigned int tagset[2];
double mfact; double mfact;
int nmaster; int nmaster;
int un_map; /* If a map/unmap happened on this monitor, then this should be true */ int arr;
}; };
typedef struct { typedef struct {
@ -490,6 +490,7 @@ arrange(Monitor *m)
if (m->lt[m->sellt]->arrange) if (m->lt[m->sellt]->arrange)
m->lt[m->sellt]->arrange(m); m->lt[m->sellt]->arrange(m);
/* TODO recheck pointer focus here... or in resize()? */ /* TODO recheck pointer focus here... or in resize()? */
m->arr = 1;
} }
void void
@ -1405,8 +1406,6 @@ mapnotify(struct wl_listener *listener, void *data)
if (c->isfullscreen) if (c->isfullscreen)
setfullscreen(c, 1); setfullscreen(c, 1);
c->mon->un_map = 1;
} }
void void
@ -1662,6 +1661,21 @@ quitsignal(int signo)
quit(NULL); quit(NULL);
} }
int
pixelonmon(Client *c, Monitor *m)
{
/* This is needed for when you don't want to check formal assignment,
* but rather actual displaying of the pixels.
* Usually VISIBLEON suffices and is also faster. */
struct wlr_surface_output *s = NULL;
if (!c->scene->state.enabled)
return 0;
wl_list_for_each(s, &client_surface(c)->current_outputs, link)
if (s->output == m->wlr_output)
return 1;
return 0;
}
void void
rendermon(struct wl_listener *listener, void *data) rendermon(struct wl_listener *listener, void *data)
{ {
@ -1676,23 +1690,15 @@ rendermon(struct wl_listener *listener, void *data)
/* Render if no XDG clients have an outstanding resize and are visible on /* Render if no XDG clients have an outstanding resize and are visible on
* this monitor. */ * this monitor. */
/* Checking m->un_map for every client is not optimal but works */ wl_list_for_each(c, &clients, link)
wl_list_for_each(c, &clients, link) { if (pixelonmon(c,m) && (!c->isfloating && (c->resize))) goto skip;
if ((c->resize && m->un_map) || (c->type == XDGShell
&& (c->surface.xdg->pending.geometry.width != if (!wlr_scene_output_commit(m->scene_output))
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; return;
/* Let clients know a frame has been rendered */ /* Let clients know a frame has been rendered */
skip:
wlr_scene_output_send_frame_done(m->scene_output, &now); wlr_scene_output_send_frame_done(m->scene_output, &now);
m->un_map = 0; m->arr = 0;
} }
void void
@ -2235,9 +2241,6 @@ unmapnotify(struct wl_listener *listener, void *data)
grabc = NULL; grabc = NULL;
} }
if (c->mon)
c->mon->un_map = 1;
if (client_is_unmanaged(c)) { if (client_is_unmanaged(c)) {
wlr_scene_node_destroy(c->scene); wlr_scene_node_destroy(c->scene);
return; return;