| OLD | NEW |
| 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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 const OpenInputDeviceParams& params, | 67 const OpenInputDeviceParams& params, |
| 68 int fd, | 68 int fd, |
| 69 const EventDeviceInfo& devinfo) { | 69 const EventDeviceInfo& devinfo) { |
| 70 #if defined(USE_EVDEV_GESTURES) | 70 #if defined(USE_EVDEV_GESTURES) |
| 71 // Touchpad or mouse: use gestures library. | 71 // Touchpad or mouse: use gestures library. |
| 72 // EventReaderLibevdevCros -> GestureInterpreterLibevdevCros -> DispatchEvent | 72 // EventReaderLibevdevCros -> GestureInterpreterLibevdevCros -> DispatchEvent |
| 73 if (UseGesturesLibraryForDevice(devinfo)) { | 73 if (UseGesturesLibraryForDevice(devinfo)) { |
| 74 scoped_ptr<GestureInterpreterLibevdevCros> gesture_interp = | 74 scoped_ptr<GestureInterpreterLibevdevCros> gesture_interp = |
| 75 make_scoped_ptr(new GestureInterpreterLibevdevCros( | 75 make_scoped_ptr(new GestureInterpreterLibevdevCros( |
| 76 params.modifiers, params.cursor, params.dispatch_callback)); | 76 params.modifiers, params.cursor, params.dispatch_callback)); |
| 77 scoped_ptr<EventReaderLibevdevCros> libevdev_reader = | 77 return make_scoped_ptr(new EventReaderLibevdevCros( |
| 78 make_scoped_ptr(new EventReaderLibevdevCros( | 78 fd, params.path, params.id, gesture_interp.Pass())); |
| 79 fd, | |
| 80 params.path, | |
| 81 params.id, | |
| 82 gesture_interp.PassAs<EventReaderLibevdevCros::Delegate>())); | |
| 83 return libevdev_reader.PassAs<EventConverterEvdev>(); | |
| 84 } | 79 } |
| 85 #endif | 80 #endif |
| 86 | 81 |
| 87 // Touchscreen: use TouchEventConverterEvdev. | 82 // Touchscreen: use TouchEventConverterEvdev. |
| 88 scoped_ptr<EventConverterEvdev> converter; | 83 scoped_ptr<EventConverterEvdev> converter; |
| 89 if (devinfo.HasAbsXY()) | 84 if (devinfo.HasAbsXY()) |
| 90 return make_scoped_ptr<EventConverterEvdev>(new TouchEventConverterEvdev( | 85 return make_scoped_ptr<EventConverterEvdev>(new TouchEventConverterEvdev( |
| 91 fd, params.path, params.id, devinfo, params.dispatch_callback)); | 86 fd, params.path, params.id, devinfo, params.dispatch_callback)); |
| 92 | 87 |
| 93 // Everything else: use KeyEventConverterEvdev. | 88 // Everything else: use KeyEventConverterEvdev. |
| (...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 284 } | 279 } |
| 285 | 280 |
| 286 observer->OnTouchscreenDevicesUpdated(touchscreens); | 281 observer->OnTouchscreenDevicesUpdated(touchscreens); |
| 287 } | 282 } |
| 288 | 283 |
| 289 int EventFactoryEvdev::NextDeviceId() { | 284 int EventFactoryEvdev::NextDeviceId() { |
| 290 return ++last_device_id_; | 285 return ++last_device_id_; |
| 291 } | 286 } |
| 292 | 287 |
| 293 } // namespace ui | 288 } // namespace ui |
| OLD | NEW |