#include "rdp_keymap.h"
#include "rdp_cliprdr.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);
int __guac_rdp_send_keysym(guac_client* client, int keysym, int pressed);
freerdp* rdp_inst = guac_client_data->rdp_inst;
/* If keysym can be in lookup table */
- if (keysym <= 0xFFFF) {
+ //if (keysym <= 0xFFFF) {
/* Look up scancode mapping */
const guac_rdp_keysym_desc* keysym_desc =
| (pressed ? KBD_FLAGS_DOWN : KBD_FLAGS_RELEASE),
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 (keysym_desc->set_keysyms != NULL)
__guac_rdp_update_keysyms(client, keysym_desc->set_keysyms, 0, 0);
if (keysym_desc->clear_keysyms != NULL)
__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. */
+ } else {
+ /* Fall back to unicode events if undefined inside current keymap */
+ 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);
- /* 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);
-
- }
+ /* LibfreeRDP seems not to take into account the DOWN/RELEASE flags.
+ * So we send only on of the two key events.
+ */
+ if (pressed) {
+ rdp_inst->input->UnicodeKeyboardEvent(
+ rdp_inst->input,
+ //pressed ? KBD_FLAGS_DOW : KBD_FLAGS_RELEASE, <- not
+ // taken into account
+ 0,
+ unicode_code);
+ } else {
+
+ guac_client_log_info(client, "Ignoring release");
+ }
+ }
+ //}
return 0;
}