diff options
| author | Keith Packard <keithp@keithp.com> | 2016-05-31 17:52:42 -0700 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2016-06-02 09:42:05 +1000 |
| commit | 7b1267f7f18c478d3dc34a7668eaefa402815891 (patch) | |
| tree | 78ccfd20e5261bf80e5e50c7543f59df2fa9a23d /src/emuMB.c | |
| parent | Report errors when attempting to write keyboard controls (diff) | |
| download | xf86-input-evdev-7b1267f7f18c478d3dc34a7668eaefa402815891.tar.gz xf86-input-evdev-7b1267f7f18c478d3dc34a7668eaefa402815891.tar.bz2 xf86-input-evdev-7b1267f7f18c478d3dc34a7668eaefa402815891.zip | |
Support XINPUT ABI version 23 (threaded input)
Use input_lock/input_unlock calls instead of SIGIO functions
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'src/emuMB.c')
| -rw-r--r-- | src/emuMB.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/emuMB.c b/src/emuMB.c index b25eac8..94e50c4 100644 --- a/src/emuMB.c +++ b/src/emuMB.c @@ -184,10 +184,13 @@ int EvdevMBEmuTimer(InputInfoPtr pInfo) { EvdevPtr pEvdev = pInfo->private; - int sigstate; int id; - sigstate = xf86BlockSIGIO (); +#if HAVE_THREADED_INPUT + input_lock(); +#else + int sigstate = xf86BlockSIGIO(); +#endif pEvdev->emulateMB.pending = FALSE; if ((id = stateTab[pEvdev->emulateMB.state][4][0]) != 0) { @@ -200,7 +203,11 @@ EvdevMBEmuTimer(InputInfoPtr pInfo) pEvdev->emulateMB.state); } - xf86UnblockSIGIO (sigstate); +#if HAVE_THREADED_INPUT + input_unlock(); +#else + xf86UnblockSIGIO(sigstate); +#endif return 0; } |