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

Unified Diff: ui/ozone/platform/wayland/wayland_connection.cc

Issue 2042503002: ozone/platform/wayland: Add support for wl_output_interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: WaylandDisplay => WaylandConnection, WaylandScreen => WaylandOutput Created 4 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: ui/ozone/platform/wayland/wayland_connection.cc
diff --git a/ui/ozone/platform/wayland/wayland_connection.cc b/ui/ozone/platform/wayland/wayland_connection.cc
new file mode 100644
index 0000000000000000000000000000000000000000..aa1ed6b5f8796f89518497bb177503059087badc
--- /dev/null
+++ b/ui/ozone/platform/wayland/wayland_connection.cc
@@ -0,0 +1,243 @@
+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "ui/ozone/platform/wayland/wayland_connection.h"
+
+#include <xdg-shell-unstable-v5-client-protocol.h>
rjkroege 2016/07/08 21:59:19 As someone who may have to maintain this code, sho
Michael Forney 2016/07/08 22:28:44 I don't think you should be too concerned. xdg-she
+
+#include "base/bind.h"
+#include "base/logging.h"
+#include "base/memory/ptr_util.h"
+#include "base/message_loop/message_loop.h"
+#include "ui/ozone/platform/wayland/wayland_object.h"
+#include "ui/ozone/platform/wayland/wayland_window.h"
+
+static_assert(XDG_SHELL_VERSION_CURRENT == 5, "Unsupported xdg-shell version");
+
+namespace ui {
+namespace {
+const uint32_t kMaxCompositorVersion = 4;
+const uint32_t kMaxSeatVersion = 4;
+const uint32_t kMaxShmVersion = 1;
+const uint32_t kMaxXdgShellVersion = 1;
+} // namespace
+
+WaylandConnection::WaylandConnection() {}
+
+WaylandConnection::~WaylandConnection() {
+ for (WaylandOutput* output : output_list_)
+ delete output;
+ output_list_.clear();
+}
+
+bool WaylandConnection::Initialize() {
+ static const wl_registry_listener registry_listener = {
+ &WaylandConnection::Global, &WaylandConnection::GlobalRemove,
+ };
+
+ display_.reset(wl_display_connect(nullptr));
+ if (!display_) {
+ LOG(ERROR) << "Failed to connect to Wayland display";
+ return false;
+ }
+
+ registry_.reset(wl_display_get_registry(display_.get()));
+ if (!registry_) {
+ LOG(ERROR) << "Failed to get Wayland registry";
+ return false;
+ }
+
+ wl_registry_add_listener(registry_.get(), &registry_listener, this);
+ wl_display_roundtrip(display_.get());
+
+ if (!compositor_) {
+ LOG(ERROR) << "No wl_compositor object";
+ return false;
+ }
+ if (!shm_) {
+ LOG(ERROR) << "No wl_shm object";
+ return false;
+ }
+ if (!seat_) {
+ LOG(ERROR) << "No wl_seat object";
+ return false;
+ }
+ if (!shell_) {
+ LOG(ERROR) << "No xdg_shell object";
+ return false;
+ }
+
+ return true;
+}
+
+bool WaylandConnection::StartProcessingEvents() {
+ if (watching_)
+ return true;
+
+ DCHECK(display_);
+ wl_display_flush(display_.get());
+
+ DCHECK(base::MessageLoopForUI::IsCurrent());
+ if (!base::MessageLoopForUI::current()->WatchFileDescriptor(
+ wl_display_get_fd(display_.get()), true,
+ base::MessagePumpLibevent::WATCH_READ, &controller_, this))
+ return false;
+
+ watching_ = true;
+ return true;
+}
+
+void WaylandConnection::ScheduleFlush() {
+ if (scheduled_flush_ || !watching_)
+ return;
+ base::MessageLoopForUI::current()->task_runner()->PostTask(
+ FROM_HERE, base::Bind(&WaylandConnection::Flush, base::Unretained(this)));
+ scheduled_flush_ = true;
+}
+
+WaylandWindow* WaylandConnection::GetWindow(gfx::AcceleratedWidget widget) {
+ auto it = window_map_.find(widget);
+ return it == window_map_.end() ? nullptr : it->second;
+}
+
+void WaylandConnection::AddWindow(gfx::AcceleratedWidget widget,
+ WaylandWindow* window) {
+ window_map_[widget] = window;
+}
+
+void WaylandConnection::RemoveWindow(gfx::AcceleratedWidget widget) {
+ window_map_.erase(widget);
+}
+
+WaylandOutput* WaylandConnection::PrimaryOutput() const {
+ if (!output_list_.size())
+ return nullptr;
+ return output_list_.front();
+}
+
+void WaylandConnection::OnDispatcherListChanged() {
+ StartProcessingEvents();
+}
+
+void WaylandConnection::Flush() {
+ wl_display_flush(display_.get());
+ scheduled_flush_ = false;
+}
+
+void WaylandConnection::DispatchUiEvent(Event* event) {
+ PlatformEventSource::DispatchEvent(event);
+}
+
+void WaylandConnection::OnFileCanReadWithoutBlocking(int fd) {
+ wl_display_dispatch(display_.get());
+ for (const auto& window : window_map_)
+ window.second->ApplyPendingBounds();
+}
+
+void WaylandConnection::OnFileCanWriteWithoutBlocking(int fd) {}
+
+const std::vector<WaylandOutput*>& WaylandConnection::GetOutputList() const {
+ return output_list_;
+}
+
+// static
+void WaylandConnection::Global(void* data,
+ wl_registry* registry,
+ uint32_t name,
+ const char* interface,
+ uint32_t version) {
+ static const wl_seat_listener seat_listener = {
+ &WaylandConnection::Capabilities, &WaylandConnection::Name,
+ };
+ static const xdg_shell_listener shell_listener = {
+ &WaylandConnection::Ping,
+ };
+
+ WaylandConnection* connection = static_cast<WaylandConnection*>(data);
+ if (!connection->compositor_ && strcmp(interface, "wl_compositor") == 0) {
+ connection->compositor_ = wl::Bind<wl_compositor>(
+ registry, name, std::min(version, kMaxCompositorVersion));
+ if (!connection->compositor_)
+ LOG(ERROR) << "Failed to bind to wl_compositor global";
+ } else if (!connection->shm_ && strcmp(interface, "wl_shm") == 0) {
+ connection->shm_ =
+ wl::Bind<wl_shm>(registry, name, std::min(version, kMaxShmVersion));
+ if (!connection->shm_)
+ LOG(ERROR) << "Failed to bind to wl_shm global";
+ } else if (!connection->seat_ && strcmp(interface, "wl_seat") == 0) {
+ connection->seat_ =
+ wl::Bind<wl_seat>(registry, name, std::min(version, kMaxSeatVersion));
+ if (!connection->seat_) {
+ LOG(ERROR) << "Failed to bind to wl_seat global";
+ return;
+ }
+ wl_seat_add_listener(connection->seat_.get(), &seat_listener, connection);
+ } else if (!connection->shell_ && strcmp(interface, "xdg_shell") == 0) {
+ connection->shell_ = wl::Bind<xdg_shell>(
+ registry, name, std::min(version, kMaxXdgShellVersion));
+ if (!connection->shell_) {
+ LOG(ERROR) << "Failed to bind to xdg_shell global";
+ return;
+ }
+ xdg_shell_add_listener(connection->shell_.get(), &shell_listener,
+ connection);
+ xdg_shell_use_unstable_version(connection->shell_.get(),
+ XDG_SHELL_VERSION_CURRENT);
+ } else if (strcmp(interface, "wl_output") == 0) {
+ wl::Object<wl_output> output = wl::Bind<wl_output>(registry, name, 1);
+ if (!output) {
+ LOG(ERROR) << "Failed to bind to wl_output global";
+ return;
+ }
+
+ WaylandOutput* wayland_output = new WaylandOutput(name, output.release());
+ if (!connection->output_list_.empty())
+ NOTIMPLEMENTED() << "Multiple screens support is not implemented";
+
+ connection->output_list_.push_back(wayland_output);
+ }
+
+ connection->ScheduleFlush();
+}
+
+// static
+void WaylandConnection::GlobalRemove(void* data,
+ wl_registry* registry,
+ uint32_t name) {
+ NOTIMPLEMENTED();
+}
+
+// static
+void WaylandConnection::Capabilities(void* data,
+ wl_seat* seat,
+ uint32_t capabilities) {
+ WaylandConnection* connection = static_cast<WaylandConnection*>(data);
+ if (capabilities & WL_SEAT_CAPABILITY_POINTER) {
+ if (!connection->pointer_) {
+ wl_pointer* pointer = wl_seat_get_pointer(connection->seat_.get());
+ if (!pointer) {
+ LOG(ERROR) << "Failed to get wl_pointer from seat";
+ return;
+ }
+ connection->pointer_ = base::WrapUnique(new WaylandPointer(
+ pointer, base::Bind(&WaylandConnection::DispatchUiEvent,
+ base::Unretained(connection))));
+ }
+ } else if (connection->pointer_) {
+ connection->pointer_.reset();
+ }
+ connection->ScheduleFlush();
+}
+
+// static
+void WaylandConnection::Name(void* data, wl_seat* seat, const char* name) {}
+
+// static
+void WaylandConnection::Ping(void* data, xdg_shell* shell, uint32_t serial) {
+ WaylandConnection* connection = static_cast<WaylandConnection*>(data);
+ xdg_shell_pong(shell, serial);
+ connection->ScheduleFlush();
+}
+
+} // namespace ui

Powered by Google App Engine
This is Rietveld 408576698