mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Wayland client: Disable shortcut inhibition on rctrl press

Browse Source
This commit is contained in:
Max Roncace 2021-04-06 23:05:50 -04:00 committed by akallabeth
parent aeba30a505
commit e2920d7259
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
client/Wayland/wlf_input.c
View File

@ -301,6 +301,9 @@ BOOL wlf_handle_key(freerdp* instance, const UwacKeyEvent* ev)
if (!instance || !ev || !instance->input)
return FALSE;
if (instance->context->settings->GrabKeyboard && ev->raw_key == KEY_RIGHTCTRL)
wlf_handle_ungrab_key(instance, ev);
input = instance->input;
rdp_scancode = freerdp_keyboard_get_rdp_scancode_from_x11_keycode(ev->raw_key + 8);
@ -310,6 +313,17 @@ BOOL wlf_handle_key(freerdp* instance, const UwacKeyEvent* ev)
return freerdp_input_send_keyboard_event_ex(input, ev->pressed, rdp_scancode);
}
BOOL wlf_handle_ungrab_key(freerdp* instance, const UwacKeyEvent* ev)
{
wlfContext* context;
if (!instance || !instance->context || !ev)
return FALSE;
context = (wlfContext*)instance->context;
return UwacSeatInhibitShortcuts(context->seat, false) == UWAC_SUCCESS;
}
BOOL wlf_keyboard_enter(freerdp* instance, const UwacKeyboardEnterLeaveEvent* ev)
{
if (!instance || !ev || !instance->input)
@ -339,6 +353,7 @@ BOOL wlf_keyboard_modifiers(freerdp* instance, const UwacKeyboardModifiersEvent*
return TRUE;
((wlfContext*)instance->context)->focusing = FALSE;
return freerdp_input_send_focus_in_event(input, syncFlags) &&
freerdp_input_send_mouse_event(input, PTR_FLAGS_MOVE, 0, 0);
}

1
client/Wayland/wlf_input.h
View File

@ -38,6 +38,7 @@ BOOL wlf_handle_touch_down(freerdp* instance, const UwacTouchDown* ev);
BOOL wlf_handle_touch_motion(freerdp* instance, const UwacTouchMotion* ev);
BOOL wlf_handle_key(freerdp* instance, const UwacKeyEvent* ev);
BOOL wlf_handle_ungrab_key(freerdp* instance, const UwacKeyEvent* ev);
BOOL wlf_keyboard_enter(freerdp* instance, const UwacKeyboardEnterLeaveEvent* ev);
BOOL wlf_keyboard_modifiers(freerdp* instance, const UwacKeyboardModifiersEvent* ev);

5
uwac/libuwac/uwac-input.c
View File

@ -1135,12 +1135,15 @@ UwacReturnCode UwacSeatInhibitShortcuts(UwacSeat* s, bool inhibit)
return UWAC_ERROR_CLOSED;
if (s->keyboard_inhibitor)
{
zwp_keyboard_shortcuts_inhibitor_v1_destroy(s->keyboard_inhibitor);
s->keyboard_inhibitor = NULL;
}
if (inhibit && s->display && s->display->keyboard_inhibit_manager)
s->keyboard_inhibitor = zwp_keyboard_shortcuts_inhibit_manager_v1_inhibit_shortcuts(
s->display->keyboard_inhibit_manager, s->keyboard_focus->surface, s->seat);
if (!s->keyboard_inhibitor)
if (inhibit && !s->keyboard_inhibitor)
return UWAC_ERROR_INTERNAL;
return UWAC_SUCCESS;
}