github/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3357 from matt335672/fix_debug_keyboard

Browse Source 
Regression: restore keyboard debug for non-XUP
This commit is contained in:
matt335672
2024-12-23 18:56:53 +00:00
committed by GitHub
parent 5a493124b8 c97bb7d5c4
commit 3f1c4b1148
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xrdp/xrdp_wm.c
+13 -1
View File
@@ -110,7 +110,19 @@ xrdp_wm_create(struct xrdp_process *owner,
self->log->auto_free = 1; self->log->auto_free = 1;
self->mm = xrdp_mm_create(self); self->mm = xrdp_mm_create(self);
/* this will use built in keymap or load from file */ /* this will use built in keymap or load from file */
get_keymaps(self->session->client_info->keylayout, &(self->keymap)); if (client_info->xrdp_keyboard_overrides.layout > 0 &&
client_info->xrdp_keyboard_overrides.layout != client_info->keylayout)
{
LOG(LOG_LEVEL_INFO, "overrode keylayout %08X with %08X",
client_info->keylayout,
client_info->xrdp_keyboard_overrides.layout);
get_keymaps(client_info->xrdp_keyboard_overrides.layout,
&(self->keymap));
}
else
{
get_keymaps(client_info->keylayout, &(self->keymap));
}
xrdp_wm_set_login_state(self, WMLS_RESET); xrdp_wm_set_login_state(self, WMLS_RESET);
self->target_surface = self->screen; self->target_surface = self->screen;
self->current_surface_index = 0xffff; /* screen */ self->current_surface_index = 0xffff; /* screen */