maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GUACAMOLE-518: Count client-side pressed keys independently of server-side keys.

Browse Source
This commit is contained in:
Michael Jumper 2020-06-23 23:57:43 -07:00
parent 2407157d00
commit 3798d85bd1
2 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/protocols/rdp/keyboard.c
View File

@ -645,9 +645,35 @@ int guac_rdp_keyboard_update_keysym(guac_rdp_keyboard* keyboard,
} }
/* If key is known, ignoring the key event entirely if state is not
* actually changing */
guac_rdp_key* key = guac_rdp_keyboard_get_key(keyboard, keysym); guac_rdp_key* key = guac_rdp_keyboard_get_key(keyboard, keysym);
/* Update tracking of client-side keyboard state but only for keys which
* are tracked server-side, as well (to ensure that the key count remains
* correct, even if a user sends extra unbalanced or excessive press and
* release events) */
if (key != NULL && source == GUAC_RDP_KEY_SOURCE_CLIENT) {
if (pressed && !key->user_pressed) {
keyboard->user_pressed_keys++;
key->user_pressed = 1;
}
else if (!pressed && key->user_pressed) {
keyboard->user_pressed_keys--;
key->user_pressed = 0;
/* Reset RDP server keyboard state (releasing any automatically
* pressed keys) once all keys have been released on the client
* side */
if (keyboard->user_pressed_keys == 0)
guac_rdp_keyboard_reset(keyboard);
}
}
/* If key is known, ignore the key event entirely if state is not actually
* changing */
if (key != NULL) { if (key != NULL) {
if ((!pressed && key->pressed == NULL) || (pressed && key->pressed != NULL)) if ((!pressed && key->pressed == NULL) || (pressed && key->pressed != NULL))
return 0; return 0;
@ -672,26 +698,6 @@ int guac_rdp_keyboard_update_keysym(guac_rdp_keyboard* keyboard,
guac_rdp_keyboard_send_missing_key(keyboard, keysym); guac_rdp_keyboard_send_missing_key(keyboard, keysym);
} }
if (source == GUAC_RDP_KEY_SOURCE_CLIENT) {
/* Update tracking of client-side keyboard state but only for keys
* which are tracked server-side, as well (to ensure that the key count
* remains correct, even if a user sends extra unbalanced or excessive
* press and release events) */
if (key != NULL) {
if (pressed)
keyboard->user_pressed_keys++;
else
keyboard->user_pressed_keys--;
}
/* Reset RDP server keyboard state (releasing any automatically pressed
* keys) once all keys have been released on the client side */
if (keyboard->user_pressed_keys == 0)
guac_rdp_keyboard_reset(keyboard);
}
return 0; return 0;
} }

6
src/protocols/rdp/keyboard.h
View File

@ -84,6 +84,12 @@ typedef struct guac_rdp_key {
*/ */
const guac_rdp_keysym_desc* pressed; const guac_rdp_keysym_desc* pressed;
/**
* Whether this key is currently pressed by the user, and is included among
* the total tracked by user_pressed_keys within guac_rdp_keyboard.
*/
int user_pressed;
} guac_rdp_key; } guac_rdp_key;
/** /**