From 4e04a670af105b6eb0b3f6ab36655380f962d6fb Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Wed, 7 Mar 2012 13:57:49 -0800 Subject: [PATCH] Reformatted comments, fixed ticket #107 (background not being drawn). --- protocols/rdp/src/client.c | 8 ++++---- protocols/rdp/src/rdp_glyph.c | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/protocols/rdp/src/client.c b/protocols/rdp/src/client.c index c4d8e18a..6109297f 100644 --- a/protocols/rdp/src/client.c +++ b/protocols/rdp/src/client.c @@ -295,7 +295,7 @@ int guac_client_init(guac_client* client, int argc, char** argv) { settings->os_major_type = OSMAJORTYPE_UNSPECIFIED; settings->os_minor_type = OSMINORTYPE_UNSPECIFIED; 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_OPAQUE_RECT_INDEX] = true; 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_MEM3BLT_V2_INDEX] = false; settings->order_support[NEG_SAVEBITMAP_INDEX] = false; - settings->order_support[NEG_GLYPH_INDEX_INDEX] = false; - settings->order_support[NEG_FAST_INDEX_INDEX] = false; - settings->order_support[NEG_FAST_GLYPH_INDEX] = false; + settings->order_support[NEG_GLYPH_INDEX_INDEX] = true; + settings->order_support[NEG_FAST_INDEX_INDEX] = true; + settings->order_support[NEG_FAST_GLYPH_INDEX] = true; settings->order_support[NEG_POLYGON_SC_INDEX] = false; settings->order_support[NEG_POLYGON_CB_INDEX] = false; settings->order_support[NEG_ELLIPSE_SC_INDEX] = false; diff --git a/protocols/rdp/src/rdp_glyph.c b/protocols/rdp/src/rdp_glyph.c index 5201fd0b..462d5908 100644 --- a/protocols/rdp/src/rdp_glyph.c +++ b/protocols/rdp/src/rdp_glyph.c @@ -160,7 +160,7 @@ void guac_rdp_glyph_begindraw(rdpContext* context, guac_client_data->background.green = (bgcolor & 0x00FF00) >> 8; guac_client_data->background.red = (bgcolor & 0xFF0000) >> 16; - /* paint background on destination */ + /* Paint background on destination */ guac_protocol_send_rect(client->socket, GUAC_COMP_OVER, current_layer, x, y, width, height, @@ -168,6 +168,7 @@ void guac_rdp_glyph_begindraw(rdpContext* context, guac_client_data->background.green, guac_client_data->background.blue, 255); + } void guac_rdp_glyph_enddraw(rdpContext* context,