OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 #ifndef UI_OZONE_PLATFORM_WAYLAND_WAYLAND_CONNECTION_H_ | 5 #ifndef UI_OZONE_PLATFORM_WAYLAND_WAYLAND_CONNECTION_H_ |
6 #define UI_OZONE_PLATFORM_WAYLAND_WAYLAND_CONNECTION_H_ | 6 #define UI_OZONE_PLATFORM_WAYLAND_WAYLAND_CONNECTION_H_ |
7 | 7 |
8 #include <map> | 8 #include <map> |
9 | 9 |
10 #include "base/message_loop/message_pump_libevent.h" | 10 #include "base/message_loop/message_pump_libevent.h" |
11 #include "ui/events/platform/platform_event_source.h" | 11 #include "ui/events/platform/platform_event_source.h" |
12 #include "ui/gfx/native_widget_types.h" | 12 #include "ui/gfx/native_widget_types.h" |
| 13 #include "ui/ozone/platform/wayland/wayland_keyboard.h" |
13 #include "ui/ozone/platform/wayland/wayland_object.h" | 14 #include "ui/ozone/platform/wayland/wayland_object.h" |
14 #include "ui/ozone/platform/wayland/wayland_output.h" | 15 #include "ui/ozone/platform/wayland/wayland_output.h" |
15 #include "ui/ozone/platform/wayland/wayland_pointer.h" | 16 #include "ui/ozone/platform/wayland/wayland_pointer.h" |
16 | 17 |
17 namespace ui { | 18 namespace ui { |
18 | 19 |
19 class WaylandWindow; | 20 class WaylandWindow; |
20 | 21 |
21 class WaylandConnection : public PlatformEventSource, | 22 class WaylandConnection : public PlatformEventSource, |
22 public base::MessagePumpLibevent::Watcher { | 23 public base::MessagePumpLibevent::Watcher { |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
71 std::map<gfx::AcceleratedWidget, WaylandWindow*> window_map_; | 72 std::map<gfx::AcceleratedWidget, WaylandWindow*> window_map_; |
72 | 73 |
73 wl::Object<wl_display> display_; | 74 wl::Object<wl_display> display_; |
74 wl::Object<wl_registry> registry_; | 75 wl::Object<wl_registry> registry_; |
75 wl::Object<wl_compositor> compositor_; | 76 wl::Object<wl_compositor> compositor_; |
76 wl::Object<wl_seat> seat_; | 77 wl::Object<wl_seat> seat_; |
77 wl::Object<wl_shm> shm_; | 78 wl::Object<wl_shm> shm_; |
78 wl::Object<xdg_shell> shell_; | 79 wl::Object<xdg_shell> shell_; |
79 | 80 |
80 std::unique_ptr<WaylandPointer> pointer_; | 81 std::unique_ptr<WaylandPointer> pointer_; |
| 82 std::unique_ptr<WaylandKeyboard> keyboard_; |
81 | 83 |
82 bool scheduled_flush_ = false; | 84 bool scheduled_flush_ = false; |
83 bool watching_ = false; | 85 bool watching_ = false; |
84 base::MessagePumpLibevent::FileDescriptorWatcher controller_; | 86 base::MessagePumpLibevent::FileDescriptorWatcher controller_; |
85 | 87 |
86 std::vector<std::unique_ptr<WaylandOutput>> output_list_; | 88 std::vector<std::unique_ptr<WaylandOutput>> output_list_; |
87 | 89 |
88 DISALLOW_COPY_AND_ASSIGN(WaylandConnection); | 90 DISALLOW_COPY_AND_ASSIGN(WaylandConnection); |
89 }; | 91 }; |
90 | 92 |
91 } // namespace ui | 93 } // namespace ui |
92 | 94 |
93 #endif // UI_OZONE_PLATFORM_WAYLAND_WAYLAND_CONNECTION_H_ | 95 #endif // UI_OZONE_PLATFORM_WAYLAND_WAYLAND_CONNECTION_H_ |
OLD | NEW |