* 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
#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) {
+void __guac_rdp_cache_bitmap(rdpContext* context, rdpBitmap* bitmap) {
- /* Allocate buffer */
guac_client* client = ((rdp_freerdp_context*) context)->client;
guac_socket* socket = client->socket;
- guac_layer* buffer = guac_client_alloc_buffer(client);
- /* Convert image data if present */
+ /* Cache image data if present */
if (bitmap->data != NULL) {
- /* Convert image data to 32-bit RGB */
- unsigned char* image_buffer = freerdp_image_convert(bitmap->data, NULL,
- bitmap->width, bitmap->height,
- context->instance->settings->color_depth,
- 32, (HCLRCONV) &guac_rdp_clrconv);
+ /* Allocate buffer */
+ guac_layer* buffer = guac_client_alloc_buffer(client);
/* Create surface from image data */
cairo_surface_t* surface = cairo_image_surface_create_for_data(
bitmap->width, bitmap->height, 4*bitmap->width);
/* Send surface to buffer */
- guac_protocol_send_png(socket, GUAC_COMP_SRC, buffer, 0, 0, surface);
+ 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);
+ /* Store buffer reference in bitmap */
+ ((guac_rdp_bitmap*) bitmap)->layer = buffer;
}
- /* 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) {
+
+ /* Convert image data to 32-bit RGB */
+ unsigned char* image_buffer = freerdp_image_convert(bitmap->data, NULL,
+ bitmap->width, bitmap->height,
+ context->instance->settings->color_depth,
+ 32, ((rdp_freerdp_context*) context)->clrconv);
+
+ /* Free existing image, if any */
+ if (image_buffer != bitmap->data)
+ free(bitmap->data);
+
+ /* Store converted image in bitmap */
+ bitmap->data = image_buffer;
+
+ /* If not ephemeral, store cached image */
+ if (!bitmap->ephemeral)
+ __guac_rdp_cache_bitmap(context, bitmap);
+
+ else
+ /* No corresponding layer */
+ ((guac_rdp_bitmap*) bitmap)->layer = NULL;
+
+ }
- guac_client_log_info(client, "guac_rdp_bitmap_new()");
+ else
+ /* No corresponding layer */
+ ((guac_rdp_bitmap*) bitmap)->layer = NULL;
}
guac_client* client = ((rdp_freerdp_context*) context)->client;
guac_socket* socket = client->socket;
- /* Copy image data from buffer to visible layer */
- guac_protocol_send_copy(socket,
- ((guac_rdp_bitmap*) bitmap)->layer,
- 0, 0, bitmap->width, bitmap->height,
- GUAC_COMP_OVER,
- GUAC_DEFAULT_LAYER, bitmap->left, bitmap->top);
+ int width = bitmap->right - bitmap->left + 1;
+ int height = bitmap->bottom - bitmap->top + 1;
- guac_client_log_info(client, "guac_rdp_bitmap_paint()");
+ /* 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,
+ 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);
+
+ }
}
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 {
+
+ if (((guac_rdp_bitmap*) bitmap)->layer != NULL)
+ ((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) {
- guac_client* client = ((rdp_freerdp_context*) context)->client;
- guac_client_log_info(client, "guac_rdp_bitmap_decompress()");
+
+ 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;
+
}
projects / libguac-client-rdp.git / blobdiff