Adding Matt Hortman to list of contributors.

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

diff --git a/src/rdp_bitmap.c b/src/rdp_bitmap.c
index fbf51b4..38a90fc 100644 (file)
--- a/src/rdp_bitmap.c
+++ b/src/rdp_bitmap.c
@@ -20,6 +20,7 @@
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
+ * Matt Hortman
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -45,18 +46,24 @@
 #include <guacamole/protocol.h>
 
 #include <freerdp/freerdp.h>
+#include <freerdp/utils/memory.h>
 #include <freerdp/codec/color.h>
+#include <freerdp/codec/bitmap.h>
 
 #include "client.h"
 #include "rdp_bitmap.h"
 
 void guac_rdp_bitmap_new(rdpContext* context, rdpBitmap* bitmap) {
 
-    /* Allocate buffer */
     guac_client* client = ((rdp_freerdp_context*) context)->client;
     guac_socket* socket = client->socket; 
+
+    /* Allocate buffer */
     guac_layer* buffer = guac_client_alloc_buffer(client);
 
+    /* Store buffer reference in bitmap */
+    ((guac_rdp_bitmap*) bitmap)->layer = buffer;
+
     /* Convert image data if present */
     if (bitmap->data != NULL) {
 
@@ -64,11 +71,11 @@ void guac_rdp_bitmap_new(rdpContext* context, rdpBitmap* bitmap) {
         unsigned char* image_buffer = freerdp_image_convert(bitmap->data, NULL,
                 bitmap->width, bitmap->height,
                 context->instance->settings->color_depth,
-                32, (HCLRCONV) &guac_rdp_clrconv);
+                32, ((rdp_freerdp_context*) context)->clrconv);
 
         /* Create surface from image data */
         cairo_surface_t* surface = cairo_image_surface_create_for_data(
-            bitmap->data, CAIRO_FORMAT_RGB24,
+            image_buffer, CAIRO_FORMAT_RGB24,
             bitmap->width, bitmap->height, 4*bitmap->width);
 
         /* Send surface to buffer */
@@ -77,16 +84,28 @@ void guac_rdp_bitmap_new(rdpContext* context, rdpBitmap* bitmap) {
         /* Free surface */
         cairo_surface_destroy(surface);
 
-        /* Free image data if actually alloated */
-        if (image_buffer != bitmap->data)
-            free(image_buffer);
+        /* If ephemeral, just free image data */
+        if (!bitmap->ephemeral) {
 
-    }
+            /* Free image data if actually alloated */
+            if (image_buffer != bitmap->data)
+                free(image_buffer);
 
-    /* Store buffer reference in bitmap */
-    ((guac_rdp_bitmap*) bitmap)->layer = buffer;
+        }
+
+        /* Otherwise, store converted image in bitmap, free any existing */
+        else {
+
+            /* Free existing image, if any */
+            if (image_buffer != bitmap->data)
+                free(bitmap->data);
+
+            /* Store converted image in bitmap */
+            bitmap->data = image_buffer;
+
+        }
 
-    guac_client_log_info(client, "guac_rdp_bitmap_new()");
+    }
 
 }
 
@@ -95,27 +114,54 @@ void guac_rdp_bitmap_paint(rdpContext* context, rdpBitmap* bitmap) {
     guac_client* client = ((rdp_freerdp_context*) context)->client;
     guac_socket* socket = client->socket;
 
-    /* Copy image data from buffer to visible layer */
+    int width = bitmap->right - bitmap->left + 1;
+    int height = bitmap->bottom - bitmap->top + 1;
+
     guac_protocol_send_copy(socket,
             ((guac_rdp_bitmap*) bitmap)->layer,
-            0, 0, bitmap->width, bitmap->height,
+            0, 0, width, height,
             GUAC_COMP_OVER,
             GUAC_DEFAULT_LAYER, bitmap->left, bitmap->top);
 
-    guac_client_log_info(client, "guac_rdp_bitmap_paint()");
-
 }
 
 void guac_rdp_bitmap_free(rdpContext* context, rdpBitmap* bitmap) {
     guac_client* client = ((rdp_freerdp_context*) context)->client;
-    guac_client_free_buffer(client, ((guac_rdp_bitmap*) bitmap)->layer);
-
-    guac_client_log_info(client, "guac_rdp_bitmap_free()");
 
+    /* Free layer, if any */
+    if (((guac_rdp_bitmap*) bitmap)->layer != NULL)
+        guac_client_free_buffer(client, ((guac_rdp_bitmap*) bitmap)->layer);
 }
 
 void guac_rdp_bitmap_setsurface(rdpContext* context, rdpBitmap* bitmap, boolean primary) {
     guac_client* client = ((rdp_freerdp_context*) context)->client;
-    guac_client_log_info(client, "guac_rdp_bitmap_setsurface()");
+
+    if (primary)
+        ((rdp_guac_client_data*) client->data)->current_surface
+            = GUAC_DEFAULT_LAYER;
+    else
+        ((rdp_guac_client_data*) client->data)->current_surface 
+            = ((guac_rdp_bitmap*) bitmap)->layer;
+
+}
+
+void guac_rdp_bitmap_decompress(rdpContext* context, rdpBitmap* bitmap, uint8* data, int width, int height, int bpp, int length, boolean compressed) {
+
+    int size = width * height * (bpp + 7) / 8;
+
+    if (bitmap->data == NULL)
+        bitmap->data = (uint8*) xmalloc(size);
+    else
+        bitmap->data = (uint8*) xrealloc(bitmap->data, size);
+
+    if (compressed)
+        bitmap_decompress(data, bitmap->data, width, height, length, bpp, bpp);
+    else
+        freerdp_image_flip(data, bitmap->data, width, height, bpp);
+
+    bitmap->compressed = false;
+    bitmap->length = size;
+    bitmap->bpp = bpp;
+
 }