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/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 |
11 #include "base/message_loop/message_loop.h" | 11 #include "base/message_loop/message_loop.h" |
12 #include "base/strings/string_util.h" | 12 #include "base/strings/string_util.h" |
13 #include "base/strings/stringprintf.h" | 13 #include "base/strings/stringprintf.h" |
14 | 14 |
15 namespace ui { | 15 namespace ui { |
16 | 16 |
17 namespace { | 17 namespace { |
18 | 18 |
19 std::string FormatLog(const char* fmt, va_list args) { | 19 std::string FormatLog(const char* fmt, va_list args) { |
20 std::string msg = base::StringPrintV(fmt, args); | 20 std::string msg = base::StringPrintV(fmt, args); |
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 scoped_ptr<Delegate> delegate) | 31 scoped_ptr<Delegate> delegate) |
31 : EventConverterEvdev(fd, path), delegate_(delegate.Pass()) { | 32 : EventConverterEvdev(fd, path, id), delegate_(delegate.Pass()) { |
32 memset(&evdev_, 0, sizeof(evdev_)); | 33 memset(&evdev_, 0, sizeof(evdev_)); |
33 evdev_.log = OnLogMessage; | 34 evdev_.log = OnLogMessage; |
34 evdev_.log_udata = this; | 35 evdev_.log_udata = this; |
35 evdev_.syn_report = OnSynReport; | 36 evdev_.syn_report = OnSynReport; |
36 evdev_.syn_report_udata = this; | 37 evdev_.syn_report_udata = this; |
37 evdev_.fd = fd; | 38 evdev_.fd = fd; |
38 | 39 |
39 memset(&evstate_, 0, sizeof(evstate_)); | 40 memset(&evstate_, 0, sizeof(evstate_)); |
40 evdev_.evstate = &evstate_; | 41 evdev_.evstate = &evstate_; |
41 Event_Init(&evdev_); | 42 Event_Init(&evdev_); |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
81 if (level >= LOGLEVEL_ERROR) | 82 if (level >= LOGLEVEL_ERROR) |
82 LOG(ERROR) << "libevdev: " << FormatLog(fmt, args); | 83 LOG(ERROR) << "libevdev: " << FormatLog(fmt, args); |
83 else if (level >= LOGLEVEL_WARNING) | 84 else if (level >= LOGLEVEL_WARNING) |
84 LOG(WARNING) << "libevdev: " << FormatLog(fmt, args); | 85 LOG(WARNING) << "libevdev: " << FormatLog(fmt, args); |
85 else | 86 else |
86 VLOG(3) << "libevdev: " << FormatLog(fmt, args); | 87 VLOG(3) << "libevdev: " << FormatLog(fmt, args); |
87 va_end(args); | 88 va_end(args); |
88 } | 89 } |
89 | 90 |
90 } // namespace ui | 91 } // namespace ui |
OLD | NEW |