From 7487d7fa2dbc69fe39f81dd5b3e9a1a32ee7a2e0 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Wed, 18 Jul 2018 23:50:28 +0200 Subject: XKB: Fix logic error commit 6aef4e96affcc26b9415c6bc9c9bebb5af05a1a7 Author: Daniel Stone Date: Sat Jan 17 13:42:46 2009 +0200 XKB: Fix logic error Use logical or instead of bitwise or. Signed-off-by: Daniel Stone Signed-off-by: Peter Hutterer Backported-to-nx-by: Ulrich Sibiller --- nx-X11/programs/Xserver/xkb/xkbAccessX.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nx-X11/programs/Xserver/xkb/xkbAccessX.c') diff --git a/nx-X11/programs/Xserver/xkb/xkbAccessX.c b/nx-X11/programs/Xserver/xkb/xkbAccessX.c index cfd42334c..dd07713b8 100644 --- a/nx-X11/programs/Xserver/xkb/xkbAccessX.c +++ b/nx-X11/programs/Xserver/xkb/xkbAccessX.c @@ -607,7 +607,7 @@ Bool ignoreKeyEvent = FALSE; ev.keycode= key; ev.slowKeysDelay= ctrls->slow_keys_delay; ev.debounceDelay= ctrls->debounce_delay; - if (BitIsOn(keybd->key->down,key) | (xkbi->mouseKey == key)) { + if (BitIsOn(keybd->key->down,key) || (xkbi->mouseKey == key)) { ev.detail= XkbAXN_SKRelease; beep_type= _BEEP_SLOW_RELEASE; } -- cgit v1.2.3 From 3c1b1efad2ca42154789f09e2519630c5471ed41 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Wed, 18 Jul 2018 23:54:46 +0200 Subject: XKB: Remove unused DDX functions commit 7c4c00649cae855e141ec9a3667bfe399e3156d0 Author: Daniel Stone Date: Thu Jan 1 05:25:52 2009 +1100 XKB: Remove unused DDX functions They were complete no-ops anyway. Signed-off-by: Daniel Stone Signed-off-by: Peter Hutterer Backported-to-nx-by: Ulrich Sibiller --- nx-X11/programs/Xserver/xkb/xkbAccessX.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'nx-X11/programs/Xserver/xkb/xkbAccessX.c') diff --git a/nx-X11/programs/Xserver/xkb/xkbAccessX.c b/nx-X11/programs/Xserver/xkb/xkbAccessX.c index dd07713b8..5d9917d2b 100644 --- a/nx-X11/programs/Xserver/xkb/xkbAccessX.c +++ b/nx-X11/programs/Xserver/xkb/xkbAccessX.c @@ -132,9 +132,7 @@ xEvent xE; } #endif - if (_XkbIsPressEvent(type)) - XkbDDXKeyClick(keybd,keyCode,TRUE); - else if (isRepeat) + if (!_XkbIsPressEvent(type) && isRepeat) XkbLastRepeatEvent= (void *)&xE; XkbProcessKeyboardEvent(&xE,keybd,1L); XkbLastRepeatEvent= NULL; -- cgit v1.2.3