Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10)

Unified Diff: ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.cc

Issue 806693009: Port ScopedDisableInternalMouseAndKeyboardX11 to Ozone (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.cc
diff --git a/ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.cc b/ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.cc
index b7ca1135243811603191984bb07320970e879313..dc6fb839c266250e0a16b6f0aafc29f12d712ce5 100644
--- a/ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.cc
+++ b/ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.cc
@@ -11,6 +11,7 @@
#include "base/strings/stringprintf.h"
#include "base/timer/timer.h"
#include "ui/events/event.h"
+#include "ui/events/keycodes/dom4/keycode_converter.h"
#include "ui/events/ozone/evdev/cursor_delegate_evdev.h"
#include "ui/events/ozone/evdev/event_device_info.h"
#include "ui/events/ozone/evdev/event_device_util.h"
@@ -235,6 +236,25 @@ void GestureInterpreterLibevdevCros::OnLibEvdevCrosEvent(Evdev* evdev,
GestureInterpreterPushHardwareState(interpreter_, &hwstate);
}
+void GestureInterpreterLibevdevCros::SetAllowedKeys(
+ scoped_ptr<std::set<DomCode>> allowed_keys) {
+ if (!allowed_keys) {
+ allowed_keys_.reset();
+ return;
+ }
+
+ allowed_keys_.reset(new std::set<int>());
+ for (const auto& it : *allowed_keys) {
+ int evdev_code = KeyboardEvdev::NativeCodeToEvdevCode(
+ KeycodeConverter::DomCodeToNativeKeycode(it));
+ allowed_keys_->insert(evdev_code);
+ }
+}
+
+void GestureInterpreterLibevdevCros::AllowAllKeys() {
+ allowed_keys_.reset();
+}
+
void GestureInterpreterLibevdevCros::OnGestureReady(const Gesture* gesture) {
switch (gesture->type) {
case kGestureTypeMove:
@@ -475,6 +495,9 @@ void GestureInterpreterLibevdevCros::DispatchChangedKeys(Evdev* evdev,
if (key >= BTN_DIGI && key < BTN_WHEEL)
continue;
+ if (allowed_keys_ && !allowed_keys_->count(key))
+ continue;
+
// Dispatch key press or release to keyboard.
keyboard_->OnKeyChange(key, value);
}

Powered by Google App Engine
This is Rietveld 408576698