ui: fixes for 4.0 (vnc, curses, keymaps).
-----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABAgAGBQJcj37zAAoJEEy22O7T6HE4EEcQAM67fVNZQbTaweLfCmK+Bb60 F+QoOINQZBZBcQB9I4cgn6gXheOcfiYA1ZBMUFW/UWL4OyeNhamAWX5LnpkI0rAR ChHvn/xBUQ+sfs5KFnTjLMuU6tIzFzvPWPHGMteQSG/zQ2h97ELVBYZE3l9xbDUC Px20ZRVgklzZVwm+KB6Mwq/zcel/lp/jawYVJBsOXRVqf42yH7Mj1IycD0vD1pfj wTSRMgRabNi37Jq6HP26T4aM+LxRmrUA8/Ip9Htq0C5NOeCR/rLqgvwSNxeU4JoW TlMtzs0hnn8ro0uYashid01FK4s0VKGstjDHVyr3z5FeB+HU3SZxRF2+gx6Efi/q AvsKmIs6OyBUbiUCpMC/OytJDKVaOYNEPPN6cpvz63/yzQD0ogifyBYGcQYbhwn/ mdXNpEhd+14+4nVkvS5zAjec45O7WddTEmNk/TuzAdc6dEWdyW009PO1kVzM2Icx R4OyNFE02+wxSnEzLCW1Z31NkSh57ZBRNmGUFZLfIEuauv31nQkW+fUwlirWaFLc uziCS+l+I22jvi3kJX31jB4mojSVyldbi7JIuh4ymyEyEm0I0FqmikGvq9Yrz74d iLX5ps9t8pFAJKZusfR1JQpZG5MeQcnL89xfvzZ3M+tbPBEoqPxSAUzRmQ1APg5/ C9pPifofv/LRkXV+vxQK =B/sm -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/kraxel/tags/ui-20190318-pull-request' into staging ui: fixes for 4.0 (vnc, curses, keymaps). # gpg: Signature made Mon 18 Mar 2019 11:20:19 GMT # gpg: using RSA key 4CB6D8EED3E87138 # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full] # gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full] # gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full] # Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138 * remotes/kraxel/tags/ui-20190318-pull-request: keymaps: regenerate keymaps keymaps: use nodeadkeys variant for de and fr curses ui: add missing iconv_close calls curses ui: always initialize all curses_line fields vnc: fix unalignment access in tight_pack24 Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
commit
185521102b
@ -9,7 +9,7 @@ ar : MAP_FLAGS := -l ar
|
||||
bepo : MAP_FLAGS := -l fr -v dvorak
|
||||
cz : MAP_FLAGS := -l cz
|
||||
da : MAP_FLAGS := -l dk
|
||||
de : MAP_FLAGS := -l de
|
||||
de : MAP_FLAGS := -l de -v nodeadkeys
|
||||
de-ch : MAP_FLAGS := -l ch
|
||||
en-us : MAP_FLAGS := -l us
|
||||
en-gb : MAP_FLAGS := -l gb
|
||||
@ -17,7 +17,7 @@ es : MAP_FLAGS := -l es
|
||||
et : MAP_FLAGS := -l et
|
||||
fi : MAP_FLAGS := -l fi
|
||||
fo : MAP_FLAGS := -l fo
|
||||
fr : MAP_FLAGS := -l fr
|
||||
fr : MAP_FLAGS := -l fr -v nodeadkeys
|
||||
fr-be : MAP_FLAGS := -l be
|
||||
fr-ca : MAP_FLAGS := -l ca -v fr
|
||||
fr-ch : MAP_FLAGS := -l ch -v fr
|
||||
|
||||
@ -36,50 +36,65 @@ Escape 0x01
|
||||
# evdev 2 (0x2), QKeyCode "1", number 0x2
|
||||
1 0x02
|
||||
exclam 0x02 shift
|
||||
Arabic_1 0x02 altgr
|
||||
|
||||
# evdev 3 (0x3), QKeyCode "2", number 0x3
|
||||
2 0x03
|
||||
at 0x03 shift
|
||||
Arabic_2 0x03 altgr
|
||||
|
||||
# evdev 4 (0x4), QKeyCode "3", number 0x4
|
||||
3 0x04
|
||||
numbersign 0x04 shift
|
||||
Arabic_3 0x04 altgr
|
||||
|
||||
# evdev 5 (0x5), QKeyCode "4", number 0x5
|
||||
4 0x05
|
||||
dollar 0x05 shift
|
||||
Arabic_4 0x05 altgr
|
||||
|
||||
# evdev 6 (0x6), QKeyCode "5", number 0x6
|
||||
5 0x06
|
||||
percent 0x06 shift
|
||||
Arabic_5 0x06 altgr
|
||||
U2030 0x06 shift altgr
|
||||
|
||||
# evdev 7 (0x7), QKeyCode "6", number 0x7
|
||||
6 0x07
|
||||
asciicircum 0x07 shift
|
||||
Arabic_6 0x07 altgr
|
||||
|
||||
# evdev 8 (0x8), QKeyCode "7", number 0x8
|
||||
7 0x08
|
||||
ampersand 0x08 shift
|
||||
Arabic_7 0x08 altgr
|
||||
|
||||
# evdev 9 (0x9), QKeyCode "8", number 0x9
|
||||
8 0x09
|
||||
asterisk 0x09 shift
|
||||
Arabic_8 0x09 altgr
|
||||
|
||||
# evdev 10 (0xa), QKeyCode "9", number 0xa
|
||||
9 0x0a
|
||||
parenright 0x0a shift
|
||||
Arabic_9 0x0a altgr
|
||||
|
||||
# evdev 11 (0xb), QKeyCode "0", number 0xb
|
||||
0 0x0b
|
||||
parenleft 0x0b shift
|
||||
Arabic_0 0x0b altgr
|
||||
|
||||
# evdev 12 (0xc), QKeyCode "minus", number 0xc
|
||||
minus 0x0c
|
||||
underscore 0x0c shift
|
||||
endash 0x0c altgr
|
||||
U2011 0x0c shift altgr
|
||||
|
||||
# evdev 13 (0xd), QKeyCode "equal", number 0xd
|
||||
equal 0x0d
|
||||
plus 0x0d shift
|
||||
notequal 0x0d altgr
|
||||
approxeq 0x0d shift altgr
|
||||
|
||||
# evdev 14 (0xe), QKeyCode "backspace", number 0xe
|
||||
BackSpace 0x0e
|
||||
@ -91,18 +106,22 @@ ISO_Left_Tab 0x0f shift
|
||||
# evdev 16 (0x10), QKeyCode "q", number 0x10
|
||||
Arabic_dad 0x10
|
||||
Arabic_fatha 0x10 shift
|
||||
U2066 0x10 shift altgr
|
||||
|
||||
# evdev 17 (0x11), QKeyCode "w", number 0x11
|
||||
Arabic_sad 0x11
|
||||
Arabic_fathatan 0x11 shift
|
||||
U2067 0x11 shift altgr
|
||||
|
||||
# evdev 18 (0x12), QKeyCode "e", number 0x12
|
||||
Arabic_theh 0x12
|
||||
Arabic_damma 0x12 shift
|
||||
U2068 0x12 shift altgr
|
||||
|
||||
# evdev 19 (0x13), QKeyCode "r", number 0x13
|
||||
Arabic_qaf 0x13
|
||||
Arabic_dammatan 0x13 shift
|
||||
U2069 0x13 shift altgr
|
||||
|
||||
# evdev 20 (0x14), QKeyCode "t", number 0x14
|
||||
Arabic_feh 0x14
|
||||
@ -112,14 +131,17 @@ Arabic_veh 0x14 altgr
|
||||
# evdev 21 (0x15), QKeyCode "y", number 0x15
|
||||
Arabic_ghain 0x15
|
||||
Arabic_hamzaunderalef 0x15 shift
|
||||
U202A 0x15 shift altgr
|
||||
|
||||
# evdev 22 (0x16), QKeyCode "u", number 0x16
|
||||
Arabic_ain 0x16
|
||||
grave 0x16 shift
|
||||
U202B 0x16 shift altgr
|
||||
|
||||
# evdev 23 (0x17), QKeyCode "i", number 0x17
|
||||
Arabic_ha 0x17
|
||||
division 0x17 shift
|
||||
U202C 0x17 shift altgr
|
||||
|
||||
# evdev 24 (0x18), QKeyCode "o", number 0x18
|
||||
Arabic_khah 0x18
|
||||
@ -128,15 +150,18 @@ multiply 0x18 shift
|
||||
# evdev 25 (0x19), QKeyCode "p", number 0x19
|
||||
Arabic_hah 0x19
|
||||
Arabic_semicolon 0x19 shift
|
||||
U200E 0x19 shift altgr
|
||||
|
||||
# evdev 26 (0x1a), QKeyCode "bracket_left", number 0x1a
|
||||
Arabic_jeem 0x1a
|
||||
less 0x1a shift
|
||||
Arabic_tcheh 0x1a altgr
|
||||
U200F 0x1a shift altgr
|
||||
|
||||
# evdev 27 (0x1b), QKeyCode "bracket_right", number 0x1b
|
||||
Arabic_dal 0x1b
|
||||
greater 0x1b shift
|
||||
U061C 0x1b shift altgr
|
||||
|
||||
# evdev 28 (0x1c), QKeyCode "ret", number 0x1c
|
||||
Return 0x1c
|
||||
@ -177,6 +202,7 @@ Arabic_tatweel 0x24 shift
|
||||
# evdev 37 (0x25), QKeyCode "k", number 0x25
|
||||
Arabic_noon 0x25
|
||||
Arabic_comma 0x25 shift
|
||||
U066B 0x25 altgr
|
||||
|
||||
# evdev 38 (0x26), QKeyCode "l", number 0x26
|
||||
Arabic_meem 0x26
|
||||
@ -190,27 +216,35 @@ Arabic_gaf 0x27 altgr
|
||||
# evdev 40 (0x28), QKeyCode "apostrophe", number 0x28
|
||||
Arabic_tah 0x28
|
||||
quotedbl 0x28 shift
|
||||
U27E9 0x28 altgr
|
||||
U200D 0x28 shift altgr
|
||||
|
||||
# evdev 41 (0x29), QKeyCode "grave_accent", number 0x29
|
||||
Arabic_thal 0x29
|
||||
Arabic_shadda 0x29 shift
|
||||
Arabic_percent 0x29 altgr
|
||||
U0609 0x29 shift altgr
|
||||
|
||||
# evdev 42 (0x2a), QKeyCode "shift", number 0x2a
|
||||
Shift_L 0x2a
|
||||
|
||||
# evdev 43 (0x2b), QKeyCode "backslash", number 0x2b
|
||||
backslash 0x2b
|
||||
bar 0x2b shift
|
||||
ellipsis 0x2b shift
|
||||
U27E8 0x2b altgr
|
||||
U202F 0x2b shift altgr
|
||||
|
||||
# evdev 44 (0x2c), QKeyCode "z", number 0x2c
|
||||
Arabic_hamzaonyeh 0x2c
|
||||
asciitilde 0x2c shift
|
||||
guillemotright 0x2c altgr
|
||||
U203A 0x2c shift altgr
|
||||
|
||||
# evdev 45 (0x2d), QKeyCode "x", number 0x2d
|
||||
Arabic_hamza 0x2d
|
||||
Arabic_sukun 0x2d shift
|
||||
guillemotleft 0x2d altgr
|
||||
U2039 0x2d shift altgr
|
||||
|
||||
# evdev 46 (0x2e), QKeyCode "c", number 0x2e
|
||||
Arabic_hamzaonwaw 0x2e
|
||||
@ -236,14 +270,18 @@ apostrophe 0x32 shift
|
||||
# evdev 51 (0x33), QKeyCode "comma", number 0x33
|
||||
Arabic_waw 0x33
|
||||
comma 0x33 shift
|
||||
U066C 0x33 altgr
|
||||
|
||||
# evdev 52 (0x34), QKeyCode "dot", number 0x34
|
||||
Arabic_zain 0x34
|
||||
period 0x34 shift
|
||||
Arabic_jeh 0x34 altgr
|
||||
|
||||
# evdev 53 (0x35), QKeyCode "slash", number 0x35
|
||||
Arabic_zah 0x35
|
||||
Arabic_question_mark 0x35 shift
|
||||
U066D 0x35 altgr
|
||||
U200C 0x35 shift altgr
|
||||
|
||||
# evdev 54 (0x36), QKeyCode "shift_r", number 0x36
|
||||
Shift_R 0x36
|
||||
@ -371,9 +409,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)
|
||||
|
||||
@ -390,8 +430,7 @@ KP_Divide 0xb5
|
||||
Print 0x54
|
||||
|
||||
# evdev 100 (0x64), QKeyCode "alt_r", number 0xb8
|
||||
Alt_R 0xb8
|
||||
Meta_R 0xb8 shift
|
||||
ISO_Level3_Shift 0xb8
|
||||
|
||||
# evdev 101 (0x65), QKeyCode "lf", number 0x5b
|
||||
Linefeed 0x5b
|
||||
@ -733,6 +772,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
|
||||
#
|
||||
|
||||
@ -399,9 +399,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)
|
||||
|
||||
@ -761,6 +763,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
|
||||
#
|
||||
|
||||
@ -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
|
||||
#
|
||||
|
||||
@ -455,9 +455,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)
|
||||
|
||||
@ -816,6 +818,10 @@ XF86AudioMedia 0xed
|
||||
|
||||
# evdev 245 (0xf5): no evdev -> QKeyCode mapping (xkb keysym NoSymbol)
|
||||
|
||||
# evdev 246 (0xf6): no evdev -> QKeyCode mapping (xkb keysym 0x0edd0160)
|
||||
|
||||
# evdev 247 (0xf7): no evdev -> QKeyCode mapping (xkb keysym 0x0edd0270)
|
||||
|
||||
#
|
||||
# quirks section start
|
||||
#
|
||||
|
||||
@ -2,10 +2,10 @@
|
||||
# generated by qemu-keymap
|
||||
# model : pc105
|
||||
# layout : de
|
||||
# variant : -
|
||||
# variant : nodeadkeys
|
||||
# options : -
|
||||
|
||||
# name: "German"
|
||||
# name: "German (no dead keys)"
|
||||
|
||||
# modifiers
|
||||
# 0: Shift
|
||||
@ -100,10 +100,9 @@ backslash 0x0c altgr
|
||||
questiondown 0x0c shift altgr
|
||||
|
||||
# evdev 13 (0xd), QKeyCode "equal", number 0xd
|
||||
dead_acute 0x0d
|
||||
dead_grave 0x0d shift
|
||||
dead_cedilla 0x0d altgr
|
||||
dead_ogonek 0x0d shift altgr
|
||||
acute 0x0d
|
||||
grave 0x0d shift
|
||||
cedilla 0x0d altgr
|
||||
|
||||
# evdev 14 (0xe), QKeyCode "backspace", number 0xe
|
||||
BackSpace 0x0e
|
||||
@ -174,8 +173,7 @@ THORN 0x19 shift altgr
|
||||
# evdev 26 (0x1a), QKeyCode "bracket_left", number 0x1a
|
||||
udiaeresis 0x1a
|
||||
Udiaeresis 0x1a shift
|
||||
dead_diaeresis 0x1a altgr
|
||||
dead_abovering 0x1a shift altgr
|
||||
diaeresis 0x1a altgr
|
||||
|
||||
# evdev 27 (0x1b), QKeyCode "bracket_right", number 0x1b
|
||||
plus 0x1b
|
||||
@ -246,20 +244,17 @@ Lstroke 0x26 shift altgr
|
||||
# evdev 39 (0x27), QKeyCode "semicolon", number 0x27
|
||||
odiaeresis 0x27
|
||||
Odiaeresis 0x27 shift
|
||||
dead_doubleacute 0x27 altgr
|
||||
dead_belowdot 0x27 shift altgr
|
||||
doubleacute 0x27 altgr
|
||||
|
||||
# evdev 40 (0x28), QKeyCode "apostrophe", number 0x28
|
||||
adiaeresis 0x28
|
||||
Adiaeresis 0x28 shift
|
||||
dead_circumflex 0x28 altgr
|
||||
dead_caron 0x28 shift altgr
|
||||
asciicircum 0x28 altgr
|
||||
|
||||
# evdev 41 (0x29), QKeyCode "grave_accent", number 0x29
|
||||
dead_circumflex 0x29
|
||||
asciicircum 0x29
|
||||
degree 0x29 shift
|
||||
U2032 0x29 altgr
|
||||
U2033 0x29 shift altgr
|
||||
notsign 0x29 altgr
|
||||
|
||||
# evdev 42 (0x2a), QKeyCode "shift", number 0x2a
|
||||
Shift_L 0x2a
|
||||
@ -268,7 +263,7 @@ Shift_L 0x2a
|
||||
numbersign 0x2b
|
||||
apostrophe 0x2b shift
|
||||
rightsinglequotemark 0x2b altgr
|
||||
dead_breve 0x2b shift altgr
|
||||
grave 0x2b shift altgr
|
||||
|
||||
# evdev 44 (0x2c), QKeyCode "z", number 0x2c
|
||||
y 0x2c
|
||||
@ -440,7 +435,7 @@ KP_Separator 0x53 numlock
|
||||
less 0x56
|
||||
greater 0x56 shift
|
||||
bar 0x56 altgr
|
||||
brokenbar 0x56 shift altgr
|
||||
dead_belowmacron 0x56 shift altgr
|
||||
|
||||
# evdev 87 (0x57), QKeyCode "f11", number 0x57
|
||||
F11 0x57
|
||||
@ -458,9 +453,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)
|
||||
|
||||
@ -819,6 +816,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
|
||||
#
|
||||
|
||||
@ -455,9 +455,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)
|
||||
|
||||
@ -816,6 +818,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
|
||||
#
|
||||
|
||||
@ -453,9 +453,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)
|
||||
|
||||
@ -815,6 +817,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
|
||||
#
|
||||
|
||||
@ -365,9 +365,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)
|
||||
|
||||
@ -727,6 +729,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
|
||||
#
|
||||
|
||||
@ -454,9 +454,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)
|
||||
|
||||
@ -815,6 +817,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
|
||||
#
|
||||
|
||||
@ -363,9 +363,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)
|
||||
|
||||
@ -725,6 +727,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
|
||||
#
|
||||
|
||||
@ -429,9 +429,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)
|
||||
|
||||
@ -790,6 +792,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
|
||||
#
|
||||
|
||||
@ -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
|
||||
#
|
||||
|
||||
@ -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
|
||||
#
|
||||
|
||||
@ -455,9 +455,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)
|
||||
|
||||
@ -816,6 +818,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
|
||||
#
|
||||
|
||||
@ -387,9 +387,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)
|
||||
|
||||
@ -748,6 +750,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
|
||||
#
|
||||
|
||||
@ -455,9 +455,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)
|
||||
|
||||
@ -816,6 +818,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
|
||||
#
|
||||
|
||||
@ -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
|
||||
#
|
||||
|
||||
@ -455,9 +455,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)
|
||||
|
||||
@ -816,6 +818,10 @@ XF86AudioMedia 0xed
|
||||
|
||||
# evdev 245 (0xf5): no evdev -> QKeyCode mapping (xkb keysym NoSymbol)
|
||||
|
||||
# evdev 246 (0xf6): no evdev -> QKeyCode mapping (xkb keysym 0x0a865600)
|
||||
|
||||
# evdev 247 (0xf7): no evdev -> QKeyCode mapping (xkb keysym 0x0a865710)
|
||||
|
||||
#
|
||||
# quirks section start
|
||||
#
|
||||
|
||||
@ -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
|
||||
#
|
||||
|
||||
@ -459,9 +459,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)
|
||||
|
||||
@ -820,6 +822,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
|
||||
#
|
||||
|
||||
@ -367,9 +367,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)
|
||||
|
||||
@ -731,6 +733,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
|
||||
#
|
||||
|
||||
@ -454,9 +454,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)
|
||||
|
||||
@ -815,6 +817,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
|
||||
#
|
||||
|
||||
@ -429,9 +429,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)
|
||||
|
||||
@ -790,6 +792,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
|
||||
#
|
||||
|
||||
@ -365,9 +365,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)
|
||||
|
||||
@ -727,6 +729,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
|
||||
#
|
||||
|
||||
@ -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
|
||||
#
|
||||
|
||||
@ -467,9 +467,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)
|
||||
|
||||
@ -831,6 +833,10 @@ XF86AudioMedia 0xed
|
||||
|
||||
# evdev 245 (0xf5): no evdev -> QKeyCode mapping (xkb keysym NoSymbol)
|
||||
|
||||
# evdev 246 (0xf6): no evdev -> QKeyCode mapping (xkb keysym 0x00408160)
|
||||
|
||||
# evdev 247 (0xf7): no evdev -> QKeyCode mapping (xkb keysym 0x00408270)
|
||||
|
||||
#
|
||||
# quirks section start
|
||||
#
|
||||
|
||||
@ -460,9 +460,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)
|
||||
|
||||
@ -821,6 +823,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
|
||||
#
|
||||
|
||||
@ -453,9 +453,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)
|
||||
|
||||
@ -814,6 +816,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
|
||||
#
|
||||
|
||||
@ -453,9 +453,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)
|
||||
|
||||
@ -814,6 +816,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
|
||||
#
|
||||
|
||||
@ -366,9 +366,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)
|
||||
|
||||
@ -728,6 +730,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
|
||||
#
|
||||
|
||||
@ -365,9 +365,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)
|
||||
|
||||
@ -727,6 +729,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
|
||||
#
|
||||
|
||||
@ -449,9 +449,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)
|
||||
|
||||
@ -810,6 +812,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
|
||||
#
|
||||
|
||||
12
ui/curses.c
12
ui/curses.c
@ -75,9 +75,9 @@ static void curses_update(DisplayChangeListener *dcl,
|
||||
if (vga_to_curses[ch].chars[0]) {
|
||||
curses_line[x] = vga_to_curses[ch];
|
||||
} else {
|
||||
curses_line[x].chars[0] = ch;
|
||||
curses_line[x].chars[1] = 0;
|
||||
curses_line[x].attr = 0;
|
||||
curses_line[x] = (cchar_t) {
|
||||
.chars[0] = ch,
|
||||
};
|
||||
}
|
||||
curses_line[x].attr |= at;
|
||||
}
|
||||
@ -519,6 +519,7 @@ static void font_setup(void)
|
||||
|
||||
wchar_to_ucs_conv = iconv_open("UCS-2", "WCHAR_T");
|
||||
if (wchar_to_ucs_conv == (iconv_t) -1) {
|
||||
iconv_close(ucs_to_wchar_conv);
|
||||
fprintf(stderr, "Could not convert font glyphs to UCS-2: '%s'\n",
|
||||
strerror(errno));
|
||||
exit(1);
|
||||
@ -526,6 +527,8 @@ static void font_setup(void)
|
||||
|
||||
font_conv = iconv_open("WCHAR_T", font_charset);
|
||||
if (font_conv == (iconv_t) -1) {
|
||||
iconv_close(ucs_to_wchar_conv);
|
||||
iconv_close(wchar_to_ucs_conv);
|
||||
fprintf(stderr, "Could not convert font glyphs from %s: '%s'\n",
|
||||
font_charset, strerror(errno));
|
||||
exit(1);
|
||||
@ -646,6 +649,9 @@ static void font_setup(void)
|
||||
}
|
||||
}
|
||||
}
|
||||
iconv_close(ucs_to_wchar_conv);
|
||||
iconv_close(wchar_to_ucs_conv);
|
||||
iconv_close(font_conv);
|
||||
}
|
||||
|
||||
static void curses_setup(void)
|
||||
|
||||
@ -886,11 +886,11 @@ static int tight_compress_data(VncState *vs, int stream_id, size_t bytes,
|
||||
*/
|
||||
static void tight_pack24(VncState *vs, uint8_t *buf, size_t count, size_t *ret)
|
||||
{
|
||||
uint32_t *buf32;
|
||||
uint8_t *buf8;
|
||||
uint32_t pix;
|
||||
int rshift, gshift, bshift;
|
||||
|
||||
buf32 = (uint32_t *)buf;
|
||||
buf8 = buf;
|
||||
|
||||
if (1 /* FIXME */) {
|
||||
rshift = vs->client_pf.rshift;
|
||||
@ -907,10 +907,11 @@ static void tight_pack24(VncState *vs, uint8_t *buf, size_t count, size_t *ret)
|
||||
}
|
||||
|
||||
while (count--) {
|
||||
pix = *buf32++;
|
||||
pix = ldl_he_p(buf8);
|
||||
*buf++ = (char)(pix >> rshift);
|
||||
*buf++ = (char)(pix >> gshift);
|
||||
*buf++ = (char)(pix >> bshift);
|
||||
buf8 += 4;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user