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>
2002-01-31 17:54:47 +00:00
parent b244cb7b73
commit 9efbc08856
34 changed files with 3009 additions and 215 deletions
--- a/display.c
+++ b/display.c
@@ -1,4 +1,4 @@
-/* $Id: display.c,v 1.14 2002/01/16 15:37:06 ukai Exp $ */
+/* $Id: display.c,v 1.15 2002/01/31 17:54:50 ukai Exp $ */
 #include <signal.h>
 #include "fm.h"

@@ -162,6 +162,10 @@ fmTerm(void)
 	move(LASTLINE, 0);
 	clrtoeolx();
 	refresh();
+#ifdef USE_IMAGE
+	if (activeImage)
+	    loadImage(IMG_FLAG_STOP);
+#endif
 #ifdef USE_MOUSE
 	if (use_mouse)
 	    mouse_end();
@@ -182,6 +186,10 @@ fmInit(void)
 	initscr();
 	term_raw();
 	term_noecho();
+#ifdef USE_IMAGE
+	if (displayImage)
+	    initImage();
+#endif
    }
    fmInitialized = TRUE;
 }
@@ -208,6 +216,12 @@ static Buffer *save_current_buf = NULL;

 char *delayed_msg = NULL;

+#ifdef USE_IMAGE
+static int image_touch = 0;
+static int draw_image_flag = FALSE;
+static Line *redrawLineImage(Buffer *buf, Line *l, int i);
+#endif
+
 void
 displayBuffer(Buffer *buf, int mode)
 {
@@ -222,9 +236,11 @@ displayBuffer(Buffer *buf, int mode)
 	buf->width = COLS;
    if (buf->height == 0)
 	buf->height = LASTLINE + 1;
-    if (buf->width != INIT_BUFFER_WIDTH && buf->type
-	&& !strcmp(buf->type, "text/html"))
+    if ((buf->width != INIT_BUFFER_WIDTH && buf->type &&
+	 !strcmp(buf->type, "text/html")) || buf->need_reshape) {
+	buf->need_reshape = TRUE;
 	reshapeBuffer(buf);
+    }
    if (showLineNum) {
 	if (buf->lastLine && buf->lastLine->real_linenumber > 0)
 	    buf->rootX = (int)(log(buf->lastLine->real_linenumber + 0.1)
@@ -237,10 +253,16 @@ displayBuffer(Buffer *buf, int mode)
    else
 	buf->rootX = 0;
    buf->COLS = COLS - buf->rootX;
-    if (mode == B_FORCE_REDRAW ||
-	mode == B_SCROLL ||
+    if (mode == B_FORCE_REDRAW || mode == B_SCROLL ||
+#ifdef USE_IMAGE
+	mode == B_REDRAW_IMAGE ||
+#endif
 	cline != buf->topLine || ccolumn != buf->currentColumn) {
-	if (mode == B_SCROLL && cline && buf->currentColumn == ccolumn) {
+	if (
+#ifdef USE_IMAGE
+	       !(activeImage && displayImage && draw_image_flag) &&
+#endif
+	       mode == B_SCROLL && cline && buf->currentColumn == ccolumn) {
 	    int n = buf->topLine->linenumber - cline->linenumber;
 	    if (n > 0 && n < LASTLINE) {
 		move(LASTLINE, 0);
@@ -258,14 +280,34 @@ displayBuffer(Buffer *buf, int mode)
 	    }
 	    redrawNLine(buf, n);
 	}
-	else
+	else {
+#ifdef USE_IMAGE
+	    if (activeImage &&
+		(mode == B_REDRAW_IMAGE ||
+		 cline != buf->topLine || ccolumn != buf->currentColumn)) {
+		if (draw_image_flag)
+		    clear();
+		clearImage();
+		loadImage(IMG_FLAG_STOP);
+		image_touch++;
+		draw_image_flag = FALSE;
+	    }
+#endif
 	    redrawBuffer(buf);
+	}
 	cline = buf->topLine;
 	ccolumn = buf->currentColumn;
    }
    if (buf->topLine == NULL)
 	buf->topLine = buf->firstLine;

+#ifdef USE_IMAGE
+    if (buf->need_reshape) {
+	displayBuffer(buf, B_FORCE_REDRAW);
+	return;
+    }
+#endif
+
 #ifdef USE_MOUSE
    if (use_mouse)
 #if LANG == JA
@@ -337,6 +379,14 @@ displayBuffer(Buffer *buf, int mode)
    message(msg->ptr, buf->cursorX + buf->rootX, buf->cursorY);
    standend();
    refresh();
+#ifdef USE_IMAGE
+    if (activeImage && displayImage && buf->img) {
+	/*
+	 * loadImage(IMG_FLAG_START);
+	 */
+	drawImage();
+    }
+#endif
 #ifdef USE_BUFINFO
    if (buf != save_current_buf) {
 	saveBufferInfo();
@@ -377,6 +427,23 @@ redrawNLine(Buffer *buf, int n)
    }
    if (n > 0)
 	clrtobotx();
+
+#ifdef USE_IMAGE
+    if (!(activeImage && displayImage && buf->img))
+	return;
+    move(buf->cursorY, buf->cursorX);
+    for (i = 0, l = buf->topLine; i < LASTLINE; i++) {
+	if (i >= LASTLINE - n || i < -n)
+	    l0 = redrawLineImage(buf, l, i);
+	else {
+	    l0 = (l) ? l->next : NULL;
+	}
+	if (l0 == NULL && l == NULL)
+	    break;
+	l = l0;
+    }
+    getAllImage(buf);
+#endif
 }

 #define addKanji(pc,pr) (addChar((pc)[0],(pr)[0]),addChar((pc)[1],(pr)[1]))
@@ -549,6 +616,77 @@ redrawLine(Buffer *buf, Line *l, int i)
    return l->next;
 }

+#ifdef USE_IMAGE
+Line *
+redrawLineImage(Buffer *buf, Line *l, int i)
+{
+    int j, pos, rcol, ncol;
+    int column = buf->currentColumn;
+    Anchor *a;
+    int x, y, sx, sy, w, h;
+
+    if (l == NULL)
+	return NULL;
+    if (l->width < 0)
+	l->width = COLPOS(l, l->len);
+    if (l->len == 0 || l->width - 1 < column)
+	return l->next;
+    pos = columnPos(l, column);
+    rcol = COLPOS(l, pos);
+    for (j = 0; rcol - column < buf->COLS && pos + j < l->len; j++) {
+	if (rcol - column < 0) {
+	    rcol = COLPOS(l, pos + j + 1);
+	    continue;
+	}
+	a = retrieveAnchor(buf->img, l->linenumber, pos + j);
+	if (a && a->image && a->image->touch < image_touch) {
+	    Image *image = a->image;
+	    ImageCache *cache;
+
+	    cache = image->cache = getImage(image, baseURL(buf),
+					    buf->image_flag);
+	    if (cache) {
+		if ((image->width < 0 && cache->width > 0) ||
+		    (image->height < 0 && cache->height > 0)) {
+		    image->width = cache->width;
+		    image->height = cache->height;
+		    buf->need_reshape = TRUE;
+		}
+		x = (int)((rcol - column + buf->rootX) * pixel_per_char);
+		y = (int)(i * pixel_per_line);
+		sx = (int)((rcol - COLPOS(l, a->start.pos)) * pixel_per_char);
+		sy = (int)((l->linenumber - image->y) * pixel_per_line);
+		if (sx == 0 && x + image->xoffset >= 0)
+		    x += image->xoffset;
+		else
+		    sx -= image->xoffset;
+		if (sy == 0 && y + image->yoffset >= 0)
+		    y += image->yoffset;
+		else
+		    sy -= image->yoffset;
+		if (image->width > 0)
+		    w = image->width - sx;
+		else
+		    w = (int)(8 * pixel_per_char - sx);
+		if (image->height > 0)
+		    h = image->height - sy;
+		else
+		    h = (int)(pixel_per_line - sy);
+		if (w > (int)((buf->COLS - rcol + column) * pixel_per_char))
+		    w = (int)((buf->COLS - rcol + column) * pixel_per_char);
+		if (h > (int)(LASTLINE * pixel_per_line - y))
+		    h = (int)(LASTLINE * pixel_per_line - y);
+		addImage(cache, x, y, sx, sy, w, h);
+		image->touch = image_touch;
+		draw_image_flag = TRUE;
+	    }
+	}
+	rcol = COLPOS(l, pos + j + 1);
+    }
+    return l->next;
+}
+#endif
+
 int
 redrawLineRegion(Buffer *buf, Line *l, int i, int bpos, int epos)
 {
@@ -850,6 +988,8 @@ message(char *s, int return_x, int return_y)
 void
 disp_message_nsec(char *s, int redraw_current, int sec, int purge, int mouse)
 {
+    if (QuietMessage)
+	return;
    if (!fmInitialized) {
 	fprintf(stderr, "%s\n", conv_to_system(s));
 	return;