diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-12-21 20:10:50 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-12-21 20:10:50 +0000 |
| commit | 239364510e41b034ad6ecb6cb51120232e7166cc (patch) | |
| tree | 37c3c57c97d3fda8179a0204d94318a738309cc0 /xserver/composite | |
| parent | 9c0c4e62648084518b26f71ef3e5664454486b42 (diff) | |
Update to xorg-server 1.9.3. Tested by japser@, landry@ and ajacoutot@
in various configurations.
Diffstat (limited to 'xserver/composite')
| -rw-r--r-- | xserver/composite/Makefile.in | 2 | ||||
| -rw-r--r-- | xserver/composite/compalloc.c | 2 | ||||
| -rw-r--r-- | xserver/composite/compwindow.c | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/xserver/composite/Makefile.in b/xserver/composite/Makefile.in index 4134adfdc..13634f94a 100644 --- a/xserver/composite/Makefile.in +++ b/xserver/composite/Makefile.in @@ -209,6 +209,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/composite/compalloc.c b/xserver/composite/compalloc.c index d8ccc1181..246e4c5fd 100644 --- a/xserver/composite/compalloc.c +++ b/xserver/composite/compalloc.c @@ -238,7 +238,7 @@ compFreeClientWindow (WindowPtr pWin, XID id) DamageRegister (&pWin->drawable, cw->damage); cw->damageRegistered = TRUE; pWin->redirectDraw = RedirectDrawAutomatic; - DamageRegionAppend(&pWin->drawable, &pWin->borderSize); + DamageDamageRegion(&pWin->drawable, &pWin->borderSize); } if (wasMapped && !pWin->mapped) { diff --git a/xserver/composite/compwindow.c b/xserver/composite/compwindow.c index 160b7644f..4dab13577 100644 --- a/xserver/composite/compwindow.c +++ b/xserver/composite/compwindow.c @@ -519,7 +519,7 @@ compCopyWindow (WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc) RegionTranslate(prgnSrc, pWin->drawable.x - ptOldOrg.x, pWin->drawable.y - ptOldOrg.y); - DamageRegionAppend(&pWin->drawable, prgnSrc); + DamageDamageRegion(&pWin->drawable, prgnSrc); } cs->CopyWindow = pScreen->CopyWindow; pScreen->CopyWindow = compCopyWindow; @@ -598,7 +598,7 @@ compSetRedirectBorderClip (WindowPtr pWin, RegionPtr pRegion) /* * Report that as damaged so it will be redrawn */ - DamageRegionAppend(&pWin->drawable, &damage); + DamageDamageRegion(&pWin->drawable, &damage); RegionUninit(&damage); /* * Save the new border clip region |