EXO: Refactored gaming input interface

Move gaming input interface  out of server.cc
This CL only moves code around.

Bug: 896710
Test: Built on ChromeOS
Change-Id: I9202fc459a4f1095d20f83e7d1b64822beca9028
Reviewed-on: https://chromium-review.googlesource.com/c/1323693
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@{#608626}

components/exo/wayland/BUILD.gn

@@ -43,6 +43,8 @@ source_set("wayland") {
     "wayland_pointer_delegate.h",
     "wayland_touch_delegate.cc",
     "wayland_touch_delegate.h",
+    "zcr_gaming_input.cc",
+    "zcr_gaming_input.h",
     "zcr_keyboard_configuration.cc",
     "zcr_keyboard_configuration.h",
     "zcr_keyboard_extension.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/zcr_gaming_input.h"
 #include "components/exo/wayland/zcr_keyboard_configuration.h"
 #include "components/exo/wayland/zcr_keyboard_extension.h"
 #include "components/exo/wayland/zcr_notification_shell.h"
@@ -4095,164 +4096,6 @@ void bind_alpha_compositing(wl_client* client,
                                  data, nullptr);
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// gaming_input_interface:
-
-// Gamepad delegate class that forwards gamepad events to the client resource.
-class WaylandGamepadDelegate : public GamepadDelegate {
- public:
-  explicit WaylandGamepadDelegate(wl_resource* gamepad_resource)
-      : gamepad_resource_(gamepad_resource) {}
-
-  // If gamepad_resource_ is destroyed first, ResetGamepadResource will
-  // be called to remove the resource from delegate, and delegate won't
-  // do anything after that. If delegate is destructed first, it will
-  // set the data to null in the gamepad_resource_, then the resource
-  // destroy won't reset the delegate (cause it's gone).
-  static void ResetGamepadResource(wl_resource* resource) {
-    WaylandGamepadDelegate* delegate =
-        GetUserDataAs<WaylandGamepadDelegate>(resource);
-    if (delegate) {
-      delegate->gamepad_resource_ = nullptr;
-    }
-  }
-
-  // Override from GamepadDelegate:
-  void OnRemoved() override {
-    if (!gamepad_resource_) {
-      return;
-    }
-    zcr_gamepad_v2_send_removed(gamepad_resource_);
-    wl_client_flush(client());
-    // Reset the user data in gamepad_resource.
-    wl_resource_set_user_data(gamepad_resource_, nullptr);
-    delete this;
-  }
-  void OnAxis(int axis, double value) override {
-    if (!gamepad_resource_) {
-      return;
-    }
-    zcr_gamepad_v2_send_axis(gamepad_resource_, NowInMilliseconds(), axis,
-                             wl_fixed_from_double(value));
-  }
-  void OnButton(int button, bool pressed, double value) override {
-    if (!gamepad_resource_) {
-      return;
-    }
-    uint32_t state = pressed ? ZCR_GAMEPAD_V2_BUTTON_STATE_PRESSED
-                             : ZCR_GAMEPAD_V2_BUTTON_STATE_RELEASED;
-    zcr_gamepad_v2_send_button(gamepad_resource_, NowInMilliseconds(), button,
-                               state, wl_fixed_from_double(value));
-  }
-  void OnFrame() override {
-    if (!gamepad_resource_) {
-      return;
-    }
-    zcr_gamepad_v2_send_frame(gamepad_resource_, NowInMilliseconds());
-    wl_client_flush(client());
-  }
-
- private:
-  // The object should be deleted by OnRemoved().
-  ~WaylandGamepadDelegate() override {}
-
-  // The client who own this gamepad instance.
-  wl_client* client() const {
-    return wl_resource_get_client(gamepad_resource_);
-  }
-
-  // The gamepad resource associated with the gamepad.
-  wl_resource* gamepad_resource_;
-
-  DISALLOW_COPY_AND_ASSIGN(WaylandGamepadDelegate);
-};
-
-void gamepad_destroy(wl_client* client, wl_resource* resource) {
-  wl_resource_destroy(resource);
-}
-
-const struct zcr_gamepad_v2_interface gamepad_implementation = {
-    gamepad_destroy};
-
-// GamingSeat delegate that provide gamepad added.
-class WaylandGamingSeatDelegate : public GamingSeatDelegate {
- public:
-  explicit WaylandGamingSeatDelegate(wl_resource* gaming_seat_resource)
-      : gaming_seat_resource_{gaming_seat_resource} {}
-
-  // Override from GamingSeatDelegate:
-  void OnGamingSeatDestroying(GamingSeat*) override { delete this; }
-  bool CanAcceptGamepadEventsForSurface(Surface* surface) const override {
-    wl_resource* surface_resource = GetSurfaceResource(surface);
-    return surface_resource &&
-           wl_resource_get_client(surface_resource) ==
-               wl_resource_get_client(gaming_seat_resource_);
-  }
-  GamepadDelegate* GamepadAdded() override {
-    wl_resource* gamepad_resource =
-        wl_resource_create(wl_resource_get_client(gaming_seat_resource_),
-                           &zcr_gamepad_v2_interface,
-                           wl_resource_get_version(gaming_seat_resource_), 0);
-
-    GamepadDelegate* gamepad_delegate =
-        new WaylandGamepadDelegate(gamepad_resource);
-
-    wl_resource_set_implementation(
-        gamepad_resource, &gamepad_implementation, gamepad_delegate,
-        &WaylandGamepadDelegate::ResetGamepadResource);
-
-    zcr_gaming_seat_v2_send_gamepad_added(gaming_seat_resource_,
-                                          gamepad_resource);
-    wl_client_flush(wl_resource_get_client(gaming_seat_resource_));
-
-    return gamepad_delegate;
-  }
-
- private:
-  // The gaming seat resource associated with the gaming seat.
-  wl_resource* const gaming_seat_resource_;
-
-  DISALLOW_COPY_AND_ASSIGN(WaylandGamingSeatDelegate);
-};
-
-void gaming_seat_destroy(wl_client* client, wl_resource* resource) {
-  wl_resource_destroy(resource);
-}
-
-const struct zcr_gaming_seat_v2_interface gaming_seat_implementation = {
-    gaming_seat_destroy};
-
-void gaming_input_get_gaming_seat(wl_client* client,
-                                  wl_resource* resource,
-                                  uint32_t id,
-                                  wl_resource* seat) {
-  wl_resource* gaming_seat_resource =
-      wl_resource_create(client, &zcr_gaming_seat_v2_interface,
-                         wl_resource_get_version(resource), id);
-
-  SetImplementation(gaming_seat_resource, &gaming_seat_implementation,
-                    std::make_unique<GamingSeat>(
-                        new WaylandGamingSeatDelegate(gaming_seat_resource)));
-}
-
-void gaming_input_destroy(wl_client* client, wl_resource* resource) {
-  wl_resource_destroy(resource);
-}
-
-const struct zcr_gaming_input_v2_interface gaming_input_implementation = {
-    gaming_input_get_gaming_seat, gaming_input_destroy};
-
-void bind_gaming_input(wl_client* client,
-                       void* data,
-                       uint32_t version,
-                       uint32_t id) {
-  wl_resource* resource =
-      wl_resource_create(client, &zcr_gaming_input_v2_interface, version, id);
-
-  wl_resource_set_implementation(resource, &gaming_input_implementation,
-                                 nullptr, nullptr);
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // touch_stylus interface:
 

components/exo/wayland/zcr_gaming_input.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/zcr_gaming_input.h"
+
+#include <gaming-input-unstable-v1-server-protocol.h>
+#include <gaming-input-unstable-v2-server-protocol.h>
+#include <wayland-server-core.h>
+#include <wayland-server-protocol-core.h>
+
+#include "base/macros.h"
+#include "components/exo/gamepad_delegate.h"
+#include "components/exo/gaming_seat.h"
+#include "components/exo/gaming_seat_delegate.h"
+#include "components/exo/wayland/server_util.h"
+
+namespace exo {
+namespace wayland {
+
+namespace {
+
+////////////////////////////////////////////////////////////////////////////////
+// gaming_input_interface:
+
+// Gamepad delegate class that forwards gamepad events to the client resource.
+class WaylandGamepadDelegate : public GamepadDelegate {
+ public:
+  explicit WaylandGamepadDelegate(wl_resource* gamepad_resource)
+      : gamepad_resource_(gamepad_resource) {}
+
+  // If gamepad_resource_ is destroyed first, ResetGamepadResource will
+  // be called to remove the resource from delegate, and delegate won't
+  // do anything after that. If delegate is destructed first, it will
+  // set the data to null in the gamepad_resource_, then the resource
+  // destroy won't reset the delegate (cause it's gone).
+  static void ResetGamepadResource(wl_resource* resource) {
+    WaylandGamepadDelegate* delegate =
+        GetUserDataAs<WaylandGamepadDelegate>(resource);
+    if (delegate) {
+      delegate->gamepad_resource_ = nullptr;
+    }
+  }
+
+  // Override from GamepadDelegate:
+  void OnRemoved() override {
+    if (!gamepad_resource_) {
+      return;
+    }
+    zcr_gamepad_v2_send_removed(gamepad_resource_);
+    wl_client_flush(client());
+    // Reset the user data in gamepad_resource.
+    wl_resource_set_user_data(gamepad_resource_, nullptr);
+    delete this;
+  }
+  void OnAxis(int axis, double value) override {
+    if (!gamepad_resource_) {
+      return;
+    }
+    zcr_gamepad_v2_send_axis(gamepad_resource_, NowInMilliseconds(), axis,
+                             wl_fixed_from_double(value));
+  }
+  void OnButton(int button, bool pressed, double value) override {
+    if (!gamepad_resource_) {
+      return;
+    }
+    uint32_t state = pressed ? ZCR_GAMEPAD_V2_BUTTON_STATE_PRESSED
+                             : ZCR_GAMEPAD_V2_BUTTON_STATE_RELEASED;
+    zcr_gamepad_v2_send_button(gamepad_resource_, NowInMilliseconds(), button,
+                               state, wl_fixed_from_double(value));
+  }
+  void OnFrame() override {
+    if (!gamepad_resource_) {
+      return;
+    }
+    zcr_gamepad_v2_send_frame(gamepad_resource_, NowInMilliseconds());
+    wl_client_flush(client());
+  }
+
+ private:
+  // The object should be deleted by OnRemoved().
+  ~WaylandGamepadDelegate() override {}
+
+  // The client who own this gamepad instance.
+  wl_client* client() const {
+    return wl_resource_get_client(gamepad_resource_);
+  }
+
+  // The gamepad resource associated with the gamepad.
+  wl_resource* gamepad_resource_;
+
+  DISALLOW_COPY_AND_ASSIGN(WaylandGamepadDelegate);
+};
+
+void gamepad_destroy(wl_client* client, wl_resource* resource) {
+  wl_resource_destroy(resource);
+}
+
+const struct zcr_gamepad_v2_interface gamepad_implementation = {
+    gamepad_destroy};
+
+// GamingSeat delegate that provide gamepad added.
+class WaylandGamingSeatDelegate : public GamingSeatDelegate {
+ public:
+  explicit WaylandGamingSeatDelegate(wl_resource* gaming_seat_resource)
+      : gaming_seat_resource_{gaming_seat_resource} {}
+
+  // Override from GamingSeatDelegate:
+  void OnGamingSeatDestroying(GamingSeat*) override { delete this; }
+  bool CanAcceptGamepadEventsForSurface(Surface* surface) const override {
+    wl_resource* surface_resource = GetSurfaceResource(surface);
+    return surface_resource &&
+           wl_resource_get_client(surface_resource) ==
+               wl_resource_get_client(gaming_seat_resource_);
+  }
+  GamepadDelegate* GamepadAdded() override {
+    wl_resource* gamepad_resource =
+        wl_resource_create(wl_resource_get_client(gaming_seat_resource_),
+                           &zcr_gamepad_v2_interface,
+                           wl_resource_get_version(gaming_seat_resource_), 0);
+
+    GamepadDelegate* gamepad_delegate =
+        new WaylandGamepadDelegate(gamepad_resource);
+
+    wl_resource_set_implementation(
+        gamepad_resource, &gamepad_implementation, gamepad_delegate,
+        &WaylandGamepadDelegate::ResetGamepadResource);
+
+    zcr_gaming_seat_v2_send_gamepad_added(gaming_seat_resource_,
+                                          gamepad_resource);
+    wl_client_flush(wl_resource_get_client(gaming_seat_resource_));
+
+    return gamepad_delegate;
+  }
+
+ private:
+  // The gaming seat resource associated with the gaming seat.
+  wl_resource* const gaming_seat_resource_;
+
+  DISALLOW_COPY_AND_ASSIGN(WaylandGamingSeatDelegate);
+};
+
+void gaming_seat_destroy(wl_client* client, wl_resource* resource) {
+  wl_resource_destroy(resource);
+}
+
+const struct zcr_gaming_seat_v2_interface gaming_seat_implementation = {
+    gaming_seat_destroy};
+
+void gaming_input_get_gaming_seat(wl_client* client,
+                                  wl_resource* resource,
+                                  uint32_t id,
+                                  wl_resource* seat) {
+  wl_resource* gaming_seat_resource =
+      wl_resource_create(client, &zcr_gaming_seat_v2_interface,
+                         wl_resource_get_version(resource), id);
+
+  SetImplementation(gaming_seat_resource, &gaming_seat_implementation,
+                    std::make_unique<GamingSeat>(
+                        new WaylandGamingSeatDelegate(gaming_seat_resource)));
+}
+
+void gaming_input_destroy(wl_client* client, wl_resource* resource) {
+  wl_resource_destroy(resource);
+}
+
+const struct zcr_gaming_input_v2_interface gaming_input_implementation = {
+    gaming_input_get_gaming_seat, gaming_input_destroy};
+
+}  // namespace
+
+void bind_gaming_input(wl_client* client,
+                       void* data,
+                       uint32_t version,
+                       uint32_t id) {
+  wl_resource* resource =
+      wl_resource_create(client, &zcr_gaming_input_v2_interface, version, id);
+
+  wl_resource_set_implementation(resource, &gaming_input_implementation,
+                                 nullptr, nullptr);
+}
+
+}  // namespace wayland
+}  // namespace exo

components/exo/wayland/zcr_gaming_input.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_ZCR_GAMING_INPUT_H_
+#define COMPONENTS_EXO_WAYLAND_ZCR_GAMING_INPUT_H_
+
+#include <stdint.h>
+
+struct wl_client;
+
+namespace exo {
+namespace wayland {
+
+void bind_gaming_input(wl_client* client,
+                       void* data,
+                       uint32_t version,
+                       uint32_t id);
+
+}  // namespace wayland
+}  // namespace exo
+
+#endif  // COMPONENTS_EXO_WAYLAND_ZCR_GAMING_INPUT_H_