w3m

Unnamed repository; edit this file to name it for gitweb.
git clone https://logand.com/git/w3m.git/
Log | Files | Refs | README

commit fff71075363cf12707e96b4787785a08478f018c
parent 333014a26aa71096cb8c10c0158d20da4c44b603
Author: ukai <ukai>
Date:   Mon, 30 Sep 2002 17:44:30 +0000

[w3m-dev 03330] Re: hang up when seeing web page that contains xbm file
* w3mimg/x11/x11_w3mimg.c (x11_load_image): scaling
From: Yuji Abe <cbo46560@pop12.odn.ne.jp>

Diffstat:
MChangeLog | 5+++++
Mw3mimg/x11/x11_w3mimg.c | 22+++++++++++++++++-----
2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog @@ -1,3 +1,8 @@ +2002-10-01 Yuji Abe <cbo46560@pop12.odn.ne.jp> + + * [w3m-dev 03330] Re: hang up when seeing web page that contains xbm file + * w3mimg/x11/x11_w3mimg.c (x11_load_image): scaling + 2002-09-30 Yuji Abe <cbo46560@pop12.odn.ne.jp> * [w3m-dev 03327] gdk-pixbuf support for w3m-img/x11 diff --git a/w3mimg/x11/x11_w3mimg.c b/w3mimg/x11/x11_w3mimg.c @@ -153,6 +153,7 @@ x11_load_image(w3mimg_op * self, W3MImage * img, char *fname, int w, int h) ImlibImage *im; #elif defined(USE_GDKPIXBUF) GdkPixbuf *pixbuf; + int iw, ih; #endif if (self == NULL) @@ -173,10 +174,12 @@ x11_load_image(w3mimg_op * self, W3MImage * img, char *fname, int w, int h) pixbuf = gdk_pixbuf_new_from_file(fname); if (!pixbuf) return 0; + iw = gdk_pixbuf_get_width(pixbuf); + ih = gdk_pixbuf_get_height(pixbuf); if (w <= 0) - w = gdk_pixbuf_get_width(pixbuf); + w = iw; if (h <= 0) - h = gdk_pixbuf_get_height(pixbuf); + h = ih; #endif img->pixmap = (void *)XCreatePixmap(xi->display, xi->parent, w, h, DefaultDepth(xi->display, 0)); @@ -188,9 +191,18 @@ x11_load_image(w3mimg_op * self, W3MImage * img, char *fname, int w, int h) Imlib_paste_image(xi->id, im, (Pixmap) img->pixmap, 0, 0, w, h); Imlib_kill_image(xi->id, im); #elif defined(USE_GDKPIXBUF) - gdk_pixbuf_xlib_render_to_drawable(pixbuf, (Drawable) img->pixmap, - xi->imageGC, 0, 0, 0, 0, w, h, - XLIB_RGB_DITHER_NORMAL, 0, 0); + if (w != iw || h != ih) { + GdkPixbuf *newpixbuf; + newpixbuf = gdk_pixbuf_scale_simple(pixbuf, w, h, GDK_INTERP_BILINEAR); + gdk_pixbuf_xlib_render_to_drawable(newpixbuf, (Drawable) img->pixmap, + xi->imageGC, 0, 0, 0, 0, w, h, + XLIB_RGB_DITHER_NORMAL, 0, 0); + gdk_pixbuf_finalize(newpixbuf); + } else { + gdk_pixbuf_xlib_render_to_drawable(pixbuf, (Drawable) img->pixmap, + xi->imageGC, 0, 0, 0, 0, w, h, + XLIB_RGB_DITHER_NORMAL, 0, 0); + } gdk_pixbuf_unref(pixbuf); #endif img->width = w;