summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Klausner <wiz@NetBSD.org>2013-07-29 23:23:31 +0200
committerGaetan Nadon <memsize@videotron.ca>2013-10-18 16:41:12 -0400
commit42b22d5dc3892309d276df131d35951a79311843 (patch)
treeff530802c09a1cbe3be3a2b112dd918edf186add
parentb8e12ae87352922eaea305f66ca232ea2a3b2d61 (diff)
downloadxorg-driver-xf86-input-keyboard-42b22d5dc3892309d276df131d35951a79311843.tar.gz
Fixes for the ADB map.
- 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@NetBSD.org> Signed-off-by: Thomas Klausner <wiz@NetBSD.org> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-rw-r--r--src/bsd_KbdMap.c8
1 files 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,