diff options
| author | marha <marha@users.sourceforge.net> | 2011-05-16 09:49:27 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-05-16 09:49:27 +0000 |
| commit | ab5c2d2c78273ccdc7c9734bcba482a33fcf9652 (patch) | |
| tree | d12aaeba9956621fe7429d94a7c90105fe306b42 /xorg-server/composite/compwindow.c | |
| parent | 421ecdd3ee6f691c63c4568944423d986f9f69db (diff) | |
| parent | 08cbf3b50bfe713044f36b363c73768cd042f13c (diff) | |
| download | vcxsrv-ab5c2d2c78273ccdc7c9734bcba482a33fcf9652.tar.gz vcxsrv-ab5c2d2c78273ccdc7c9734bcba482a33fcf9652.tar.bz2 vcxsrv-ab5c2d2c78273ccdc7c9734bcba482a33fcf9652.zip | |
merge ^/branches/released .
Diffstat (limited to 'xorg-server/composite/compwindow.c')
| -rw-r--r-- | xorg-server/composite/compwindow.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/xorg-server/composite/compwindow.c b/xorg-server/composite/compwindow.c index ef1f7f154..967e992c9 100644 --- a/xorg-server/composite/compwindow.c +++ b/xorg-server/composite/compwindow.c @@ -164,8 +164,18 @@ compCheckRedirect (WindowPtr pWin) {
if (should)
return compAllocPixmap (pWin);
+ else {
+ ScreenPtr pScreen = pWin->drawable.pScreen;
+ PixmapPtr pPixmap = (*pScreen->GetWindowPixmap) (pWin);
+ compSetParentPixmap (pWin);
+ compRestoreWindow (pWin, pPixmap);
+ (*pScreen->DestroyPixmap) (pPixmap);
+ }
+ } else if (should) {
+ if (cw->update == CompositeRedirectAutomatic)
+ pWin->redirectDraw = RedirectDrawAutomatic;
else
- compFreePixmap (pWin);
+ pWin->redirectDraw = RedirectDrawManual;
}
return TRUE;
}
@@ -583,8 +593,11 @@ compDestroyWindow (WindowPtr pWin) while ((csw = GetCompSubwindows (pWin)))
FreeResource (csw->clients->id, RT_NONE);
- if (pWin->redirectDraw != RedirectDrawNone)
- compFreePixmap (pWin);
+ if (pWin->redirectDraw != RedirectDrawNone) {
+ PixmapPtr pPixmap = (*pScreen->GetWindowPixmap) (pWin);
+ compSetParentPixmap (pWin);
+ (*pScreen->DestroyPixmap) (pPixmap);
+ }
ret = (*pScreen->DestroyWindow) (pWin);
cs->DestroyWindow = pScreen->DestroyWindow;
pScreen->DestroyWindow = compDestroyWindow;
|