| 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 |
| 18 #if defined(USE_XKBCOMMON) |
| 19 #include "ui/events/ozone/layout/xkb/xkb_evdev_codes.h" |
| 20 #endif |
| 21 |
| 17 namespace ui { | 22 namespace ui { |
| 18 | 23 |
| 19 class WaylandWindow; | 24 class WaylandWindow; |
| 20 | 25 |
| 21 class WaylandConnection : public PlatformEventSource, | 26 class WaylandConnection : public PlatformEventSource, |
| 22 public base::MessagePumpLibevent::Watcher { | 27 public base::MessagePumpLibevent::Watcher { |
| 23 public: | 28 public: |
| 24 WaylandConnection(); | 29 WaylandConnection(); |
| 25 ~WaylandConnection() override; | 30 ~WaylandConnection() override; |
| 26 | 31 |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 std::map<gfx::AcceleratedWidget, WaylandWindow*> window_map_; | 76 std::map<gfx::AcceleratedWidget, WaylandWindow*> window_map_; |
| 72 | 77 |
| 73 wl::Object<wl_display> display_; | 78 wl::Object<wl_display> display_; |
| 74 wl::Object<wl_registry> registry_; | 79 wl::Object<wl_registry> registry_; |
| 75 wl::Object<wl_compositor> compositor_; | 80 wl::Object<wl_compositor> compositor_; |
| 76 wl::Object<wl_seat> seat_; | 81 wl::Object<wl_seat> seat_; |
| 77 wl::Object<wl_shm> shm_; | 82 wl::Object<wl_shm> shm_; |
| 78 wl::Object<xdg_shell> shell_; | 83 wl::Object<xdg_shell> shell_; |
| 79 | 84 |
| 80 std::unique_ptr<WaylandPointer> pointer_; | 85 std::unique_ptr<WaylandPointer> pointer_; |
| 86 std::unique_ptr<WaylandKeyboard> keyboard_; |
| 81 | 87 |
| 82 bool scheduled_flush_ = false; | 88 bool scheduled_flush_ = false; |
| 83 bool watching_ = false; | 89 bool watching_ = false; |
| 84 base::MessagePumpLibevent::FileDescriptorWatcher controller_; | 90 base::MessagePumpLibevent::FileDescriptorWatcher controller_; |
| 85 | 91 |
| 86 std::vector<std::unique_ptr<WaylandOutput>> output_list_; | 92 std::vector<std::unique_ptr<WaylandOutput>> output_list_; |
| 87 | 93 |
| 94 #if defined(USE_XKBCOMMON) |
| 95 XkbEvdevCodes codes_; |
| 96 #endif |
| 97 |
| 88 DISALLOW_COPY_AND_ASSIGN(WaylandConnection); | 98 DISALLOW_COPY_AND_ASSIGN(WaylandConnection); |
| 89 }; | 99 }; |
| 90 | 100 |
| 91 } // namespace ui | 101 } // namespace ui |
| 92 | 102 |
| 93 #endif // UI_OZONE_PLATFORM_WAYLAND_WAYLAND_CONNECTION_H_ | 103 #endif // UI_OZONE_PLATFORM_WAYLAND_WAYLAND_CONNECTION_H_ |
| OLD | NEW |