Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev Add Estonian layout as a variation of Swedish for uk...



details:   https://anonhg.NetBSD.org/src/rev/10228c9960bb
branches:  trunk
changeset: 1011806:10228c9960bb
user:      nia <nia%NetBSD.org@localhost>
date:      Sun Jul 12 12:13:05 2020 +0000

description:
Add Estonian layout as a variation of Swedish for ukbd and pckbd

diffstat:

 sys/dev/hid/hidkbdmap.c          |  22 ++++++++++++++++++++--
 sys/dev/pckbport/wskbdmap_mfii.c |  22 ++++++++++++++++++++--
 sys/dev/wscons/wsksymdef.h       |   3 ++-
 3 files changed, 42 insertions(+), 5 deletions(-)

diffs (117 lines):

diff -r 75ab136de418 -r 10228c9960bb sys/dev/hid/hidkbdmap.c
--- a/sys/dev/hid/hidkbdmap.c   Sun Jul 12 10:10:53 2020 +0000
+++ b/sys/dev/hid/hidkbdmap.c   Sun Jul 12 12:13:05 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hidkbdmap.c,v 1.5 2020/07/12 01:44:24 nia Exp $        */
+/*     $NetBSD: hidkbdmap.c,v 1.6 2020/07/12 12:13:05 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.5 2020/07/12 01:44:24 nia Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hidkbdmap.c,v 1.6 2020/07/12 12:13:05 nia Exp $");
 
 #include <sys/types.h>
 #include <dev/wscons/wsksymdef.h>
@@ -367,6 +367,22 @@
     KC(48),  KS_diaeresis,     KS_asciicircum, KS_asciitilde,
 };
 
+Static const keysym_t hidkbd_keydesc_ee[] = {
+/*  pos      normal             shifted         altgr                   shift-altgr */
+    KC(22),  KS_s,             KS_S,           KS_scaron,              KS_Scaron,
+    KC(29),  KS_z,             KS_Z,           KS_zcaron,              KS_Zcaron,
+    KC(47),  KS_udiaeresis,    KS_Udiaeresis,  KS_dead_diaeresis,      KS_dead_abovering,
+    KC(48),  KS_otilde,                KS_Otilde,      KS_section,
+    KC(50),  KS_apostrophe,    KS_asterisk,    KS_onehalf,             KS_dead_breve,
+    KC(52),  KS_adiaeresis,    KS_Adiaeresis,  KS_asciicircum,         KS_dead_caron,
+    KC(53),  KS_dead_caron,    KS_dead_tilde,  KS_notsign,             KS_notsign,
+};
+
+Static const keysym_t hidkbd_keydesc_ee_nodead[] = {
+/*  pos      normal            shifted         altgr           shift-altgr */
+    KC(53),  KS_asciicircum,   KS_asciitilde,  KS_notsign,     KS_notsign,
+};
+
 Static const keysym_t hidkbd_keydesc_no[] = {
 /*  pos      normal            shifted         altgr           shift-altgr */
     KC(46),  KS_backslash,     KS_dead_grave,  KS_dead_acute,
@@ -680,6 +696,8 @@
        KBD_MAP(KB_UK | KB_SWAPCTRLCAPS,KB_UK,  hidkbd_keydesc_swapctrlcaps),
        KBD_MAP(KB_SV,                  KB_DK,  hidkbd_keydesc_sv),
        KBD_MAP(KB_SV | KB_NODEAD,      KB_SV,  hidkbd_keydesc_sv_nodead),
+       KBD_MAP(KB_EE,                  KB_SV,  hidkbd_keydesc_ee),
+       KBD_MAP(KB_EE | KB_NODEAD,      KB_EE,  hidkbd_keydesc_ee_nodead),
        KBD_MAP(KB_NO,                  KB_DK,  hidkbd_keydesc_no),
        KBD_MAP(KB_NO | KB_NODEAD,      KB_NO,  hidkbd_keydesc_no_nodead),
        KBD_MAP(KB_ES ,                 KB_US,  hidkbd_keydesc_es),
diff -r 75ab136de418 -r 10228c9960bb sys/dev/pckbport/wskbdmap_mfii.c
--- a/sys/dev/pckbport/wskbdmap_mfii.c  Sun Jul 12 10:10:53 2020 +0000
+++ b/sys/dev/pckbport/wskbdmap_mfii.c  Sun Jul 12 12:13:05 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wskbdmap_mfii.c,v 1.29 2020/07/12 01:44:24 nia Exp $   */
+/*     $NetBSD: wskbdmap_mfii.c,v 1.30 2020/07/12 12:13:05 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.29 2020/07/12 01:44:24 nia Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wskbdmap_mfii.c,v 1.30 2020/07/12 12:13:05 nia Exp $");
 
 #include "opt_wskbdmap.h"
 #include <sys/types.h>
@@ -371,6 +371,22 @@
     KC(27),  KS_diaeresis,     KS_asciicircum, KS_asciitilde,
 };
 
+static const keysym_t pckbd_keydesc_ee[] = {
+/*  pos      normal             shifted         altgr                   shift-altgr */
+    KC(26),  KS_udiaeresis,    KS_Udiaeresis,  KS_dead_diaeresis,      KS_dead_abovering,
+    KC(27),  KS_otilde,                KS_Otilde,      KS_section,
+    KC(31),  KS_s,             KS_S,           KS_scaron,              KS_Scaron,
+    KC(44),  KS_z,             KS_Z,           KS_zcaron,              KS_Zcaron,
+    KC(40),  KS_adiaeresis,    KS_Adiaeresis,  KS_asciicircum,         KS_dead_caron,
+    KC(41),  KS_dead_caron,    KS_dead_tilde,  KS_notsign,             KS_notsign,
+    KC(43),  KS_apostrophe,    KS_asterisk,    KS_onehalf,             KS_dead_breve,
+};
+
+static const keysym_t pckbd_keydesc_ee_nodead[] = {
+/*  pos      normal            shifted         altgr           shift-altgr */
+    KC(41),  KS_asciicircum,   KS_asciitilde,  KS_notsign,     KS_notsign,
+};
+
 static const keysym_t pckbd_keydesc_no[] = {
 /*  pos      normal            shifted         altgr           shift-altgr */
     KC(13),  KS_backslash,     KS_dead_grave,  KS_dead_acute,
@@ -889,6 +905,8 @@
        KBD_MAP(KB_JP,                  KB_US,  pckbd_keydesc_jp),
        KBD_MAP(KB_SV,                  KB_DK,  pckbd_keydesc_sv),
        KBD_MAP(KB_SV | KB_NODEAD,      KB_SV,  pckbd_keydesc_sv_nodead),
+       KBD_MAP(KB_EE,                  KB_SV,  pckbd_keydesc_ee),
+       KBD_MAP(KB_EE | KB_NODEAD,      KB_EE,  pckbd_keydesc_ee_nodead),
        KBD_MAP(KB_NO,                  KB_DK,  pckbd_keydesc_no),
        KBD_MAP(KB_NO | KB_NODEAD,      KB_NO,  pckbd_keydesc_no_nodead),
        KBD_MAP(KB_US | KB_DECLK,       KB_US,  pckbd_keydesc_us_declk),
diff -r 75ab136de418 -r 10228c9960bb sys/dev/wscons/wsksymdef.h
--- a/sys/dev/wscons/wsksymdef.h        Sun Jul 12 10:10:53 2020 +0000
+++ b/sys/dev/wscons/wsksymdef.h        Sun Jul 12 12:13:05 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wsksymdef.h,v 1.68 2020/07/12 01:35:59 nia Exp $ */
+/*     $NetBSD: wsksymdef.h,v 1.69 2020/07/12 12:13:05 nia Exp $ */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -659,6 +659,7 @@
 action(KB_CZ,  0,      0x1500, "cz",   ,       "Czech")        \
 action(KB_DK,  0,      0x0400, "dk",   ,       "Danish")       \
 action(KB_NL,  0,      0x1600, "nl",   ,       "Dutch")        \
+action(KB_EE,  0,      0x1900, "ee",   ,       "Estonian")     \
 action(KB_FI,  0,      0x0900, "fi",   ,       "Finnish")      \
 action(KB_FR,  0,      0x0600, "fr",   ,       "French")       \
 action(KB_DE, KB_NODEAD,0x0300,        "de",".nodead", "German")       \



Home | Main Index | Thread Index | Old Index