Port ScopedDisableInternalMouseAndKeyboardX11 to Ozone

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/keycodes/dom4/keycode_converter.h"
 #include "ui/events/ozone/evdev/event_modifiers_evdev.h"
 
 namespace ui {
 
 namespace {
 
 const int kXkbKeycodeOffset = 8;
 
-ui::KeyboardCode KeyboardCodeFromEvdevKey(unsigned int code) {
+int ModifierFromEvdevKey(unsigned int code) {

[kpschoedel, 2014/12/22 19:17:56]

The base version here is fatally out of date now.

+  switch (code) {
+    case KEY_CAPSLOCK:
+      return EVDEV_MODIFIER_CAPS_LOCK;
+    case KEY_LEFTSHIFT:
+    case KEY_RIGHTSHIFT:
+      return EVDEV_MODIFIER_SHIFT;
+    case KEY_LEFTCTRL:
+    case KEY_RIGHTCTRL:
+      return EVDEV_MODIFIER_CONTROL;
+    case KEY_LEFTALT:
+    case KEY_RIGHTALT:
+      return EVDEV_MODIFIER_ALT;
+    case BTN_LEFT:
+      return EVDEV_MODIFIER_LEFT_MOUSE_BUTTON;
+    case BTN_MIDDLE:
+      return EVDEV_MODIFIER_MIDDLE_MOUSE_BUTTON;
+    case BTN_RIGHT:
+      return EVDEV_MODIFIER_RIGHT_MOUSE_BUTTON;
+    case KEY_LEFTMETA:
+    case KEY_RIGHTMETA:
+      return EVDEV_MODIFIER_COMMAND;
+    default:
+      return EVDEV_MODIFIER_NONE;
+  }
+}
+
+bool IsModifierLockKeyFromEvdevKey(unsigned int code) {
+  return code == KEY_CAPSLOCK;
+}
+
+}  // namespace
+
+KeyboardEvdev::KeyboardEvdev(EventModifiersEvdev* modifiers,
+                             const EventDispatchCallback& callback)
+    : callback_(callback), modifiers_(modifiers) {
+}
+
+KeyboardEvdev::~KeyboardEvdev() {
+}
+
+// static
+ui::KeyboardCode KeyboardEvdev::KeyboardCodeFromEvdevKey(unsigned int code) {
   static const ui::KeyboardCode kLinuxBaseKeyMap[] = {
       ui::VKEY_UNKNOWN,            // KEY_RESERVED
       ui::VKEY_ESCAPE,             // KEY_ESC
       ui::VKEY_1,                  // KEY_1
       ui::VKEY_2,                  // KEY_2
       ui::VKEY_3,                  // KEY_3
       ui::VKEY_4,                  // KEY_4
       ui::VKEY_5,                  // KEY_5
       ui::VKEY_6,                  // KEY_6
       ui::VKEY_7,                  // KEY_7
@@ skipping 118 matching lines @@
       ui::VKEY_APPS,               // KEY_COMPOSE
   };
 
   if (code < arraysize(kLinuxBaseKeyMap))
     return kLinuxBaseKeyMap[code];
 
   LOG(ERROR) << "Unknown key code: " << code;
   return ui::VKEY_UNKNOWN;
 }
 
-int ModifierFromEvdevKey(unsigned int code) {
-  switch (code) {
-    case KEY_CAPSLOCK:
-      return EVDEV_MODIFIER_CAPS_LOCK;
-    case KEY_LEFTSHIFT:
-    case KEY_RIGHTSHIFT:
-      return EVDEV_MODIFIER_SHIFT;
-    case KEY_LEFTCTRL:
-    case KEY_RIGHTCTRL:
-      return EVDEV_MODIFIER_CONTROL;
-    case KEY_LEFTALT:
-    case KEY_RIGHTALT:
-      return EVDEV_MODIFIER_ALT;
-    case BTN_LEFT:
-      return EVDEV_MODIFIER_LEFT_MOUSE_BUTTON;
-    case BTN_MIDDLE:
-      return EVDEV_MODIFIER_MIDDLE_MOUSE_BUTTON;
-    case BTN_RIGHT:
-      return EVDEV_MODIFIER_RIGHT_MOUSE_BUTTON;
-    case KEY_LEFTMETA:
-    case KEY_RIGHTMETA:
-      return EVDEV_MODIFIER_COMMAND;
-    default:
-      return EVDEV_MODIFIER_NONE;
-  }
-}
-
-bool IsModifierLockKeyFromEvdevKey(unsigned int code) {
-  return code == KEY_CAPSLOCK;
-}
-
-}  // namespace
-
-KeyboardEvdev::KeyboardEvdev(EventModifiersEvdev* modifiers,
-                             const EventDispatchCallback& callback)
-    : callback_(callback), modifiers_(modifiers) {
-}
-
-KeyboardEvdev::~KeyboardEvdev() {
-}
-
 void KeyboardEvdev::OnKeyChange(unsigned int key, bool down) {
   if (key > KEY_MAX)
     return;
 
   if (down != key_state_.test(key)) {
     // State transition: !(down) -> (down)
     if (down)
       key_state_.set(key);
     else
       key_state_.reset(key);
@@ skipping 33 matching lines @@
 
 // static
 int KeyboardEvdev::NativeCodeToEvdevCode(int native_code) {
   if (native_code == KeycodeConverter::InvalidNativeKeycode()) {
     return KEY_RESERVED;
   }
   return native_code - kXkbKeycodeOffset;
 }
 
 }  // namespace ui