Changeset 3186ce2 in libguac-client-rdp

Timestamp:

04/06/12 01:55:46 (14 months ago)

Author:

zhangmaike

Branches:

master, debian, rpm, unstable

Children:

81b81c3

Parents:

572810e

git-author:

Michael Jumper <zhangmaike@…> (04/06/12 01:55:46)

git-committer:

Michael Jumper <zhangmaike@…> (04/06/12 01:55:46)

Message:

Fix transparent glyphs

Files:

• include/client.h (modified) (1 diff)
• src/client.c (modified) (1 diff)
• src/rdp_glyph.c (modified) (3 diffs)

include/client.h

@@ -56 +56 @@
 
     /**
-     * Cairo surface which will receive all drawn glyphs.
+     * Cairo surface which will receive all TRANSPARENT glyphs.
+     */
+    cairo_surface_t* trans_glyph_surface;
+
+    /**
+     * Cairo surface which will receive all OPAQUE glyphs.
+     */
+    cairo_surface_t* opaque_glyph_surface;
+
+    /**
+     * The current Cairo surface which will receive all drawn glyphs,
+     * depending on whether we are currently drawing transparent or
+     * opaque glyphs.
      */
     cairo_surface_t* glyph_surface;
 
     /**
-     * Cairo instance for drawing to glyph surface.
+     * Cairo instance for drawing to the current glyph surface.
      */
     cairo_t* glyph_cairo;

src/client.c

@@ -394 +394 @@
             settings->width, settings->height);
 
-    /* Create glyph surface and cairo instance */
-    guac_client_data->glyph_surface = cairo_image_surface_create(
+    /* Create glyph surfaces */
+    guac_client_data->opaque_glyph_surface = cairo_image_surface_create(
             CAIRO_FORMAT_RGB24, settings->width, settings->height);
 
-    guac_client_data->glyph_cairo = cairo_create(
-        guac_client_data->glyph_surface);
+    guac_client_data->trans_glyph_surface = cairo_image_surface_create(
+            CAIRO_FORMAT_ARGB32, settings->width, settings->height);
 
     /* Success */

src/rdp_glyph.c

@@ -140 +140 @@
     if (width != 0 && height != 0) {
 
+        /* Prepare for opaque glyphs */
+        guac_client_data->glyph_surface = 
+            guac_client_data->opaque_glyph_surface;
+
+        /* Create cairo instance */
+        guac_client_data->glyph_cairo = cairo_create(
+            guac_client_data->glyph_surface);
+
         /* Convert background color */
         bgcolor = freerdp_color_convert_var(bgcolor,
@@ -155 +163 @@
 
         cairo_fill(guac_client_data->glyph_cairo);
+
+    }
+
+    /* Otherwise, prepare for transparent glyphs  */
+    else {
+
+        /* Select transparent glyph surface */
+        guac_client_data->glyph_surface = 
+            guac_client_data->trans_glyph_surface;
+
+        guac_client_data->glyph_cairo = cairo_create(
+            guac_client_data->glyph_surface);
+
+        /* Clear surface */
+        cairo_set_operator(guac_client_data->glyph_cairo,
+            CAIRO_OPERATOR_SOURCE);
+
+        cairo_set_source_rgba(guac_client_data->glyph_cairo, 0, 0, 0, 0);
+        cairo_paint(guac_client_data->glyph_cairo);
+
+        /* Restore operator */
+        cairo_set_operator(guac_client_data->glyph_cairo,
+            CAIRO_OPERATOR_OVER);
 
     }
@@ -194 +225 @@
     cairo_surface_destroy(surface);
 
-}
-
+    /* Destroy cairo instance */
+    cairo_destroy(guac_client_data->glyph_cairo);
+
+}
+