[maemo-commits] [maemo-commits] r17093 - in projects/haf/trunk/sapwood: . engine

[From: subversion at stage.maemo.org]

Author: herzi
Date: 2009-01-12 12:53:31 +0200 (Mon, 12 Jan 2009)
New Revision: 17093

Modified:
   projects/haf/trunk/sapwood/ChangeLog
   projects/haf/trunk/sapwood/engine/sapwood-pixmap.c
Log:
2009-01-10  Sven Herzberg  <sven at imendio.com>

	Get the remaining RGBA bits into sapwood

	* engine/sapwood-pixmap.c
	(sapwood_pixmap_get_for_file): set a colormap for the remove pixmap;
	this is required to work properly with the gdk-cairo code
	(sapwood_pixmap_render_rects_internal): use cairo for rendering the
	pixmap; gdk doesn't have a clue about alpha rendering
	(sapwood_pixmap_render_rects): properly initialize the temporary
	pixmap to be fully transparent (if in 32bit mode)


Modified: projects/haf/trunk/sapwood/ChangeLog
===================================================================
--- projects/haf/trunk/sapwood/ChangeLog	2009-01-12 10:53:25 UTC (rev 17092)
+++ projects/haf/trunk/sapwood/ChangeLog	2009-01-12 10:53:31 UTC (rev 17093)
@@ -1,5 +1,17 @@
 2009-01-10  Sven Herzberg  <sven at imendio.com>
 
+	Get the remaining RGBA bits into sapwood
+
+	* engine/sapwood-pixmap.c
+	(sapwood_pixmap_get_for_file): set a colormap for the remove pixmap;
+	this is required to work properly with the gdk-cairo code
+	(sapwood_pixmap_render_rects_internal): use cairo for rendering the
+	pixmap; gdk doesn't have a clue about alpha rendering
+	(sapwood_pixmap_render_rects): properly initialize the temporary
+	pixmap to be fully transparent (if in 32bit mode)
+
+2009-01-10  Sven Herzberg  <sven at imendio.com>
+
 	Don't expect 24/32 bit pixmap depth, expect system_depth/32
 
 	* server/sapwood-server.c (extract_pixmap_single),

Modified: projects/haf/trunk/sapwood/engine/sapwood-pixmap.c
===================================================================
--- projects/haf/trunk/sapwood/engine/sapwood-pixmap.c	2009-01-12 10:53:25 UTC (rev 17092)
+++ projects/haf/trunk/sapwood/engine/sapwood-pixmap.c	2009-01-12 10:53:31 UTC (rev 17093)
@@ -136,6 +136,25 @@
 	  {
 	    gdk_error_trap_push ();
 	    pixmap = gdk_pixmap_foreign_new (rep.pixmap[i][j]);
+            if (gdk_colormap_get_visual (gdk_screen_get_rgba_colormap (gdk_screen_get_default ()))->depth == depth)
+              {
+                gdk_drawable_set_colormap (pixmap,
+                                           gdk_screen_get_rgba_colormap (gdk_screen_get_default ()));
+              }
+            else if (gdk_colormap_get_visual (gdk_screen_get_rgb_colormap (gdk_screen_get_default ()))->depth == depth)
+              {
+                gdk_drawable_set_colormap (pixmap,
+                                           gdk_screen_get_rgb_colormap (gdk_screen_get_default ()));
+              }
+            else if (gdk_colormap_get_visual (gdk_screen_get_system_colormap (gdk_screen_get_default ()))->depth == depth)
+              {
+                gdk_drawable_set_colormap (pixmap,
+                                           gdk_screen_get_system_colormap (gdk_screen_get_default ()));
+              }
+            else
+              {
+                g_assert_not_reached ();
+              }
 	    gdk_flush ();
 	    if ((xerror = gdk_error_trap_pop ()) || !pixmap)
 	      {
@@ -335,20 +354,21 @@
 	area = *dest;
 
       if (rect[n].pixmap)
-	{
-	  values.tile = rect[n].pixmap;
-	  values.ts_x_origin = dest->x;
-	  values.ts_y_origin = dest->y;
-	  gdk_gc_set_values (draw_gc, &values, GDK_GC_TILE|GDK_GC_TS_X_ORIGIN|GDK_GC_TS_Y_ORIGIN);
-
-	  gdk_draw_rectangle (draw, draw_gc, TRUE, area.x, area.y, area.width, area.height);
-	}
+        {
+          cairo_t* cr = gdk_cairo_create (draw);
+          gdk_cairo_set_source_pixmap (cr, rect[n].pixmap, dest->x, dest->y);
+          cairo_rectangle (cr, area.x, area.y, area.width, area.height);
+          cairo_pattern_set_extend (cairo_get_source (cr),
+                                    CAIRO_EXTEND_REPEAT);
+          cairo_fill (cr);
+          cairo_destroy (cr);
+        }
     }
 }
 
 void
 sapwood_pixmap_render_rects (SapwoodPixmap *self,
-			     GtkWidget     *widget,
+                             GtkWidget     *widget,
                              GdkDrawable   *draw,
                              gint           draw_x,
                              gint           draw_y,
@@ -407,6 +427,15 @@
       cairo_paint (mask_cr);
     }
 
+  if (gdk_drawable_get_depth (tmp) == 32)
+    {
+      tmp_cr = gdk_cairo_create (tmp);
+      cairo_set_operator (tmp_cr, CAIRO_OPERATOR_SOURCE);
+      cairo_set_source_rgba (tmp_cr, 0.0, 0.0, 0.0, 0.0);
+      cairo_paint (tmp_cr);
+      cairo_destroy (tmp_cr);
+    }
+
   sapwood_pixmap_render_rects_internal (self, tmp, 0, 0, tmp_mask, 0, 0, mask_required, NULL, n_rect, rect);
 
   tmp_cr = gdk_cairo_create (tmp);