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

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

Issue 561243002: ozone: evdev: Move read polling into EventConverterEvdev (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
(...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 scoped_ptr<Delegate> delegate) 30 scoped_ptr<Delegate> delegate)
31 : path_(path), delegate_(delegate.Pass()) { 31 : EventConverterEvdev(fd, path), delegate_(delegate.Pass()) {
32 memset(&evdev_, 0, sizeof(evdev_)); 32 memset(&evdev_, 0, sizeof(evdev_));
33 evdev_.log = OnLogMessage; 33 evdev_.log = OnLogMessage;
34 evdev_.log_udata = this; 34 evdev_.log_udata = this;
35 evdev_.syn_report = OnSynReport; 35 evdev_.syn_report = OnSynReport;
36 evdev_.syn_report_udata = this; 36 evdev_.syn_report_udata = this;
37 evdev_.fd = fd; 37 evdev_.fd = fd;
38 38
39 memset(&evstate_, 0, sizeof(evstate_)); 39 memset(&evstate_, 0, sizeof(evstate_));
40 evdev_.evstate = &evstate_; 40 evdev_.evstate = &evstate_;
41 Event_Init(&evdev_); 41 Event_Init(&evdev_);
42 42
43 Event_Open(&evdev_); 43 Event_Open(&evdev_);
44 44
45 delegate_->OnLibEvdevCrosOpen(&evdev_, &evstate_); 45 delegate_->OnLibEvdevCrosOpen(&evdev_, &evstate_);
46 } 46 }
47 47
48 EventReaderLibevdevCros::~EventReaderLibevdevCros() { 48 EventReaderLibevdevCros::~EventReaderLibevdevCros() {
49 Stop(); 49 Stop();
50 EvdevClose(&evdev_); 50 EvdevClose(&evdev_);
51 } 51 }
52 52
53 EventReaderLibevdevCros::Delegate::~Delegate() {} 53 EventReaderLibevdevCros::Delegate::~Delegate() {}
54 54
55 void EventReaderLibevdevCros::Start() {
56 base::MessageLoopForUI::current()->WatchFileDescriptor(
57 evdev_.fd,
58 true,
59 base::MessagePumpLibevent::WATCH_READ,
60 &controller_,
61 this);
62 }
63
64 void EventReaderLibevdevCros::Stop() {
65 controller_.StopWatchingFileDescriptor();
66 }
67
68 void EventReaderLibevdevCros::OnFileCanReadWithoutBlocking(int fd) { 55 void EventReaderLibevdevCros::OnFileCanReadWithoutBlocking(int fd) {
69 if (EvdevRead(&evdev_)) { 56 if (EvdevRead(&evdev_)) {
70 if (errno == EINTR || errno == EAGAIN) 57 if (errno == EINTR || errno == EAGAIN)
71 return; 58 return;
72 if (errno != ENODEV) 59 if (errno != ENODEV)
73 PLOG(ERROR) << "error reading device " << path_.value(); 60 PLOG(ERROR) << "error reading device " << path_.value();
74 Stop(); 61 Stop();
75 return; 62 return;
76 } 63 }
77 } 64 }
78 65
79 void EventReaderLibevdevCros::OnFileCanWriteWithoutBlocking(int fd) {
80 NOTREACHED();
81 }
82
83 // static 66 // static
84 void EventReaderLibevdevCros::OnSynReport(void* data, 67 void EventReaderLibevdevCros::OnSynReport(void* data,
85 EventStateRec* evstate, 68 EventStateRec* evstate,
86 struct timeval* tv) { 69 struct timeval* tv) {
87 EventReaderLibevdevCros* reader = static_cast<EventReaderLibevdevCros*>(data); 70 EventReaderLibevdevCros* reader = static_cast<EventReaderLibevdevCros*>(data);
88 reader->delegate_->OnLibEvdevCrosEvent(&reader->evdev_, evstate, *tv); 71 reader->delegate_->OnLibEvdevCrosEvent(&reader->evdev_, evstate, *tv);
89 } 72 }
90 73
91 // static 74 // static
92 void EventReaderLibevdevCros::OnLogMessage(void* data, 75 void EventReaderLibevdevCros::OnLogMessage(void* data,
93 int level, 76 int level,
94 const char* fmt, 77 const char* fmt,
95 ...) { 78 ...) {
96 va_list args; 79 va_list args;
97 va_start(args, fmt); 80 va_start(args, fmt);
98 if (level >= LOGLEVEL_ERROR) 81 if (level >= LOGLEVEL_ERROR)
99 LOG(ERROR) << "libevdev: " << FormatLog(fmt, args); 82 LOG(ERROR) << "libevdev: " << FormatLog(fmt, args);
100 else if (level >= LOGLEVEL_WARNING) 83 else if (level >= LOGLEVEL_WARNING)
101 LOG(WARNING) << "libevdev: " << FormatLog(fmt, args); 84 LOG(WARNING) << "libevdev: " << FormatLog(fmt, args);
102 else 85 else
103 VLOG(3) << "libevdev: " << FormatLog(fmt, args); 86 VLOG(3) << "libevdev: " << FormatLog(fmt, args);
104 va_end(args); 87 va_end(args);
105 } 88 }
106 89
107 } // namespace ui 90 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698