mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 764285 part.2 Use naming rules of virtual keycodes in SDK for defining undefined keycode r=smichaud

This commit is contained in:
Masayuki Nakano 2012-07-04 14:59:50 +09:00
Родитель d8b32fc85d
Коммит a010d3eb72
2 изменённых файлов: 33 добавлений и 29 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

14
widget/cocoa/TextInputHandler.h
Просмотреть файл

@ -28,13 +28,17 @@ namespace widget {
// Key code constants
enum
{
kRCommandKeyCode = 0x36, // right command key
kVK_RightCommand = 0x36, // right command key
kPrintScreenKeyCode = kVK_F13,
kScrollLockKeyCode = kVK_F14,
kPauseKeyCode = kVK_F15,
kVK_PC_PrintScreen = kVK_F13,
kVK_PC_ScrollLock = kVK_F14,
kVK_PC_Pause = kVK_F15,
kPowerbookEnterKeyCode = 0x34, // Enter on Powerbook's keyboard is different
kVK_PC_Insert = kVK_Help,
kVK_PC_Backspace = kVK_Delete,
kVK_PC_Delete = kVK_ForwardDelete,
kVK_Powerbook_KeypadEnter = 0x34 // Enter on Powerbook's keyboard is different
};
/**

48
widget/cocoa/TextInputHandler.mm
Просмотреть файл

@ -58,7 +58,7 @@ GetKeyNameForNativeKeyCode(unsigned short aNativeKeyCode)
{
switch (aNativeKeyCode) {
case kVK_Escape: return "Escape";
case kRCommandKeyCode: return "Right-Command";
case kVK_RightCommand: return "Right-Command";
case kVK_Command: return "Command";
case kVK_Shift: return "Shift";
case kVK_CapsLock: return "CapsLock";
@ -104,12 +104,12 @@ GetKeyNameForNativeKeyCode(unsigned short aNativeKeyCode)
case kVK_ANSI_KeypadEquals: return "NumPad-=";
case kVK_ANSI_KeypadEnter: return "NumPad-Enter";
case kVK_Return: return "Return";
case kPowerbookEnterKeyCode: return "NumPad-EnterOnPowerBook";
case kVK_Powerbook_KeypadEnter: return "NumPad-EnterOnPowerBook";
case kVK_Help: return "Insert/Help";
case kVK_ForwardDelete: return "Delete";
case kVK_PC_Insert: return "Insert/Help";
case kVK_PC_Delete: return "Delete";
case kVK_Tab: return "Tab";
case kVK_Delete: return "Backspace";
case kVK_PC_Backspace: return "Backspace";
case kVK_Home: return "Home";
case kVK_End: return "End";
case kVK_PageUp: return "PageUp";
@ -719,7 +719,7 @@ TISInputSourceWrapper::InitKeyEvent(NSEvent *aNativeKeyEvent,
aKeyEvent.location = nsIDOMKeyEvent::DOM_KEY_LOCATION_LEFT;
break;
case kRCommandKeyCode:
case kVK_RightCommand:
case kVK_RightShift:
case kVK_RightOption:
case kVK_RightControl:
@ -743,7 +743,7 @@ TISInputSourceWrapper::InitKeyEvent(NSEvent *aNativeKeyEvent,
case kVK_ANSI_KeypadDivide:
case kVK_ANSI_KeypadEquals:
case kVK_ANSI_KeypadEnter:
case kPowerbookEnterKeyCode:
case kVK_Powerbook_KeypadEnter:
aKeyEvent.location = nsIDOMKeyEvent::DOM_KEY_LOCATION_NUMPAD;
break;
@ -1016,7 +1016,7 @@ TISInputSourceWrapper::ComputeGeckoKeyCode(UInt32 aNativeKeyCode,
case kVK_Escape: return NS_VK_ESCAPE;
// modifiers
case kRCommandKeyCode:
case kVK_RightCommand:
case kVK_Command: return NS_VK_META;
case kVK_RightShift:
case kVK_Shift: return NS_VK_SHIFT;
@ -1049,9 +1049,9 @@ TISInputSourceWrapper::ComputeGeckoKeyCode(UInt32 aNativeKeyCode,
case kVK_F18: return NS_VK_F18;
case kVK_F19: return NS_VK_F19;
case kPauseKeyCode: return NS_VK_PAUSE;
case kScrollLockKeyCode: return NS_VK_SCROLL_LOCK;
case kPrintScreenKeyCode: return NS_VK_PRINTSCREEN;
case kVK_PC_Pause: return NS_VK_PAUSE;
case kVK_PC_ScrollLock: return NS_VK_SCROLL_LOCK;
case kVK_PC_PrintScreen: return NS_VK_PRINTSCREEN;
// keypad
case kVK_ANSI_Keypad0: return NS_VK_NUMPAD0;
@ -1076,10 +1076,10 @@ TISInputSourceWrapper::ComputeGeckoKeyCode(UInt32 aNativeKeyCode,
case kVK_JIS_Kana: return NS_VK_KANA;
// these may clash with forward delete and help
case kVK_Help: return NS_VK_INSERT;
case kVK_ForwardDelete: return NS_VK_DELETE;
case kVK_PC_Insert: return NS_VK_INSERT;
case kVK_PC_Delete: return NS_VK_DELETE;
case kVK_Delete: return NS_VK_BACK;
case kVK_PC_Backspace: return NS_VK_BACK;
case kVK_Tab: return NS_VK_TAB;
case kVK_Home: return NS_VK_HOME;
@ -1106,7 +1106,7 @@ TISInputSourceWrapper::ComputeGeckoKeyCode(UInt32 aNativeKeyCode,
case kVK_ANSI_KeypadEnter:
case kVK_Return:
case kPowerbookEnterKeyCode: return NS_VK_RETURN;
case kVK_Powerbook_KeypadEnter: return NS_VK_RETURN;
}
// If Cmd key is pressed, that causes switching keyboard layout temporarily.
@ -3883,7 +3883,7 @@ TextInputHandlerBase::IsSpecialGeckoKey(UInt32 aNativeKeyCode)
case kVK_Shift:
case kVK_RightShift:
case kVK_Command:
case kRCommandKeyCode:
case kVK_RightCommand:
case kVK_CapsLock:
case kVK_Control:
case kVK_RightControl:
@ -3904,18 +3904,18 @@ TextInputHandlerBase::IsSpecialGeckoKey(UInt32 aNativeKeyCode)
case kVK_F10:
case kVK_F11:
case kVK_F12:
case kPauseKeyCode:
case kScrollLockKeyCode:
case kPrintScreenKeyCode:
case kVK_PC_Pause:
case kVK_PC_ScrollLock:
case kVK_PC_PrintScreen:
case kVK_F16:
case kVK_F17:
case kVK_F18:
case kVK_F19:
case kVK_Help:
case kVK_ForwardDelete:
case kVK_PC_Insert:
case kVK_PC_Delete:
case kVK_Tab:
case kVK_Delete:
case kVK_PC_Backspace:
case kVK_JIS_Eisu:
case kVK_JIS_Kana:
@ -3930,7 +3930,7 @@ TextInputHandlerBase::IsSpecialGeckoKey(UInt32 aNativeKeyCode)
case kVK_DownArrow:
case kVK_Return:
case kVK_ANSI_KeypadEnter:
case kPowerbookEnterKeyCode:
case kVK_Powerbook_KeypadEnter:
return true;
}
return false;
@ -3957,7 +3957,7 @@ TextInputHandlerBase::IsModifierKey(UInt32 aNativeKeyCode)
{
switch (aNativeKeyCode) {
case kVK_CapsLock:
case kRCommandKeyCode:
case kVK_RightCommand:
case kVK_Command:
case kVK_Shift:
case kVK_Option: