Fix Ozone keyboard layout to handle German Neo 2.

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 "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/dom/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 {
 
+// We can't include ui/events/keycodes/dom/dom_code.h here because of
+// conflicts with preprocessor macros in <linux/input.h>, so we use the
+// same underlying data with an additional prefix.
+#define USB_KEYMAP(usb, xkb, win, mac, code, id) DOM_CODE_ ## id = usb
+#define USB_KEYMAP_DECLARATION enum class DomCode
+#include "ui/events/keycodes/dom/keycode_converter_data.inc"
+#undef USB_KEYMAP
+#undef USB_KEYMAP_DECLARATION
+
 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;
     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_MOD3_DOWN:
+      return EVDEV_MODIFIER_MOD3;
     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_BACK_MOUSE_BUTTON:
       return EVDEV_MODIFIER_BACK_MOUSE_BUTTON;
     case EF_FORWARD_MOUSE_BUTTON:
       return EVDEV_MODIFIER_FORWARD_MOUSE_BUTTON;
@@ skipping 146 matching lines @@
   ScheduleKeyRepeat(repeat_interval_);
 }
 
 void KeyboardEvdev::DispatchKey(unsigned int key,
                                 bool down,
                                 bool repeat,
                                 base::TimeDelta timestamp,
                                 int device_id) {
   DomCode dom_code =
       KeycodeConverter::NativeKeycodeToDomCode(EvdevCodeToNativeCode(key));
-  // DomCode constants are not included here because of conflicts with
-  // evdev preprocessor macros.
-  if (!static_cast<int>(dom_code))
+  if (dom_code == DomCode::DOM_CODE_NONE)
     return;
   int flags = modifiers_->GetModifierFlags();
   DomKey dom_key;
   KeyboardCode key_code;
   uint16 character;
   uint32 platform_keycode = 0;
   if (!keyboard_layout_engine_->Lookup(dom_code, flags, &dom_key, &character,
                                        &key_code, &platform_keycode)) {
     return;
   }
-  if (!repeat)
-    UpdateModifier(ModifierDomKeyToEventFlag(dom_key), down);
+  if (!repeat) {
+    int flag = ModifierDomKeyToEventFlag(dom_key);
+    UpdateModifier(flag, down);
+    // X11 XKB, using the configuration as modified for ChromeOS, always sets
+    // EF_MOD3_DOWN for the physical CapsLock key, even if the layout maps
+    // it to something else, so we imitate this to make certain layouts (e.g.
+    // German Neo2) work. crbug.com/495277
+    if (dom_code == DomCode::DOM_CODE_CAPS_LOCK)
+      UpdateModifier(EF_MOD3_DOWN, down);

[spang, 2015/06/08 22:43:09]

Can you now remove the other hack for MOD3 in UpdateModifier()?

[kpschoedel, 2015/06/09 13:28:50]

No, it's still required (in fact, the Neo layout is another reason it *is*
required). Cleaning this up depends on  removing or cleaning up the ChromeOS XKB
patches, which is not easy until post-X11 ChromeOS ~~~~~~~~=[,,_,,]:3 

+  }
 
   KeyEvent event(down ? ET_KEY_PRESSED : ET_KEY_RELEASED, key_code, dom_code,
                  modifiers_->GetModifierFlags(), dom_key, character, timestamp);
   event.set_source_device_id(device_id);
   if (platform_keycode)
     event.set_platform_keycode(platform_keycode);
   callback_.Run(&event);
 }
-
 }  // namespace ui