svn merge ^/branches/released .

5 files changed, 45 insertions, 4 deletions

diff --git a/xorg-server/hw/xfree86/common/xf86VGAarbiter.c b/xorg-server/hw/xfree86/common/xf86VGAarbiter.c
index e5fd0fb85..d75b86502 100644
--- a/xorg-server/hw/xfree86/common/xf86VGAarbiter.c
+++ b/xorg-server/hw/xfree86/common/xf86VGAarbiter.c
@@ -523,12 +523,16 @@ static Bool
 VGAarbiterEnterVT(int index, int flags)

 {

     Bool val;

+    ScrnInfoPtr pScrn = xf86Screens[index];

     ScreenPtr pScreen = screenInfo.screens[index];

     VGAarbiterScreenPtr pScreenPriv = (VGAarbiterScreenPtr)dixLookupPrivate(

         &pScreen->devPrivates, VGAarbiterScreenKey);

 

     VGAGet();

-    val = (*pScreenPriv->EnterVT)(index, flags);

+    pScrn->EnterVT = pScreenPriv->EnterVT;

+    val = (*pScrn->EnterVT)(index, flags);

+    pScreenPriv->EnterVT = pScrn->EnterVT;

+    pScrn->EnterVT = VGAarbiterEnterVT;

     VGAPut();

     return val;

 }

@@ -536,12 +540,16 @@ VGAarbiterEnterVT(int index, int flags)
 static void

 VGAarbiterLeaveVT(int index, int flags)

 {

+    ScrnInfoPtr pScrn = xf86Screens[index];

     ScreenPtr pScreen = screenInfo.screens[index];

     VGAarbiterScreenPtr pScreenPriv = (VGAarbiterScreenPtr)dixLookupPrivate(

         &pScreen->devPrivates, VGAarbiterScreenKey);

 

     VGAGet();

+    pScrn->LeaveVT = pScreenPriv->LeaveVT;

     (*pScreenPriv->LeaveVT)(index, flags);

+    pScreenPriv->LeaveVT = pScrn->LeaveVT;

+    pScrn->LeaveVT = VGAarbiterLeaveVT;

     VGAPut();

 }

 

diff --git a/xorg-server/hw/xfree86/common/xf86cmap.c b/xorg-server/hw/xfree86/common/xf86cmap.c
index 851843faa..191ae6132 100644
--- a/xorg-server/hw/xfree86/common/xf86cmap.c
+++ b/xorg-server/hw/xfree86/common/xf86cmap.c
@@ -466,11 +466,17 @@ CMapInstallColormap(ColormapPtr pmap)
 static Bool 

 CMapEnterVT(int index, int flags)

 {

+    ScrnInfoPtr pScrn = xf86Screens[index];

     ScreenPtr pScreen = screenInfo.screens[index];

+    Bool ret;

     CMapScreenPtr pScreenPriv = (CMapScreenPtr)dixLookupPrivate(

 	&pScreen->devPrivates, CMapScreenKey);

 

-    if((*pScreenPriv->EnterVT)(index, flags)) {

+    pScrn->EnterVT = pScreenPriv->EnterVT;

+    ret = (*pScreenPriv->EnterVT)(index, flags);

+    pScreenPriv->EnterVT = pScrn->EnterVT;

+    pScrn->EnterVT = CMapEnterVT;

+    if(ret) {

 	if(GetInstalledmiColormap(pScreen))

 	    CMapReinstallMap(GetInstalledmiColormap(pScreen));

 	return TRUE;

diff --git a/xorg-server/hw/xfree86/common/xf86xv.c b/xorg-server/hw/xfree86/common/xf86xv.c
index 6dae62717..29c74f66e 100644
--- a/xorg-server/hw/xfree86/common/xf86xv.c
+++ b/xorg-server/hw/xfree86/common/xf86xv.c
@@ -1229,11 +1229,15 @@ xf86XVQueryAdaptors(
 static Bool

 xf86XVEnterVT(int index, int flags)

 {

+    ScrnInfoPtr pScrn = xf86Screens[index];

     ScreenPtr pScreen = screenInfo.screens[index];

     XF86XVScreenPtr ScreenPriv = GET_XF86XV_SCREEN(pScreen);

     Bool ret;

 

+    pScrn->EnterVT = ScreenPriv->EnterVT;

     ret = (*ScreenPriv->EnterVT)(index, flags);

+    ScreenPriv->EnterVT = pScrn->EnterVT;

+    pScrn->EnterVT = xf86XVEnterVT;

 

     if(ret) WalkTree(pScreen, xf86XVReputAllVideo, 0);

 

@@ -1243,6 +1247,7 @@ xf86XVEnterVT(int index, int flags)
 static void

 xf86XVLeaveVT(int index, int flags)

 {

+    ScrnInfoPtr pScrn = xf86Screens[index];

     ScreenPtr pScreen = screenInfo.screens[index];

     XvScreenPtr pxvs = GET_XV_SCREEN(pScreen);

     XF86XVScreenPtr ScreenPriv = GET_XF86XV_SCREEN(pScreen);

@@ -1274,7 +1279,10 @@ xf86XVLeaveVT(int index, int flags)
 	}

     }

 

+    pScrn->LeaveVT = ScreenPriv->LeaveVT;

     (*ScreenPriv->LeaveVT)(index, flags);

+    ScreenPriv->LeaveVT = pScrn->LeaveVT;

+    pScrn->LeaveVT = xf86XVLeaveVT;

 }

 

 static void

diff --git a/xorg-server/hw/xfree86/shadowfb/shadow.c b/xorg-server/hw/xfree86/shadowfb/shadow.c
index 4c7551de9..20e70d6ce 100644
--- a/xorg-server/hw/xfree86/shadowfb/shadow.c
+++ b/xorg-server/hw/xfree86/shadowfb/shadow.c
@@ -216,9 +216,14 @@ static Bool
 ShadowEnterVT(int index, int flags)

 {

     ScrnInfoPtr pScrn = xf86Screens[index];

+    Bool ret;

     ShadowScreenPtr pPriv = GET_SCREEN_PRIVATE(pScrn->pScreen);

 

-    if((*pPriv->EnterVT)(index, flags)) {

+    pScrn->EnterVT = pPriv->EnterVT;

+    ret = (*pPriv->EnterVT)(index, flags);

+    pPriv->EnterVT = pScrn->EnterVT;

+    pScrn->EnterVT = ShadowEnterVT;

+    if(ret) {

 	pPriv->vtSema = TRUE;

         return TRUE;

     }

@@ -229,11 +234,15 @@ ShadowEnterVT(int index, int flags)
 static void

 ShadowLeaveVT(int index, int flags)

 {

+    ScrnInfoPtr pScrn = xf86Screens[index];

     ShadowScreenPtr pPriv = GET_SCREEN_PRIVATE(xf86Screens[index]->pScreen);

 

     pPriv->vtSema = FALSE;

 

+    pScrn->LeaveVT = pPriv->LeaveVT;

     (*pPriv->LeaveVT)(index, flags);

+    pPriv->LeaveVT = pScrn->LeaveVT;

+    pScrn->LeaveVT = ShadowLeaveVT;

 }

 

 /**********************************************************/

diff --git a/xorg-server/hw/xfree86/xaa/xaaInit.c b/xorg-server/hw/xfree86/xaa/xaaInit.c
index a4b235acf..ff1dd3d8b 100644
--- a/xorg-server/hw/xfree86/xaa/xaaInit.c
+++ b/xorg-server/hw/xfree86/xaa/xaaInit.c
@@ -508,16 +508,23 @@ XAAChangeWindowAttributes (WindowPtr pWin, unsigned long mask)
 static Bool 

 XAAEnterVT(int index, int flags)

 {

+    ScrnInfoPtr pScrn = xf86Screens[index];

+    Bool ret;

     ScreenPtr pScreen = screenInfo.screens[index];

     XAAScreenPtr pScreenPriv = 

 	(XAAScreenPtr)dixLookupPrivate(&pScreen->devPrivates, XAAScreenKey);

 

-    return((*pScreenPriv->EnterVT)(index, flags));

+    pScrn->EnterVT = pScreenPriv->EnterVT;

+    ret = ((*pScreenPriv->EnterVT)(index, flags));

+    pScreenPriv->EnterVT = pScrn->EnterVT;

+    pScrn->EnterVT = XAAEnterVT;

+    return ret;

 }

 

 static void 

 XAALeaveVT(int index, int flags)

 {

+    ScrnInfoPtr pScrn = xf86Screens[index];

     ScreenPtr pScreen = screenInfo.screens[index];

     XAAScreenPtr pScreenPriv = 

 	(XAAScreenPtr)dixLookupPrivate(&pScreen->devPrivates, XAAScreenKey);

@@ -528,7 +535,10 @@ XAALeaveVT(int index, int flags)
         infoRec->NeedToSync = FALSE;

     }

 

+    pScrn->LeaveVT = pScreenPriv->LeaveVT;

     (*pScreenPriv->LeaveVT)(index, flags);

+    pScreenPriv->LeaveVT = pScrn->LeaveVT;

+    pScrn->LeaveVT = XAALeaveVT;

 }

 

 typedef struct {