Bug 751749 part.4 Give higher priority to Meta than Super and Hyper due to better compatibility with Web applications r=karlt
authorMasayuki Nakano <masayuki@d-toybox.com>
Thu, 19 Jul 2012 10:28:17 +0900
changeset 99729 ea6903f1a7dff5ea87fb3a5c71ec1de72e353c17
parent 99728 ae94d3a4497e5962de06dd58ded2b8376beb9765
child 99730 205aaea8796db13d1ed1e1b0e84d740768ac6a0e
push id12164
push usermasayuki@d-toybox.com
push dateThu, 19 Jul 2012 01:28:44 +0000
treeherdermozilla-inbound@205aaea8796d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskarlt
bugs751749
milestone17.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 751749 part.4 Give higher priority to Meta than Super and Hyper due to better compatibility with Web applications r=karlt
widget/gtk2/nsGtkKeyUtils.cpp
widget/gtk2/nsGtkKeyUtils.h
--- a/widget/gtk2/nsGtkKeyUtils.cpp
+++ b/widget/gtk2/nsGtkKeyUtils.cpp
@@ -458,25 +458,25 @@ KeymapWrapper::InitBySystemSettings()
                 modifier = NUM_LOCK;
                 break;
             case INDEX_SCROLL_LOCK:
                 modifier = SCROLL_LOCK;
                 break;
             case INDEX_ALT:
                 modifier = ALT;
                 break;
+            case INDEX_META:
+                modifier = META;
+                break;
             case INDEX_SUPER:
                 modifier = SUPER;
                 break;
             case INDEX_HYPER:
                 modifier = HYPER;
                 break;
-            case INDEX_META:
-                modifier = META;
-                break;
             case INDEX_ALTGR:
                 modifier = ALTGR;
                 break;
             default:
                 MOZ_NOT_REACHED("All indexes must be handled here");
                 break;
         }
         for (PRUint32 j = 0; j < ArrayLength(mod); j++) {
--- a/widget/gtk2/nsGtkKeyUtils.h
+++ b/widget/gtk2/nsGtkKeyUtils.h
@@ -48,19 +48,19 @@ public:
     enum Modifier {
         NOT_MODIFIER       = 0x0000,
         CAPS_LOCK          = 0x0001,
         NUM_LOCK           = 0x0002,
         SCROLL_LOCK        = 0x0004,
         SHIFT              = 0x0008,
         CTRL               = 0x0010,
         ALT                = 0x0020,
-        SUPER              = 0x0040,
-        HYPER              = 0x0080,
-        META               = 0x0100,
+        META               = 0x0040,
+        SUPER              = 0x0080,
+        HYPER              = 0x0100,
         ALTGR              = 0x0200
     };
 
     /**
      * Modifiers is used for combination of Modifier.
      * E.g., |Modifiers modifiers = (SHIFT | CTRL);| means Shift and Ctrl.
      */
     typedef PRUint32 Modifiers;
@@ -165,19 +165,19 @@ protected:
     /**
      * mModifierMasks is bit masks for each modifier.  The index should be one
      * of ModifierIndex values.
      */
     enum ModifierIndex {
         INDEX_NUM_LOCK,
         INDEX_SCROLL_LOCK,
         INDEX_ALT,
+        INDEX_META,
         INDEX_SUPER,
         INDEX_HYPER,
-        INDEX_META,
         INDEX_ALTGR,
         COUNT_OF_MODIFIER_INDEX
     };
     guint mModifierMasks[COUNT_OF_MODIFIER_INDEX];
 
     guint GetModifierMask(Modifier aModifier) const;
 
     /**