maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Render all glyphs server-side.

Browse Source
This commit is contained in:
Michael Jumper 2012-04-05 16:45:04 -07:00
parent ec66c2b1b6
commit 6659af55c2
3 changed files with 66 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
protocols/rdp/include/client.h
View File

@ -63,6 +63,16 @@ typedef struct rdp_guac_client_data {
guac_rdp_color foreground; guac_rdp_color foreground;
guac_rdp_color background; guac_rdp_color background;
/**
* Cairo surface which will receive all drawn glyphs.
*/
cairo_surface_t* glyph_surface;
/**
* Cairo instance for drawing to glyph surface.
*/
cairo_t* glyph_cairo;
const guac_layer* current_surface; const guac_layer* current_surface;
guac_rdp_static_keymap keymap; guac_rdp_static_keymap keymap;

4
protocols/rdp/include/rdp_glyph.h
View File

@ -50,9 +50,9 @@ typedef struct guac_rdp_glyph {
rdpGlyph glyph; rdpGlyph glyph;
/** /**
* Guacamole layer containing cached image data. * Cairo surface layer containing cached image data.
*/ */
guac_layer* layer; cairo_surface_t* surface;
} guac_rdp_glyph; } guac_rdp_glyph;

98
protocols/rdp/src/rdp_glyph.c
View File

@ -45,11 +45,6 @@
void guac_rdp_glyph_new(rdpContext* context, rdpGlyph* glyph) { void guac_rdp_glyph_new(rdpContext* context, rdpGlyph* glyph) {
/* Allocate buffer */
guac_client* client = ((rdp_freerdp_context*) context)->client;
guac_socket* socket = client->socket;
guac_layer* layer = guac_client_alloc_buffer(client);
int x, y, i; int x, y, i;
int stride; int stride;
unsigned char* image_buffer; unsigned char* image_buffer;
@ -59,8 +54,6 @@ void guac_rdp_glyph_new(rdpContext* context, rdpGlyph* glyph) {
int width = glyph->cx; int width = glyph->cx;
int height = glyph->cy; int height = glyph->cy;
cairo_surface_t* surface;
/* Init Cairo buffer */ /* Init Cairo buffer */
stride = cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, width); stride = cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, width);
image_buffer = malloc(height*stride); image_buffer = malloc(height*stride);
@ -97,15 +90,9 @@ void guac_rdp_glyph_new(rdpContext* context, rdpGlyph* glyph) {
} }
} }
surface = cairo_image_surface_create_for_data(image_buffer, CAIRO_FORMAT_ARGB32, width, height, stride); /* Store glyph surface */
guac_protocol_send_png(socket, GUAC_COMP_SRC, layer, 0, 0, surface); ((guac_rdp_glyph*) glyph)->surface = cairo_image_surface_create_for_data(
image_buffer, CAIRO_FORMAT_ARGB32, width, height, stride);
/* Free surface */
cairo_surface_destroy(surface);
free(image_buffer);
/* Store layer */
((guac_rdp_glyph*) glyph)->layer = layer;
} }
@ -113,29 +100,27 @@ void guac_rdp_glyph_draw(rdpContext* context, rdpGlyph* glyph, int x, int y) {
guac_client* client = ((rdp_freerdp_context*) context)->client; guac_client* client = ((rdp_freerdp_context*) context)->client;
rdp_guac_client_data* guac_client_data = (rdp_guac_client_data*) client->data; rdp_guac_client_data* guac_client_data = (rdp_guac_client_data*) client->data;
const guac_layer* current_layer = ((rdp_guac_client_data*) client->data)->current_surface;
/* Colorize glyph */ /* Use glyph as mask */
guac_protocol_send_rect(client->socket, ((guac_rdp_glyph*) glyph)->layer, cairo_mask_surface(
0, 0, glyph->cx, glyph->cy); guac_client_data->glyph_cairo,
((guac_rdp_glyph*) glyph)->surface, x, y);
guac_protocol_send_cfill(client->socket, /* Fill rectangle with foreground */
GUAC_COMP_ATOP, ((guac_rdp_glyph*) glyph)->layer, cairo_rectangle(guac_client_data->glyph_cairo, x, y, glyph->cx, glyph->cy);
guac_client_data->foreground.red, cairo_fill(guac_client_data->glyph_cairo);
guac_client_data->foreground.green,
guac_client_data->foreground.blue,
255);
/* Draw glyph */
guac_protocol_send_copy(client->socket,
((guac_rdp_glyph*) glyph)->layer, 0, 0, glyph->cx, glyph->cy,
GUAC_COMP_OVER, current_layer, x, y);
} }
void guac_rdp_glyph_free(rdpContext* context, rdpGlyph* glyph) { void guac_rdp_glyph_free(rdpContext* context, rdpGlyph* glyph) {
guac_client* client = ((rdp_freerdp_context*) context)->client;
guac_client_free_buffer(client, ((guac_rdp_glyph*) glyph)->layer); unsigned char* image_buffer = cairo_image_surface_get_data(
((guac_rdp_glyph*) glyph)->surface);
/* Free surface */
cairo_surface_destroy(((guac_rdp_glyph*) glyph)->surface);
free(image_buffer);
} }
void guac_rdp_glyph_begindraw(rdpContext* context, void guac_rdp_glyph_begindraw(rdpContext* context,
@ -143,7 +128,6 @@ void guac_rdp_glyph_begindraw(rdpContext* context,
guac_client* client = ((rdp_freerdp_context*) context)->client; guac_client* client = ((rdp_freerdp_context*) context)->client;
rdp_guac_client_data* guac_client_data = (rdp_guac_client_data*) client->data; rdp_guac_client_data* guac_client_data = (rdp_guac_client_data*) client->data;
const guac_layer* current_layer = ((rdp_guac_client_data*) client->data)->current_surface;
bgcolor = freerdp_color_convert_var(bgcolor, bgcolor = freerdp_color_convert_var(bgcolor,
context->instance->settings->color_depth, 32, context->instance->settings->color_depth, 32,
@ -161,21 +145,47 @@ void guac_rdp_glyph_begindraw(rdpContext* context,
guac_client_data->background.green = (bgcolor & 0x00FF00) >> 8; guac_client_data->background.green = (bgcolor & 0x00FF00) >> 8;
guac_client_data->background.red = (bgcolor & 0xFF0000) >> 16; guac_client_data->background.red = (bgcolor & 0xFF0000) >> 16;
/* Paint background on destination */ /* Create glyph surface and cairo instance */
guac_protocol_send_rect(client->socket, current_layer, guac_client_data->glyph_surface = cairo_image_surface_create(
x, y, width, height); CAIRO_FORMAT_RGB24, width, height);
guac_protocol_send_cfill(client->socket, guac_client_data->glyph_cairo = cairo_create(
GUAC_COMP_OVER, current_layer, guac_client_data->glyph_surface);
guac_client_data->background.red,
guac_client_data->background.green, /* Fill with color */
guac_client_data->background.blue, cairo_set_source_rgb(guac_client_data->glyph_cairo,
255); guac_client_data->background.red / 255.0,
guac_client_data->background.green / 255.0,
guac_client_data->background.blue / 255.0);
cairo_rectangle(guac_client_data->glyph_cairo,
0, 0, width, height);
cairo_fill(guac_client_data->glyph_cairo);
/* Prepare for glyph drawing */
cairo_set_source_rgb(guac_client_data->glyph_cairo,
guac_client_data->foreground.red / 255.0,
guac_client_data->foreground.green / 255.0,
guac_client_data->foreground.blue / 255.0);
} }
void guac_rdp_glyph_enddraw(rdpContext* context, void guac_rdp_glyph_enddraw(rdpContext* context,
int x, int y, int width, int height, uint32 fgcolor, uint32 bgcolor) { int x, int y, int width, int height, uint32 fgcolor, uint32 bgcolor) {
/* UNUSED */
guac_client* client = ((rdp_freerdp_context*) context)->client;
rdp_guac_client_data* guac_client_data = (rdp_guac_client_data*) client->data;
const guac_layer* current_layer = ((rdp_guac_client_data*) client->data)->current_surface;
/* Send surface with all glyphs to layer */
guac_protocol_send_png(client->socket,
GUAC_COMP_OVER, current_layer, x, y,
guac_client_data->glyph_surface);
/* Clean up cairo and glyph surface */
cairo_destroy(guac_client_data->glyph_cairo);
cairo_surface_destroy(guac_client_data->glyph_surface);
} }