From 157e0631b12d0aae4a5f38b81bee615a7eaf553f Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Mon, 30 May 2016 01:27:49 -0700 Subject: Use xf86AddEnabledDevice with threaded input We didn't use SIGIO input for keyboard processing, but we can use threaded input. Signed-off-by: Keith Packard Signed-off-by: Peter Hutterer --- src/kbd.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/kbd.c b/src/kbd.c index e378dcc..be6948c 100644 --- a/src/kbd.c +++ b/src/kbd.c @@ -45,6 +45,10 @@ #include "xkbstr.h" #include "xkbsrv.h" +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 23 +#define HAVE_THREADED_INPUT 1 +#endif + #define CAPSFLAG 1 #define NUMFLAG 2 #define SCROLLFLAG 4 @@ -352,7 +356,11 @@ KbdProc(DeviceIntPtr device, int what) */ if (pInfo->fd >= 0) { xf86FlushInput(pInfo->fd); +#if HAVE_THREADED_INPUT + xf86AddEnabledDevice(pInfo); +#else AddEnabledDevice(pInfo->fd); +#endif } device->public.on = TRUE; @@ -365,8 +373,13 @@ KbdProc(DeviceIntPtr device, int what) /* * Restore original keyboard directness and translation. */ - if (pInfo->fd != -1) + if (pInfo->fd != -1) { +#if HAVE_THREADED_INPUT + xf86RemoveEnabledDevice(pInfo); +#else RemoveEnabledDevice(pInfo->fd); +#endif + } pKbd->KbdOff(pInfo, what); device->public.on = FALSE; break; -- cgit v1.2.3