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

GUAC-656: Implement rect, clean logic.

Browse Source
This commit is contained in:
Michael Jumper 2014-04-30 19:03:46 -07:00
parent 98a041336a
commit c786854b63
1 changed files with 28 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/common/guac_surface.c
View File

@ -68,13 +68,10 @@ static int __guac_common_should_combine(guac_common_surface* surface, int x, int
if (new_pixels - dirty_pixels <= update_pixels*4) return 1; if (new_pixels - dirty_pixels <= update_pixels*4) return 1;
if (new_pixels / dirty_pixels <= 2) return 1; if (new_pixels / dirty_pixels <= 2) return 1;
/* Otherwise, do not combine */
return 0;
} }
/* Always combine with nothing */ /* Otherwise, do not combine */
return 1; return 0;
} }
@ -153,24 +150,21 @@ void guac_common_surface_free(guac_common_surface* surface) {
void guac_common_surface_draw(guac_common_surface* surface, int x, int y, cairo_surface_t* src) { void guac_common_surface_draw(guac_common_surface* surface, int x, int y, cairo_surface_t* src) {
guac_socket* socket = surface->socket;
int w = cairo_image_surface_get_width(src); int w = cairo_image_surface_get_width(src);
int h = cairo_image_surface_get_height(src); int h = cairo_image_surface_get_height(src);
/* Flush if not combining */ /* Update backing surface */
if (!__guac_common_should_combine(surface, x, y, w, h)) {
guac_protocol_send_log(socket, "Refusing to combine rect (%i, %i) %ix%i", x, y, w, h);
guac_common_surface_flush(surface);
}
/* Draw with given surface */
cairo_save(surface->cairo); cairo_save(surface->cairo);
cairo_set_source_surface(surface->cairo, src, x, y); cairo_set_source_surface(surface->cairo, src, x, y);
cairo_rectangle(surface->cairo, x, y, w, h); cairo_rectangle(surface->cairo, x, y, w, h);
cairo_fill(surface->cairo); cairo_fill(surface->cairo);
cairo_restore(surface->cairo); cairo_restore(surface->cairo);
/* Flush if not combining */
if (!__guac_common_should_combine(surface, x, y, w, h))
guac_common_surface_flush(surface);
/* Always defer draws */
__guac_common_mark_dirty(surface, x, y, w, h); __guac_common_mark_dirty(surface, x, y, w, h);
} }
@ -182,19 +176,15 @@ void guac_common_surface_copy(guac_common_surface* src, int sx, int sy, int w, i
const guac_layer* src_layer = src->layer; const guac_layer* src_layer = src->layer;
const guac_layer* dst_layer = dst->layer; const guac_layer* dst_layer = dst->layer;
/* Flush if not combining */ /* TODO: Update backing surface */
if (!__guac_common_should_combine(dst, dx, dy, w, h)) {
guac_protocol_send_log(socket, "Refusing to combine rect (%i, %i) %ix%i", dx, dy, w, h);
guac_common_surface_flush(dst);
}
if (dst->dirty) { /* Defer if combining */
/* STUB */ if (__guac_common_should_combine(dst, dx, dy, w, h))
guac_protocol_send_log(socket, "NOTE - would rewrite as PNG instead of sending copy");
__guac_common_mark_dirty(dst, dx, dy, w, h); __guac_common_mark_dirty(dst, dx, dy, w, h);
}
/* Otherwise, flush and draw immediately */
else { else {
guac_common_surface_flush(dst);
guac_common_surface_flush(src); guac_common_surface_flush(src);
guac_protocol_send_copy(socket, src_layer, sx, sy, w, h, GUAC_COMP_OVER, dst_layer, dx, dy); guac_protocol_send_copy(socket, src_layer, sx, sy, w, h, GUAC_COMP_OVER, dst_layer, dx, dy);
} }
@ -208,19 +198,15 @@ void guac_common_surface_transfer(guac_common_surface* src, int sx, int sy, int
const guac_layer* src_layer = src->layer; const guac_layer* src_layer = src->layer;
const guac_layer* dst_layer = dst->layer; const guac_layer* dst_layer = dst->layer;
/* Flush if not combining */ /* TODO: Update backing surface */
if (!__guac_common_should_combine(dst, dx, dy, w, h)) {
guac_protocol_send_log(socket, "Refusing to combine rect (%i, %i) %ix%i", dx, dy, w, h);
guac_common_surface_flush(dst);
}
if (dst->dirty) { /* Defer if combining */
/* STUB */ if (__guac_common_should_combine(dst, dx, dy, w, h))
guac_protocol_send_log(socket, "NOTE - would rewrite as PNG instead of sending transfer");
__guac_common_mark_dirty(dst, dx, dy, w, h); __guac_common_mark_dirty(dst, dx, dy, w, h);
}
/* Otherwise, flush and draw immediately */
else { else {
guac_common_surface_flush(dst);
guac_common_surface_flush(src); guac_common_surface_flush(src);
guac_protocol_send_transfer(socket, src_layer, sx, sy, w, h, op, dst_layer, dx, dy); guac_protocol_send_transfer(socket, src_layer, sx, sy, w, h, op, dst_layer, dx, dy);
} }
@ -234,19 +220,20 @@ void guac_common_surface_rect(guac_common_surface* surface,
guac_socket* socket = surface->socket; guac_socket* socket = surface->socket;
const guac_layer* layer = surface->layer; const guac_layer* layer = surface->layer;
/* Flush if not combining */ /* Update backing surface */
if (!__guac_common_should_combine(surface, x, y, w, h)) { cairo_save(surface->cairo);
guac_protocol_send_log(socket, "Refusing to combine rect (%i, %i) %ix%i", x, y, w, h); cairo_set_source_rgb(surface->cairo, red, green, blue);
guac_common_surface_flush(surface); cairo_rectangle(surface->cairo, x, y, w, h);
} cairo_fill(surface->cairo);
cairo_restore(surface->cairo);
if (surface->dirty) { /* Defer if combining */
/* STUB */ if (__guac_common_should_combine(surface, x, y, w, h))
guac_protocol_send_log(socket, "NOTE - would rewrite as PNG instead of sending rect+cfill");
__guac_common_mark_dirty(surface, x, y, w, h); __guac_common_mark_dirty(surface, x, y, w, h);
}
/* Otherwise, flush and draw immediately */
else { else {
guac_common_surface_flush(surface);
guac_protocol_send_rect(socket, layer, x, y, w, h); guac_protocol_send_rect(socket, layer, x, y, w, h);
guac_protocol_send_cfill(socket, GUAC_COMP_OVER, layer, red, green, blue, 0xFF); guac_protocol_send_cfill(socket, GUAC_COMP_OVER, layer, red, green, blue, 0xFF);
} }