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

Unified Diff: ui/events/ozone/evdev/libgestures_glue/event_reader_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/event_reader_libevdev_cros.cc
diff --git a/ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.cc b/ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.cc
index aeed7914f908c1c5e03a4f27141560977cc0adb5..1bed68b725887695e49d5dcc759d05438c8f5b6f 100644
--- a/ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.cc
+++ b/ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.cc
@@ -33,6 +33,7 @@ EventReaderLibevdevCros::EventReaderLibevdevCros(int fd,
scoped_ptr<Delegate> delegate)
: EventConverterEvdev(fd, path, id, type),
has_keyboard_(devinfo.HasKeyboard()),
+ has_touchpad_(devinfo.HasTouchpad()),
delegate_(delegate.Pass()) {
memset(&evdev_, 0, sizeof(evdev_));
evdev_.log = OnLogMessage;
@@ -72,11 +73,29 @@ bool EventReaderLibevdevCros::HasKeyboard() const {
return has_keyboard_;
}
+bool EventReaderLibevdevCros::HasTouchpad() const {
+ return has_touchpad_;
+}
+
+void EventReaderLibevdevCros::SetAllowedKeys(
+ scoped_ptr<std::set<DomCode>> allowed_keys) {
+ DCHECK(HasKeyboard());
+ delegate_->SetAllowedKeys(allowed_keys.Pass());
+}
+
+void EventReaderLibevdevCros::AllowAllKeys() {
+ DCHECK(HasKeyboard());
+ delegate_->AllowAllKeys();
+}
+
// static
void EventReaderLibevdevCros::OnSynReport(void* data,
EventStateRec* evstate,
struct timeval* tv) {
EventReaderLibevdevCros* reader = static_cast<EventReaderLibevdevCros*>(data);
+ if (reader->ignore_events_)
+ return;
+
reader->delegate_->OnLibEvdevCrosEvent(&reader->evdev_, evstate, *tv);
}

Powered by Google App Engine
This is Rietveld 408576698