Add support for polish keyboard from Kamil Andrusz wizz at mniam dot net.

Replaced some Latin 1 symbols with Latin 2. -moj

2 files changed, 41 insertions, 3 deletions

diff --git a/sys/dev/pckbc/wskbdmap_mfii.c b/sys/dev/pckbc/wskbdmap_mfii.c
index 2adedd186a9..f88df51b24b 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.20 2003/01/04 13:24:31 maja Exp $ */
+/*	$OpenBSD: wskbdmap_mfii.c,v 1.21 2003/01/04 13:40:08 maja Exp $ */
 /*	$NetBSD: wskbdmap_mfii.c,v 1.15 2000/05/19 16:40:04 drochner Exp $	*/
 
 /*-
@@ -779,6 +779,20 @@ static const keysym_t pckbd_keydesc_tr_nodead[] = {
     KC(43),  KS_comma,		KS_semicolon,	KS_grave,
 };
 
+static const keysym_t pckbd_keydesc_pl[] = {
+/*  pos      normal		shifted         altgr           shift-altgr */
+    KC(18),  KS_e,		KS_E,		KS_L2_eogonek,	KS_L2_Eogonek,
+    KC(24),  KS_o,		KS_O,		KS_oacute,	KS_Oacute,
+    KC(30),  KS_a,		KS_A,		KS_L2_aogonek,	KS_L2_Aogonek,
+    KC(31),  KS_s,		KS_S,		KS_L2_sacute,	KS_L2_Sacute,
+    KC(38),  KS_l,		KS_L,		KS_L2_lstroke,	KS_L2_Lstroke,
+    KC(44),  KS_z,		KS_Z,		KS_L2_zdotabove,KS_L2_Zdotabove,
+    KC(45),  KS_x,		KS_X,		KS_L2_zacute,	KS_L2_Zacute,
+    KC(46),  KS_c,		KS_C,		KS_L2_cacute,	KS_L2_Cacute,
+    KC(49),  KS_n,		KS_N,		KS_L2_nacute,	KS_L2_Nacute,
+    KC(184), KS_Mode_switch,	KS_Multi_key,
+};
+
 #define KBD_MAP(name, base, map) \
 			{ name, base, sizeof(map)/sizeof(keysym_t), map }
 
@@ -821,6 +835,7 @@ const struct wscons_keydesc pckbd_keydesctab[] = {
 	KBD_MAP(KB_BR,			KB_US,	pckbd_keydesc_br),
 	KBD_MAP(KB_TR,			KB_US,	pckbd_keydesc_tr),
 	KBD_MAP(KB_TR | KB_NODEAD,	KB_TR,	pckbd_keydesc_tr_nodead),
+	KBD_MAP(KB_PL,			KB_US,	pckbd_keydesc_pl),
 	{0, 0, 0, 0}
 };
 
diff --git a/sys/dev/wscons/wsksymdef.h b/sys/dev/wscons/wsksymdef.h
index 89198a9d0d6..0cde0dbb976 100644
--- a/sys/dev/wscons/wsksymdef.h
+++ b/sys/dev/wscons/wsksymdef.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wsksymdef.h,v 1.23 2003/01/04 13:24:31 maja Exp $	*/
+/*	$OpenBSD: wsksymdef.h,v 1.24 2003/01/04 13:40:08 maja Exp $	*/
 /*	$NetBSD: wsksymdef.h,v 1.34.4.1 2000/07/07 09:49:54 hannken Exp $ */
 
 /*-
@@ -356,6 +356,27 @@
 #define KS_Cyrillic_YEUKR	0xb4
 
 /*
+ * Group Latin-2 (iso8859-2)
+ */
+
+#define KS_L2_Aogonek		0xa1
+#define KS_L2_Lstroke		0xa3
+#define KS_L2_Sacute		0xa6
+#define KS_L2_Zacute		0xac
+#define KS_L2_Zdotabove		0xaf
+#define KS_L2_aogonek		0xb1
+#define KS_L2_lstroke		0xb3
+#define KS_L2_sacute		0xb6
+#define KS_L2_zacute		0xbc
+#define KS_L2_zdotabove		0xbf
+#define KS_L2_Cacute		0xc6
+#define KS_L2_Eogonek		0xca
+#define KS_L2_Nacute		0xd1
+#define KS_L2_cacute		0xe6
+#define KS_L2_eogonek		0xea
+#define KS_L2_nacute		0xf1
+
+/*
  * Group Latin-5 (iso8859-9)
  */
 
@@ -663,6 +684,7 @@
 #define KB_BR			0x1500
 #define KB_NL			0x1600
 #define KB_TR			0x1700
+#define KB_PL			0x1800
 
 #define KB_NODEAD		0x0001
 #define KB_DECLK		0x0002	/* DEC LKnnn layout */
@@ -696,7 +718,8 @@
 	{ KB_LA,	"la" }, \
 	{ KB_BR,	"br" },	\
 	{ KB_NL,	"nl" }, \
-	{ KB_TR,	"tr" }
+	{ KB_TR,	"tr" }, \
+	{ KB_PL,	"pl" }
 
 #define KB_VARTAB \
 	{ KB_NODEAD,	"nodead" }, \