From 44c494c8f38b98d629261a12f67cc141176b468c Mon Sep 17 00:00:00 2001 From: Fumitoshi UKAI Date: Mon, 8 Nov 2004 17:08:09 +0000 Subject: [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 --- w3mimg/fb/fb_gdkpixbuf.c | 3 ++- w3mimg/x11/x11_w3mimg.c | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'w3mimg') diff --git a/w3mimg/fb/fb_gdkpixbuf.c b/w3mimg/fb/fb_gdkpixbuf.c index c779d90..798f573 100644 --- a/w3mimg/fb/fb_gdkpixbuf.c +++ b/w3mimg/fb/fb_gdkpixbuf.c @@ -1,4 +1,4 @@ -/* $Id: fb_gdkpixbuf.c,v 1.19 2004/08/16 16:56:40 ukai Exp $ */ +/* $Id: fb_gdkpixbuf.c,v 1.20 2004/11/08 17:08:10 ukai Exp $ */ /************************************************************************** fb_gdkpixbuf.c 0.3 Copyright (C) 2002, hito **************************************************************************/ @@ -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 index ef9dcf1..e47dcdc 100644 --- a/w3mimg/x11/x11_w3mimg.c +++ b/w3mimg/x11/x11_w3mimg.c @@ -1,4 +1,4 @@ -/* $Id: x11_w3mimg.c,v 1.27 2004/08/05 18:22:16 ukai Exp $ */ +/* $Id: x11_w3mimg.c,v 1.28 2004/11/08 17:08:10 ukai Exp $ */ #include #include #include @@ -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, -- cgit v1.2.3