Fix CapsLock remapping.

ui/events/ozone/evdev/keyboard_evdev.cc

 // Copyright 2014 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 "ui/events/ozone/evdev/keyboard_evdev.h"
 
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/dom4/keycode_converter.h"
 #include "ui/events/ozone/evdev/event_modifiers_evdev.h"
 #include "ui/events/ozone/evdev/keyboard_util_evdev.h"
 #include "ui/events/ozone/layout/keyboard_layout_engine.h"
 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h"
 #include "ui/events/ozone/layout/layout_util.h"
 
 namespace ui {
 
 namespace {
 
 const int kRepeatDelayMs = 500;
 const int kRepeatIntervalMs = 50;
 
 int EventFlagToEvdevModifier(int flag) {
   switch (flag) {
     case EF_CAPS_LOCK_DOWN:
-      return EVDEV_MODIFIER_CAPS_LOCK;
+      return EVDEV_MODIFIER_CAPS_LOCKED_STATE;
+    case EF_MOD3_DOWN:
+      return EVDEV_MODIFIER_CAPS_LOCK_HELD;
     case EF_SHIFT_DOWN:
       return EVDEV_MODIFIER_SHIFT;
     case EF_CONTROL_DOWN:
       return EVDEV_MODIFIER_CONTROL;
     case EF_ALT_DOWN:
       return EVDEV_MODIFIER_ALT;
     case EF_ALTGR_DOWN:
       return EVDEV_MODIFIER_ALTGR;
     case EF_LEFT_MOUSE_BUTTON:
       return EVDEV_MODIFIER_LEFT_MOUSE_BUTTON;
     case EF_MIDDLE_MOUSE_BUTTON:
       return EVDEV_MODIFIER_MIDDLE_MOUSE_BUTTON;
     case EF_RIGHT_MOUSE_BUTTON:
       return EVDEV_MODIFIER_RIGHT_MOUSE_BUTTON;
     case EF_COMMAND_DOWN:
       return EVDEV_MODIFIER_COMMAND;
     default:
       return EVDEV_MODIFIER_NONE;
   }
 }
 
-bool IsModifierLock(int evdev_modifier) {
-  return evdev_modifier == EVDEV_MODIFIER_CAPS_LOCK;
-}
-
 }  // namespace
 
 KeyboardEvdev::KeyboardEvdev(EventModifiersEvdev* modifiers,
                              KeyboardLayoutEngine* keyboard_layout_engine,
                              const EventDispatchCallback& callback)
     : callback_(callback),
       modifiers_(modifiers),
       keyboard_layout_engine_(keyboard_layout_engine),
       repeat_enabled_(true),
       repeat_key_(KEY_RESERVED) {
@@ skipping 17 matching lines @@
   if (down)
     key_state_.set(key);
   else
     key_state_.reset(key);
 
   UpdateKeyRepeat(key, down);
   DispatchKey(key, down, false /* repeat */, timestamp);
 }
 
 void KeyboardEvdev::SetCapsLockEnabled(bool enabled) {
-  modifiers_->SetModifierLock(EVDEV_MODIFIER_CAPS_LOCK, enabled);
+  modifiers_->SetModifierLock(EVDEV_MODIFIER_CAPS_LOCKED_STATE, enabled);
 }
 
 bool KeyboardEvdev::IsCapsLockEnabled() {
-  return (modifiers_->GetModifierFlags() & EF_CAPS_LOCK_DOWN) != 0;
+  return (modifiers_->GetModifierLockFlags() & EF_CAPS_LOCK_DOWN) != 0;
 }
 
 bool KeyboardEvdev::IsAutoRepeatEnabled() {
   return repeat_enabled_;
 }
 
 void KeyboardEvdev::SetAutoRepeatEnabled(bool enabled) {
   repeat_enabled_ = enabled;
 }
 
 void KeyboardEvdev::SetAutoRepeatRate(const base::TimeDelta& delay,
                                       const base::TimeDelta& interval) {
   repeat_delay_ = delay;
   repeat_interval_ = interval;
 }
 
 void KeyboardEvdev::GetAutoRepeatRate(base::TimeDelta* delay,
                                       base::TimeDelta* interval) {
   *delay = repeat_delay_;
   *interval = repeat_interval_;
 }
 
 void KeyboardEvdev::UpdateModifier(int modifier_flag, bool down) {
   if (modifier_flag == EF_NONE)
     return;
 
   int modifier = EventFlagToEvdevModifier(modifier_flag);
   if (modifier == EVDEV_MODIFIER_NONE)
     return;
-
-  if (IsModifierLock(modifier))
-    modifiers_->UpdateModifierLock(modifier, down);
-  else
-    modifiers_->UpdateModifier(modifier, down);
+  modifiers_->UpdateModifier(modifier, down);

[spang, 2015/02/25 22:03:28]

Wouldn't it work to just do

// TODO: Do key remapping earlier.
if (modifier == EVDEV_MODIFIER_CAPS_LOCK)
  modifiers_->UpdateModifier(EVDEV_MODIFIER_MOD3, down);

and keep everything else the same?

[kpschoedel, 2015/02/25 23:03:06]

Done.

 }
 
 void KeyboardEvdev::UpdateKeyRepeat(unsigned int key, bool down) {
   if (!repeat_enabled_)
     StopKeyRepeat();
   else if (key != repeat_key_ && down)
     StartKeyRepeat(key);
   else if (key == repeat_key_ && !down)
     StopKeyRepeat();
 }
@@ skipping 50 matching lines @@
     UpdateModifier(ModifierDomKeyToEventFlag(dom_key), down);
 
   KeyEvent event(down ? ET_KEY_PRESSED : ET_KEY_RELEASED, key_code, dom_code,
                  modifiers_->GetModifierFlags(), dom_key, character, timestamp);
   if (platform_keycode)
     event.set_platform_keycode(platform_keycode);
   callback_.Run(&event);
 }
 
 }  // namespace ui