diff options
| author | marha <marha@users.sourceforge.net> | 2011-02-25 08:27:07 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-02-25 08:27:07 +0000 |
| commit | 27b0ed125725f09242054563bb65ac20cfaa17ff (patch) | |
| tree | 6fe92374761ae87d8541d117605db27f3486aee1 /xorg-server/hw/xfree86/common/xf86Helper.c | |
| parent | e8d899178e9ebe174e6b4a53297d3dfced8003f0 (diff) | |
| parent | 8268836508edd4ba2a3045c9ba937397df7bf2c5 (diff) | |
| download | vcxsrv-27b0ed125725f09242054563bb65ac20cfaa17ff.tar.gz vcxsrv-27b0ed125725f09242054563bb65ac20cfaa17ff.tar.bz2 vcxsrv-27b0ed125725f09242054563bb65ac20cfaa17ff.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/common/xf86Helper.c')
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86Helper.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86Helper.c b/xorg-server/hw/xfree86/common/xf86Helper.c index 8f61c4c72..147464410 100644 --- a/xorg-server/hw/xfree86/common/xf86Helper.c +++ b/xorg-server/hw/xfree86/common/xf86Helper.c @@ -1038,12 +1038,7 @@ xf86SetRootClip (ScreenPtr pScreen, Bool enable) RegionInit(&pWin->winSize, &box, 1);
RegionInit(&pWin->borderSize, &box, 1);
if (WasViewable)
- {
- PixmapPtr pPixmap = (*pScreen->GetScreenPixmap) (pScreen);
- box.x2 = pPixmap->drawable.width;
- box.y2 = pPixmap->drawable.height;
RegionReset(&pWin->borderClip, &box);
- }
pWin->drawable.width = pScreen->width;
pWin->drawable.height = pScreen->height;
RegionBreak(&pWin->clipList);
@@ -1121,6 +1116,7 @@ xf86EnableDisableFBAccess(int scrnIndex, Bool enable) */
if (!xf86Resetting)
xf86SetRootClip (pScreen, TRUE);
+
}
else
{
|