diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2001-06-08 17:24:42 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2001-06-08 17:24:42 +0000 |
| commit | f3d22a08bf76f13e61def2020c5318e1e6e9d61f (patch) | |
| tree | 71fadd2113e1efffc49ab1da30efe3c5462da78a | |
| parent | 7ba8445cf2d4695e9c773dbe0c33cd77cafe51ea (diff) | |
swiss french keyboard; from Mathias Schmocker <smat@acm.org>
| -rw-r--r-- | sys/dev/pckbc/wskbdmap_mfii.c | 11 | ||||
| -rw-r--r-- | sys/dev/wscons/wsksymdef.h | 6 |
2 files changed, 14 insertions, 3 deletions
diff --git a/sys/dev/pckbc/wskbdmap_mfii.c b/sys/dev/pckbc/wskbdmap_mfii.c index a08aef43fff..a4459ea3008 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.8 2001/05/14 16:43:18 mickey Exp $ */ +/* $OpenBSD: wskbdmap_mfii.c,v 1.9 2001/06/08 17:24:41 mickey Exp $ */ /* $NetBSD: wskbdmap_mfii.c,v 1.15 2000/05/19 16:40:04 drochner Exp $ */ /*- @@ -586,6 +586,13 @@ static const keysym_t pckbd_keydesc_sg_nodead[] = { KC(27), KS_diaeresis, KS_exclam, KS_bracketright }; +static const keysym_t pckbd_keydesc_sf[] = { +/* pos normal shifted altgr shift-altgr */ + KC(26), KS_egrave, KS_udiaeresis, KS_bracketleft, + KC(39), KS_eacute, KS_odiaeresis, + KC(40), KS_agrave, KS_adiaeresis, KS_braceleft +}; + #define KBD_MAP(name, base, map) \ { name, base, sizeof(map)/sizeof(keysym_t), map } @@ -619,6 +626,8 @@ const struct wscons_keydesc pckbd_keydesctab[] = { KBD_MAP(KB_RU, KB_US, pckbd_keydesc_ru), KBD_MAP(KB_SG, KB_US, pckbd_keydesc_sg), KBD_MAP(KB_SG | KB_NODEAD, KB_SG, pckbd_keydesc_sg_nodead), + KBD_MAP(KB_SF, KB_SG, pckbd_keydesc_sf), + KBD_MAP(KB_SF | KB_NODEAD, KB_SF, pckbd_keydesc_sg_nodead), {0, 0, 0, 0} }; diff --git a/sys/dev/wscons/wsksymdef.h b/sys/dev/wscons/wsksymdef.h index b980a361e80..aa801402fee 100644 --- a/sys/dev/wscons/wsksymdef.h +++ b/sys/dev/wscons/wsksymdef.h @@ -1,4 +1,4 @@ -/* $OpenBSD: wsksymdef.h,v 1.11 2001/05/14 16:43:19 mickey Exp $ */ +/* $OpenBSD: wsksymdef.h,v 1.12 2001/06/08 17:24:41 mickey Exp $ */ /* $NetBSD: wsksymdef.h,v 1.34.4.1 2000/07/07 09:49:54 hannken Exp $ */ /*- @@ -570,6 +570,7 @@ #define KB_BE 0x0d00 #define KB_RU 0x0e00 #define KB_SG 0x0f00 +#define KB_SF 0x1000 #define KB_NODEAD 0x0001 #define KB_DECLK 0x0002 /* DEC LKnnn layout */ @@ -595,7 +596,8 @@ { KB_HU, "hu" }, \ { KB_BE, "be" }, \ { KB_RU, "ru" }, \ - { KB_SG, "sg" } + { KB_SG, "sg" }, \ + { KB_SG, "sf" } #define KB_VARTAB \ { KB_NODEAD, "nodead" }, \ |