Estonian keymap

classic Classic list List threaded Threaded
6 messages Options
Reply | Threaded
Open this post in threaded view
|

Estonian keymap

Mart Tõnso
Updated Estonian keymap patch for current. Original from 2005 at
http://marc.info/?l=openbsd-tech&m=112873075504474


Index: sys/dev/pckbc/wskbdmap_mfii.c
===================================================================
RCS file: /cvs/src/sys/dev/pckbc/wskbdmap_mfii.c,v
retrieving revision 1.43
diff -u -p -u -r1.43 wskbdmap_mfii.c
--- sys/dev/pckbc/wskbdmap_mfii.c 14 Apr 2013 19:32:52 -0000 1.43
+++ sys/dev/pckbc/wskbdmap_mfii.c 26 Aug 2016 19:32:22 -0000
@@ -1071,6 +1071,40 @@ static const keysym_t pckbd_keydesc_is_n
     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_keydes
  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}
 };
Index: sys/dev/wscons/wskbdutil.c
===================================================================
RCS file: /cvs/src/sys/dev/wscons/wskbdutil.c,v
retrieving revision 1.14
diff -u -p -u -r1.14 wskbdutil.c
--- sys/dev/wscons/wskbdutil.c 9 Dec 2014 07:05:06 -0000 1.14
+++ sys/dev/wscons/wskbdutil.c 26 Aug 2016 19:32:22 -0000
@@ -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)
Index: sys/dev/wscons/wsksymdef.h
===================================================================
RCS file: /cvs/src/sys/dev/wscons/wsksymdef.h,v
retrieving revision 1.36
diff -u -p -u -r1.36 wsksymdef.h
--- sys/dev/wscons/wsksymdef.h 26 Jan 2014 17:48:08 -0000 1.36
+++ sys/dev/wscons/wsksymdef.h 26 Aug 2016 19:32:22 -0000
@@ -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" }, \

Reply | Threaded
Open this post in threaded view
|

Re: Estonian keymap

Mart Tõnso
Would this be ok for inclusion in the next release?

On Sat, Aug 27, 2016 at 7:27 AM, Mart Tõnso <[hidden email]> wrote:

> Updated Estonian keymap patch for current. Original from 2005 at
> http://marc.info/?l=openbsd-tech&m=112873075504474
>
>
> Index: sys/dev/pckbc/wskbdmap_mfii.c
> ===================================================================
> RCS file: /cvs/src/sys/dev/pckbc/wskbdmap_mfii.c,v
> retrieving revision 1.43
> diff -u -p -u -r1.43 wskbdmap_mfii.c
> --- sys/dev/pckbc/wskbdmap_mfii.c 14 Apr 2013 19:32:52 -0000 1.43
> +++ sys/dev/pckbc/wskbdmap_mfii.c 26 Aug 2016 19:32:22 -0000
> @@ -1071,6 +1071,40 @@ static const keysym_t pckbd_keydesc_is_n
>      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_keydes
>   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}
>  };
> Index: sys/dev/wscons/wskbdutil.c
> ===================================================================
> RCS file: /cvs/src/sys/dev/wscons/wskbdutil.c,v
> retrieving revision 1.14
> diff -u -p -u -r1.14 wskbdutil.c
> --- sys/dev/wscons/wskbdutil.c 9 Dec 2014 07:05:06 -0000 1.14
> +++ sys/dev/wscons/wskbdutil.c 26 Aug 2016 19:32:22 -0000
> @@ -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)
> Index: sys/dev/wscons/wsksymdef.h
> ===================================================================
> RCS file: /cvs/src/sys/dev/wscons/wsksymdef.h,v
> retrieving revision 1.36
> diff -u -p -u -r1.36 wsksymdef.h
> --- sys/dev/wscons/wsksymdef.h 26 Jan 2014 17:48:08 -0000 1.36
> +++ sys/dev/wscons/wsksymdef.h 26 Aug 2016 19:32:22 -0000
> @@ -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" }, \

Reply | Threaded
Open this post in threaded view
|

Re: Estonian keymap

Jeremie Courreges-Anglas-2
In reply to this post by Mart Tõnso

Hi,

> Updated Estonian keymap patch for current. Original from 2005 at
> http://marc.info/?l=openbsd-tech&m=112873075504474

The tabs in your diff seem to have suffered from copy/paste (maybe your
MUA is at fault).  As is, the diff doesn't apply.

--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Reply | Threaded
Open this post in threaded view
|

Re: Estonian keymap

Mart Tõnso
Hello,


> > Updated Estonian keymap patch for current. Original from 2005 at
> > http://marc.info/?l=openbsd-tech&m=112873075504474
>
> The tabs in your diff seem to have suffered from copy/paste (maybe your
> MUA is at fault).  As is, the diff doesn't apply.


Well, this is embarrassing... Let's try again.

Regards,

Mart


Index: sys/dev/pckbc/wskbdmap_mfii.c
===================================================================
RCS file: /cvs/src/sys/dev/pckbc/wskbdmap_mfii.c,v
retrieving revision 1.43
diff -u -p -r1.43 wskbdmap_mfii.c
--- sys/dev/pckbc/wskbdmap_mfii.c 14 Apr 2013 19:32:52 -0000 1.43
+++ sys/dev/pckbc/wskbdmap_mfii.c 30 Aug 2016 15:27:46 -0000
@@ -1071,6 +1071,40 @@ static const keysym_t pckbd_keydesc_is_n
     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_keydes
  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}
 };
Index: sys/dev/wscons/wskbdutil.c
===================================================================
RCS file: /cvs/src/sys/dev/wscons/wskbdutil.c,v
retrieving revision 1.14
diff -u -p -r1.14 wskbdutil.c
--- sys/dev/wscons/wskbdutil.c 9 Dec 2014 07:05:06 -0000 1.14
+++ sys/dev/wscons/wskbdutil.c 30 Aug 2016 15:27:46 -0000
@@ -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)
Index: sys/dev/wscons/wsksymdef.h
===================================================================
RCS file: /cvs/src/sys/dev/wscons/wsksymdef.h,v
retrieving revision 1.36
diff -u -p -r1.36 wsksymdef.h
--- sys/dev/wscons/wsksymdef.h 26 Jan 2014 17:48:08 -0000 1.36
+++ sys/dev/wscons/wsksymdef.h 30 Aug 2016 15:27:46 -0000
@@ -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" }, \

Reply | Threaded
Open this post in threaded view
|

Re: Estonian keymap

Mart Tõnso

This should be ok now:


Index: sys/dev/pckbc/wskbdmap_mfii.c
===================================================================
RCS file: /cvs/src/sys/dev/pckbc/wskbdmap_mfii.c,v
retrieving revision 1.43
diff -u -p -r1.43 wskbdmap_mfii.c
--- sys/dev/pckbc/wskbdmap_mfii.c 14 Apr 2013 19:32:52 -0000 1.43
+++ sys/dev/pckbc/wskbdmap_mfii.c 30 Aug 2016 15:59:25 -0000
@@ -1071,6 +1071,40 @@ static const keysym_t pckbd_keydesc_is_n
     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_keydes
  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}
 };
Index: sys/dev/wscons/wskbdutil.c
===================================================================
RCS file: /cvs/src/sys/dev/wscons/wskbdutil.c,v
retrieving revision 1.14
diff -u -p -r1.14 wskbdutil.c
--- sys/dev/wscons/wskbdutil.c 9 Dec 2014 07:05:06 -0000 1.14
+++ sys/dev/wscons/wskbdutil.c 30 Aug 2016 15:59:25 -0000
@@ -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)
Index: sys/dev/wscons/wsksymdef.h
===================================================================
RCS file: /cvs/src/sys/dev/wscons/wsksymdef.h,v
retrieving revision 1.36
diff -u -p -r1.36 wsksymdef.h
--- sys/dev/wscons/wsksymdef.h 26 Jan 2014 17:48:08 -0000 1.36
+++ sys/dev/wscons/wsksymdef.h 30 Aug 2016 15:59:25 -0000
@@ -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" }, \

Reply | Threaded
Open this post in threaded view
|

Re: Estonian keymap

Martin Pieuchot
On 08/30/16 21:14, Mart Tõnso wrote:
>
> This should be ok now:

ok mpi@

> Index: sys/dev/pckbc/wskbdmap_mfii.c
> ===================================================================
> RCS file: /cvs/src/sys/dev/pckbc/wskbdmap_mfii.c,v
> retrieving revision 1.43
> diff -u -p -r1.43 wskbdmap_mfii.c
> --- sys/dev/pckbc/wskbdmap_mfii.c 14 Apr 2013 19:32:52 -0000 1.43
> +++ sys/dev/pckbc/wskbdmap_mfii.c 30 Aug 2016 15:59:25 -0000
> @@ -1071,6 +1071,40 @@ static const keysym_t pckbd_keydesc_is_n
>      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_keydes
>   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}
>  };
> Index: sys/dev/wscons/wskbdutil.c
> ===================================================================
> RCS file: /cvs/src/sys/dev/wscons/wskbdutil.c,v
> retrieving revision 1.14
> diff -u -p -r1.14 wskbdutil.c
> --- sys/dev/wscons/wskbdutil.c 9 Dec 2014 07:05:06 -0000 1.14
> +++ sys/dev/wscons/wskbdutil.c 30 Aug 2016 15:59:25 -0000
> @@ -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)
> Index: sys/dev/wscons/wsksymdef.h
> ===================================================================
> RCS file: /cvs/src/sys/dev/wscons/wsksymdef.h,v
> retrieving revision 1.36
> diff -u -p -r1.36 wsksymdef.h
> --- sys/dev/wscons/wsksymdef.h 26 Jan 2014 17:48:08 -0000 1.36
> +++ sys/dev/wscons/wsksymdef.h 30 Aug 2016 15:59:25 -0000
> @@ -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" }, \
>