cosmetic and comments for guacamole integration

[libguac-client-rdp.git] / src / guac_handlers.c

diff --git a/src/guac_handlers.c b/src/guac_handlers.c
index 671fd8f..ebc3307 100644 (file)
--- a/src/guac_handlers.c
+++ b/src/guac_handlers.c
@@ -59,6 +59,7 @@
 #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);
@@ -82,6 +83,9 @@ int rdp_guac_client_free_handler(guac_client* client) {
     freerdp_free(rdp_inst);
 
     /* Free client data */
+    cairo_surface_destroy(guac_client_data->opaque_glyph_surface);
+    cairo_surface_destroy(guac_client_data->trans_glyph_surface);
+    free(guac_client_data->clipboard);
     free(guac_client_data);
 
     return 0;
@@ -322,7 +326,7 @@ 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 =
@@ -346,6 +350,8 @@ int __guac_rdp_send_keysym(guac_client* client, int keysym, int pressed) {
                         | (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);
@@ -354,24 +360,29 @@ int __guac_rdp_send_keysym(guac_client* client, int keysym, int pressed) {
             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. */
-
-            /* 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);
+        } 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);
 
-    }
+                       /* 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;
 }
@@ -409,3 +420,31 @@ int rdp_guac_client_key_handler(guac_client* client, int keysym, int pressed) {
 
 }
 
+int rdp_guac_client_clipboard_handler(guac_client* client, char* data) {
+
+    rdpChannels* channels = 
+        ((rdp_guac_client_data*) client->data)->rdp_inst->context->channels;
+
+    RDP_CB_FORMAT_LIST_EVENT* format_list =
+        (RDP_CB_FORMAT_LIST_EVENT*) freerdp_event_new(
+            RDP_EVENT_CLASS_CLIPRDR,
+            RDP_EVENT_TYPE_CB_FORMAT_LIST,
+            NULL, NULL);
+
+    /* Free existing data */
+    free(((rdp_guac_client_data*) client->data)->clipboard);
+
+    /* Store data in client */
+    ((rdp_guac_client_data*) client->data)->clipboard = strdup(data);
+
+    /* Notify server that text data is now available */
+    format_list->formats = (uint32*) malloc(sizeof(uint32));
+    format_list->formats[0] = CB_FORMAT_TEXT;
+    format_list->num_formats = 1;
+
+    freerdp_channels_send_event(channels, (RDP_EVENT*) format_list);
+
+    return 0;
+
+}
+