Add diamond-key remapping support.

chrome/browser/ui/ash/event_rewriter.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/ash/event_rewriter.h"
 
 #include <vector>
 
 #include "ash/shell.h"
 #include "base/logging.h"
@@ skipping 67 matching lines @@
   unsigned int native_modifier;
   int flag;
   const char* pref_name;
 } kModifierFlagToPrefName[] = {
   // TODO(yusukes): When the device has a Chrome keyboard (i.e. the one without
   // Caps Lock), we should not check kLanguageRemapCapsLockKeyTo.
   { Mod3Mask, 0, prefs::kLanguageRemapCapsLockKeyTo },
   { Mod4Mask, 0, prefs::kLanguageRemapSearchKeyTo },
   { ControlMask, ui::EF_CONTROL_DOWN, prefs::kLanguageRemapControlKeyTo },
   { Mod1Mask, ui::EF_ALT_DOWN, prefs::kLanguageRemapAltKeyTo },
+  { Mod2Mask, 0, prefs::kLanguageRemapDiamondKeyTo },
 };
 
 // Gets a remapped key for |pref_name| key. For example, to find out which
 // key Search is currently remapped to, call the function with
 // prefs::kLanguageRemapSearchKeyTo.
 const ModifierRemapping* GetRemappedKey(const std::string& pref_name,
                                         const PrefService& pref_service) {
   if (!pref_service.FindPreference(pref_name.c_str()))
     return NULL;  // The |pref_name| hasn't been registered. On login screen?
   const int value = pref_service.GetInteger(pref_name.c_str());
@@ skipping 17 matching lines @@
       break;
   }
   return false;
 }
 
 bool HasChromeOSKeyboard() {
   return CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kHasChromeOSKeyboard);
 }
 
+bool HasDiamondKey() {
+  return CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kHasChromeOSDiamondKey);
+}
+
 bool IsMod3UsedByCurrentInputMethod() {
   // Since both German Neo2 XKB layout and Caps Lock depend on Mod3Mask,
   // it's not possible to make both features work. For now, we don't remap
   // Mod3Mask when Neo2 is in use.
   // TODO(yusukes): Remove the restriction.
   return GetInputMethodManager()->GetCurrentInputMethod().id() == kNeo2LayoutId;
 }
 #endif
 
 const PrefService* GetPrefService() {
@@ skipping 284 matching lines @@
         *remapped_native_modifiers |=
             kModifierFlagToPrefName[i].native_modifier;
       }
     }
   }
 
   *remapped_flags =
       (original_flags & ~(ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)) |
       *remapped_flags;
 
-  unsigned int native_mask = Mod4Mask | ControlMask | Mod1Mask;
+  unsigned int native_mask = Mod4Mask | ControlMask | Mod1Mask | Mod2Mask;
   if (!skip_mod3)
     native_mask |= Mod3Mask;
   *remapped_native_modifiers =
       (original_native_modifiers & ~native_mask) |
       *remapped_native_modifiers;
 #endif
 }
 
 bool EventRewriter::RewriteModifiers(ui::KeyEvent* event) {
   // Do nothing if we have just logged in as guest but have not restarted chrome
@@ skipping 20 matching lines @@
   XEvent* xev = event->native_event();
   XKeyEvent* xkey = &(xev->xkey);
   KeySym keysym = XLookupKeysym(xkey, 0);
 
   ui::KeyboardCode remapped_keycode = event->key_code();
   KeyCode remapped_native_keycode = xkey->keycode;
 
   // First, remap |keysym|.
   const ModifierRemapping* remapped_key = NULL;
   switch (keysym) {
+    // On Chrome OS, XF86XK_Launch6 (F15) with Mod2Mask is sent when Diamond
+    // key is pressed.
+    case XF86XK_Launch6:
+      // When diamond key is not available, the configuration UI for Diamond
+      // key is not shown. Therefore, ignore the kLanguageRemapDiamondKeyTo
+      // syncable pref.
+      if (HasDiamondKey())
+        remapped_key =
+            GetRemappedKey(prefs::kLanguageRemapDiamondKeyTo, *pref_service);
+      if (!remapped_key)
+        remapped_key = kModifierRemappingCtrl;
+      break;
     // On Chrome OS, XF86XK_Launch7 (F16) with Mod3Mask is sent when Caps Lock
     // is pressed (with one exception: when IsMod3UsedByCurrentInputMethod() is
     // true, the key generates XK_ISO_Level3_Shift with Mod3Mask, not
     // XF86XK_Launch7).
     case XF86XK_Launch7:
       // When a Chrome OS keyboard is available, the configuration UI for Caps
       // Lock is not shown. Therefore, ignore the kLanguageRemapCapsLockKeyTo
       // syncable pref.
-      if (HasChromeOSKeyboard())
-        remapped_key = kModifierRemappingCapsLock;
-      else
+      if (!HasChromeOSKeyboard())
         remapped_key =
             GetRemappedKey(prefs::kLanguageRemapCapsLockKeyTo, *pref_service);
+      if (!remapped_key)
+        remapped_key = kModifierRemappingCapsLock;
       break;
     case XK_Super_L:
     case XK_Super_R:
       // Rewrite Command-L/R key presses on an Apple keyboard to Control-L/R.
       if (IsAppleKeyboard())
         remapped_key = kModifierRemappingCtrl;
       else
         remapped_key =
             GetRemappedKey(prefs::kLanguageRemapSearchKeyTo, *pref_service);

[Yusuke Sato, 2013/01/25 06:17:08]

as we talked offline, please handle null-return case here too.

[yoshiki, 2013/01/25 06:43:36]

I think, in contrast with F15/F16 key, the super key works as the search key
without modification, right? If so, we don't need to handle null-return (and
I'll add the comment).

On 2013/01/25 06:17:08, Yusuke Sato wrote:

[Yusuke Sato, 2013/01/25 06:46:46]

Sorry, I added the previous comment at the wrong line. Your current CL looks
very good.

On 2013/01/25 06:43:36, yoshiki wrote:

       break;
     case XK_Control_L:
     case XK_Control_R:
       remapped_key =
           GetRemappedKey(prefs::kLanguageRemapControlKeyTo, *pref_service);
       break;
     case XK_Alt_L:
     case XK_Alt_R:
     case XK_Meta_L:
     case XK_Meta_R:
@@ skipping 484 matching lines @@
   const DeviceType type = EventRewriter::GetDeviceType(device_name);
   if (type == kDeviceAppleKeyboard) {
     VLOG(1) << "Apple keyboard '" << device_name << "' connected: "
             << "id=" << device_id;
   }
   // Always overwrite the existing device_id since the X server may reuse a
   // device id for an unattached device.
   device_id_to_type_[device_id] = type;
   return type;
 }