EXO: Refactored wl_seat interface for cast usage

Move wl_seat interface out of server.cc,
removed usage of keyboard and pointer for cast shell.

Bug: 896710
Test: Built on ChromeOS
Change-Id: I3e91381883ff028e684b5c4bfbb1dd744cf31ed8
Reviewed-on: https://chromium-review.googlesource.com/c/1324099
Commit-Queue: Shawn Gallea <sagallea@google.com>
Reviewed-by: Daniele Castagna <dcastagna@chromium.org>
Reviewed-by: Daniel Nicoara <dnicoara@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608933}

components/exo/wayland/BUILD.gn

@@ -43,6 +43,8 @@ source_set("wayland") {
     "wayland_pointer_delegate.h",
     "wayland_touch_delegate.cc",
     "wayland_touch_delegate.h",
+    "wl_seat.cc",
+    "wl_seat.h",
     "wl_shell.cc",
     "wl_shell.h",
     "zcr_gaming_input.cc",

components/exo/wayland/server.cc

@@ -99,6 +99,7 @@
 #include "components/exo/wayland/wayland_keyboard_delegate.h"
 #include "components/exo/wayland/wayland_pointer_delegate.h"
 #include "components/exo/wayland/wayland_touch_delegate.h"
+#include "components/exo/wayland/wl_seat.h"
 #include "components/exo/wayland/wl_shell.h"
 #include "components/exo/wayland/zcr_gaming_input.h"
 #include "components/exo/wayland/zcr_keyboard_configuration.h"
@@ -1700,118 +1701,6 @@ void bind_data_device_manager(wl_client* client,
                                  data, nullptr);
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// wl_pointer_interface:
-
-void pointer_set_cursor(wl_client* client,
-                        wl_resource* resource,
-                        uint32_t serial,
-                        wl_resource* surface_resource,
-                        int32_t hotspot_x,
-                        int32_t hotspot_y) {
-  GetUserDataAs<Pointer>(resource)->SetCursor(
-      surface_resource ? GetUserDataAs<Surface>(surface_resource) : nullptr,
-      gfx::Point(hotspot_x, hotspot_y));
-}
-
-void pointer_release(wl_client* client, wl_resource* resource) {
-  wl_resource_destroy(resource);
-}
-
-const struct wl_pointer_interface pointer_implementation = {pointer_set_cursor,
-                                                            pointer_release};
-
-
-////////////////////////////////////////////////////////////////////////////////
-// wl_keyboard_interface:
-
-#if BUILDFLAG(USE_XKBCOMMON)
-
-void keyboard_release(wl_client* client, wl_resource* resource) {
-  wl_resource_destroy(resource);
-}
-
-const struct wl_keyboard_interface keyboard_implementation = {keyboard_release};
-
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-// wl_touch_interface:
-
-void touch_release(wl_client* client, wl_resource* resource) {
-  wl_resource_destroy(resource);
-}
-
-const struct wl_touch_interface touch_implementation = {touch_release};
-
-////////////////////////////////////////////////////////////////////////////////
-// wl_seat_interface:
-
-void seat_get_pointer(wl_client* client, wl_resource* resource, uint32_t id) {
-  wl_resource* pointer_resource = wl_resource_create(
-      client, &wl_pointer_interface, wl_resource_get_version(resource), id);
-
-  SetImplementation(
-      pointer_resource, &pointer_implementation,
-      std::make_unique<Pointer>(new WaylandPointerDelegate(pointer_resource)));
-}
-
-void seat_get_keyboard(wl_client* client, wl_resource* resource, uint32_t id) {
-#if BUILDFLAG(USE_XKBCOMMON)
-  uint32_t version = wl_resource_get_version(resource);
-  wl_resource* keyboard_resource =
-      wl_resource_create(client, &wl_keyboard_interface, version, id);
-
-  WaylandKeyboardDelegate* delegate =
-      new WaylandKeyboardDelegate(keyboard_resource);
-  std::unique_ptr<Keyboard> keyboard =
-      std::make_unique<Keyboard>(delegate, GetUserDataAs<Seat>(resource));
-  keyboard->AddObserver(delegate);
-  SetImplementation(keyboard_resource, &keyboard_implementation,
-                    std::move(keyboard));
-
-  // TODO(reveman): Keep repeat info synchronized with chromium and the host OS.
-  if (version >= WL_KEYBOARD_REPEAT_INFO_SINCE_VERSION)
-    wl_keyboard_send_repeat_info(keyboard_resource, 40, 500);
-#else
-  NOTIMPLEMENTED();
-#endif
-}
-
-void seat_get_touch(wl_client* client, wl_resource* resource, uint32_t id) {
-  wl_resource* touch_resource = wl_resource_create(
-      client, &wl_touch_interface, wl_resource_get_version(resource), id);
-
-  SetImplementation(
-      touch_resource, &touch_implementation,
-      std::make_unique<Touch>(new WaylandTouchDelegate(touch_resource)));
-}
-
-void seat_release(wl_client* client, wl_resource* resource) {
-  wl_resource_destroy(resource);
-}
-
-const struct wl_seat_interface seat_implementation = {
-    seat_get_pointer, seat_get_keyboard, seat_get_touch, seat_release};
-
-const uint32_t seat_version = 6;
-
-void bind_seat(wl_client* client, void* data, uint32_t version, uint32_t id) {
-  wl_resource* resource = wl_resource_create(
-      client, &wl_seat_interface, std::min(version, seat_version), id);
-
-  wl_resource_set_implementation(resource, &seat_implementation, data, nullptr);
-
-  if (version >= WL_SEAT_NAME_SINCE_VERSION)
-    wl_seat_send_name(resource, "default");
-
-  uint32_t capabilities = WL_SEAT_CAPABILITY_POINTER | WL_SEAT_CAPABILITY_TOUCH;
-#if BUILDFLAG(USE_XKBCOMMON)
-  capabilities |= WL_SEAT_CAPABILITY_KEYBOARD;
-#endif
-  wl_seat_send_capabilities(resource, capabilities);
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // wp_viewport_interface:
 
@@ -2619,7 +2508,7 @@ Server::Server(Display* display)
   wl_global_create(wl_display_.get(), &wl_data_device_manager_interface,
                    data_device_manager_version, display_,
                    bind_data_device_manager);
-  wl_global_create(wl_display_.get(), &wl_seat_interface, seat_version,
+  wl_global_create(wl_display_.get(), &wl_seat_interface, kWlSeatVersion,
                    display_->seat(), bind_seat);
   wl_global_create(wl_display_.get(), &wp_viewporter_interface, 1, display_,
                    bind_viewporter);

components/exo/wayland/wl_seat.cc

+// Copyright 2018 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 "components/exo/wayland/wl_seat.h"
+
+#include <wayland-server-core.h>
+#include <wayland-server-protocol-core.h>
+
+#include "components/exo/touch.h"
+#include "components/exo/wayland/server_util.h"
+#include "components/exo/wayland/wayland_touch_delegate.h"
+
+#if defined(OS_CHROMEOS)
+#include "components/exo/keyboard.h"
+#include "components/exo/pointer.h"
+#include "components/exo/wayland/wayland_keyboard_delegate.h"
+#include "components/exo/wayland/wayland_pointer_delegate.h"
+#endif  // defined(OS_CHROMEOS)
+
+namespace exo {
+namespace wayland {
+
+namespace {
+
+#if defined(OS_CHROMEOS)
+////////////////////////////////////////////////////////////////////////////////
+// wl_pointer_interface:
+
+void pointer_set_cursor(wl_client* client,
+                        wl_resource* resource,
+                        uint32_t serial,
+                        wl_resource* surface_resource,
+                        int32_t hotspot_x,
+                        int32_t hotspot_y) {
+  GetUserDataAs<Pointer>(resource)->SetCursor(
+      surface_resource ? GetUserDataAs<Surface>(surface_resource) : nullptr,
+      gfx::Point(hotspot_x, hotspot_y));
+}
+
+void pointer_release(wl_client* client, wl_resource* resource) {
+  wl_resource_destroy(resource);
+}
+
+const struct wl_pointer_interface pointer_implementation = {pointer_set_cursor,
+                                                            pointer_release};
+
+////////////////////////////////////////////////////////////////////////////////
+// wl_keyboard_interface:
+
+#if BUILDFLAG(USE_XKBCOMMON)
+
+void keyboard_release(wl_client* client, wl_resource* resource) {
+  wl_resource_destroy(resource);
+}
+
+const struct wl_keyboard_interface keyboard_implementation = {keyboard_release};
+
+#endif  // BUILDFLAG(USE_XKBCOMMON)
+#endif  // defined(OS_CHROMEOS)
+////////////////////////////////////////////////////////////////////////////////
+// wl_touch_interface:
+
+void touch_release(wl_client* client, wl_resource* resource) {
+  wl_resource_destroy(resource);
+}
+
+const struct wl_touch_interface touch_implementation = {touch_release};
+
+////////////////////////////////////////////////////////////////////////////////
+// wl_seat_interface:
+
+void seat_get_pointer(wl_client* client, wl_resource* resource, uint32_t id) {
+#if defined(OS_CHROMEOS)
+  wl_resource* pointer_resource = wl_resource_create(
+      client, &wl_pointer_interface, wl_resource_get_version(resource), id);
+
+  SetImplementation(
+      pointer_resource, &pointer_implementation,
+      std::make_unique<Pointer>(new WaylandPointerDelegate(pointer_resource)));
+#else
+  NOTIMPLEMENTED();
+#endif  // defined(OS_CHROMEOS)
+}
+
+void seat_get_keyboard(wl_client* client, wl_resource* resource, uint32_t id) {
+#if defined(OS_CHROMEOS)
+#if BUILDFLAG(USE_XKBCOMMON)
+  uint32_t version = wl_resource_get_version(resource);
+  wl_resource* keyboard_resource =
+      wl_resource_create(client, &wl_keyboard_interface, version, id);
+
+  WaylandKeyboardDelegate* delegate =
+      new WaylandKeyboardDelegate(keyboard_resource);
+  std::unique_ptr<Keyboard> keyboard =
+      std::make_unique<Keyboard>(delegate, GetUserDataAs<Seat>(resource));
+  keyboard->AddObserver(delegate);
+  SetImplementation(keyboard_resource, &keyboard_implementation,
+                    std::move(keyboard));
+
+  // TODO(reveman): Keep repeat info synchronized with chromium and the host OS.
+  if (version >= WL_KEYBOARD_REPEAT_INFO_SINCE_VERSION)
+    wl_keyboard_send_repeat_info(keyboard_resource, 40, 500);
+#else
+  NOTIMPLEMENTED();
+#endif  // BUILDFLAG(USE_XKBCOMMON)
+#else
+  NOTIMPLEMENTED();
+#endif  // defined(OS_CHROMEOS)
+}
+
+void seat_get_touch(wl_client* client, wl_resource* resource, uint32_t id) {
+  wl_resource* touch_resource = wl_resource_create(
+      client, &wl_touch_interface, wl_resource_get_version(resource), id);
+
+  SetImplementation(
+      touch_resource, &touch_implementation,
+      std::make_unique<Touch>(new WaylandTouchDelegate(touch_resource)));
+}
+
+void seat_release(wl_client* client, wl_resource* resource) {
+  wl_resource_destroy(resource);
+}
+
+const struct wl_seat_interface seat_implementation = {
+    seat_get_pointer, seat_get_keyboard, seat_get_touch, seat_release};
+
+}  // namespace
+
+void bind_seat(wl_client* client, void* data, uint32_t version, uint32_t id) {
+  wl_resource* resource = wl_resource_create(
+      client, &wl_seat_interface, std::min(version, kWlSeatVersion), id);
+
+  wl_resource_set_implementation(resource, &seat_implementation, data, nullptr);
+
+  if (version >= WL_SEAT_NAME_SINCE_VERSION)
+    wl_seat_send_name(resource, "default");
+#if defined(OS_CHROMEOS)
+  uint32_t capabilities = WL_SEAT_CAPABILITY_POINTER | WL_SEAT_CAPABILITY_TOUCH;
+
+#if BUILDFLAG(USE_XKBCOMMON)
+  capabilities |= WL_SEAT_CAPABILITY_KEYBOARD;
+#endif  // BUILDFLAG(USE_XKBCOMMON)
+
+#else
+  uint32_t capabilities = WL_SEAT_CAPABILITY_TOUCH;
+#endif  // defined(OS_CHROMEOS)
+  wl_seat_send_capabilities(resource, capabilities);
+}
+
+}  // namespace wayland
+}  // namespace exo

components/exo/wayland/wl_seat.h

+// Copyright 2018 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.
+
+#ifndef COMPONENTS_EXO_WAYLAND_WL_SEAT_H_
+#define COMPONENTS_EXO_WAYLAND_WL_SEAT_H_
+
+#include <stdint.h>
+
+struct wl_client;
+
+namespace exo {
+namespace wayland {
+
+constexpr uint32_t kWlSeatVersion = 6;
+
+void bind_seat(wl_client* client, void* data, uint32_t version, uint32_t id);
+
+}  // namespace wayland
+}  // namespace exo
+
+#endif  // COMPONENTS_EXO_WAYLAND_WL_SEAT_H_