From 7b1267f7f18c478d3dc34a7668eaefa402815891 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Tue, 31 May 2016 17:52:42 -0700 Subject: Support XINPUT ABI version 23 (threaded input) Use input_lock/input_unlock calls instead of SIGIO functions Signed-off-by: Keith Packard Signed-off-by: Peter Hutterer --- src/emuThird.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'src/emuThird.c') diff --git a/src/emuThird.c b/src/emuThird.c index 5f14d33..dd49a84 100644 --- a/src/emuThird.c +++ b/src/emuThird.c @@ -89,12 +89,19 @@ Evdev3BEmuTimer(OsTimerPtr timer, CARD32 time, pointer arg) InputInfoPtr pInfo = (InputInfoPtr)arg; EvdevPtr pEvdev = pInfo->private; struct emulate3B *emu3B = &pEvdev->emulate3B; - int sigstate = 0; - sigstate = xf86BlockSIGIO (); +#if HAVE_THREADED_INPUT + input_lock(); +#else + int sigstate = xf86BlockSIGIO(); +#endif emu3B->state = EM3B_EMULATING; Evdev3BEmuPostButtonEvent(pInfo, emu3B->button, BUTTON_PRESS); - xf86UnblockSIGIO (sigstate); +#if HAVE_THREADED_INPUT + input_unlock(); +#else + xf86UnblockSIGIO(sigstate); +#endif return 0; } -- cgit v1.2.3