summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSascha Hlusiak <saschahlusiak@arcor.de>2008-12-08 12:24:39 +0100
committerKeith Packard <keithp@keithp.com>2008-12-09 20:49:22 -0800
commitff9b55d8cbc19e0e31a91034e332058acd967cd1 (patch)
tree52a25720ebf3a7b6e43132a69b87a51188fab462
parentb0c64725526338cbc02708415e1aa9497cdc3a38 (diff)
ddxCtrls.c: XkbDDXUsesSoftRepeat always returns 1 now
We'd like to do soft repeat in the server for all keys. Remove obscure check, that'd prevent the server from autorepeating when delay is set to exactly 660ms and rate is set to exactly 25 (interval=40). Signed-off-by: Daniel Stone <daniel@fooishbar.org> (cherry picked from commit bbf811514d3cdf84790bad5b852942a4e636902b) Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--xkb/ddxCtrls.c20
1 files changed, 0 insertions, 20 deletions
diff --git a/xkb/ddxCtrls.c b/xkb/ddxCtrls.c
index 34ea0bd3f..be269c2af 100644
--- a/xkb/ddxCtrls.c
+++ b/xkb/ddxCtrls.c
@@ -57,27 +57,7 @@ int realRepeat;
int
XkbDDXUsesSoftRepeat(DeviceIntPtr pXDev)
{
-#ifndef XKB_ALWAYS_USES_SOFT_REPEAT
- if (pXDev && pXDev->kbdfeed ) {
- if (pXDev->kbdfeed->ctrl.autoRepeat) {
- if (pXDev->key && pXDev->key->xkbInfo) {
- XkbDescPtr xkb;
- xkb= pXDev->key->xkbInfo->desc;
- if ((xkb->ctrls->repeat_delay == 660) &&
- (xkb->ctrls->repeat_interval == 40) &&
- ((xkb->ctrls->enabled_ctrls&(XkbSlowKeysMask|
- XkbBounceKeysMask|
- XkbMouseKeysMask))==0)) {
- return 0;
- }
- return ((xkb->ctrls->enabled_ctrls&XkbRepeatKeysMask)!=0);
- }
- }
- }
- return 0;
-#else
return 1;
-#endif
}
void