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

Reformatted comments, fixed ticket #107 (background not being drawn).

Browse Source
This commit is contained in:
Michael Jumper 2012-03-07 13:57:49 -08:00
parent 76df678e75
commit 4e04a670af
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
protocols/rdp/src/client.c
View File

@ -295,7 +295,7 @@ int guac_client_init(guac_client* client, int argc, char** argv) {
settings->os_major_type = OSMAJORTYPE_UNSPECIFIED; settings->os_major_type = OSMAJORTYPE_UNSPECIFIED;
settings->os_minor_type = OSMINORTYPE_UNSPECIFIED; settings->os_minor_type = OSMINORTYPE_UNSPECIFIED;
settings->order_support[NEG_DSTBLT_INDEX] = true; settings->order_support[NEG_DSTBLT_INDEX] = true;
settings->order_support[NEG_PATBLT_INDEX] = false; //true; settings->order_support[NEG_PATBLT_INDEX] = false; /* PATBLT not yet supported */
settings->order_support[NEG_SCRBLT_INDEX] = true; settings->order_support[NEG_SCRBLT_INDEX] = true;
settings->order_support[NEG_OPAQUE_RECT_INDEX] = true; settings->order_support[NEG_OPAQUE_RECT_INDEX] = true;
settings->order_support[NEG_DRAWNINEGRID_INDEX] = false; settings->order_support[NEG_DRAWNINEGRID_INDEX] = false;
@ -311,9 +311,9 @@ int guac_client_init(guac_client* client, int argc, char** argv) {
settings->order_support[NEG_MEMBLT_V2_INDEX] = bitmap_cache; settings->order_support[NEG_MEMBLT_V2_INDEX] = bitmap_cache;
settings->order_support[NEG_MEM3BLT_V2_INDEX] = false; settings->order_support[NEG_MEM3BLT_V2_INDEX] = false;
settings->order_support[NEG_SAVEBITMAP_INDEX] = false; settings->order_support[NEG_SAVEBITMAP_INDEX] = false;
settings->order_support[NEG_GLYPH_INDEX_INDEX] = false; settings->order_support[NEG_GLYPH_INDEX_INDEX] = true;
settings->order_support[NEG_FAST_INDEX_INDEX] = false; settings->order_support[NEG_FAST_INDEX_INDEX] = true;
settings->order_support[NEG_FAST_GLYPH_INDEX] = false; settings->order_support[NEG_FAST_GLYPH_INDEX] = true;
settings->order_support[NEG_POLYGON_SC_INDEX] = false; settings->order_support[NEG_POLYGON_SC_INDEX] = false;
settings->order_support[NEG_POLYGON_CB_INDEX] = false; settings->order_support[NEG_POLYGON_CB_INDEX] = false;
settings->order_support[NEG_ELLIPSE_SC_INDEX] = false; settings->order_support[NEG_ELLIPSE_SC_INDEX] = false;

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

@ -160,7 +160,7 @@ 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 */ /* Paint background on destination */
guac_protocol_send_rect(client->socket, guac_protocol_send_rect(client->socket,
GUAC_COMP_OVER, current_layer, GUAC_COMP_OVER, current_layer,
x, y, width, height, x, y, width, height,
@ -168,6 +168,7 @@ void guac_rdp_glyph_begindraw(rdpContext* context,
guac_client_data->background.green, guac_client_data->background.green,
guac_client_data->background.blue, guac_client_data->background.blue,
255); 255);
} }
void guac_rdp_glyph_enddraw(rdpContext* context, void guac_rdp_glyph_enddraw(rdpContext* context,