hrev44761 adds 2 changesets to branch 'master' old head: 17ad59afd3b25f230efd7231a3315e344ef73ae0 new head: 634feff0e97e3d0e60976eb7a27938743440506b ---------------------------------------------------------------------------- 095d038: Reverted hrev42962 - there is no right command key in US internatinal. * This makes the keymap behave as in every other operating system. * I don't really understand the original purpose of this change. Please enlighten me (see #4464). 634feff: Cut off the trailing spaces from the key dump. * Noticed these on the keymap changes made by John, however, I have no idea how they did get there (the keymap command doesn't use this code). [ Axel DÃrfler <axeld@xxxxxxxxxxxxxxxx> ] ---------------------------------------------------------------------------- 3 files changed, 226 insertions(+), 224 deletions(-) .../input_server/devices/keyboard/Keymap.cpp | 9 +- src/data/keymaps/US-International.keymap | 434 +++++++++---------- src/preferences/keymap/Keymap.cpp | 7 +- ############################################################################ Commit: 095d0385780b041d07d427390be095b48ef7575c URL: http://cgit.haiku-os.org/haiku/commit/?id=095d038 Author: Axel DÃrfler <axeld@xxxxxxxxxxxxxxxx> Date: Mon Nov 5 12:29:52 2012 UTC Ticket: https://dev.haiku-os.org/ticket/4464 Reverted hrev42962 - there is no right command key in US internatinal. * This makes the keymap behave as in every other operating system. * I don't really understand the original purpose of this change. Please enlighten me (see #4464). ---------------------------------------------------------------------------- diff --git a/src/data/keymaps/US-International.keymap b/src/data/keymaps/US-International.keymap index 737d327..4d5f7be 100644 --- a/src/data/keymaps/US-International.keymap +++ b/src/data/keymaps/US-International.keymap @@ -37,11 +37,11 @@ NumLock = 0x22 LShift = 0x4b RShift = 0x56 LCommand = 0x5d -RCommand = 0x5f +RCommand = 0x00 LControl = 0x5c RControl = 0x60 LOption = 0x66 -ROption = 0x67 +ROption = 0x5f Menu = 0x68 # # Lock settings @@ -51,224 +51,224 @@ Menu = 0x68 # To set everything, do the following: # LockSettings = CapsLock NumLock ScrollLock # -LockSettings = +LockSettings = # Legend: # n = Normal # s = Shift # c = Control # C = CapsLock # o = Option -# Key n s c o os C Cs Co Cos -Key 0x00 = '' '' '' '' '' '' '' '' '' -Key 0x01 = 0x1b 0x1b 0x1b 0x1b 0x1b 0x1b 0x1b 0x1b 0x1b -Key 0x02 = 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 -Key 0x03 = 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 -Key 0x04 = 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 -Key 0x05 = 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 -Key 0x06 = 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 -Key 0x07 = 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 -Key 0x08 = 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 -Key 0x09 = 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 -Key 0x0a = 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 -Key 0x0b = 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 -Key 0x0c = 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 -Key 0x0d = 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 -Key 0x0e = 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 -Key 0x0f = 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 -Key 0x10 = 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 -Key 0x11 = '`' '~' '' '`' '~' '`' '~' '`' '~' -Key 0x12 = '1' '!' '' 0xc2a1 0xc2b9 '1' '!' 0xc2b9 0xc2a1 -Key 0x13 = '2' '@' 0x00 0xc2b2 0xc2ba '2' '@' 0xc2ba 0xc2b2 -Key 0x14 = '3' '#' '' 0xc2b3 0xc2aa '3' '#' 0xc2aa 0xc2b3 -Key 0x15 = '4' '$' '' 0xc2a4 0xc2a3 '4' '$' 0xc2a3 0xc2a4 -Key 0x16 = '5' '%' '' 0xe282ac '' '5' '%' '' 0xe282ac -Key 0x17 = '6' '^' 0x1e 0xc2bc '^' '6' '^' 0xc2bc '^' -Key 0x18 = '7' '&' '' 0xc2bd '' '7' '&' '' 0xc2bd -Key 0x19 = '8' '*' '' 0xc2be '' '8' '*' '' 0xc2be -Key 0x1a = '9' '(' '' 0xe28098 '' '9' '(' '' 0xe28098 -Key 0x1b = '0' ')' '' 0xe28099 0xc2b1 '0' ')' 0xc2b1 0xe28099 -Key 0x1c = '-' '_' 0x1f 0xc2a5 0xc2af '-' '_' 0xc2af 0xc2a5 -Key 0x1d = '=' '+' '' 0xc397 0xc3b7 '=' '+' 0xc3b7 0xc397 -Key 0x1e = 0x08 0x08 0x7f 0x08 0x08 0x08 0x08 0x08 0x08 -Key 0x1f = 0x05 0x05 0x05 0x05 0x05 0x05 0x05 0x05 0x05 -Key 0x20 = 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 -Key 0x21 = 0x0b 0x0b 0x0b 0x0b 0x0b 0x0b 0x0b 0x0b 0x0b -Key 0x22 = '' '' '' '' '' '' '' '' '' -Key 0x23 = '/' '/' '/' '/' '/' '/' '/' '/' '/' -Key 0x24 = '*' '*' '*' '*' '*' '*' '*' '*' '*' -Key 0x25 = '-' '-' '-' '-' '-' '-' '-' '-' '-' -Key 0x26 = 0x09 0x09 0x09 0x09 0x09 0x09 0x09 0x09 0x09 -Key 0x27 = 'q' 'Q' 0x11 0xc3a4 0xc384 'Q' '' 0xc384 0xc3a4 -Key 0x28 = 'w' 'W' 0x17 0xc3a5 0xc385 'W' '' 0xc385 0xc3a5 -Key 0x29 = 'e' 'E' 0x05 0xc3a9 0xc389 'E' '' 0xc389 0xc3a9 -Key 0x2a = 'r' 'R' 0x12 0xc2ae '' 'R' '' '' 0xc2ae -Key 0x2b = 't' 'T' 0x14 0xc3be 0xc39e 'T' '' 0xc39e 0xc3be -Key 0x2c = 'y' 'Y' 0x19 0xc3bc 0xc39c 'Y' '' 0xc39c 0xc3bc -Key 0x2d = 'u' 'U' 0x15 0xc3ba 0xc39a 'U' '' 0xc39a 0xc3ba -Key 0x2e = 'i' 'I' 0x09 0xc3ad 0xc38d 'I' '' 0xc38d 0xc3ad -Key 0x2f = 'o' 'O' 0x0f 0xc3b3 0xc393 'O' '' 0xc393 0xc3b3 -Key 0x30 = 'p' 'P' 0x10 0xc3b6 0xc396 'P' '' 0xc396 0xc3b6 -Key 0x31 = '[' '{' 0x1b 0xc2ab '' '[' '' '' 0xc2ab -Key 0x32 = ']' '}' 0x1d 0xc2bb '' ']' '' '' 0xc2bb -Key 0x33 = '\\' '|' 0x1c 0xc2ac 0xc2a6 '\\' '' 0xc2a6 0xc2ac -Key 0x34 = 0x7f 0x7f 0x7f 0x7f 0x7f 0x7f 0x7f 0x7f 0x7f -Key 0x35 = 0x04 0x04 0x04 0x04 0x04 0x04 0x04 0x04 0x04 -Key 0x36 = 0x0c 0x0c 0x0c 0x0c 0x0c 0x0c 0x0c 0x0c 0x0c -Key 0x37 = 0x01 '7' 0x01 0x01 '7' 0x01 '7' '7' 0x01 -Key 0x38 = 0x1e '8' 0x1e 0x1e '8' 0x1e '8' '8' 0x1e -Key 0x39 = 0x0b '9' 0x0b 0x0b '9' 0x0b '9' '9' 0x0b -Key 0x3a = '+' '+' '+' '+' '+' '+' '+' '+' '+' -Key 0x3b = '' '' '' '' '' '' '' '' '' -Key 0x3c = 'a' 'A' 0x01 0xc3a1 0xc381 'A' '' 0xc381 0xc3a1 -Key 0x3d = 's' 'S' 0x13 0xc39f 0xc2a7 'S' '' 0xc2a7 0xc39f -Key 0x3e = 'd' 'D' 0x04 0xc3b0 0xc390 'D' '' 0xc390 0xc3b0 -Key 0x3f = 'f' 'F' 0x06 '' '' 'F' '' '' '' -Key 0x40 = 'g' 'G' 0x07 '' '' 'G' '' '' '' -Key 0x41 = 'h' 'H' 0x08 '' '' 'H' '' '' '' -Key 0x42 = 'j' 'J' 0x0a '' '' 'J' '' '' '' -Key 0x43 = 'k' 'K' 0x0b '' '' 'K' '' '' '' -Key 0x44 = 'l' 'L' 0x0c 0xc3b8 0xc398 'L' '' 0xc398 0xc3b8 -Key 0x45 = ';' ':' '' 0xc2b6 0xc2b0 ';' '' 0xc2b0 0xc2b6 -Key 0x46 = '\'' '"' '' 0xc2b4 0xc2a8 '\'' '' 0xc2b4 0xc2a8 -Key 0x47 = 0x0a 0x0a 0x0a 0x0a 0x0a 0x0a 0x0a 0x0a 0x0a -Key 0x48 = 0x1c '4' 0x1c 0x1c '4' 0x1c '4' '4' 0x1c -Key 0x49 = '' '5' '' '' '5' '' '5' '5' '' -Key 0x4a = 0x1d '6' 0x1d 0x1d '6' 0x1d '6' '6' 0x1d -Key 0x4b = '' '' '' '' '' '' '' '' '' -Key 0x4c = 'z' 'Z' 0x1a 0xc3a6 0xc386 'Z' '' 0xc386 0xc3a6 -Key 0x4d = 'x' 'X' 0x18 '' '' 'X' '' '' '' -Key 0x4e = 'c' 'C' 0x03 0xc2a9 0xc2a2 'C' '' 0xc2a9 0xc2a2 -Key 0x4f = 'v' 'V' 0x16 0xe2889a '' 'V' '' '' 0xe2889a -Key 0x50 = 'b' 'B' 0x02 '' '' 'B' '' '' '' -Key 0x51 = 'n' 'N' 0x0e 0xc3b1 0xc391 'N' '' 0xc391 0xc3b1 -Key 0x52 = 'm' 'M' 0x0d 0xc2b5 '' 'M' '' '' 0xc2b5 -Key 0x53 = ',' '<' '' 0xc3a7 0xc387 ',' '' 0xc387 0xc3a7 -Key 0x54 = '.' '>' '' 0xc2b7 0xc2b8 '.' '' 0xc2b8 0xc2b7 -Key 0x55 = '/' '?' '' '' '' '/' '' '' '' -Key 0x56 = '' '' '' '' '' '' '' '' '' -Key 0x57 = 0x1e 0x1e 0x1e 0x1e 0x1e 0x1e 0x1e 0x1e 0x1e -Key 0x58 = 0x04 '1' 0x04 0x04 '1' 0x04 '1' '1' 0x04 -Key 0x59 = 0x1f '2' 0x1f 0x1f '2' 0x1f '2' '2' 0x1f -Key 0x5a = 0x0c '3' 0x0c 0x0c '3' 0x0c '3' '3' 0x0c -Key 0x5b = 0x0a 0x0a 0x0a 0x0a 0x0a 0x0a 0x0a 0x0a 0x0a -Key 0x5c = '' '' '' '' '' '' '' '' '' -Key 0x5d = '' '' '' '' '' '' '' '' '' -Key 0x5e = ' ' ' ' 0x00 ' ' '' ' ' ' ' '' ' ' -Key 0x5f = '' '' '' '' '' '' '' '' '' -Key 0x60 = '' '' '' '' '' '' '' '' '' -Key 0x61 = 0x1c 0x1c 0x1c 0x1c 0x1c 0x1c 0x1c 0x1c 0x1c -Key 0x62 = 0x1f 0x1f 0x1f 0x1f 0x1f 0x1f 0x1f 0x1f 0x1f -Key 0x63 = 0x1d 0x1d 0x1d 0x1d 0x1d 0x1d 0x1d 0x1d 0x1d -Key 0x64 = 0x05 '0' 0x05 0x05 '0' 0x05 '0' '0' 0x05 -Key 0x65 = 0x7f '.' 0x7f 0x7f '.' 0x7f '.' '.' 0x7f -Key 0x66 = '' '' '' '' '' '' '' '' '' -Key 0x67 = '' '' '' '' '' '' '' '' '' -Key 0x68 = '' '' '' '' '' '' '' '' '' -Key 0x69 = '\\' '|' 0x1c 0xc2ac 0xc2a6 '\\' '|' 0xc2a6 0xc2ac -Key 0x6a = '' '' '' '' '' '' '' '' '' -Key 0x6b = '' '' '' '' '' '' '' '' '' -Key 0x6c = '' '' '' '' '' '' '' '' '' -Key 0x6d = '' '' '' '' '' '' '' '' '' -Key 0x6e = '' '' '' '' '' '' '' '' '' -Key 0x6f = '' '' '' '' '' '' '' '' '' -Key 0x70 = '' '' '' '' '' '' '' '' '' -Key 0x71 = '' '' '' '' '' '' '' '' '' -Key 0x72 = '' '' '' '' '' '' '' '' '' -Key 0x73 = '' '' '' '' '' '' '' '' '' -Key 0x74 = '' '' '' '' '' '' '' '' '' -Key 0x75 = '' '' '' '' '' '' '' '' '' -Key 0x76 = '' '' '' '' '' '' '' '' '' -Key 0x77 = '' '' '' '' '' '' '' '' '' -Key 0x78 = '' '' '' '' '' '' '' '' '' -Key 0x79 = '' '' '' '' '' '' '' '' '' -Key 0x7a = '' '' '' '' '' '' '' '' '' -Key 0x7b = '' '' '' '' '' '' '' '' '' -Key 0x7c = '' '' '' '' '' '' '' '' '' -Key 0x7d = '' '' '' '' '' '' '' '' '' -Key 0x7e = '' '' '' '' '' '' '' '' '' -Key 0x7f = '' '' '' '' '' '' '' '' '' -Acute ' ' = 0xc2b4 -Acute 'A' = 0xc381 -Acute 'C' = 0xc387 -Acute 'E' = 0xc389 -Acute 'I' = 0xc38d -Acute 'O' = 0xc393 -Acute 'U' = 0xc39a -Acute 'Y' = 0xc39d -Acute 'a' = 0xc3a1 -Acute 'c' = 0xc3a7 -Acute 'e' = 0xc3a9 -Acute 'i' = 0xc3ad -Acute 'o' = 0xc3b3 -Acute 'u' = 0xc3ba -Acute 'y' = 0xc3bd -Acute '' = '' -AcuteTab = Option CapsLock-Option -Grave ' ' = '`' -Grave 'A' = 0xc380 -Grave 'E' = 0xc388 -Grave 'I' = 0xc38c -Grave 'O' = 0xc392 -Grave 'U' = 0xc399 -Grave 'a' = 0xc3a0 -Grave 'e' = 0xc3a8 -Grave 'i' = 0xc3ac -Grave 'o' = 0xc3b2 -Grave 'u' = 0xc3b9 -Grave '' = '' -Grave '' = '' -Grave '' = '' -Grave '' = '' -Grave '' = '' -GraveTab = Option CapsLock-Option -Circumflex ' ' = '^' -Circumflex 'A' = 0xc382 -Circumflex 'E' = 0xc38a -Circumflex 'I' = 0xc38e -Circumflex 'O' = 0xc394 -Circumflex 'U' = 0xc39b -Circumflex 'a' = 0xc3a2 -Circumflex 'e' = 0xc3aa -Circumflex 'i' = 0xc3ae -Circumflex 'o' = 0xc3b4 -Circumflex 'u' = 0xc3bb -Circumflex '' = '' -Circumflex '' = '' -Circumflex '' = '' -Circumflex '' = '' -Circumflex '' = '' -CircumflexTab = Option-Shift CapsLock-Shift-Option -Diaeresis ' ' = 0xc2a8 -Diaeresis 'A' = 0xc384 -Diaeresis 'E' = 0xc38b -Diaeresis 'I' = 0xc38f -Diaeresis 'O' = 0xc396 -Diaeresis 'U' = 0xc39c -Diaeresis 'Y' = 0xc5b8 -Diaeresis 'a' = 0xc3a4 -Diaeresis 'e' = 0xc3ab -Diaeresis 'i' = 0xc3af -Diaeresis 'o' = 0xc3b6 -Diaeresis 'u' = 0xc3bc -Diaeresis 'y' = 0xc3bf -Diaeresis '' = '' -Diaeresis '' = '' -Diaeresis '' = '' -DiaeresisTab = Option-Shift CapsLock-Shift-Option -Tilde ' ' = '~' -Tilde 'A' = 0xc383 -Tilde 'O' = 0xc395 -Tilde 'N' = 0xc391 -Tilde 'a' = 0xc3a3 -Tilde 'o' = 0xc3b5 -Tilde 'n' = 0xc3b1 -Tilde '' = '' -Tilde '' = '' -Tilde '' = '' -Tilde '' = '' -Tilde '' = '' -Tilde '' = '' -Tilde '' = '' -Tilde '' = '' -Tilde '' = '' -TildeTab = Option-Shift CapsLock-Shift-Option +# Key n s c o os C Cs Co Cos +Key 0x00 = '' '' '' '' '' '' '' '' '' +Key 0x01 = 0x1b 0x1b 0x1b 0x1b 0x1b 0x1b 0x1b 0x1b 0x1b +Key 0x02 = 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 +Key 0x03 = 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 +Key 0x04 = 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 +Key 0x05 = 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 +Key 0x06 = 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 +Key 0x07 = 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 +Key 0x08 = 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 +Key 0x09 = 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 +Key 0x0a = 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 +Key 0x0b = 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 +Key 0x0c = 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 +Key 0x0d = 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 +Key 0x0e = 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 +Key 0x0f = 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 +Key 0x10 = 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 0x10 +Key 0x11 = '`' '~' '' '`' '~' '`' '~' '`' '~' +Key 0x12 = '1' '!' '' 0xc2a1 0xc2b9 '1' '!' 0xc2b9 0xc2a1 +Key 0x13 = '2' '@' 0x00 0xc2b2 0xc2ba '2' '@' 0xc2ba 0xc2b2 +Key 0x14 = '3' '#' '' 0xc2b3 0xc2aa '3' '#' 0xc2aa 0xc2b3 +Key 0x15 = '4' '$' '' 0xc2a4 0xc2a3 '4' '$' 0xc2a3 0xc2a4 +Key 0x16 = '5' '%' '' 0xe282ac '' '5' '%' '' 0xe282ac +Key 0x17 = '6' '^' 0x1e 0xc2bc '^' '6' '^' 0xc2bc '^' +Key 0x18 = '7' '&' '' 0xc2bd '' '7' '&' '' 0xc2bd +Key 0x19 = '8' '*' '' 0xc2be '' '8' '*' '' 0xc2be +Key 0x1a = '9' '(' '' 0xe28098 '' '9' '(' '' 0xe28098 +Key 0x1b = '0' ')' '' 0xe28099 0xc2b1 '0' ')' 0xc2b1 0xe28099 +Key 0x1c = '-' '_' 0x1f 0xc2a5 0xc2af '-' '_' 0xc2af 0xc2a5 +Key 0x1d = '=' '+' '' 0xc397 0xc3b7 '=' '+' 0xc3b7 0xc397 +Key 0x1e = 0x08 0x08 0x7f 0x08 0x08 0x08 0x08 0x08 0x08 +Key 0x1f = 0x05 0x05 0x05 0x05 0x05 0x05 0x05 0x05 0x05 +Key 0x20 = 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 +Key 0x21 = 0x0b 0x0b 0x0b 0x0b 0x0b 0x0b 0x0b 0x0b 0x0b +Key 0x22 = '' '' '' '' '' '' '' '' '' +Key 0x23 = '/' '/' '/' '/' '/' '/' '/' '/' '/' +Key 0x24 = '*' '*' '*' '*' '*' '*' '*' '*' '*' +Key 0x25 = '-' '-' '-' '-' '-' '-' '-' '-' '-' +Key 0x26 = 0x09 0x09 0x09 0x09 0x09 0x09 0x09 0x09 0x09 +Key 0x27 = 'q' 'Q' 0x11 0xc3a4 0xc384 'Q' '' 0xc384 0xc3a4 +Key 0x28 = 'w' 'W' 0x17 0xc3a5 0xc385 'W' '' 0xc385 0xc3a5 +Key 0x29 = 'e' 'E' 0x05 0xc3a9 0xc389 'E' '' 0xc389 0xc3a9 +Key 0x2a = 'r' 'R' 0x12 0xc2ae '' 'R' '' '' 0xc2ae +Key 0x2b = 't' 'T' 0x14 0xc3be 0xc39e 'T' '' 0xc39e 0xc3be +Key 0x2c = 'y' 'Y' 0x19 0xc3bc 0xc39c 'Y' '' 0xc39c 0xc3bc +Key 0x2d = 'u' 'U' 0x15 0xc3ba 0xc39a 'U' '' 0xc39a 0xc3ba +Key 0x2e = 'i' 'I' 0x09 0xc3ad 0xc38d 'I' '' 0xc38d 0xc3ad +Key 0x2f = 'o' 'O' 0x0f 0xc3b3 0xc393 'O' '' 0xc393 0xc3b3 +Key 0x30 = 'p' 'P' 0x10 0xc3b6 0xc396 'P' '' 0xc396 0xc3b6 +Key 0x31 = '[' '{' 0x1b 0xc2ab '' '[' '' '' 0xc2ab +Key 0x32 = ']' '}' 0x1d 0xc2bb '' ']' '' '' 0xc2bb +Key 0x33 = '\\' '|' 0x1c 0xc2ac 0xc2a6 '\\' '' 0xc2a6 0xc2ac +Key 0x34 = 0x7f 0x7f 0x7f 0x7f 0x7f 0x7f 0x7f 0x7f 0x7f +Key 0x35 = 0x04 0x04 0x04 0x04 0x04 0x04 0x04 0x04 0x04 +Key 0x36 = 0x0c 0x0c 0x0c 0x0c 0x0c 0x0c 0x0c 0x0c 0x0c +Key 0x37 = 0x01 '7' 0x01 0x01 '7' 0x01 '7' '7' 0x01 +Key 0x38 = 0x1e '8' 0x1e 0x1e '8' 0x1e '8' '8' 0x1e +Key 0x39 = 0x0b '9' 0x0b 0x0b '9' 0x0b '9' '9' 0x0b +Key 0x3a = '+' '+' '+' '+' '+' '+' '+' '+' '+' +Key 0x3b = '' '' '' '' '' '' '' '' '' +Key 0x3c = 'a' 'A' 0x01 0xc3a1 0xc381 'A' '' 0xc381 0xc3a1 +Key 0x3d = 's' 'S' 0x13 0xc39f 0xc2a7 'S' '' 0xc2a7 0xc39f +Key 0x3e = 'd' 'D' 0x04 0xc3b0 0xc390 'D' '' 0xc390 0xc3b0 +Key 0x3f = 'f' 'F' 0x06 '' '' 'F' '' '' '' +Key 0x40 = 'g' 'G' 0x07 '' '' 'G' '' '' '' +Key 0x41 = 'h' 'H' 0x08 '' '' 'H' '' '' '' +Key 0x42 = 'j' 'J' 0x0a '' '' 'J' '' '' '' +Key 0x43 = 'k' 'K' 0x0b '' '' 'K' '' '' '' +Key 0x44 = 'l' 'L' 0x0c 0xc3b8 0xc398 'L' '' 0xc398 0xc3b8 +Key 0x45 = ';' ':' '' 0xc2b6 0xc2b0 ';' '' 0xc2b0 0xc2b6 +Key 0x46 = '\'' '"' '' 0xc2b4 0xc2a8 '\'' '' 0xc2b4 0xc2a8 +Key 0x47 = 0x0a 0x0a 0x0a 0x0a 0x0a 0x0a 0x0a 0x0a 0x0a +Key 0x48 = 0x1c '4' 0x1c 0x1c '4' 0x1c '4' '4' 0x1c +Key 0x49 = '' '5' '' '' '5' '' '5' '5' '' +Key 0x4a = 0x1d '6' 0x1d 0x1d '6' 0x1d '6' '6' 0x1d +Key 0x4b = '' '' '' '' '' '' '' '' '' +Key 0x4c = 'z' 'Z' 0x1a 0xc3a6 0xc386 'Z' '' 0xc386 0xc3a6 +Key 0x4d = 'x' 'X' 0x18 '' '' 'X' '' '' '' +Key 0x4e = 'c' 'C' 0x03 0xc2a9 0xc2a2 'C' '' 0xc2a9 0xc2a2 +Key 0x4f = 'v' 'V' 0x16 0xe2889a '' 'V' '' '' 0xe2889a +Key 0x50 = 'b' 'B' 0x02 '' '' 'B' '' '' '' +Key 0x51 = 'n' 'N' 0x0e 0xc3b1 0xc391 'N' '' 0xc391 0xc3b1 +Key 0x52 = 'm' 'M' 0x0d 0xc2b5 '' 'M' '' '' 0xc2b5 +Key 0x53 = ',' '<' '' 0xc3a7 0xc387 ',' '' 0xc387 0xc3a7 +Key 0x54 = '.' '>' '' 0xc2b7 0xc2b8 '.' '' 0xc2b8 0xc2b7 +Key 0x55 = '/' '?' '' '' '' '/' '' '' '' +Key 0x56 = '' '' '' '' '' '' '' '' '' +Key 0x57 = 0x1e 0x1e 0x1e 0x1e 0x1e 0x1e 0x1e 0x1e 0x1e +Key 0x58 = 0x04 '1' 0x04 0x04 '1' 0x04 '1' '1' 0x04 +Key 0x59 = 0x1f '2' 0x1f 0x1f '2' 0x1f '2' '2' 0x1f +Key 0x5a = 0x0c '3' 0x0c 0x0c '3' 0x0c '3' '3' 0x0c +Key 0x5b = 0x0a 0x0a 0x0a 0x0a 0x0a 0x0a 0x0a 0x0a 0x0a +Key 0x5c = '' '' '' '' '' '' '' '' '' +Key 0x5d = '' '' '' '' '' '' '' '' '' +Key 0x5e = ' ' ' ' 0x00 ' ' '' ' ' ' ' '' ' ' +Key 0x5f = '' '' '' '' '' '' '' '' '' +Key 0x60 = '' '' '' '' '' '' '' '' '' +Key 0x61 = 0x1c 0x1c 0x1c 0x1c 0x1c 0x1c 0x1c 0x1c 0x1c +Key 0x62 = 0x1f 0x1f 0x1f 0x1f 0x1f 0x1f 0x1f 0x1f 0x1f +Key 0x63 = 0x1d 0x1d 0x1d 0x1d 0x1d 0x1d 0x1d 0x1d 0x1d +Key 0x64 = 0x05 '0' 0x05 0x05 '0' 0x05 '0' '0' 0x05 +Key 0x65 = 0x7f '.' 0x7f 0x7f '.' 0x7f '.' '.' 0x7f +Key 0x66 = '' '' '' '' '' '' '' '' '' +Key 0x67 = '' '' '' '' '' '' '' '' '' +Key 0x68 = '' '' '' '' '' '' '' '' '' +Key 0x69 = '\\' '|' 0x1c 0xc2ac 0xc2a6 '\\' '|' 0xc2a6 0xc2ac +Key 0x6a = '' '' '' '' '' '' '' '' '' +Key 0x6b = '' '' '' '' '' '' '' '' '' +Key 0x6c = '' '' '' '' '' '' '' '' '' +Key 0x6d = '' '' '' '' '' '' '' '' '' +Key 0x6e = '' '' '' '' '' '' '' '' '' +Key 0x6f = '' '' '' '' '' '' '' '' '' +Key 0x70 = '' '' '' '' '' '' '' '' '' +Key 0x71 = '' '' '' '' '' '' '' '' '' +Key 0x72 = '' '' '' '' '' '' '' '' '' +Key 0x73 = '' '' '' '' '' '' '' '' '' +Key 0x74 = '' '' '' '' '' '' '' '' '' +Key 0x75 = '' '' '' '' '' '' '' '' '' +Key 0x76 = '' '' '' '' '' '' '' '' '' +Key 0x77 = '' '' '' '' '' '' '' '' '' +Key 0x78 = '' '' '' '' '' '' '' '' '' +Key 0x79 = '' '' '' '' '' '' '' '' '' +Key 0x7a = '' '' '' '' '' '' '' '' '' +Key 0x7b = '' '' '' '' '' '' '' '' '' +Key 0x7c = '' '' '' '' '' '' '' '' '' +Key 0x7d = '' '' '' '' '' '' '' '' '' +Key 0x7e = '' '' '' '' '' '' '' '' '' +Key 0x7f = '' '' '' '' '' '' '' '' '' +Acute ' ' = 0xc2b4 +Acute 'A' = 0xc381 +Acute 'C' = 0xc387 +Acute 'E' = 0xc389 +Acute 'I' = 0xc38d +Acute 'O' = 0xc393 +Acute 'U' = 0xc39a +Acute 'Y' = 0xc39d +Acute 'a' = 0xc3a1 +Acute 'c' = 0xc3a7 +Acute 'e' = 0xc3a9 +Acute 'i' = 0xc3ad +Acute 'o' = 0xc3b3 +Acute 'u' = 0xc3ba +Acute 'y' = 0xc3bd +Acute '' = '' +AcuteTab = Option CapsLock-Option +Grave ' ' = '`' +Grave 'A' = 0xc380 +Grave 'E' = 0xc388 +Grave 'I' = 0xc38c +Grave 'O' = 0xc392 +Grave 'U' = 0xc399 +Grave 'a' = 0xc3a0 +Grave 'e' = 0xc3a8 +Grave 'i' = 0xc3ac +Grave 'o' = 0xc3b2 +Grave 'u' = 0xc3b9 +Grave '' = '' +Grave '' = '' +Grave '' = '' +Grave '' = '' +Grave '' = '' +GraveTab = Option CapsLock-Option +Circumflex ' ' = '^' +Circumflex 'A' = 0xc382 +Circumflex 'E' = 0xc38a +Circumflex 'I' = 0xc38e +Circumflex 'O' = 0xc394 +Circumflex 'U' = 0xc39b +Circumflex 'a' = 0xc3a2 +Circumflex 'e' = 0xc3aa +Circumflex 'i' = 0xc3ae +Circumflex 'o' = 0xc3b4 +Circumflex 'u' = 0xc3bb +Circumflex '' = '' +Circumflex '' = '' +Circumflex '' = '' +Circumflex '' = '' +Circumflex '' = '' +CircumflexTab = Option-Shift CapsLock-Shift-Option +Diaeresis ' ' = 0xc2a8 +Diaeresis 'A' = 0xc384 +Diaeresis 'E' = 0xc38b +Diaeresis 'I' = 0xc38f +Diaeresis 'O' = 0xc396 +Diaeresis 'U' = 0xc39c +Diaeresis 'Y' = 0xc5b8 +Diaeresis 'a' = 0xc3a4 +Diaeresis 'e' = 0xc3ab +Diaeresis 'i' = 0xc3af +Diaeresis 'o' = 0xc3b6 +Diaeresis 'u' = 0xc3bc +Diaeresis 'y' = 0xc3bf +Diaeresis '' = '' +Diaeresis '' = '' +Diaeresis '' = '' +DiaeresisTab = Option-Shift CapsLock-Shift-Option +Tilde ' ' = '~' +Tilde 'A' = 0xc383 +Tilde 'O' = 0xc395 +Tilde 'N' = 0xc391 +Tilde 'a' = 0xc3a3 +Tilde 'o' = 0xc3b5 +Tilde 'n' = 0xc3b1 +Tilde '' = '' +Tilde '' = '' +Tilde '' = '' +Tilde '' = '' +Tilde '' = '' +Tilde '' = '' +Tilde '' = '' +Tilde '' = '' +Tilde '' = '' +TildeTab = Option-Shift CapsLock-Shift-Option ############################################################################ Revision: hrev44761 Commit: 634feff0e97e3d0e60976eb7a27938743440506b URL: http://cgit.haiku-os.org/haiku/commit/?id=634feff Author: Axel DÃrfler <axeld@xxxxxxxxxxxxxxxx> Date: Mon Nov 5 12:32:51 2012 UTC Cut off the trailing spaces from the key dump. * Noticed these on the keymap changes made by John, however, I have no idea how they did get there (the keymap command doesn't use this code). ---------------------------------------------------------------------------- diff --git a/src/add-ons/input_server/devices/keyboard/Keymap.cpp b/src/add-ons/input_server/devices/keyboard/Keymap.cpp index 86afbe0..f003b02 100644 --- a/src/add-ons/input_server/devices/keyboard/Keymap.cpp +++ b/src/add-ons/input_server/devices/keyboard/Keymap.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2004-2010, Haiku, Inc. All rights reserved. + * Copyright 2004-2012, Haiku, Inc. All rights reserved. * Distributed under the terms of the MIT License. * * Authors: @@ -23,7 +23,7 @@ static void -print_key(char* chars, int32 offset) +print_key(char* chars, int32 offset, bool last = false) { int size = chars[offset++]; @@ -53,7 +53,8 @@ print_key(char* chars, int32 offset) } } - fputs("\t", stdout); + if (!last) + fputs("\t", stdout); } @@ -91,7 +92,7 @@ Keymap::DumpKeymap() print_key(fChars, fKeys.caps_map[i]); print_key(fChars, fKeys.caps_shift_map[i]); print_key(fChars, fKeys.option_caps_map[i]); - print_key(fChars, fKeys.option_caps_shift_map[i]); + print_key(fChars, fKeys.option_caps_shift_map[i], true); fputs("\n", stdout); } } diff --git a/src/preferences/keymap/Keymap.cpp b/src/preferences/keymap/Keymap.cpp index 817d86e..e2225f9 100644 --- a/src/preferences/keymap/Keymap.cpp +++ b/src/preferences/keymap/Keymap.cpp @@ -26,7 +26,7 @@ static const uint32 kModifierKeys = B_SHIFT_KEY | B_CAPS_LOCK | B_CONTROL_KEY static void -print_key(char *chars, int32 offset) +print_key(char *chars, int32 offset, bool last = false) { int size = chars[offset++]; @@ -53,7 +53,8 @@ print_key(char *chars, int32 offset) } } - fputs("\t", stdout); + if (!last) + fputs("\t", stdout); } @@ -110,7 +111,7 @@ Keymap::DumpKeymap() print_key(fChars, fKeys.caps_map[i]); print_key(fChars, fKeys.caps_shift_map[i]); print_key(fChars, fKeys.option_caps_map[i]); - print_key(fChars, fKeys.option_caps_shift_map[i]); + print_key(fChars, fKeys.option_caps_shift_map[i], true); fputs("\n", stdout); } }