diff options
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/vax/dec/dzkbd.c | 6 | ||||
| -rw-r--r-- | sys/arch/vax/dec/wskbdmap_lk201.c | 34 |
2 files changed, 35 insertions, 5 deletions
diff --git a/sys/arch/vax/dec/dzkbd.c b/sys/arch/vax/dec/dzkbd.c index 56cfbf1db71..bc94bd90379 100644 --- a/sys/arch/vax/dec/dzkbd.c +++ b/sys/arch/vax/dec/dzkbd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dzkbd.c,v 1.9 2006/07/31 21:57:05 miod Exp $ */ +/* $OpenBSD: dzkbd.c,v 1.10 2006/08/03 20:19:29 miod Exp $ */ /* $NetBSD: dzkbd.c,v 1.1 2000/12/02 17:03:55 ragge Exp $ */ /* @@ -114,8 +114,8 @@ const struct wskbd_consops dzkbd_consops = { const struct wskbd_mapdata dzkbd_keymapdata = { lkkbd_keydesctab, -#ifdef DZKBD_LAYOUT - DZKBD_LAYOUT, +#ifdef LKKBD_LAYOUT + LKKBD_LAYOUT, #else KB_US, #endif diff --git a/sys/arch/vax/dec/wskbdmap_lk201.c b/sys/arch/vax/dec/wskbdmap_lk201.c index 1fbb724b2ba..09ed95e6a4b 100644 --- a/sys/arch/vax/dec/wskbdmap_lk201.c +++ b/sys/arch/vax/dec/wskbdmap_lk201.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wskbdmap_lk201.c,v 1.4 2006/07/31 21:57:05 miod Exp $ */ +/* $OpenBSD: wskbdmap_lk201.c,v 1.5 2006/08/03 20:19:29 miod Exp $ */ /* $NetBSD: wskbdmap_lk201.c,v 1.4 2000/12/02 16:57:41 ragge Exp $ */ #include <sys/types.h> @@ -65,7 +65,7 @@ static const keysym_t lkkbd_keydesc_us[] = { KC(175), KS_Cmd1, KS_Control_L, KC(176), KS_Caps_Lock, KC(177), KS_Multi_key, /* (left) compose */ /* LK 401 */ - KC(178), KS_Alt_R, /* LK 401 */ + KC(178), KS_Cmd2, KS_Alt_R, /* LK 401 */ KC(188), KS_Delete, KC(189), KS_Return, KC(190), KS_Tab, @@ -122,11 +122,41 @@ static const keysym_t lkkbd_keydesc_us[] = { KC(252), KS_Cmd2, KS_Alt_L, KS_Multi_key }; +static const keysym_t lkkbd_keydesc_fr[] = { + KC(178), KS_Cmd2, KS_Mode_switch, + KC(192), KS_ampersand, KS_1, + KC(193), KS_a, + KC(194), KS_q, + KC(195), KS_w, + KC(197), KS_eacute, KS_2, + KC(198), KS_z, + KC(203), KS_quotedbl, KS_3, + KC(208), KS_apostrophe, KS_4, + KC(214), KS_parenleft, KS_5, + KC(219), KS_section, KS_6, KS_bracketleft, + KC(224), KS_egrave, KS_7, KS_bracketright, + KC(227), KS_comma, KS_question, + KC(229), KS_exclam, KS_8, + KC(232), KS_semicolon, KS_period, + KC(234), KS_ccedilla, KS_9, KS_braceleft, + KC(237), KS_colon, KS_slash, + KC(239), KS_agrave, KS_0, KS_braceright, + KC(242), KS_m, + KC(243), KS_equal, KS_plus, + KC(245), KS_minus, KS_underscore, + KC(246), KS_dollar, KS_asterisk, + KC(247), KS_numbersign, KS_at, + KC(249), KS_parenright, KS_degree, + KC(250), KS_dead_circumflex, KS_dead_diaeresis, + KC(251), KS_ugrave, KS_percent, KS_backslash, +}; + #define KBD_MAP(name, base, map) \ { name, base, sizeof(map)/sizeof(keysym_t), map } const struct wscons_keydesc lkkbd_keydesctab[] = { KBD_MAP(KB_US, 0, lkkbd_keydesc_us), + KBD_MAP(KB_FR, KB_US, lkkbd_keydesc_fr), {0, 0, 0, 0} }; |