storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[w3m-dev 04128] Re: w3mimgdisplay

Browse Source 
* 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
This commit is contained in:
Fumitoshi UKAI
2004-11-08 17:08:09 +00:00
parent 42508f56c5
commit 44c494c8f3
6 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+13 -1
View File
@@ -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> 2004-11-05 Hiroyuki Ito <ZXB01226@nifty.com>
* [w3m-dev 04117] Re: start attribute and value attribute on ordered lists * [w3m-dev 04117] Re: start attribute and value attribute on ordered lists
@@ -8593,4 +8605,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1 * release-0-2-1
* import w3m-0.2.1 * import w3m-0.2.1
$Id: ChangeLog,v 1.940 2004/11/04 17:25:44 ukai Exp $ $Id: ChangeLog,v 1.941 2004/11/08 17:08:09 ukai Exp $
acinclude.m4
+1 -1
View File
@@ -666,7 +666,7 @@ AC_DEFUN([AC_W3M_IMAGE],
[have_gdkpixbuf="no"; have_gtk2="no"]) [have_gdkpixbuf="no"; have_gtk2="no"])
fi fi
if test x"$with_gdkpixbuf" = xyes; then 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], AC_W3M_CHECK_VER([GdkPixbuf],
[`$GDKPIXBUF_CONFIG --version 2>/dev/null`], [`$GDKPIXBUF_CONFIG --version 2>/dev/null`],
0, 16, 0, 0, 16, 0,
aclocal.m4
Vendored
+1 -1
View File
@@ -678,7 +678,7 @@ AC_DEFUN([AC_W3M_IMAGE],
[have_gdkpixbuf="no"; have_gtk2="no"]) [have_gdkpixbuf="no"; have_gtk2="no"])
fi fi
if test x"$with_gdkpixbuf" = xyes; then 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], AC_W3M_CHECK_VER([GdkPixbuf],
[`$GDKPIXBUF_CONFIG --version 2>/dev/null`], [`$GDKPIXBUF_CONFIG --version 2>/dev/null`],
0, 16, 0, 0, 16, 0,
configure
Vendored
+1 -1
View File
@@ -5097,7 +5097,7 @@ echo "$as_me: WARNING: GdkPixbuf is not installed. Install GdkPixbuf (version >
fi fi
fi fi
if test x"$with_gdkpixbuf" = xyes; then 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`" version="`$GDKPIXBUF_CONFIG --version 2>/dev/null`"
if test x"$version" != x; then if test x"$version" != x; then
echo "$as_me:$LINENO: checking GdkPixbuf version" >&5 echo "$as_me:$LINENO: checking GdkPixbuf version" >&5
w3mimg/fb/fb_gdkpixbuf.c
+2 -1
View File
@@ -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 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]); fb_image_copy(tmp_image, fb_frame[i]);
break; break;
case GDK_PIXBUF_FRAME_DISPOSE: case GDK_PIXBUF_FRAME_DISPOSE:
fb_image_fill(tmp_image, bg_r, bg_g, bg_b);
break; break;
case GDK_PIXBUF_FRAME_REVERT: case GDK_PIXBUF_FRAME_REVERT:
fb_image_copy(tmp_image, fb_frame[0]); fb_image_copy(tmp_image, fb_frame[0]);
w3mimg/x11/x11_w3mimg.c
+5 -1
View File
@@ -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 <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@@ -109,6 +109,7 @@ get_animation_size(GdkPixbufAnimation * animation, int *w, int *h, int *delay)
} }
if (delay) if (delay)
*delay = d; *delay = d;
return n;
} }
#endif #endif
#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); xi->imageGC, 0, 0, w, h, 0, 0);
break; break;
case GDK_PIXBUF_FRAME_DISPOSE: 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; break;
case GDK_PIXBUF_FRAME_REVERT: case GDK_PIXBUF_FRAME_REVERT:
XCopyArea(xi->display, ximg->pixmap[0], tmp_pixmap, XCopyArea(xi->display, ximg->pixmap[0], tmp_pixmap,