merge w3m-img for framebuffer support

* w3mimg/w3mimg.h: created
* w3mimg/x11/x11_w3mimg.c: created
* w3mimg/fb/fb_w3mimg.c: created
* w3mimgsize.c w3mimgdisplay.c: modified
* configure: modified
* XMakefile: modified
* config.h.dist: updated
From: Fumitoshi UKAI  <ukai@debian.or.jp>

w3m-img for framebuffer support
* http://homepage3.nifty.com/slokar/fb/
* w3mimg/fb/fb.c w3mimg/fb/fb.h
  w3mimg/fb/fb_img.c w3mimg/fb/fb_img.h
  w3mimg/fb/fb_gdkpixbuf.c w3mimg/fb/fb_gdkpixbuf.h
  w3mimg/fb/fb_imlib2.c w3mimg/fb/fb_imlib.h
  w3mimg/fb/readme.txt w3mimg/fb/license.txt: added
From: Hiroshi Kawashima <kei@sm.sony.co.jp>

1 files changed, 13 insertions, 16 deletions

diff --git a/w3mimgsize.c b/w3mimgsize.c
index 89a28f6..72f0cea 100644
--- a/w3mimgsize.c
+++ b/w3mimgsize.c
@@ -1,31 +1,28 @@
-/* $Id: w3mimgsize.c,v 1.1 2002/01/31 17:54:57 ukai Exp $ */
+/* $Id: w3mimgsize.c,v 1.2 2002/07/17 20:58:48 ukai Exp $ */
 #include <stdio.h>
 #include <stdlib.h>
-#include <Imlib.h>
+#include <string.h>
+#include "config.h"
+#include "w3mimg/w3mimg.h"
 
 int
 main(int argc, char **argv)
 {
-    Display *display;
-    ImlibData *id;
-    ImlibImage *im;
+    w3mimg_op *w_op = NULL;
+    W3MImage img;
 
     fclose(stderr);
     if (argc < 2)
 	exit(1);
-    display = XOpenDisplay(NULL);
-    if (!display)
+    w_op = w3mimg_open();
+    if (w_op == NULL)
 	exit(1);
-    id = Imlib_init(display);
-    if (!id)
+
+    if (!w_op->init(w_op))
 	exit(1);
-    im = Imlib_load_image(id, argv[1]);
-    if (!im)
+
+    if (!w_op->load_image(w_op, &img, argv[1], -1, -1))
 	exit(1);
-    printf("%d %d\n", im->rgb_width, im->rgb_height);
-    /*
-     * Imlib_kill_image(id, im);
-     * XCloseDisplay(display);
-     */
+    printf("%d %d\n", img.width, img.height);
     exit(0);
 }