Merge pull request #98 from grayjay/windows-server-keys

Update key names on Windows server.

server/windows/aenea-windows-server/src/Windows.hsc

@@ -283,7 +283,7 @@ keys = [ key_ALT
        , key_QUESTION ]
 
 key_ALT = Key W.vK_MENU ["alt"] Nothing False
-key_CONTROL = Key W.vK_CONTROL ["ctrl", "control"] Nothing False
+key_CONTROL = Key W.vK_CONTROL ["ctrl", "control", "Control_R"] Nothing False
 key_SHIFT = Key W.vK_SHIFT ["shift"] Nothing False
 key_0 = Key 0x30 ["0"] (Just '0') False
 key_1 = Key 0x31 ["1"] (Just '1') False
@@ -406,35 +406,35 @@ key_F21 = Key W.vK_F21 ["f21"] Nothing False
 key_F22 = Key W.vK_F22 ["f22"] Nothing False
 key_F23 = Key W.vK_F23 ["f23"] Nothing False
 key_F24 = Key W.vK_F24 ["f24"] Nothing False
-key_EXCLAMATION = Key (keyCode key_1) ["exclamation", "bang"] (Just '!') True
+key_EXCLAMATION = Key (keyCode key_1) ["exclamation", "bang", "exclam"] (Just '!') True
 key_AT = Key (keyCode key_2) ["at"] (Just '@') True
-key_HASH = Key (keyCode key_3) ["hash"] (Just '#') True
+key_HASH = Key (keyCode key_3) ["hash", "numbersign"] (Just '#') True
 key_DOLLAR = Key (keyCode key_4) ["dollar"] (Just '$') True
 key_PERCENT = Key (keyCode key_5) ["percent"] (Just '%') True
-key_CARET = Key (keyCode key_6) ["caret"] (Just '^') True
+key_CARET = Key (keyCode key_6) ["caret", "asciicircum"] (Just '^') True
 key_AMPERSAND = Key (keyCode key_7) ["ampersand", "and"] (Just '&') True
 key_ASTERISK = Key (keyCode key_8) ["asterisk", "star"] (Just '*') True
-key_LEFT_PAREN = Key (keyCode key_9) ["leftparen", "lparen"] (Just '(') True
-key_RIGHT_PAREN = Key (keyCode key_0) ["rightparen", "rparen"] (Just ')') True
+key_LEFT_PAREN = Key (keyCode key_9) ["leftparen", "lparen", "parenleft"] (Just '(') True
+key_RIGHT_PAREN = Key (keyCode key_0) ["rightparen", "rparen", "parenright"] (Just ')') True
 key_MINUS = Key 0xBD ["hyphen", "minus"] (Just '-') False
 key_UNDERSCORE = Key 0xBD ["underscore"] (Just '_') True
 key_PLUS = Key 0xBB ["plus"] (Just '+') True
 key_EQUAL = Key 0xBB ["equal", "equals"] (Just '=') False
-key_BACKTICK = Key (#const VK_OEM_3) ["backtick"] (Just '`') False
+key_BACKTICK = Key (#const VK_OEM_3) ["backtick", "quoteleft"] (Just '`') False
 key_TILDE = Key (#const VK_OEM_3) ["tilde"] (Just '~') True
-key_LEFT_BRACKET = Key (#const VK_OEM_4) ["leftbracket", "lbracket"] (Just '[') False
-key_RIGHT_BRACKET = Key (#const VK_OEM_6) ["rightbracket", "rbracket"] (Just ']') False
-key_LEFT_BRACE = Key (#const VK_OEM_4) ["leftbrace", "lbrace"] (Just '{') True
-key_RIGHT_BRACE = Key (#const VK_OEM_6) ["rightbrace", "rbrace"] (Just '}') True
+key_LEFT_BRACKET = Key (#const VK_OEM_4) ["leftbracket", "lbracket", "bracketleft"] (Just '[') False
+key_RIGHT_BRACKET = Key (#const VK_OEM_6) ["rightbracket", "rbracket", "bracketright"] (Just ']') False
+key_LEFT_BRACE = Key (#const VK_OEM_4) ["leftbrace", "lbrace", "braceleft"] (Just '{') True
+key_RIGHT_BRACE = Key (#const VK_OEM_6) ["rightbrace", "rbrace", "braceright"] (Just '}') True
 key_BACKSLASH = Key (#const VK_OEM_5) ["backslash"] (Just '\\') False
 key_BAR = Key (#const VK_OEM_5) ["bar"] (Just '|') True
 key_COLON = Key (#const VK_OEM_1) ["colon"] (Just ':') True
 key_SEMICOLON = Key (#const VK_OEM_1) ["semicolon"] (Just ';') False
 key_APOSTROPHE = Key (#const VK_OEM_7) ["apostrophe", "singlequote", "squote"] (Just '\'') False
 key_QUOTE = Key (#const VK_OEM_7) ["quote", "doublequote", "dquote"] (Just '"') True
 key_COMMA = Key 0xBC ["comma"] (Just ',') False
-key_DOT = Key 0xBE ["dot"] (Just '.') False
-key_LESS_THAN = Key 0xBC ["lessthan", "leftangle", "langle"] (Just '<') True
-key_GREATER_THAN = Key 0xBE ["greaterthan", "rightangle", "rangle"] (Just '>') True
+key_DOT = Key 0xBE ["dot", "period"] (Just '.') False
+key_LESS_THAN = Key 0xBC ["lessthan", "leftangle", "langle", "less"] (Just '<') True
+key_GREATER_THAN = Key 0xBE ["greaterthan", "rightangle", "rangle", "greater"] (Just '>') True
 key_SLASH = Key (#const VK_OEM_2) ["slash"] (Just '/') False
 key_QUESTION = Key (#const VK_OEM_2) ["question"] (Just '?') True