Bug 939006 part.5 Sort out key names in UI Keys section r=smaug
authorMasayuki Nakano <masayuki@d-toybox.com>
Wed, 04 Jun 2014 21:43:43 +0900
changeset 206912 6d7575761c43bdcb3271f8a316929d5eaa88a877
parent 206911 4d69c4b463a910790797e73f00dfce3a204d3861
child 206913 ee87f878d131dfc268b08f9cab45a48ed01e1aa6
push id494
push userraliiev@mozilla.com
push dateMon, 25 Aug 2014 18:42:16 +0000
treeherdermozilla-release@a3cc3e46b571 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug
bugs939006
milestone32.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 939006 part.5 Sort out key names in UI Keys section r=smaug
dom/events/KeyNameList.h
widget/shared/NativeKeyToDOMKeyName.h
--- a/dom/events/KeyNameList.h
+++ b/dom/events/KeyNameList.h
@@ -79,17 +79,35 @@ DEFINE_KEYNAME_WITH_SAME_NAME(Cut)
 DEFINE_KEYNAME_WITH_SAME_NAME(Del) // Rename to Delete
 DEFINE_KEYNAME_WITH_SAME_NAME(EraseEof)
 DEFINE_KEYNAME_WITH_SAME_NAME(Exsel) // Rename to ExSel
 DEFINE_KEYNAME_WITH_SAME_NAME(Insert)
 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)
 DEFINE_KEYNAME_WITH_SAME_NAME(F3)
 DEFINE_KEYNAME_WITH_SAME_NAME(F4)
 DEFINE_KEYNAME_WITH_SAME_NAME(F5)
 DEFINE_KEYNAME_WITH_SAME_NAME(F6)
 DEFINE_KEYNAME_WITH_SAME_NAME(F7)
@@ -136,32 +154,21 @@ DEFINE_KEYNAME_WITH_SAME_NAME(LaunchAppl
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchApplication13)
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchApplication14)
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchApplication15)
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchApplication16)
 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)
 DEFINE_KEYNAME_WITH_SAME_NAME(BrightnessUp)
 DEFINE_KEYNAME_WITH_SAME_NAME(Camera)
 DEFINE_KEYNAME_WITH_SAME_NAME(Eject)
 DEFINE_KEYNAME_WITH_SAME_NAME(Power)
 DEFINE_KEYNAME_WITH_SAME_NAME(PrintScreen)
@@ -171,17 +178,16 @@ DEFINE_KEYNAME_WITH_SAME_NAME(BrowserRef
 DEFINE_KEYNAME_WITH_SAME_NAME(BrowserSearch)
 DEFINE_KEYNAME_WITH_SAME_NAME(BrowserStop)
 DEFINE_KEYNAME_WITH_SAME_NAME(BrowserBack)
 DEFINE_KEYNAME_WITH_SAME_NAME(BrowserForward)
 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)
 DEFINE_KEYNAME_WITH_SAME_NAME(DeadTilde)
 DEFINE_KEYNAME_WITH_SAME_NAME(DeadMacron)
 DEFINE_KEYNAME_WITH_SAME_NAME(DeadBreve)
 DEFINE_KEYNAME_WITH_SAME_NAME(DeadAboveDot)
 DEFINE_KEYNAME_WITH_SAME_NAME(DeadUmlaut)
--- a/widget/shared/NativeKeyToDOMKeyName.h
+++ b/widget/shared/NativeKeyToDOMKeyName.h
@@ -317,21 +317,79 @@ KEY_MAP_ANDROID (Insert, AKEYCODE_INSERT
 
 // Paste
 KEY_MAP_GTK     (Paste, GDK_Paste)
 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)
 
 // F1
 KEY_MAP_WIN     (F1, VK_F1)
 KEY_MAP_COCOA   (F1, kVK_F1)
 KEY_MAP_GTK     (F1, GDK_F1)
 KEY_MAP_GTK     (F1, GDK_KP_F1)
@@ -605,82 +663,27 @@ KEY_MAP_QT      (LaunchApplication18, Qt
 // LaunchMail
 KEY_MAP_WIN     (LaunchMail, VK_LAUNCH_MAIL)
 KEY_MAP_GTK     (LaunchMail, GDK_Mail)
 KEY_MAP_QT      (LaunchMail, Qt::Key_LaunchMail)
 KEY_MAP_ANDROID (LaunchMail, AKEYCODE_ENVELOPE)
 
 // List
 
-// Props
-
 // Soft1
 
 // Soft2
 
 // Soft3
 
 // 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)
 
 // Zoom
 KEY_MAP_WIN     (Zoom, VK_ZOOM)
 KEY_MAP_QT      (Zoom, Qt::Key_Zoom)
 
 // BrightnessDown
@@ -757,20 +760,16 @@ KEY_MAP_ANDROID (BrowserForward, AKEYCOD
 // UpLeft
 
 // UpRight
 
 // DownLeft
 
 // 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)
 
 // DeadAcute
 KEY_MAP_GTK     (DeadAcute, GDK_dead_acute)
 KEY_MAP_QT      (DeadAcute, Qt::Key_Dead_Acute)