| 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/platform/x11/x11_event_source.h" | 5 #include "ui/events/platform/x11/x11_event_source.h" |
| 6 | 6 |
| 7 #include <X11/Xlib.h> | 7 #include <X11/Xlib.h> |
| 8 | 8 |
| 9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 10 #include "base/message_loop/message_pump_libevent.h" | 10 #include "base/message_loop/message_pump_libevent.h" |
| 11 | 11 |
| 12 namespace ui { | 12 namespace ui { |
| 13 | 13 |
| 14 namespace { | 14 namespace { |
| 15 | 15 |
| 16 class X11EventSourceLibevent : public X11EventSource, | 16 class X11EventSourceLibevent : public X11EventSource, |
| 17 public base::MessagePumpLibevent::Watcher { | 17 public base::MessagePumpLibevent::Watcher { |
| 18 public: | 18 public: |
| 19 explicit X11EventSourceLibevent(XDisplay* display) | 19 explicit X11EventSourceLibevent(XDisplay* display) |
| 20 : X11EventSource(display), | 20 : X11EventSource(display), |
| 21 initialized_(false) { | 21 initialized_(false) { |
| 22 AddEventWatcher(); | 22 AddEventWatcher(); |
| 23 } | 23 } |
| 24 | 24 |
| 25 virtual ~X11EventSourceLibevent() { | 25 ~X11EventSourceLibevent() override { |
| 26 } | 26 } |
| 27 | 27 |
| 28 private: | 28 private: |
| 29 void AddEventWatcher() { | 29 void AddEventWatcher() { |
| 30 if (initialized_) | 30 if (initialized_) |
| 31 return; | 31 return; |
| 32 if (!base::MessageLoop::current()) | 32 if (!base::MessageLoop::current()) |
| 33 return; | 33 return; |
| 34 | 34 |
| 35 int fd = ConnectionNumber(display()); | 35 int fd = ConnectionNumber(display()); |
| 36 base::MessageLoopForUI::current()->WatchFileDescriptor(fd, true, | 36 base::MessageLoopForUI::current()->WatchFileDescriptor(fd, true, |
| 37 base::MessagePumpLibevent::WATCH_READ, &watcher_controller_, this); | 37 base::MessagePumpLibevent::WATCH_READ, &watcher_controller_, this); |
| 38 initialized_ = true; | 38 initialized_ = true; |
| 39 } | 39 } |
| 40 | 40 |
| 41 // PlatformEventSource: | 41 // PlatformEventSource: |
| 42 virtual void OnDispatcherListChanged() override { | 42 void OnDispatcherListChanged() override { |
| 43 AddEventWatcher(); | 43 AddEventWatcher(); |
| 44 } | 44 } |
| 45 | 45 |
| 46 // base::MessagePumpLibevent::Watcher: | 46 // base::MessagePumpLibevent::Watcher: |
| 47 virtual void OnFileCanReadWithoutBlocking(int fd) override { | 47 void OnFileCanReadWithoutBlocking(int fd) override { |
| 48 DispatchXEvents(); | 48 DispatchXEvents(); |
| 49 } | 49 } |
| 50 | 50 |
| 51 virtual void OnFileCanWriteWithoutBlocking(int fd) override { | 51 void OnFileCanWriteWithoutBlocking(int fd) override { |
| 52 NOTREACHED(); | 52 NOTREACHED(); |
| 53 } | 53 } |
| 54 | 54 |
| 55 base::MessagePumpLibevent::FileDescriptorWatcher watcher_controller_; | 55 base::MessagePumpLibevent::FileDescriptorWatcher watcher_controller_; |
| 56 bool initialized_; | 56 bool initialized_; |
| 57 | 57 |
| 58 DISALLOW_COPY_AND_ASSIGN(X11EventSourceLibevent); | 58 DISALLOW_COPY_AND_ASSIGN(X11EventSourceLibevent); |
| 59 }; | 59 }; |
| 60 | 60 |
| 61 } // namespace | 61 } // namespace |
| 62 | 62 |
| 63 scoped_ptr<PlatformEventSource> PlatformEventSource::CreateDefault() { | 63 scoped_ptr<PlatformEventSource> PlatformEventSource::CreateDefault() { |
| 64 return scoped_ptr<PlatformEventSource>( | 64 return scoped_ptr<PlatformEventSource>( |
| 65 new X11EventSourceLibevent(gfx::GetXDisplay())); | 65 new X11EventSourceLibevent(gfx::GetXDisplay())); |
| 66 } | 66 } |
| 67 | 67 |
| 68 } // namespace ui | 68 } // namespace ui |
| OLD | NEW |