Changeset e8a54cd in libguac-client-rdp

Timestamp:

04/03/12 17:03:52 (14 months ago)

Author:

zhangmaike

Branches:

master, debian, rpm, unstable

Children:

9ebadf7

Parents:

69f2919

git-author:

Michael Jumper <zhangmaike@…> (04/03/12 17:03:52)

git-committer:

Michael Jumper <zhangmaike@…> (04/03/12 17:03:52)

Message:

Only cache bitmap on client if not ephemeral.

File:

• src/rdp_bitmap.c (modified) (2 diffs)

src/rdp_bitmap.c

@@ -74 +74 @@
                 32, ((rdp_freerdp_context*) context)->clrconv);
 
-        /* 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);
+        /* If not ephemeral, store cached image, and free image data */
+        if (!bitmap->ephemeral) {
 
-        /* Send surface to buffer */
-        guac_protocol_send_png(socket, GUAC_COMP_SRC, buffer, 0, 0, surface);
+            /* 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);
 
-        /* Free surface */
-        cairo_surface_destroy(surface);
+            /* Send surface to buffer */
+            guac_protocol_send_png(socket,
+                    GUAC_COMP_SRC, buffer, 0, 0, surface);
 
-        /* If ephemeral, just free image data */
-        if (!bitmap->ephemeral) {
+            /* Free surface */
+            cairo_surface_destroy(surface);
 
             /* Free image data if actually alloated */
@@ -118 +119 @@
     int height = bitmap->bottom - bitmap->top + 1;
 
-    guac_protocol_send_copy(socket,
-            ((guac_rdp_bitmap*) bitmap)->layer,
-            0, 0, width, height,
-            GUAC_COMP_OVER,
-            GUAC_DEFAULT_LAYER, bitmap->left, bitmap->top);
+    /* If not ephemeral, retrieve from cache */
+    if (!bitmap->ephemeral)
+        guac_protocol_send_copy(socket,
+                ((guac_rdp_bitmap*) bitmap)->layer,
+                0, 0, width, height,
+                GUAC_COMP_OVER,
+                GUAC_DEFAULT_LAYER, bitmap->left, bitmap->top);
+
+    /* Otherwise, draw with stored image data */
+    else if (bitmap->data != NULL) {
+
+        /* Create surface from image data */
+        cairo_surface_t* surface = cairo_image_surface_create_for_data(
+            bitmap->data, CAIRO_FORMAT_RGB24,
+            width, height, 4*bitmap->width);
+
+        /* Send surface to buffer */
+        guac_protocol_send_png(socket,
+                GUAC_COMP_OVER, GUAC_DEFAULT_LAYER,
+                bitmap->left, bitmap->top, surface);
+
+        /* Free surface */
+        cairo_surface_destroy(surface);
+
+    }
 
 }