Estonian keymap

Original diff from Taavi Tani in 2005 (!), adapted to -current by Mart
Tonso.  ok mpi@

3 files changed, 49 insertions, 5 deletions

diff --git a/sys/dev/pckbc/wskbdmap_mfii.c b/sys/dev/pckbc/wskbdmap_mfii.c
index 0acb1d5642b..895a166e2a3 100644
--- a/sys/dev/pckbc/wskbdmap_mfii.c
+++ b/sys/dev/pckbc/wskbdmap_mfii.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wskbdmap_mfii.c,v 1.43 2013/04/14 19:32:52 miod Exp $ */
+/*	$OpenBSD: wskbdmap_mfii.c,v 1.44 2016/08/31 11:05:48 jca Exp $ */
 /*	$NetBSD: wskbdmap_mfii.c,v 1.15 2000/05/19 16:40:04 drochner Exp $	*/
 
 /*
@@ -1071,6 +1071,40 @@ static const keysym_t pckbd_keydesc_is_nodead[] = {
     KC(40),  KS_acute,		KS_diaeresis,	KS_asciicircum,
 };
 
+static const keysym_t pckbd_keydesc_ee[] = {
+/*  pos      normal		shifted		altgr		shift-altgr */
+    KC(3),   KS_2,		KS_quotedbl,	KS_at,
+    KC(4),   KS_3,		KS_numbersign,	KS_sterling,
+    KC(5),   KS_4,		KS_currency,	KS_dollar,
+    KC(7),   KS_6,		KS_ampersand,
+    KC(8),   KS_7,		KS_slash,	KS_braceleft,
+    KC(9),   KS_8,		KS_parenleft,	KS_bracketleft,
+    KC(10),  KS_9,		KS_parenright,	KS_bracketright,
+    KC(11),  KS_0,		KS_equal,	KS_braceright,
+    KC(12),  KS_plus,		KS_question,	KS_backslash,
+    KC(13),  KS_dead_acute,	KS_dead_grave,
+    KC(26),  KS_udiaeresis,
+    KC(27),  KS_otilde,		KS_Otilde,	KS_section,
+    KC(31),  KS_s,		KS_S,		KS_L2_scaron,	KS_L2_Scaron,
+    KC(39),  KS_odiaeresis,
+    KC(40),  KS_adiaeresis,	KS_Adiaeresis,	KS_dead_circumflex,
+    KC(41),  KS_dead_caron,	KS_dead_tilde,
+    KC(43),  KS_apostrophe,	KS_asterisk,	KS_onehalf,
+    KC(44),  KS_z,		KS_Z,		KS_L2_zcaron,	KS_L2_Zcaron,
+    KC(51),  KS_comma,		KS_semicolon,
+    KC(52),  KS_period,		KS_colon,
+    KC(53),  KS_minus,		KS_underscore,
+    KC(86),  KS_less,		KS_greater,	KS_bar,		KS_brokenbar,
+    KC(184), KS_Mode_switch,	KS_Multi_key,
+};
+
+static const keysym_t pckbd_keydesc_ee_nodead[] = {
+/*  pos      normal		shifted		altgr		shift-altgr */
+    KC(13),  KS_apostrophe,	KS_grave,
+    KC(40),  KS_adiaeresis,	KS_Adiaeresis,	KS_asciicircum,
+    KC(41),  KS_L2_caron,	KS_asciitilde,
+};
+
 #endif	/* WSKBD_NO_INTL_LAYOUTS */
 
 #define KBD_MAP(name, base, map) \
@@ -1130,6 +1164,8 @@ const struct wscons_keydesc pckbd_keydesctab[] = {
 	KBD_MAP(KB_NL | KB_NODEAD,	KB_NL,	pckbd_keydesc_nl_nodead),
 	KBD_MAP(KB_IS,			KB_US, 	pckbd_keydesc_is),
 	KBD_MAP(KB_IS | KB_NODEAD,	KB_IS, 	pckbd_keydesc_is_nodead),
+	KBD_MAP(KB_EE,			KB_US,	pckbd_keydesc_ee),
+	KBD_MAP(KB_EE | KB_NODEAD,	KB_EE,	pckbd_keydesc_ee_nodead),
 #endif	/* WSKBD_NO_INTL_LAYOUTS */
 	{0, 0, 0, 0}
 };
diff --git a/sys/dev/wscons/wskbdutil.c b/sys/dev/wscons/wskbdutil.c
index a0159c6f31f..c4412a78f2f 100644
--- a/sys/dev/wscons/wskbdutil.c
+++ b/sys/dev/wscons/wskbdutil.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wskbdutil.c,v 1.14 2014/12/09 07:05:06 doug Exp $	*/
+/*	$OpenBSD: wskbdutil.c,v 1.15 2016/08/31 11:05:48 jca Exp $	*/
 /*	$NetBSD: wskbdutil.c,v 1.7 1999/12/21 11:59:13 drochner Exp $	*/
 
 /*-
@@ -170,7 +170,12 @@ static struct compose_tab_s {
 	{ { KS_acute,			KS_u },			KS_uacute },
 	{ { KS_asciicircum,		KS_u },			KS_ucircumflex },
 	{ { KS_grave,			KS_u },			KS_ugrave },
-	{ { KS_acute,			KS_y },			KS_yacute }
+	{ { KS_acute,			KS_y },			KS_yacute },
+	{ { KS_dead_caron,		KS_space },		KS_L2_caron },
+	{ { KS_dead_caron,		KS_S },			KS_L2_Scaron },
+	{ { KS_dead_caron,		KS_Z },			KS_L2_Zcaron },
+	{ { KS_dead_caron,		KS_s },			KS_L2_scaron },
+	{ { KS_dead_caron,		KS_z },			KS_L2_zcaron }
 };
 
 #define COMPOSE_SIZE	nitems(compose_tab)
diff --git a/sys/dev/wscons/wsksymdef.h b/sys/dev/wscons/wsksymdef.h
index 9570da68ca9..486b8840c4f 100644
--- a/sys/dev/wscons/wsksymdef.h
+++ b/sys/dev/wscons/wsksymdef.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wsksymdef.h,v 1.36 2014/01/26 17:48:08 miod Exp $	*/
+/*	$OpenBSD: wsksymdef.h,v 1.37 2016/08/31 11:05:48 jca Exp $	*/
 /*	$NetBSD: wsksymdef.h,v 1.34.4.1 2000/07/07 09:49:54 hannken Exp $ */
 
 /*-
@@ -266,6 +266,7 @@
 #define	KS_dead_diaeresis 	0x0308
 #define	KS_dead_abovering 	0x030a
 #define	KS_dead_cedilla 	0x0327
+#define	KS_dead_caron	 	0x0328
 
 /*
  * Group Cyrillic
@@ -734,6 +735,7 @@
 #define KB_CF			0x1a00
 #define KB_LV			0x1b00
 #define KB_IS			0x1c00
+#define KB_EE			0x1d00
 
 #define KB_NODEAD		0x00000001 /* disable dead accents */
 #define KB_DECLK		0x00000002 /* DEC LKnnn layout */
@@ -774,7 +776,8 @@
 	{ KB_SI,	"si" }, \
 	{ KB_CF,	"cf" }, \
 	{ KB_LV,	"lv" }, \
-	{ KB_IS,	"is" }
+	{ KB_IS,	"is" }, \
+	{ KB_EE,	"ee" }
 
 #define KB_VARTAB \
 	{ KB_NODEAD,	"nodead" }, \