add swiss german layout; from Kaspar Brand <kasparb@freesurf.ch>

2 files changed, 42 insertions, 3 deletions

diff --git a/sys/dev/pckbc/wskbdmap_mfii.c b/sys/dev/pckbc/wskbdmap_mfii.c
index 3ac91d26681..a08aef43fff 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.7 2001/05/02 18:58:20 mickey Exp $ */
+/*	$OpenBSD: wskbdmap_mfii.c,v 1.8 2001/05/14 16:43:18 mickey Exp $ */
 /*	$NetBSD: wskbdmap_mfii.c,v 1.15 2000/05/19 16:40:04 drochner Exp $	*/
 
 /*-
@@ -551,6 +551,41 @@ static const keysym_t pckbd_keydesc_ru[] = {
     KC(53),  KS_slash,		KS_question,	KS_Cyrillic_yo,		KS_Cyrillic_YO,
 };
 
+static const keysym_t pckbd_keydesc_sg[] = {
+/*  pos      normal		shifted		altgr		shift-altgr */
+    KC(2),   KS_1,		KS_plus,	KS_bar,
+    KC(3),   KS_2,		KS_quotedbl,	KS_at,
+    KC(4),   KS_3,		KS_asterisk,	KS_numbersign,
+    KC(5),   KS_4,		KS_ccedilla,
+    KC(7),   KS_6,		KS_ampersand,	KS_notsign,
+    KC(8),   KS_7,		KS_slash,	KS_brokenbar,
+    KC(9),   KS_8,		KS_parenleft,	KS_cent,
+    KC(10),  KS_9,		KS_parenright,
+    KC(11),  KS_0,		KS_equal,
+    KC(12),  KS_apostrophe,	KS_question,	KS_dead_acute,
+    KC(13),  KS_dead_circumflex,KS_dead_grave,	KS_asciitilde,	KS_dead_tilde,
+    KC(21),  KS_z,
+    KC(26),  KS_udiaeresis,	KS_egrave,	KS_bracketleft,
+    KC(27),  KS_dead_diaeresis,	KS_exclam,	KS_bracketright,
+    KC(39),  KS_odiaeresis,	KS_eacute,
+    KC(40),  KS_adiaeresis,	KS_agrave,	KS_braceleft,
+    KC(41),  KS_section,	KS_degree,	KS_dead_abovering,
+    KC(43),  KS_dollar,		KS_sterling,	KS_braceright,
+    KC(44),  KS_y,
+    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_backslash,
+    KC(184), KS_Mode_switch,	KS_Multi_key,
+};
+
+static const keysym_t pckbd_keydesc_sg_nodead[] = {
+/*  pos      normal		shifted		altgr		shift-altgr */
+    KC(12),  KS_apostrophe,	KS_question,	KS_acute,
+    KC(13),  KS_asciicircum,	KS_grave,	KS_asciitilde,	KS_dead_tilde,
+    KC(27),  KS_diaeresis,	KS_exclam,	KS_bracketright
+};
+
 #define KBD_MAP(name, base, map) \
 			{ name, base, sizeof(map)/sizeof(keysym_t), map }
 
@@ -582,6 +617,8 @@ const struct wscons_keydesc pckbd_keydesctab[] = {
 	KBD_MAP(KB_ES,			KB_US,	pckbd_keydesc_es),
 	KBD_MAP(KB_BE,			KB_US,	pckbd_keydesc_be),
 	KBD_MAP(KB_RU,			KB_US,	pckbd_keydesc_ru),
+	KBD_MAP(KB_SG,			KB_US,	pckbd_keydesc_sg),
+	KBD_MAP(KB_SG | KB_NODEAD,	KB_SG,	pckbd_keydesc_sg_nodead),
 	{0, 0, 0, 0}
 };
 
diff --git a/sys/dev/wscons/wsksymdef.h b/sys/dev/wscons/wsksymdef.h
index 860e7bd2b99..b980a361e80 100644
--- a/sys/dev/wscons/wsksymdef.h
+++ b/sys/dev/wscons/wsksymdef.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wsksymdef.h,v 1.10 2001/04/30 16:53:35 mickey Exp $	*/
+/*	$OpenBSD: wsksymdef.h,v 1.11 2001/05/14 16:43:19 mickey Exp $	*/
 /*	$NetBSD: wsksymdef.h,v 1.34.4.1 2000/07/07 09:49:54 hannken Exp $ */
 
 /*-
@@ -569,6 +569,7 @@
 #define KB_HU			0x0c00
 #define KB_BE			0x0d00
 #define KB_RU			0x0e00
+#define KB_SG			0x0f00
 
 #define KB_NODEAD		0x0001
 #define KB_DECLK		0x0002	/* DEC LKnnn layout */
@@ -593,7 +594,8 @@
 	{ KB_ES,	"es" }, \
 	{ KB_HU,	"hu" }, \
 	{ KB_BE,	"be" }, \
-	{ KB_RU,	"ru" }
+	{ KB_RU,	"ru" }, \
+	{ KB_SG,	"sg" }
 
 #define KB_VARTAB \
 	{ KB_NODEAD,	"nodead" }, \