Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Regression: restore keyboard debug for non-XUP #3357

Merged
merged 1 commit into from
Dec 23, 2024
Merged

Regression: restore keyboard debug for non-XUP #3357

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion xrdp/xrdp_wm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,19 @@ xrdp_wm_create(struct xrdp_process *owner,
self->log->auto_free = 1;
self->mm = xrdp_mm_create(self);
/* 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);
self->target_surface = self->screen;
self->current_surface_index = 0xffff; /* screen */
Expand Down
Loading