Add the remaining layouts (due to popular demand): spanish, italian, dutch,

norwegian, portuguese, swiss-french, swiss-german, uk english.
Not thoroughly tested, problems (if any) should be minor.

Also fix glitch in caret handling in the previous commit.

1 files changed, 456 insertions, 11 deletions

diff --git a/sys/dev/sun/sunkbd.c b/sys/dev/sun/sunkbd.c
index 854e7e23fbe..d987ca6d810 100644
--- a/sys/dev/sun/sunkbd.c
+++ b/sys/dev/sun/sunkbd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sunkbd.c,v 1.10 2002/11/23 19:15:22 miod Exp $	*/
+/*	$OpenBSD: sunkbd.c,v 1.11 2002/11/23 23:49:13 miod Exp $	*/
 
 /*
  * Copyright (c) 2002 Jason L. Wright (jason@thought.net)
@@ -187,7 +187,7 @@ const keysym_t sunkbd_keydesc_befr[] = {
     KC(0x25),		KS_exclam,	KS_8,		KS_sterling,
     KC(0x26),		KS_ccedilla,	KS_9,		KS_backslash,
     KC(0x27),		KS_agrave,	KS_0,
-    KC(0x28),		KS_parenright,	KS_asciicircum,	KS_asciitilde,
+    KC(0x28),		KS_parenright,	KS_degree,	KS_asciitilde,
     KC(0x29),		KS_minus,	KS_underscore,	KS_numbersign,
     KC(0x2a),		KS_asterisk,	KS_bar,		KS_currency,
     KC(0x36),		KS_a,
@@ -218,9 +218,9 @@ const keysym_t sunkbd5_keydesc_fr[] = {
     KC(0x23),		KS_minus,	KS_6,		KS_bar,
     KC(0x24),		KS_egrave,	KS_7,		KS_grave,
     KC(0x25),		KS_exclam,	KS_8,		KS_backslash,
-    KC(0x26),		KS_ccedilla,	KS_9,		KS_dead_circumflex,
+    KC(0x26),		KS_ccedilla,	KS_9,		KS_asciicircum,
     KC(0x27),		KS_agrave,	KS_0,		KS_at,
-    KC(0x28),		KS_parenright,	KS_asciicircum,	KS_bracketright,
+    KC(0x28),		KS_parenright,	KS_degree,	KS_bracketright,
     KC(0x29),		KS_equal,	KS_plus,	KS_braceright,
     KC(0x2a),		KS_twosuperior,
     KC(0x36),		KS_a,
@@ -242,7 +242,7 @@ const keysym_t sunkbd5_keydesc_fr[] = {
 /* 004 Danish type 4 keyboard */
 const keysym_t sunkbd_keydesc_dk[] = {
     KC(0x0d),		KS_Multi_key,
-    KC(0x0f),		KS_asciitilde,	KS_dead_circumflex, 
+    KC(0x0f),		KS_asciitilde,	KS_asciicircum, 
     KC(0x1f),		KS_2,		KS_quotedbl,	KS_at,
     KC(0x20),		KS_3,		KS_numbersign,	KS_sterling,
     KC(0x21),		KS_4,		KS_currency,	KS_dollar,
@@ -270,11 +270,12 @@ const keysym_t sunkbd_keydesc_dk[] = {
 
 /* 024 Danish type 5 keyboard */
 const keysym_t sunkbd5_keydesc_dk[] = {
+    KC(0x0d),		KS_Mode_switch,
     KC(0x1f),		KS_2,		KS_quotedbl,	KS_at,
     KC(0x20),		KS_3,		KS_numbersign,	KS_sterling,
     KC(0x21),		KS_4,		KS_currency,	KS_dollar,
     KC(0x22),		KS_5,		KS_percent,	KS_asciitilde,
-    KC(0x23),		KS_6,		KS_ampersand,	KS_dead_circumflex,
+    KC(0x23),		KS_6,		KS_ampersand,	KS_asciicircum,
     KC(0x24),		KS_7,		KS_slash,	KS_braceleft,
     KC(0x25),		KS_8,		KS_parenleft,	KS_bracketleft,
     KC(0x26),		KS_9,		KS_parenright,	KS_bracketright,
@@ -301,13 +302,13 @@ const keysym_t sunkbd_keydesc_de[] = {
     KC(0x1f),		KS_2,		KS_quotedbl,	KS_twosuperior,
     KC(0x20),		KS_3,		KS_paragraph,	KS_threesuperior,
     KC(0x23),		KS_6,		KS_ampersand,
-    KC(0x24),		KS_7,		KS_slash,	KS_asciicircum,
+    KC(0x24),		KS_7,		KS_slash,	KS_degree,
     KC(0x25),		KS_8,		KS_parenleft,	KS_grave,
     KC(0x26),		KS_9,		KS_parenright,	KS_apostrophe,
     KC(0x27),		KS_0,		KS_equal,	KS_bar,
     KC(0x28),		KS_ssharp,	KS_question,	KS_backslash,
     KC(0x29),		KS_dead_acute,	KS_dead_grave,
-    KC(0x2a),		KS_numbersign,	KS_dead_circumflex,KS_at,
+    KC(0x2a),		KS_numbersign,	KS_asciicircum,	KS_at,
     KC(0x3b),		KS_z,
     KC(0x40),		KS_udiaeresis,
     KC(0x41),		KS_plus,	KS_multiply,	KS_asciitilde,
@@ -324,8 +325,9 @@ const keysym_t sunkbd_keydesc_de[] = {
     KC(0x7c),		KS_less,	KS_greater,
 };
 
-/* 025 German type 4 keyboard */
+/* 025 German type 5 keyboard */
 const keysym_t sunkbd5_keydesc_de[] = {
+    KC(0x0d),		KS_Mode_switch,
     KC(0x1f),		KS_2,		KS_quotedbl,	KS_twosuperior,
     KC(0x20),		KS_3,		KS_paragraph,	KS_threesuperior,
     KC(0x23),		KS_6,		KS_ampersand,
@@ -335,7 +337,7 @@ const keysym_t sunkbd5_keydesc_de[] = {
     KC(0x27),		KS_0,		KS_equal,	KS_braceright,
     KC(0x28),		KS_ssharp,	KS_question,	KS_backslash,
     KC(0x29),		KS_dead_acute,	KS_dead_grave,
-    KC(0x2a),		KS_dead_circumflex,KS_asciicircum,
+    KC(0x2a),		KS_asciicircum,	KS_degree,
     KC(0x36),		KS_q,		KS_Q,		KS_at,
     KC(0x3b),		KS_z,
     KC(0x40),		KS_udiaeresis,
@@ -351,7 +353,289 @@ const keysym_t sunkbd5_keydesc_de[] = {
     KC(0x7c),		KS_less,	KS_greater,	KS_bar,
 };
 
-/* 00c Swedish/Finnish type 4 keyboard */
+/* 006 Italian type 4 keyboard */
+const keysym_t sunkbd_keydesc_it[] = {
+    KC(0x0d),		KS_Mode_switch,
+    KC(0x0f),		KS_bracketright,KS_braceright,	KS_guillemotright,
+    KC(0x1f),		KS_2,		KS_quotedbl,	KS_twosuperior,
+    KC(0x20),		KS_3,		KS_sterling,	KS_threesuperior,
+    KC(0x23),		KS_6,		KS_ampersand,	KS_notsign,
+    KC(0x24),		KS_7,		KS_slash,
+    KC(0x25),		KS_8,		KS_parenleft,
+    KC(0x26),		KS_9,		KS_parenright,	KS_backslash,
+    KC(0x27),		KS_0,		KS_equal,	KS_bar,
+    KC(0x28),		KS_apostrophe,	KS_question,	KS_grave,
+    KC(0x29),		KS_igrave,	KS_asciicircum,
+    KC(0x2a),		KS_ugrave,	KS_paragraph,
+    KC(0x40),		KS_egrave,	KS_eacute,
+    KC(0x41),		KS_plus,	KS_asterisk,	KS_asciitilde,
+    KC(0x4c),		KS_Caps_Lock,
+    KC(0x56),		KS_ograve,	KS_ccedilla,	KS_at,
+    KC(0x57),		KS_agrave,	KS_degree,	KS_numbersign,
+    KC(0x58),		KS_bracketleft,	KS_braceleft,	KS_guillemotleft,
+    KC(0x6b),		KS_comma,	KS_semicolon,
+    KC(0x6c),		KS_period,	KS_colon,
+    KC(0x6d),		KS_minus,	KS_underscore,
+    KC(0x77),		KS_Control_L,
+    KC(0x7c),		KS_less,	KS_greater,
+};
+
+/* 026 Italian type 5 keyboard */
+const keysym_t sunkbd5_keydesc_it[] = {
+    KC(0x0d),		KS_Mode_switch,
+    KC(0x1f),		KS_2,		KS_quotedbl,
+    KC(0x20),		KS_3,		KS_sterling,
+    KC(0x23),		KS_6,		KS_ampersand,
+    KC(0x24),		KS_7,		KS_slash,
+    KC(0x25),		KS_8,		KS_parenleft,	KS_braceleft,
+    KC(0x26),		KS_9,		KS_parenright,	KS_braceright,
+    KC(0x27),		KS_0,		KS_equal,
+    KC(0x28),		KS_apostrophe,	KS_question,	KS_grave,
+    KC(0x29),		KS_igrave,	KS_asciicircum,
+    KC(0x2a),		KS_backslash,	KS_bar,
+    KC(0x40),		KS_egrave,	KS_eacute,	KS_bracketleft,
+    KC(0x41),		KS_plus,	KS_asterisk,	KS_bracketright,
+    KC(0x56),		KS_ograve,	KS_ccedilla,	KS_at,
+    KC(0x57),		KS_agrave,	KS_degree,	KS_numbersign,
+    KC(0x58),		KS_ugrave,	KS_paragraph,	KS_asciitilde,
+    KC(0x6b),		KS_comma,	KS_semicolon,
+    KC(0x6c),		KS_period,	KS_colon,
+    KC(0x6d),		KS_minus,	KS_underscore,
+    KC(0x7c),		KS_less,	KS_greater,
+};
+
+/* 007 Dutch type 4 keyboard */
+const keysym_t sunkbd_keydesc_nl[] = {
+    KC(0x0d),		KS_Caps_Lock,
+    KC(0x0f),		KS_backslash,	KS_bar,
+    KC(0x1e),		KS_1,		KS_exclam,	KS_onesuperior,
+    KC(0x1f),		KS_2,		KS_quotedbl,	KS_twosuperior,
+    KC(0x20),		KS_3,		KS_numbersign,	KS_threesuperior,
+    KC(0x21),		KS_4,		KS_dollar,	KS_onequarter,
+    KC(0x22),		KS_5,		KS_percent,	KS_onehalf,
+    KC(0x23),		KS_6,		KS_ampersand,	KS_threequarters,
+    KC(0x24),		KS_7,		KS_underscore,	KS_sterling,
+    KC(0x25),		KS_8,		KS_parenleft,	KS_braceleft,
+    KC(0x26),		KS_9,		KS_parenright,	KS_braceright,
+    KC(0x27),		KS_0,		KS_apostrophe,	KS_grave,
+    KC(0x28),		KS_slash,	KS_question,
+    KC(0x29),		KS_degree,	KS_dead_tilde,	KS_dead_abovering,
+    KC(0x2a),		KS_less,	KS_greater,
+    KC(0x40),		KS_dead_diaeresis,KS_dead_circumflex,
+    KC(0x41),		KS_asterisk,	KS_brokenbar,	KS_asciitilde,
+    KC(0x4e),		KS_s,		KS_S,		KS_ssharp,
+    KC(0x56),		KS_plus,	KS_plusminus,
+    KC(0x57),		KS_dead_acute,	KS_dead_grave,
+    KC(0x58),		KS_at,		KS_paragraph,	KS_notsign,
+    KC(0x64),		KS_z,		KS_Z,		KS_guillemotleft,
+    KC(0x65),		KS_x,		KS_X,		KS_guillemotright,
+    KC(0x66),		KS_c,		KS_C,		KS_cent,
+    KC(0x6a),		KS_m,		KS_M,		KS_mu,
+    KC(0x6b),		KS_comma,	KS_semicolon,
+    KC(0x6c),		KS_period,	KS_colon,
+    KC(0x6d),		KS_minus,	KS_equal,
+    KC(0x77),		KS_Mode_switch,
+    KC(0x7d),		KS_bracketright,KS_bracketleft,
+};
+
+/* 027 Dutch type 5 keyboard */
+const keysym_t sunkbd5_keydesc_nl[] = {
+    KC(0x0d),		KS_Mode_switch,
+    KC(0x1e),		KS_1,		KS_exclam,	KS_onesuperior,
+    KC(0x1f),		KS_2,		KS_quotedbl,	KS_twosuperior,
+    KC(0x20),		KS_3,		KS_numbersign,	KS_threesuperior,
+    KC(0x21),		KS_4,		KS_dollar,	KS_onequarter,
+    KC(0x22),		KS_5,		KS_percent,	KS_onehalf,
+    KC(0x23),		KS_6,		KS_ampersand,	KS_threequarters,
+    KC(0x24),		KS_7,		KS_underscore,	KS_sterling,
+    KC(0x25),		KS_8,		KS_parenleft,	KS_braceleft,
+    KC(0x26),		KS_9,		KS_parenright,	KS_braceright,
+    KC(0x27),		KS_0,		KS_apostrophe,	KS_grave,
+    KC(0x28),		KS_slash,	KS_question,	KS_backslash,
+    KC(0x29),		KS_degree,	KS_dead_tilde,	KS_dead_abovering,
+    KC(0x2a),		KS_at,		KS_paragraph,	KS_notsign,
+    KC(0x40),		KS_dead_diaeresis,KS_dead_circumflex,
+    KC(0x41),		KS_asterisk,	KS_bar,		KS_asciitilde,
+    KC(0x4e),		KS_s,		KS_S,		KS_ssharp,
+    KC(0x56),		KS_plus,	KS_plusminus,
+    KC(0x57),		KS_dead_acute,	KS_dead_grave,
+    KC(0x58),		KS_less,	KS_greater,	KS_asciicircum,
+    KC(0x64),		KS_z,		KS_Z,		KS_guillemotleft,
+    KC(0x65),		KS_x,		KS_X,		KS_guillemotright,
+    KC(0x66),		KS_c,		KS_C,		KS_cent,
+    KC(0x6a),		KS_m,		KS_M,		KS_mu,
+    KC(0x6b),		KS_comma,	KS_semicolon,
+    KC(0x6c),		KS_period,	KS_colon,	KS_hyphen,
+    KC(0x6d),		KS_minus,	KS_equal,
+    KC(0x7d),		KS_bracketright,KS_bracketleft,	KS_brokenbar,
+};
+
+/* 008 Norwegian type 4 keyboard */
+const keysym_t sunkbd_keydesc_no[] = {
+    KC(0x0d),		KS_Mode_switch,
+    KC(0x0f),		KS_asciitilde,	KS_asciicircum,
+    KC(0x1f),		KS_2,		KS_quotedbl,	KS_at,
+    KC(0x20),		KS_3,		KS_numbersign,	KS_sterling,
+    KC(0x21),		KS_4,		KS_currency,	KS_dollar,
+    KC(0x23),		KS_6,		KS_ampersand,
+    KC(0x24),		KS_7,		KS_slash,	KS_braceleft,
+    KC(0x25),		KS_8,		KS_parenleft,	KS_bracketleft,
+    KC(0x26),		KS_9,		KS_parenright,	KS_bracketright,
+    KC(0x27),		KS_0,		KS_equal,	KS_braceright,
+    KC(0x28),		KS_plus,	KS_question,
+    KC(0x29),		KS_backslash,	KS_dead_grave,	KS_dead_acute,
+    KC(0x2a),		KS_apostrophe,	KS_asterisk,	KS_grave,
+    KC(0x40),		KS_aring,
+    KC(0x41),		KS_dead_diaeresis,KS_dead_circumflex,KS_dead_tilde,
+    KC(0x4c),		KS_Caps_Lock,
+    KC(0x56),		KS_oslash,
+    KC(0x57),		KS_ae,
+    KC(0x58),		KS_bar,		KS_paragraph,
+    KC(0x6b),		KS_comma,	KS_semicolon,
+    KC(0x6c),		KS_period,	KS_colon,
+    KC(0x6d),		KS_minus,	KS_underscore,
+    KC(0x77),		KS_Control_L,
+    KC(0x7d),		KS_less,	KS_greater,
+};
+
+/* 028 Norwegian type 5 keyboard */
+const keysym_t sunkbd5_keydesc_no[] = {
+    KC(0x0d),		KS_Mode_switch,
+    KC(0x1f),		KS_2,		KS_quotedbl,	KS_at,
+    KC(0x20),		KS_3,		KS_numbersign,	KS_sterling,
+    KC(0x21),		KS_4,		KS_currency,	KS_dollar,
+    KC(0x22),		KS_5,		KS_percent,	KS_asciitilde,
+    KC(0x23),		KS_6,		KS_ampersand,	KS_asciicircum,
+    KC(0x24),		KS_7,		KS_slash,	KS_braceleft,
+    KC(0x25),		KS_8,		KS_parenleft,	KS_bracketleft,
+    KC(0x26),		KS_9,		KS_parenright,	KS_bracketright,
+    KC(0x27),		KS_0,		KS_equal,	KS_braceright,
+    KC(0x28),		KS_plus,	KS_question,
+    KC(0x29),		KS_backslash,	KS_dead_grave,	KS_dead_acute,
+    KC(0x2a),		KS_bar,		KS_paragraph,
+    KC(0x40),		KS_aring,
+    KC(0x41),		KS_dead_diaeresis,KS_dead_circumflex,KS_dead_tilde,
+    KC(0x56),		KS_oslash,
+    KC(0x57),		KS_ae,
+    KC(0x58),		KS_apostrophe,	KS_asterisk,	KS_grave,
+    KC(0x6b),		KS_comma,	KS_semicolon,
+    KC(0x6c),		KS_period,	KS_colon,
+    KC(0x6d),		KS_minus,	KS_underscore,
+    KC(0x7d),		KS_less,	KS_greater,
+};
+
+/* 009 Portuguese type 4 keyboard */
+const keysym_t sunkbd_keydesc_pt[] = {
+    KC(0x0d),		KS_Mode_switch,
+    KC(0x0f),		KS_bracketright,KS_braceright,	KS_guillemotright,
+    KC(0x1f),		KS_2,		KS_quotedbl,	KS_at,
+    KC(0x20),		KS_3,		KS_numbersign,	KS_sterling,
+    KC(0x21),		KS_4,		KS_dollar,	KS_paragraph,
+    KC(0x23),		KS_6,		KS_ampersand,	KS_notsign,
+    KC(0x24),		KS_7,		KS_slash,
+    KC(0x25),		KS_8,		KS_parenleft,
+    KC(0x26),		KS_9,		KS_parenright,	KS_backslash,
+    KC(0x27),		KS_0,		KS_equal,	KS_bar,
+    KC(0x28),		KS_apostrophe,	KS_question,	KS_grave,
+    KC(0x29),		KS_exclamdown,	KS_questiondown,
+    KC(0x2a),		KS_dead_tilde,	KS_dead_circumflex,KS_asciicircum,
+    KC(0x40),		KS_dead_diaeresis,KS_asterisk,	KS_plus,
+    KC(0x41),		KS_dead_acute,	KS_dead_grave,	KS_asciitilde,
+    KC(0x4c),		KS_Caps_Lock,
+    KC(0x56),		KS_ccedilla,
+    KC(0x57),		KS_masculine,	KS_ordfeminine,
+    KC(0x58),		KS_bracketleft,	KS_braceleft,	KS_guillemotleft,
+    KC(0x6b),		KS_comma,	KS_semicolon,
+    KC(0x6c),		KS_period,	KS_colon,
+    KC(0x6d),		KS_minus,	KS_underscore,
+    KC(0x77),		KS_Control_L,
+    KC(0x7d),		KS_less,	KS_greater,
+};
+
+/* 029 Portuguese type 4 keyboard */
+const keysym_t sunkbd5_keydesc_pt[] = {
+    KC(0x0d),		KS_Mode_switch,
+    KC(0x1f),		KS_2,		KS_quotedbl,	KS_at,
+    KC(0x20),		KS_3,		KS_numbersign,	KS_sterling,
+    KC(0x21),		KS_4,		KS_dollar,	KS_paragraph,
+    KC(0x22),		KS_5,		KS_percent,	KS_asciitilde,
+    KC(0x23),		KS_6,		KS_ampersand,	KS_asciicircum,
+    KC(0x24),		KS_7,		KS_slash,	KS_braceleft,
+    KC(0x25),		KS_8,		KS_parenleft,	KS_bracketleft,
+    KC(0x26),		KS_9,		KS_parenright,	KS_bracketright,
+    KC(0x27),		KS_0,		KS_equal,	KS_braceright,
+    KC(0x28),		KS_apostrophe,	KS_question,	KS_grave,
+    KC(0x29),		KS_guillemotleft,KS_guillemotright,
+    KC(0x2a),		KS_backslash,	KS_bar,
+    KC(0x40),		KS_plus,	KS_asterisk,	KS_dead_diaeresis,
+    KC(0x41),		KS_dead_acute,	KS_dead_grave,
+    KC(0x56),		KS_ccedilla,
+    KC(0x57),		KS_masculine,	KS_ordfeminine,
+    KC(0x58),		KS_dead_tilde,	KS_dead_circumflex,
+    KC(0x6b),		KS_comma,	KS_semicolon,
+    KC(0x6c),		KS_period,	KS_colon,
+    KC(0x6d),		KS_minus,	KS_underscore,
+    KC(0x7d),		KS_less,	KS_greater,
+};
+
+/* 00a Spanish type 4 keyboard */
+const keysym_t sunkbd_keydesc_es[] = {
+    KC(0x0d),		KS_Mode_switch,
+    KC(0x0f),		KS_bracketright,KS_braceright,	KS_guillemotright,
+    KC(0x1f),		KS_2,		KS_quotedbl,	KS_at,
+    KC(0x20),		KS_3,		KS_hyphen,	KS_numbersign,
+    KC(0x22),		KS_5,		KS_percent,	KS_degree,
+    KC(0x23),		KS_6,		KS_ampersand,	KS_notsign,
+    KC(0x24),		KS_7,		KS_slash,
+    KC(0x25),		KS_8,		KS_parenleft,
+    KC(0x26),		KS_9,		KS_parenright,	KS_backslash,
+    KC(0x27),		KS_0,		KS_equal,	KS_bar,
+    KC(0x28),		KS_apostrophe,	KS_question,	KS_grave,
+    KC(0x29),		KS_exclamdown,	KS_questiondown,
+    KC(0x2a),		KS_ccedilla,
+    KC(0x3e),		KS_o,		KS_O,		KS_masculine,
+    KC(0x40),		KS_dead_grave,	KS_dead_circumflex,KS_asciicircum,
+    KC(0x41),		KS_plus,	KS_asterisk,	KS_asciitilde,
+    KC(0x4c),		KS_Caps_Lock,
+    KC(0x4d),		KS_a,		KS_A,		KS_ordfeminine,
+    KC(0x56),		KS_ntilde,
+    KC(0x57),		KS_dead_acute,	KS_dead_diaeresis,
+    KC(0x58),		KS_bracketleft,	KS_braceleft,	KS_guillemotleft,
+    KC(0x6b),		KS_comma,	KS_semicolon,
+    KC(0x6c),		KS_period,	KS_colon,
+    KC(0x6d),		KS_minus,	KS_underscore,
+    KC(0x77),		KS_Control_L,
+    KC(0x7d),		KS_less,	KS_greater,
+};
+
+/* 02a Spanish type 5 keyboard */
+const keysym_t sunkbd5_keydesc_es[] = {
+    KC(0x0d),		KS_Mode_switch,
+    KC(0x1e),		KS_1,		KS_exclam,	KS_bar,
+    KC(0x1f),		KS_2,		KS_quotedbl,	KS_at,
+    KC(0x20),		KS_3,		KS_hyphen,	KS_numbersign,
+    KC(0x21),		KS_4,		KS_dollar,	KS_asciicircum,
+    KC(0x22),		KS_5,		KS_percent,	KS_asciitilde,
+    KC(0x23),		KS_6,		KS_ampersand,	KS_notsign,
+    KC(0x24),		KS_7,		KS_slash,
+    KC(0x25),		KS_8,		KS_parenleft,
+    KC(0x26),		KS_9,		KS_parenright,
+    KC(0x27),		KS_0,		KS_equal,
+    KC(0x28),		KS_apostrophe,	KS_question,	KS_grave,
+    KC(0x29),		KS_exclamdown,	KS_questiondown,
+    KC(0x2a),		KS_masculine,	KS_ordfeminine,	KS_backslash,
+    KC(0x40),		KS_dead_grave,	KS_dead_circumflex,KS_bracketleft,
+    KC(0x41),		KS_plus,	KS_asterisk,	KS_bracketright,
+    KC(0x56),		KS_ntilde,
+    KC(0x57),		KS_dead_acute,	KS_dead_diaeresis,KS_braceleft,
+    KC(0x58),		KS_ccedilla,	KS_Ccedilla,	KS_braceright,
+    KC(0x6b),		KS_comma,	KS_semicolon,
+    KC(0x6c),		KS_period,	KS_colon,
+    KC(0x6d),		KS_minus,	KS_underscore,
+    KC(0x7d),		KS_less,	KS_greater,
+};
+
+/* 00b Swedish/Finnish type 4 keyboard */
 const keysym_t sunkbd_keydesc_sv[] = {
     KC(0x0d),		KS_Multi_key,
     KC(0x0f),		KS_asciitilde,	KS_asciicircum, 
@@ -414,6 +698,151 @@ const keysym_t sunkbd5_keydesc_sv[] = {
     KC(0x7c),		KS_less,	KS_greater,	KS_bar,
 };
 
+/* 00c Swiss-French type 4 keyboard */
+const keysym_t sunkbd_keydesc_sf[] = {
+    KC(0x0d),		KS_Multi_key,
+    KC(0x0f),		KS_greater,	KS_braceright,
+    KC(0x1e),		KS_1,		KS_plus,	KS_exclam,
+    KC(0x1f),		KS_2,		KS_quotedbl,	KS_at,
+    KC(0x20),		KS_3,		KS_asterisk,	KS_numbersign,
+    KC(0x21),		KS_4,		KS_ccedilla,	KS_cent,
+    KC(0x22),		KS_5,		KS_percent,	KS_asciitilde,
+    KC(0x23),		KS_6,		KS_ampersand,	KS_paragraph,
+    KC(0x24),		KS_7,		KS_slash,	KS_bar,
+    KC(0x25),		KS_8,		KS_parenleft,	KS_degree,
+    KC(0x26),		KS_9,		KS_parenright,	KS_backslash,
+    KC(0x27),		KS_0,		KS_equal,	KS_asciicircum,
+    KC(0x28),		KS_apostrophe,	KS_question,	KS_grave,
+    KC(0x29),		KS_dead_circumflex,KS_dead_grave,
+    KC(0x2a),		KS_dollar,	KS_dead_tilde,	KS_sterling,
+    KC(0x3b),		KS_z,
+    KC(0x40),		KS_egrave,	KS_udiaeresis,
+    KC(0x41),		KS_dead_diaeresis,KS_dead_acute,
+    KC(0x43),		KS_Mode_switch,
+    KC(0x4c),		KS_Caps_Lock,
+    KC(0x56),		KS_eacute,	KS_odiaeresis,
+    KC(0x57),		KS_agrave,	KS_adiaeresis,
+    KC(0x58),		KS_less,	KS_braceleft,
+    KC(0x64),		KS_y,
+    KC(0x6a),		KS_m,		KS_M,		KS_mu,
+    KC(0x6b),		KS_comma,	KS_semicolon,
+    KC(0x6c),		KS_period,	KS_colon,
+    KC(0x6d),		KS_minus,	KS_underscore,
+    KC(0x77),		KS_Control_L,
+    KC(0x7c),		KS_bracketright,KS_bracketleft,	KS_backslash,
+};
+
+/* 02c Swiss-French type 5 keyboard */
+const keysym_t sunkbd5_keydesc_sf[] = {
+    KC(0x0d),		KS_Mode_switch,
+    KC(0x1e),		KS_1,		KS_plus,	KS_bar,
+    KC(0x1f),		KS_2,		KS_quotedbl,	KS_at,
+    KC(0x20),		KS_3,		KS_asterisk,	KS_numbersign,
+    KC(0x21),		KS_4,		KS_ccedilla,	KS_asciicircum,
+    KC(0x22),		KS_5,		KS_percent,	KS_asciitilde,
+    KC(0x23),		KS_6,		KS_ampersand,
+    KC(0x24),		KS_7,		KS_slash,
+    KC(0x25),		KS_8,		KS_parenleft,
+    KC(0x26),		KS_9,		KS_parenright,
+    KC(0x27),		KS_0,		KS_equal,	KS_grave,
+    KC(0x28),		KS_apostrophe,	KS_question,	KS_dead_acute,
+    KC(0x29),		KS_dead_circumflex,KS_dead_grave,KS_dead_tilde,
+    KC(0x2a),		KS_dollar,	KS_degree,
+    KC(0x3b),		KS_z,
+    KC(0x40),		KS_egrave,	KS_udiaeresis,	KS_bracketleft,
+    KC(0x41),		KS_dead_diaeresis,KS_exclam,	KS_bracketright,
+    KC(0x56),		KS_eacute,	KS_odiaeresis,
+    KC(0x57),		KS_agrave,	KS_adiaeresis,	KS_braceleft,
+    KC(0x58),		KS_dollar,	KS_sterling,	KS_braceright,
+    KC(0x64),		KS_y,
+    KC(0x6b),		KS_comma,	KS_semicolon,
+    KC(0x6c),		KS_period,	KS_colon,
+    KC(0x6d),		KS_minus,	KS_underscore,
+    KC(0x7c),		KS_less,	KS_greater,	KS_backslash,
+};
+
+/* 00d Swiss-German type 4 keyboard */
+const keysym_t sunkbd_keydesc_sg[] = {
+    KC(0x0d),		KS_Multi_key,
+    KC(0x0f),		KS_greater,	KS_braceright,
+    KC(0x1e),		KS_1,		KS_plus,	KS_exclam,
+    KC(0x1f),		KS_2,		KS_quotedbl,	KS_at,
+    KC(0x20),		KS_3,		KS_asterisk,	KS_numbersign,
+    KC(0x21),		KS_4,		KS_ccedilla,	KS_cent,
+    KC(0x22),		KS_5,		KS_percent,	KS_asciitilde,
+    KC(0x23),		KS_6,		KS_ampersand,	KS_paragraph,
+    KC(0x24),		KS_7,		KS_slash,	KS_bar,
+    KC(0x25),		KS_8,		KS_parenleft,	KS_degree,
+    KC(0x26),		KS_9,		KS_parenright,	KS_backslash,
+    KC(0x27),		KS_0,		KS_equal,	KS_asciicircum,
+    KC(0x28),		KS_apostrophe,	KS_question,	KS_grave,
+    KC(0x29),		KS_dead_circumflex,KS_dead_grave,
+    KC(0x2a),		KS_dollar,	KS_dead_tilde,	KS_sterling,
+    KC(0x3b),		KS_z,
+    KC(0x40),		KS_udiaeresis,	KS_egrave,
+    KC(0x41),		KS_dead_diaeresis,KS_dead_acute,
+    KC(0x43),		KS_Mode_switch,
+    KC(0x4c),		KS_Caps_Lock,
+    KC(0x56),		KS_odiaeresis,	KS_eacute,
+    KC(0x57),		KS_adiaeresis,	KS_agrave,
+    KC(0x58),		KS_less,	KS_braceleft,
+    KC(0x64),		KS_y,
+    KC(0x6a),		KS_m,		KS_M,		KS_mu,
+    KC(0x6b),		KS_comma,	KS_semicolon,
+    KC(0x6c),		KS_period,	KS_colon,
+    KC(0x6d),		KS_minus,	KS_underscore,
+    KC(0x77),		KS_Control_L,
+    KC(0x7c),		KS_bracketright,KS_bracketleft,	KS_backslash,
+};
+
+/* 02d Swiss-German type 5 keyboard */
+const keysym_t sunkbd5_keydesc_sg[] = {
+    KC(0x0d),		KS_Mode_switch,
+    KC(0x1e),		KS_1,		KS_plus,	KS_bar,
+    KC(0x1f),		KS_2,		KS_quotedbl,	KS_at,
+    KC(0x20),		KS_3,		KS_asterisk,	KS_numbersign,
+    KC(0x21),		KS_4,		KS_ccedilla,	KS_asciicircum,
+    KC(0x22),		KS_5,		KS_percent,	KS_asciitilde,
+    KC(0x23),		KS_6,		KS_ampersand,
+    KC(0x24),		KS_7,		KS_slash,
+    KC(0x25),		KS_8,		KS_parenleft,
+    KC(0x26),		KS_9,		KS_parenright,
+    KC(0x27),		KS_0,		KS_equal,	KS_grave,
+    KC(0x28),		KS_apostrophe,	KS_question,	KS_dead_acute,
+    KC(0x29),		KS_dead_circumflex,KS_dead_grave,KS_dead_tilde,
+    KC(0x2a),		KS_dollar,	KS_degree,
+    KC(0x3b),		KS_z,
+    KC(0x40),		KS_udiaeresis,	KS_egrave,	KS_bracketleft,
+    KC(0x41),		KS_dead_diaeresis,KS_exclam,	KS_bracketright,
+    KC(0x56),		KS_odiaeresis,	KS_eacute,
+    KC(0x57),		KS_adiaeresis,	KS_agrave,	KS_braceleft,
+    KC(0x58),		KS_dollar,	KS_sterling,	KS_braceright,
+    KC(0x64),		KS_y,
+    KC(0x6b),		KS_comma,	KS_semicolon,
+    KC(0x6c),		KS_period,	KS_colon,
+    KC(0x6d),		KS_minus,	KS_underscore,
+    KC(0x7c),		KS_less,	KS_greater,	KS_backslash,
+};
+
+/* 00e UK English type 4 keyboard */
+const keysym_t sunkbd_keydesc_uk[] = {
+    KC(0x1e),		KS_1,		KS_exclam,	KS_bar,
+    KC(0x21),		KS_3,		KS_sterling,	KS_numbersign,
+    KC(0x28),		KS_minus,	KS_underscore,	KS_notsign,
+    KC(0x43),		KS_Mode_switch,
+};
+
+/* 02e UK English type 5 keyboard */
+const keysym_t sunkbd5_keydesc_uk[] = {
+    KC(0x0d),		KS_Mode_switch,
+    KC(0x20),		KS_2,		KS_quotedbl,
+    KC(0x21),		KS_3,		KS_sterling,
+    KC(0x2a),		KS_grave,	KS_notsign,	KS_brokenbar,
+    KC(0x57),		KS_apostrophe,	KS_at,
+    KC(0x58),		KS_numbersign,	KS_asciitilde,
+    KC(0x7c),		KS_backslash,	KS_bar,
+};
+
 #define KBD_MAP(name, base, map) \
     { name, base, sizeof(map)/sizeof(keysym_t), map }
 
@@ -423,9 +852,17 @@ const struct wscons_keydesc sunkbd_keydesctab[] = {
 	KBD_MAP(KB_BE,			KB_US,	sunkbd_keydesc_befr),
 	KBD_MAP(KB_DE,			KB_US,	sunkbd_keydesc_de),
 	KBD_MAP(KB_DK,			KB_US,	sunkbd_keydesc_dk),
+	KBD_MAP(KB_ES,			KB_US,	sunkbd_keydesc_es),
 	KBD_MAP(KB_FR,			KB_US,	sunkbd_keydesc_befr),
+	KBD_MAP(KB_IT,			KB_US,	sunkbd_keydesc_it),
+	KBD_MAP(KB_NL,			KB_US,	sunkbd_keydesc_nl),
+	KBD_MAP(KB_NO,			KB_US,	sunkbd_keydesc_no),
+	KBD_MAP(KB_PT,			KB_US,	sunkbd_keydesc_pt),
+	KBD_MAP(KB_SF,			KB_US,	sunkbd_keydesc_sf),
+	KBD_MAP(KB_SG,			KB_US,	sunkbd_keydesc_sg),
 	KBD_MAP(KB_SV,			KB_US,	sunkbd_keydesc_sv),
 	KBD_MAP(KB_SV | KB_NODEAD,	KB_SV,	sunkbd_keydesc_sv_nodead),
+	KBD_MAP(KB_UK,			KB_US,	sunkbd_keydesc_uk),
 	{0, 0, 0, 0},
 };
 
@@ -434,9 +871,17 @@ const struct wscons_keydesc sunkbd5_keydesctab[] = {
 	KBD_MAP(KB_US,			0,	sunkbd_keydesc_us),
 	KBD_MAP(KB_DE,			KB_US,	sunkbd5_keydesc_de),
 	KBD_MAP(KB_DK,			KB_US,	sunkbd5_keydesc_dk),
+	KBD_MAP(KB_ES,			KB_US,	sunkbd5_keydesc_es),
 	KBD_MAP(KB_FR,			KB_US,	sunkbd5_keydesc_fr),
+	KBD_MAP(KB_IT,			KB_US,	sunkbd5_keydesc_it),
+	KBD_MAP(KB_NL,			KB_US,	sunkbd5_keydesc_nl),
+	KBD_MAP(KB_NO,			KB_US,	sunkbd5_keydesc_no),
+	KBD_MAP(KB_PT,			KB_US,	sunkbd5_keydesc_pt),
+	KBD_MAP(KB_SF,			KB_US,	sunkbd5_keydesc_sf),
+	KBD_MAP(KB_SG,			KB_US,	sunkbd5_keydesc_sg),
 	KBD_MAP(KB_SV,			KB_US,	sunkbd5_keydesc_sv),
 	KBD_MAP(KB_SV | KB_NODEAD,	KB_SV,	sunkbd_keydesc_sv_nodead),
+	KBD_MAP(KB_UK,			KB_US,	sunkbd5_keydesc_uk),
 	{0, 0, 0, 0},
 };