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

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

Issue 616633002: [Ozone-Evdev] Propagate touchscreen device information to DeviceDataManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . 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
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
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 #include "ui/events/ozone/evdev/event_device_info.h"
14 15
15 namespace ui { 16 namespace ui {
16 17
17 namespace { 18 namespace {
18 19
19 std::string FormatLog(const char* fmt, va_list args) { 20 std::string FormatLog(const char* fmt, va_list args) {
20 std::string msg = base::StringPrintV(fmt, args); 21 std::string msg = base::StringPrintV(fmt, args);
21 if (!msg.empty() && msg[msg.size() - 1] == '\n') 22 if (!msg.empty() && msg[msg.size() - 1] == '\n')
22 msg.erase(msg.end() - 1, msg.end()); 23 msg.erase(msg.end() - 1, msg.end());
23 return msg; 24 return msg;
24 } 25 }
25 26
26 } // namespace 27 } // namespace
27 28
28 EventReaderLibevdevCros::EventReaderLibevdevCros(int fd, 29 EventReaderLibevdevCros::EventReaderLibevdevCros(
29 const base::FilePath& path, 30 int fd,
30 scoped_ptr<Delegate> delegate) 31 const base::FilePath& path,
31 : EventConverterEvdev(fd, path), delegate_(delegate.Pass()) { 32 scoped_ptr<EventDeviceInfo> device_info,
33 scoped_ptr<Delegate> delegate)
34 : EventConverterEvdev(fd, path, device_info.Pass()),
35 delegate_(delegate.Pass()) {
32 memset(&evdev_, 0, sizeof(evdev_)); 36 memset(&evdev_, 0, sizeof(evdev_));
33 evdev_.log = OnLogMessage; 37 evdev_.log = OnLogMessage;
34 evdev_.log_udata = this; 38 evdev_.log_udata = this;
35 evdev_.syn_report = OnSynReport; 39 evdev_.syn_report = OnSynReport;
36 evdev_.syn_report_udata = this; 40 evdev_.syn_report_udata = this;
37 evdev_.fd = fd; 41 evdev_.fd = fd;
38 42
39 memset(&evstate_, 0, sizeof(evstate_)); 43 memset(&evstate_, 0, sizeof(evstate_));
40 evdev_.evstate = &evstate_; 44 evdev_.evstate = &evstate_;
41 Event_Init(&evdev_); 45 Event_Init(&evdev_);
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 if (level >= LOGLEVEL_ERROR) 85 if (level >= LOGLEVEL_ERROR)
82 LOG(ERROR) << "libevdev: " << FormatLog(fmt, args); 86 LOG(ERROR) << "libevdev: " << FormatLog(fmt, args);
83 else if (level >= LOGLEVEL_WARNING) 87 else if (level >= LOGLEVEL_WARNING)
84 LOG(WARNING) << "libevdev: " << FormatLog(fmt, args); 88 LOG(WARNING) << "libevdev: " << FormatLog(fmt, args);
85 else 89 else
86 VLOG(3) << "libevdev: " << FormatLog(fmt, args); 90 VLOG(3) << "libevdev: " << FormatLog(fmt, args);
87 va_end(args); 91 va_end(args);
88 } 92 }
89 93
90 } // namespace ui 94 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698