Attachment 36922 Details for Bug 28988 – fix glx enter/leavevt wrapping

[patch] fix glx enter/leavevt wrapping

0001-GLX-Fix-broken-Enter-LeaveVT-wrapping-bug-28988.patch (text/plain), 3.20 KB, created by Daniel Stone on 2010-07-09 10:07:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Stone

Created: 2010-07-09 10:07:49 UTC

Size: 3.20 KB

patch

obsolete

>From 78bedfdc74b5de7b51d7cca0dd3ee75ad3a264d2 Mon Sep 17 00:00:00 2001
>From: Daniel Stone <daniel@fooishbar.org>
>Date: Fri, 9 Jul 2010 18:05:23 +0100
>Subject: [PATCH] GLX: Fix broken Enter/LeaveVT wrapping (bug #28988)
>
>GLX code wasn't even bothering to try rewrapping EnterVT and LeaveVT, so
>it was possible to hit an infinite loop when something else tried to
>rewrap properly.
>
>Signed-off-by: Daniel Stone <daniel@fooishbar.org>
>---
> glx/glxdri.c  |   21 +++++++++++++++------
> glx/glxdri2.c |   23 ++++++++++++++++-------
> 2 files changed, 31 insertions(+), 13 deletions(-)
>
>diff --git a/glx/glxdri.c b/glx/glxdri.c
>index 32b35db..85411b2 100644
>--- a/glx/glxdri.c
>+++ b/glx/glxdri.c
>@@ -868,15 +868,20 @@ glxDRIEnterVT (int index, int flags)
> {
>     __GLXDRIscreen *screen = (__GLXDRIscreen *) 
> 	glxGetScreen(screenInfo.screens[index]);
>+    ScrnInfoPtr pScrn = xf86Screens[index];
>+    Bool ret;
> 
>     LogMessage(X_INFO, "AIGLX: Resuming AIGLX clients after VT switch\n");
> 
>-    if (!(*screen->enterVT) (index, flags))
>-	return FALSE;
>-    
>-    glxResumeClients();
>+    pScrn->EnterVT = screen->enterVT;
>+    ret = (*pScrn->EnterVT) (index, flags);
>+    screen->enterVT = pScrn->EnterVT;
>+    pScrn->EnterVT = glxDRIEnterVT;
> 
>-    return TRUE;
>+    if (ret)
>+        glxResumeClients();
>+
>+    return ret;
> }
> 
> static void
>@@ -884,12 +889,16 @@ glxDRILeaveVT (int index, int flags)
> {
>     __GLXDRIscreen *screen = (__GLXDRIscreen *)
> 	glxGetScreen(screenInfo.screens[index]);
>+    ScrnInfoPtr pScrn = xf86Screens[index];
> 
>     LogMessage(X_INFO, "AIGLX: Suspending AIGLX clients for VT switch\n");
> 
>     glxSuspendClients();
> 
>-    return (*screen->leaveVT) (index, flags);
>+    pScrn->LeaveVT = screen->leaveVT;
>+    (*pScrn->LeaveVT) (index, flags);
>+    screen->leaveVT = pScrn->LeaveVT;
>+    pScrn->LeaveVT = glxDRILeaveVT;
> }
> 
> static void
>diff --git a/glx/glxdri2.c b/glx/glxdri2.c
>index 177c73c..3a9f7f4 100644
>--- a/glx/glxdri2.c
>+++ b/glx/glxdri2.c
>@@ -604,17 +604,22 @@ static const char dri_driver_path[] = DRI_DRIVER_PATH;
> static Bool
> glxDRIEnterVT (int index, int flags)
> {
>-    __GLXDRIscreen *screen = (__GLXDRIscreen *) 
>+    __GLXDRIscreen *screen = (__GLXDRIscreen *)
> 	glxGetScreen(screenInfo.screens[index]);
>+    ScrnInfoPtr pScrn = xf86Screens[index];
>+    Bool ret;
> 
>     LogMessage(X_INFO, "AIGLX: Resuming AIGLX clients after VT switch\n");
> 
>-    if (!(*screen->enterVT) (index, flags))
>-	return FALSE;
>-    
>-    glxResumeClients();
>+    pScrn->EnterVT = screen->enterVT;
>+    ret = (*pScrn->EnterVT) (index, flags);
>+    screen->enterVT = pScrn->EnterVT;
>+    pScrn->EnterVT = glxDRIEnterVT;
> 
>-    return TRUE;
>+    if (ret)
>+        glxResumeClients();
>+
>+    return ret;
> }
> 
> static void
>@@ -622,12 +627,16 @@ glxDRILeaveVT (int index, int flags)
> {
>     __GLXDRIscreen *screen = (__GLXDRIscreen *)
> 	glxGetScreen(screenInfo.screens[index]);
>+    ScrnInfoPtr pScrn = xf86Screens[index];
> 
>     LogMessage(X_INFO, "AIGLX: Suspending AIGLX clients for VT switch\n");
> 
>     glxSuspendClients();
> 
>-    return (*screen->leaveVT) (index, flags);
>+    pScrn->LeaveVT = screen->leaveVT;
>+    (*pScrn->LeaveVT) (index, flags);
>+    screen->leaveVT = pScrn->LeaveVT;
>+    pScrn->LeaveVT = glxDRILeaveVT;
> }
> 
> static void
>-- 
>1.7.1
>

Actions: View | Splinter Review

Attachments on bug 28988: 36921 | 36922

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.