forked from pool/xorg-x11-server
Stefan Dirsch
c8690bb170
This submit is just for preparing the final 13.0 release, please have a look at it and comment so i can fix things up until the final 13.0 release for 12.3! #3 OBS-URL: https://build.opensuse.org/request/show/131324 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=408
71 lines
2.1 KiB
Diff
71 lines
2.1 KiB
Diff
Index: hw/xfree86/common/xf86Events.c
|
|
===================================================================
|
|
--- hw/xfree86/common/xf86Events.c.orig
|
|
+++ hw/xfree86/common/xf86Events.c
|
|
@@ -115,6 +115,7 @@ typedef struct x_IHRec {
|
|
InputHandlerProc ihproc;
|
|
pointer data;
|
|
Bool enabled;
|
|
+ Bool is_input;
|
|
struct x_IHRec *next;
|
|
} IHRec, *IHPtr;
|
|
|
|
@@ -445,9 +446,13 @@ xf86VTSwitch(void)
|
|
* Keep the order: Disable Device > LeaveVT
|
|
* EnterVT > EnableDevice
|
|
*/
|
|
- for (ih = InputHandlers; ih; ih = ih->next)
|
|
+ for (ih = InputHandlers; ih; ih = ih->next) {
|
|
+ if (ih->is_input)
|
|
xf86DisableInputHandler(ih);
|
|
- for (pInfo = xf86InputDevs; pInfo; pInfo = pInfo->next) {
|
|
+ else
|
|
+ xf86DisableGeneralHandler(ih);
|
|
+ }
|
|
+ for (pInfo = xf86InputDevs; pInfo; pInfo = pInfo->next) {
|
|
if (pInfo->dev) {
|
|
xf86ReleaseKeys(pInfo->dev);
|
|
ProcessInputEvents();
|
|
@@ -486,8 +491,12 @@ xf86VTSwitch(void)
|
|
EnableDevice(pInfo->dev, TRUE);
|
|
pInfo = pInfo->next;
|
|
}
|
|
- for (ih = InputHandlers; ih; ih = ih->next)
|
|
- xf86EnableInputHandler(ih);
|
|
+ for (ih = InputHandlers; ih; ih = ih->next) {
|
|
+ if (ih->is_input)
|
|
+ xf86EnableInputHandler(ih);
|
|
+ else
|
|
+ xf86EnableGeneralHandler(ih);
|
|
+ }
|
|
|
|
xf86UnblockSIGIO(prevSIGIO);
|
|
|
|
@@ -542,8 +551,12 @@ xf86VTSwitch(void)
|
|
pInfo = pInfo->next;
|
|
}
|
|
|
|
- for (ih = InputHandlers; ih; ih = ih->next)
|
|
- xf86EnableInputHandler(ih);
|
|
+ for (ih = InputHandlers; ih; ih = ih->next) {
|
|
+ if (ih->is_input)
|
|
+ xf86EnableInputHandler(ih);
|
|
+ else
|
|
+ xf86EnableGeneralHandler(ih);
|
|
+ }
|
|
|
|
xf86UnblockSIGIO(prevSIGIO);
|
|
}
|
|
@@ -579,8 +592,10 @@ xf86AddInputHandler(int fd, InputHandler
|
|
{
|
|
IHPtr ih = addInputHandler(fd, proc, data);
|
|
|
|
- if (ih)
|
|
+ if (ih) {
|
|
AddEnabledDevice(fd);
|
|
+ ih->is_input = TRUE;
|
|
+ }
|
|
return ih;
|
|
}
|
|
|