fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[UI] Add simple support for controller usage in UI

Browse Source 
- Disabled unnecessary hotkeys thread when it is not used
- Removed problematic xam_exports static initialization
- Moved xam_dialogs_shown_ and xam_nui_dialogs_shown_ to XamState
This commit is contained in:
Gliniak
2025-08-11 21:56:13 +02:00
committed by Radosław Gliński
parent 2e9c459846
commit 9054a29483
17 changed files with 221 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

138
src/xenia/ui/imgui_drawer.cc
View File

@@ -143,6 +143,9 @@ void ImGuiDrawer::Initialize() {
internal_state_ = ImGui::CreateContext();
ImGui::SetCurrentContext(internal_state_);
auto& io = ImGui::GetIO();
io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad;
const float font_size = std::max((float)cvars::font_size, 8.f);
const float title_font_size = font_size + 6.f;
@@ -211,6 +214,18 @@ void ImGuiDrawer::Initialize() {
reset_mouse_position_after_next_frame_ = false;
}
void ImGuiDrawer::LoadInputSystem(hid::InputSystem* input_system) {
if (input_system_) {
return;
}
input_system_ = input_system;
}
void ImGuiDrawer::SetGuideButtonAction(std::function<void(uint8_t)> func) {
onGuidePressFunction_ = func;
}
std::optional<ImGuiKey> ImGuiDrawer::VirtualKeyToImGuiKey(VirtualKey vkey) {
static const std::map<VirtualKey, ImGuiKey> map = {
{ui::VirtualKey::kTab, ImGuiKey_Tab},
@@ -568,6 +583,10 @@ void ImGuiDrawer::Draw(UIDrawContext& ui_draw_context) {
io.DisplaySize.x = window_->GetActualPhysicalWidth() * physical_to_logical;
io.DisplaySize.y = window_->GetActualPhysicalHeight() * physical_to_logical;
if (!dialogs_.empty()) {
UpdateGamepads();
}
ImGui::NewFrame();
assert_true(!IsDrawingDialogs());
@@ -874,5 +893,124 @@ void ImGuiDrawer::DetachIfLastWindowRemoved() {
ClearInput();
}
void ImGuiDrawer::UpdateGamepads() {
if (!input_system_) {
return;
}
hid::X_INPUT_CAPABILITIES caps = {};
bool is_gamepad_connected = false;
for (uint8_t i = 0; i < XUserMaxUserCount; i++) {
if (input_system_->GetCapabilities(i, 1, &caps) == X_ERROR_SUCCESS) {
// Special case to skip keyboard being set in gamepad mode.
if (caps.gamepad.buttons == 0xFFFF &&
caps.vibration.left_motor_speed == 0 &&
caps.vibration.right_motor_speed == 0) {
continue;
}
is_gamepad_connected = true;
break;
}
}
auto& io = GetIO();
if (!is_gamepad_connected) {
io.BackendFlags &= ~ImGuiBackendFlags_HasGamepad;
return;
}
uint8_t controller_to_poke = XUserIndexNone;
hid::X_INPUT_STATE gamepad_state;
for (uint8_t i = 0; i < XUserMaxUserCount; i++) {
if (input_system_->GetState(i, 1, &gamepad_state) == X_ERROR_SUCCESS) {
if (gamepad_state.gamepad.buttons != 0) {
controller_to_poke = i;
break;
}
}
}
if (controller_to_poke == XUserIndexNone) {
io.ClearInputKeys();
return;
}
io.BackendFlags |= ImGuiBackendFlags_HasGamepad;
hid::X_INPUT_GAMEPAD& gamepad = gamepad_state.gamepad;
// GUIDE BUTTON - More info needed
if (gamepad_state.gamepad.buttons ==
hid::X_INPUT_GAMEPAD_BUTTON::X_INPUT_GAMEPAD_GUIDE) {
if (onGuidePressFunction_) {
onGuidePressFunction_(controller_to_poke);
}
}
#define IM_SATURATE(V) (V < 0.0f ? 0.0f : V > 1.0f ? 1.0f : V)
#define MAP_BUTTON(KEY_NO, BUTTON_ENUM) \
{ \
io.AddKeyEvent(KEY_NO, (gamepad.buttons & BUTTON_ENUM) != 0); \
}
#define MAP_ANALOG(KEY_NO, VALUE, V0, V1) \
{ \
float vn = (float)(VALUE - V0) / (float)(V1 - V0); \
io.AddKeyAnalogEvent(KEY_NO, vn > 0.10f, IM_SATURATE(vn)); \
}
MAP_BUTTON(ImGuiKey_GamepadStart,
hid::X_INPUT_GAMEPAD_BUTTON::X_INPUT_GAMEPAD_START);
MAP_BUTTON(ImGuiKey_GamepadBack,
hid::X_INPUT_GAMEPAD_BUTTON::X_INPUT_GAMEPAD_BACK);
MAP_BUTTON(ImGuiKey_GamepadFaceLeft,
hid::X_INPUT_GAMEPAD_BUTTON::X_INPUT_GAMEPAD_X);
MAP_BUTTON(ImGuiKey_GamepadFaceRight,
hid::X_INPUT_GAMEPAD_BUTTON::X_INPUT_GAMEPAD_B);
MAP_BUTTON(ImGuiKey_GamepadFaceUp,
hid::X_INPUT_GAMEPAD_BUTTON::X_INPUT_GAMEPAD_Y);
MAP_BUTTON(ImGuiKey_GamepadFaceDown,
hid::X_INPUT_GAMEPAD_BUTTON::X_INPUT_GAMEPAD_A);
MAP_BUTTON(ImGuiKey_GamepadDpadLeft,
hid::X_INPUT_GAMEPAD_BUTTON::X_INPUT_GAMEPAD_DPAD_LEFT);
MAP_BUTTON(ImGuiKey_GamepadDpadRight,
hid::X_INPUT_GAMEPAD_BUTTON::X_INPUT_GAMEPAD_DPAD_RIGHT);
MAP_BUTTON(ImGuiKey_GamepadDpadUp,
hid::X_INPUT_GAMEPAD_BUTTON::X_INPUT_GAMEPAD_DPAD_UP);
MAP_BUTTON(ImGuiKey_GamepadDpadDown,
hid::X_INPUT_GAMEPAD_BUTTON::X_INPUT_GAMEPAD_DPAD_DOWN);
MAP_BUTTON(ImGuiKey_GamepadL1,
hid::X_INPUT_GAMEPAD_BUTTON::X_INPUT_GAMEPAD_LEFT_SHOULDER);
MAP_BUTTON(ImGuiKey_GamepadR1,
hid::X_INPUT_GAMEPAD_BUTTON::X_INPUT_GAMEPAD_RIGHT_SHOULDER);
MAP_ANALOG(ImGuiKey_GamepadL2, gamepad.left_trigger,
hid::X_INPUT_GAMEPAD_TRIGGER_THRESHOLD, 255);
MAP_ANALOG(ImGuiKey_GamepadR2, gamepad.right_trigger,
hid::X_INPUT_GAMEPAD_TRIGGER_THRESHOLD, 255);
MAP_BUTTON(ImGuiKey_GamepadL3,
hid::X_INPUT_GAMEPAD_BUTTON::X_INPUT_GAMEPAD_LEFT_THUMB);
MAP_BUTTON(ImGuiKey_GamepadR3,
hid::X_INPUT_GAMEPAD_BUTTON::X_INPUT_GAMEPAD_RIGHT_THUMB);
MAP_ANALOG(ImGuiKey_GamepadLStickLeft, gamepad.thumb_lx,
-hid::X_INPUT_GAMEPAD_LEFT_THUMB_DEADZONE, -32768);
MAP_ANALOG(ImGuiKey_GamepadLStickRight, gamepad.thumb_lx,
+hid::X_INPUT_GAMEPAD_LEFT_THUMB_DEADZONE, +32767);
MAP_ANALOG(ImGuiKey_GamepadLStickUp, gamepad.thumb_ly,
+hid::X_INPUT_GAMEPAD_LEFT_THUMB_DEADZONE, +32767);
MAP_ANALOG(ImGuiKey_GamepadLStickDown, gamepad.thumb_ly,
-hid::X_INPUT_GAMEPAD_LEFT_THUMB_DEADZONE, -32768);
MAP_ANALOG(ImGuiKey_GamepadRStickLeft, gamepad.thumb_rx,
-hid::X_INPUT_GAMEPAD_LEFT_THUMB_DEADZONE, -32768);
MAP_ANALOG(ImGuiKey_GamepadRStickRight, gamepad.thumb_rx,
+hid::X_INPUT_GAMEPAD_LEFT_THUMB_DEADZONE, +32767);
MAP_ANALOG(ImGuiKey_GamepadRStickUp, gamepad.thumb_ry,
+hid::X_INPUT_GAMEPAD_LEFT_THUMB_DEADZONE, +32767);
MAP_ANALOG(ImGuiKey_GamepadRStickDown, gamepad.thumb_ry,
-hid::X_INPUT_GAMEPAD_LEFT_THUMB_DEADZONE, -32768);
#undef MAP_BUTTON
#undef MAP_ANALOG
}
} // namespace ui
} // namespace xe

7
src/xenia/ui/imgui_drawer.h
View File

@@ -18,6 +18,7 @@
#include <vector>
#include "third_party/imgui/imgui.h"
#include "xenia/hid/input_system.h"
#include "xenia/ui/immediate_drawer.h"
#include "xenia/ui/presenter.h"
#include "xenia/ui/window.h"
@@ -89,6 +90,9 @@ class ImGuiDrawer : public WindowInputListener, public UIDrawer {
return GetIO().Fonts->Fonts[1];
}
void LoadInputSystem(hid::InputSystem* input_system);
void SetGuideButtonAction(std::function<void(uint8_t)> func);
protected:
void OnKeyDown(KeyEvent& e) override;
void OnKeyUp(KeyEvent& e) override;
@@ -119,6 +123,7 @@ class ImGuiDrawer : public WindowInputListener, public UIDrawer {
bool IsDrawingDialogs() const { return dialog_loop_next_index_ != SIZE_MAX; }
void DetachIfLastWindowRemoved();
void UpdateGamepads();
std::optional<ImGuiKey> VirtualKeyToImGuiKey(VirtualKey vkey);
@@ -126,7 +131,9 @@ class ImGuiDrawer : public WindowInputListener, public UIDrawer {
size_t z_order_;
ImGuiContext* internal_state_ = nullptr;
hid::InputSystem* input_system_ = nullptr;
std::function<void(uint8_t)> onGuidePressFunction_;
// All currently-attached dialogs that get drawn.
std::vector<ImGuiDialog*> dialogs_;