SEO

Hello,

Here's a diff that adds Estonian keymap support for wscons.

Taavi


Index: sys/dev/pckbc/wskbdmap_mfii.c
================================================== =================
RCS file: /cvs/src/sys/dev/pckbc/wskbdmap_mfii.c,v
retrieving revision 1.30
diff -u -r1.30 wskbdmap_mfii.c
--- sys/dev/pckbc/wskbdmap_mfii.c 9 May 2005 05:08:57 -0000 1.30
+++ sys/dev/pckbc/wskbdmap_mfii.c 7 Oct 2005 20:19:22 -0000
@@ -917,6 +917,40 @@
KC(53), KS_eacute, KS_Eacute, KS_acute,
};

+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 /* SMALL_KERNEL */

#define KBD_MAP(name, base, map) \
@@ -967,6 +1001,8 @@
KBD_MAP(KB_SI, KB_US, pckbd_keydesc_si),
KBD_MAP(KB_CF, KB_US, pckbd_keydesc_cf),
KBD_MAP(KB_CF | KB_NODEAD, KB_CF, pckbd_keydesc_cf_nodead),
+ KBD_MAP(KB_EE, KB_US, pckbd_keydesc_ee),
+ KBD_MAP(KB_EE | KB_NODEAD, KB_EE, pckbd_keydesc_ee_nodead),
#endif /* SMALL_KERNEL */
{0, 0, 0, 0}
};
Index: sys/dev/wscons/wsksymdef.h
================================================== =================
RCS file: /cvs/src/sys/dev/wscons/wsksymdef.h,v
retrieving revision 1.28
diff -u -r1.28 wsksymdef.h
--- sys/dev/wscons/wsksymdef.h 15 May 2005 11:29:15 -0000 1.28
+++ sys/dev/wscons/wsksymdef.h 7 Oct 2005 20:19:22 -0000
@@ -274,6 +274,7 @@
#define KS_dead_diaeresis 0x0308
#define KS_dead_abovering 0x030a
#define KS_dead_cedilla 0x0327
+#define KS_dead_caron 0x0328

/*
* Group Cyrillic (koi8-r)
@@ -700,6 +701,7 @@
#define KB_PL 0x1800
#define KB_SI 0x1900
#define KB_CF 0x1a00
+#define KB_EE 0x1b00

#define KB_NODEAD 0x000001 /* disable dead accents */
#define KB_DECLK 0x000002 /* DEC LKnnn layout */
@@ -737,7 +739,8 @@
{ KB_TR, "tr" }, \
{ KB_PL, "pl" }, \
{ KB_SI, "si" }, \
- { KB_CF, "cf" }
+ { KB_CF, "cf" }, \
+ { KB_EE, "ee" }

#define KB_VARTAB \
{ KB_NODEAD, "nodead" }, \
Index: sys/dev/wscons/wskbdutil.c
================================================== =================
RCS file: /cvs/src/sys/dev/wscons/wskbdutil.c,v
retrieving revision 1.5
diff -u -r1.5 wskbdutil.c
--- sys/dev/wscons/wskbdutil.c 6 Dec 2003 14:46:44 -0000 1.5
+++ sys/dev/wscons/wskbdutil.c 7 Oct 2005 20:19:22 -0000
@@ -178,7 +178,12 @@
{ { 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 sizeof(compose_tab)/sizeof(compose_tab[0])