|
Line
Link Here
|
| 0 |
-- a/src/kbd.c |
0 |
++ b/src/kbd.c |
|
Lines 45-50
Link Here
|
| 45 |
#include "xkbstr.h" |
45 |
#include "xkbstr.h" |
| 46 |
#include "xkbsrv.h" |
46 |
#include "xkbsrv.h" |
| 47 |
|
47 |
|
|
|
48 |
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 23 |
| 49 |
#define HAVE_THREADED_INPUT 1 |
| 50 |
#endif |
| 51 |
|
| 48 |
#define CAPSFLAG 1 |
52 |
#define CAPSFLAG 1 |
| 49 |
#define NUMFLAG 2 |
53 |
#define NUMFLAG 2 |
| 50 |
#define SCROLLFLAG 4 |
54 |
#define SCROLLFLAG 4 |
|
Lines 352-358
KbdProc(DeviceIntPtr device, int what)
Link Here
|
| 352 |
*/ |
356 |
*/ |
| 353 |
if (pInfo->fd >= 0) { |
357 |
if (pInfo->fd >= 0) { |
| 354 |
xf86FlushInput(pInfo->fd); |
358 |
xf86FlushInput(pInfo->fd); |
|
|
359 |
#if HAVE_THREADED_INPUT |
| 360 |
xf86AddEnabledDevice(pInfo); |
| 361 |
#else |
| 355 |
AddEnabledDevice(pInfo->fd); |
362 |
AddEnabledDevice(pInfo->fd); |
|
|
363 |
#endif |
| 356 |
} |
364 |
} |
| 357 |
|
365 |
|
| 358 |
device->public.on = TRUE; |
366 |
device->public.on = TRUE; |
|
Lines 365-372
KbdProc(DeviceIntPtr device, int what)
Link Here
|
| 365 |
/* |
373 |
/* |
| 366 |
* Restore original keyboard directness and translation. |
374 |
* Restore original keyboard directness and translation. |
| 367 |
*/ |
375 |
*/ |
| 368 |
if (pInfo->fd != -1) |
376 |
if (pInfo->fd != -1) { |
|
|
377 |
#if HAVE_THREADED_INPUT |
| 378 |
xf86RemoveEnabledDevice(pInfo); |
| 379 |
#else |
| 369 |
RemoveEnabledDevice(pInfo->fd); |
380 |
RemoveEnabledDevice(pInfo->fd); |
|
|
381 |
#endif |
| 382 |
} |
| 370 |
pKbd->KbdOff(pInfo, what); |
383 |
pKbd->KbdOff(pInfo, what); |
| 371 |
device->public.on = FALSE; |
384 |
device->public.on = FALSE; |
| 372 |
break; |
385 |
break; |
