diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-09-06 19:44:39 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-09-06 19:44:39 +0000 |
| commit | 9401e5643e90e23287b785e5fc238bb7c7f2d896 (patch) | |
| tree | 759a23118c7bb4a1cddc87b3ad5c63f459a64bd2 /xserver/composite/compalloc.c | |
| parent | 6d29d2deb77299e537a0daf2babf0e217ce51376 (diff) | |
update to xserver 1.6.4rc1. Tested by many, ok oga@.
Diffstat (limited to 'xserver/composite/compalloc.c')
| -rw-r--r-- | xserver/composite/compalloc.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/xserver/composite/compalloc.c b/xserver/composite/compalloc.c index 19c7db0b3..a2f3f140a 100644 --- a/xserver/composite/compalloc.c +++ b/xserver/composite/compalloc.c @@ -148,6 +148,16 @@ compRedirectWindow (ClientPtr pClient, WindowPtr pWin, int update) return BadAlloc; if (ccw->update == CompositeRedirectManual) { + /* If the window was CompositeRedirectAutomatic, then + * unmap the window so that the parent clip list will + * be correctly recomputed. + */ + if (pWin->mapped) + { + DisableMapUnmapEvents (pWin); + UnmapWindow (pWin, FALSE); + EnableMapUnmapEvents (pWin); + } if (cw->damageRegistered) { DamageUnregister (&pWin->drawable, cw->damage); @@ -224,7 +234,7 @@ compFreeClientWindow (WindowPtr pWin, XID id) DamageRegister (&pWin->drawable, cw->damage); cw->damageRegistered = TRUE; pWin->redirectDraw = RedirectDrawAutomatic; - DamageDamageRegion (&pWin->drawable, &pWin->borderSize); + DamageRegionAppend(&pWin->drawable, &pWin->borderSize); } if (wasMapped && !pWin->mapped) { |