summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2005-05-19 10:41:06 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2005-05-19 10:41:06 +0000
commit25b9d25752a4ab8a05ecc569d15b0c23c974e97d (patch)
treeed3ae5f40eafd81ab34aab965b32b4f674f49541 /sys
parent585d1a6c696bf90d78aab7ecba33797735aed3b1 (diff)
Regen
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/usb/ukbdmap.c18
1 files changed, 16 insertions, 2 deletions
diff --git a/sys/dev/usb/ukbdmap.c b/sys/dev/usb/ukbdmap.c
index 8634680124f..a9186ecb9aa 100644
--- a/sys/dev/usb/ukbdmap.c
+++ b/sys/dev/usb/ukbdmap.c
@@ -1,10 +1,10 @@
-/* $OpenBSD: ukbdmap.c,v 1.19 2005/05/12 16:21:48 miod Exp $ */
+/* $OpenBSD: ukbdmap.c,v 1.20 2005/05/19 10:41:05 miod Exp $ */
/*
* THIS FILE IS AUTOMAGICALLY GENERATED. DO NOT EDIT.
*
* generated by:
- * OpenBSD: makemap.awk,v 1.3 2005/05/12 16:21:24 miod Exp
+ * OpenBSD: makemap.awk,v 1.4 2005/05/19 10:40:48 miod Exp
* generated from:
*/
/* OpenBSD: wskbdmap_mfii.c,v 1.30 2005/05/09 05:08:57 miod Exp */
@@ -301,6 +301,17 @@ static const keysym_t ukbd_keydesc_fr[] = {
KC(230), KS_Mode_switch, KS_Multi_key,
};
+static const keysym_t ukbd_keydesc_fr_apple[] = {
+ KC(35), KS_section, KS_6,
+ KC(37), KS_exclam, KS_8,
+ KC(46), KS_minus, KS_underscore,
+ KC(48), KS_dollar, KS_asterisk,
+ KC(50), KS_backslash, KS_sterling,
+ KC(53), KS_at, KS_numbersign,
+ KC(56), KS_equal, KS_plus,
+ KC(103), KS_KP_Equal,
+};
+
static const keysym_t ukbd_keydesc_it[] = {
/* pos normal shifted altgr shift-altgr */
KC(31), KS_2, KS_quotedbl, KS_twosuperior,
@@ -903,6 +914,7 @@ const struct wscons_keydesc ukbd_keydesctab[] = {
KBD_MAP(KB_DE, KB_US, ukbd_keydesc_de),
KBD_MAP(KB_DE | KB_NODEAD, KB_DE, ukbd_keydesc_de_nodead),
KBD_MAP(KB_FR, KB_US, ukbd_keydesc_fr),
+ KBD_MAP(KB_FR | KB_APPLE, KB_FR, ukbd_keydesc_fr_apple),
KBD_MAP(KB_DK, KB_US, ukbd_keydesc_dk),
KBD_MAP(KB_DK | KB_NODEAD, KB_DK, ukbd_keydesc_dk_nodead),
KBD_MAP(KB_IT, KB_US, ukbd_keydesc_it),
@@ -917,6 +929,8 @@ const struct wscons_keydesc ukbd_keydesctab[] = {
KBD_MAP(KB_US | KB_IOPENER, KB_US, ukbd_keydesc_iopener),
KBD_MAP(KB_JP | KB_SWAPCTRLCAPS, KB_JP, ukbd_keydesc_swapctrlcaps),
KBD_MAP(KB_FR | KB_SWAPCTRLCAPS, KB_FR, ukbd_keydesc_swapctrlcaps),
+ KBD_MAP(KB_FR | KB_APPLE | KB_SWAPCTRLCAPS, KB_FR | KB_APPLE,
+ ukbd_keydesc_swapctrlcaps),
KBD_MAP(KB_BE | KB_SWAPCTRLCAPS, KB_BE, ukbd_keydesc_swapctrlcaps),
KBD_MAP(KB_US | KB_DVORAK | KB_SWAPCTRLCAPS, KB_US | KB_DVORAK,
ukbd_keydesc_swapctrlcaps),