Mercurial > dwindows

changeset 1249:b31056c321a2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Got dw_pixmap_stretch_bitblt() mostly working for GTK2... Haven't figured out how to apply the alpha mask to the converted pixbuf yet. This won't be supported on GTK1 at all.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Wed, 19 Oct 2011 21:29:23 +0000
parents 398ac8c90317
children ed2119fc210d
files gtk/dw.c
diffstat 1 files changed, 34 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/gtk/dw.c	Wed Oct 19 11:11:00 2011 +0000
+++ b/gtk/dw.c	Wed Oct 19 21:29:23 2011 +0000
@@ -8726,31 +8726,52 @@
 
    if ( gc )
    {
-      /*
-       * If we have a bitmap (mask) in the source pixmap, then set the clipping region
-       */
-      if ( srcp && srcp->bitmap )
-      {
-         gdk_gc_set_clip_mask( gc, srcp->bitmap );
-         gdk_gc_set_clip_origin( gc, xdest, ydest );
-      }
-
 #if GTK_MAJOR_VERSION > 1
       if(srcwidth != -1)
       {
-         GdkPixbuf *pbdst, *pbsrc = gdk_pixbuf_get_from_drawable(NULL, src ? src->window : srcp->pixmap, NULL, xsrc, ysrc, 0, 0, srcwidth, srcheight);
+         /* There are no scaling functions for pixmaps/bitmaps so we need to convert
+          * the drawable to a pixbuf, scale it to the correct size for the bitblt then
+          * draw the resulting scaled copy and free the left over pixbufs.
+          */
+         GdkPixbuf *pbdst, *pbsrc = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, srcwidth, srcheight);
+         /* Now that with have a pixbuf with alpha, copy from the drawable to create the source */
+         gdk_pixbuf_get_from_drawable(pbsrc, src ? src->window : srcp->pixmap, NULL, xsrc, ysrc, 0, 0, srcwidth, srcheight);
          
+         /* If the pixmap has an associated alpha mask, include that in the pixbuf */
+         //if( srcp && srcp->bitmap )
+            // Need to apply the mask to the pixmap if possible here
+         /* Scale the pixbuf to the desired size */
+         pbdst = gdk_pixbuf_scale_simple(pbsrc, width, height, GDK_INTERP_BILINEAR);
+         /* Create a new clipping mask from the scaled pixbuf */
          if( srcp && srcp->bitmap )
-            gdk_pixbuf_render_threshold_alpha(pbsrc, srcp->bitmap, xsrc, ysrc, 0, 0, srcwidth, srcheight, 255); 
-         pbdst = gdk_pixbuf_scale_simple(pbsrc, width, height, GDK_INTERP_BILINEAR);
+         {
+            GdkBitmap *bitmap = gdk_pixmap_new(NULL, width, height, 1);
+            gdk_pixbuf_render_threshold_alpha(pbdst, bitmap, 0, 0, 0, 0, width, height, 1); 
+            gdk_gc_set_clip_mask( gc, bitmap );
+            gdk_gc_set_clip_origin( gc, xdest, ydest );
+            gdk_bitmap_unref(bitmap);
+         }
+         /* Draw the final pixbuf onto the destination drawable */
          gdk_draw_pixbuf(dest ? dest->window : destp->pixmap, gc, pbdst, 0, 0, xdest, ydest, width, height, GDK_RGB_DITHER_NONE, 0, 0);
+         /* Cleanup so we don't leak */
          gdk_pixbuf_unref(pbsrc);
          gdk_pixbuf_unref(pbdst);
       }
       else
 #endif
+      {
+         /*
+          * If we have a bitmap (mask) in the source pixmap, then set the clipping region
+          */
+         if ( srcp && srcp->bitmap )
+         {
+            gdk_gc_set_clip_mask( gc, srcp->bitmap );
+            gdk_gc_set_clip_origin( gc, xdest, ydest );
+         }
          gdk_draw_pixmap( dest ? dest->window : destp->pixmap, gc, src ? src->window : srcp->pixmap, xsrc, ysrc, xdest, ydest, width, height );
 
+      }
+
       /*
        * Reset the clipping region
        */
@@ -8759,6 +8780,7 @@
          gdk_gc_set_clip_mask( gc, NULL );
          gdk_gc_set_clip_origin( gc, 0, 0 );
       }
+
       gdk_gc_unref( gc );
       retval = DW_ERROR_NONE;
    }