Implement deferred cache via memblt.

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

diff --git a/src/rdp_bitmap.c b/src/rdp_bitmap.c
index 2a51447..2d67410 100644 (file)
--- a/src/rdp_bitmap.c
+++ b/src/rdp_bitmap.c
@@ -53,7 +53,7 @@
 #include "client.h"
 #include "rdp_bitmap.h"
 
-void guac_rdp_bitmap_new(rdpContext* context, rdpBitmap* bitmap) {
+void guac_rdp_cache_bitmap(rdpContext* context, rdpBitmap* bitmap) {
 
     guac_client* client = ((rdp_freerdp_context*) context)->client;
     guac_socket* socket = client->socket; 
@@ -61,9 +61,31 @@ void guac_rdp_bitmap_new(rdpContext* context, rdpBitmap* bitmap) {
     /* Allocate buffer */
     guac_layer* buffer = guac_client_alloc_buffer(client);
 
+    /* Cache image data if present */
+    if (bitmap->data != NULL) {
+
+        /* Create surface from image data */
+        cairo_surface_t* surface = cairo_image_surface_create_for_data(
+            bitmap->data, CAIRO_FORMAT_RGB24,
+            bitmap->width, bitmap->height, 4*bitmap->width);
+
+        /* Send surface to buffer */
+        guac_protocol_send_png(socket,
+                GUAC_COMP_SRC, buffer, 0, 0, surface);
+
+        /* Free surface */
+        cairo_surface_destroy(surface);
+
+    }
+
     /* Store buffer reference in bitmap */
     ((guac_rdp_bitmap*) bitmap)->layer = buffer;
 
+}
+
+
+void guac_rdp_bitmap_new(rdpContext* context, rdpBitmap* bitmap) {
+
     /* Convert image data if present */
     if (bitmap->data != NULL) {
 
@@ -73,40 +95,20 @@ void guac_rdp_bitmap_new(rdpContext* context, rdpBitmap* bitmap) {
                 context->instance->settings->color_depth,
                 32, ((rdp_freerdp_context*) context)->clrconv);
 
-        /* If not ephemeral, store cached image, and free image data */
-        if (!bitmap->ephemeral) {
-
-            /* Create surface from image data */
-            cairo_surface_t* surface = cairo_image_surface_create_for_data(
-                image_buffer, CAIRO_FORMAT_RGB24,
-                bitmap->width, bitmap->height, 4*bitmap->width);
-
-            /* Send surface to buffer */
-            guac_protocol_send_png(socket,
-                    GUAC_COMP_SRC, buffer, 0, 0, surface);
-
-            /* Free surface */
-            cairo_surface_destroy(surface);
-
-            /* Free image data if actually alloated */
-            if (image_buffer != bitmap->data)
-                free(image_buffer);
+        /* Free existing image, if any */
+        if (image_buffer != bitmap->data)
+            free(bitmap->data);
 
-        }
+        /* Store converted image in bitmap */
+        bitmap->data = image_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;
+    /* No corresponding layer yet - caching is deferred. */
+    ((guac_rdp_bitmap*) bitmap)->layer = NULL;
 
-        }
-
-    }
+    /* Start at zero usage */
+    ((guac_rdp_bitmap*) bitmap)->used = 0;
 
 }
 
@@ -118,8 +120,13 @@ void guac_rdp_bitmap_paint(rdpContext* context, rdpBitmap* bitmap) {
     int width = bitmap->right - bitmap->left + 1;
     int height = bitmap->bottom - bitmap->top + 1;
 
-    /* If not ephemeral, retrieve from cache */
-    if (!bitmap->ephemeral)
+    /* If not cached, cache if necessary */
+    if (((guac_rdp_bitmap*) bitmap)->layer == NULL
+            && ((guac_rdp_bitmap*) bitmap)->used >= 1)
+        guac_rdp_cache_bitmap(context, bitmap);
+
+    /* If cached, retrieve from cache */
+    if (((guac_rdp_bitmap*) bitmap)->layer != NULL)
         guac_protocol_send_copy(socket,
                 ((guac_rdp_bitmap*) bitmap)->layer,
                 0, 0, width, height,
@@ -144,14 +151,18 @@ void guac_rdp_bitmap_paint(rdpContext* context, rdpBitmap* bitmap) {
 
     }
 
+    /* Increment usage counter */
+    ((guac_rdp_bitmap*) bitmap)->used++;
+
 }
 
 void guac_rdp_bitmap_free(rdpContext* context, rdpBitmap* bitmap) {
     guac_client* client = ((rdp_freerdp_context*) context)->client;
 
-    /* Free layer, if any */
+    /* If cached, free buffer */
     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) {
@@ -160,10 +171,18 @@ void guac_rdp_bitmap_setsurface(rdpContext* context, rdpBitmap* bitmap, boolean
     if (primary)
         ((rdp_guac_client_data*) client->data)->current_surface
             = GUAC_DEFAULT_LAYER;
-    else
+
+    else {
+
+        /* If not available as a surface, make available. */
+        if (((guac_rdp_bitmap*) bitmap)->layer == NULL)
+            guac_rdp_cache_bitmap(context, bitmap);
+
         ((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) {