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_DISPLAY_H_ | 5 #ifndef UI_OZONE_PLATFORM_WAYLAND_WAYLAND_DISPLAY_H_ |
6 #define UI_OZONE_PLATFORM_WAYLAND_WAYLAND_DISPLAY_H_ | 6 #define UI_OZONE_PLATFORM_WAYLAND_WAYLAND_DISPLAY_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_pointer.h" | 15 #include "ui/ozone/platform/wayland/wayland_pointer.h" |
15 | 16 |
| 17 #if defined(USE_XKBCOMMON) |
| 18 #include "ui/events/ozone/layout/xkb/xkb_evdev_codes.h" |
| 19 #endif |
| 20 |
16 namespace ui { | 21 namespace ui { |
17 | 22 |
18 class WaylandWindow; | 23 class WaylandWindow; |
19 | 24 |
20 class WaylandDisplay : public PlatformEventSource, | 25 class WaylandDisplay : public PlatformEventSource, |
21 public base::MessagePumpLibevent::Watcher { | 26 public base::MessagePumpLibevent::Watcher { |
22 public: | 27 public: |
23 WaylandDisplay(); | 28 WaylandDisplay(); |
24 ~WaylandDisplay() override; | 29 ~WaylandDisplay() override; |
25 | 30 |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
67 std::map<gfx::AcceleratedWidget, WaylandWindow*> window_map_; | 72 std::map<gfx::AcceleratedWidget, WaylandWindow*> window_map_; |
68 | 73 |
69 wl::Object<wl_display> display_; | 74 wl::Object<wl_display> display_; |
70 wl::Object<wl_registry> registry_; | 75 wl::Object<wl_registry> registry_; |
71 wl::Object<wl_compositor> compositor_; | 76 wl::Object<wl_compositor> compositor_; |
72 wl::Object<wl_seat> seat_; | 77 wl::Object<wl_seat> seat_; |
73 wl::Object<wl_shm> shm_; | 78 wl::Object<wl_shm> shm_; |
74 wl::Object<xdg_shell> shell_; | 79 wl::Object<xdg_shell> shell_; |
75 | 80 |
76 scoped_ptr<WaylandPointer> pointer_; | 81 scoped_ptr<WaylandPointer> pointer_; |
| 82 scoped_ptr<WaylandKeyboard> keyboard_; |
77 | 83 |
78 bool scheduled_flush_ = false; | 84 bool scheduled_flush_ = false; |
79 bool watching_ = false; | 85 bool watching_ = false; |
80 base::MessagePumpLibevent::FileDescriptorWatcher controller_; | 86 base::MessagePumpLibevent::FileDescriptorWatcher controller_; |
81 | 87 |
| 88 #if defined(USE_XKBCOMMON) |
| 89 XkbEvdevCodes codes_; |
| 90 #endif |
| 91 |
82 DISALLOW_COPY_AND_ASSIGN(WaylandDisplay); | 92 DISALLOW_COPY_AND_ASSIGN(WaylandDisplay); |
83 }; | 93 }; |
84 | 94 |
85 } // namespace ui | 95 } // namespace ui |
86 | 96 |
87 #endif // UI_OZONE_PLATFORM_WAYLAND_WAYLAND_DISPLAY_H_ | 97 #endif // UI_OZONE_PLATFORM_WAYLAND_WAYLAND_DISPLAY_H_ |
OLD | NEW |