From 0f36384d0636d6a8d3a8f182be69c72cccd1ff5c Mon Sep 17 00:00:00 2001 From: Sascha Hlusiak Date: Mon, 8 Dec 2008 12:32:31 +0100 Subject: Revert "Keyboard: Disable kernel autorepeat" This reverts commit 6867652c2c8ad563d5655302d94134592b10265b. Functionally replaced by commit ece72ce9e97adae23b1932dc1334f63669196d56 Signed-off-by: Daniel Stone --- src/evdev.c | 29 ----------------------------- src/evdev.h | 1 - 2 files changed, 30 deletions(-) diff --git a/src/evdev.c b/src/evdev.c index d246eed..318c746 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -1070,33 +1070,6 @@ EvdevInit(DeviceIntPtr device) return Success; } -/* We handle repeat per-key for ourselves in the server, so disable it - * in the kernel. If in is true, disable it: if out is true, restore - * it. */ -static void -EvdevSetKeyRepeat(InputInfoPtr pInfo, Bool in) -{ - EvdevPtr pEvdev = pInfo->private; - int zero_repeat[2] = { 0, 0 }; /* delay, rate */ - - if (!(pEvdev->flags & EVDEV_KEYBOARD_EVENTS)) - return; - - if (in) { - if (ioctl(pInfo->fd, EVIOCGREP, pEvdev->key_repeat) != 0) - return; - - if (ioctl(pInfo->fd, EVIOCSREP, zero_repeat) != 0) - xf86Msg(X_WARNING, "%s: Couldn't set key repeat (%s)\n", pInfo->name, - strerror(errno)); - } - else { - if (ioctl(pInfo->fd, EVIOCSREP, pEvdev->key_repeat) != 0) - xf86Msg(X_WARNING, "%s: Couldn't reset key repeat (%s)\n", - pInfo->name, strerror(errno)); - } -} - /** * Init all extras (wheel emulation, etc.) and grab the device. * @@ -1144,7 +1117,6 @@ EvdevOn(DeviceIntPtr device) xf86FlushInput(pInfo->fd); xf86AddEnabledDevice(pInfo); EvdevMBEmuOn(pInfo); - EvdevSetKeyRepeat(pInfo, TRUE); pEvdev->flags |= EVDEV_INITIALIZED; device->public.on = TRUE; } @@ -1185,7 +1157,6 @@ EvdevProc(DeviceIntPtr device, int what) pEvdev->min_maj = 0; if (pEvdev->flags & EVDEV_INITIALIZED) EvdevMBEmuFinalize(pInfo); - EvdevSetKeyRepeat(pInfo, FALSE); pEvdev->flags &= ~EVDEV_INITIALIZED; device->public.on = FALSE; if (pEvdev->reopen_timer) diff --git a/src/evdev.h b/src/evdev.h index 38daafa..af88741 100644 --- a/src/evdev.h +++ b/src/evdev.h @@ -65,7 +65,6 @@ typedef struct { int flags; int tool; int buttons; /* number of buttons */ - int key_repeat[2]; BOOL swap_axes; BOOL invert_x; BOOL invert_y; -- cgit v1.2.3