Skip to content

Consume inputtino's runtime joypad factory (Xbox/PS5/Switch Pro/Joy-Con) #445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kmreisi wants to merge 1 commit into
base: stable
Choose a base branch
from
Open

Consume inputtino's runtime joypad factory (Xbox/PS5/Switch Pro/Joy-Con) #445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
!.clang-format
!docker/gstreamer.control
!docker/startup.sh
!docker/supervisord.conf
!docker/supervisord.conf
6 changes: 4 additions & 2 deletions src/core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,12 @@ if (UNIX AND NOT APPLE)
if (WOLF_CUSTOM_INPUTTINO_SRC)
add_subdirectory(${WOLF_CUSTOM_INPUTTINO_SRC} ${CMAKE_CURRENT_BINARY_DIR}/inputtino EXCLUDE_FROM_ALL)
else ()
# NOTE: points at the runtime joypad-factory branch (inputtino #40/#37/#41).
# Repoint to games-on-whales/inputtino once those land on stable.
FetchContent_Declare(
inputtino
GIT_REPOSITORY https://github.com/games-on-whales/inputtino.git

@kmreisi kmreisi Jun 26, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't merge until this has been changed.

GIT_TAG fd136cf)
GIT_REPOSITORY https://github.com/kmreisi/inputtino.git
GIT_TAG b793c9a)
FetchContent_MakeAvailable(inputtino)
endif ()

Expand Down
27 changes: 4 additions & 23 deletions src/core/src/core/input.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,27 +64,8 @@ class Keyboard : public inputtino::Keyboard, public VirtualDevice {
std::vector<std::pair<std::string, std::vector<std::string>>> get_udev_hw_db_entries() const override;
};

class XboxOneJoypad : public inputtino::XboxOneJoypad, public VirtualDevice {
public:
XboxOneJoypad(inputtino::XboxOneJoypad &&j) noexcept : inputtino::XboxOneJoypad(std::move(j)) {}

std::vector<std::map<std::string, std::string>> get_udev_events() const override;
std::vector<std::pair<std::string, std::vector<std::string>>> get_udev_hw_db_entries() const override;
};

class SwitchJoypad : public inputtino::SwitchJoypad, public VirtualDevice {
public:
SwitchJoypad(inputtino::SwitchJoypad &&j) noexcept : inputtino::SwitchJoypad(std::move(j)) {}

std::vector<std::map<std::string, std::string>> get_udev_events() const override;
std::vector<std::pair<std::string, std::vector<std::string>>> get_udev_hw_db_entries() const override;
};

class PS5Joypad : public inputtino::PS5Joypad, public VirtualDevice {
public:
PS5Joypad(inputtino::PS5Joypad &&j) noexcept : inputtino::PS5Joypad(std::move(j)) {}

std::vector<std::map<std::string, std::string>> get_udev_events() const override;
std::vector<std::pair<std::string, std::vector<std::string>>> get_udev_hw_db_entries() const override;
};
// Joypads are no longer wrapped here: they are used directly as inputtino::Joypad
// (see events::JoypadTypes), which now self-describes its udev events/hwdb. Mouse,
// keyboard, trackpad, touchscreen and pen tablet still wrap because they supply
// wolf-specific udev metadata.
} // namespace wolf::core::input
207 changes: 0 additions & 207 deletions src/core/src/platforms/linux/uinput/joypad.cpp
View file
Open in desktop

This file was deleted.

Loading