w3m-img merge (w3m-0.2.4+cvs-1.278-img-2.2.patch.gz)

* NEWS: w3m-img merge
* .cvsignore: add w3mimgdisplay, w3mimgsize
* XMakefile: add image.c to SRCS
	     add image.o to OBJS
             add IMGDISPLAY, IMGSIZE
* config.h.dist: USE_IMAGE, IMGSIZE, IMGDISPLAY
* configure: add find_imlib
		ask use_image
	(config.h) add $imgtarget to EXT_TARGETS
		   $def_use_image
		   IMGSIZE, IMGDISPLAY
* fm.h (MAX_IMAGE): added
* fm.h (DEFAULT_PIXEL_PER_CHAR): fix for USE_IMAGE
* fm.h (DEFAULT_PIXEL_PER_LINE): added
* fm.h (B_REDRAW_IMAGE): added
* fm.h (IMG_FLAG_SKIP): added
* fm.h (IMG_FLAG_AUTO): added
* fm.h (IMG_FLAG_START): added
* fm.h (IMG_FLAG_STOP): added
* fm.h (IMG_FLAG_NEXT): added
* fm.h (IMG_FLAG_UNLOADED): added
* fm.h (IMG_FLAG_LOADED): added
* fm.h (IMG_FLAG_ERROR): added
* fm.h (MapArea): added
* fm.h (MapList): s/urls/alts/, add area
* fm.h (ImageCache): added
* fm.h (Image): added
* fm.h (Anchor): add image
* fm.h (Buffer): add imarklist, image_flag, need_reshape
* fm.h (RG_FRAME_SRC): added
* fm.h (ALIGN_MIDDLE): added
* fm.h (ALIGN_TOP): added
* fm.h (ALIGN_BOTTOM): added
* fm.h (QuietMessage): added
* fm.h (Imgdisplay): added
* fm.h (Imgsize): added
* fm.h (activeImage): added
* fm.h (displayImage): added
* fm.h (autoImage): added
* fm.h (useExtImageViewer): added
* fm.h (image_source): added
* fm.h (view_unseenobject): change default if USE_IMAGE
* fm.h (set_pixel_per_char): added
* fm.h (pixel_per_line): added
* fm.h (set_pixel_per_line): added
* fm.h (image_scale): added
* proto.h (dispI): added
* proto.h (stopI): added
* proto.h (deleteImage): added
* proto.h (getAllImage): added
* proto.h (loadImage): added
* proto.h (getImage): added
* proto.h (getImageSize): added
* proto.h (process_img): add width arg
* proto.h (loadImageBuffer): added
* proto.h (follow_map_menu): add a_img arg
* proto.h (getMapXY): added
* proto.h (newMapArea): added
* proto.h (touch_cursor): added
* proto.h (cURLcode): added
* proto.h (initImage): added
* proto.h (termImage): added
* proto.h (addImage): added
* proto.h (drawImage): added
* proto.h (clearImage): added
* anchor.c (addMultirowsImg): added
* buffer.c (discardBuffer): deleteImage if USE_IMAGE
* buffer.c (reshapeBuffer): buf->need_reshape check
* display.c (fmTerm): if activeImage, stop load image
* display.c (fmInit): if displayImage, initImage
* display.c (image_touch): added
* display.c (draw_image_flag): added
* display.c (redrawLineImage): added
* display.c (displayBuffer): buf->need_reshape = TRUE
			mode == B_REDRAW_IMAGE
			image flag checks
			force redraw image in mode == B_REDRAW_IMAGE
			displayBuffer if need reshape
			drawImage
* display.c (redrawNLine): redrawLineImage
* display.c (redrawLineImage): added
* display.c (disp_message_nsec): return immediately if QuietMessage
* etc.c (reset_signals): ignore SIGUSR1
* file.c (frame_source): added
* file.c (_MoveFile): added
* file.c (cur_baseURL): added
* file.c (cur_document_code): added
* file.c (cur_iseq): added
* file.c (loadGeneralFile): fix fmInitialized and prevtrap checks
			save cur_baseURL
			image_source load
			loadImageBuffer for "image/*"
			frame_source flag
			fix b->type when proc is loadImageBuffer
* file.c (process_img): add width arg
		parse height and width attr, align
		fix for inline-image
* file.c (process_input): fix for form <input type="image">
* file.c (HTMLtagproc1): pass h_env->limit to process_img()
		fix <img_alt> for inline-image
		save cur_baseURL
* file.c (HTMLlineproc2body): fix <img_alt> for inline-image
* file.c (loadHTMLstream): fix for inline-image
		fix fmInitialized and prevtrap checks
		save cur_document_code
		save image_flag
* file.c (loadGopherDir): save cur_document_code
		fix fmInitialized and prevtrap checks
* file.c (loadImageBuffer): added for inline-image
* file.c (save2tmp): fix fmInitialized and prevtrap checks
* frame.c (frame_download_source): set RG_FRAME_SRC flag
		image check
* funcname.tab (DISPLAY_IMAGE): added
* funcname.tab (STOP_IMAGE): added
* html.c (ALST_IMG): add align, ismap
* html.c (ALST_AREA): add shape, coords
* html.c (ALST_IMG_ALT): add width, height, usemap, ismap, hseq,
			xoffset, yoffset, top_margin, bottom_margin
* html.c (AttrMap): add shape, coords, ismap, xoffset, yoffset
* html.h (ATTR_SHAPE): added
* html.h (ATTR_COORDS): added
* html.h (ATTR_ISMAP): added
* html.h (ATTR_XOFFSET): added
* html.h (ATTR_YOFFSET): added
* html.h (ATTR_TOP_MARGIN): added
* html.h (ATTR_BOTTOM_MARGIN): added
* html.h (SHAPE_UNKNOWN): added
* html.h (SHAPE_DEFAULT): added
* html.h (SHAPE_RECT): added
* html.h (SHAPE_CIRCLE): added
* html.h (SHAPE_POLY): added
* image.c: added
* main.c (fversion): add USE_IMAGE
* main.c (fusage): -ppl option
* main.c (MAIN): set_pixel_per_char if ppc specified
		-ppl option
		loadImage
* main.c (pushBuffer): deleteImage
* main.c (quitfm): termImage
* main.c (selBuf): deleteImage
* main.c (followA): fix for inline-image and map area
* main.c (query_from_followform): getMapXY()
* main.c (setOpt): displayBuffer B_REDRAW_IMAGE
* main.c (follow_map): fix calculate x, y
* main.c (dispI): added
* main.c (stopI): added
* map.c: include <math.h>
* map.c (inMapArea): added
* map.c (follow_map_menu): add a_img arg to handle inline-image
* map.c (follow_map_panel): use MapArea
* map.c (getMapXY): added
* map.c (newMapArea): added
* menu.c (smChBuf): deleteImage
* parsetagx.c (toAlign): align top, bottom, middle
* rc.c (P_SCALE): added
* rc.c (CMT_PIXEL_PER_LINE): added
* rc.c (CMT_DISP_IMAGE): added
* rc.c (CMT_AUTO_IMAGE): added
* rc.c (CMT_EXT_IMAGE_VIEWER): added
* rc.c (CMT_IMAGE_SCALE): added
* rc.c (CMT_IMGDISPLAY): added
* rc.c (CMT_IMGSIZE): added
* rc.c (show_param): P_PIXELS
* rc.c (set_param): P_PIXELS
* rc.c (sync_with_option): initImage
* rc.c (to_str): P_PIXELS
* table.c (feed_table_tag): fix <img> for inline-image
* tagtable.tab (image): added
* terms.c (wgetch): retry read when EINTR or EAGAIN
* terms.c (touch_cursor): added
* w3mimgdisplay.c: added
* w3mimgsize.c: added
* doc/README.func (DISPLAY_IMAGE): added
* doc/README.func (STOP_IMAGE): added
* doc/README.img: added
* doc-jp/README.func (DISPLAY_IMAGE): added
* doc-jp/README.func (STOP_IMAGE): added
* doc-jp/README.img: added
* scripts/w3mhelp.cgi.in: show dispI, stopI
* scripts/multipart/multipart.cgi.in: inline image support
From: Fumitoshi UKAI  <ukai@debian.or.jp>

1 files changed, 113 insertions, 15 deletions

diff --git a/main.c b/main.c
index d8ec266..ae9f8eb 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.76 2002/01/31 04:49:42 ukai Exp $ */
+/* $Id: main.c,v 1.77 2002/01/31 17:54:52 ukai Exp $ */
 #define MAINPROGRAM
 #include "fm.h"
 #include <signal.h>
@@ -109,6 +109,9 @@ fversion(FILE * f)
 #else
 	    "lang=en"
 #endif
+#ifdef USE_IMAGE
+	    ",image"
+#endif
 #ifdef USE_COLOR
 	    ",color"
 #ifdef USE_ANSI_COLOR
@@ -193,6 +196,10 @@ fusage(FILE * f, int err)
 	    "    -cols width      specify column width (used with -dump)\n");
     fprintf(f,
 	    "    -ppc count       specify the number of pixels per character (4.0...32.0)\n");
+#ifdef USE_IMAGE
+    fprintf(f,
+	    "    -ppl count       specify the number of pixels per line (4.0...64.0)\n");
+#endif
     fprintf(f, "    -dump            dump formatted page into stdout\n");
     fprintf(f,
 	    "    -dump_head       dump response of HEAD request into stdout\n");
@@ -582,9 +589,24 @@ MAIN(int argc, char **argv, char **envp)
 		    usage();
 		ppc = atof(argv[i]);
 		if (ppc >= MINIMUM_PIXEL_PER_CHAR &&
-		    ppc <= MAXIMUM_PIXEL_PER_CHAR)
+		    ppc <= MAXIMUM_PIXEL_PER_CHAR) {
 		    pixel_per_char = ppc;
+		    set_pixel_per_char = TRUE;
+		}
+	    }
+#ifdef USE_IMAGE
+	    else if (!strcmp("-ppl", argv[i])) {
+		double ppc;
+		if (++i >= argc)
+		    usage();
+		ppc = atof(argv[i]);
+		if (ppc >= MINIMUM_PIXEL_PER_CHAR &&
+		    ppc <= MAXIMUM_PIXEL_PER_CHAR * 2) {
+		    pixel_per_line = ppc;
+		    set_pixel_per_line = TRUE;
+		}
 	    }
+#endif
 	    else if (!strcmp("-num", argv[i]))
 		showLineNum = TRUE;
 	    else if (!strcmp("-no-proxy", argv[i]))
@@ -962,7 +984,15 @@ MAIN(int argc, char **argv, char **envp)
 	}
 	signal(SIGWINCH, resize_handler);
 #endif
+#ifdef USE_IMAGE
+	if (activeImage && displayImage)
+	    loadImage(IMG_FLAG_NEXT);
+#endif
 	c = getch();
+#ifdef USE_IMAGE
+	if (activeImage && displayImage)
+	    loadImage(IMG_FLAG_START);
+#endif
 #ifdef SIGWINCH
 	signal(SIGWINCH, resize_hook);
 #endif
@@ -1145,6 +1175,9 @@ pushBuffer(Buffer *buf)
 {
     Buffer *b;
 
+#ifdef USE_IMAGE
+    deleteImage(Currentbuf);
+#endif
     if (clear_buffer)
 	tmpClearBuffer(Currentbuf);
     if (Firstbuf == Currentbuf) {
@@ -2121,6 +2154,10 @@ qquitfm(void)
 void
 quitfm(void)
 {
+#ifdef USE_IMAGE
+    if (activeImage)
+	termImage();
+#endif
     fmTerm();
 #ifdef USE_COOKIE
     save_cookies();
@@ -2169,8 +2206,13 @@ selBuf(void)
 	}
     } while (!ok);
 
-    if (clear_buffer) {
-	for (buf = Firstbuf; buf != NULL; buf = buf->nextBuffer)
+    for (buf = Firstbuf; buf != NULL; buf = buf->nextBuffer) {
+	if (buf == Currentbuf)
+	    continue;
+#ifdef USE_IMAGE
+	deleteImage(buf);
+#endif
+	if (clear_buffer)
 	    tmpClearBuffer(buf);
     }
     displayBuffer(Currentbuf, B_FORCE_REDRAW);
@@ -2632,11 +2674,26 @@ followA(void)
     Line *l;
     Anchor *a;
     ParsedURL u;
+#ifdef USE_IMAGE
+    int x = 0, y = 0, map = 0;
+#endif
+    char *url;
 
     if (Currentbuf->firstLine == NULL)
 	return;
     l = Currentbuf->currentLine;
 
+#ifdef USE_IMAGE
+    a = retrieveCurrentImg(Currentbuf);
+    if (a && a->image && a->image->map) {
+	_followForm(FALSE);
+	return;
+    }
+    if (a && a->image && a->image->ismap) {
+	getMapXY(Currentbuf, retrieveCurrentImg(Currentbuf), &x, &y);
+	map = 1;
+    }
+#endif
     a = retrieveCurrentAnchor(Currentbuf);
     if (a == NULL) {
 	_followForm(FALSE);
@@ -2672,7 +2729,12 @@ followA(void)
 	return;
     }
 #endif				/* USE_NNTP */
-    loadLink(a->url, a->target, a->referer, NULL);
+    url = a->url;
+#ifdef USE_IMAGE
+    if (map)
+	url = Sprintf("%s?%d,%d", a->url, x, y)->ptr;
+#endif
+    loadLink(url, a->target, a->referer, NULL);
     displayBuffer(Currentbuf, B_NORMAL);
 }
 
@@ -2842,14 +2904,18 @@ query_from_followform(Str *query, FormItemList *fi, int multipart)
 	}
 	if (multipart) {
 	    if (f2->type == FORM_INPUT_IMAGE) {
+		int x = 0, y = 0;
+#ifdef USE_IMAGE
+		getMapXY(Currentbuf, retrieveCurrentImg(Currentbuf), &x, &y);
+#endif
 		*query = Strdup(conv_form_encoding(f2->name, fi, Currentbuf));
 		Strcat_charp(*query, ".x");
 		form_write_data(body, fi->parent->boundary, (*query)->ptr,
-				"1");
+				Sprintf("%d", x)->ptr);
 		*query = Strdup(conv_form_encoding(f2->name, fi, Currentbuf));
 		Strcat_charp(*query, ".y");
 		form_write_data(body, fi->parent->boundary, (*query)->ptr,
-				"1");
+				Sprintf("%d", y)->ptr);
 	    }
 	    else if (f2->name && f2->name->length > 0 && f2->value != NULL) {
 		/* not IMAGE */
@@ -2870,14 +2936,18 @@ query_from_followform(Str *query, FormItemList *fi, int multipart)
 	else {
 	    /* not multipart */
 	    if (f2->type == FORM_INPUT_IMAGE) {
+		int x = 0, y = 0;
+#ifdef USE_IMAGE
+		getMapXY(Currentbuf, retrieveCurrentImg(Currentbuf), &x, &y);
+#endif
 		Strcat(*query,
 		       Str_form_quote(conv_form_encoding
 				      (f2->name, fi, Currentbuf)));
-		Strcat_charp(*query, ".x=1&");
+		Strcat(*query, Sprintf(".x=%d&", x));
 		Strcat(*query,
 		       Str_form_quote(conv_form_encoding
 				      (f2->name, fi, Currentbuf)));
-		Strcat_charp(*query, ".y=1");
+		Strcat(*query, Sprintf(".y=%d", y));
 	    }
 	    else {
 		/* not IMAGE */
@@ -3776,6 +3846,10 @@ setOpt(void)
     }
     if (set_param_option(opt))
 	sync_with_option();
+#ifdef USE_IMAGE
+    if (activeImage)
+	displayBuffer(Currentbuf, B_REDRAW_IMAGE);
+#endif
     displayBuffer(Currentbuf, B_FORCE_REDRAW);
 }
 
@@ -3817,12 +3891,8 @@ follow_map(struct parsed_tagarg *arg)
     ParsedURL p_url;
 
     a = retrieveCurrentImg(Currentbuf);
-    if (a != NULL)
-	x = Currentbuf->cursorX - Currentbuf->pos + a->start.pos +
-	    Currentbuf->rootX;
-    else
-	x = Currentbuf->cursorX + Currentbuf->rootX;
-    url = follow_map_menu(Currentbuf, arg, x, Currentbuf->cursorY + 2);
+    x = Currentbuf->cursorX + Currentbuf->rootX;
+    url = follow_map_menu(Currentbuf, arg, a, x, Currentbuf->cursorY);
     if (url == NULL || *url == '\0')
 	return;
     if (*url == '#') {
@@ -4448,6 +4518,34 @@ curlno()
     disp_message(tmp->ptr, FALSE);
 }
 
+#ifdef USE_IMAGE
+void
+dispI(void)
+{
+    if (!displayImage)
+	initImage();
+    if (!activeImage)
+	return;
+    if (!displayImage || Currentbuf->image_flag == IMG_FLAG_SKIP) {
+	displayImage = TRUE;
+	if (!(Currentbuf->type && !strcmp(Currentbuf->type, "text/html")))
+	    return;
+	Currentbuf->image_flag = IMG_FLAG_AUTO;
+	Currentbuf->need_reshape = TRUE;
+	displayBuffer(Currentbuf, B_REDRAW_IMAGE);
+    }
+}
+
+void
+stopI(void)
+{
+    if (!activeImage)
+	return;
+    Currentbuf->image_flag = IMG_FLAG_SKIP;
+    displayBuffer(Currentbuf, B_NORMAL);
+}
+#endif
+
 #ifdef USE_MOUSE
 
 static void