diff options
| author | Fumitoshi UKAI <ukai@debian.or.jp> | 2002-07-22 16:17:32 +0000 |
|---|---|---|
| committer | Fumitoshi UKAI <ukai@debian.or.jp> | 2002-07-22 16:17:32 +0000 |
| commit | 9f103b13bb3c46be9a9e017547c193f75876e24e (patch) | |
| tree | 73c933927f290d578e4fc672605111319a5985cb /w3mimg/fb/fb_w3mimg.c | |
| parent | [w3m-dev 03278] Compile error on mipsel linux (glibc-2.0.6) (diff) | |
| download | w3m-9f103b13bb3c46be9a9e017547c193f75876e24e.tar.gz w3m-9f103b13bb3c46be9a9e017547c193f75876e24e.zip | |
[w3m-dev 03279] w3m-img for framebuffer update
http://homepage3.nifty.com/slokar/fb/w3mfb.patch.gz
* w3mimg/fb/readme.txt: update
* w3mimg/fb/fb.c: update
* w3mimg/fb/fb.h: update
* w3mimg/fb/fb_gdkpixbuf.c: update
* w3mimg/fb/fb_img.c: update
* w3mimg/fb/fb_img.h: update
* w3mimg/fb/fb_imlib2.c: update
* w3mimg/fb/fb_w3mimg.c: update
* w3mimg/fb/fb_gdkpixbuf.h: deleted
* w3mimg/fb/fb_imlib2.h: deleted
* w3mimg/w3mimg.h (w3mimg_op): add get_image_size()
* w3mimg/x11/x11_w3mimg.c: update
* w3mimgdisplay.c (main): use get_image_size()
* w3mimgsize.c (main): use get_image_size()
From: Hiroyuki Ito <hito@crl.go.jp>
Diffstat (limited to 'w3mimg/fb/fb_w3mimg.c')
| -rw-r--r-- | w3mimg/fb/fb_w3mimg.c | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/w3mimg/fb/fb_w3mimg.c b/w3mimg/fb/fb_w3mimg.c index c022f22..71cc001 100644 --- a/w3mimg/fb/fb_w3mimg.c +++ b/w3mimg/fb/fb_w3mimg.c @@ -1,4 +1,4 @@ -/* $Id: fb_w3mimg.c,v 1.1 2002/07/17 20:58:48 ukai Exp $ */ +/* $Id: fb_w3mimg.c,v 1.2 2002/07/22 16:17:32 ukai Exp $ */ #include <stdio.h> #include <stdlib.h> #include <ctype.h> @@ -39,7 +39,7 @@ w3mfb_set_background(w3mimg_op *self, char *background) if (background) { int r, g, b; if (sscanf(background, "#%02x%02x%02x", &r, &g, &b) == 3) - fb_set_bg(r, g, b); + fb_image_set_bg(r, g, b); } } @@ -58,11 +58,11 @@ w3mfb_close(w3mimg_op *self) static int w3mfb_load_image(w3mimg_op *self, W3MImage *img, char *fname, int w, int h) { - IMAGE *im; + FB_IMAGE *im; if (self == NULL) return 0; - im = fb_load_image(fname, w, h); + im = fb_image_load(fname, w, h); if (!im) return 0; img->pixmap = im; @@ -79,7 +79,7 @@ w3mfb_show_image(w3mimg_op *self, W3MImage *img, int sx, int sy, if (self == NULL) return 0; - fb_draw_image((IMAGE *)img->pixmap, + fb_image_draw((FB_IMAGE *)img->pixmap, x + self->offset_x, y + self->offset_y, sx, sy, (sw ? sw : img->width), @@ -93,13 +93,27 @@ w3mfb_free_image(w3mimg_op *self, W3MImage *img) if (self == NULL) return; if (img && img->pixmap) { - fb_free_image((IMAGE *)img->pixmap); + fb_image_free((FB_IMAGE *)img->pixmap); img->pixmap = NULL; img->width = 0; img->height = 0; } } +static int +w3mfb_get_image_size(w3mimg_op *self, W3MImage *img, + char *fname, int *w, int *h) +{ + int i; + + if (self == NULL) + return 0; + i = get_image_size(fname, w, h); + if (i) + return 0; + return 1; +} + w3mimg_op * w3mimg_fbopen() { @@ -125,6 +139,7 @@ w3mimg_fbopen() wop->load_image = w3mfb_load_image; wop->show_image = w3mfb_show_image; wop->free_image = w3mfb_free_image; + wop->get_image_size = w3mfb_get_image_size; return wop; error: |