Free clipboard data properly.

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

diff --git a/src/guac_handlers.c b/src/guac_handlers.c
index ef4c0cb..3b60a28 100644 (file)
--- a/src/guac_handlers.c
+++ b/src/guac_handlers.c
@@ -47,6 +47,8 @@
 #include <freerdp/input.h>
 #include <freerdp/codec/color.h>
 #include <freerdp/cache/cache.h>
+#include <freerdp/utils/event.h>
+#include <freerdp/plugins/cliprdr.h>
 
 #include <guacamole/socket.h>
 #include <guacamole/protocol.h>
@@ -55,6 +57,7 @@
 
 #include "client.h"
 #include "rdp_keymap.h"
+#include "rdp_cliprdr.h"
 #include "guac_handlers.h"
 
 void __guac_rdp_update_keysyms(guac_client* client, const int* keysym_string, int from, int to);
@@ -98,6 +101,7 @@ int rdp_guac_client_handle_messages(guac_client* client) {
     int read_count = 0;
     int write_count = 0;
     fd_set rfds, wfds;
+    RDP_EVENT* event;
 
     struct timeval timeout = {
         .tv_sec = 0,
@@ -172,6 +176,25 @@ int rdp_guac_client_handle_messages(guac_client* client) {
         return 1;
     }
 
+    /* Check for channel events */
+    event = freerdp_channels_pop_event(channels);
+    if (event) {
+
+        /* Handle clipboard events */
+        if (event->event_class == RDP_EVENT_CLASS_CLIPRDR)
+            guac_rdp_process_cliprdr_event(client, event);
+
+        freerdp_event_free(event);
+
+    }
+
+    /* Handle RDP disconnect */
+    if (freerdp_shall_disconnect(rdp_inst)) {
+        guac_error = GUAC_STATUS_NO_INPUT;
+        guac_error_message = "RDP server closed connection";
+        return 1;
+    }
+
     /* Success */
     return 0;
 
@@ -386,3 +409,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;
+
+}
+