Port ScopedDisableInternalMouseAndKeyboardX11 to Ozone

ui/events/ozone/evdev/event_converter_evdev_impl.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/event_converter_evdev_impl.h"
 
 #include <errno.h>
 #include <linux/input.h>
 
 #include "base/message_loop/message_loop.h"
 #include "ui/events/event.h"
 #include "ui/events/keycodes/dom4/keycode_converter.h"
-#include "ui/events/keycodes/keyboard_codes.h"
+#include "ui/events/ozone/evdev/keyboard_evdev.h"
 
 namespace ui {
 
 // Values for EV_KEY.
 const int kKeyReleaseValue = 0;
 const int kKeyRepeatValue = 2;
 
 EventConverterEvdevImpl::EventConverterEvdevImpl(
     int fd,
     base::FilePath path,
     int id,
     InputDeviceType type,
     const EventDeviceInfo& devinfo,
     EventModifiersEvdev* modifiers,
     MouseButtonMapEvdev* button_map,
     CursorDelegateEvdev* cursor,
     KeyboardEvdev* keyboard,
     const EventDispatchCallback& callback)
     : EventConverterEvdev(fd, path, id, type),
       has_keyboard_(devinfo.HasKeyboard()),
+      has_touchpad_(devinfo.HasTouchpad()),
       x_offset_(0),
       y_offset_(0),
       cursor_(cursor),
       keyboard_(keyboard),
       modifiers_(modifiers),
       button_map_(button_map),
       callback_(callback) {
 }
 
 EventConverterEvdevImpl::~EventConverterEvdevImpl() {
   Stop();
   close(fd_);
 }
 
 void EventConverterEvdevImpl::OnFileCanReadWithoutBlocking(int fd) {
   input_event inputs[4];
   ssize_t read_size = read(fd, inputs, sizeof(inputs));
   if (read_size < 0) {
     if (errno == EINTR || errno == EAGAIN)
       return;
     if (errno != ENODEV)
       PLOG(ERROR) << "error reading device " << path_.value();
     Stop();
     return;
   }
 
+  if (ignore_events_)

[spang, 2015/01/02 22:49:57]

Add a TODO(spang): Re-implement this by releasing buttons & temporarily closing
the device.

That'll fix the buttons stuck down issue, as well as some relatively minor
issues with respecting the event boundaries (SYN_REPORT) when we stop or resume
processing.

+    return;
+
   DCHECK_EQ(read_size % sizeof(*inputs), 0u);
   ProcessEvents(inputs, read_size / sizeof(*inputs));
 }
 
 bool EventConverterEvdevImpl::HasKeyboard() const {
   return has_keyboard_;
 }
 
+bool EventConverterEvdevImpl::HasTouchpad() const {
+  return has_touchpad_;
+}
+
+void EventConverterEvdevImpl::SetAllowedKeys(
+    scoped_ptr<std::set<DomCode>> allowed_keys) {
+  DCHECK(HasKeyboard());
+  allowed_keys_ = allowed_keys.Pass();
+}
+
+void EventConverterEvdevImpl::AllowAllKeys() {
+  DCHECK(HasKeyboard());
+  allowed_keys_.reset();
+}
+
 void EventConverterEvdevImpl::ProcessEvents(const input_event* inputs,
                                             int count) {
   for (int i = 0; i < count; ++i) {
     const input_event& input = inputs[i];
     switch (input.type) {
       case EV_KEY:
         ConvertKeyEvent(input);
         break;
       case EV_REL:
         ConvertMouseMoveEvent(input);
@@ skipping 10 matching lines @@
   if (input.value == kKeyRepeatValue)
     return;
 
   // Mouse processing.
   if (input.code >= BTN_MOUSE && input.code < BTN_JOYSTICK) {
     DispatchMouseButton(input);
     return;
   }
 
   // Keyboard processing.
-  keyboard_->OnKeyChange(input.code, input.value != kKeyReleaseValue);
+  DomCode key_code = KeycodeConverter::NativeKeycodeToDomCode(
+      KeyboardEvdev::EvdevCodeToNativeCode(input.code));

[kpschoedel, 2014/12/25 18:14:17]

NativeKeycodeToDomCode() is a slow operation; since allowed_keys_ is part of
evdev-specific code could you make it hold evdev codes and thus convert just
once?

+  if (!allowed_keys_ || allowed_keys_->count(key_code))
+    keyboard_->OnKeyChange(input.code, input.value != kKeyReleaseValue);
 }
 
 void EventConverterEvdevImpl::ConvertMouseMoveEvent(const input_event& input) {
   if (!cursor_)
     return;
   switch (input.code) {
     case REL_X:
       x_offset_ = input.value;
       break;
     case REL_Y:
@@ skipping 37 matching lines @@
       new MouseEvent(ui::ET_MOUSE_MOVED,
                      cursor_->GetLocation(),
                      cursor_->GetLocation(),
                      modifiers_->GetModifierFlags(),
                      /* changed_button_flags */ 0)));
   x_offset_ = 0;
   y_offset_ = 0;
 }
 
 }  // namespace ui