xserver and libxcb git update 11/6/2010

4 files changed, 75 insertions, 44 deletions

diff --git a/xorg-server/hw/xfree86/dri2/dri2.c b/xorg-server/hw/xfree86/dri2/dri2.c
index bb1be358b..123bc3225 100644
--- a/xorg-server/hw/xfree86/dri2/dri2.c
+++ b/xorg-server/hw/xfree86/dri2/dri2.c
@@ -957,8 +957,12 @@ Bool
 DRI2Connect(ScreenPtr pScreen, unsigned int driverType, int *fd,

 	    const char **driverName, const char **deviceName)

 {

-    DRI2ScreenPtr ds = DRI2GetScreen(pScreen);

+    DRI2ScreenPtr ds;

+

+    if (!dixPrivateKeyRegistered(dri2ScreenPrivateKey))

+	return FALSE;

 

+    ds = DRI2GetScreen(pScreen);

     if (ds == NULL || driverType >= ds->numDrivers ||

 	    !ds->driverNames[driverType])

 	return FALSE;

diff --git a/xorg-server/hw/xfree86/modes/xf86Crtc.c b/xorg-server/hw/xfree86/modes/xf86Crtc.c
index 9c5b3c1ad..6a56e31cc 100644
--- a/xorg-server/hw/xfree86/modes/xf86Crtc.c
+++ b/xorg-server/hw/xfree86/modes/xf86Crtc.c
@@ -753,6 +753,8 @@ xf86CrtcCloseScreen (int index, ScreenPtr screen)
 

 	crtc->randr_crtc = NULL;

     }

+    xf86RandR12CloseScreen (screen);

+

     return screen->CloseScreen (index, screen);

 }

 

diff --git a/xorg-server/hw/xfree86/modes/xf86RandR12.c b/xorg-server/hw/xfree86/modes/xf86RandR12.c
index e49387317..90e267c1e 100644
--- a/xorg-server/hw/xfree86/modes/xf86RandR12.c
+++ b/xorg-server/hw/xfree86/modes/xf86RandR12.c
@@ -928,6 +928,24 @@ xf86RandR12Init (ScreenPtr pScreen)
 }

 

 void

+xf86RandR12CloseScreen (ScreenPtr pScreen)

+{

+    XF86RandRInfoPtr	randrp;

+

+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(7,0,0,0,0)

+    if (xf86RandR12Key == NULL)

+	return;

+#endif

+

+    randrp = XF86RANDRINFO(pScreen);

+#if RANDR_12_INTERFACE

+    xf86Screens[pScreen->myNum]->EnterVT = randrp->orig_EnterVT;

+#endif

+

+    free(randrp);

+}

+

+void

 xf86RandR12SetRotations (ScreenPtr pScreen, Rotation rotations)

 {

     XF86RandRInfoPtr	randrp;

@@ -1755,10 +1773,16 @@ static Bool
 xf86RandR12EnterVT (int screen_index, int flags)

 {

     ScreenPtr        pScreen = screenInfo.screens[screen_index];

+    ScrnInfoPtr	     pScrn = xf86Screens[screen_index];

     XF86RandRInfoPtr randrp  = XF86RANDRINFO(pScreen);

+    Bool	     ret;

 

     if (randrp->orig_EnterVT) {

-	if (!randrp->orig_EnterVT (screen_index, flags))

+	pScrn->EnterVT = randrp->orig_EnterVT;

+	ret = pScrn->EnterVT (screen_index, flags);

+	randrp->orig_EnterVT = pScrn->EnterVT;

+	pScrn->EnterVT = xf86RandR12EnterVT;

+	if (!ret)

 	    return FALSE;

     }

 

diff --git a/xorg-server/hw/xfree86/modes/xf86RandR12.h b/xorg-server/hw/xfree86/modes/xf86RandR12.h
index c8d9918cf..755a472d1 100644
--- a/xorg-server/hw/xfree86/modes/xf86RandR12.h
+++ b/xorg-server/hw/xfree86/modes/xf86RandR12.h
@@ -1,42 +1,43 @@
-/*
- * Copyright © 2006 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of the copyright holders not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission.  The copyright holders make no representations
- * about the suitability of this software for any purpose.  It is provided "as
- * is" without express or implied warranty.
- *
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-#ifndef _XF86_RANDR_H_
-#define _XF86_RANDR_H_
-#include <randrstr.h>
-#include <X11/extensions/render.h>
-#if XF86_MODES_RENAME
-#include "xf86Rename.h"
-#endif
-
-extern _X_EXPORT Bool xf86RandR12CreateScreenResources (ScreenPtr pScreen);
-extern _X_EXPORT Bool xf86RandR12Init(ScreenPtr pScreen);
-extern _X_EXPORT void xf86RandR12SetRotations (ScreenPtr pScreen, Rotation rotation);
-extern _X_EXPORT void xf86RandR12SetTransformSupport (ScreenPtr pScreen, Bool transforms);
-extern _X_EXPORT Bool xf86RandR12SetConfig(ScreenPtr pScreen, Rotation rotation, int rate,
-			RRScreenSizePtr pSize);
-extern _X_EXPORT Rotation xf86RandR12GetRotation(ScreenPtr pScreen);
-extern _X_EXPORT void xf86RandR12GetOriginalVirtualSize(ScrnInfoPtr pScrn, int *x, int *y);
-extern _X_EXPORT Bool xf86RandR12PreInit (ScrnInfoPtr pScrn);
-extern _X_EXPORT void xf86RandR12TellChanged (ScreenPtr pScreen);
-
-#endif /* _XF86_RANDR_H_ */
+/*

+ * Copyright © 2006 Keith Packard

+ *

+ * Permission to use, copy, modify, distribute, and sell this software and its

+ * documentation for any purpose is hereby granted without fee, provided that

+ * the above copyright notice appear in all copies and that both that copyright

+ * notice and this permission notice appear in supporting documentation, and

+ * that the name of the copyright holders not be used in advertising or

+ * publicity pertaining to distribution of the software without specific,

+ * written prior permission.  The copyright holders make no representations

+ * about the suitability of this software for any purpose.  It is provided "as

+ * is" without express or implied warranty.

+ *

+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE

+ * OF THIS SOFTWARE.

+ */

+

+#ifndef _XF86_RANDR_H_

+#define _XF86_RANDR_H_

+#include <randrstr.h>

+#include <X11/extensions/render.h>

+#if XF86_MODES_RENAME

+#include "xf86Rename.h"

+#endif

+

+extern _X_EXPORT Bool xf86RandR12CreateScreenResources (ScreenPtr pScreen);

+extern _X_EXPORT Bool xf86RandR12Init(ScreenPtr pScreen);

+extern _X_EXPORT void xf86RandR12CloseScreen(ScreenPtr pScreen);

+extern _X_EXPORT void xf86RandR12SetRotations (ScreenPtr pScreen, Rotation rotation);

+extern _X_EXPORT void xf86RandR12SetTransformSupport (ScreenPtr pScreen, Bool transforms);

+extern _X_EXPORT Bool xf86RandR12SetConfig(ScreenPtr pScreen, Rotation rotation, int rate,

+			RRScreenSizePtr pSize);

+extern _X_EXPORT Rotation xf86RandR12GetRotation(ScreenPtr pScreen);

+extern _X_EXPORT void xf86RandR12GetOriginalVirtualSize(ScrnInfoPtr pScrn, int *x, int *y);

+extern _X_EXPORT Bool xf86RandR12PreInit (ScrnInfoPtr pScrn);

+extern _X_EXPORT void xf86RandR12TellChanged (ScreenPtr pScreen);

+

+#endif /* _XF86_RANDR_H_ */