mirror/Sunshine
1
0
Fork 0
mirror of https://github.com/LizardByte/Sunshine.git synced 2025-04-10 15:44:33 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fix regression on gamepad support

Browse Source
This commit is contained in:
loki 2020-01-20 20:39:30 +01:00
parent 18f11ec735
commit 5ea2f30d5c
2 changed files with 50 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
sunshine/input.cpp
View File

@ -140,25 +140,51 @@ void passthrough(std::shared_ptr<input_t> &input, PNV_MULTI_CONTROLLER_PACKET pa
packet->rightStickY packet->rightStickY
}; };
bf = gamepad_state.buttonFlags ^ input->gamepad_state.buttonFlags;
auto bf_new = gamepad_state.buttonFlags; auto bf_new = gamepad_state.buttonFlags;
switch(input->back_button_state) {
case button_state_e::UP:
if(!(platf::BACK & bf_new)) {
input->back_button_state = button_state_e::NONE;
}
gamepad_state.buttonFlags &= ~platf::BACK;
break;
case button_state_e::DOWN:
if(platf::BACK & bf_new) {
input->back_button_state = button_state_e::NONE;
}
gamepad_state.buttonFlags |= platf::BACK;
break;
case button_state_e::NONE:
break;
}
bf = gamepad_state.buttonFlags ^ input->gamepad_state.buttonFlags;
bf_new = gamepad_state.buttonFlags;
// up pressed == -1, down pressed == 1, else 0
if (platf::BACK & bf) { if (platf::BACK & bf) {
if (platf::BACK & bf_new) { if (platf::BACK & bf_new) {
input->back_timeout_id = task_pool.pushDelayed([input]() {
auto &state = input->gamepad_state;
// Press Home button // Don't emulate home button if timeout < 0
state.buttonFlags |= platf::HOME; if(config::input.back_button_timeout >= 0ms) {
platf::gamepad(input->input, state); input->back_timeout_id = task_pool.pushDelayed([input]() {
auto &state = input->gamepad_state;
// Release Home button // Force the back button up
state.buttonFlags &= ~platf::HOME; input->back_button_state = button_state_e::UP;
platf::gamepad(input->input, state); state.buttonFlags &= ~platf::BACK;
platf::gamepad(input->input, state);
input->back_timeout_id = nullptr; // Press Home button
}, config::input.back_button_timeout).task_id; state.buttonFlags |= platf::HOME;
platf::gamepad(input->input, state);
// Release Home button
state.buttonFlags &= ~platf::HOME;
platf::gamepad(input->input, state);
input->back_timeout_id = nullptr;
}, config::input.back_button_timeout).task_id;
}
} }
else if (input->back_timeout_id) { else if (input->back_timeout_id) {
task_pool.cancel(input->back_timeout_id); task_pool.cancel(input->back_timeout_id);

12
sunshine/input.h
View File

@ -9,6 +9,11 @@
#include "thread_pool.h" #include "thread_pool.h"
namespace input { namespace input {
enum class button_state_e {
NONE,
DOWN,
UP
};
struct input_t { struct input_t {
input_t(); input_t();
@ -19,6 +24,13 @@ struct input_t {
util::ThreadPool::task_id_t back_timeout_id; util::ThreadPool::task_id_t back_timeout_id;
platf::input_t input; platf::input_t input;
// When emulating the HOME button, we may need to artificially release the back button.
// Afterwards, the gamepad state on sunshine won't match the state on Moonlight
// To prevent Sunshine from sending erronious input data to the active application,
// Sunshine forces the button to be in a specific state until the gamepad state matches that of
// Moonlight once more.
button_state_e back_button_state {button_state_e::NONE };
}; };
void print(void *input); void print(void *input);