# HG changeset patch # User Jacob Alexander # Date 1424936837 28800 # Node ID 43a72b401d44e158480cce47a0e16d00454bb57c # Parent 8b82e0ceac05e1206a5818eae115cda983f72236 Adding more symbolic names to the kll lookup. - These will be added to the KLL Spec 0.4 diff -r 8b82e0ceac05 -r 43a72b401d44 kll_lib/hid_dict.py --- a/kll_lib/hid_dict.py Sat Feb 21 23:34:14 2015 -0800 +++ b/kll_lib/hid_dict.py Wed Feb 25 23:47:17 2015 -0800 @@ -301,7 +301,7 @@ ( '9', 0x26 ), ( '0', 0x27 ), ( 'ENTER', 0x28 ), - ( 'ESC', 0x29 ), + ( 'ESC', 0x29 ), ( 'ESCAPE', 0x29 ), ( 'BACKSPACE', 0x2A ), ( 'TAB', 0x2B ), ( 'SPACE', 0x2C ), @@ -317,7 +317,7 @@ ( ',', 0x36 ), ( 'COMMA', 0x36 ), ( '.', 0x37 ), ( 'PERIOD', 0x37 ), ( '/', 0x38 ), ( 'SLASH', 0x38 ), - ( 'CAPSLOCK', 0x39 ), + ( 'CAPSLOCK', 0x39 ), { 'CAPS LOCK', 0x39 }, ( 'F1', 0x3A ), ( 'F2', 0x3B ), ( 'F3', 0x3C ), @@ -330,20 +330,20 @@ ( 'F10', 0x43 ), ( 'F11', 0x44 ), ( 'F12', 0x45 ), - ( 'PRINTSCREEN', 0x46 ), - ( 'SCROLLLOCK', 0x47 ), + ( 'PRINTSCREEN', 0x46 ), ( 'PRINT SCREEN', 0x46 ), + ( 'SCROLLLOCK', 0x47 ), ( 'SCROLL LOCK', 0x47 ), ( 'PAUSE', 0x48 ), ( 'INSERT', 0x49 ), ( 'HOME', 0x4A ), - ( 'PAGEUP', 0x4B ), + ( 'PAGEUP', 0x4B ), ( 'PAGE UP', 0x4B ), ( 'DELETE', 0x4C ), ( 'END', 0x4D ), - ( 'PAGEDOWN', 0x4E ), + ( 'PAGEDOWN', 0x4E ), ( 'PAGE DOWN', 0x4E ), ( 'RIGHT', 0x4F ), ( 'LEFT', 0x50 ), ( 'DOWN', 0x51 ), ( 'UP', 0x52 ), - ( 'NUMLOCK', 0x53 ), + ( 'NUMLOCK', 0x53 ), ( 'NUM LOCK', 0x53 ), ( 'P/', 0x54 ), ( 'KEYPAD SLASH', 0x54 ), ( 'P*', 0x55 ), ( 'KEYPAD ASTERIX', 0x55 ), ( 'KEYPAD ASTERISK', 0x55 ), ( 'P-', 0x56 ), ( 'KEYPAD MINUS', 0x56 ), @@ -388,11 +388,11 @@ ( 'PASTE', 0x7D ), ( 'FIND', 0x7E ), ( 'MUTE', 0x7F ), - ( 'VOLUMEUP', 0x80 ), - ( 'VOLUMEDOWN', 0x81 ), - ( 'CAPSTOGGLELOCK', 0x82 ), - ( 'NUMTOGGLELOCK', 0x83 ), - ( 'SCROLLTOGGLELOCK', 0x84 ), + ( 'VOLUMEUP', 0x80 ), ( 'VOLUME UP', 0x80 ), + ( 'VOLUMEDOWN', 0x81 ), ( 'VOLUME DOWN', 0x81 ), + ( 'CAPSTOGGLELOCK', 0x82 ), ( 'CAPS TOGGLE LOCK', 0x82 ), + ( 'NUMTOGGLELOCK', 0x83 ), ( 'NUM TOGGLE LOCK', 0x83 ), + ( 'SCROLLTOGGLELOCK', 0x84 ), ( 'SCROLL TOGGLE LOCK', 0x84 ), ( 'P,', 0x85 ), ( 'KEYPAD AS400 EQUAL', 0x86 ), ( 'INTER1', 0x87 ), ( 'KANJI1', 0x87 ), @@ -401,20 +401,20 @@ ( 'INTER4', 0x8A ), ( 'KANJI4', 0x8A ), ( 'HENKAN', 0x8A ), ( 'INTER5', 0x8B ), ( 'KANJI5', 0x8B ), ( 'MUHENKAN', 0x8B ), ( 'INTER6', 0x8C ), ( 'KANJI6', 0x8C ), - ( 'INTER7', 0x8D ), ( 'KANJI7', 0x8D ), ( 'BYTETOGGLE', 0x8D ), + ( 'INTER7', 0x8D ), ( 'KANJI7', 0x8D ), ( 'BYTETOGGLE', 0x8D ), ( 'BYTE TOGGLE', 0x8D ), ( 'INTER8', 0x8E ), ( 'KANJI8', 0x8E ), ( 'INTER9', 0x8F ), ( 'KANJI9', 0x8F ), - ( 'LANG1', 0x90 ), ( 'HANGULENGLISH', 0x90 ), + ( 'LANG1', 0x90 ), ( 'HANGULENGLISH', 0x90 ), ( 'HANGUL ENGLISH', 0x90 ), ( 'LANG2', 0x91 ), ( 'HANJA', 0x91 ), ( 'EISU', 0x91 ), ( 'LANG3', 0x92 ), ( 'KATAKANA', 0x92 ), ( 'LANG4', 0x93 ), ( 'HIRAGANA', 0x93 ), - ( 'LANG5', 0x94 ), ( 'ZENKAKUHANKAKU', 0x94 ), + ( 'LANG5', 0x94 ), ( 'ZENKAKUHANKAKU', 0x94 ), ( 'ZENKAKU HANKAKU', 0x94 ), ( 'LANG6', 0x95 ), ( 'LANG7', 0x96 ), ( 'LANG8', 0x97 ), ( 'LANG9', 0x98 ), - ( 'ALTERASE', 0x99 ), - ( 'SYSREQATT', 0x9A ), + ( 'ALTERASE', 0x99 ), ( 'ALT ERASE', 0x99 ), + ( 'SYSREQATT', 0x9A ), ( 'SYSREQ', 0x9A ), ( 'SYSTEM REQUEST', 0x9A ), ( 'CANCEL', 0x9B ), ( 'CLEAR', 0x9C ), ( 'PRIOR', 0x9D ), @@ -422,16 +422,16 @@ ( 'SEP', 0x9F ), ( 'SEPARATOR', 0x9F ), ( 'OUT', 0xA0 ), ( 'OPER', 0xA1 ), - ( 'CLEAR_AGAIN', 0xA2 ), - ( 'CRSEL_PROPS', 0xA3 ), + ( 'CLEAR AGAIN', 0xA2 ), + ( 'CRSEL PROPS', 0xA3 ), ( 'EXSEL', 0xA4 ), ( 'P00', 0xB0 ), ( 'KEYPAD 00', 0xB0 ), ( 'P000', 0xB1 ), ( 'KEYPAD 000', 0xB1 ), - ( '1000SEP', 0xB2 ), ( 'THOUSANDSEPARATOR', 0xB2 ), - ( 'DECIMALSEP', 0xB3 ), ( 'DECIMALSEPARATOR', 0xB3 ), - ( 'CURRENCY', 0xB4 ), ( 'CURRENCYUNIT', 0xB4 ), - ( 'CURRENCYSUB', 0xB5 ), ( 'CURRENCYSUBUNIT', 0xB5 ), + ( '1000SEP', 0xB2 ), ( 'THOUSANDSEPARATOR', 0xB2 ), ( 'THOUSAND SEPARATOR', 0xB2 ), + ( 'DECIMALSEP', 0xB3 ), ( 'DECIMALSEPARATOR', 0xB3 ), ( 'DECIMAL SEPARATOR', 0xB3 ), + ( 'CURRENCY', 0xB4 ), ( 'CURRENCYUNIT', 0xB4 ), ( 'CURRENCY UNIT', 0xB4 ), + ( 'CURRENCYSUB', 0xB5 ), ( 'CURRENCYSUBUNIT', 0xB5 ), ( 'CURRENCY SUB UNIT', 0xB5 ), ( 'P(', 0xB6 ), ( 'KEYPAD LEFT PARENTHESES', 0xB6 ), ( 'P)', 0xB7 ), ( 'KEYPAD RIGHT PARENTHESES', 0xB7 ), ( 'P{', 0xB8 ), ( 'KEYPAD LEFT BRACE', 0xB8 ), @@ -447,40 +447,40 @@ ( 'PXOR', 0xC2 ), ( 'KEYPAD XOR', 0xC2 ), ( 'P^', 0xC3 ), ( 'KEYPAD CHEVRON', 0xC3 ), ( 'P%', 0xC4 ), ( 'KEYPAD PERCENT', 0xC4 ), - ( 'P<', 0xC5 ), ( 'KEYPAD LESSTHAN', 0xC5 ), - ( 'P>', 0xC6 ), ( 'KEYPAD GREATERTHAN', 0xC6 ), - ( 'P&', 0xC7 ), ( 'KEYPAD BITAND', 0xC7 ), + ( 'P<', 0xC5 ), ( 'KEYPAD LESSTHAN', 0xC5 ), ( 'KEYPAD LESS THAN', 0xC5 ), + ( 'P>', 0xC6 ), ( 'KEYPAD GREATERTHAN', 0xC6 ), ( 'KEYPAD GREATER THAN', 0xC6 ), + ( 'P&', 0xC7 ), ( 'KEYPAD BITAND', 0xC7 ), ( 'KEYPAD BIT AND', 0xC7 ), ( 'P&&', 0xC8 ), ( 'KEYPAD AND', 0xC8 ), - ( 'P|', 0xC9 ), ( 'KEYPAD BITOR', 0xC9 ), + ( 'P|', 0xC9 ), ( 'KEYPAD BITOR', 0xC9 ), ( 'KEYPAD BIT OR', 0xC9 ), ( 'P||', 0xCA ), ( 'KEYPAD OR', 0xCA ), ( 'P:', 0xCB ), ( 'KEYPAD COLON', 0xCB ), ( 'P#', 0xCC ), ( 'KEYPAD NUMBER', 0xCC ), ( 'KEYPAD HASH', 0xCC ), ( 'PSPACE', 0xCD ), ( 'KEYPAD SPACE', 0xCD ), ( 'P@', 0xCE ), ( 'KEYPAD AT', 0xCE ), ( 'P!', 0xCF ), ( 'KEYPAD EXCLAIM', 0xCF ), - ( 'PMEMSTORE', 0xD0 ), ( 'KEYPAD MEMSTORE', 0xD0 ), - ( 'PMEMRECALL', 0xD1 ), ( 'KEYPAD MEMRECALL', 0xD1 ), - ( 'PMEMCLEAR', 0xD2 ), ( 'KEYPAD MEMCLEAR', 0xD2 ), - ( 'PMEMADD', 0xD3 ), ( 'KEYPAD MEMADD', 0xD3 ), - ( 'PMEMSUB', 0xD4 ), ( 'KEYPAD MEMSUB', 0xD4 ), - ( 'PMEMMULT', 0xD5 ), ( 'KEYPAD MEMMULT', 0xD5 ), - ( 'PMEMDIV', 0xD6 ), ( 'KEYPAD MEMDIV', 0xD6 ), - ( 'P+/-', 0xD7 ), ( 'KEYPAD PLUSMINUS', 0xD7 ), + ( 'PMEMSTORE', 0xD0 ), ( 'KEYPAD MEMSTORE', 0xD0 ), ( 'KEYPAD MEMORY STORE', 0xD0 ), + ( 'PMEMRECALL', 0xD1 ), ( 'KEYPAD MEMRECALL', 0xD1 ), ( 'KEYPAD MEMORY RECALL', 0xD1 ), + ( 'PMEMCLEAR', 0xD2 ), ( 'KEYPAD MEMCLEAR', 0xD2 ), ( 'KEYPAD MEMORY CLEAR', 0xD2 ), + ( 'PMEMADD', 0xD3 ), ( 'KEYPAD MEMADD', 0xD3 ), ( 'KEYPAD MEMORY ADD', 0xD3 ), + ( 'PMEMSUB', 0xD4 ), ( 'KEYPAD MEMSUB', 0xD4 ), ( 'KEYPAD MEMORY SUB', 0xD4 ), + ( 'PMEMMULT', 0xD5 ), ( 'KEYPAD MEMMULT', 0xD5 ), ( 'KEYPAD MEMORY MULTIPLY', 0xD5 ), + ( 'PMEMDIV', 0xD6 ), ( 'KEYPAD MEMDIV', 0xD6 ), ( 'KEYPAD MEMORY DIVIDE', 0xD6 ), + ( 'P+/-', 0xD7 ), ( 'KEYPAD PLUSMINUS', 0xD7 ), ( 'KEYPAD PLUS MINUS', 0xD7 ), ( 'PCLEAR', 0xD8 ), ( 'KEYPAD CLEAR', 0xD8 ), - ( 'PCLEARENTRY', 0xD9 ), ( 'KEYPAD CLEARENTRY', 0xD9 ), + ( 'PCLEARENTRY', 0xD9 ), ( 'KEYPAD CLEARENTRY', 0xD9 ), ( 'KEYPAD CLEAR ENTRY', 0xD9 ), ( 'PBINARY', 0xDA ), ( 'KEYPAD BINARY', 0xDA ), ( 'POCTAL', 0xDB ), ( 'KEYPAD OCTAL', 0xDB ), ( 'PDECIMAL', 0xDC ), ( 'KEYPAD DECIMAL', 0xDC ), ( 'PHEX', 0xDD ), ( 'KEYPAD HEX', 0xDD ), - ( 'LCTRL', 0xE0 ), ( 'LEFT CTRL', 0xE0 ), ( 'CTRL', 0xE0 ), + ( 'LCTRL', 0xE0 ), ( 'LEFT CTRL', 0xE0 ), ( 'CTRL', 0xE0 ), ( 'CONTROL', 0xE0 ), ( 'LEFT CONTROL', 0xE0 ), ( 'LSHIFT', 0xE1 ), ( 'LEFT SHIFT', 0xE1 ), ( 'SHIFT', 0xE1 ), - ( 'LALT', 0xE2 ), ( 'LEFT ALT', 0xE2 ), ( 'ALT', 0xE2 ), - ( 'LGUI', 0xE3 ), ( 'LEFT GUI', 0xE3 ), ( 'GUI', 0xE3 ), - ( 'RCTRL', 0xE4 ), ( 'RIGHT CTRL', 0xE4 ), + ( 'LALT', 0xE2 ), ( 'LEFT ALT', 0xE2 ), ( 'ALT', 0xE2 ), ( 'ALTERNATE', 0xE2 ), ( 'LEFT ALTERNATE', 0xE2 ), + ( 'LGUI', 0xE3 ), ( 'LEFT GUI', 0xE3 ), ( 'GUI', 0xE3 ), ( 'SUPER', 0xE3 ), ( 'LEFT SUPER', 0xE3 ), ( 'WINDOWS', 0xE3 ), ( 'LEFT WINDOWS', 0xE3 ), ( 'WIN', 0xE3 ), ( 'LEFT WIN', 0xE3 ), + ( 'RCTRL', 0xE4 ), ( 'RIGHT CTRL', 0xE4 ), ( 'RIGHT CONTROL', 0xE4 ), ( 'RSHIFT', 0xE5 ), ( 'RIGHT SHIFT', 0xE5 ), - ( 'RALT', 0xE6 ), ( 'RIGHT ALT', 0xE6 ), - ( 'RGUI', 0xE7 ), ( 'RIGHT GUI', 0xE7 ), + ( 'RALT', 0xE6 ), ( 'RIGHT ALT', 0xE6 ), ( 'RIGHT ALTERNATE', 0xE6 ), + ( 'RGUI', 0xE7 ), ( 'RIGHT GUI', 0xE7 ), ( 'RIGHT SUPER', 0xE7 ), ( 'RIGHT WINDOWS', 0xE7 ), ( 'RIGHT WIN', 0xE7 ), ( 'FUN1', 0xF0 ), ( 'FUNCTION1', 0xF0 ), ( 'FUN', 0xF0 ), ( 'FUN2', 0xF1 ), ( 'FUNCTION2', 0xF1 ),