xserver libX11 xkeyboard-config git update 30/9/2010

1 files changed, 2 insertions, 10 deletions

diff --git a/xorg-server/hw/xfree86/modes/xf86RandR12.c b/xorg-server/hw/xfree86/modes/xf86RandR12.c
index 92f34a222..0f4c40c09 100644
--- a/xorg-server/hw/xfree86/modes/xf86RandR12.c
+++ b/xorg-server/hw/xfree86/modes/xf86RandR12.c
@@ -511,7 +511,6 @@ xf86RandR12SetMode (ScreenPtr	    pScreen,
     WindowPtr		pRoot = pScreen->root;

     DisplayModePtr      currentMode = NULL;

     Bool 		ret = TRUE;

-    PixmapPtr 		pspix = NULL;

 

     if (pRoot)

 	(*scrp->EnableDisableFBAccess) (pScreen->myNum, FALSE);

@@ -560,14 +559,6 @@ xf86RandR12SetMode (ScreenPtr	    pScreen,
 	pScreen->mmHeight = oldmmHeight;

         scrp->currentMode = currentMode;

     }

-    /*

-     * Get the new Screen pixmap ptr as SwitchMode might have called

-     * ModifyPixmapHeader and xf86EnableDisableFBAccess will put it back...

-     * Unfortunately.

-     */

-    pspix = (*pScreen->GetScreenPixmap) (pScreen);

-    if (pspix->devPrivate.ptr)

-       scrp->pixmapPrivate = pspix->devPrivate;

 

     /*

      * Make sure the layout is correct

@@ -677,7 +668,7 @@ xf86RandR12ScreenSetSize (ScreenPtr	pScreen,
     ScrnInfoPtr		pScrn = XF86SCRNINFO(pScreen);

     xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(pScrn);

     WindowPtr		pRoot = pScreen->root;

-    PixmapPtr		pScrnPix = (*pScreen->GetScreenPixmap)(pScreen);

+    PixmapPtr		pScrnPix;

     Bool		ret = FALSE;

     int                 c;

 

@@ -714,6 +705,7 @@ xf86RandR12ScreenSetSize (ScreenPtr	pScreen,
 	}

     }

 

+    pScrnPix = (*pScreen->GetScreenPixmap)(pScreen);

     pScreen->width = pScrnPix->drawable.width = width;

     pScreen->height = pScrnPix->drawable.height = height;

     randrp->mmWidth = pScreen->mmWidth = mmWidth;