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

Full conversion of old libpng-based methods.

Browse Source
This commit is contained in:
Michael Jumper 2011-03-27 18:40:38 -07:00
parent e49798364b
commit be731b5900
1 changed files with 43 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
protocols/vnc/src/vnc_client.c
View File

@ -93,10 +93,15 @@ void guac_vnc_cursor(rfbClient* client, int x, int y, int w, int h, int bpp) {
/* Copy image data from VNC client to RGBA buffer */ /* Copy image data from VNC client to RGBA buffer */
for (dy = 0; dy<h; dy++) { for (dy = 0; dy<h; dy++) {
unsigned char* buffer_current = buffer_row_current; unsigned char* buffer_current;
unsigned char* fb_current;
/* Get current buffer row, advance to next */
buffer_current = buffer_row_current;
buffer_row_current += stride; buffer_row_current += stride;
unsigned char* fb_current = fb_row_current; /* Get current framebuffer row, advance to next */
fb_current = fb_row_current;
fb_row_current += fb_stride; fb_row_current += fb_stride;
for (dx = 0; dx<w; dx++) { for (dx = 0; dx<w; dx++) {
@ -138,6 +143,10 @@ void guac_vnc_cursor(rfbClient* client, int x, int y, int w, int h, int bpp) {
surface = cairo_image_surface_create_for_data(buffer, CAIRO_FORMAT_ARGB32, w, h, stride); surface = cairo_image_surface_create_for_data(buffer, CAIRO_FORMAT_ARGB32, w, h, stride);
guac_send_cursor(io, x, y, surface); guac_send_cursor(io, x, y, surface);
/* Free surface */
cairo_surface_destroy(surface);
free(buffer);
/* libvncclient does not free rcMask as it does rcSource */ /* libvncclient does not free rcMask as it does rcSource */
free(client->rcMask); free(client->rcMask);
} }
@ -149,15 +158,16 @@ void guac_vnc_update(rfbClient* client, int x, int y, int w, int h) {
guac_client* gc = rfbClientGetClientData(client, __GUAC_CLIENT); guac_client* gc = rfbClientGetClientData(client, __GUAC_CLIENT);
GUACIO* io = gc->io; GUACIO* io = gc->io;
png_byte** png_buffer = ((vnc_guac_client_data*) gc->data)->png_buffer;
png_byte* row;
png_byte** png_row_current = png_buffer; /* Cairo image buffer */
int stride = cairo_format_stride_for_width(CAIRO_FORMAT_RGB24, w);
unsigned char* buffer = malloc(h*stride);
unsigned char* buffer_row_current = buffer;
cairo_surface_t* surface;
unsigned int bpp = client->format.bitsPerPixel/8; unsigned int bpp = client->format.bitsPerPixel/8;
unsigned int bytesPerRow = bpp * client->width; unsigned int fb_stride = bpp * client->width;
unsigned char* fb_row_current = client->frameBuffer + (y * bytesPerRow) + (x * bpp); unsigned char* fb_row_current = client->frameBuffer + (y * fb_stride) + (x * bpp);
unsigned char* fb_row;
unsigned int v; unsigned int v;
/* Ignore extra update if already handled by copyrect */ /* Ignore extra update if already handled by copyrect */
@ -169,37 +179,51 @@ void guac_vnc_update(rfbClient* client, int x, int y, int w, int h) {
/* Copy image data from VNC client to PNG */ /* Copy image data from VNC client to PNG */
for (dy = y; dy<y+h; dy++) { for (dy = y; dy<y+h; dy++) {
row = *(png_row_current++); unsigned char* buffer_current;
unsigned char* fb_current;
fb_row = fb_row_current; /* Get current buffer row, advance to next */
fb_row_current += bytesPerRow; buffer_current = buffer_row_current;
buffer_row_current += stride;
/* Get current framebuffer row, advance to next */
fb_current = fb_row_current;
fb_row_current += fb_stride;
for (dx = x; dx<x+w; dx++) { for (dx = x; dx<x+w; dx++) {
switch (bpp) { switch (bpp) {
case 4: case 4:
v = *((unsigned int*) fb_row); v = *((unsigned int*) fb_current);
break; break;
case 2: case 2:
v = *((unsigned short*) fb_row); v = *((unsigned short*) fb_current);
break; break;
default: default:
v = *((unsigned char*) fb_row); v = *((unsigned char*) fb_current);
} }
*(row++) = (v >> client->format.redShift) * 256 / (client->format.redMax+1); /* Output RGB */
*(row++) = (v >> client->format.greenShift) * 256 / (client->format.greenMax+1);
*(row++) = (v >> client->format.blueShift) * 256 / (client->format.blueMax+1);
fb_row += bpp; buffer_current++; /* High 8 bits unused in Cairo's RGB24 */
*(buffer_current++) = (v >> client->format.redShift) * 0x100 / (client->format.redMax + 1);
*(buffer_current++) = (v >> client->format.greenShift) * 0x100 / (client->format.greenMax + 1);
*(buffer_current++) = (v >> client->format.blueShift) * 0x100 / (client->format.blueMax + 1);
fb_current += bpp;
} }
} }
/* For now, only use layer 0 */ /* For now, only use layer 0 */
guac_send_png(io, 0, x, y, png_buffer, w, h); surface = cairo_image_surface_create_for_data(buffer, CAIRO_FORMAT_RGB24, w, h, stride);
guac_send_png(io, 0, x, y, surface);
/* Free surface */
cairo_surface_destroy(surface);
free(buffer);
} }