diff options
author | mpi <mpi@openbsd.org> | 2011-10-09 12:41:39 +0000 |
---|---|---|
committer | mpi <mpi@openbsd.org> | 2011-10-09 12:41:39 +0000 |
commit | 65dee4e1386b0d7d3872ffc3a9fd93a1655a1803 (patch) | |
tree | 8a6d1a2d68ec1565c17466e0586bce806ef4ed60 /sys/dev/adb | |
parent | Remove the BUGS section, it's been taken care of. (diff) | |
download | wireguard-openbsd-65dee4e1386b0d7d3872ffc3a9fd93a1655a1803.tar.xz wireguard-openbsd-65dee4e1386b0d7d3872ffc3a9fd93a1655a1803.zip |
Fix the backspace key under X11 and make the 'option' key behaves like in
console. The 'command' key is now the alt modifier.
Based on a diff from shadchin@ with inputs from miod@
ok shadchin@, miod@
Diffstat (limited to 'sys/dev/adb')
-rw-r--r-- | sys/dev/adb/akbdmap.h | 34 |
1 files changed, 10 insertions, 24 deletions
diff --git a/sys/dev/adb/akbdmap.h b/sys/dev/adb/akbdmap.h index 91917b30be8..144a9cb49ba 100644 --- a/sys/dev/adb/akbdmap.h +++ b/sys/dev/adb/akbdmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: akbdmap.h,v 1.4 2011/06/13 16:29:11 shadchin Exp $ */ +/* $OpenBSD: akbdmap.h,v 1.5 2011/10/09 12:41:39 mpi Exp $ */ /* $NetBSD: akbdmap.h,v 1.7 2005/05/05 22:29:41 abs Exp $ */ /*- @@ -44,11 +44,7 @@ unsigned char keyboard[128] = { RAWKEY_x, RAWKEY_c, RAWKEY_v, -#ifdef FIX_SV_X_KBDBUG - RAWKEY_grave, -#else RAWKEY_less, -#endif RAWKEY_b, RAWKEY_q, RAWKEY_w, @@ -88,19 +84,15 @@ unsigned char keyboard[128] = { RAWKEY_period, RAWKEY_Tab, RAWKEY_space, -#ifdef FIX_SV_X_KBDBUG - RAWKEY_less, -#else RAWKEY_grave, -#endif - RAWKEY_Delete, + RAWKEY_BackSpace, RAWKEY_KP_Enter, RAWKEY_Escape, RAWKEY_Control_L, - 219, /* XXX */ + RAWKEY_Alt_L, /* Command */ RAWKEY_Shift_L, RAWKEY_Caps_Lock, - RAWKEY_Alt_L, + RAWKEY_Alt_R, /* Option */ RAWKEY_Left, RAWKEY_Right, RAWKEY_Down, @@ -233,11 +225,11 @@ static const keysym_t akbd_keydesc_us[] = { KC(51), KS_Delete, KC(52), KS_KP_Enter, KC(53), KS_Escape, - KC(54), KS_Control_L, - KC(55), KS_Cmd, /* Command */ + KC(54), KS_Cmd1, KS_Control_L, + KC(55), KS_Cmd2, KS_Alt_L, /* Command */ KC(56), KS_Shift_L, KC(57), KS_Caps_Lock, - KC(58), KS_Cmd1, /* Option */ + KC(58), KS_Cmd2, KS_Alt_R, /* Option */ KC(59), KS_Left, KC(60), KS_Right, KC(61), KS_Down, @@ -340,8 +332,6 @@ static const keysym_t akbd_keydesc_fr[] = { KC(46), KS_comma, KS_question, KS_voidSymbol, KS_questiondown, KC(47), KS_colon, KS_slash, KS_division, KS_backslash, KC(50), KS_less, KS_greater, - KC(52), KS_Alt_R, - KC(55), KS_Meta_L, /* Command */ KC(58), KS_Mode_switch, KS_Multi_key, /* Option */ }; @@ -376,7 +366,6 @@ static const keysym_t akbd_keydesc_uk[] = { /* pos normal shifted altgr shift-altgr */ KC(10), KS_section, KS_plusminus, KC(20), KS_3, KS_sterling, KS_numbersign, - KC(52), KS_KP_Enter, KC(58), KS_Mode_switch, KS_Multi_key, /* Option */ }; @@ -401,7 +390,7 @@ static const keysym_t akbd_keydesc_sv[] = { KC(44), KS_minus, KS_underscore, KC(47), KS_period, KS_colon, KC(50), KS_less, KS_greater, KS_bar, - KC(58), KS_Mode_switch,KS_Multi_key, + KC(58), KS_Mode_switch, KS_Multi_key, /* Option */ }; static const keysym_t akbd_keydesc_sv_nodead[] = { @@ -452,8 +441,7 @@ static const keysym_t akbd_keydesc_de[] = { KC(46), KS_m, KS_M, KS_mu, KC(47), KS_period, KS_colon, KC(50), KS_less, KS_greater, - KC(52), KS_Multi_key, - KC(58), KS_Mode_switch, + KC(58), KS_Mode_switch, KS_Multi_key, /* Option */ }; static const keysym_t akbd_keydesc_de_nodead[] = { @@ -517,7 +505,6 @@ static const keysym_t akbd_keydesc_es[] = { KC(44), KS_minus, KS_underscore, KC(47), KS_period, KS_colon, KC(50), KS_less, KS_greater, - KC(55), KS_Alt_L, /* Command */ KC(58), KS_Mode_switch, KS_Multi_key, /* Option */ }; @@ -624,8 +611,7 @@ static const keysym_t akbd_keydesc_sg[] = { KC(46), KS_m, KS_M, KS_mu, KC(47), KS_period, KS_colon, KS_voidSymbol, KS_division, KC(50), KS_less, KS_greater, - KC(52), KS_Multi_key, - KC(58), KS_Mode_switch, + KC(58), KS_Mode_switch, KS_Multi_key, /* Option */ }; static const keysym_t akbd_keydesc_sg_nodead[] = { |