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

First working implementation with special characters handled by unicodekeyboardevents.

Browse Source 
Signed-off-by: Michael Jumper <zhangmaike@users.sourceforge.net>
This commit is contained in:
Jocelyn DELALANDE 2012-05-01 10:59:50 +02:00 committed by Michael Jumper
parent 12d7353fb7
commit 4d0ed19243
3 changed files with 1077 additions and 1053 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1041
protocols/rdp/include/unicode_convtable.h
View File

File diff suppressed because it is too large Load Diff

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

@ -59,6 +59,7 @@
#include "rdp_keymap.h" #include "rdp_keymap.h"
#include "rdp_cliprdr.h" #include "rdp_cliprdr.h"
#include "guac_handlers.h" #include "guac_handlers.h"
#include "unicode_convtable.h"
void __guac_rdp_update_keysyms(guac_client* client, const int* keysym_string, int from, int to); void __guac_rdp_update_keysyms(guac_client* client, const int* keysym_string, int from, int to);
int __guac_rdp_send_keysym(guac_client* client, int keysym, int pressed); int __guac_rdp_send_keysym(guac_client* client, int keysym, int pressed);
@ -344,10 +345,12 @@ int __guac_rdp_send_keysym(guac_client* client, int keysym, int pressed) {
/* Send actual key */ /* Send actual key */
rdp_inst->input->KeyboardEvent( rdp_inst->input->KeyboardEvent(
rdp_inst->input, rdp_inst->input,
keysym_desc->flags keysym_desc->flags
| (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)
@ -357,23 +360,39 @@ int __guac_rdp_send_keysym(guac_client* client, int keysym, int pressed) {
if (keysym_desc->clear_keysyms != NULL) if (keysym_desc->clear_keysyms != NULL)
__guac_rdp_update_keysyms(client, keysym_desc->clear_keysyms, 1, 1); __guac_rdp_update_keysyms(client, keysym_desc->clear_keysyms, 1, 1);
}
/* If undefined but has Alt-code, use Alt-Code */
else if (keysym <= 0xFF) {
/* NOTE: The Alt-codes are conveniently identical to keysyms. */ /* /\* If undefined but has Alt-code, use Alt-Code *\/ */
/* else if (keysym <= 0xFF) { */
/* Only send Alt-code on press */ /* /\* NOTE: The Alt-codes are conveniently identical to keysyms. *\/ */
if (pressed)
__guac_rdp_send_altcode(client, keysym);
} /* /\* Only send Alt-code on press *\/ */
/* if (pressed) */
/* __guac_rdp_send_altcode(client, keysym); */
/* If no defined Alt-code, log warning */ /* } */
else
guac_client_log_info(client, "unmapped keysym: 0x%x", keysym);
/* /\* If no defined Alt-code, log warning *\/ */
/* else */
/* guac_client_log_info(client, "unmapped keysym: 0x%x", keysym); */
} else {
/* Fall back to unicode events */
int unicode_code = keysym2uni(keysym);
guac_client_log_info(client, "Translated keysym:0x%x to unicode:0x%x (pressed=%d flag=%d)",
keysym, unicode_code, pressed, pressed ? KBD_FLAGS_DOWN : KBD_FLAGS_RELEASE);
/* LibfreeRDP seems not to take into account the DOWN/RELEASE flags.
* So we send only the key once.
*/
if (pressed) {
rdp_inst->input->UnicodeKeyboardEvent(
rdp_inst->input,
0,//pressed ? KBD_FLAGS_DOW : KBD_FLAGS_RELEASE,
unicode_code);
}
}
} }
return 0; return 0;

1042
protocols/rdp/src/unicode_convtable.c
View File

File diff suppressed because it is too large Load Diff