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

Side by Side Diff: ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.cc

Issue 790153005: ozone: evdev: Add property to identify internal or external devices (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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
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/libgestures_glue/event_reader_libevdev_cros.h" 5 #include "ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.h"
6 6
7 #include <errno.h> 7 #include <errno.h>
8 #include <libevdev/libevdev.h> 8 #include <libevdev/libevdev.h>
9 #include <linux/input.h> 9 #include <linux/input.h>
10 10
(...skipping 10 matching lines...) Expand all
21 if (!msg.empty() && msg[msg.size() - 1] == '\n') 21 if (!msg.empty() && msg[msg.size() - 1] == '\n')
22 msg.erase(msg.end() - 1, msg.end()); 22 msg.erase(msg.end() - 1, msg.end());
23 return msg; 23 return msg;
24 } 24 }
25 25
26 } // namespace 26 } // namespace
27 27
28 EventReaderLibevdevCros::EventReaderLibevdevCros(int fd, 28 EventReaderLibevdevCros::EventReaderLibevdevCros(int fd,
29 const base::FilePath& path, 29 const base::FilePath& path,
30 int id, 30 int id,
31 InputDeviceType type,
31 scoped_ptr<Delegate> delegate) 32 scoped_ptr<Delegate> delegate)
32 : EventConverterEvdev(fd, path, id), delegate_(delegate.Pass()) { 33 : EventConverterEvdev(fd, path, id, type), delegate_(delegate.Pass()) {
33 memset(&evdev_, 0, sizeof(evdev_)); 34 memset(&evdev_, 0, sizeof(evdev_));
34 evdev_.log = OnLogMessage; 35 evdev_.log = OnLogMessage;
35 evdev_.log_udata = this; 36 evdev_.log_udata = this;
36 evdev_.syn_report = OnSynReport; 37 evdev_.syn_report = OnSynReport;
37 evdev_.syn_report_udata = this; 38 evdev_.syn_report_udata = this;
38 evdev_.fd = fd; 39 evdev_.fd = fd;
39 40
40 memset(&evstate_, 0, sizeof(evstate_)); 41 memset(&evstate_, 0, sizeof(evstate_));
41 evdev_.evstate = &evstate_; 42 evdev_.evstate = &evstate_;
42 Event_Init(&evdev_); 43 Event_Init(&evdev_);
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 if (level >= LOGLEVEL_ERROR) 83 if (level >= LOGLEVEL_ERROR)
83 LOG(ERROR) << "libevdev: " << FormatLog(fmt, args); 84 LOG(ERROR) << "libevdev: " << FormatLog(fmt, args);
84 else if (level >= LOGLEVEL_WARNING) 85 else if (level >= LOGLEVEL_WARNING)
85 LOG(WARNING) << "libevdev: " << FormatLog(fmt, args); 86 LOG(WARNING) << "libevdev: " << FormatLog(fmt, args);
86 else 87 else
87 VLOG(3) << "libevdev: " << FormatLog(fmt, args); 88 VLOG(3) << "libevdev: " << FormatLog(fmt, args);
88 va_end(args); 89 va_end(args);
89 } 90 }
90 91
91 } // namespace ui 92 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698