[PATCH:xf86-input-keyboard 05/23] Fixes for the ADB map.

Thomas Klausner wiz at NetBSD.org
Mon Jul 29 14:23:31 PDT 2013


- map the backspace key to KEY_BackSpace
- swap LAlt and LMeta to match the keyboard (Alt=Alt/Option, Meta=Command)
- add a keysym for . on the number pad
... so killing the Xserver with Ctrl-Alt-BackSpace works now and the default
map matches an US keyboard without any xmodmap stunts.

>From Michael Lorenz <macallan at NetBSD.org>
Signed-off-by: Thomas Klausner <wiz at NetBSD.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
Reviewed-by: Matthieu Herrb <matthieu.herrb at laas.fr>
---
 src/bsd_KbdMap.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/bsd_KbdMap.c b/src/bsd_KbdMap.c
index 8580bbb..e0d0d16 100644
--- a/src/bsd_KbdMap.c
+++ b/src/bsd_KbdMap.c
@@ -505,14 +505,14 @@ static CARD8 wsAdbMap[] = {
 	/* 48 */ KEY_Tab,
 	/* 49 */ KEY_Space,
 	/* 50 */ KEY_Tilde,
-	/* 51 */ KEY_Delete,
+	/* 51 */ KEY_BackSpace,
 	/* 52 */ KEY_AltLang,
 	/* 53 */ KEY_Escape,
 	/* 54 */ KEY_LCtrl,
-	/* 55 */ KEY_Alt,
+	/* 55 */ KEY_LMeta,
 	/* 56 */ KEY_ShiftL,
 	/* 57 */ KEY_CapsLock,
-	/* 58 */ KEY_LMeta,
+	/* 58 */ KEY_Alt,
 	/* 59 */ KEY_Left,
 	/* 60 */ KEY_Right,
 	/* 61 */ KEY_Down,
@@ -549,7 +549,7 @@ static CARD8 wsAdbMap[] = {
 	/* 92 */ KEY_KP_9,
 	/* 93 */ KEY_NOTUSED,
 	/* 94 */ KEY_NOTUSED,
-	/* 95 */ KEY_UNKNOWN,	/* Keypad ,  */
+	/* 95 */ KEY_KP_Decimal,	/* Keypad ,  */
 	/* 96 */ KEY_F5,
 	/* 97 */ KEY_F6,
 	/* 98 */ KEY_F7,
-- 
1.8.3.3



More information about the xorg-devel mailing list