Skip to content

GitLab

T
tangled
Commit 9ec45bae authored by Jingkui Wang's avatar Jingkui Wang Committed by Commit Bot
Browse files
Options

exo: Remove old gamepad implementation 

This patch removes the gaming seat implementation for evdev. All the
gamepad support will use ozone implementation.

This patch also removes the dummy interface for gaming_input_v1 in Wayland
server. The dummy interface was there to make sure the system is robust
when we moved the protocol to v2.

Bug: 717246
Change-Id: I70b29d3c6a81761d1e15c502f78fd0615bf768fe
Reviewed-on: https://chromium-review.googlesource.com/661100
Commit-Queue: Jingkui Wang <jkwang@google.com>
Reviewed-by: default avatarDavid Reveman <reveman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#501402}
parent 35476d64
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 473 deletions
chrome/common/features.gni
View file @ 9ec45bae
......@@ -54,10 +54,6 @@ declare_args() {
enable_one_click_signin =
is_win || is_mac || (is_linux && !is_chromeos && !is_chromecast)
# Indicates if Exo should use ozone gamepad. If this is false, exo will use
# /device/gamepad as backend.
enable_exo_ozone_gamepad = use_ozone
# Set to true to bundle all the mash related mojo services into chrome.
# Specify --mash to chrome to have chrome start the mash environment.
enable_package_mash_services = is_chromeos
......
components/exo/BUILD.gn
View file @ 9ec45bae
......@@ -22,6 +22,7 @@ source_set("exo") {
"data_source_delegate.h",
"display.cc",
"display.h",
"gaming_seat.cc",
"gaming_seat.h",
"keyboard.cc",
"keyboard.h",
......@@ -75,24 +76,17 @@ source_set("exo") {
"//ui/compositor",
"//ui/display/manager",
"//ui/events/devices:devices",
"//ui/events/ozone:events_ozone_evdev",
"//ui/gfx",
"//ui/gfx/geometry",
"//ui/gl",
"//ui/ozone",
"//ui/views",
"//ui/views/mus",
"//ui/wm",
"//ui/wm/public",
]
if (enable_exo_ozone_gamepad) {
defines = [ "USE_OZONE_GAMEPAD" ]
sources += [ "gaming_seat_ozone.cc" ]
deps += [ "//ui/ozone" ]
deps += [ "//ui/events/ozone:events_ozone_evdev" ]
} else {
sources += [ "gaming_seat.cc" ]
}
if (is_chromeos) {
deps += [ "//chromeos" ]
}
......@@ -128,10 +122,12 @@ source_set("unit_tests") {
testonly = true
sources = [
"../../ui/events/ozone/gamepad/gamepad_event.cc",
"buffer_unittest.cc",
"data_device_unittest.cc",
"data_offer_unittest.cc",
"display_unittest.cc",
"gaming_seat_unittest.cc",
"keyboard_unittest.cc",
"pointer_unittest.cc",
"shared_memory_unittest.cc",
......@@ -163,6 +159,7 @@ source_set("unit_tests") {
"//ui/compositor:test_support",
"//ui/events:dom_keycode_converter",
"//ui/events:test_support",
"//ui/events/ozone:events_ozone_evdev",
"//ui/gfx",
"//ui/keyboard",
"//ui/message_center",
......@@ -173,14 +170,6 @@ source_set("unit_tests") {
if (use_ozone) {
deps += [ "//ui/ozone" ]
}
if (enable_exo_ozone_gamepad) {
sources += [
"../../ui/events/ozone/gamepad/gamepad_event.cc",
"gaming_seat_unittest.cc",
]
deps += [ "//ui/events/ozone:events_ozone_evdev" ]
}
}
test("exo_unittests") {
......
components/exo/gaming_seat.cc
View file @ 9ec45bae
This diff is collapsed.
components/exo/gaming_seat.h
View file @ 9ec45bae
......@@ -12,39 +12,22 @@
#include "base/memory/weak_ptr.h"
#include "base/sequenced_task_runner.h"
#include "base/synchronization/lock.h"
#include "base/threading/thread.h"
#include "base/threading/thread_task_runner_handle.h"
#include "components/exo/wm_helper.h"
#include "device/gamepad/gamepad_data_fetcher.h"
#include "ui/aura/client/focus_change_observer.h"
#if defined(USE_OZONE_GAMEPAD)
#include "ui/events/ozone/gamepad/gamepad_observer.h"
#endif
namespace exo {
class GamingSeatDelegate;
class GamepadDelegate;
using CreateGamepadDataFetcherCallback =
base::Callback<std::unique_ptr<device::GamepadDataFetcher>()>;
// TODO(jkwang): always use ozone_gamepad when ozone is default for all Chrome
// OS builds. https://crbug.com/717246
// This class represents one gaming seat. It uses /device/gamepad or
// ozone/gamepad as backend and notifies corresponding GamepadDelegate of any
// gamepad changes.
class GamingSeat : public WMHelper::FocusObserver
#if defined(USE_OZONE_GAMEPAD)
,
public ui::GamepadObserver
#endif
{
class GamingSeat : public WMHelper::FocusObserver, public ui::GamepadObserver {
public:
// This class will monitor gamepad connection changes and manage gamepad
// returned by gaming_seat_delegate.
GamingSeat(GamingSeatDelegate* gaming_seat_delegate,
base::SingleThreadTaskRunner* polling_task_runner);
GamingSeat(GamingSeatDelegate* gaming_seat_delegate);
~GamingSeat() override;
......@@ -52,44 +35,20 @@ class GamingSeat : public WMHelper::FocusObserver
void OnWindowFocused(aura::Window* gained_focus,
aura::Window* lost_focus) override;
#if defined(USE_OZONE_GAMEPAD)
// Overridden from ui::GamepadObserver:
void OnGamepadDevicesUpdated() override;
void OnGamepadEvent(const ui::GamepadEvent& event) override;
#endif
private:
// The delegate that handles gamepad_added.
GamingSeatDelegate* const delegate_;
#if defined(USE_OZONE_GAMEPAD)
// Contains the delegate for each gamepad device.
base::flat_map<int, GamepadDelegate*> gamepads_;
// The flag if a valid target for gaming seat is focused. In other words, if
// it's true, this class is observing gamepad events.
bool focused_ = false;
#else
class ThreadSafeGamepadChangeFetcher;
// Processes updates of gamepad data and passes changes on to delegate.
void ProcessGamepadChanges(int index, const device::Gamepad new_pad);
// Private implementation of methods and resources that are used on the
// polling thread.
scoped_refptr<ThreadSafeGamepadChangeFetcher> gamepad_change_fetcher_;
// The delegate instances that all other events are dispatched to.
GamepadDelegate* gamepad_delegates_[device::Gamepads::kItemsLengthCap];
// The current state of the gamepad represented by this instance.
device::Gamepads pad_state_;
// ThreadChecker for the origin thread.
THREAD_CHECKER(thread_checker_);
base::WeakPtrFactory<GamingSeat> weak_ptr_factory_;
#endif
DISALLOW_COPY_AND_ASSIGN(GamingSeat);
};
......
components/exo/gaming_seat_ozone.cc deleted 100644 → 0
View file @ 35476d64
// Copyright 2017 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/gamepad_delegate.h"
#include "components/exo/gaming_seat.h"
#include "components/exo/gaming_seat_delegate.h"
#include "components/exo/shell_surface.h"
#include "components/exo/surface.h"
#include "ui/events/ozone/gamepad/gamepad_provider_ozone.h"
namespace exo {
////////////////////////////////////////////////////////////////////////////////
// GamingSeat, public:
GamingSeat::GamingSeat(GamingSeatDelegate* delegate,
base::SingleThreadTaskRunner* task_runner)
: delegate_(delegate) {
auto* helper = WMHelper::GetInstance();
helper->AddFocusObserver(this);
OnWindowFocused(helper->GetFocusedWindow(), nullptr);
}
GamingSeat::~GamingSeat() {
if (focused_)
ui::GamepadProviderOzone::GetInstance()->RemoveGamepadObserver(this);
delegate_->OnGamingSeatDestroying(this);
// Disconnect all the gamepads.
for (auto& entry : gamepads_)
entry.second->OnRemoved();
WMHelper::GetInstance()->RemoveFocusObserver(this);
}
////////////////////////////////////////////////////////////////////////////////
// WMHelper::FocusObserver overrides:
void GamingSeat::OnWindowFocused(aura::Window* gained_focus,
aura::Window* lost_focus) {
Surface* target = nullptr;
if (gained_focus) {
target = Surface::AsSurface(gained_focus);
if (!target) {
aura::Window* top_level_window = gained_focus->GetToplevelWindow();
if (top_level_window)
target = ShellSurface::GetMainSurface(top_level_window);
}
}
bool focused = target && delegate_->CanAcceptGamepadEventsForSurface(target);
if (focused_ != focused) {
focused_ = focused;
if (focused) {
ui::GamepadProviderOzone::GetInstance()->AddGamepadObserver(this);
OnGamepadDevicesUpdated();
} else {
ui::GamepadProviderOzone::GetInstance()->RemoveGamepadObserver(this);
}
}
}
////////////////////////////////////////////////////////////////////////////////
// ui::GamepadObserver overrides:
void GamingSeat::OnGamepadDevicesUpdated() {
std::vector<ui::InputDevice> gamepad_devices =
ui::GamepadProviderOzone::GetInstance()->GetGamepadDevices();
base::flat_map<int, GamepadDelegate*> new_gamepads;
// Copy the "still connected gamepads".
for (auto& device : gamepad_devices) {
auto it = gamepads_.find(device.id);
if (it != gamepads_.end()) {
new_gamepads[device.id] = it->second;
gamepads_.erase(it);
}
}
// Remove each disconected gamepad.
for (auto& entry : gamepads_)
entry.second->OnRemoved();
// Add each new connected gamepad.
for (auto& device : gamepad_devices) {
if (new_gamepads.find(device.id) == new_gamepads.end())
new_gamepads[device.id] = delegate_->GamepadAdded();
}
new_gamepads.swap(gamepads_);
}
void GamingSeat::OnGamepadEvent(const ui::GamepadEvent& event) {
auto it = gamepads_.find(event.device_id());
if (it == gamepads_.end())
return;
switch (event.type()) {
case ui::GamepadEventType::BUTTON:
it->second->OnButton(event.code(), event.value(), event.value());
break;
case ui::GamepadEventType::AXIS:
it->second->OnAxis(event.code(), event.value());
break;
case ui::GamepadEventType::FRAME:
it->second->OnFrame();
break;
}
}
} // namespace exo
components/exo/gaming_seat_unittest.cc
View file @ 9ec45bae
......@@ -46,7 +46,7 @@ class GamingSeatTest : public test::ExoTestBase {
public:
GamingSeatTest() {}
void InitializeGamingSeat(MockGamingSeatDelegate* delegate) {
gaming_seat_.reset(new GamingSeat(delegate, nullptr));
gaming_seat_.reset(new GamingSeat(delegate));
}
void DestroyGamingSeat(MockGamingSeatDelegate* delegate) {
......
components/exo/wayland/server.cc
View file @ 9ec45bae
......@@ -4098,12 +4098,9 @@ void gaming_input_get_gaming_seat(wl_client* client,
wl_resource_create(client, &zcr_gaming_seat_v2_interface,
wl_resource_get_version(resource), id);
base::Thread* gaming_input_thread = GetUserDataAs<base::Thread>(resource);
SetImplementation(gaming_seat_resource, &gaming_seat_implementation,
base::MakeUnique<GamingSeat>(
new WaylandGamingSeatDelegate(gaming_seat_resource),
gaming_input_thread->task_runner().get()));
new WaylandGamingSeatDelegate(gaming_seat_resource)));
}
void gaming_input_destroy(wl_client* client, wl_resource* resource) {
......@@ -4120,53 +4117,8 @@ void bind_gaming_input(wl_client* client,
wl_resource* resource =
wl_resource_create(client, &zcr_gaming_input_v2_interface, version, id);
std::unique_ptr<base::Thread> gaming_input_thread(
new base::Thread("Exo gaming input polling thread."));
gaming_input_thread->StartWithOptions(
base::Thread::Options(base::MessageLoop::TYPE_IO, 0));
SetImplementation(resource, &gaming_input_implementation,
std::move(gaming_input_thread));
}
////////////////////////////////////////////////////////////////////////////////
// dummy interface for gaming_input_v1:
/* Following is a dummy interface for gaming_input_v1.
* It makes sure the "old" android with v1 interface won't break. However, "old"
* android will not receive any gamepad input. This interface implementation
* should be removed once android is updated.
*/
// TODO(jkwang): Remove the following interface function once android updated.
void gamepad_v1_destroy_DEPRECATED(wl_client* client, wl_resource* resource) {
wl_resource_destroy(resource);
}
const struct zcr_gamepad_v1_interface gamepad_v1_implementation = {
gamepad_v1_destroy_DEPRECATED};
void gaming_input_v1_get_gamepad_DEPRECATED(wl_client* client,
wl_resource* resource,
uint32_t id,
wl_resource* seat) {
wl_resource* gamepad_resource = wl_resource_create(
client, &zcr_gamepad_v1_interface, wl_resource_get_version(resource), id);
wl_resource_set_implementation(gamepad_resource, &gamepad_v1_implementation,
NULL, NULL);
}
const struct zcr_gaming_input_v1_interface gaming_input_v1_implementation = {
gaming_input_v1_get_gamepad_DEPRECATED};
void bind_gaming_input_v1_DEPRECATED(wl_client* client,
void* data,
uint32_t version,
uint32_t id) {
wl_resource* resource =
wl_resource_create(client, &zcr_gaming_input_v1_interface, version, id);
wl_resource_set_implementation(resource, &gaming_input_v1_implementation,
NULL, NULL);
wl_resource_set_implementation(resource, &gaming_input_implementation,
nullptr, nullptr);
}
////////////////////////////////////////////////////////////////////////////////
......@@ -4598,8 +4550,6 @@ Server::Server(Display* display)
remote_shell_version, display_, bind_remote_shell);
wl_global_create(wl_display_.get(), &zaura_shell_interface, 1, display_,
bind_aura_shell);
wl_global_create(wl_display_.get(), &zcr_gaming_input_v1_interface, 1,
display_, bind_gaming_input_v1_DEPRECATED);
wl_global_create(wl_display_.get(), &zcr_gaming_input_v2_interface, 1,
display_, bind_gaming_input);
wl_global_create(wl_display_.get(), &zcr_stylus_v1_interface, 2, display_,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment