ozone/platform/wayland: Add support for wl_output_interface

ui/ozone/platform/wayland/wayland_connection.cc

 // 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>
 
 #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() {}
+WaylandConnection::~WaylandConnection() {
+  for (WaylandOutput* output : output_list_)
+    delete output;

[rjkroege, 2016/07/25 23:45:46]

Keep WaylandOutput in a self-deleting type like std::unique_ptr?

[joone, 2016/09/21 21:21:22]

Done.

+  output_list_.clear();

[rjkroege, 2016/07/25 23:45:46]

redundant I would think.

[joone, 2016/09/21 21:21:22]

Done.

+}
 
 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;
@@ skipping 60 matching lines @@
 
 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 = {
@@ skipping 23 matching lines @@
     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(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();
@@ skipping 25 matching lines @@
 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