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/glx/glxdri2.c | |
| 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/glx/glxdri2.c')
| -rw-r--r-- | xorg-server/glx/glxdri2.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/xorg-server/glx/glxdri2.c b/xorg-server/glx/glxdri2.c index 4419972b3..45a1903e4 100644 --- a/xorg-server/glx/glxdri2.c +++ b/xorg-server/glx/glxdri2.c @@ -605,12 +605,21 @@ static const char dri_driver_path[] = DRI_DRIVER_PATH; static Bool
glxDRIEnterVT (int index, int flags)
{
+ ScrnInfoPtr scrn = xf86Screens[index];
+ Bool ret;
__GLXDRIscreen *screen = (__GLXDRIscreen *)
glxGetScreen(screenInfo.screens[index]);
LogMessage(X_INFO, "AIGLX: Resuming AIGLX clients after VT switch\n");
- if (!(*screen->enterVT) (index, flags))
+ scrn->EnterVT = screen->enterVT;
+
+ ret = scrn->EnterVT (index, flags);
+
+ screen->enterVT = scrn->EnterVT;
+ scrn->EnterVT = glxDRIEnterVT;
+
+ if (!ret)
return FALSE;
glxResumeClients();
@@ -621,6 +630,7 @@ glxDRIEnterVT (int index, int flags) static void
glxDRILeaveVT (int index, int flags)
{
+ ScrnInfoPtr scrn = xf86Screens[index];
__GLXDRIscreen *screen = (__GLXDRIscreen *)
glxGetScreen(screenInfo.screens[index]);
@@ -628,7 +638,10 @@ glxDRILeaveVT (int index, int flags) glxSuspendClients();
- return (*screen->leaveVT) (index, flags);
+ scrn->LeaveVT = screen->leaveVT;
+ (*screen->leaveVT) (index, flags);
+ screen->leaveVT = scrn->LeaveVT;
+ scrn->LeaveVT = glxDRILeaveVT;
}
static void
|