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 },

[Yusuke Sato, 2013/01/23 07:12:18]

Please add unit tests. This class should be 100% tested.

[yoshiki, 2013/01/25 01:33:10]

Done.

 };
 
 // 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 246 matching lines @@
 }
 #endif
 
 void EventRewriter::Rewrite(ui::KeyEvent* event) {
 #if defined(OS_CHROMEOS)
   // Do not rewrite an event sent by ui_controls::SendKeyPress(). See
   // crbug.com/136465.
   if (event->native_event()->xkey.send_event)
     return;
 #endif
   RewriteModifiers(event);

[Yusuke Sato, 2013/01/23 07:12:18]

this rewriter has to be called before RewriteNumPadKeys() because
RewriteNumPadKeys() might add Mod2Mask, correct? If so, add a comment and some
tests to prevent future regressions.

[Yusuke Sato, 2013/01/24 20:46:01]

Please fix.

[yoshiki, 2013/01/25 01:33:10]

Sorry for lack of the explanation.

RewriteNumPadKeys() will be removed shortly by nona@'s later patch to chrome.
I'll keep it as is now. But Mod2Mask matter is still under discussion at the
nona@'s xkb patch, hence I may change something if necessary.

On 2013/01/24 20:46:01, Yusuke Sato wrote:

[Yusuke Sato, 2013/01/25 01:45:25]

Have you talked to nona today? The removal will unlikely happen.

On 2013/01/25 01:33:10, yoshiki wrote:

[yoshiki, 2013/01/25 01:47:18]

No I haven't. I'll talk.

On 2013/01/25 01:45:25, Yusuke Sato wrote:

   RewriteNumPadKeys(event);
   RewriteExtendedKeys(event);
   RewriteFunctionKeys(event);
 }
 
 bool EventRewriter::IsAppleKeyboard() const {
   if (last_device_id_ == kBadDeviceId)
     return false;
 
   // Check which device generated |event|.
@@ skipping 95 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) {
+    case XF86XK_Launch6:

[Yusuke Sato, 2013/01/23 07:12:18]

Add a similar comment to line 475-478.

[yoshiki, 2013/01/25 01:33:10]

Done.

+      remapped_key =

[Yusuke Sato, 2013/01/23 07:12:18]

Shouldn't we check the command line flag here? I think it would be safer to
always map XF86XK_Launch6 to Control on non-Stout devices where the new
configuration UI is not shown:

if (HasDiamondKey())
   ...
else
   ...

Please note that the pref you added is SYNCABLE_PREF.

[yoshiki, 2013/01/25 01:33:10]

Done.

+          GetRemappedKey(prefs::kLanguageRemapDiamondKeyTo, *pref_service);
+      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;
@@ skipping 506 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;
 }