BitHeaven
/
picom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Workaround for what seems to be a race in Xserver" 

This reverts commit 967d9f32ea.
This commit is contained in:
Yuxuan Shui 2018-09-22 19:43:35 +01:00
parent 967d9f32ea
commit 43f3744fea
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/compton.c
View File

@ -2089,7 +2089,7 @@ paint_all(session_t *ps, XserverRegion region, XserverRegion region_real, win *t
} }
static void static void
repair_win(session_t *ps, win *w, XDamageNotifyEvent *de) { repair_win(session_t *ps, win *w) {
if (IsViewable != w->a.map_state) if (IsViewable != w->a.map_state)
return; return;
@ -2097,8 +2097,12 @@ repair_win(session_t *ps, win *w, XDamageNotifyEvent *de) {
if (!w->ever_damaged) { if (!w->ever_damaged) {
parts = win_extents(ps, w); parts = win_extents(ps, w);
set_ignore_next(ps);
XDamageSubtract(ps->dpy, w->damage, None, None);
} else { } else {
parts = XFixesCreateRegion(ps->dpy, (XRectangle[]){de->area}, 1); parts = XFixesCreateRegion(ps->dpy, 0, 0);
set_ignore_next(ps);
XDamageSubtract(ps->dpy, w->damage, None, parts);
XFixesTranslateRegion(ps->dpy, parts, XFixesTranslateRegion(ps->dpy, parts,
w->a.x + w->a.border_width, w->a.x + w->a.border_width,
w->a.y + w->a.border_width); w->a.y + w->a.border_width);
@ -3225,7 +3229,7 @@ ev_damage_notify(session_t *ps, XDamageNotifyEvent *de) {
if (!w) return; if (!w) return;
repair_win(ps, w, de); repair_win(ps, w);
} }
inline static void inline static void
@ -5410,6 +5414,7 @@ session_init(session_t *ps_old, int argc, char **argv) {
if (!ps->dpy) { if (!ps->dpy) {
printf_errfq(1, "(): Can't open display."); printf_errfq(1, "(): Can't open display.");
} }
XSetEventQueueOwner(ps->dpy, XCBOwnsEventQueue);
} }
XSetErrorHandler(xerror); XSetErrorHandler(xerror);

2
src/win.c
View File

@ -878,7 +878,7 @@ bool add_win(session_t *ps, Window id, Window prev) {
// Create Damage for window // Create Damage for window
set_ignore_next(ps); set_ignore_next(ps);
new->damage = XDamageCreate(ps->dpy, id, XDamageReportRawRectangles); new->damage = XDamageCreate(ps->dpy, id, XDamageReportNonEmpty);
} }
calc_win_size(ps, new); calc_win_size(ps, new);