pxcloud/sunshine-sdk
5
0
Fork 0
mirror of https://github.com/thinkonmay/sunshine-sdk.git synced 2026-01-07 11:37:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Convert keyboard input to scancodes using the US English layout (#651)

Browse Source
This commit is contained in:
Cameron Gutman 2022-12-30 12:30:11 -06:00 committed by GitHub
parent 91f4f15c49
commit 03b62730ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 46 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/platform/windows/input.cpp
View File

@ -170,12 +170,31 @@ void CALLBACK ds4_notify(
task_pool.push(&vigem_t::rumble, (vigem_t *)userdata, target, smallMotor, largeMotor);
}
input_t input() {
input_t result { new vigem_t {} };
struct input_raw_t {
~input_raw_t() {
delete vigem;
}
auto vigem = (vigem_t *)result.get();
if(vigem->init()) {
return nullptr;
vigem_t *vigem;
HKL keyboard_layout;
};
input_t input() {
input_t result { new input_raw_t {} };
auto &raw = *(input_raw_t *)result.get();
raw.vigem = new vigem_t {};
if(raw.vigem->init()) {
delete raw.vigem;
raw.vigem = nullptr;
}
// Moonlight currently sends keys normalized to the US English layout.
// We need to use that layout when converting to scancodes.
raw.keyboard_layout = LoadKeyboardLayoutA("00000409", 0);
if(!raw.keyboard_layout || LOWORD(raw.keyboard_layout) != 0x409) {
BOOST_LOG(warning) << "Unable to load US English keyboard layout for scancode translation. Keyboard input may not work in games."sv;
raw.keyboard_layout = NULL;
}
return result;
@ -285,16 +304,23 @@ void scroll(input_t &input, int distance) {
}
void keyboard(input_t &input, uint16_t modcode, bool release) {
auto raw = (input_raw_t *)input.get();
INPUT i {};
i.type = INPUT_KEYBOARD;
auto &ki = i.ki;
// For some reason, MapVirtualKey(VK_LWIN, MAPVK_VK_TO_VSC) doesn't seem to work :/
if(modcode != VK_LWIN && modcode != VK_RWIN && modcode != VK_PAUSE) {
ki.wScan = MapVirtualKey(modcode, MAPVK_VK_TO_VSC);
if(modcode != VK_LWIN && modcode != VK_RWIN && modcode != VK_PAUSE && raw->keyboard_layout != NULL) {
ki.wScan = MapVirtualKeyEx(modcode, MAPVK_VK_TO_VSC, raw->keyboard_layout);
}
// If we can map this to a scancode, send it as a scancode for maximum game compatibility.
if(ki.wScan) {
ki.dwFlags = KEYEVENTF_SCANCODE;
}
else {
// If there is no scancode mapping, send it as a regular VK event.
ki.wVk = modcode;
}
@ -355,19 +381,23 @@ void unicode(input_t &input, char *utf8, int size) {
}
int alloc_gamepad(input_t &input, int nr, rumble_queue_t rumble_queue) {
if(!input) {
auto raw = (input_raw_t *)input.get();
if(!raw->vigem) {
return 0;
}
return ((vigem_t *)input.get())->alloc_gamepad_interal(nr, rumble_queue, map(config::input.gamepad));
return raw->vigem->alloc_gamepad_interal(nr, rumble_queue, map(config::input.gamepad));
}
void free_gamepad(input_t &input, int nr) {
if(!input) {
auto raw = (input_raw_t *)input.get();
if(!raw->vigem) {
return;
}
((vigem_t *)input.get())->free_target(nr);
raw->vigem->free_target(nr);
}
static VIGEM_ERROR x360_update(client_t::pointer client, target_t::pointer gp, const gamepad_state_t &gamepad_state) {
@ -476,13 +506,13 @@ static VIGEM_ERROR ds4_update(client_t::pointer client, target_t::pointer gp, co
void gamepad(input_t &input, int nr, const gamepad_state_t &gamepad_state) {
auto vigem = ((input_raw_t *)input.get())->vigem;
// If there is no gamepad support
if(!input) {
if(!vigem) {
return;
}
auto vigem = (vigem_t *)input.get();
auto &[_, gp] = vigem->gamepads[nr];
VIGEM_ERROR status;
@ -500,9 +530,9 @@ void gamepad(input_t &input, int nr, const gamepad_state_t &gamepad_state) {
}
void freeInput(void *p) {
auto vigem = (vigem_t *)p;
auto input = (input_raw_t *)p;
delete vigem;
delete input;
}
std::vector<std::string_view> &supported_gamepads() {