github/FreeRDP
7
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2025-06-03 00:00:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[clinet,sdl] send local layout to server

Browse Source
This commit is contained in:
akallabeth 2025-03-25 10:55:16 +01:00
parent 0d67955f7f
commit 6f326ad1ef
No known key found for this signature in database
GPG Key ID: A49454A3FC909FD5
3 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/SDL/SDL3/sdl_freerdp.cpp
View File

@ -644,6 +644,9 @@ static BOOL sdl_pre_connect(freerdp* instance)
WLog_Print(sdl->log, WLOG_INFO, "Authentication only. Don't connect SDL.");
}
if (!sdl->input.initialize())
return FALSE;
/* TODO: Any code your client requires */
return TRUE;
}

36
client/SDL/SDL3/sdl_kbd.cpp
View File

@ -30,6 +30,8 @@
#include <freerdp/utils/string.h>
#include <freerdp/scancode.h>
#include <freerdp/locale/keyboard.h>
#include <freerdp/locale/locale.h>
#include <freerdp/log.h>
@ -590,13 +592,6 @@ BOOL sdlInput::keyboard_handle_event(const SDL_KeyboardEvent* ev)
}
}
if (!_remapTable)
{
auto list =
freerdp_settings_get_string(_sdl->context()->settings, FreeRDP_KeyboardRemappingList);
_remapTable = freerdp_keyboard_remap_string_to_list(list);
assert(_remapTable);
}
auto scancode = freerdp_keyboard_remap_key(_remapTable, rdp_scancode);
return freerdp_input_send_keyboard_event_ex(
_sdl->context()->input, ev->type == SDL_EVENT_KEY_DOWN, ev->repeat, scancode);
@ -652,3 +647,30 @@ sdlInput::~sdlInput()
{
freerdp_keyboard_remap_free(_remapTable);
}
BOOL sdlInput::initialize()
{
auto settings = _sdl->context()->settings;
WINPR_ASSERT(settings);
WINPR_ASSERT(!_remapTable);
{
auto list = freerdp_settings_get_string(settings, FreeRDP_KeyboardRemappingList);
_remapTable = freerdp_keyboard_remap_string_to_list(list);
if (!_remapTable)
return FALSE;
}
if (freerdp_settings_get_uint32(settings, FreeRDP_KeyboardLayout) == 0)
{
uint32_t KeyboardLayout = 0;
freerdp_detect_keyboard_layout_from_system_locale(&KeyboardLayout);
if (KeyboardLayout == 0)
KeyboardLayout = ENGLISH_UNITED_STATES;
if (!freerdp_settings_set_uint32(settings, FreeRDP_KeyboardLayout, KeyboardLayout))
return FALSE;
}
return TRUE;
}

2
client/SDL/SDL3/sdl_kbd.hpp
View File

@ -42,6 +42,8 @@ class sdlInput
sdlInput& operator=(const sdlInput& other) = delete;
sdlInput& operator=(sdlInput&& other) = delete;
BOOL initialize();
BOOL keyboard_sync_state();
BOOL keyboard_focus_in();