diff options
| author | nia <nia@NetBSD.org> | 2020-07-13 08:45:12 +0000 |
|---|---|---|
| committer | nia <nia@NetBSD.org> | 2020-07-13 08:45:12 +0000 |
| commit | 77dafeec043c765656fc417da382fd37cc79a9ca (patch) | |
| tree | 745cc678cb37618328baa7feb02571717c0ef735 | |
| parent | 0321370c2b403aad8bd45e4575fc017c60152b52 (diff) | |
Add keyboard layout for Latin American Spanish to ukbd/pckbd
| -rw-r--r-- | sys/dev/hid/hidkbdmap.c | 32 | ||||
| -rw-r--r-- | sys/dev/pckbport/wskbdmap_mfii.c | 31 | ||||
| -rw-r--r-- | sys/dev/wscons/wsksymdef.h | 3 |
3 files changed, 61 insertions, 5 deletions
diff --git a/sys/dev/hid/hidkbdmap.c b/sys/dev/hid/hidkbdmap.c index fe658390ca8..c9474e9fbde 100644 --- a/sys/dev/hid/hidkbdmap.c +++ b/sys/dev/hid/hidkbdmap.c @@ -1,4 +1,4 @@ -/* $NetBSD: hidkbdmap.c,v 1.8 2020/07/12 14:31:49 nia Exp $ */ +/* $NetBSD: hidkbdmap.c,v 1.9 2020/07/13 08:45:12 nia Exp $ */ /* * Copyright (c) 1999,2001 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hidkbdmap.c,v 1.8 2020/07/12 14:31:49 nia Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hidkbdmap.c,v 1.9 2020/07/13 08:45:12 nia Exp $"); #include <sys/types.h> #include <dev/wscons/wsksymdef.h> @@ -743,6 +743,33 @@ static const keysym_t hidkbd_keydesc_is_nodead[] = { KC(52), KS_acute, KS_diaeresis, KS_asciicircum, }; +static const keysym_t hidkbd_keydesc_la[] = { +/* pos normal shifted altgr shift-altgr */ + KC(20), KS_q, KS_Q, KS_at, + KC(30), KS_1, KS_exclam, KS_bar, + KC(31), KS_2, KS_quotedbl, KS_at, + KC(32), KS_3, KS_numbersign, KS_periodcentered, + KC(35), KS_6, KS_ampersand, KS_notsign, + KC(36), KS_7, KS_slash, + KC(37), KS_8, KS_parenleft, + KC(38), KS_9, KS_parenright, + KC(39), KS_0, KS_equal, + KC(45), KS_apostrophe, KS_question, KS_backslash, + KC(46), KS_questiondown, KS_exclamdown, KS_dead_cedilla, KS_dead_ogonek, + KC(47), KS_dead_acute, KS_dead_diaeresis, KS_dead_diaeresis, KS_dead_abovering, + KC(48), KS_plus, KS_asterisk, KS_asciitilde, + KC(49), KS_braceright, KS_bracketright, KS_dead_grave, + KC(50), KS_braceright, KS_bracketright, KS_dead_grave, + KC(51), KS_ntilde, KS_Ntilde, KS_asciitilde, + KC(52), KS_braceleft, KS_bracketleft, KS_dead_circumflex, + KC(53), KS_bar, KS_degree, KS_notsign, + KC(54), KS_comma, KS_semicolon, + KC(55), KS_period, KS_colon, + KC(56), KS_minus, KS_underscore, + KC(100), KS_less, KS_greater, + KC(230), KS_Mode_switch, KS_Multi_key, +}; + #define KBD_MAP(name, base, map) \ { name, base, sizeof(map)/sizeof(keysym_t), map } @@ -783,6 +810,7 @@ const struct wscons_keydesc hidkbd_keydesctab[] = { KBD_MAP(KB_SF | KB_NODEAD, KB_SF, hidkbd_keydesc_sg_nodead), KBD_MAP(KB_TR, KB_US, hidkbd_keydesc_tr), KBD_MAP(KB_TR | KB_NODEAD, KB_TR, hidkbd_keydesc_tr_nodead), + KBD_MAP(KB_LA, KB_US, hidkbd_keydesc_la), KBD_MAP(KB_HU, KB_US, hidkbd_keydesc_hu), {0, 0, 0, 0} }; diff --git a/sys/dev/pckbport/wskbdmap_mfii.c b/sys/dev/pckbport/wskbdmap_mfii.c index 0a02c7af3af..b49943105b8 100644 --- a/sys/dev/pckbport/wskbdmap_mfii.c +++ b/sys/dev/pckbport/wskbdmap_mfii.c @@ -1,4 +1,4 @@ -/* $NetBSD: wskbdmap_mfii.c,v 1.31 2020/07/12 14:31:49 nia Exp $ */ +/* $NetBSD: wskbdmap_mfii.c,v 1.32 2020/07/13 08:45:12 nia Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wskbdmap_mfii.c,v 1.31 2020/07/12 14:31:49 nia Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wskbdmap_mfii.c,v 1.32 2020/07/13 08:45:12 nia Exp $"); #include "opt_wskbdmap.h" #include <sys/types.h> @@ -912,6 +912,32 @@ static const keysym_t pckbd_keydesc_is_nodead[] = { /* pos normal shifted altgr shift-altgr */ KC(40), KS_acute, KS_diaeresis, KS_asciicircum, }; + +static const keysym_t pckbd_keydesc_la[] = { +/* pos normal shifted altgr shift-altgr */ + KC(2), KS_1, KS_exclam, KS_bar, + KC(3), KS_2, KS_quotedbl, KS_at, + KC(4), KS_3, KS_numbersign, KS_periodcentered, + KC(7), KS_6, KS_ampersand, KS_notsign, + KC(8), KS_7, KS_slash, + KC(9), KS_8, KS_parenleft, + KC(10), KS_9, KS_parenright, + KC(11), KS_0, KS_equal, + KC(12), KS_apostrophe, KS_question, KS_backslash, + KC(13), KS_questiondown, KS_exclamdown, KS_dead_cedilla, KS_dead_ogonek, + KC(16), KS_q, KS_Q, KS_at, + KC(26), KS_dead_acute, KS_dead_diaeresis, KS_dead_diaeresis, KS_dead_abovering, + KC(27), KS_plus, KS_asterisk, KS_asciitilde, + KC(39), KS_ntilde, KS_Ntilde, KS_asciitilde, + KC(40), KS_braceleft, KS_bracketleft, KS_dead_circumflex, + KC(41), KS_bar, KS_degree, KS_notsign, + KC(43), KS_braceright, KS_bracketright, KS_dead_grave, + KC(51), KS_comma, KS_semicolon, + KC(52), KS_period, KS_colon, + KC(53), KS_minus, KS_underscore, + KC(86), KS_less, KS_greater, + KC(184), KS_Mode_switch, KS_Multi_key, +}; #endif /* WSKBD_USONLY */ #define KBD_MAP(name, base, map) \ @@ -967,6 +993,7 @@ const struct wscons_keydesc pckbd_keydesctab[] = { KBD_MAP(KB_NL | KB_NODEAD, KB_NL, pckbd_keydesc_nl_nodead), KBD_MAP(KB_TR, KB_US, pckbd_keydesc_tr), KBD_MAP(KB_TR | KB_NODEAD, KB_TR, pckbd_keydesc_tr_nodead), + KBD_MAP(KB_LA, KB_US, pckbd_keydesc_la), #endif /* WSKBD_USONLY */ /* placeholders */ diff --git a/sys/dev/wscons/wsksymdef.h b/sys/dev/wscons/wsksymdef.h index e0636f8d330..21e8f542b3a 100644 --- a/sys/dev/wscons/wsksymdef.h +++ b/sys/dev/wscons/wsksymdef.h @@ -1,4 +1,4 @@ -/* $NetBSD: wsksymdef.h,v 1.70 2020/07/12 14:31:50 nia Exp $ */ +/* $NetBSD: wsksymdef.h,v 1.71 2020/07/13 08:45:12 nia Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -668,6 +668,7 @@ action(KB_HU, 0, 0x0c00, "hu", , "Hungarian") \ action(KB_IS, 0, 0x1a00, "is", , "Icelandic") \ action(KB_IT, 0, 0x0500, "it", , "Italian") \ action(KB_JP, 0, 0x0800, "jp", , "Japanese") \ +action(KB_LA, 0, 0x1b00, "la", , "Latinamerican")\ action(KB_NO, 0, 0x0a00, "no", , "Norwegian") \ action(KB_PL, 0, 0x0d00, "pl", , "Polish") \ action(KB_PT, 0, 0x1100, "pt", , "Portuguese") \ |
