Attachment 209388 Details for Bug 152522

[patch] Proposed fix.

diff.events (text/plain), 2.08 KB, created by Egbert Eich on 2008-04-21 16:49:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Egbert Eich

Created: 2008-04-21 16:49:33 UTC

Size: 2.08 KB

patch

obsolete

>diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
>index 2b7cb12..2a480cd 100644
>--- a/hw/xfree86/common/xf86Events.c
>+++ b/hw/xfree86/common/xf86Events.c
>@@ -869,18 +869,22 @@ xf86VTSwitch()
>      * Keep the order: Disable Device > LeaveVT
>      *                        EnterVT > EnableDevice
>      */
>+
>+    for (i = 0; i < xf86NumScreens; i++)
>+	xf86Screens[i]->LeaveVT(i, 0);
>+
>+    for (ih = InputHandlers; ih; ih = ih->next)
>+      xf86DisableInputHandler(ih);
>+
>     pInfo = xf86InputDevs;
>     while (pInfo) {
>       if (pInfo->dev)
>           DisableDevice(pInfo->dev);
>       pInfo = pInfo->next;
>     }
>+    /* XXX HACK */
>     xf86EnterServerState(SETUP);
>-    for (i = 0; i < xf86NumScreens; i++)
>-	xf86Screens[i]->LeaveVT(i, 0);
> 
>-    for (ih = InputHandlers; ih; ih = ih->next)
>-      xf86DisableInputHandler(ih);
>     xf86AccessLeave();      /* We need this here, otherwise */
>     xf86AccessLeaveState(); /* console won't be restored    */
> 
>@@ -910,20 +914,27 @@ xf86VTSwitch()
> 
>       pInfo = xf86InputDevs;
>       while (pInfo) {
>-        if (pInfo->dev) {
>-            xf86ReleaseKeys(pInfo->dev);
>+        if (pInfo->dev)
>             EnableDevice(pInfo->dev);
>-        }
> 	pInfo = pInfo->next;
>       }
>-      /* XXX HACK */
>-      xf86ReleaseKeys(inputInfo.keyboard);
>       for (ih = InputHandlers; ih; ih = ih->next)
>         xf86EnableInputHandler(ih);
> 
>       xf86UnblockSIGIO(prevSIGIO);
> 
>     } else {
>+
>+	pInfo = xf86InputDevs;
>+	while (pInfo) {
>+	    if (pInfo->dev) {
>+		xf86ReleaseKeys(pInfo->dev);
>+	    }
>+	    pInfo = pInfo->next;
>+	}
>+	/* XXX HACK */
>+	xf86ReleaseKeys(inputInfo.keyboard);
>+
> #ifdef XF86PM
> 	  if (xf86OSPMClose)
> 	      xf86OSPMClose();
>@@ -974,14 +985,10 @@ xf86VTSwitch()
> 
>     pInfo = xf86InputDevs;
>     while (pInfo) {
>-      if (pInfo->dev) {
>-          xf86ReleaseKeys(pInfo->dev);
>+      if (pInfo->dev)
>           EnableDevice(pInfo->dev);
>-      }
>       pInfo = pInfo->next;
>     }
>-    /* XXX HACK */
>-    xf86ReleaseKeys(inputInfo.keyboard);
> 
>     for (ih = InputHandlers; ih; ih = ih->next)
>       xf86EnableInputHandler(ih);

Actions: View | Diff

Attachments on bug 152522: 71437 | 209388