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

[libguac-client-rdp.git] / src / rdp_glyph.c

diff --git a/src/rdp_glyph.c b/src/rdp_glyph.c
old mode 100755 (executable)
new mode 100644 (file)
index c6fbce0..462d590
--- a/src/rdp_glyph.c
+++ b/src/rdp_glyph.c
@@ -20,6 +20,7 @@
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
+ * Matt Hortman
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -114,7 +115,7 @@ void guac_rdp_glyph_draw(rdpContext* context, rdpGlyph* glyph, int x, int y) {
     guac_client* client = ((rdp_freerdp_context*) context)->client;
     rdp_guac_client_data* guac_client_data = (rdp_guac_client_data*) client->data;
     const guac_layer* current_layer = ((rdp_guac_client_data*) client->data)->current_surface;
-  
+ 
     /* Colorize glyph */
     guac_protocol_send_rect(client->socket,
             GUAC_COMP_ATOP, ((guac_rdp_glyph*) glyph)->layer,
@@ -141,6 +142,7 @@ void guac_rdp_glyph_begindraw(rdpContext* context,
 
     guac_client* client = ((rdp_freerdp_context*) context)->client;
     rdp_guac_client_data* guac_client_data = (rdp_guac_client_data*) client->data;
+    const guac_layer* current_layer = ((rdp_guac_client_data*) client->data)->current_surface;
 
     bgcolor = freerdp_color_convert_var(bgcolor,
             context->instance->settings->color_depth, 32,
@@ -150,9 +152,22 @@ void guac_rdp_glyph_begindraw(rdpContext* context,
             context->instance->settings->color_depth, 32,
             ((rdp_freerdp_context*) context)->clrconv);
 
-    guac_client_data->foreground.red   =  fgcolor & 0x0000FF;
+    guac_client_data->foreground.blue  =  fgcolor & 0x0000FF;
     guac_client_data->foreground.green = (fgcolor & 0x00FF00) >> 8;
-    guac_client_data->foreground.blue  = (fgcolor & 0xFF0000) >> 16;
+    guac_client_data->foreground.red   = (fgcolor & 0xFF0000) >> 16;
+
+    guac_client_data->background.blue   =  bgcolor & 0x0000FF;
+    guac_client_data->background.green  = (bgcolor & 0x00FF00) >> 8;
+    guac_client_data->background.red    = (bgcolor & 0xFF0000) >> 16;
+
+    /* Paint background on destination */
+    guac_protocol_send_rect(client->socket,
+            GUAC_COMP_OVER, current_layer,
+            x, y, width, height,
+            guac_client_data->background.red,
+            guac_client_data->background.green,
+            guac_client_data->background.blue,
+            255);
 
 }