From 982da416cdee78646c05b2048d9c7eb13899da55 Mon Sep 17 00:00:00 2001
From: miod <miod@openbsd.org>
Date: Sat, 9 Aug 2008 16:31:23 +0000
Subject: [PATCH] Regen

---
 sys/dev/usb/ukbdmap.c | 69 +++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 66 insertions(+), 3 deletions(-)

diff --git a/sys/dev/usb/ukbdmap.c b/sys/dev/usb/ukbdmap.c
index 56ed95c2e13..0231f3a4219 100644
--- a/sys/dev/usb/ukbdmap.c
+++ b/sys/dev/usb/ukbdmap.c
@@ -1,13 +1,13 @@
-/*	$OpenBSD: ukbdmap.c,v 1.32 2008/07/30 15:53:37 deraadt Exp $	*/
+/*	$OpenBSD: ukbdmap.c,v 1.33 2008/08/09 16:31:23 miod Exp $	*/
 
 /*
  * THIS FILE IS AUTOMAGICALLY GENERATED.  DO NOT EDIT.
  *
  * generated by:
- *	OpenBSD: makemap.awk,v 1.8 2008/05/19 18:09:06 miod Exp 
+ *	OpenBSD: makemap.awk,v 1.9 2008/08/09 16:31:08 miod Exp 
  * generated from:
  */
-/*	OpenBSD: wskbdmap_mfii.c,v 1.38 2008/07/30 15:53:31 deraadt Exp  */
+/*	OpenBSD: wskbdmap_mfii.c,v 1.39 2008/08/09 16:31:08 miod Exp  */
 /*	$NetBSD: wskbdmap_mfii.c,v 1.15 2000/05/19 16:40:04 drochner Exp $	*/
 
 /*
@@ -354,6 +354,66 @@ static const keysym_t ukbd_keydesc_fr_apple[] = {
     KC(231),	KS_Mode_switch,	KS_Multi_key,
 };
 
+/*
+ * fr-dvorak-be'po layout, simplified map, per http://www.clavier-dvorak.org/
+ * (the complete map is still a moving target)
+ */
+static const keysym_t ukbd_keydesc_fr_dvorak_bepo[] = {
+						/* oe ligature */
+						/* euro currency */
+    KC(4),	KS_a,		KS_A,		KS_ae,		KS_AE,
+    KC(5),	KS_k,		KS_K,		KS_asciitilde,
+    KC(6),	KS_x,		KS_X,		KS_braceright,
+    KC(7),	KS_i,		KS_I,		KS_dead_diaeresis,
+    KC(8),	KS_p,		KS_P,		KS_ampersand,
+    KC(9),	KS_e,		KS_E,
+    KC(10),	KS_comma,	KS_semicolon,
+    KC(11),	KS_c,
+    KC(12),	KS_d,
+    KC(13),	KS_t,
+    KC(14),	KS_s,
+    KC(15),	KS_r,
+    KC(16),	KS_q,		KS_Q,
+    KC(17),	KS_apostrophe,	KS_question,
+    KC(18),	KS_l,
+    KC(19),	KS_j,
+    KC(20),	KS_b,		KS_B,		KS_bar,
+    KC(21),	KS_o,		KS_O,
+    KC(22),	KS_u,		KS_U,		KS_ugrave,	KS_Ugrave,
+    KC(23),	KS_egrave,	KS_Egrave,	KS_dead_grave,
+    KC(24),	KS_v,
+    KC(25),	KS_period,	KS_colon,	/*ellipsis*/
+    KC(26),	KS_eacute,	KS_Eacute,	KS_dead_acute,
+    KC(27),	KS_y,		KS_Y,		KS_braceleft,
+    KC(28),	KS_dead_circumflex,KS_exclam,
+    KC(29),	KS_agrave,	KS_Agrave,	KS_backslash,
+    KC(30),	KS_quotedbl,	KS_1,		KS_hyphen,
+    KC(31),	KS_guillemotleft,KS_2,		KS_less,
+    KC(32),	KS_guillemotright,KS_3,		KS_greater,
+    KC(33),	KS_parenleft,	KS_4,		KS_bracketleft,
+    KC(34),	KS_parenright,	KS_5,		KS_bracketright,
+    KC(35),	KS_at,		KS_6,
+    KC(36),	KS_plus,	KS_7,
+    KC(37),	KS_minus,	KS_8,
+    KC(38),	KS_slash,	KS_9,
+    KC(39),	KS_asterisk,	KS_0,
+    KC(44),	KS_space,	KS_nobreakspace,KS_underscore,
+    KC(45),	KS_equal,	KS_asciicircum,
+    KC(46),	KS_percent,	KS_grave,
+    KC(47),	KS_z,
+    KC(48),	KS_w,
+    KC(49),	KS_ccedilla,	KS_Ccedilla,
+    KC(50),	KS_ccedilla,	KS_Ccedilla,
+    KC(51),	KS_n,
+    KC(52),	KS_m,
+    KC(53),	KS_dollar,	KS_numbersign,
+    KC(54),	KS_g,		KS_G,		KS_mu,
+    KC(55),	KS_h,
+    KC(56),	KS_f,
+    KC(100),	KS_egrave,	KS_Egrave,	KS_slash,
+    KC(230),	KS_Mode_switch,	KS_Multi_key,
+};
+
 static const keysym_t ukbd_keydesc_it[] = {
 /*  pos      normal		shifted		altgr		shift-altgr */
     KC(31),	KS_2,		KS_quotedbl,	KS_twosuperior,
@@ -1031,6 +1091,7 @@ const struct wscons_keydesc ukbd_keydesctab[] = {
 	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_FR | KB_DVORAK,	KB_US,	ukbd_keydesc_fr_dvorak_bepo),
 	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),
@@ -1047,6 +1108,8 @@ const struct wscons_keydesc ukbd_keydesctab[] = {
 	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_FR | KB_DVORAK | KB_SWAPCTRLCAPS,	KB_FR | KB_DVORAK,
+		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),
-- 
2.20.1