Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 14:22:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 939006 part.5 Sort out key names in UI Keys section r=smaug

Browse Source
This commit is contained in:
Masayuki Nakano 2014-06-04 21:43:43 +09:00
parent c063f0a8a9
commit 0e77f7e04f
2 changed files with 76 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dom/events/KeyNameList.h
View File

@ -84,7 +84,25 @@ DEFINE_KEYNAME_WITH_SAME_NAME(Paste)
// DEFINE_KEYNAME_WITH_SAME_NAME(Redo)
DEFINE_KEYNAME_WITH_SAME_NAME(Undo)
/******************************************************************************
* UI Keys
*****************************************************************************/
DEFINE_KEYNAME_WITH_SAME_NAME(Accept)
// DEFINE_KEYNAME_WITH_SAME_NAME(Again)
DEFINE_KEYNAME_WITH_SAME_NAME(Attn)
DEFINE_KEYNAME_WITH_SAME_NAME(Cancel)
DEFINE_KEYNAME_WITH_SAME_NAME(Menu) // Rename to ContextMenu
DEFINE_KEYNAME_WITH_SAME_NAME(Esc) // Rename to Escape
DEFINE_KEYNAME_WITH_SAME_NAME(Execute)
DEFINE_KEYNAME_WITH_SAME_NAME(Find)
DEFINE_KEYNAME_WITH_SAME_NAME(Help)
DEFINE_KEYNAME_WITH_SAME_NAME(Pause)
DEFINE_KEYNAME_WITH_SAME_NAME(Play)
// DEFINE_KEYNAME_WITH_SAME_NAME(Props)
DEFINE_KEYNAME_WITH_SAME_NAME(Select)
// DEFINE_KEYNAME_WITH_SAME_NAME(ZoomIn)
// DEFINE_KEYNAME_WITH_SAME_NAME(ZoomOut)
DEFINE_KEYNAME_WITH_SAME_NAME(Apps)
DEFINE_KEYNAME_WITH_SAME_NAME(F1)
DEFINE_KEYNAME_WITH_SAME_NAME(F2)
@ -141,22 +159,11 @@ DEFINE_KEYNAME_WITH_SAME_NAME(LaunchApplication17)
DEFINE_KEYNAME_WITH_SAME_NAME(LaunchApplication18)
DEFINE_KEYNAME_WITH_SAME_NAME(LaunchMail)
DEFINE_KEYNAME_WITH_SAME_NAME(List)
DEFINE_KEYNAME_WITH_SAME_NAME(Props)
DEFINE_KEYNAME_WITH_SAME_NAME(Soft1)
DEFINE_KEYNAME_WITH_SAME_NAME(Soft2)
DEFINE_KEYNAME_WITH_SAME_NAME(Soft3)
DEFINE_KEYNAME_WITH_SAME_NAME(Soft4)
DEFINE_KEYNAME_WITH_SAME_NAME(Accept)
DEFINE_KEYNAME_WITH_SAME_NAME(Again)
DEFINE_KEYNAME_WITH_SAME_NAME(Find)
DEFINE_KEYNAME_WITH_SAME_NAME(Help)
DEFINE_KEYNAME_WITH_SAME_NAME(Info)
DEFINE_KEYNAME_WITH_SAME_NAME(Menu)
DEFINE_KEYNAME_WITH_SAME_NAME(Pause)
DEFINE_KEYNAME_WITH_SAME_NAME(Play)
DEFINE_KEYNAME_WITH_SAME_NAME(Execute)
DEFINE_KEYNAME_WITH_SAME_NAME(Cancel)
DEFINE_KEYNAME_WITH_SAME_NAME(Esc)
DEFINE_KEYNAME_WITH_SAME_NAME(Exit)
DEFINE_KEYNAME_WITH_SAME_NAME(Zoom)
DEFINE_KEYNAME_WITH_SAME_NAME(BrightnessDown)
@ -176,7 +183,6 @@ DEFINE_KEYNAME_WITH_SAME_NAME(UpLeft)
DEFINE_KEYNAME_WITH_SAME_NAME(UpRight)
DEFINE_KEYNAME_WITH_SAME_NAME(DownLeft)
DEFINE_KEYNAME_WITH_SAME_NAME(DownRight)
DEFINE_KEYNAME_WITH_SAME_NAME(Select)
DEFINE_KEYNAME_WITH_SAME_NAME(DeadGrave)
DEFINE_KEYNAME_WITH_SAME_NAME(DeadAcute)
DEFINE_KEYNAME_WITH_SAME_NAME(DeadCircumflex)

117
widget/shared/NativeKeyToDOMKeyName.h
View File

@ -322,11 +322,69 @@ KEY_MAP_QT (Paste, Qt::Key_Paste)
// Undo
KEY_MAP_GTK (Undo, GDK_Undo)
/******************************************************************************
* UI Keys
******************************************************************************/
// Accept
KEY_MAP_WIN (Accept, VK_ACCEPT)
KEY_MAP_ANDROID (Accept, AKEYCODE_DPAD_CENTER)
// Attn
KEY_MAP_WIN_OTH (Attn, VK_ATTN) // not valid with Japanese keyboard layout
KEY_MAP_GTK (Attn, GDK_3270_Attn) // legacy IBM keyboard layout
// Cancel
KEY_MAP_WIN (Cancel, VK_CANCEL)
KEY_MAP_GTK (Cancel, GDK_Cancel)
KEY_MAP_QT (Cancel, Qt::Key_Cancel)
// Menu
KEY_MAP_WIN (Menu, VK_APPS)
KEY_MAP_COCOA (Menu, kVK_PC_ContextMenu)
KEY_MAP_GTK (Menu, GDK_Menu)
KEY_MAP_QT (Menu, Qt::Key_Menu)
KEY_MAP_ANDROID (Menu, AKEYCODE_MENU)
// Esc
KEY_MAP_WIN (Esc, VK_ESCAPE)
KEY_MAP_COCOA (Esc, kVK_Escape)
KEY_MAP_GTK (Esc, GDK_Escape)
KEY_MAP_QT (Esc, Qt::Key_Escape)
KEY_MAP_ANDROID (Esc, AKEYCODE_ESCAPE)
// Execute
KEY_MAP_WIN (Execute, VK_EXECUTE)
KEY_MAP_GTK (Execute, GDK_Execute)
KEY_MAP_QT (Execute, Qt::Key_Execute)
// Find
KEY_MAP_GTK (Find, GDK_Find)
// Help
KEY_MAP_WIN (Help, VK_HELP)
KEY_MAP_COCOA (Help, kVK_Help)
KEY_MAP_GTK (Help, GDK_Help)
KEY_MAP_QT (Help, Qt::Key_Help)
KEY_MAP_ANDROID (Help, AKEYCODE_ASSIST)
// Pause
KEY_MAP_WIN (Pause, VK_PAUSE)
KEY_MAP_GTK (Pause, GDK_Pause)
// Break is typically mapped to Alt+Pause or Ctrl+Pause on GTK.
KEY_MAP_GTK (Pause, GDK_Break)
KEY_MAP_QT (Pause, Qt::Key_Pause)
KEY_MAP_ANDROID (Pause, AKEYCODE_BREAK)
// Play
KEY_MAP_WIN (Play, VK_PLAY)
KEY_MAP_GTK (Play, GDK_3270_Play) // legacy IBM keyboard layout
KEY_MAP_QT (Play, Qt::Key_Play)
// Select
KEY_MAP_WIN (Select, VK_SELECT)
KEY_MAP_GTK (Select, GDK_Select)
// Apps
KEY_MAP_ANDROID (Apps, AKEYCODE_APP_SWITCH)
@ -610,8 +668,6 @@ KEY_MAP_ANDROID (LaunchMail, AKEYCODE_ENVELOPE)
// List
// Props
// Soft1
// Soft2
@ -620,62 +676,9 @@ KEY_MAP_ANDROID (LaunchMail, AKEYCODE_ENVELOPE)
// Soft4
// Accept
KEY_MAP_WIN (Accept, VK_ACCEPT)
KEY_MAP_ANDROID (Accept, AKEYCODE_DPAD_CENTER)
// Again
// Find
KEY_MAP_GTK (Find, GDK_Find)
// Help
KEY_MAP_WIN (Help, VK_HELP)
KEY_MAP_COCOA (Help, kVK_Help)
KEY_MAP_GTK (Help, GDK_Help)
KEY_MAP_QT (Help, Qt::Key_Help)
KEY_MAP_ANDROID (Help, AKEYCODE_ASSIST)
// Info
KEY_MAP_ANDROID (Info, AKEYCODE_INFO)
// Menu
KEY_MAP_WIN (Menu, VK_APPS)
KEY_MAP_COCOA (Menu, kVK_PC_ContextMenu)
KEY_MAP_GTK (Menu, GDK_Menu)
KEY_MAP_QT (Menu, Qt::Key_Menu)
KEY_MAP_ANDROID (Menu, AKEYCODE_MENU)
// Pause
KEY_MAP_WIN (Pause, VK_PAUSE)
KEY_MAP_GTK (Pause, GDK_Pause)
// Break is typically mapped to Alt+Pause or Ctrl+Pause on GTK.
KEY_MAP_GTK (Pause, GDK_Break)
KEY_MAP_QT (Pause, Qt::Key_Pause)
KEY_MAP_ANDROID (Pause, AKEYCODE_BREAK)
// Play
KEY_MAP_WIN (Play, VK_PLAY)
KEY_MAP_GTK (Play, GDK_3270_Play) // legacy IBM keyboard layout
KEY_MAP_QT (Play, Qt::Key_Play)
// Execute
KEY_MAP_WIN (Execute, VK_EXECUTE)
KEY_MAP_GTK (Execute, GDK_Execute)
KEY_MAP_QT (Execute, Qt::Key_Execute)
// Cancel
KEY_MAP_WIN (Cancel, VK_CANCEL)
KEY_MAP_GTK (Cancel, GDK_Cancel)
KEY_MAP_QT (Cancel, Qt::Key_Cancel)
// Esc
KEY_MAP_WIN (Esc, VK_ESCAPE)
KEY_MAP_COCOA (Esc, kVK_Escape)
KEY_MAP_GTK (Esc, GDK_Escape)
KEY_MAP_QT (Esc, Qt::Key_Escape)
KEY_MAP_ANDROID (Esc, AKEYCODE_ESCAPE)
// Exit
KEY_MAP_ANDROID (Exit, AKEYCODE_HOME)
@ -762,10 +765,6 @@ KEY_MAP_ANDROID (BrowserForward, AKEYCODE_FORWARD)
// DownRight
// Select
KEY_MAP_WIN (Select, VK_SELECT)
KEY_MAP_GTK (Select, GDK_Select)
// DeadGrave
KEY_MAP_GTK (DeadGrave, GDK_dead_grave)
KEY_MAP_QT (DeadGrave, Qt::Key_Dead_Grave)