summaryrefslogtreecommitdiffstats
path: root/pc-bios/keymaps/fr
diff options
context:
space:
mode:
authorGerd Hoffmann2019-03-15 12:02:48 +0100
committerGerd Hoffmann2019-03-18 12:06:04 +0100
commit0a87602268884f977ba67df8b51735bf5ac141ec (patch)
tree98ab7617c386150eff77f817cf7ada217c1a8fbf /pc-bios/keymaps/fr
parentkeymaps: use nodeadkeys variant for de and fr (diff)
downloadqemu-0a87602268884f977ba67df8b51735bf5ac141ec.tar.gz
qemu-0a87602268884f977ba67df8b51735bf5ac141ec.tar.xz
qemu-0a87602268884f977ba67df8b51735bf5ac141ec.zip
keymaps: regenerate keymaps
Pick up the config updates. Also add a few keys to the maps which got a QKeyCode assigned since the last time we generated the maps (Hiragana_Katakana, Muhenkan). Sync with xkbcommon updates. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Message-id: 20190315110248.29208-3-kraxel@redhat.com
Diffstat (limited to 'pc-bios/keymaps/fr')
-rw-r--r--pc-bios/keymaps/fr36
1 files changed, 21 insertions, 15 deletions
diff --git a/pc-bios/keymaps/fr b/pc-bios/keymaps/fr
index 5b25227455..82ca812c7e 100644
--- a/pc-bios/keymaps/fr
+++ b/pc-bios/keymaps/fr
@@ -2,10 +2,10 @@
# generated by qemu-keymap
# model : pc105
# layout : fr
-# variant : -
+# variant : nodeadkeys
# options : -
-# name: "French"
+# name: "French (no dead keys)"
# modifiers
# 0: Shift
@@ -103,7 +103,7 @@ questiondown 0x0c shift altgr
equal 0x0d
plus 0x0d shift
braceright 0x0d altgr
-dead_ogonek 0x0d shift altgr
+ogonek 0x0d shift altgr
# evdev 14 (0xe), QKeyCode "backspace", number 0xe
BackSpace 0x0e
@@ -173,8 +173,8 @@ thorn 0x19 altgr
THORN 0x19 shift altgr
# evdev 26 (0x1a), QKeyCode "bracket_left", number 0x1a
-dead_circumflex 0x1a
-dead_diaeresis 0x1a shift
+asciicircum 0x1a
+diaeresis 0x1a shift
dead_diaeresis 0x1a altgr
dead_abovering 0x1a shift altgr
@@ -182,7 +182,7 @@ dead_abovering 0x1a shift altgr
dollar 0x1b
sterling 0x1b shift
currency 0x1b altgr
-dead_macron 0x1b shift altgr
+macron 0x1b shift altgr
# evdev 28 (0x1c), QKeyCode "ret", number 0x1c
Return 0x1c
@@ -253,8 +253,8 @@ masculine 0x27 shift altgr
# evdev 40 (0x28), QKeyCode "apostrophe", number 0x28
ugrave 0x28
percent 0x28 shift
-dead_circumflex 0x28 altgr
-dead_caron 0x28 shift altgr
+asciicircum 0x28 altgr
+caron 0x28 shift altgr
# evdev 41 (0x29), QKeyCode "grave_accent", number 0x29
twosuperior 0x29
@@ -267,8 +267,8 @@ Shift_L 0x2a
# evdev 43 (0x2b), QKeyCode "backslash", number 0x2b
asterisk 0x2b
mu 0x2b shift
-dead_grave 0x2b altgr
-dead_breve 0x2b shift altgr
+grave 0x2b altgr
+breve 0x2b shift altgr
# evdev 44 (0x2c), QKeyCode "z", number 0x2c
w 0x2c
@@ -307,8 +307,8 @@ N 0x31 shift
# evdev 50 (0x32), QKeyCode "m", number 0x32
comma 0x32
question 0x32 shift
-dead_acute 0x32 altgr
-dead_doubleacute 0x32 shift altgr
+acute 0x32 altgr
+doubleacute 0x32 shift altgr
# evdev 51 (0x33), QKeyCode "comma", number 0x33
semicolon 0x33
@@ -326,7 +326,7 @@ division 0x34 shift altgr
exclam 0x35
section 0x35 shift
dead_belowdot 0x35 altgr
-dead_abovedot 0x35 shift altgr
+abovedot 0x35 shift altgr
# evdev 54 (0x36), QKeyCode "shift_r", number 0x36
Shift_R 0x36
@@ -456,9 +456,11 @@ Hiragana 0x77
# evdev 92 (0x5c), QKeyCode "henkan", number 0x79
Henkan_Mode 0x79
-# evdev 93 (0x5d): no evdev -> QKeyCode mapping (xkb keysym Hiragana_Katakana)
+# evdev 93 (0x5d), QKeyCode "katakanahiragana", number 0x70
+Hiragana_Katakana 0x70
-# evdev 94 (0x5e): no evdev -> QKeyCode mapping (xkb keysym Muhenkan)
+# evdev 94 (0x5e), QKeyCode "muhenkan", number 0x7b
+Muhenkan 0x7b
# evdev 95 (0x5f): no evdev -> QKeyCode mapping (xkb keysym NoSymbol)
@@ -817,6 +819,10 @@ XF86AudioMedia 0xed
# evdev 245 (0xf5): no evdev -> QKeyCode mapping (xkb keysym NoSymbol)
+# evdev 246 (0xf6): no evdev -> QKeyCode mapping (xkb keysym Invalid)
+
+# evdev 247 (0xf7): no evdev -> QKeyCode mapping (xkb keysym Invalid)
+
#
# quirks section start
#