w3m

commit c4c1c1b873200c29f26efe3e832966e9d4e786b0
parent 4a2bd70876e7d04a2e65f6f00d0c69153c0b25d6
Author: ukai <ukai>
Date:   Mon,  8 Nov 2004 17:08:09 +0000

[w3m-dev 04128] Re: w3mimgdisplay
* acinclude.m4 (AC_W3M_IMAGE): check not yes
* aclocal.m4, configure: regen
* w3mimg/fb/fb_gdkpixbuf.c (fb_image_load):
   fb_image_fill in case GDK_PIXBUF_FRAME_DISPOSE
* w3mimg/x11/x11_w3mimg.c (get_animation_size):
   return n
  (x11_load_image):
   fill in case GDK_PIXBUF_FRAME_DISPOSE

Diffstat:
M
ChangeLog
 | 
12
++++++++++++
M
acinclude.m4
 | 
2
+-
M
aclocal.m4
 | 
2
+-
M
configure
 | 
2
+-
M
w3mimg/fb/fb_gdkpixbuf.c
 | 
1
+
M
w3mimg/x11/x11_w3mimg.c
 | 
4
++++

6 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,15 @@
+2004-11-09  Hiroyuki Ito <ZXB01226@nifty.com>
+
+	* [w3m-dev 04128] Re: w3mimgdisplay
+	* acinclude.m4 (AC_W3M_IMAGE): check not yes
+	* aclocal.m4, configure: regen
+	* w3mimg/fb/fb_gdkpixbuf.c (fb_image_load): 
+	   fb_image_fill in case GDK_PIXBUF_FRAME_DISPOSE
+	* w3mimg/x11/x11_w3mimg.c (get_animation_size):
+	   return n
+	  (x11_load_image): 
+	   fill in case GDK_PIXBUF_FRAME_DISPOSE
+
 2004-11-05  Hiroyuki Ito <ZXB01226@nifty.com>
 
 	* [w3m-dev 04117] Re: start attribute and value attribute on ordered lists
diff --git a/acinclude.m4 b/acinclude.m4
@@ -666,7 +666,7 @@ AC_DEFUN([AC_W3M_IMAGE],
 	[have_gdkpixbuf="no"; have_gtk2="no"])
   fi
   if test x"$with_gdkpixbuf" = xyes; then
-   if test x"$have_gdkpixbuf" = xno; then
+   if test x"$have_gdkpixbuf" != xyes; then
     AC_W3M_CHECK_VER([GdkPixbuf],
 	[`$GDKPIXBUF_CONFIG --version 2>/dev/null`],
 	0, 16, 0,
diff --git a/aclocal.m4 b/aclocal.m4
@@ -678,7 +678,7 @@ AC_DEFUN([AC_W3M_IMAGE],
 	[have_gdkpixbuf="no"; have_gtk2="no"])
   fi
   if test x"$with_gdkpixbuf" = xyes; then
-   if test x"$have_gdkpixbuf" = xno; then
+   if test x"$have_gdkpixbuf" != xyes; then
     AC_W3M_CHECK_VER([GdkPixbuf],
 	[`$GDKPIXBUF_CONFIG --version 2>/dev/null`],
 	0, 16, 0,
diff --git a/configure b/configure
@@ -5097,7 +5097,7 @@ echo "$as_me: WARNING: GdkPixbuf is not installed.  Install GdkPixbuf (version >
  fi
   fi
   if test x"$with_gdkpixbuf" = xyes; then
-   if test x"$have_gdkpixbuf" = xno; then
+   if test x"$have_gdkpixbuf" != xyes; then
     version="`$GDKPIXBUF_CONFIG --version 2>/dev/null`"
  if test x"$version" != x; then
    echo "$as_me:$LINENO: checking GdkPixbuf version" >&5
diff --git a/w3mimg/fb/fb_gdkpixbuf.c b/w3mimg/fb/fb_gdkpixbuf.c
@@ -233,6 +233,7 @@ fb_image_load(char *filename, int w, int h, int max_anim)
 	    fb_image_copy(tmp_image, fb_frame[i]);
 	    break;
 	case GDK_PIXBUF_FRAME_DISPOSE:
+	    fb_image_fill(tmp_image, bg_r, bg_g, bg_b);
 	    break;
 	case GDK_PIXBUF_FRAME_REVERT:
 	    fb_image_copy(tmp_image, fb_frame[0]);
diff --git a/w3mimg/x11/x11_w3mimg.c b/w3mimg/x11/x11_w3mimg.c
@@ -109,6 +109,7 @@ get_animation_size(GdkPixbufAnimation * animation, int *w, int *h, int *delay)
     }
     if (delay)
 	*delay = d;
+    return n;
 }
 #endif
 #endif
@@ -522,6 +523,9 @@ x11_load_image(w3mimg_op * self, W3MImage * img, char *fname, int w, int h)
 		      xi->imageGC, 0, 0, w, h, 0, 0);
 	    break;
 	case GDK_PIXBUF_FRAME_DISPOSE:
+	    XSetForeground(xi->display, xi->imageGC, xi->background_pixel);
+	    XFillRectangle(xi->display, tmp_pixmap, xi->imageGC,
+			   0, 0, w, h);
 	    break;
 	case GDK_PIXBUF_FRAME_REVERT:
 	    XCopyArea(xi->display, ximg->pixmap[0], tmp_pixmap,