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

GUAC-675: Source coordinates must be updated along with rect.

Browse Source
This commit is contained in:
Michael Jumper 2014-05-12 02:26:04 -07:00
parent 07f6712591
commit 2bbbda3ca9
1 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/common/guac_surface.c
View File

@ -400,7 +400,7 @@ static void __guac_common_surface_rect(guac_common_surface* dst, guac_common_rec
* should be ignored), zero otherwise. * should be ignored), zero otherwise.
*/ */
static void __guac_common_surface_put(unsigned char* src_buffer, int src_stride, static void __guac_common_surface_put(unsigned char* src_buffer, int src_stride,
int sx, int sy, int* sx, int* sy,
guac_common_surface* dst, guac_common_rect* rect, guac_common_surface* dst, guac_common_rect* rect,
int opaque) { int opaque) {
@ -414,7 +414,10 @@ static void __guac_common_surface_put(unsigned char* src_buffer, int src_stride,
int max_x = 0; int max_x = 0;
int max_y = 0; int max_y = 0;
src_buffer += src_stride*sy + 4*sx; int orig_x = rect->x;
int orig_y = rect->y;
src_buffer += src_stride * (*sy) + 4 * (*sx);
dst_buffer += (dst_stride * rect->y) + (4 * rect->x); dst_buffer += (dst_stride * rect->y) + (4 * rect->x);
/* For each row */ /* For each row */
@ -462,6 +465,10 @@ static void __guac_common_surface_put(unsigned char* src_buffer, int src_stride,
rect->height = 0; rect->height = 0;
} }
/* Update source X/Y */
*sx += rect->x - orig_x;
*sy += rect->y - orig_y;
} }
/** /**
@ -536,7 +543,7 @@ static void __guac_common_surface_fill_mask(unsigned char* src_buffer, int src_s
* @param dx The destination X coordinate. * @param dx The destination X coordinate.
* @param dy The destination Y coordinate. * @param dy The destination Y coordinate.
*/ */
static void __guac_common_surface_transfer(guac_common_surface* src, int sx, int sy, static void __guac_common_surface_transfer(guac_common_surface* src, int* sx, int* sy,
guac_transfer_function op, guac_transfer_function op,
guac_common_surface* dst, guac_common_rect* rect) { guac_common_surface* dst, guac_common_rect* rect) {
@ -552,9 +559,12 @@ static void __guac_common_surface_transfer(guac_common_surface* src, int sx, int
int max_x = 0; int max_x = 0;
int max_y = 0; int max_y = 0;
int orig_x = rect->x;
int orig_y = rect->y;
/* Copy forwards only if destination is in a different surface or is before source */ /* Copy forwards only if destination is in a different surface or is before source */
if (src != dst || rect->y < sy || (rect->y == sy && rect->x < sx)) { if (src != dst || rect->y < *sy || (rect->y == *sy && rect->x < *sx)) {
src_buffer += src->stride*sy + 4*sx; src_buffer += src->stride * (*sy) + 4 * (*sx);
dst_buffer += (dst->stride * rect->y) + (4 * rect->x); dst_buffer += (dst->stride * rect->y) + (4 * rect->x);
src_stride = src->stride; src_stride = src->stride;
dst_stride = dst->stride; dst_stride = dst->stride;
@ -563,7 +573,7 @@ static void __guac_common_surface_transfer(guac_common_surface* src, int sx, int
/* Otherwise, copy backwards */ /* Otherwise, copy backwards */
else { else {
src_buffer += src->stride * (sy + rect->height - 1) + 4 * (sx + rect->width - 1); src_buffer += src->stride * (*sy + rect->height - 1) + 4 * (*sx + rect->width - 1);
dst_buffer += dst->stride * (rect->y + rect->height - 1) + 4 * (rect->x + rect->width - 1); dst_buffer += dst->stride * (rect->y + rect->height - 1) + 4 * (rect->x + rect->width - 1);
src_stride = -src->stride; src_stride = -src->stride;
dst_stride = -dst->stride; dst_stride = -dst->stride;
@ -596,12 +606,18 @@ static void __guac_common_surface_transfer(guac_common_surface* src, int sx, int
} }
/* Translate coordinate space of min_* and max_* if moving backwards */ /* Translate X coordinate space of moving backwards */
if (step < 0) { if (step < 0) {
min_x = rect->width - 1 - min_x; int old_max_x = max_x;
max_x = rect->width - 1 - max_x; max_x = rect->width - 1 - min_x;
min_y = rect->height - 1 - min_y; min_x = rect->width - 1 - old_max_x;
max_y = rect->height - 1 - max_y; }
/* Translate Y coordinate space of moving backwards */
if (dst_stride < 0) {
int old_max_y = max_y;
max_y = rect->height - 1 - min_y;
min_y = rect->height - 1 - old_max_y;
} }
/* Restrict destination rect to only updated pixels */ /* Restrict destination rect to only updated pixels */
@ -616,6 +632,10 @@ static void __guac_common_surface_transfer(guac_common_surface* src, int sx, int
rect->height = 0; rect->height = 0;
} }
/* Update source X/Y */
*sx += rect->x - orig_x;
*sy += rect->y - orig_y;
} }
guac_common_surface* guac_common_surface_alloc(guac_socket* socket, const guac_layer* layer, int w, int h) { guac_common_surface* guac_common_surface_alloc(guac_socket* socket, const guac_layer* layer, int w, int h) {
@ -732,7 +752,7 @@ void guac_common_surface_draw(guac_common_surface* surface, int x, int y, cairo_
return; return;
/* Update backing surface */ /* Update backing surface */
__guac_common_surface_put(buffer, stride, sx, sy, surface, &rect, format != CAIRO_FORMAT_ARGB32); __guac_common_surface_put(buffer, stride, &sx, &sy, surface, &rect, format != CAIRO_FORMAT_ARGB32);
if (rect.width <= 0 || rect.height <= 0) if (rect.width <= 0 || rect.height <= 0)
return; return;
@ -792,7 +812,7 @@ void guac_common_surface_copy(guac_common_surface* src, int sx, int sy, int w, i
return; return;
/* Update backing surface */ /* Update backing surface */
__guac_common_surface_transfer(src, sx, sy, GUAC_TRANSFER_BINARY_SRC, dst, &rect); __guac_common_surface_transfer(src, &sx, &sy, GUAC_TRANSFER_BINARY_SRC, dst, &rect);
if (rect.width <= 0 || rect.height <= 0) if (rect.width <= 0 || rect.height <= 0)
return; return;
@ -827,7 +847,7 @@ void guac_common_surface_transfer(guac_common_surface* src, int sx, int sy, int
return; return;
/* Update backing surface */ /* Update backing surface */
__guac_common_surface_transfer(src, sx, sy, op, dst, &rect); __guac_common_surface_transfer(src, &sx, &sy, op, dst, &rect);
if (rect.width <= 0 || rect.height <= 0) if (rect.width <= 0 || rect.height <= 0)
return; return;