diff options
| -rw-r--r-- | share/man/man4/pckbd.4 | 12 | ||||
| -rw-r--r-- | share/man/man4/ukbd.4 | 12 | ||||
| -rw-r--r-- | sys/dev/pckbc/wskbdmap_mfii.c | 35 | ||||
| -rw-r--r-- | sys/dev/wscons/wsksymdef.h | 6 |
4 files changed, 54 insertions, 11 deletions
diff --git a/share/man/man4/pckbd.4 b/share/man/man4/pckbd.4 index 6e6404dc478..d3465944951 100644 --- a/share/man/man4/pckbd.4 +++ b/share/man/man4/pckbd.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pckbd.4,v 1.38 2011/01/30 07:53:57 jmc Exp $ +.\" $OpenBSD: pckbd.4,v 1.39 2011/04/05 19:12:11 miod Exp $ .\" $NetBSD: pckbd.4,v 1.3 1999/12/21 11:31:07 drochner Exp $ .\" .\" Copyright (c) 1999 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd $Mdocdate: January 30 2011 $ +.Dd $Mdocdate: April 5 2011 $ .Dt PCKBD 4 .Os .Sh NAME @@ -92,6 +92,10 @@ layout. .It KB_HU .Pq hu Hungarian. +.It KB_IS +.Pq is +Icelandic with +.Dq dead accents . .It KB_IT .Pq it Italian. @@ -169,8 +173,8 @@ English/US keyboard with layout. .El .Pp -The KB_DE, KB_DK, KB_NO, KB_SF, KB_SG, KB_SV and KB_TR mappings can be used in -the KB_NODEAD +The KB_DE, KB_DK, KB_IS, KB_NO, KB_SF, KB_SG, KB_SV and KB_TR +mappings can be used in the KB_NODEAD .Pq .nodead variant. This switches off the diff --git a/share/man/man4/ukbd.4 b/share/man/man4/ukbd.4 index d22b469f39b..af218fa0910 100644 --- a/share/man/man4/ukbd.4 +++ b/share/man/man4/ukbd.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ukbd.4,v 1.20 2011/01/30 07:53:57 jmc Exp $ +.\" $OpenBSD: ukbd.4,v 1.21 2011/04/05 19:12:11 miod Exp $ .\" $NetBSD: ukbd.4,v 1.10 2001/12/29 15:12:32 augustss Exp $ .\" .\" Copyright (c) 1999, 2001 The NetBSD Foundation, Inc. @@ -52,7 +52,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd $Mdocdate: January 30 2011 $ +.Dd $Mdocdate: April 5 2011 $ .Dt UKBD 4 .Os .Sh NAME @@ -123,6 +123,10 @@ layout. .It KB_HU .Pq hu Hungarian. +.It KB_IS +.Pq is +Icelandic with +.Dq dead accents . .It KB_IT .Pq it Italian. @@ -201,8 +205,8 @@ English/US keyboard with layout. .El .Pp -The KB_DE, KB_DK, KB_NO, KB_SF, KB_SG, KB_SV and KB_TR mappings can be used in -the KB_NODEAD +The KB_DE, KB_DK, KB_IS, KB_NO, KB_SF, KB_SG, KB_SV and KB_TR +mappings can be used in the KB_NODEAD .Pq .nodead variant. This switches off the diff --git a/sys/dev/pckbc/wskbdmap_mfii.c b/sys/dev/pckbc/wskbdmap_mfii.c index 75f081c70f4..a674d1be681 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.41 2010/08/28 16:39:18 miod Exp $ */ +/* $OpenBSD: wskbdmap_mfii.c,v 1.42 2011/04/05 19:12:13 miod Exp $ */ /* $NetBSD: wskbdmap_mfii.c,v 1.15 2000/05/19 16:40:04 drochner Exp $ */ /* @@ -1028,6 +1028,37 @@ static const keysym_t pckbd_keydesc_nl_nodead[] = { KC(40), KS_apostrophe, KS_grave, }; +static const keysym_t pckbd_keydesc_is[] = { +/* pos normal shifted altgr shift-altgr */ + KC(3), KS_2, KS_quotedbl, + 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_odiaeresis, KS_Odiaeresis, KS_backslash, + KC(13), KS_minus, KS_underscore, + KC(16), KS_q, KS_Q, KS_at, + KC(18), KS_e, KS_E, + /* euro currency */ + KC(26), KS_eth, + KC(27), KS_apostrophe, KS_question, KS_asciitilde, + KC(39), KS_ae, + KC(40), KS_dead_acute, KS_dead_diaeresis, KS_dead_circumflex, + KC(41), KS_degree, KS_diaeresis, + KC(43), KS_plus, KS_asterisk, KS_grave, + KC(51), KS_comma, KS_semicolon, + KC(52), KS_period, KS_colon, + KC(53), KS_thorn, + KC(86), KS_less, KS_greater, KS_bar, + KC(184), KS_Mode_switch, KS_Multi_key, +}; + +static const keysym_t pckbd_keydesc_is_nodead[] = { +/* pos normal shifted altgr shift-altgr */ + KC(40), KS_acute, KS_diaeresis, KS_asciicircum, +}; + #endif /* WSKBD_NO_INTL_LAYOUTS */ #define KBD_MAP(name, base, map) \ @@ -1085,6 +1116,8 @@ const struct wscons_keydesc pckbd_keydesctab[] = { KBD_MAP(KB_LV, KB_US, pckbd_keydesc_lv), KBD_MAP(KB_NL, KB_US, pckbd_keydesc_nl), 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), #endif /* WSKBD_NO_INTL_LAYOUTS */ {0, 0, 0, 0} }; diff --git a/sys/dev/wscons/wsksymdef.h b/sys/dev/wscons/wsksymdef.h index be5938f05b1..5c8d58978e4 100644 --- a/sys/dev/wscons/wsksymdef.h +++ b/sys/dev/wscons/wsksymdef.h @@ -1,4 +1,4 @@ -/* $OpenBSD: wsksymdef.h,v 1.33 2010/07/31 16:12:37 miod Exp $ */ +/* $OpenBSD: wsksymdef.h,v 1.34 2011/04/05 19:12:13 miod Exp $ */ /* $NetBSD: wsksymdef.h,v 1.34.4.1 2000/07/07 09:49:54 hannken Exp $ */ /*- @@ -733,6 +733,7 @@ #define KB_SI 0x1900 #define KB_CF 0x1a00 #define KB_LV 0x1b00 +#define KB_IS 0x1c00 #define KB_NODEAD 0x000001 /* disable dead accents */ #define KB_DECLK 0x000002 /* DEC LKnnn layout */ @@ -771,7 +772,8 @@ { KB_PL, "pl" }, \ { KB_SI, "si" }, \ { KB_CF, "cf" }, \ - { KB_LV, "lv" } + { KB_LV, "lv" }, \ + { KB_IS, "is" } #define KB_VARTAB \ { KB_NODEAD, "nodead" }, \ |