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

Added controller hotkeys cvar (#119)

Browse Source 
* Added controller hotkeys setting

Added option to disable controller hotkeys
Minor Changes

* Fixed locked input system

The input system lock should be released even if a controller is not connected.
This commit is contained in:
Adrian
2023-01-29 18:26:25 +00:00
committed by GitHub
parent 89f3598426
commit b10c84b340
3 changed files with 44 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/xenia/hid/xinput/xinput_input_driver.cc
View File

@@ -52,6 +52,7 @@ X_STATUS XInputInputDriver::Setup() {
}
// Support guide button with XInput using XInputGetStateEx
// https://source.winehq.org/git/wine.git/?a=commit;h=de3591ca9803add117fbacb8abe9b335e2e44977
auto const XInputGetStateEx = (LPCSTR)100;
// Required.
@@ -77,7 +78,7 @@ X_STATUS XInputInputDriver::Setup() {
XInputGetKeystroke_ = xigk;
XInputSetState_ = xiss;
XInputEnable_ = xie;
return X_STATUS_SUCCESS;
}
@@ -140,16 +141,17 @@ X_RESULT XInputInputDriver::GetState(uint32_t user_index,
if (skipper) {
return skipper;
}
// Added padding in case we are using XInputGetStateEx
struct {
XINPUT_STATE state;
unsigned int xinput_state_ex_padding; // Add padding in case we are using XInputGetStateEx
unsigned int dwPaddingReserved;
} native_state;
// If the guide button is enabled use XInputGetStateEx, otherwise use the default XInputGetState.
auto xigs = cvars::guide_button
? (decltype(&XInputGetState))XInputGetStateEx_
: (decltype(&XInputGetState))XInputGetState_;
// If the guide button is enabled use XInputGetStateEx, otherwise use the
// default XInputGetState.
auto xigs = cvars::guide_button ? (decltype(&XInputGetState))XInputGetStateEx_
: (decltype(&XInputGetState))XInputGetState_;
DWORD result = xigs(user_index, &native_state.state);
if (result) {