Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(25)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/events/keycodes/keyboard_code_conversion_mac.mm

Issue 809773006: MacViews: Intercept events for Menus (after AppKit has interpreted keystrokes) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@20141205-MacViews-AcceleratedWidget-PLUS-AddingLayers-fromcl-PLUS-bringup
Patch Set: A few more cleanups Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/events/keycodes/keyboard_code_conversion_mac.h ('k') | ui/events/test/cocoa_test_event_utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/keycodes/keyboard_code_conversion_mac.mm
diff --git a/ui/events/keycodes/keyboard_code_conversion_mac.mm b/ui/events/keycodes/keyboard_code_conversion_mac.mm
index 4d5cb1f7c4cefd0f74d7d20db402cbbd6580ea60..fbdae0158388d2305b9c6c9b75903652a0647393 100644
--- a/ui/events/keycodes/keyboard_code_conversion_mac.mm
+++ b/ui/events/keycodes/keyboard_code_conversion_mac.mm
@@ -203,114 +203,6 @@ const KeyCodeMap kKeyCodesMap[] = {
// A convenient array for getting symbol characters on the number keys.
const char kShiftCharsForNumberKeys[] = ")!@#$%^&*(";
-// Translates from character code to keyboard code.
-KeyboardCode KeyboardCodeFromCharCode(unichar charCode) {
- switch (charCode) {
- case 8: case 0x7F: return VKEY_BACK;
- case 9: return VKEY_TAB;
- case 0xD: case 3: return VKEY_RETURN;
- case 0x1B: return VKEY_ESCAPE;
- case ' ': return VKEY_SPACE;
- case NSHomeFunctionKey: return VKEY_HOME;
- case NSEndFunctionKey: return VKEY_END;
- case NSPageUpFunctionKey: return VKEY_PRIOR;
- case NSPageDownFunctionKey: return VKEY_NEXT;
- case NSUpArrowFunctionKey: return VKEY_UP;
- case NSDownArrowFunctionKey: return VKEY_DOWN;
- case NSLeftArrowFunctionKey: return VKEY_LEFT;
- case NSRightArrowFunctionKey: return VKEY_RIGHT;
- case NSDeleteFunctionKey: return VKEY_DELETE;
-
- case '0': case ')': return VKEY_0;
- case '1': case '!': return VKEY_1;
- case '2': case '@': return VKEY_2;
- case '3': case '#': return VKEY_3;
- case '4': case '$': return VKEY_4;
- case '5': case '%': return VKEY_5;
- case '6': case '^': return VKEY_6;
- case '7': case '&': return VKEY_7;
- case '8': case '*': return VKEY_8;
- case '9': case '(': return VKEY_9;
-
- case 'a': case 'A': return VKEY_A;
- case 'b': case 'B': return VKEY_B;
- case 'c': case 'C': return VKEY_C;
- case 'd': case 'D': return VKEY_D;
- case 'e': case 'E': return VKEY_E;
- case 'f': case 'F': return VKEY_F;
- case 'g': case 'G': return VKEY_G;
- case 'h': case 'H': return VKEY_H;
- case 'i': case 'I': return VKEY_I;
- case 'j': case 'J': return VKEY_J;
- case 'k': case 'K': return VKEY_K;
- case 'l': case 'L': return VKEY_L;
- case 'm': case 'M': return VKEY_M;
- case 'n': case 'N': return VKEY_N;
- case 'o': case 'O': return VKEY_O;
- case 'p': case 'P': return VKEY_P;
- case 'q': case 'Q': return VKEY_Q;
- case 'r': case 'R': return VKEY_R;
- case 's': case 'S': return VKEY_S;
- case 't': case 'T': return VKEY_T;
- case 'u': case 'U': return VKEY_U;
- case 'v': case 'V': return VKEY_V;
- case 'w': case 'W': return VKEY_W;
- case 'x': case 'X': return VKEY_X;
- case 'y': case 'Y': return VKEY_Y;
- case 'z': case 'Z': return VKEY_Z;
-
- case NSPauseFunctionKey: return VKEY_PAUSE;
- case NSSelectFunctionKey: return VKEY_SELECT;
- case NSPrintFunctionKey: return VKEY_PRINT;
- case NSExecuteFunctionKey: return VKEY_EXECUTE;
- case NSPrintScreenFunctionKey: return VKEY_SNAPSHOT;
- case NSInsertFunctionKey: return VKEY_INSERT;
- case NSHelpFunctionKey: return VKEY_INSERT;
-
- case NSF1FunctionKey: return VKEY_F1;
- case NSF2FunctionKey: return VKEY_F2;
- case NSF3FunctionKey: return VKEY_F3;
- case NSF4FunctionKey: return VKEY_F4;
- case NSF5FunctionKey: return VKEY_F5;
- case NSF6FunctionKey: return VKEY_F6;
- case NSF7FunctionKey: return VKEY_F7;
- case NSF8FunctionKey: return VKEY_F8;
- case NSF9FunctionKey: return VKEY_F9;
- case NSF10FunctionKey: return VKEY_F10;
- case NSF11FunctionKey: return VKEY_F11;
- case NSF12FunctionKey: return VKEY_F12;
- case NSF13FunctionKey: return VKEY_F13;
- case NSF14FunctionKey: return VKEY_F14;
- case NSF15FunctionKey: return VKEY_F15;
- case NSF16FunctionKey: return VKEY_F16;
- case NSF17FunctionKey: return VKEY_F17;
- case NSF18FunctionKey: return VKEY_F18;
- case NSF19FunctionKey: return VKEY_F19;
- case NSF20FunctionKey: return VKEY_F20;
-
- case NSF21FunctionKey: return VKEY_F21;
- case NSF22FunctionKey: return VKEY_F22;
- case NSF23FunctionKey: return VKEY_F23;
- case NSF24FunctionKey: return VKEY_F24;
- case NSScrollLockFunctionKey: return VKEY_SCROLL;
-
- // U.S. Specific mappings. Mileage may vary.
- case ';': case ':': return VKEY_OEM_1;
- case '=': case '+': return VKEY_OEM_PLUS;
- case ',': case '<': return VKEY_OEM_COMMA;
- case '-': case '_': return VKEY_OEM_MINUS;
- case '.': case '>': return VKEY_OEM_PERIOD;
- case '/': case '?': return VKEY_OEM_2;
- case '`': case '~': return VKEY_OEM_3;
- case '[': case '{': return VKEY_OEM_4;
- case '\\': case '|': return VKEY_OEM_5;
- case ']': case '}': return VKEY_OEM_6;
- case '\'': case '"': return VKEY_OEM_7;
- }
-
- return VKEY_UNKNOWN;
-}
-
KeyboardCode KeyboardCodeFromKeyCode(unsigned short keyCode) {
static const KeyboardCode kKeyboardCodes[] = {
/* 0 */ VKEY_A,
@@ -526,6 +418,114 @@ int MacKeyCodeForWindowsKeyCode(KeyboardCode keycode,
return macKeycode;
}
+// Translates from character code to keyboard code.
+KeyboardCode KeyboardCodeFromCharCode(unichar charCode) {
+ switch (charCode) {
+ case 8: case 0x7F: return VKEY_BACK;
+ case 9: return VKEY_TAB;
+ case 0xD: case 3: return VKEY_RETURN;
+ case 0x1B: return VKEY_ESCAPE;
+ case ' ': return VKEY_SPACE;
+ case NSHomeFunctionKey: return VKEY_HOME;
+ case NSEndFunctionKey: return VKEY_END;
+ case NSPageUpFunctionKey: return VKEY_PRIOR;
+ case NSPageDownFunctionKey: return VKEY_NEXT;
+ case NSUpArrowFunctionKey: return VKEY_UP;
+ case NSDownArrowFunctionKey: return VKEY_DOWN;
+ case NSLeftArrowFunctionKey: return VKEY_LEFT;
+ case NSRightArrowFunctionKey: return VKEY_RIGHT;
+ case NSDeleteFunctionKey: return VKEY_DELETE;
+
+ case '0': case ')': return VKEY_0;
+ case '1': case '!': return VKEY_1;
+ case '2': case '@': return VKEY_2;
+ case '3': case '#': return VKEY_3;
+ case '4': case '$': return VKEY_4;
+ case '5': case '%': return VKEY_5;
+ case '6': case '^': return VKEY_6;
+ case '7': case '&': return VKEY_7;
+ case '8': case '*': return VKEY_8;
+ case '9': case '(': return VKEY_9;
+
+ case 'a': case 'A': return VKEY_A;
+ case 'b': case 'B': return VKEY_B;
+ case 'c': case 'C': return VKEY_C;
+ case 'd': case 'D': return VKEY_D;
+ case 'e': case 'E': return VKEY_E;
+ case 'f': case 'F': return VKEY_F;
+ case 'g': case 'G': return VKEY_G;
+ case 'h': case 'H': return VKEY_H;
+ case 'i': case 'I': return VKEY_I;
+ case 'j': case 'J': return VKEY_J;
+ case 'k': case 'K': return VKEY_K;
+ case 'l': case 'L': return VKEY_L;
+ case 'm': case 'M': return VKEY_M;
+ case 'n': case 'N': return VKEY_N;
+ case 'o': case 'O': return VKEY_O;
+ case 'p': case 'P': return VKEY_P;
+ case 'q': case 'Q': return VKEY_Q;
+ case 'r': case 'R': return VKEY_R;
+ case 's': case 'S': return VKEY_S;
+ case 't': case 'T': return VKEY_T;
+ case 'u': case 'U': return VKEY_U;
+ case 'v': case 'V': return VKEY_V;
+ case 'w': case 'W': return VKEY_W;
+ case 'x': case 'X': return VKEY_X;
+ case 'y': case 'Y': return VKEY_Y;
+ case 'z': case 'Z': return VKEY_Z;
+
+ case NSPauseFunctionKey: return VKEY_PAUSE;
+ case NSSelectFunctionKey: return VKEY_SELECT;
+ case NSPrintFunctionKey: return VKEY_PRINT;
+ case NSExecuteFunctionKey: return VKEY_EXECUTE;
+ case NSPrintScreenFunctionKey: return VKEY_SNAPSHOT;
+ case NSInsertFunctionKey: return VKEY_INSERT;
+ case NSHelpFunctionKey: return VKEY_INSERT;
+
+ case NSF1FunctionKey: return VKEY_F1;
+ case NSF2FunctionKey: return VKEY_F2;
+ case NSF3FunctionKey: return VKEY_F3;
+ case NSF4FunctionKey: return VKEY_F4;
+ case NSF5FunctionKey: return VKEY_F5;
+ case NSF6FunctionKey: return VKEY_F6;
+ case NSF7FunctionKey: return VKEY_F7;
+ case NSF8FunctionKey: return VKEY_F8;
+ case NSF9FunctionKey: return VKEY_F9;
+ case NSF10FunctionKey: return VKEY_F10;
+ case NSF11FunctionKey: return VKEY_F11;
+ case NSF12FunctionKey: return VKEY_F12;
+ case NSF13FunctionKey: return VKEY_F13;
+ case NSF14FunctionKey: return VKEY_F14;
+ case NSF15FunctionKey: return VKEY_F15;
+ case NSF16FunctionKey: return VKEY_F16;
+ case NSF17FunctionKey: return VKEY_F17;
+ case NSF18FunctionKey: return VKEY_F18;
+ case NSF19FunctionKey: return VKEY_F19;
+ case NSF20FunctionKey: return VKEY_F20;
+
+ case NSF21FunctionKey: return VKEY_F21;
+ case NSF22FunctionKey: return VKEY_F22;
+ case NSF23FunctionKey: return VKEY_F23;
+ case NSF24FunctionKey: return VKEY_F24;
+ case NSScrollLockFunctionKey: return VKEY_SCROLL;
+
+ // U.S. Specific mappings. Mileage may vary.
+ case ';': case ':': return VKEY_OEM_1;
+ case '=': case '+': return VKEY_OEM_PLUS;
+ case ',': case '<': return VKEY_OEM_COMMA;
+ case '-': case '_': return VKEY_OEM_MINUS;
+ case '.': case '>': return VKEY_OEM_PERIOD;
+ case '/': case '?': return VKEY_OEM_2;
+ case '`': case '~': return VKEY_OEM_3;
+ case '[': case '{': return VKEY_OEM_4;
+ case '\\': case '|': return VKEY_OEM_5;
+ case ']': case '}': return VKEY_OEM_6;
+ case '\'': case '"': return VKEY_OEM_7;
+ }
+
+ return VKEY_UNKNOWN;
+}
+
KeyboardCode KeyboardCodeFromNSEvent(NSEvent* event) {
KeyboardCode code = VKEY_UNKNOWN;
« no previous file with comments | « ui/events/keycodes/keyboard_code_conversion_mac.h ('k') | ui/events/test/cocoa_test_event_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698