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

Side by Side Diff: ui/events/ozone/evdev/event_factory_evdev.cc

Issue 654073002: ozone: evdev: Dispatch key events from gestures devices (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: mismerge Created 6 years, 2 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 unified diff | Download patch
« no previous file with comments | « no previous file | ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/events/ozone/evdev/event_factory_evdev.h" 5 #include "ui/events/ozone/evdev/event_factory_evdev.h"
6 6
7 #include <fcntl.h> 7 #include <fcntl.h>
8 #include <linux/input.h> 8 #include <linux/input.h>
9 9
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 #endif 65 #endif
66 66
67 scoped_ptr<EventConverterEvdev> CreateConverter( 67 scoped_ptr<EventConverterEvdev> CreateConverter(
68 const OpenInputDeviceParams& params, 68 const OpenInputDeviceParams& params,
69 int fd, 69 int fd,
70 const EventDeviceInfo& devinfo) { 70 const EventDeviceInfo& devinfo) {
71 #if defined(USE_EVDEV_GESTURES) 71 #if defined(USE_EVDEV_GESTURES)
72 // Touchpad or mouse: use gestures library. 72 // Touchpad or mouse: use gestures library.
73 // EventReaderLibevdevCros -> GestureInterpreterLibevdevCros -> DispatchEvent 73 // EventReaderLibevdevCros -> GestureInterpreterLibevdevCros -> DispatchEvent
74 if (UseGesturesLibraryForDevice(devinfo)) { 74 if (UseGesturesLibraryForDevice(devinfo)) {
75 scoped_ptr<GestureInterpreterLibevdevCros> gesture_interp = 75 scoped_ptr<GestureInterpreterLibevdevCros> gesture_interp = make_scoped_ptr(
76 make_scoped_ptr(new GestureInterpreterLibevdevCros( 76 new GestureInterpreterLibevdevCros(params.modifiers,
77 params.modifiers, params.cursor, params.dispatch_callback)); 77 params.cursor,
78 params.keyboard,
79 params.dispatch_callback));
78 return make_scoped_ptr(new EventReaderLibevdevCros( 80 return make_scoped_ptr(new EventReaderLibevdevCros(
79 fd, params.path, params.id, gesture_interp.Pass())); 81 fd, params.path, params.id, gesture_interp.Pass()));
80 } 82 }
81 #endif 83 #endif
82 84
83 // Touchscreen: use TouchEventConverterEvdev. 85 // Touchscreen: use TouchEventConverterEvdev.
84 scoped_ptr<EventConverterEvdev> converter; 86 scoped_ptr<EventConverterEvdev> converter;
85 if (devinfo.HasAbsXY()) 87 if (devinfo.HasAbsXY())
86 return make_scoped_ptr<EventConverterEvdev>(new TouchEventConverterEvdev( 88 return make_scoped_ptr<EventConverterEvdev>(new TouchEventConverterEvdev(
87 fd, params.path, params.id, devinfo, params.dispatch_callback)); 89 fd, params.path, params.id, devinfo, params.dispatch_callback));
88 90
89 // Everything else: use KeyEventConverterEvdev. 91 // Everything else: use KeyEventConverterEvdev.
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 } 284 }
283 285
284 observer->OnTouchscreenDevicesUpdated(touchscreens); 286 observer->OnTouchscreenDevicesUpdated(touchscreens);
285 } 287 }
286 288
287 int EventFactoryEvdev::NextDeviceId() { 289 int EventFactoryEvdev::NextDeviceId() {
288 return ++last_device_id_; 290 return ++last_device_id_;
289 } 291 }
290 292
291 } // namespace ui 293 } // namespace ui
OLDNEW
« no previous file with comments | « no previous file | ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698