forked from pool/xorg-x11-server
Stefan Dirsch
548e4d5cc8
- update:
* randr1_1-sig11.diff
removed accidentally forgotten debugging code.
* u_OS-acpi-Reconnect-to-acpid-when-it-gets-restarted.patch
made socket non-blocking. Idea taken from a pach for SLES11.
- don't look for 10-evdev.conf for anything older than 11.3
(this includes SLE-11).
- remove use-last-screen.patch:
This patch has been rejected upstream. We will try to resolve
this issue differently by not providing any screen, monitor or
device section.
- remove disable-fbblt-opt.diff:
We are unable to reproduce this issue any more.
So let's remove the workaround and start from scratch
when issue resurfaces and find a proper fix.
- fixed bug-197858_dpms.diff:
removed pieces that have been solved differently today.
- remove moblin-use_preferred_mode_for_all_outputs.diff:
remove moblin specific patches.
- rename edit_data_sanity_check.diff -> edid_data_sanity_check.diff
- remove p_xkills_wrong_client.diff:
made obsolete by commit b7f3618f.
OBS-URL: https://build.opensuse.org/request/show/76024
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=347
70 lines
1.8 KiB
Diff
70 lines
1.8 KiB
Diff
Index: hw/xfree86/common/xf86Events.c
|
|
================================================================================
|
|
--- hw/xfree86/common/xf86Events.c
|
|
+++ hw/xfree86/common/xf86Events.c
|
|
@@ -115,6 +115,7 @@
|
|
InputHandlerProc ihproc;
|
|
pointer data;
|
|
Bool enabled;
|
|
+ Bool is_input;
|
|
struct x_IHRec * next;
|
|
} IHRec, *IHPtr;
|
|
|
|
@@ -449,8 +450,12 @@
|
|
* Keep the order: Disable Device > LeaveVT
|
|
* EnterVT > EnableDevice
|
|
*/
|
|
- for (ih = InputHandlers; ih; ih = ih->next)
|
|
- xf86DisableInputHandler(ih);
|
|
+ for (ih = InputHandlers; ih; ih = ih->next) {
|
|
+ if (ih->is_input)
|
|
+ xf86DisableInputHandler(ih);
|
|
+ else
|
|
+ xf86DisableGeneralHandler(ih);
|
|
+ }
|
|
for (pInfo = xf86InputDevs; pInfo; pInfo = pInfo->next) {
|
|
if (pInfo->dev) {
|
|
xf86ReleaseKeys(pInfo->dev);
|
|
@@ -492,8 +497,12 @@
|
|
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);
|
|
|
|
@@ -549,8 +558,12 @@
|
|
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);
|
|
}
|
|
@@ -587,8 +600,10 @@
|
|
{
|
|
IHPtr ih = addInputHandler(fd, proc, data);
|
|
|
|
- if (ih)
|
|
+ if (ih) {
|
|
AddEnabledDevice(fd);
|
|
+ ih->is_input = TRUE;
|
|
+ }
|
|
return ih;
|
|
}
|
|
|