Mercurial > dwindows

changeset 1246:c228c90f95cb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Compile fix for GTK2 and attempt at getting stretching working with pixmaps... Doesn't work yet but wanted to commit it before I slept.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Wed, 19 Oct 2011 10:41:50 +0000
parents 3a2ffe3a7eae
children 93607596cf85
files gtk/dw.c
diffstat 1 files changed, 21 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/gtk/dw.c	Wed Oct 19 09:40:23 2011 +0000
+++ b/gtk/dw.c	Wed Oct 19 10:41:50 2011 +0000
@@ -8588,7 +8588,7 @@
 
 #if GTK_CHECK_VERSION(2,10,0)
 /* Cairo version of dw_pixmap_bitblt() from GTK3, use if either pixmap is a cairo surface */
-void _cairo_pixmap_bitblt(HWND dest, HPIXMAP destp, int xdest, int ydest, int width, int height, HWND src, HPIXMAP srcp, int xsrc, int ysrc, int srcwidth, int srcheight)
+int _cairo_pixmap_bitblt(HWND dest, HPIXMAP destp, int xdest, int ydest, int width, int height, HWND src, HPIXMAP srcp, int xsrc, int ysrc, int srcwidth, int srcheight)
 {
    int _locked_by_me = FALSE;
    cairo_t *cr = NULL;
@@ -8699,11 +8699,6 @@
  */
 int API dw_pixmap_stretch_bitblt(HWND dest, HPIXMAP destp, int xdest, int ydest, int width, int height, HWND src, HPIXMAP srcp, int xsrc, int ysrc, int srcwidth, int srcheight)
 {
-   /* Ok, these #ifdefs are going to get a bit confusing because
-    * when using gdk-pixbuf, pixmaps are really pixbufs, so we
-    * have to use the pixbuf functions on them, and thus convoluting
-    * the code here a bit. -Brian
-    */
    int _locked_by_me = FALSE;
    GdkGC *gc = NULL;
    int retval = DW_ERROR_GENERAL;
@@ -8716,6 +8711,9 @@
    if((!dest && (!destp || !destp->pixmap)) || (!src && (!srcp || !srcp->pixmap)))
       return retval;
 
+   if((srcwidth == -1 || srcheight == -1) && srcwidth != srcheight)
+      return retval;
+
    DW_MUTEX_LOCK;
    if(dest)
       gc = _set_colors(dest->window);
@@ -8736,7 +8734,23 @@
          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 );
+
+#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);
+         
+         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);
+         gdk_draw_pixbuf(dest ? dest->window : destp->pixmap, gc, pbdst, 0, 0, xdest, ydest, width, height, GDK_RGB_DITHER_NONE, 0, 0);
+         gdk_pixbuf_unref(pbsrc);
+         gdk_pixbuf_unref(pbdst);
+      }
+      else
+#endif
+         gdk_draw_pixmap( dest ? dest->window : destp->pixmap, gc, src ? src->window : srcp->pixmap, xsrc, ysrc, xdest, ydest, width, height );
+
       /*
        * Reset the clipping region
        */