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

Log when no equivalence between keysym and Unicode. Remove debug log.

Browse Source
This commit is contained in:
Michael Jumper 2012-05-16 10:29:43 -07:00
parent 13415ebcdb
commit 2056ab9619
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
protocols/rdp/src/guac_handlers.c
View File

@ -309,8 +309,6 @@ int __guac_rdp_send_keysym(guac_client* client, int keysym, int pressed) {
| (pressed ? KBD_FLAGS_DOWN : KBD_FLAGS_RELEASE), | (pressed ? KBD_FLAGS_DOWN : KBD_FLAGS_RELEASE),
keysym_desc->scancode); keysym_desc->scancode);
guac_client_log_info(client, "Base flags are %d", keysym_desc->flags);
/* If defined, release any keys that were originally released */ /* If defined, release any keys that were originally released */
if (keysym_desc->set_keysyms != NULL) if (keysym_desc->set_keysyms != NULL)
__guac_rdp_update_keysyms(client, keysym_desc->set_keysyms, 0, 0); __guac_rdp_update_keysyms(client, keysym_desc->set_keysyms, 0, 0);
@ -326,17 +324,25 @@ int __guac_rdp_send_keysym(guac_client* client, int keysym, int pressed) {
/* Fall back to unicode events if undefined inside current keymap */ /* Fall back to unicode events if undefined inside current keymap */
/* Only send when key pressed - Unicode events do not have DOWN/RELEASE flags */ /* Only send when key pressed - Unicode events do not have
* DOWN/RELEASE flags */
if (pressed) { if (pressed) {
/* Translate keysym into codepoint */ /* Translate keysym into codepoint */
int codepoint; int codepoint;
if (keysym <= 0xFF) if (keysym <= 0xFF)
codepoint = keysym; codepoint = keysym;
else else if (keysym >= 0x1000000)
codepoint = keysym & 0xFFFFFF; codepoint = keysym & 0xFFFFFF;
else {
guac_client_log_info(client,
"Unmapped keysym has no equivalent unicode "
"value: 0x%x", keysym);
return 0;
}
guac_client_log_info(client, "Translated keysym 0x%x to U+%04X", keysym, codepoint); guac_client_log_info(client, "Translated keysym 0x%x to U+%04X",
keysym, codepoint);
/* Send Unicode event */ /* Send Unicode event */
rdp_inst->input->UnicodeKeyboardEvent( rdp_inst->input->UnicodeKeyboardEvent(