diff options
| author | marha <marha@users.sourceforge.net> | 2010-07-14 10:57:04 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-07-14 10:57:04 +0000 |
| commit | 8fb9d7f4ca923dc7f640a0df6c871348a3e554ab (patch) | |
| tree | 39ebbf9255fe0fd660ea645f4ebdef3287a5078b /xorg-server/hw/xfree86/xaa | |
| parent | 80b785273c916676a94cbe1d7dfbbc93b58127d5 (diff) | |
| parent | 865af20e32591176d03acf984d9b5788d5ebce21 (diff) | |
| download | vcxsrv-8fb9d7f4ca923dc7f640a0df6c871348a3e554ab.tar.gz vcxsrv-8fb9d7f4ca923dc7f640a0df6c871348a3e554ab.tar.bz2 vcxsrv-8fb9d7f4ca923dc7f640a0df6c871348a3e554ab.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/xaa')
| -rw-r--r-- | xorg-server/hw/xfree86/xaa/xaaInit.c | 12 |
1 files changed, 11 insertions, 1 deletions
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 {
|