xserver: Branch 'master'

[Sascha Hlusiak]

 xkb/ddxCtrls.c |   20 --------------------
 1 file changed, 20 deletions(-)

New commits:
commit bbf811514d3cdf84790bad5b852942a4e636902b
Author: Sascha Hlusiak <saschahlusiak at arcor.de>
Date:   Mon Dec 8 12:24:39 2008 +0100

    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 at fooishbar.org>

diff --git a/xkb/ddxCtrls.c b/xkb/ddxCtrls.c
index 34ea0bd..be269c2 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