Common subdirectories: w3m-0.2.4/Bonus and w3m-0.2.4-img-js/Bonus
diff -u w3m-0.2.4/XMakefile w3m-0.2.4-img-js/XMakefile
--- w3m-0.2.4/XMakefile	Thu Jan 17 17:26:10 2002
+++ w3m-0.2.4-img-js/XMakefile	Thu Jan 17 17:03:52 2002
@@ -1,10 +1,12 @@
 # $Id: XMakefile,v 1.19 2001/12/21 20:30:54 ukai Exp $
 SRCS=main.c file.c buffer.c display.c etc.c search.c linein.c table.c local.c \
 	form.c map.c frame.c rc.c menu.c mailcap.c\
-	func.c cookie.c history.c backend.c $(KEYBIND_SRC)
+	func.c cookie.c history.c backend.c $(KEYBIND_SRC)\
+	script.c js_html.c
 OBJS=main.o file.o buffer.o display.o etc.o search.o linein.o table.o local.o\
 	form.o map.o frame.o rc.o menu.o mailcap.o\
-	func.o cookie.o history.o backend.o $(KEYBIND_OBJ)
+	func.o cookie.o history.o backend.o $(KEYBIND_OBJ)\
+	script.o js_html.o
 LSRCS=terms.c conv.c url.c ftp.c anchor.c mimehead.c parsetagx.c\
 	tagtable.c istream.c
 LOBJS=terms.o conv.o url.o ftp.o anchor.o mimehead.o parsetagx.o\
diff -u w3m-0.2.4/XXMakefile w3m-0.2.4-img-js/XXMakefile
--- w3m-0.2.4/XXMakefile	Thu Jan 17 17:23:53 2002
+++ w3m-0.2.4-img-js/XXMakefile	Thu Jan 17 17:16:03 2002
@@ -24,7 +24,7 @@
 RANLIB=ranlib
 MKDIR=mkdir -p
 PERL=/usr//bin/perl
-VERSION=0.2.4
+VERSION=0.2.4-img-1.18
 MODEL=Linux.i686-monster-EN
 #else
 # $Id: XMakefile,v 1.19 2001/12/21 20:30:54 ukai Exp $
Binary files w3m-0.2.4/backend.o and w3m-0.2.4-img-js/backend.o differ
diff -u w3m-0.2.4/buffer.c w3m-0.2.4-img-js/buffer.c
--- w3m-0.2.4/buffer.c	Thu Jan 17 17:26:10 2002
+++ w3m-0.2.4-img-js/buffer.c	Thu Jan 17 17:03:52 2002
@@ -99,6 +99,10 @@
     }
     if (buf->mailcap_source)
 	unlink(buf->mailcap_source);
+#ifdef USE_SCRIPT
+    if (buf->script_lang)
+	script_close(buf);
+#endif
     while (buf->frameset) {
 	deleteFrameSet(buf->frameset);
 	buf->frameset = popFrameTree(&(buf->frameQ));
Binary files w3m-0.2.4/buffer.o and w3m-0.2.4-img-js/buffer.o differ
diff -u w3m-0.2.4/config.h w3m-0.2.4-img-js/config.h
--- w3m-0.2.4/config.h	Thu Jan 17 17:23:51 2002
+++ w3m-0.2.4-img-js/config.h	Thu Jan 17 17:16:01 2002
@@ -87,7 +87,7 @@
 RANLIB=ranlib
 MKDIR=mkdir -p
 PERL=/usr//bin/perl
-VERSION=0.2.4
+VERSION=0.2.4-img-1.18
 MODEL=Linux.i686-monster-EN
 #else
 
@@ -120,9 +120,9 @@
 #define USE_HELP_CGI
 #define USE_JAVASCRIPT
 
-#define DEF_EDITOR "/bin/vi"
+#define DEF_EDITOR "vi"
 #define DEF_MAILER "/bin/mail"
-#define DEF_EXT_BROWSER "/usr//bin/netscape"
+#define DEF_EXT_BROWSER "/usr/bin/galeon"
 
 /* fallback viewer. mailcap override these configuration */
 #define DEF_IMAGE_VIEWER	"xv"
diff -u w3m-0.2.4/config.h.dist w3m-0.2.4-img-js/config.h.dist
--- w3m-0.2.4/config.h.dist	Thu Jan 17 17:26:10 2002
+++ w3m-0.2.4-img-js/config.h.dist	Thu Jan 17 17:03:52 2002
@@ -119,6 +119,7 @@
 #undef USE_GOPHER
 #undef USE_ALARM
 #define USE_HELP_CGI
+#undef USE_JAVASCRIPT
 
 #define DEF_EDITOR "/bin/vi"
 #define DEF_MAILER "/bin/mail"
diff -u w3m-0.2.4/config.param w3m-0.2.4-img-js/config.param
--- w3m-0.2.4/config.param	Thu Jan 17 17:26:26 2002
+++ w3m-0.2.4-img-js/config.param	Thu Jan 17 17:15:59 2002
@@ -15,5 +15,37 @@
 use_cookie=y
 use_ssl=y
 use_ssl_verify=y
+use_javascript=y
 use_ansi_color=y
 use_nntp=y
+use_gopher=y
+use_alarm=y
+use_mark=y
+use_dict=n
+use_history=y
+use_bg_color=y
+format_nice=n
+id_ext=y
+use_bufinfo=y
+use_egd=y
+enable_remove_trailingspaces=n
+menu_thin_frame=n
+emacs_like_lineedit=y
+vi_prec_num=y
+label_topline=y
+nextpage_topline=y
+ftppass_hostnamegen=y
+table_expand=n
+table_no_compact=n
+nowrap=y
+matrix=y
+ded='vi'
+dmail='/bin/mail'
+dbrowser='/usr/bin/galeon'
+def_image_viewer='xv'
+def_audio_player='showaudio'
+dcc='gcc'
+dcflags='-O'
+dtermlib='-lncurses'
+dldflags=''
+use_help_cgi=y
diff -u w3m-0.2.4/configure w3m-0.2.4-img-js/configure
--- w3m-0.2.4/configure	Thu Jan 17 17:26:10 2002
+++ w3m-0.2.4-img-js/configure	Thu Jan 17 17:03:52 2002
@@ -690,6 +690,8 @@
   def_param "use_ssl_verify" n
 fi
 
+ask_param "EXPERIMENTAL JavaScript support" use_javascript n
+
 if [ "$use_color" = y ]; then
   ask_param "ANSI color escape sequences support" use_ansi_color n
 else
@@ -924,6 +926,33 @@
   echo "additional library found: $extlib"
 fi
 
+## Search js
+jslib=
+jsinclude=
+if [ "$use_javascript" = "y" ]; then
+for libdir in /lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib $prefix/lib ${HOME}/lib
+do
+  if [ -f $libdir/libjs.a -o -f $libdir/libjs.$so_ext ] ; then
+    echo "$libdir/libjs found"
+    jslib="-L$libdir -ljs"
+    break
+  fi
+done
+for inc in /usr/include /usr/local/include $prefix/include ${HOME}/include
+do
+  if [ -f $inc/js.h ]; then
+    echo "$inc/js.h found"
+    jsinclude="-I$inc"
+    break
+  fi
+done
+if [ -z "$jslib" -o -z "$jsinclude" ]; then
+  echo "Error: It seems you don't have libjs or js.h."
+  echo "       JavaScript cannot be supported."
+  exit 1
+fi
+fi
+
 ## Search zlib
 zlib=
 for tlibdir in /lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib /usr/X11R6/lib $prefix/lib ${HOME}/lib
@@ -1999,10 +2028,10 @@
 ETC_DIR = $sysconfdir
 RC_DIR = ~/.w3m
 HELP_FILE = $helpfile
-SYS_LIBRARIES = $gpmlib $extlib $termlib $ssllib $v6lib
+SYS_LIBRARIES = $gpmlib $extlib $termlib $ssllib $v6lib $jslib
 LOCAL_LIBRARIES = $bsdlib $ldflags
 CC = $cc
-MYCFLAGS = $cflags $bsdinclude $sslinclude
+MYCFLAGS = $cflags $bsdinclude $sslinclude $jsinclude
 GCCFLAGS = $cflags -I./\$(srcdir)/include -DATOMIC_UNCOLLECTABLE -DNO_SIGNALS -DNO_EXECUTE_PERMISSION -DSILENT -DALL_INTERIOR_POINTERS
 KEYBIND_SRC = $keymap_file.c
 KEYBIND_OBJ = $keymap_file.o
@@ -2048,6 +2077,7 @@
 $def_use_gopher
 $def_use_alarm
 $def_use_help_cgi
+$def_use_javascript
 
 #define DEF_EDITOR "$editor"
 #define DEF_MAILER "$mailer"
Common subdirectories: w3m-0.2.4/doc and w3m-0.2.4-img-js/doc
Common subdirectories: w3m-0.2.4/doc-jp and w3m-0.2.4-img-js/doc-jp
diff -u w3m-0.2.4/etc.c w3m-0.2.4-img-js/etc.c
--- w3m-0.2.4/etc.c	Thu Jan 17 17:26:10 2002
+++ w3m-0.2.4-img-js/etc.c	Thu Jan 17 17:03:52 2002
@@ -791,8 +791,10 @@
 	    }
 	    if (prev_status == R_ST_NCMNT2 || prev_status == R_ST_NCMNT3 ||
 		prev_status == R_ST_IRRTAG || prev_status == R_ST_CMNT1) {
-		if (prev_status == R_ST_CMNT1 && !append)
+		if (prev_status == R_ST_CMNT1 && !append && !pre)
 		    Strclear(buf);
+		if (pre)
+		    Strcat_char(buf, *p);
 		p++;
 		goto proc_end;
 	    }
@@ -815,7 +817,10 @@
 	    }
 	    if (*status == R_ST_TAG0 && !REALLY_THE_BEGINNING_OF_A_TAG(p)) {
 		/* it seems that this '<' is not a beginning of a tag */
+/*
 		Strcat_charp(buf, "&lt;");
+*/
+		Strcat_char(buf, '<');
 		*status = R_ST_NORMAL;
 	    }
 	    else
@@ -829,7 +834,9 @@
 	    break;
 	case R_ST_CMNT:
 	case R_ST_IRRTAG:
-	    if (!append)
+	    if (pre)
+		Strcat_char(buf, *p);
+	    else if (!append)
 		Strclear(buf);
 	    break;
 	case R_ST_CMNT1:
@@ -838,6 +845,8 @@
 	case R_ST_NCMNT2:
 	case R_ST_NCMNT3:
 	    /* do nothing */
+	    if (pre)
+		Strcat_char(buf, *p);
 	    break;
 	}
     }
Binary files w3m-0.2.4/etc.o and w3m-0.2.4-img-js/etc.o differ
diff -u w3m-0.2.4/file.c w3m-0.2.4-img-js/file.c
--- w3m-0.2.4/file.c	Thu Jan 17 17:26:10 2002
+++ w3m-0.2.4-img-js/file.c	Thu Jan 17 17:10:18 2002
@@ -25,12 +25,22 @@
 #define min(a,b)        ((a) > (b) ? (b) : (a))
 #endif				/* not min */
 
+#ifdef USE_IMAGE
+static int image_flag = 0;
+static char *current_source = NULL;
+#endif
+static int frame_source = 0;
+
+static int _MoveFile(char *path1, char *path2);
 static void uncompress_stream(URLFile *uf);
 static FILE *lessopen_stream(char *path);
 static Buffer *loadcmdout(char *cmd,
 			  Buffer *(*loadproc) (URLFile *, Buffer *),
 			  Buffer *defaultbuf);
 static void close_textarea(struct html_feed_environ *h_env);
+#ifdef USE_SCRIPT
+static void close_script(struct html_feed_environ *h_env);
+#endif
 static void addnewline(Buffer *buf, char *line, Lineprop *prop,
 #ifdef USE_ANSI_COLOR
 		       Linecolor *color,
@@ -47,6 +57,13 @@
 static struct table *tables[MAX_TABLE];
 static struct table_mode table_mode[MAX_TABLE];
 
+#ifdef USE_IMAGE
+static ParsedURL *cur_baseURL = NULL;
+#ifdef JP_CHARSET
+static char cur_document_code;
+#endif
+#endif
+
 static Str cur_select;
 static Str select_str;
 static int select_is_multiple;
@@ -73,6 +90,13 @@
 static int ignore_nl_textarea;
 static int max_textarea = MAX_TEXTAREA;
 
+#ifdef USE_SCRIPT
+static Str cur_script_str;
+static char *cur_script_lang;
+static void *script_interp;
+static char *script_lang;
+#endif
+
 static int http_response_code;
 
 #ifdef JP_CHARSET
@@ -113,6 +137,9 @@
 static int current_content_length;
 
 static int cur_hseq;
+#ifdef USE_IMAGE
+static int cur_iseq;
+#endif
 
 #define MAX_UL_LEVEL 9
 #ifdef KANJI_SYMBOLS
@@ -1019,10 +1046,10 @@
 	 * on an FTP server, or (2) is a local directory name. 
 	 */
 	extern Str FTPDIRtmp;
-	if (fmInitialized && prevtrap) {
+	if (fmInitialized)
 	    term_raw();
+	if (prevtrap)
 	    signal(SIGINT, prevtrap);
-	}
 	switch (f.scheme) {
 	case SCM_FTPDIR:
 	    if (FTPDIRtmp->length > 0) {
@@ -1064,6 +1091,19 @@
 		    }
 		}
 	    }
+	    break;
+#ifdef USE_JAVASCRIPT
+	case SCM_JAVASCRIPT:
+	    if (! Currentbuf)
+		return NULL;
+	    script_eval(Currentbuf, "JavaScript", pu.file);
+	    if (Currentbuf->location)
+		return loadGeneralFile(Currentbuf->location, current, referer,
+			flag, NULL);
+	    displayBuffer(Currentbuf, B_FORCE_REDRAW);
+	    return NO_BUFFER;
+#endif
+	    break;
 	}
 	return NULL;
     }
@@ -1071,10 +1111,9 @@
     /* openURL() succeeded */
     if (SETJMP(AbortLoading) != 0) {
 	/* transfer interrupted */
-	if (fmInitialized) {
+	if (fmInitialized)
 	    term_raw();
-	    signal(SIGINT, prevtrap);
-	}
+	signal(SIGINT, prevtrap);
 	if (b)
 	    discardBuffer(b);
 	UFclose(&f);
@@ -1089,10 +1128,9 @@
     }
     if (header_string)
 	header_string = NULL;
-    if (fmInitialized) {
-	prevtrap = signal(SIGINT, KeyAbort);
+    prevtrap = signal(SIGINT, KeyAbort);
+    if (fmInitialized)
 	term_cbreak();
-    }
     if (pu.scheme == SCM_HTTP ||
 #ifdef USE_SSL
 	pu.scheme == SCM_HTTPS ||
@@ -1319,14 +1357,17 @@
     if (real_type == NULL)
 	real_type = t;
     proc = loadBuffer;
+#ifdef USE_IMAGE
+    cur_baseURL = New(ParsedURL);
+    copyParsedURL(cur_baseURL, &pu);
+#endif
 
     if (do_download) {
 	/* download only */
 	char *file;
-	if (fmInitialized) {
+	if (fmInitialized)
 	    term_raw();
-	    signal(SIGINT, prevtrap);
-	}
+	signal(SIGINT, prevtrap);
 	if (DecodeCTE && IStype(f.stream) != IST_ENCODED)
 	    f.stream = newEncodedStream(f.stream, f.encoding);
 	if (pu.scheme == SCM_LOCAL)
@@ -1350,16 +1391,39 @@
 	    f.compression = CMP_NOCOMPRESS;
 	}
     }
+#ifdef USE_IMAGE
+    if (current_source) {
+	Buffer *b = NULL;
+	if (IStype(f.stream) != IST_ENCODED)
+	    f.stream = newEncodedStream(f.stream, f.encoding);
+	if (save2tmp(f, current_source) == 0) {
+	    b = newBuffer(INIT_BUFFER_WIDTH);
+	    b->sourcefile = current_source;
+	    b->real_type = t;
+	}
+	if (fmInitialized)
+	    term_raw();
+	signal(SIGINT, prevtrap);
+	UFclose(&f);
+	return b;
+    }
+#endif
 
     if (!strcasecmp(t, "text/html"))
 	proc = loadHTMLBuffer;
     else if (is_plain_text_type(t))
 	proc = loadBuffer;
+#ifdef USE_IMAGE
+    else if (activeImage && displayImage && !useExtImageViewer &&
+	     !w3m_dump && !strncasecmp(t, "image/", 6))
+	proc = loadImageBuffer;
+#endif
 #ifdef USE_GOPHER
     else if (!strcasecmp(t, "gopher:directory")) {
 	proc = loadGopherDir;
     }
 #endif				/* USE_GOPHER */
+
     else if (w3m_backend) ;
     else if (!(w3m_dump & ~DUMP_FRAME) || is_dump_text_type(t)) {
 	if (!do_download && doExternal(f,
@@ -1372,17 +1436,15 @@
 		    copyParsedURL(&b->currentURL, &pu);
 	    }
 	    UFclose(&f);
-	    if (fmInitialized) {
+	    if (fmInitialized)
 		term_raw();
-		signal(SIGINT, prevtrap);
-	    }
+	    signal(SIGINT, prevtrap);
 	    return b;
 	}
 	else {
-	    if (fmInitialized) {
+	    if (fmInitialized)
 		term_raw();
-		signal(SIGINT, prevtrap);
-	    }
+	    signal(SIGINT, prevtrap);
 	    if (pu.scheme == SCM_LOCAL) {
 		UFclose(&f);
 		doFileCopy(pu.real_file,
@@ -1414,7 +1476,9 @@
 	    t_buf->ssl_certificate = s->ptr;
     }
 #endif
+    frame_source = flag & RG_FRAME_SRC;
     b = loadSomething(&f, pu.real_file ? pu.real_file : pu.file, proc, t_buf);
+    frame_source = 0;
     UFclose(&f);
     if (b) {
 	b->real_scheme = f.scheme;
@@ -1428,6 +1492,10 @@
 	    Str s = Strnew_charp(t);
 	    b->type = s->ptr;
 	}
+#ifdef USE_IMAGE
+	else if (proc == loadImageBuffer)
+	    b->type = b->real_type;
+#endif
 	else
 	    b->type = "text/plain";
 	if (pu.label) {
@@ -1462,10 +1530,9 @@
     }
     if (header_string)
 	header_string = NULL;
-    if (fmInitialized) {
+    if (fmInitialized)
 	term_raw();
-	signal(SIGINT, prevtrap);
-    }
+    signal(SIGINT, prevtrap);
     return b;
 }
 
@@ -2274,12 +2341,278 @@
 	push_tag(obuf, "<u>", HTML_U);
 }
 
+#ifdef USE_IMAGE
+static Hash_sv *image_hash = NULL;
+static Hash_sv *image_file = NULL;
+static GeneralList *image_list = NULL;
+static ImageCache *image_cache = NULL;
+static pid_t image_pid = 0;
+int image_index = 0;
+static int need_load_image = FALSE;
+
+static MySignalHandler
+load_image_handler(SIGNAL_ARG)
+{
+    need_load_image = TRUE;
+    SIGNAL_RETURN;
+}
+
+static MySignalHandler
+load_image_next(SIGNAL_ARG)
+{
+    need_load_image = TRUE;
+    loadImage(IMG_FLAG_NEXT);
+    SIGNAL_RETURN;
+}
+
+void
+deleteImage(Buffer *buf)
+{
+    AnchorList *al;
+    Anchor *a;
+    int i;
+
+    if (!buf)
+	return;
+    al = buf->img;
+    if (!al)
+	return;
+    for (i = 0, a = al->anchors; i < al->nanchor; i++, a++) {
+	if (a->image && a->image->cache &&
+	    a->image->cache->loaded != IMG_FLAG_UNLOADED &&
+	    a->image->cache->index < 0)
+	    unlink(a->image->cache->file);
+    }
+    loadImage(IMG_FLAG_STOP);
+}
+
+void
+getAllImage(Buffer *buf)
+{
+    AnchorList *al;
+    Anchor *a;
+    ParsedURL *current;
+    int i;
+
+    if (!buf)
+	return;
+    al = buf->img;
+    if (!al)
+	return;
+    current = baseURL(buf);
+    for (i = 0, a = al->anchors; i < al->nanchor; i++, a++) {
+	if (a->image)
+	    a->image->cache = getImage(a->image, current, buf->image_flag);
+    }
+}
+
+void
+loadImage(int flag)
+{
+    int wait_st;
+
+    if (flag == IMG_FLAG_STOP) {
+	if (image_pid) {
+	    kill(image_pid, SIGKILL);
+#ifdef HAVE_WAITPID
+	    waitpid(image_pid, &wait_st, 0);
+#else
+	    wait(&wait_st);
+#endif
+	    image_pid = 0;
+	}
+	image_cache = NULL;
+	image_list = NULL;
+	image_file = NULL;
+	need_load_image = FALSE;
+	return;
+    }
+
+    if (flag == IMG_FLAG_NEXT && need_load_image) {
+	struct stat st;
+	if (image_pid) {
+#ifdef HAVE_WAITPID
+	    waitpid(image_pid, &wait_st, 0);
+#else
+	    wait(&wait_st);
+#endif
+	    image_pid = 0;
+	}
+	if (!stat(image_cache->file, &st)) {
+	    image_cache->loaded = IMG_FLAG_LOADED;
+	    if (getImageSize(image_cache)) {
+		if (Currentbuf)
+		    Currentbuf->need_reshape = TRUE;
+	    }
+	}
+	else {
+	    image_cache->loaded = IMG_FLAG_ERROR;
+	}
+	image_cache = NULL;
+	drawImage();
+    }
+
+    need_load_image = FALSE;
+    if (flag == IMG_FLAG_START)
+	signal(SIGUSR1, load_image_handler);
+    else
+	signal(SIGUSR1, load_image_next);
+
+    if (image_cache)
+	return;
+
+    image_pid = 0;
+    if (!image_list)
+	return;
+    while (1) {
+	image_cache = (ImageCache *) popValue(image_list);
+	if (!image_cache) {
+	    if (Currentbuf && Currentbuf->need_reshape)
+		displayBuffer(Currentbuf, B_NORMAL);
+	    return;
+	}
+	if (image_cache->loaded == IMG_FLAG_UNLOADED)
+	    break;
+    }
+
+    flush_tty();
+    if ((image_pid = fork()) == 0) {
+	Buffer *b;
+
+	signal(SIGHUP, SIG_IGN);
+	signal(SIGINT, SIG_IGN);
+	signal(SIGQUIT, SIG_IGN);
+	signal(SIGTERM, SIG_IGN);
+	close_tty();
+	QuietMessage = TRUE;
+	fmInitialized = FALSE;
+	current_source = image_cache->file;
+	b = loadGeneralFile(image_cache->url, image_cache->current, NULL, 0,
+			    NULL);
+	if (!b || !b->real_type || strncasecmp(b->real_type, "image/", 6))
+	    unlink(image_cache->file);
+	kill(getppid(), SIGUSR1);
+	exit(0);
+    }
+}
+
+ImageCache *
+getImage(Image * image, ParsedURL *current, int flag)
+{
+    Str key;
+    ImageCache *cache;
+
+    if (!activeImage)
+	return;
+    if (!image_hash)
+	image_hash = newHash_sv(100);
+    if (image->cache)
+	cache = image->cache;
+    else {
+	key = Sprintf("%d;%d;%s", image->width, image->height, image->url);
+	cache = (ImageCache *) getHash_sv(image_hash, key->ptr, NULL);
+    }
+    if (cache && cache->index && abs(cache->index) <= image_index - MAX_IMAGE) {
+	struct stat st;
+	if (stat(cache->file, &st))
+	    cache->loaded = IMG_FLAG_UNLOADED;
+	cache->index = 0;
+    }
+
+    if (!cache) {
+	if (flag == IMG_FLAG_SKIP)
+	    return NULL;
+
+	cache = New(ImageCache);
+	cache->url = image->url;
+	cache->current = current;
+	cache->file = tmpfname(TMPF_DFL, image->ext)->ptr;
+	cache->index = 0;
+	cache->loaded = IMG_FLAG_UNLOADED;
+	cache->width = image->width;
+	cache->height = image->height;
+	putHash_sv(image_hash, key->ptr, (void *)cache);
+	pushText(fileToDelete, cache->file);
+    }
+    if (flag != IMG_FLAG_SKIP) {
+	if (cache->loaded == IMG_FLAG_UNLOADED) {
+	    if (!image_file)
+		image_file = newHash_sv(100);
+	    if (!getHash_sv(image_file, cache->file, NULL)) {
+		putHash_sv(image_file, cache->file, (void *)cache);
+		if (!image_list)
+		    image_list = newGeneralList();
+		pushValue(image_list, (void *)cache);
+	    }
+	}
+	if (!cache->index)
+	    cache->index = ++image_index;
+    }
+    if (cache->loaded == IMG_FLAG_LOADED)
+	getImageSize(cache);
+    return cache;
+}
+
+int
+getImageSize(ImageCache * cache)
+{
+    Str tmp;
+    FILE *f;
+    int w = 0, h = 0;
+
+    if (!activeImage)
+	return 0;
+    if (!cache || cache->loaded != IMG_FLAG_LOADED ||
+	(cache->width > 0 && cache->height > 0))
+	return 0;
+    if (Imgsize[0] != '/')
+	tmp = Sprintf("%s/%s %s", LIB_DIR, Imgsize, shell_quote(cache->file));
+    else
+	tmp = Sprintf("%s %s", Imgsize, shell_quote(cache->file));
+    f = popen(tmp->ptr, "r");
+    if (!f)
+	return 0;
+    fscanf(f, "%d %d", &w, &h);
+    pclose(f);
+
+    if (!(w > 0 && h > 0))
+	return 0;
+    w = (int)(w * image_scale / 100 + 0.5);
+    if (w == 0)
+	w = 1;
+    h = (int)(h * image_scale / 100 + 0.5);
+    if (h == 0)
+	h = 1;
+    if (cache->width < 0 && cache->height < 0) {
+	cache->width = w;
+	cache->height = h;
+    }
+    else if (cache->width < 0) {
+	cache->width = (int)((double)cache->height * w / h + 0.5);
+    }
+    else if (cache->height < 0) {
+	cache->height = (int)((double)cache->width * h / w + 0.5);
+    }
+    if (cache->width == 0)
+	cache->width = 1;
+    if (cache->height == 0)
+	cache->height = 1;
+    tmp = Sprintf("%d;%d;%s", cache->width, cache->height, cache->url);
+    putHash_sv(image_hash, tmp->ptr, (void *)cache);
+    return 1;
+}
+#endif
 
 Str
-process_img(struct parsed_tag *tag)
+process_img(struct parsed_tag *tag, int width)
 {
     char *p, *q, *r, *r2, *s;
-    int w, i;
+#ifdef USE_IMAGE
+    int w, i, nw, ni, n, w0, i0, align, xoffset, yoffset, top, bottom, ismap;
+    int use_image = activeImage && displayImage;
+#else
+    int w, i, nw, n;
+#endif
     Str tmp = Strnew();
 
     if (!parsedtag_get_value(tag, ATTR_SRC, &p))
@@ -2287,69 +2620,231 @@
     q = NULL;
     parsedtag_get_value(tag, ATTR_ALT, &q);
     w = -1;
-    parsedtag_get_value(tag, ATTR_WIDTH, &w);
-    i = -1;
-    parsedtag_get_value(tag, ATTR_HEIGHT, &i);
+    if (parsedtag_get_value(tag, ATTR_WIDTH, &w)) {
+	if (w < 0) {
+	    if (width > 0)
+		w = (int)(-width * pixel_per_char * w / 100 + 0.5);
+	    else
+		w = -1;
+	}
+#ifdef USE_IMAGE
+	if (use_image) {
+	    if (w > 0) {
+		w = (int)(w * image_scale / 100 + 0.5);
+		if (w == 0)
+		    w = 1;
+	    }
+	}
+#endif
+    }
+#ifdef USE_IMAGE
+    if (use_image) {
+	i = -1;
+	if (parsedtag_get_value(tag, ATTR_HEIGHT, &i)) {
+	    if (i > 0) {
+		i = (int)(i * image_scale / 100 + 0.5);
+		if (i == 0)
+		    i = 1;
+	    }
+	    else {
+		i = -1;
+	    }
+	}
+	align = -1;
+	parsedtag_get_value(tag, ATTR_ALIGN, &align);
+	ismap = 0;
+	if (parsedtag_exists(tag, ATTR_ISMAP))
+	    ismap = 1;
+    }
+    else
+#endif
+	parsedtag_get_value(tag, ATTR_HEIGHT, &i);
     r = NULL;
     parsedtag_get_value(tag, ATTR_USEMAP, &r);
 
     tmp = Strnew_size(128);
+#ifdef USE_IMAGE
+    if (use_image) {
+	switch (align) {
+	case ALIGN_LEFT:
+	    Strcat_charp(tmp, "<div align=left>");
+	    break;
+	case ALIGN_CENTER:
+	    Strcat_charp(tmp, "<div align=center>");
+	    break;
+	case ALIGN_RIGHT:
+	    Strcat_charp(tmp, "<div align=right>");
+	    break;
+	}
+    }
+#endif
     if (r) {
 	r2 = strchr(r, '#');
 	s = "<form_int method=internal action=map>";
 	process_form(parse_tag(&s, TRUE));
-	Strcat(tmp, Sprintf("<pre_int><input_alt fid=\"%d\" "
+	Strcat(tmp, Sprintf("<input_alt fid=\"%d\" "
 			    "type=hidden name=link value=\"", cur_form_id));
 	Strcat_charp(tmp, html_quote((r2) ? r2 + 1 : r));
 	Strcat(tmp, Sprintf("\"><input_alt hseq=\"%d\" fid=\"%d\" "
 			    "type=submit no_effect=true>",
 			    cur_hseq++, cur_form_id));
     }
-    if (q != NULL && *q == '\0' && ignore_null_img_alt)
-	q = NULL;
-    if (q != NULL || r != NULL)
-	Strcat_charp(tmp, "<img_alt src=\"");
+#ifdef USE_IMAGE
+    if (use_image) {
+	w0 = w;
+	i0 = i;
+	if (w < 0 || i < 0) {
+	    char *url, *ext;
+	    Image image;
+	    ParsedURL u;
+
+#ifdef JP_CHARSET
+	    parseURL2(conv(p, InnerCode, cur_document_code)->ptr, &u,
+		      cur_baseURL);
+#else
+	    parseURL2(p, &u, cur_baseURL);
+#endif
+	    image.url = parsedURL2Str(&u)->ptr;
+	    image.ext = filename_extension(u.file, TRUE);
+	    image.cache = NULL;
+	    image.width = w;
+	    image.height = i;
+
+	    image.cache = getImage(&image, cur_baseURL, IMG_FLAG_SKIP);
+	    if (image.cache && image.cache->width > 0 &&
+		image.cache->height > 0) {
+		w = w0 = image.cache->width;
+		i = i0 = image.cache->height;
+	    }
+	    if (w < 0)
+		w = 8 * pixel_per_char;
+	    if (i < 0)
+		i = pixel_per_line;
+	}
+	nw = (w > 3) ? (int)((w - 3) / pixel_per_char + 1) : 1;
+	ni = (i > 3) ? (int)((i - 3) / pixel_per_line + 1) : 1;
+	Strcat(tmp,
+	       Sprintf("<pre_int><img_alt hseq=\"%d\" src=\"", cur_iseq++));
+    }
     else
-	Strcat_charp(tmp, "<nobr><img_alt src=\"");
+#endif
+    {
+	if (w < 0)
+	    w = 12 * pixel_per_char;
+	nw = w ? (int)((w - 1) / pixel_per_char + 1) : 1;
+	if (r)
+	    Strcat_charp(tmp, "<pre_int>");
+	Strcat_charp(tmp, "<img_alt src=\"");
+    }
     Strcat_charp(tmp, html_quote(p));
-    Strcat_charp(tmp, "\">");
+    Strcat_charp(tmp, "\"");
+#ifdef USE_IMAGE
+    if (use_image) {
+	if (w0 >= 0)
+	    Strcat(tmp, Sprintf(" width=%d", w0));
+	if (i0 >= 0)
+	    Strcat(tmp, Sprintf(" height=%d", i0));
+	switch (align) {
+	case ALIGN_TOP:
+	    top = 0;
+	    bottom = ni - 1;
+	    yoffset = 0;
+	    break;
+	case ALIGN_MIDDLE:
+	    top = ni / 2;
+	    bottom = top;
+	    if (top * 2 == ni)
+		yoffset = (int)(((ni + 1) * pixel_per_line - i) / 2);
+	    else
+		yoffset = (int)((ni * pixel_per_line - i) / 2);
+	    break;
+	case ALIGN_BOTTOM:
+	    top = ni - 1;
+	    bottom = 0;
+	    yoffset = (int)(ni * pixel_per_line - i);
+	    break;
+	default:
+	    top = ni - 1;
+	    bottom = 0;
+	    if (ni == 1 && ni * pixel_per_line > i)
+		yoffset = 0;
+	    else {
+		yoffset = (int)(ni * pixel_per_line - i);
+		if (yoffset <= -2)
+		    yoffset++;
+	    }
+	    break;
+	}
+	xoffset = (int)((nw * pixel_per_char - w) / 2);
+	if (xoffset)
+	    Strcat(tmp, Sprintf(" xoffset=%d", xoffset));
+	if (yoffset)
+	    Strcat(tmp, Sprintf(" yoffset=%d", yoffset));
+	if (top)
+	    Strcat(tmp, Sprintf(" top_margin=%d", top));
+	if (bottom)
+	    Strcat(tmp, Sprintf(" bottom_margin=%d", bottom));
+	if (r) {
+	    Strcat_charp(tmp, " usemap=\"");
+	    Strcat_charp(tmp, html_quote((r2) ? r2 + 1 : r));
+	    Strcat_charp(tmp, "\"");
+	}
+	if (ismap)
+	    Strcat_charp(tmp, " ismap");
+    }
+#endif
+    Strcat_charp(tmp, ">");
+    if (q != NULL && *q == '\0' && ignore_null_img_alt)
+	q = NULL;
     if (q != NULL) {
-	Strcat_charp(tmp, html_quote(q));
-	Strcat_charp(tmp, "</img_alt> ");
-	goto img_end2;
+	n = strlen(q);
+#ifdef USE_IMAGE
+	if (use_image) {
+	    if (n > nw) {
+		n = nw;
+		Strcat_charp(tmp, html_quote(Strnew_charp_n(q, nw)->ptr));
+	    }
+	    else
+		Strcat_charp(tmp, q);
+	}
+	else
+#endif
+	    Strcat_charp(tmp, q);
+	goto img_end;
     }
     if (w > 0 && i > 0) {
 	/* guess what the image is! */
 	if (w < 32 && i < 48) {
 	    /* must be an icon or space */
+	    n = 1;
 	    if (strcasestr(p, "space") || strcasestr(p, "blank"))
-		Strcat_charp(tmp, "_</img_alt>");
+		Strcat_charp(tmp, "_");
 	    else {
 		if (w * i < 8 * 16)
-		    Strcat_charp(tmp, "*</img_alt>");
+		    Strcat_charp(tmp, "*");
 		else {
 #ifdef KANJI_SYMBOLS
-		    Strcat_charp(tmp, "●</img_alt>");
+		    Strcat_charp(tmp, "●");
+		    n = 2;
 #else				/* not KANJI_SYMBOLS */
-		    Strcat_charp(tmp, "#</img_alt>");
+		    Strcat_charp(tmp, "#");
 #endif				/* not KANJI_SYMBOLS */
 		}
 	    }
-	    goto img_end1;
+	    goto img_end;
 	}
 	if (w > 200 && i < 13) {
 	    /* must be a horizontal line */
 #ifndef KANJI_SYMBOLS
 	    Strcat_charp(tmp, "<_RULE TYPE=10>");
 #endif				/* not KANJI_SYMBOLS */
-	    w /= pixel_per_char;
-	    for (i = 0; i < w - (HR_RULE_WIDTH - 1); i += HR_RULE_WIDTH)
+	    for (i = 0; i < nw - (HR_RULE_WIDTH - 1); i += HR_RULE_WIDTH)
 		Strcat_charp(tmp, HR_RULE);
 #ifndef KANJI_SYMBOLS
 	    Strcat_charp(tmp, "</_RULE>");
 #endif				/* not KANJI_SYMBOLS */
-	    Strcat_charp(tmp, "</img_alt>");
-	    goto img_end1;
+	    n = i;
+	    goto img_end;
 	}
     }
     for (q = p; *q; q++) ;
@@ -2358,27 +2853,50 @@
     if (*q == '/')
 	q++;
     Strcat_char(tmp, '[');
+    n = 1;
     p = q;
     for (; *q; q++) {
 	if (!IS_ALNUM(*q) && *q != '_' && *q != '-') {
 	    break;
 	}
-	else if (w > 0 && !IS_ALNUM(*q)
-		 && q - p + 2 > (int)(w / pixel_per_char)) {
-	    Strcat_charp(tmp, "..");
-	    break;
-	}
 	Strcat_char(tmp, *q);
+	n++;
+	if (n + 1 >= nw)
+	    break;
     }
-    Strcat_charp(tmp, "]</img_alt>");
-  img_end1:
-    if (r == NULL)
-	Strcat_charp(tmp, "</nobr>");
-  img_end2:
+    Strcat_char(tmp, ']');
+    n++;
+  img_end:
+#ifdef USE_IMAGE
+    if (use_image) {
+	for (; n < nw; n++)
+	    Strcat_char(tmp, ' ');
+    }
+#endif
+    Strcat_charp(tmp, "</img_alt>");
+#ifdef USE_IMAGE
+    if (use_image) {
+	Strcat_charp(tmp, "</pre_int>");
+    }
+    else
+#endif
+    if (r)
+	Strcat_charp(tmp, "</pre_int>");
     if (r) {
-	Strcat_charp(tmp, "</input_alt></pre_int>");
+	Strcat_charp(tmp, "</input_alt>");
 	process_n_form();
     }
+#ifdef USE_IMAGE
+    if (use_image) {
+	switch (align) {
+	case ALIGN_RIGHT:
+	case ALIGN_CENTER:
+	case ALIGN_LEFT:
+	    Strcat_charp(tmp, "</div>");
+	    break;
+	}
+    }
+#endif
     return tmp;
 }
 
@@ -2400,8 +2918,7 @@
 process_input(struct parsed_tag *tag)
 {
     int i, w, v, x, y, z, iw, ih;
-    char *q, *p, *r, *p2;
-    char *pi = NULL;
+    char *q, *p, *r, *p2, *s;
     Str tmp;
     char *qq = "";
     int qlen = 0;
@@ -2490,6 +3007,20 @@
 	    Strcat_charp(tmp, "<u>");
 	    break;
 	case FORM_INPUT_IMAGE:
+	    s = NULL;
+	    parsedtag_get_value(tag, ATTR_SRC, &s);
+	    if (s) {
+		Strcat(tmp, Sprintf("<img src=\"%s\"", html_quote(s)));
+		if (p2)
+		    Strcat(tmp, Sprintf(" alt=\"%s\"", html_quote(p2)));
+		if (parsedtag_get_value(tag, ATTR_WIDTH, &iw))
+		    Strcat(tmp, Sprintf(" width=\"%d\"", iw));
+		if (parsedtag_get_value(tag, ATTR_HEIGHT, &ih))
+		    Strcat(tmp, Sprintf(" height=\"%d\"", ih));
+		Strcat_charp(tmp, ">");
+		Strcat_charp(tmp, "</input_alt></pre_int>");
+		return tmp;
+	    }
 	case FORM_INPUT_SUBMIT:
 	case FORM_INPUT_BUTTON:
 	case FORM_INPUT_RESET:
@@ -2515,23 +3046,6 @@
 		    Strcat_char(tmp, ' ');
 	    }
 	    break;
-	case FORM_INPUT_IMAGE:
-	    parsedtag_get_value(tag, ATTR_SRC, &pi);
-	    if (pi) {
-		Strcat(tmp, Sprintf("<img_alt src=\"%s\"", html_quote(pi)));
-		if (parsedtag_get_value(tag, ATTR_WIDTH, &iw))
-		    Strcat(tmp, Sprintf(" width=\"%d\"", iw));
-		if (parsedtag_get_value(tag, ATTR_HEIGHT, &ih))
-		    Strcat(tmp, Sprintf(" height=\"%d\"", ih));
-		Strcat_charp(tmp, ">");
-		if (p2)
-		    Strcat_charp(tmp, html_quote(p2));
-		else
-		    Strcat_charp(tmp, qq);
-		Strcat_charp(tmp, "</img_alt>");
-		break;
-	    }
-	    /* FALL THROUGH */
 	case FORM_INPUT_SUBMIT:
 	case FORM_INPUT_BUTTON:
 	    if (p2)
@@ -2839,6 +3353,53 @@
     }
 }
 
+#ifdef USE_SCRIPT
+Str
+process_script(struct parsed_tag * tag)
+{
+    char *p = "JavaScript";
+
+    parsedtag_get_value(tag, ATTR_LANGUAGE, &p);
+    cur_script_str = Strnew();
+    cur_script_lang = p;
+    return NULL;
+}
+
+Str
+process_n_script(void)
+{
+    Buffer *buf;
+    Str tmp = NULL;
+ 
+    if (cur_script_str != NULL && cur_script_str->length) {
+	char *p;
+	buf = newBuffer(INIT_BUFFER_WIDTH);
+	p = cur_script_str->ptr;
+	while (IS_SPACE(*p)) p++;
+	if (! strncmp(p, "<!--", 4))
+	    p += 4;
+	buf->script_interp = script_interp;
+	buf->script_lang = script_lang;
+	tmp = script_eval(buf, cur_script_lang, p);
+	script_interp = buf->script_interp;
+	script_lang = buf->script_lang;
+	if (buf->location) {
+	    tmp = Sprintf("script: <meta http-equiv=\"refresh\" content=\"url=%s; 0\">",
+		html_quote(buf->location));
+	}
+    }
+    cur_script_str = NULL;
+    return tmp;
+}
+
+void
+feed_script(char *str)
+{
+    if (str != NULL)
+	Strcat_charp(cur_script_str, str);
+}
+#endif
+
 Str
 process_hr(struct parsed_tag *tag, int width, int indent_width)
 {
@@ -3486,11 +4047,20 @@
 	obuf->flag &= ~RB_XMPMODE;
 	return 1;
     case HTML_SCRIPT:
+#ifdef USE_SCRIPT
+	process_script(tag);
+	obuf->flag |= RB_SCRIPT;
+#else
 	obuf->flag |= RB_IGNORE;
 	obuf->ignore_tag = Strnew_charp("</script>");
+#endif
 	return 1;
     case HTML_N_SCRIPT:
+#ifdef USE_SCRIPT
+	close_script(h_env);
+#else
 	/* should not be reached */
+#endif
 	return 1;
     case HTML_STYLE:
 	obuf->flag |= RB_IGNORE;
@@ -3528,12 +4098,24 @@
 	close_anchor(h_env, obuf);
 	return 1;
     case HTML_IMG:
-	tmp = process_img(tag);
+	tmp = process_img(tag, h_env->limit);
 	HTMLlineproc1(tmp->ptr, h_env);
 	return 1;
     case HTML_IMG_ALT:
 	if (parsedtag_get_value(tag, ATTR_SRC, &p))
 	    obuf->img_alt = Strnew_charp(p);
+#ifdef USE_IMAGE
+	i = 0;
+	if (parsedtag_get_value(tag, ATTR_TOP_MARGIN, &i)) {
+	    if (i > obuf->top_margin)
+		obuf->top_margin = i;
+	}
+	i = 0;
+	if (parsedtag_get_value(tag, ATTR_BOTTOM_MARGIN, &i)) {
+	    if (i > obuf->bottom_margin)
+		obuf->bottom_margin = i;
+	}
+#endif
 	return 0;
     case HTML_N_IMG_ALT:
 	if (obuf->img_alt) {
@@ -3765,6 +4347,14 @@
 	}
 	return 1;
     case HTML_BASE:
+#ifdef USE_IMAGE
+	p = NULL;
+	if (parsedtag_get_value(tag, ATTR_HREF, &p)) {
+	    if (!cur_baseURL)
+		cur_baseURL = New(ParsedURL);
+	    parseURL(p, cur_baseURL, NULL);
+	}
+#endif
     case HTML_MAP:
     case HTML_N_MAP:
     case HTML_AREA:
@@ -3856,7 +4446,7 @@
 {
     Anchor *a_href = NULL, *a_img = NULL, *a_form = NULL;
     char outc[LINELEN];
-    char *p, *q, *r, *str;
+    char *p, *q, *r, *s, *str;
     Lineprop outp[LINELEN], mode, effect;
     int pos;
     int nlines;
@@ -4012,9 +4602,67 @@
 		    break;
 		case HTML_IMG_ALT:
 		    if (parsedtag_get_value(tag, ATTR_SRC, &p)) {
+#ifdef USE_IMAGE
+			int w = -1, h = -1, iseq = 0, ismap = 0;
+			int xoffset = 0, yoffset = 0, top = 0, bottom = 0;
+			parsedtag_get_value(tag, ATTR_HSEQ, &iseq);
+			parsedtag_get_value(tag, ATTR_WIDTH, &w);
+			parsedtag_get_value(tag, ATTR_HEIGHT, &h);
+			parsedtag_get_value(tag, ATTR_XOFFSET, &xoffset);
+			parsedtag_get_value(tag, ATTR_YOFFSET, &yoffset);
+			parsedtag_get_value(tag, ATTR_TOP_MARGIN, &top);
+			parsedtag_get_value(tag, ATTR_BOTTOM_MARGIN, &bottom);
+			if (parsedtag_exists(tag, ATTR_ISMAP))
+			    ismap = 1;
+			q = NULL;
+			parsedtag_get_value(tag, ATTR_USEMAP, &q);
+			if (iseq > 0) {
+			    buf->imarklist = putHmarker(buf->imarklist,
+							currentLn(buf), pos,
+							iseq - 1);
+			}
+#endif
 			p = remove_space(p);
 			p = url_quote_conv(p, buf->document_code);
 			a_img = registerImg(buf, p, currentLn(buf), pos);
+#ifdef USE_IMAGE
+			a_img->hseq = iseq;
+			a_img->image = NULL;
+			if (iseq > 0) {
+			    ParsedURL u;
+			    Image *image;
+
+			    parseURL2(a_img->url, &u, cur_baseURL);
+			    a_img->image = image = New(Image);
+			    image->url = parsedURL2Str(&u)->ptr;
+			    image->ext = filename_extension(u.file, TRUE);
+			    image->cache = NULL;
+			    image->width = w;
+			    image->height = h;
+			    image->xoffset = xoffset;
+			    image->yoffset = yoffset;
+			    image->y = currentLn(buf) - top;
+			    if (image->xoffset < 0 && pos == 0)
+				image->xoffset = 0;
+			    if (image->yoffset < 0 && image->y == 1)
+				image->yoffset = 0;
+			    image->rows = 1 + top + bottom;
+			    image->map = q;
+			    image->ismap = ismap;
+			    image->touch = 0;
+			    image->cache = getImage(image, cur_baseURL,
+						    IMG_FLAG_SKIP);
+			}
+			else if (iseq < 0) {
+			    BufferPoint *po = buf->imarklist->marks - iseq - 1;
+			    Anchor *a = retrieveAnchor(buf->img,
+						       po->line, po->pos);
+			    if (a) {
+				a_img->url = a->url;
+				a_img->image = a->image;
+			    }
+			}
+#endif
 		    }
 		    effect |= PE_IMAGE;
 		    break;
@@ -4076,9 +4724,8 @@
 		    if (parsedtag_get_value(tag, ATTR_NAME, &p)) {
 			MapList *m = New(MapList);
 			m->name = Strnew_charp(p);
+			m->area = newGeneralList();
 			m->next = buf->maplist;
-			m->urls = newTextList();
-			m->alts = newTextList();
 			buf->maplist = m;
 		    }
 		    break;
@@ -4089,13 +4736,19 @@
 		    if (buf->maplist == NULL)	/* outside of <map>..</map> */
 			break;
 		    if (parsedtag_get_value(tag, ATTR_HREF, &p)) {
+			MapArea *a;
 			p = remove_space(p);
 			p = url_quote_conv(p, buf->document_code);
-			pushText(buf->maplist->urls, p);
-			if (parsedtag_get_value(tag, ATTR_ALT, &q))
-			    pushText(buf->maplist->alts, q);
-			else
-			    pushText(buf->maplist->alts, "");
+			q = "";
+			parsedtag_get_value(tag, ATTR_ALT, &q);
+			r = NULL;
+			s = NULL;
+#ifdef USE_IMAGE
+			parsedtag_get_value(tag, ATTR_SHAPE, &r);
+			parsedtag_get_value(tag, ATTR_COORDS, &s);
+#endif
+			a = newMapArea(p, q, r, s);
+			pushValue(buf->maplist->area, (void *)a);
 		    }
 		    break;
 		case HTML_FRAMESET:
@@ -4196,6 +4849,9 @@
 	fclose(debug);
     if (n_textarea)
 	addMultirowsForm(buf, buf->formitem);
+#ifdef USE_IMAGE
+    addMultirowsImg(buf, buf->img);
+#endif
 }
 
 void
@@ -4311,12 +4967,16 @@
 		(obuf->flag & RB_PREMODE) ? 'P' : ' ',
 		(obuf->table_level >= 0) ? 'T' : ' ',
 		(obuf->flag & RB_INTXTA) ? 'X' : ' ',
+#ifdef USE_SCRIPT
+		(obuf->flag & RB_SCRIPT) ? 'S' : ' ',
+#endif
 		(obuf->flag & RB_IGNORE) ? 'I' : ' ');
 	fprintf(f, "HTMLlineproc1(\"%s\",%d,%lx)\n", str, h_env->limit,
 		(unsigned long)h_env);
 	fclose(f);
     }
 
+#if 0	/* <script>, <xmp>, <listing> */
     /* comment processing */
     if (obuf->status == R_ST_CMNT || obuf->status == R_ST_NCMNT3 ||
 	obuf->status == R_ST_IRRTAG) {
@@ -4327,6 +4987,7 @@
 	if (obuf->status != R_ST_NORMAL)
 	    return;
     }
+#endif
 
     tokbuf = Strnew();
 
@@ -4340,13 +5001,31 @@
 
     while (*str != '\0') {
 	int is_tag = FALSE;
+#ifdef USE_SCRIPT
+	int pre_mode  = (obuf->table_level >= 0) ?
+	    tbl_mode->pre_mode & (TBLM_PLAIN|TBLM_SCRIPT) :
+	    obuf->flag & (RB_PLAINMODE|RB_SCRIPT);
+#else
+	int pre_mode  = (obuf->table_level >= 0) ?
+	    tbl_mode->pre_mode & TBLM_PLAIN :
+	    obuf->flag & RB_PLAINMODE;
+#endif
 
 	if (obuf->flag & RB_PLAIN)
 	    goto read_as_plain;	/* don't process tag */
 
+	if (ST_IS_COMMENT(obuf->status)) {
+	    read_token(h_env->tagbuf, &str, &obuf->status, pre_mode, 1);
+	    if (obuf->status != R_ST_NORMAL)
+		return;
+	    if (pre_mode) {
+		is_tag = TRUE;
+		q = h_env->tagbuf->ptr;
+		goto read_as_pre_mode;
+	    }
+	    continue;
+	}
 	if (*str == '<' || ST_IS_TAG(obuf->status)) {
-	    int pre_mode = (obuf->table_level >= 0) ?
-		tbl_mode->pre_mode & TBLM_PLAIN : obuf->flag & RB_PLAINMODE;
 	    /* 
 	     * Tag processing
 	     */
@@ -4358,6 +5037,8 @@
 		if (!REALLY_THE_BEGINNING_OF_A_TAG(str)) {
 		    /* this is NOT a beginning of a tag */
 		    obuf->status = R_ST_NORMAL;
+		    if (pre_mode)
+			goto read_as_pre_mode;
 		    HTMLlineproc1("&lt;", h_env);
 		    str++;
 		    continue;
@@ -4392,11 +5073,20 @@
 	    q = h_env->tagbuf->ptr;
 	}
 
-	if (obuf->flag & (RB_INTXTA | RB_INSELECT | RB_IGNORE)) {
+    read_as_pre_mode:
+	if (obuf->flag & (RB_INTXTA
+#ifdef USE_SCRIPT
+		| RB_SCRIPT
+#endif
+		| RB_INSELECT | RB_IGNORE)) {
 	    cmd = HTML_UNKNOWN;
 	    if (!is_tag) {
 		read_token(tokbuf, &str, &obuf->status,
+#ifdef USE_SCRIPT
+			   (obuf->flag & (RB_INTXTA | RB_SCRIPT)) ? 1 : 0, 0);
+#else
 			   (obuf->flag & RB_INTXTA) ? 1 : 0, 0);
+#endif
 		if (obuf->status != R_ST_NORMAL)
 		    continue;
 		q = tokbuf->ptr;
@@ -4410,8 +5100,18 @@
 	    if (obuf->flag & RB_INTXTA) {
 		if (cmd == HTML_N_TEXTAREA)
 		    goto proc_normal;
+		if (is_tag)
+		    continue;
 		feed_textarea(q);
 	    }
+#ifdef USE_SCRIPT
+	    /* script */
+	    else if (obuf->flag & RB_SCRIPT) {
+		if (cmd == HTML_N_SCRIPT)
+		    goto proc_normal;
+		feed_script(q);
+	    }
+#endif
 	    else if (obuf->flag & RB_INSELECT) {
 		if (cmd == HTML_N_SELECT || cmd == HTML_N_FORM)
 		    goto proc_normal;
@@ -4643,7 +5343,11 @@
 	}
     }
     if (!(obuf->flag & (RB_PREMODE | RB_NOBR | RB_INTXTA | RB_INSELECT
-			| RB_PLAINMODE | RB_IGNORE))) {
+#ifdef USE_SCRIPT
+			| RB_SCRIPT
+#endif
+			| RB_PLAINMODE | RB_IGNORE
+			))) {
 	char *tp;
 	int i = 0;
 
@@ -4680,6 +5384,19 @@
 	HTMLlineproc1(tmp->ptr, h_env);
 }
 
+#ifdef USE_SCRIPT
+static void
+close_script(struct html_feed_environ *h_env)
+{
+    Str tmp;
+
+    h_env->obuf->flag &= ~RB_SCRIPT;
+    tmp = process_n_script();
+    if (tmp != NULL)
+	HTMLlineproc1(tmp->ptr, h_env);
+}
+#endif
+
 extern char *NullLine;
 extern Lineprop NullProp[];
 
@@ -4994,6 +5711,22 @@
     forms_size = 0;
     forms = NULL;
     cur_hseq = 1;
+#ifdef USE_IMAGE
+    cur_iseq = 1;
+    if (newBuf->image_flag)
+	image_flag = newBuf->image_flag;
+    else if (activeImage && displayImage && autoImage)
+	image_flag = IMG_FLAG_AUTO;
+    else
+	image_flag = IMG_FLAG_SKIP;
+    if (newBuf->currentURL.file)
+	cur_baseURL = baseURL(newBuf);
+#endif
+#ifdef USE_SCRIPT
+     cur_script_str = NULL;
+     script_interp = NULL;
+     script_lang = NULL;
+#endif
 
     if (w3m_halfload) {
 	newBuf->buffername = "---";
@@ -5002,10 +5735,9 @@
 #endif				/* JP_CHARSET */
 	HTMLlineproc3(newBuf, f->stream);
 	w3m_halfload = FALSE;
-	if (fmInitialized) {
+	if (fmInitialized)
 	    term_raw();
-	    signal(SIGINT, prevtrap);
-	}
+	signal(SIGINT, prevtrap);
 	return;
     }
 
@@ -5020,10 +5752,9 @@
 	HTMLlineproc1("<br>Transfer Interrupted!<br>", &htmlenv1);
 	goto phase2;
     }
-    if (fmInitialized) {
-	prevtrap = signal(SIGINT, KeyAbort);
+    prevtrap = signal(SIGINT, KeyAbort);
+    if (fmInitialized)
 	term_cbreak();
-    }
 
 #ifdef JP_CHARSET
     if (newBuf != NULL && newBuf->document_code != '\0')
@@ -5044,16 +5775,32 @@
 	if (src)
 	    Strfputs(lineBuf2, src);
 	linelen += lineBuf2->length;
+	if (w3m_dump & DUMP_SOURCE)
+	    continue;
 	showProgress(&linelen, &trbyte);
+	/*
+	 * if (frame_source)
+	 * continue;
+	 */
 #ifdef JP_CHARSET
 	if (meta_charset != '\0') {	/* <META> */
-	    if (content_charset == '\0' && UseContentCharset)
+	    if (content_charset == '\0' && UseContentCharset) {
 		code = meta_charset;
+#ifdef USE_IMAGE
+		cur_document_code = code;
+#endif
+	    }
 	    meta_charset = '\0';
 	}
 #endif
-	if (!internal)
+	if (!internal) {
 	    lineBuf2 = convertLine(f, lineBuf2, &code, HTML_MODE);
+#ifdef JP_CHARSET
+#ifdef USE_IMAGE
+	    cur_document_code = code;
+#endif
+#endif
+	}
 #ifdef USE_NNTP
 	if (f->scheme == SCM_NEWS) {
 	    if (Str_news_endline(lineBuf2)) {
@@ -5072,22 +5819,28 @@
     if (htmlenv1.title)
 	newBuf->buffername = htmlenv1.title;
     if (w3m_halfdump) {
-	if (fmInitialized) {
+	if (fmInitialized)
 	    term_raw();
-	    signal(SIGINT, prevtrap);
-	}
+	signal(SIGINT, prevtrap);
 	return;
     }
   phase2:
     newBuf->trbyte = trbyte + linelen;
-    if (fmInitialized) {
+    if (fmInitialized)
 	term_raw();
-	signal(SIGINT, prevtrap);
-    }
+    signal(SIGINT, prevtrap);
 #ifdef JP_CHARSET
     newBuf->document_code = code;
     content_charset = '\0';
 #endif				/* JP_CHARSET */
+#ifdef USE_IMAGE
+    newBuf->image_flag = image_flag;
+#endif
+#ifdef USE_SCRIPT
+     newBuf->script_interp = script_interp;
+     newBuf->script_lang = script_lang;
+#endif
+
     if (w3m_backend)
 	backend_halfdump_buf = htmlenv1.buf;
     HTMLlineproc2(newBuf, htmlenv1.buf);
@@ -5107,15 +5860,18 @@
 
     newBuf = newBuffer(INIT_BUFFER_WIDTH);
     if (SETJMP(AbortLoading) != 0) {
+	if (fmInitialized)
+	    term_raw();
+	signal(SIGINT, prevtrap);
 	discardBuffer(newBuf);
 	return NULL;
     }
+    prevtrap = signal(SIGINT, KeyAbort);
+    if (fmInitialized)
+	term_cbreak();
+
     init_stream(&f, SCM_LOCAL, newStrStream(page));
 
-    if (fmInitialized) {
-	prevtrap = signal(SIGINT, KeyAbort);
-	term_cbreak();
-    }
     if (w3m_dump & DUMP_FRAME) {
 	tmp = tmpfname(TMPF_SRC, ".html");
 	pushText(fileToDelete, tmp->ptr);
@@ -5126,10 +5882,9 @@
 
     loadHTMLstream(&f, newBuf, src, TRUE);
 
-    if (fmInitialized) {
+    if (fmInitialized)
 	term_raw();
-	signal(SIGINT, prevtrap);
-    }
+    signal(SIGINT, prevtrap);
     newBuf->topLine = newBuf->firstLine;
     newBuf->lastLine = newBuf->currentLine;
     newBuf->currentLine = newBuf->firstLine;
@@ -5173,6 +5928,9 @@
 	code = content_charset;
     else
 	code = DocumentCode;
+#ifdef USE_IMAGE
+    cur_document_code = code;
+#endif
     content_charset = '\0';
 #endif
     while (1) {
@@ -5276,10 +6034,9 @@
     if (SETJMP(AbortLoading) != 0) {
 	goto _end;
     }
-    if (fmInitialized) {
-	prevtrap = signal(SIGINT, KeyAbort);
+    prevtrap = signal(SIGINT, KeyAbort);
+    if (fmInitialized)
 	term_cbreak();
-    }
 
     if (newBuf->sourcefile == NULL &&
 	(uf->scheme != SCM_LOCAL || newBuf->mailcap)) {
@@ -5305,7 +6062,11 @@
 	if (src)
 	    Strfputs(lineBuf2, src);
 	linelen += lineBuf2->length;
+	if (w3m_dump & DUMP_SOURCE)
+	    continue;
 	showProgress(&linelen, &trbyte);
+	if (frame_source)
+	    continue;
 	lineBuf2 = convertLine(uf, lineBuf2, &code, PAGER_MODE);
 	if (squeezeBlankLine) {
 	    if (lineBuf2->ptr[0] == '\n' && pre_lbuf == '\n') {
@@ -5336,10 +6097,9 @@
 		   lineBuf2->length, nlines);
     }
   _end:
-    if (fmInitialized) {
-	signal(SIGINT, prevtrap);
+    if (fmInitialized)
 	term_raw();
-    }
+    signal(SIGINT, prevtrap);
     newBuf->topLine = newBuf->firstLine;
     newBuf->lastLine = newBuf->currentLine;
     newBuf->currentLine = newBuf->firstLine;
@@ -5353,6 +6113,67 @@
     return newBuf;
 }
 
+#ifdef USE_IMAGE
+Buffer *
+loadImageBuffer(URLFile *uf, Buffer *newBuf)
+{
+    Image *image;
+    ImageCache *cache;
+    Str tmp, tmpf;
+    FILE *src = NULL;
+    URLFile f;
+    MySignalHandler(*prevtrap) ();
+
+    loadImage(IMG_FLAG_STOP);
+    image = New(Image);
+    image->url = parsedURL2Str(cur_baseURL)->ptr;
+    image->ext = filename_extension(cur_baseURL->file, 1);
+    image->width = -1;
+    image->height = -1;
+    cache = getImage(image, cur_baseURL, IMG_FLAG_AUTO);
+    if (!cur_baseURL->is_nocache && cache->loaded == IMG_FLAG_LOADED)
+	goto image_buffer;
+
+    prevtrap = signal(SIGINT, KeyAbort);
+    if (fmInitialized)
+	term_cbreak();
+    if (IStype(uf->stream) != IST_ENCODED)
+	uf->stream = newEncodedStream(uf->stream, uf->encoding);
+    if (save2tmp(*uf, cache->file) < 0) {
+	if (fmInitialized)
+	    term_raw();
+	signal(SIGINT, prevtrap);
+	return NULL;
+    }
+    if (fmInitialized)
+	term_raw();
+    signal(SIGINT, prevtrap);
+
+    cache->loaded = IMG_FLAG_LOADED;
+    getImageSize(cache);
+
+  image_buffer:
+    tmp = Sprintf("<img src=\"%s\"><br><br>", html_quote(image->url));
+    if (newBuf == NULL)
+	newBuf = newBuffer(INIT_BUFFER_WIDTH);
+    if (frame_source) {
+	tmpf = tmpfname(TMPF_SRC, ".html");
+	src = fopen(tmpf->ptr, "w");
+	newBuf->sourcefile = tmpf->ptr;
+	pushText(fileToDelete, tmpf->ptr);
+    }
+    init_stream(&f, SCM_LOCAL, newStrStream(tmp));
+    loadHTMLstream(&f, newBuf, src, TRUE);
+    if (src)
+	fclose(src);
+
+    newBuf->topLine = newBuf->firstLine;
+    newBuf->lastLine = newBuf->currentLine;
+    newBuf->currentLine = newBuf->firstLine;
+    return newBuf;
+}
+#endif
+
 /* 
  * saveBuffer: write buffer to file
  */
@@ -5723,10 +6544,9 @@
     if (SETJMP(AbortLoading) != 0) {
 	goto _end;
     }
-    if (fmInitialized) {
-	prevtrap = signal(SIGINT, KeyAbort);
+    prevtrap = signal(SIGINT, KeyAbort);
+    if (fmInitialized)
 	term_cbreak();
-    }
     check = 0;
     current_content_length = 0;
 #ifdef USE_NNTP
@@ -5762,10 +6582,9 @@
     }
   _end:
     bcopy(env_bak, AbortLoading, sizeof(JMP_BUF));
-    if (fmInitialized) {
+    if (fmInitialized)
 	term_raw();
-	signal(SIGINT, prevtrap);
-    }
+    signal(SIGINT, prevtrap);
     fclose(ff);
     if (uf.scheme == SCM_FTP)
 	FTPhalfclose(uf.stream);
Binary files w3m-0.2.4/file.o and w3m-0.2.4-img-js/file.o differ
diff -u w3m-0.2.4/fm.h w3m-0.2.4-img-js/fm.h
--- w3m-0.2.4/fm.h	Thu Jan 17 17:26:10 2002
+++ w3m-0.2.4-img-js/fm.h	Thu Jan 17 17:08:28 2002
@@ -32,6 +32,12 @@
 #undef USE_ANSI_COLOR
 #endif
 
+#ifdef USE_JAVASCRIPT
+#ifndef USE_SCRIPT
+#define USE_SCRIPT
+#endif
+#endif
+
 #include "ctrlcode.h"
 #include "html.h"
 #include "gc.h"
@@ -73,7 +79,14 @@
 #define PAGER_MAX_LINE	10000	/* Maximum line kept as pager */
 #define FNLEN 80
 
+#ifdef USE_IMAGE
+#define MAX_IMAGE 1000
+
+#define DEFAULT_PIXEL_PER_CHAR  7.0	/* arbitrary */
+#define DEFAULT_PIXEL_PER_LINE  14.0	/* arbitrary */
+#else
 #define DEFAULT_PIXEL_PER_CHAR  8.0	/* arbitrary */
+#endif
 #define MINIMUM_PIXEL_PER_CHAR  4.0
 #define MAXIMUM_PIXEL_PER_CHAR  32.0
 
@@ -163,6 +176,7 @@
 #define B_FORCE_REDRAW	1
 #define B_REDRAW	2
 #define B_SCROLL        3
+#define B_REDRAW_IMAGE	4
 
 /* Buffer Property */
 #define BP_NORMAL	0x0
@@ -225,6 +239,17 @@
 #define IN_URL		0x100
 #define IN_CHAR		0x200
 
+#define IMG_FLAG_SKIP	1
+#define IMG_FLAG_AUTO	2
+
+#define IMG_FLAG_START	0
+#define IMG_FLAG_STOP	1
+#define IMG_FLAG_NEXT	2
+
+#define IMG_FLAG_UNLOADED	0
+#define IMG_FLAG_LOADED		1
+#define IMG_FLAG_ERROR		2
+
 /* 
  * Macros.
  */
@@ -269,10 +294,21 @@
 typedef unsigned char Linecolor;
 #endif
 
+typedef struct _MapArea {
+    char *url;
+    char *alt;
+#ifdef MENU_MAP
+#ifdef USE_IMAGE
+    char shape;
+    short *coords;
+    int ncoords;
+#endif
+#endif
+} MapArea;
+
 typedef struct _MapList {
     Str name;
-    TextList *urls;
-    TextList *alts;
+    GeneralList *area;
     struct _MapList *next;
 } MapList;
 
@@ -296,6 +332,33 @@
     short pos;
 } BufferPoint;
 
+#ifdef USE_IMAGE
+typedef struct _imageCache {
+    char *url;
+    ParsedURL *current;
+    char *file;
+    char loaded;
+    int index;
+    short width;
+    short height;
+} ImageCache;
+
+typedef struct _image {
+    char *url;
+    char *ext;
+    short width;
+    short height;
+    short xoffset;
+    short yoffset;
+    short y;
+    short rows;
+    char *map;
+    char ismap;
+    int touch;
+    ImageCache *cache;
+} Image;
+#endif
+
 typedef struct _anchor {
     char *url;
     char *target;
@@ -305,6 +368,9 @@
     int hseq;
     short y;
     short rows;
+#ifdef USE_IMAGE
+    Image *image;
+#endif
 } Anchor;
 
 #define NO_REFERER ((char*)-1)
@@ -353,6 +419,7 @@
     FormList *formlist;
     MapList *maplist;
     HmarkerList *hmarklist;
+    HmarkerList *imarklist;
     ParsedURL currentURL;
     ParsedURL *baseURL;
     char *baseTarget;
@@ -377,6 +444,14 @@
 #ifdef USE_SSL
     char *ssl_certificate;
 #endif
+#ifdef USE_SCRIPT
+     void *script_interp;
+     char *script_lang;
+     char *location;
+#endif
+
+    char image_flag;
+    char need_reshape;
 } Buffer;
 
 
@@ -466,7 +541,7 @@
 #define RB_P		0x80
 #define RB_PRE_INT	0x100
 #define RB_PREMODE	(RB_PRE | RB_PRE_INT)
-#define RB_SPECIAL	(RB_PRE|RB_XMPMODE|RB_LSTMODE|RB_PLAIN|RB_NOBR|RB_PRE_INT)
+#define RB_SPECIAL	(RB_PRE|RB_XMPMODE|RB_LSTMODE|RB_PLAIN|RB_NOBR|RB_PRE_INT|RB_SCRIPT)
 #define RB_PLAINMODE	(RB_XMPMODE|RB_LSTMODE|RB_PLAIN)
 
 #define RB_IN_DT	0x200
@@ -478,6 +553,7 @@
 #define RB_TITLE	0x8000
 #define RB_NFLUSHED	0x10000
 #define RB_NOFRAMES	0x20000
+#define RB_SCRIPT	0x40000
 
 #ifdef FORMAT_NICE
 #define RB_FILL		0x200000
@@ -521,6 +597,7 @@
 /* flags for loadGeneralFile */
 #define RG_NOCACHE   1
 #define RG_FRAME     2
+#define RG_FRAME_SRC 4
 
 struct html_feed_environ {
     struct readbuffer *obuf;
@@ -593,6 +670,9 @@
 #define ALIGN_CENTER 0
 #define ALIGN_LEFT   1
 #define ALIGN_RIGHT  2
+#define ALIGN_MIDDLE 4
+#define ALIGN_TOP    5
+#define ALIGN_BOTTOM 6
 
 #define VALIGN_MIDDLE 0
 #define VALIGN_TOP    1
@@ -653,6 +733,7 @@
 global char MetaRefresh init(FALSE);
 
 global char fmInitialized init(FALSE);
+global char QuietMessage init(FALSE);
 
 extern char GlobalKeymap[];
 extern char EscKeymap[];
@@ -748,6 +829,14 @@
 global int retryAsHttp init(TRUE);
 global int showLineNum init(FALSE);
 global int show_srch_str init(TRUE);
+#ifdef USE_IMAGE
+global char *Imgdisplay init(IMGDISPLAY);
+global char *Imgsize init(IMGSIZE);
+global int activeImage init(FALSE);
+global int displayImage init(TRUE);
+global int autoImage init(TRUE);
+global int useExtImageViewer init(TRUE);
+#endif
 global char *Editor init(DEF_EDITOR);
 global char *Mailer init(DEF_MAILER);
 global char *ExtBrowser init(DEF_EXT_BROWSER);
@@ -841,7 +930,11 @@
 global TextList *Cookie_accept_domains;
 #endif				/* USE_COOKIE */
 
+#ifdef USE_IMAGE
+global int view_unseenobject init(FALSE);
+#else
 global int view_unseenobject init(TRUE);
+#endif
 
 #if defined(USE_SSL) && defined(USE_SSL_VERIFY)
 global int ssl_verify_server init(FALSE);
@@ -859,6 +952,10 @@
 global int is_redisplay init(FALSE);
 global int clear_buffer init(TRUE);
 global double pixel_per_char init(DEFAULT_PIXEL_PER_CHAR);
+#ifdef USE_IMAGE
+global double pixel_per_line init(DEFAULT_PIXEL_PER_LINE);
+global double image_scale init(100);
+#endif
 global int use_lessopen init(FALSE);
 
 #ifdef JP_CHARSET
Binary files w3m-0.2.4/form.o and w3m-0.2.4-img-js/form.o differ
diff -u w3m-0.2.4/frame.c w3m-0.2.4-img-js/frame.c
--- w3m-0.2.4/frame.c	Thu Nov 29 09:34:14 2001
+++ w3m-0.2.4-img-js/frame.c	Thu Jan 17 16:09:21 2002
@@ -385,7 +385,7 @@
 	w3m_dump |= DUMP_FRAME;
 	buf = loadGeneralFile(b->url,
 			      baseURL ? baseURL : currentURL,
-			      b->referer, flag, b->request);
+			      b->referer, flag | RG_FRAME_SRC, b->request);
 	w3m_dump &= ~DUMP_FRAME;
 	is_redisplay = FALSE;
 	break;
@@ -399,7 +399,12 @@
     b->url = parsedURL2Str(&buf->currentURL)->ptr;
     b->source = buf->sourcefile;
     b->type = buf->type;
-    if (buf->real_scheme != SCM_LOCAL) {
+    if ((buf->real_scheme != SCM_LOCAL)
+#ifdef USE_IMAGE
+	|| (activeImage && !useExtImageViewer &&
+	    buf->real_type && !strncasecmp(buf->real_type, "image/", 6))
+#endif
+	) {
 	tmp = tmpfname(TMPF_FRAME, NULL);
 	rename(buf->sourcefile, tmp->ptr);
 	b->source = tmp->ptr;
Binary files w3m-0.2.4/frame.o and w3m-0.2.4-img-js/frame.o differ
Binary files w3m-0.2.4/func.o and w3m-0.2.4-img-js/func.o differ
diff -u w3m-0.2.4/funcname.c w3m-0.2.4-img-js/funcname.c
--- w3m-0.2.4/funcname.c	Thu Jan 17 17:24:08 2002
+++ w3m-0.2.4-img-js/funcname.c	Thu Jan 17 17:16:18 2002
@@ -11,107 +11,109 @@
 /*9*/ {"DELETE_PREVBUF",deletePrevBuf},
 /*10*/ {"DICT_WORD_AT",dictwordat},
 /*11*/ {"DICT_WORD",dictword},
-/*12*/ {"DOWN",ldown1},
-/*13*/ {"DOWNLOAD",svSrc},
-/*14*/ {"EDIT",editBf},
-/*15*/ {"EDIT_SCREEN",editScr},
-/*16*/ {"END",goLineL},
-/*17*/ {"ESCBMAP",escbmap},
-/*18*/ {"ESCMAP",escmap},
-/*19*/ {"EXEC_SHELL",execsh},
-/*20*/ {"EXIT",quitfm},
-/*21*/ {"EXTERN",extbrz},
-/*22*/ {"EXTERN_LINK",linkbrz},
-/*23*/ {"FRAME",rFrame},
-/*24*/ {"GOTO",goURL},
-/*25*/ {"GOTO_LINE",goLine},
-/*26*/ {"GOTO_LINK",followA},
-/*27*/ {"HELP",ldhelp},
-/*28*/ {"HISTORY",ldHist},
-/*29*/ {"INFO",pginfo},
-/*30*/ {"INIT_MAILCAP",initMailcap},
-/*31*/ {"INTERRUPT",susp},
-/*32*/ {"ISEARCH_BACK",isrchbak},
-/*33*/ {"ISEARCH",isrchfor},
-/*34*/ {"LEFT",col1L},
-/*35*/ {"LINE_BEGIN",linbeg},
-/*36*/ {"LINE_END",linend},
-/*37*/ {"LINE_INFO",curlno},
-/*38*/ {"LINK_BEGIN",topA},
-/*39*/ {"LINK_END",lastA},
-/*40*/ {"LOAD",ldfile},
-/*41*/ {"MAIN_MENU",mainMn},
-/*42*/ {"MARK",_mark},
-/*43*/ {"MARK_MID",chkNMID},
-/*44*/ {"MARK_URL",chkURL},
-/*45*/ {"MENU",mainMn},
-/*46*/ {"MOUSE",mouse},
-/*47*/ {"MOUSE_TOGGLE",msToggle},
-/*48*/ {"MOVE_DOWN1",movD1},
-/*49*/ {"MOVE_DOWN",movD},
-/*50*/ {"MOVE_LEFT1",movL1},
-/*51*/ {"MOVE_LEFT",movL},
-/*52*/ {"MOVE_RIGHT1",movR1},
-/*53*/ {"MOVE_RIGHT",movR},
-/*54*/ {"MOVE_UP1",movU1},
-/*55*/ {"MOVE_UP",movU},
-/*56*/ {"MSGS",msgs},
-/*57*/ {"NEXT_DOWN",nextD},
-/*58*/ {"NEXT_LEFT",nextL},
-/*59*/ {"NEXT_LEFT_UP",nextLU},
-/*60*/ {"NEXT_LINK",nextA},
-/*61*/ {"NEXT_MARK",nextMk},
-/*62*/ {"NEXT_PAGE",pgFore},
-/*63*/ {"NEXT_RIGHT_DOWN",nextRD},
-/*64*/ {"NEXT_RIGHT",nextR},
-/*65*/ {"NEXT_UP",nextU},
-/*66*/ {"NEXT_WORD",movRW},
-/*67*/ {"NOTHING",nulcmd},
-/*68*/ {"@@@",nulcmd},
-/*69*/ {"NULL",nulcmd},
-/*70*/ {"OPTIONS",ldOpt},
-/*71*/ {"PCMAP",pcmap},
-/*72*/ {"PEEK",curURL},
-/*73*/ {"PEEK_IMG",peekIMG},
-/*74*/ {"PEEK_LINK",peekURL},
-/*75*/ {"PIPE_BUF",pipeBuf},
-/*76*/ {"PIPE_SHELL",pipesh},
-/*77*/ {"PREV_LINK",prevA},
-/*78*/ {"PREV_MARK",prevMk},
-/*79*/ {"PREV_PAGE",pgBack},
-/*80*/ {"PREV_WORD",movLW},
-/*81*/ {"PRINT",svBuf},
-/*82*/ {"QUIT",qquitfm},
-/*83*/ {"READ_SHELL",readsh},
-/*84*/ {"REDRAW",rdrwSc},
-/*85*/ {"REG_MARK",reMark},
-/*86*/ {"RELOAD",reload},
-/*87*/ {"RIGHT",col1R},
-/*88*/ {"SAVE_IMAGE",svI},
-/*89*/ {"SAVE_LINK",svA},
-/*90*/ {"SAVE_SCREEN",svBuf},
-/*91*/ {"SAVE",svSrc},
-/*92*/ {"SEARCH_BACK",srchbak},
-/*93*/ {"SEARCH_FORE",srchfor},
-/*94*/ {"SEARCH_NEXT",srchnxt},
-/*95*/ {"SEARCH_PREV",srchprv},
-/*96*/ {"SEARCH",srchfor},
-/*97*/ {"SELECT_MENU",selMn},
-/*98*/ {"SELECT",selBuf},
-/*99*/ {"SETENV",setEnv},
-/*100*/ {"SET_OPTION",setOpt},
-/*101*/ {"SHELL",execsh},
-/*102*/ {"SHIFT_LEFT",shiftl},
-/*103*/ {"SHIFT_RIGHT",shiftr},
-/*104*/ {"SOURCE",vwSrc},
-/*105*/ {"SUBMIT",submitForm},
-/*106*/ {"SUSPEND",susp},
-/*107*/ {"UP",lup1},
-/*108*/ {"VERSION",dispVer},
-/*109*/ {"VIEW_BOOKMARK",ldBmark},
-/*110*/ {"VIEW_IMAGE",followI},
-/*111*/ {"VIEW",vwSrc},
-/*112*/ {"WHEREIS",srchfor},
-/*113*/ {"WRAP_TOGGLE",wrapToggle},
+/*12*/ {"DISPLAY_IMAGE",dispI},
+/*13*/ {"DOWN",ldown1},
+/*14*/ {"DOWNLOAD",svSrc},
+/*15*/ {"EDIT",editBf},
+/*16*/ {"EDIT_SCREEN",editScr},
+/*17*/ {"END",goLineL},
+/*18*/ {"ESCBMAP",escbmap},
+/*19*/ {"ESCMAP",escmap},
+/*20*/ {"EXEC_SHELL",execsh},
+/*21*/ {"EXIT",quitfm},
+/*22*/ {"EXTERN",extbrz},
+/*23*/ {"EXTERN_LINK",linkbrz},
+/*24*/ {"FRAME",rFrame},
+/*25*/ {"GOTO",goURL},
+/*26*/ {"GOTO_LINE",goLine},
+/*27*/ {"GOTO_LINK",followA},
+/*28*/ {"HELP",ldhelp},
+/*29*/ {"HISTORY",ldHist},
+/*30*/ {"INFO",pginfo},
+/*31*/ {"INIT_MAILCAP",initMailcap},
+/*32*/ {"INTERRUPT",susp},
+/*33*/ {"ISEARCH_BACK",isrchbak},
+/*34*/ {"ISEARCH",isrchfor},
+/*35*/ {"LEFT",col1L},
+/*36*/ {"LINE_BEGIN",linbeg},
+/*37*/ {"LINE_END",linend},
+/*38*/ {"LINE_INFO",curlno},
+/*39*/ {"LINK_BEGIN",topA},
+/*40*/ {"LINK_END",lastA},
+/*41*/ {"LOAD",ldfile},
+/*42*/ {"MAIN_MENU",mainMn},
+/*43*/ {"MARK",_mark},
+/*44*/ {"MARK_MID",chkNMID},
+/*45*/ {"MARK_URL",chkURL},
+/*46*/ {"MENU",mainMn},
+/*47*/ {"MOUSE",mouse},
+/*48*/ {"MOUSE_TOGGLE",msToggle},
+/*49*/ {"MOVE_DOWN1",movD1},
+/*50*/ {"MOVE_DOWN",movD},
+/*51*/ {"MOVE_LEFT1",movL1},
+/*52*/ {"MOVE_LEFT",movL},
+/*53*/ {"MOVE_RIGHT1",movR1},
+/*54*/ {"MOVE_RIGHT",movR},
+/*55*/ {"MOVE_UP1",movU1},
+/*56*/ {"MOVE_UP",movU},
+/*57*/ {"MSGS",msgs},
+/*58*/ {"NEXT_DOWN",nextD},
+/*59*/ {"NEXT_LEFT",nextL},
+/*60*/ {"NEXT_LEFT_UP",nextLU},
+/*61*/ {"NEXT_LINK",nextA},
+/*62*/ {"NEXT_MARK",nextMk},
+/*63*/ {"NEXT_PAGE",pgFore},
+/*64*/ {"NEXT_RIGHT_DOWN",nextRD},
+/*65*/ {"NEXT_RIGHT",nextR},
+/*66*/ {"NEXT_UP",nextU},
+/*67*/ {"NEXT_WORD",movRW},
+/*68*/ {"NOTHING",nulcmd},
+/*69*/ {"@@@",nulcmd},
+/*70*/ {"NULL",nulcmd},
+/*71*/ {"OPTIONS",ldOpt},
+/*72*/ {"PCMAP",pcmap},
+/*73*/ {"PEEK",curURL},
+/*74*/ {"PEEK_IMG",peekIMG},
+/*75*/ {"PEEK_LINK",peekURL},
+/*76*/ {"PIPE_BUF",pipeBuf},
+/*77*/ {"PIPE_SHELL",pipesh},
+/*78*/ {"PREV_LINK",prevA},
+/*79*/ {"PREV_MARK",prevMk},
+/*80*/ {"PREV_PAGE",pgBack},
+/*81*/ {"PREV_WORD",movLW},
+/*82*/ {"PRINT",svBuf},
+/*83*/ {"QUIT",qquitfm},
+/*84*/ {"READ_SHELL",readsh},
+/*85*/ {"REDRAW",rdrwSc},
+/*86*/ {"REG_MARK",reMark},
+/*87*/ {"RELOAD",reload},
+/*88*/ {"RIGHT",col1R},
+/*89*/ {"SAVE_IMAGE",svI},
+/*90*/ {"SAVE_LINK",svA},
+/*91*/ {"SAVE_SCREEN",svBuf},
+/*92*/ {"SAVE",svSrc},
+/*93*/ {"SEARCH_BACK",srchbak},
+/*94*/ {"SEARCH_FORE",srchfor},
+/*95*/ {"SEARCH_NEXT",srchnxt},
+/*96*/ {"SEARCH_PREV",srchprv},
+/*97*/ {"SEARCH",srchfor},
+/*98*/ {"SELECT_MENU",selMn},
+/*99*/ {"SELECT",selBuf},
+/*100*/ {"SETENV",setEnv},
+/*101*/ {"SET_OPTION",setOpt},
+/*102*/ {"SHELL",execsh},
+/*103*/ {"SHIFT_LEFT",shiftl},
+/*104*/ {"SHIFT_RIGHT",shiftr},
+/*105*/ {"SOURCE",vwSrc},
+/*106*/ {"STOP_IMAGE",stopI},
+/*107*/ {"SUBMIT",submitForm},
+/*108*/ {"SUSPEND",susp},
+/*109*/ {"UP",lup1},
+/*110*/ {"VERSION",dispVer},
+/*111*/ {"VIEW_BOOKMARK",ldBmark},
+/*112*/ {"VIEW_IMAGE",followI},
+/*113*/ {"VIEW",vwSrc},
+/*114*/ {"WHEREIS",srchfor},
+/*115*/ {"WRAP_TOGGLE",wrapToggle},
 { NULL, NULL }
 };
diff -u w3m-0.2.4/funcname.tab w3m-0.2.4-img-js/funcname.tab
--- w3m-0.2.4/funcname.tab	Tue Dec 25 13:43:51 2001
+++ w3m-0.2.4-img-js/funcname.tab	Thu Jan 17 16:09:21 2002
@@ -14,6 +14,7 @@
 DELETE_PREVBUF	deletePrevBuf
 DICT_WORD	dictword
 DICT_WORD_AT	dictwordat
+DISPLAY_IMAGE	dispI
 DOWN		ldown1
 DOWNLOAD	svSrc
 EDIT		editBf
@@ -106,6 +107,7 @@
 SHIFT_LEFT	shiftl
 SHIFT_RIGHT	shiftr
 SOURCE		vwSrc
+STOP_IMAGE	stopI
 SUBMIT        submitForm
 SUSPEND		susp
 UP		lup1
diff -u w3m-0.2.4/funcname1.h w3m-0.2.4-img-js/funcname1.h
--- w3m-0.2.4/funcname1.h	Thu Jan 17 17:23:53 2002
+++ w3m-0.2.4-img-js/funcname1.h	Thu Jan 17 17:16:03 2002
@@ -10,93 +10,95 @@
 #define FUNCNAME_deletePrevBuf 9
 #define FUNCNAME_dictwordat 10
 #define FUNCNAME_dictword 11
-#define FUNCNAME_ldown1 12
-#define FUNCNAME_svSrc 13
-#define FUNCNAME_editBf 14
-#define FUNCNAME_editScr 15
-#define FUNCNAME_goLineL 16
-#define FUNCNAME_escbmap 17
-#define FUNCNAME_escmap 18
-#define FUNCNAME_execsh 19
-#define FUNCNAME_extbrz 21
-#define FUNCNAME_linkbrz 22
-#define FUNCNAME_rFrame 23
-#define FUNCNAME_goURL 24
-#define FUNCNAME_goLine 25
-#define FUNCNAME_followA 26
-#define FUNCNAME_ldhelp 27
-#define FUNCNAME_ldHist 28
-#define FUNCNAME_pginfo 29
-#define FUNCNAME_initMailcap 30
-#define FUNCNAME_susp 31
-#define FUNCNAME_isrchbak 32
-#define FUNCNAME_isrchfor 33
-#define FUNCNAME_col1L 34
-#define FUNCNAME_linbeg 35
-#define FUNCNAME_linend 36
-#define FUNCNAME_curlno 37
-#define FUNCNAME_topA 38
-#define FUNCNAME_lastA 39
-#define FUNCNAME_ldfile 40
-#define FUNCNAME_mainMn 41
-#define FUNCNAME__mark 42
-#define FUNCNAME_chkNMID 43
-#define FUNCNAME_chkURL 44
-#define FUNCNAME_mouse 46
-#define FUNCNAME_msToggle 47
-#define FUNCNAME_movD1 48
-#define FUNCNAME_movD 49
-#define FUNCNAME_movL1 50
-#define FUNCNAME_movL 51
-#define FUNCNAME_movR1 52
-#define FUNCNAME_movR 53
-#define FUNCNAME_movU1 54
-#define FUNCNAME_movU 55
-#define FUNCNAME_msgs 56
-#define FUNCNAME_nextD 57
-#define FUNCNAME_nextL 58
-#define FUNCNAME_nextLU 59
-#define FUNCNAME_nextA 60
-#define FUNCNAME_nextMk 61
-#define FUNCNAME_pgFore 62
-#define FUNCNAME_nextRD 63
-#define FUNCNAME_nextR 64
-#define FUNCNAME_nextU 65
-#define FUNCNAME_movRW 66
-#define FUNCNAME_nulcmd 67
-#define FUNCNAME_ldOpt 70
-#define FUNCNAME_pcmap 71
-#define FUNCNAME_curURL 72
-#define FUNCNAME_peekIMG 73
-#define FUNCNAME_peekURL 74
-#define FUNCNAME_pipeBuf 75
-#define FUNCNAME_pipesh 76
-#define FUNCNAME_prevA 77
-#define FUNCNAME_prevMk 78
-#define FUNCNAME_pgBack 79
-#define FUNCNAME_movLW 80
-#define FUNCNAME_svBuf 81
-#define FUNCNAME_qquitfm 82
-#define FUNCNAME_readsh 83
-#define FUNCNAME_rdrwSc 84
-#define FUNCNAME_reMark 85
-#define FUNCNAME_reload 86
-#define FUNCNAME_col1R 87
-#define FUNCNAME_svI 88
-#define FUNCNAME_svA 89
-#define FUNCNAME_srchbak 92
-#define FUNCNAME_srchfor 93
-#define FUNCNAME_srchnxt 94
-#define FUNCNAME_srchprv 95
-#define FUNCNAME_selMn 97
-#define FUNCNAME_selBuf 98
-#define FUNCNAME_setEnv 99
-#define FUNCNAME_setOpt 100
-#define FUNCNAME_shiftl 102
-#define FUNCNAME_shiftr 103
-#define FUNCNAME_vwSrc 104
-#define FUNCNAME_submitForm 105
-#define FUNCNAME_lup1 107
-#define FUNCNAME_dispVer 108
-#define FUNCNAME_followI 110
-#define FUNCNAME_wrapToggle 113
+#define FUNCNAME_dispI 12
+#define FUNCNAME_ldown1 13
+#define FUNCNAME_svSrc 14
+#define FUNCNAME_editBf 15
+#define FUNCNAME_editScr 16
+#define FUNCNAME_goLineL 17
+#define FUNCNAME_escbmap 18
+#define FUNCNAME_escmap 19
+#define FUNCNAME_execsh 20
+#define FUNCNAME_extbrz 22
+#define FUNCNAME_linkbrz 23
+#define FUNCNAME_rFrame 24
+#define FUNCNAME_goURL 25
+#define FUNCNAME_goLine 26
+#define FUNCNAME_followA 27
+#define FUNCNAME_ldhelp 28
+#define FUNCNAME_ldHist 29
+#define FUNCNAME_pginfo 30
+#define FUNCNAME_initMailcap 31
+#define FUNCNAME_susp 32
+#define FUNCNAME_isrchbak 33
+#define FUNCNAME_isrchfor 34
+#define FUNCNAME_col1L 35
+#define FUNCNAME_linbeg 36
+#define FUNCNAME_linend 37
+#define FUNCNAME_curlno 38
+#define FUNCNAME_topA 39
+#define FUNCNAME_lastA 40
+#define FUNCNAME_ldfile 41
+#define FUNCNAME_mainMn 42
+#define FUNCNAME__mark 43
+#define FUNCNAME_chkNMID 44
+#define FUNCNAME_chkURL 45
+#define FUNCNAME_mouse 47
+#define FUNCNAME_msToggle 48
+#define FUNCNAME_movD1 49
+#define FUNCNAME_movD 50
+#define FUNCNAME_movL1 51
+#define FUNCNAME_movL 52
+#define FUNCNAME_movR1 53
+#define FUNCNAME_movR 54
+#define FUNCNAME_movU1 55
+#define FUNCNAME_movU 56
+#define FUNCNAME_msgs 57
+#define FUNCNAME_nextD 58
+#define FUNCNAME_nextL 59
+#define FUNCNAME_nextLU 60
+#define FUNCNAME_nextA 61
+#define FUNCNAME_nextMk 62
+#define FUNCNAME_pgFore 63
+#define FUNCNAME_nextRD 64
+#define FUNCNAME_nextR 65
+#define FUNCNAME_nextU 66
+#define FUNCNAME_movRW 67
+#define FUNCNAME_nulcmd 68
+#define FUNCNAME_ldOpt 71
+#define FUNCNAME_pcmap 72
+#define FUNCNAME_curURL 73
+#define FUNCNAME_peekIMG 74
+#define FUNCNAME_peekURL 75
+#define FUNCNAME_pipeBuf 76
+#define FUNCNAME_pipesh 77
+#define FUNCNAME_prevA 78
+#define FUNCNAME_prevMk 79
+#define FUNCNAME_pgBack 80
+#define FUNCNAME_movLW 81
+#define FUNCNAME_svBuf 82
+#define FUNCNAME_qquitfm 83
+#define FUNCNAME_readsh 84
+#define FUNCNAME_rdrwSc 85
+#define FUNCNAME_reMark 86
+#define FUNCNAME_reload 87
+#define FUNCNAME_col1R 88
+#define FUNCNAME_svI 89
+#define FUNCNAME_svA 90
+#define FUNCNAME_srchbak 93
+#define FUNCNAME_srchfor 94
+#define FUNCNAME_srchnxt 95
+#define FUNCNAME_srchprv 96
+#define FUNCNAME_selMn 98
+#define FUNCNAME_selBuf 99
+#define FUNCNAME_setEnv 100
+#define FUNCNAME_setOpt 101
+#define FUNCNAME_shiftl 103
+#define FUNCNAME_shiftr 104
+#define FUNCNAME_vwSrc 105
+#define FUNCNAME_stopI 106
+#define FUNCNAME_submitForm 107
+#define FUNCNAME_lup1 109
+#define FUNCNAME_dispVer 110
+#define FUNCNAME_followI 112
+#define FUNCNAME_wrapToggle 115
diff -u w3m-0.2.4/funcname2.h w3m-0.2.4-img-js/funcname2.h
--- w3m-0.2.4/funcname2.h	Thu Jan 17 17:24:28 2002
+++ w3m-0.2.4-img-js/funcname2.h	Thu Jan 17 17:16:23 2002
@@ -10,93 +10,95 @@
 #define deletePrevBuf 9
 #define dictwordat 10
 #define dictword 11
-#define ldown1 12
-#define svSrc 13
-#define editBf 14
-#define editScr 15
-#define goLineL 16
-#define escbmap 17
-#define escmap 18
-#define execsh 19
-#define extbrz 21
-#define linkbrz 22
-#define rFrame 23
-#define goURL 24
-#define goLine 25
-#define followA 26
-#define ldhelp 27
-#define ldHist 28
-#define pginfo 29
-#define initMailcap 30
-#define susp 31
-#define isrchbak 32
-#define isrchfor 33
-#define col1L 34
-#define linbeg 35
-#define linend 36
-#define curlno 37
-#define topA 38
-#define lastA 39
-#define ldfile 40
-#define mainMn 41
-#define _mark 42
-#define chkNMID 43
-#define chkURL 44
-#define mouse 46
-#define msToggle 47
-#define movD1 48
-#define movD 49
-#define movL1 50
-#define movL 51
-#define movR1 52
-#define movR 53
-#define movU1 54
-#define movU 55
-#define msgs 56
-#define nextD 57
-#define nextL 58
-#define nextLU 59
-#define nextA 60
-#define nextMk 61
-#define pgFore 62
-#define nextRD 63
-#define nextR 64
-#define nextU 65
-#define movRW 66
-#define nulcmd 67
-#define ldOpt 70
-#define pcmap 71
-#define curURL 72
-#define peekIMG 73
-#define peekURL 74
-#define pipeBuf 75
-#define pipesh 76
-#define prevA 77
-#define prevMk 78
-#define pgBack 79
-#define movLW 80
-#define svBuf 81
-#define qquitfm 82
-#define readsh 83
-#define rdrwSc 84
-#define reMark 85
-#define reload 86
-#define col1R 87
-#define svI 88
-#define svA 89
-#define srchbak 92
-#define srchfor 93
-#define srchnxt 94
-#define srchprv 95
-#define selMn 97
-#define selBuf 98
-#define setEnv 99
-#define setOpt 100
-#define shiftl 102
-#define shiftr 103
-#define vwSrc 104
-#define submitForm 105
-#define lup1 107
-#define dispVer 108
-#define followI 110
-#define wrapToggle 113
+#define dispI 12
+#define ldown1 13
+#define svSrc 14
+#define editBf 15
+#define editScr 16
+#define goLineL 17
+#define escbmap 18
+#define escmap 19
+#define execsh 20
+#define extbrz 22
+#define linkbrz 23
+#define rFrame 24
+#define goURL 25
+#define goLine 26
+#define followA 27
+#define ldhelp 28
+#define ldHist 29
+#define pginfo 30
+#define initMailcap 31
+#define susp 32
+#define isrchbak 33
+#define isrchfor 34
+#define col1L 35
+#define linbeg 36
+#define linend 37
+#define curlno 38
+#define topA 39
+#define lastA 40
+#define ldfile 41
+#define mainMn 42
+#define _mark 43
+#define chkNMID 44
+#define chkURL 45
+#define mouse 47
+#define msToggle 48
+#define movD1 49
+#define movD 50
+#define movL1 51
+#define movL 52
+#define movR1 53
+#define movR 54
+#define movU1 55
+#define movU 56
+#define msgs 57
+#define nextD 58
+#define nextL 59
+#define nextLU 60
+#define nextA 61
+#define nextMk 62
+#define pgFore 63
+#define nextRD 64
+#define nextR 65
+#define nextU 66
+#define movRW 67
+#define nulcmd 68
+#define ldOpt 71
+#define pcmap 72
+#define curURL 73
+#define peekIMG 74
+#define peekURL 75
+#define pipeBuf 76
+#define pipesh 77
+#define prevA 78
+#define prevMk 79
+#define pgBack 80
+#define movLW 81
+#define svBuf 82
+#define qquitfm 83
+#define readsh 84
+#define rdrwSc 85
+#define reMark 86
+#define reload 87
+#define col1R 88
+#define svI 89
+#define svA 90
+#define srchbak 93
+#define srchfor 94
+#define srchnxt 95
+#define srchprv 96
+#define selMn 98
+#define selBuf 99
+#define setEnv 100
+#define setOpt 101
+#define shiftl 103
+#define shiftr 104
+#define vwSrc 105
+#define stopI 106
+#define submitForm 107
+#define lup1 109
+#define dispVer 110
+#define followI 112
+#define wrapToggle 115
diff -u w3m-0.2.4/functable.c w3m-0.2.4-img-js/functable.c
--- w3m-0.2.4/functable.c	Thu Jan 17 17:24:26 2002
+++ w3m-0.2.4-img-js/functable.c	Thu Jan 17 17:16:20 2002
@@ -31,91 +31,93 @@
   /* 26 */ {"MARK_MID",FUNCNAME_chkNMID,&MyHashItem[27]},
   /* 27 */ {"LOAD",FUNCNAME_ldfile,NULL},
   /* 28 */ {"EXEC_SHELL",FUNCNAME_execsh,NULL},
-  /* 29 */ {"VIEW_BOOKMARK",FUNCNAME_ldBmark,NULL},
-  /* 30 */ {"SHIFT_RIGHT",FUNCNAME_shiftr,&MyHashItem[31]},
-  /* 31 */ {"SEARCH_NEXT",FUNCNAME_srchnxt,NULL},
-  /* 32 */ {"PEEK",FUNCNAME_curURL,NULL},
-  /* 33 */ {"DICT_WORD_AT",FUNCNAME_dictwordat,NULL},
-  /* 34 */ {"SOURCE",FUNCNAME_vwSrc,&MyHashItem[35]},
-  /* 35 */ {"SAVE_LINK",FUNCNAME_svA,&MyHashItem[36]},
-  /* 36 */ {"GOTO",FUNCNAME_goURL,NULL},
-  /* 37 */ {"ABORT",FUNCNAME_quitfm,NULL},
-  /* 38 */ {"MENU",FUNCNAME_mainMn,NULL},
-  /* 39 */ {"PCMAP",FUNCNAME_pcmap,&MyHashItem[40]},
-  /* 40 */ {"EXIT",FUNCNAME_quitfm,NULL},
-  /* 41 */ {"LINE_INFO",FUNCNAME_curlno,&MyHashItem[42]},
-  /* 42 */ {"ADD_BOOKMARK",FUNCNAME_adBmark,NULL},
-  /* 43 */ {"WHEREIS",FUNCNAME_srchfor,&MyHashItem[44]},
-  /* 44 */ {"SELECT_MENU",FUNCNAME_selMn,&MyHashItem[45]},
-  /* 45 */ {"GOTO_LINE",FUNCNAME_goLine,NULL},
-  /* 46 */ {"MOUSE",FUNCNAME_mouse,NULL},
-  /* 47 */ {"PIPE_BUF",FUNCNAME_pipeBuf,&MyHashItem[48]},
-  /* 48 */ {"LINK_BEGIN",FUNCNAME_topA,NULL},
-  /* 49 */ {"PEEK_IMG",FUNCNAME_peekIMG,NULL},
-  /* 50 */ {"GOTO_LINK",FUNCNAME_followA,&MyHashItem[51]},
-  /* 51 */ {"EXTERN_LINK",FUNCNAME_linkbrz,NULL},
-  /* 52 */ {"BOOKMARK",FUNCNAME_ldBmark,NULL},
-  /* 53 */ {"@@@",FUNCNAME_nulcmd,&MyHashItem[54]},
-  /* 54 */ {"NEXT_RIGHT_DOWN",FUNCNAME_nextRD,&MyHashItem[55]},
-  /* 55 */ {"NEXT_LEFT",FUNCNAME_nextL,NULL},
-  /* 56 */ {"ALARM",FUNCNAME_setAlarm,NULL},
-  /* 57 */ {"UP",FUNCNAME_lup1,&MyHashItem[58]},
-  /* 58 */ {"SETENV",FUNCNAME_setEnv,&MyHashItem[59]},
-  /* 59 */ {"RELOAD",FUNCNAME_reload,NULL},
-  /* 60 */ {"NEXT_PAGE",FUNCNAME_pgFore,NULL},
-  /* 61 */ {"PIPE_SHELL",FUNCNAME_pipesh,&MyHashItem[62]},
-  /* 62 */ {"NEXT_DOWN",FUNCNAME_nextD,NULL},
-  /* 63 */ {"MAIN_MENU",FUNCNAME_mainMn,NULL},
-  /* 64 */ {"EDIT",FUNCNAME_editBf,NULL},
-  /* 65 */ {"SAVE_IMAGE",FUNCNAME_svI,&MyHashItem[66]},
-  /* 66 */ {"NEXT_MARK",FUNCNAME_nextMk,&MyHashItem[67]},
-  /* 67 */ {"COOKIE",FUNCNAME_cooLst,NULL},
-  /* 68 */ {"LINK_END",FUNCNAME_lastA,&MyHashItem[69]},
-  /* 69 */ {"LINE_BEGIN",FUNCNAME_linbeg,&MyHashItem[70]},
-  /* 70 */ {"DELETE_PREVBUF",FUNCNAME_deletePrevBuf,NULL},
-  /* 71 */ {"WRAP_TOGGLE",FUNCNAME_wrapToggle,NULL},
-  /* 72 */ {"NOTHING",FUNCNAME_nulcmd,&MyHashItem[73]},
-  /* 73 */ {"FRAME",FUNCNAME_rFrame,NULL},
-  /* 74 */ {"SEARCH_PREV",FUNCNAME_srchprv,&MyHashItem[75]},
-  /* 75 */ {"LINE_END",FUNCNAME_linend,NULL},
-  /* 76 */ {"SELECT",FUNCNAME_selBuf,NULL},
-  /* 77 */ {"MOVE_LEFT",FUNCNAME_movL,NULL},
-  /* 78 */ {"SEARCH_BACK",FUNCNAME_srchbak,&MyHashItem[79]},
-  /* 79 */ {"SAVE",FUNCNAME_svSrc,NULL},
-  /* 80 */ {"SHIFT_LEFT",FUNCNAME_shiftl,&MyHashItem[81]},
-  /* 81 */ {"READ_SHELL",FUNCNAME_readsh,&MyHashItem[82]},
-  /* 82 */ {"PRINT",FUNCNAME_svBuf,&MyHashItem[83]},
-  /* 83 */ {"MOVE_DOWN",FUNCNAME_movD,&MyHashItem[84]},
-  /* 84 */ {"EDIT_SCREEN",FUNCNAME_editScr,NULL},
-  /* 85 */ {"ISEARCH_BACK",FUNCNAME_isrchbak,NULL},
-  /* 86 */ {"NEXT_LINK",FUNCNAME_nextA,NULL},
-  /* 87 */ {"MSGS",FUNCNAME_msgs,NULL},
-  /* 88 */ {"CENTER_H",FUNCNAME_ctrCsrH,NULL},
-  /* 89 */ {"PREV_PAGE",FUNCNAME_pgBack,NULL},
-  /* 90 */ {"SAVE_SCREEN",FUNCNAME_svBuf,NULL},
-  /* 91 */ {"SEARCH_FORE",FUNCNAME_srchfor,&MyHashItem[92]},
-  /* 92 */ {"MOVE_UP1",FUNCNAME_movU1,&MyHashItem[93]},
-  /* 93 */ {"MOVE_LEFT1",FUNCNAME_movL1,NULL},
-  /* 94 */ {"INIT_MAILCAP",FUNCNAME_initMailcap,NULL},
-  /* 95 */ {"PREV_MARK",FUNCNAME_prevMk,&MyHashItem[96]},
-  /* 96 */ {"PEEK_LINK",FUNCNAME_peekURL,NULL},
-  /* 97 */ {"MARK_URL",FUNCNAME_chkURL,NULL},
-  /* 98 */ {"SUBMIT",FUNCNAME_submitForm,NULL},
-  /* 99 */ {"NEXT_WORD",FUNCNAME_movRW,&MyHashItem[100]},
-  /* 100 */ {"HELP",FUNCNAME_ldhelp,NULL},
-  /* 101 */ {"MOVE_DOWN1",FUNCNAME_movD1,NULL},
-  /* 102 */ {"ISEARCH",FUNCNAME_isrchfor,NULL},
-  /* 103 */ {"NEXT_RIGHT",FUNCNAME_nextR,&MyHashItem[104]},
-  /* 104 */ {"CENTER_V",FUNCNAME_ctrCsrV,NULL},
-  /* 105 */ {"MOVE_RIGHT1",FUNCNAME_movR1,NULL},
-  /* 106 */ {"ESCMAP",FUNCNAME_escmap,&MyHashItem[107]},
-  /* 107 */ {"ESCBMAP",FUNCNAME_escbmap,NULL},
-  /* 108 */ {"NULL",FUNCNAME_nulcmd,&MyHashItem[109]},
-  /* 109 */ {"DICT_WORD",FUNCNAME_dictword,NULL},
-  /* 110 */ {"PREV_LINK",FUNCNAME_prevA,NULL},
-  /* 111 */ {"MOUSE_TOGGLE",FUNCNAME_msToggle,&MyHashItem[112]},
-  /* 112 */ {"BACK",FUNCNAME_backBf,NULL},
-  /* 113 */ {"OPTIONS",FUNCNAME_ldOpt,NULL},
+  /* 29 */ {"VIEW_BOOKMARK",FUNCNAME_ldBmark,&MyHashItem[30]},
+  /* 30 */ {"STOP_IMAGE",FUNCNAME_stopI,NULL},
+  /* 31 */ {"SHIFT_RIGHT",FUNCNAME_shiftr,&MyHashItem[32]},
+  /* 32 */ {"SEARCH_NEXT",FUNCNAME_srchnxt,NULL},
+  /* 33 */ {"PEEK",FUNCNAME_curURL,NULL},
+  /* 34 */ {"DICT_WORD_AT",FUNCNAME_dictwordat,NULL},
+  /* 35 */ {"SOURCE",FUNCNAME_vwSrc,&MyHashItem[36]},
+  /* 36 */ {"SAVE_LINK",FUNCNAME_svA,&MyHashItem[37]},
+  /* 37 */ {"GOTO",FUNCNAME_goURL,NULL},
+  /* 38 */ {"ABORT",FUNCNAME_quitfm,NULL},
+  /* 39 */ {"MENU",FUNCNAME_mainMn,NULL},
+  /* 40 */ {"PCMAP",FUNCNAME_pcmap,&MyHashItem[41]},
+  /* 41 */ {"EXIT",FUNCNAME_quitfm,NULL},
+  /* 42 */ {"LINE_INFO",FUNCNAME_curlno,&MyHashItem[43]},
+  /* 43 */ {"ADD_BOOKMARK",FUNCNAME_adBmark,NULL},
+  /* 44 */ {"WHEREIS",FUNCNAME_srchfor,&MyHashItem[45]},
+  /* 45 */ {"SELECT_MENU",FUNCNAME_selMn,&MyHashItem[46]},
+  /* 46 */ {"GOTO_LINE",FUNCNAME_goLine,NULL},
+  /* 47 */ {"MOUSE",FUNCNAME_mouse,NULL},
+  /* 48 */ {"PIPE_BUF",FUNCNAME_pipeBuf,&MyHashItem[49]},
+  /* 49 */ {"LINK_BEGIN",FUNCNAME_topA,NULL},
+  /* 50 */ {"PEEK_IMG",FUNCNAME_peekIMG,NULL},
+  /* 51 */ {"GOTO_LINK",FUNCNAME_followA,&MyHashItem[52]},
+  /* 52 */ {"EXTERN_LINK",FUNCNAME_linkbrz,NULL},
+  /* 53 */ {"BOOKMARK",FUNCNAME_ldBmark,NULL},
+  /* 54 */ {"@@@",FUNCNAME_nulcmd,&MyHashItem[55]},
+  /* 55 */ {"NEXT_RIGHT_DOWN",FUNCNAME_nextRD,&MyHashItem[56]},
+  /* 56 */ {"NEXT_LEFT",FUNCNAME_nextL,NULL},
+  /* 57 */ {"ALARM",FUNCNAME_setAlarm,NULL},
+  /* 58 */ {"UP",FUNCNAME_lup1,&MyHashItem[59]},
+  /* 59 */ {"SETENV",FUNCNAME_setEnv,&MyHashItem[60]},
+  /* 60 */ {"RELOAD",FUNCNAME_reload,NULL},
+  /* 61 */ {"NEXT_PAGE",FUNCNAME_pgFore,&MyHashItem[62]},
+  /* 62 */ {"DISPLAY_IMAGE",FUNCNAME_dispI,NULL},
+  /* 63 */ {"PIPE_SHELL",FUNCNAME_pipesh,&MyHashItem[64]},
+  /* 64 */ {"NEXT_DOWN",FUNCNAME_nextD,NULL},
+  /* 65 */ {"MAIN_MENU",FUNCNAME_mainMn,NULL},
+  /* 66 */ {"EDIT",FUNCNAME_editBf,NULL},
+  /* 67 */ {"SAVE_IMAGE",FUNCNAME_svI,&MyHashItem[68]},
+  /* 68 */ {"NEXT_MARK",FUNCNAME_nextMk,&MyHashItem[69]},
+  /* 69 */ {"COOKIE",FUNCNAME_cooLst,NULL},
+  /* 70 */ {"LINK_END",FUNCNAME_lastA,&MyHashItem[71]},
+  /* 71 */ {"LINE_BEGIN",FUNCNAME_linbeg,&MyHashItem[72]},
+  /* 72 */ {"DELETE_PREVBUF",FUNCNAME_deletePrevBuf,NULL},
+  /* 73 */ {"WRAP_TOGGLE",FUNCNAME_wrapToggle,NULL},
+  /* 74 */ {"NOTHING",FUNCNAME_nulcmd,&MyHashItem[75]},
+  /* 75 */ {"FRAME",FUNCNAME_rFrame,NULL},
+  /* 76 */ {"SEARCH_PREV",FUNCNAME_srchprv,&MyHashItem[77]},
+  /* 77 */ {"LINE_END",FUNCNAME_linend,NULL},
+  /* 78 */ {"SELECT",FUNCNAME_selBuf,NULL},
+  /* 79 */ {"MOVE_LEFT",FUNCNAME_movL,NULL},
+  /* 80 */ {"SEARCH_BACK",FUNCNAME_srchbak,&MyHashItem[81]},
+  /* 81 */ {"SAVE",FUNCNAME_svSrc,NULL},
+  /* 82 */ {"SHIFT_LEFT",FUNCNAME_shiftl,&MyHashItem[83]},
+  /* 83 */ {"READ_SHELL",FUNCNAME_readsh,&MyHashItem[84]},
+  /* 84 */ {"PRINT",FUNCNAME_svBuf,&MyHashItem[85]},
+  /* 85 */ {"MOVE_DOWN",FUNCNAME_movD,&MyHashItem[86]},
+  /* 86 */ {"EDIT_SCREEN",FUNCNAME_editScr,NULL},
+  /* 87 */ {"ISEARCH_BACK",FUNCNAME_isrchbak,NULL},
+  /* 88 */ {"NEXT_LINK",FUNCNAME_nextA,NULL},
+  /* 89 */ {"MSGS",FUNCNAME_msgs,NULL},
+  /* 90 */ {"CENTER_H",FUNCNAME_ctrCsrH,NULL},
+  /* 91 */ {"PREV_PAGE",FUNCNAME_pgBack,NULL},
+  /* 92 */ {"SAVE_SCREEN",FUNCNAME_svBuf,NULL},
+  /* 93 */ {"SEARCH_FORE",FUNCNAME_srchfor,&MyHashItem[94]},
+  /* 94 */ {"MOVE_UP1",FUNCNAME_movU1,&MyHashItem[95]},
+  /* 95 */ {"MOVE_LEFT1",FUNCNAME_movL1,NULL},
+  /* 96 */ {"INIT_MAILCAP",FUNCNAME_initMailcap,NULL},
+  /* 97 */ {"PREV_MARK",FUNCNAME_prevMk,&MyHashItem[98]},
+  /* 98 */ {"PEEK_LINK",FUNCNAME_peekURL,NULL},
+  /* 99 */ {"MARK_URL",FUNCNAME_chkURL,NULL},
+  /* 100 */ {"SUBMIT",FUNCNAME_submitForm,NULL},
+  /* 101 */ {"NEXT_WORD",FUNCNAME_movRW,&MyHashItem[102]},
+  /* 102 */ {"HELP",FUNCNAME_ldhelp,NULL},
+  /* 103 */ {"MOVE_DOWN1",FUNCNAME_movD1,NULL},
+  /* 104 */ {"ISEARCH",FUNCNAME_isrchfor,NULL},
+  /* 105 */ {"NEXT_RIGHT",FUNCNAME_nextR,&MyHashItem[106]},
+  /* 106 */ {"CENTER_V",FUNCNAME_ctrCsrV,NULL},
+  /* 107 */ {"MOVE_RIGHT1",FUNCNAME_movR1,NULL},
+  /* 108 */ {"ESCMAP",FUNCNAME_escmap,&MyHashItem[109]},
+  /* 109 */ {"ESCBMAP",FUNCNAME_escbmap,NULL},
+  /* 110 */ {"NULL",FUNCNAME_nulcmd,&MyHashItem[111]},
+  /* 111 */ {"DICT_WORD",FUNCNAME_dictword,NULL},
+  /* 112 */ {"PREV_LINK",FUNCNAME_prevA,NULL},
+  /* 113 */ {"MOUSE_TOGGLE",FUNCNAME_msToggle,&MyHashItem[114]},
+  /* 114 */ {"BACK",FUNCNAME_backBf,NULL},
+  /* 115 */ {"OPTIONS",FUNCNAME_ldOpt,NULL},
 };
 
 static HashItem_si *MyHashItemTbl[] = {
@@ -147,78 +149,78 @@
   NULL,
   NULL,
   &MyHashItem[29],
-  &MyHashItem[30],
-  &MyHashItem[32],
+  &MyHashItem[31],
   &MyHashItem[33],
   &MyHashItem[34],
-  &MyHashItem[37],
+  &MyHashItem[35],
   &MyHashItem[38],
   &MyHashItem[39],
-  &MyHashItem[41],
+  &MyHashItem[40],
+  &MyHashItem[42],
   NULL,
-  &MyHashItem[43],
+  &MyHashItem[44],
   NULL,
-  &MyHashItem[46],
   &MyHashItem[47],
-  &MyHashItem[49],
-  NULL,
+  &MyHashItem[48],
   &MyHashItem[50],
   NULL,
+  &MyHashItem[51],
+  NULL,
   NULL,
   NULL,
-  &MyHashItem[52],
   &MyHashItem[53],
-  &MyHashItem[56],
+  &MyHashItem[54],
   &MyHashItem[57],
-  &MyHashItem[60],
+  &MyHashItem[58],
   &MyHashItem[61],
   &MyHashItem[63],
-  &MyHashItem[64],
   &MyHashItem[65],
-  &MyHashItem[68],
-  &MyHashItem[71],
+  &MyHashItem[66],
+  &MyHashItem[67],
+  &MyHashItem[70],
+  &MyHashItem[73],
   NULL,
-  &MyHashItem[72],
   &MyHashItem[74],
-  NULL,
   &MyHashItem[76],
   NULL,
-  &MyHashItem[77],
   &MyHashItem[78],
   NULL,
-  NULL,
+  &MyHashItem[79],
   &MyHashItem[80],
-  &MyHashItem[85],
   NULL,
-  &MyHashItem[86],
   NULL,
+  &MyHashItem[82],
   &MyHashItem[87],
+  NULL,
   &MyHashItem[88],
+  NULL,
   &MyHashItem[89],
   &MyHashItem[90],
   &MyHashItem[91],
-  &MyHashItem[94],
-  &MyHashItem[95],
+  &MyHashItem[92],
+  &MyHashItem[93],
+  &MyHashItem[96],
   &MyHashItem[97],
+  &MyHashItem[99],
   NULL,
-  &MyHashItem[98],
+  &MyHashItem[100],
   NULL,
-  &MyHashItem[99],
   &MyHashItem[101],
-  &MyHashItem[102],
-  NULL,
   &MyHashItem[103],
-  &MyHashItem[105],
-  &MyHashItem[106],
+  &MyHashItem[104],
   NULL,
+  &MyHashItem[105],
+  &MyHashItem[107],
   &MyHashItem[108],
   NULL,
-  NULL,
   &MyHashItem[110],
   NULL,
-  &MyHashItem[111],
+  NULL,
+  &MyHashItem[112],
   NULL,
   &MyHashItem[113],
+  NULL,
+  &MyHashItem[115],
 };
 
 Hash_si functable = {100, MyHashItemTbl};
Common subdirectories: w3m-0.2.4/gc and w3m-0.2.4-img-js/gc
diff -u w3m-0.2.4/html.c w3m-0.2.4-img-js/html.c
--- w3m-0.2.4/html.c	Thu Jan 17 17:26:10 2002
+++ w3m-0.2.4-img-js/html.c	Thu Jan 17 17:14:32 2002
@@ -23,8 +23,10 @@
 unsigned char ALST_PRE[] = { ATTR_FOR_TABLE, ATTR_CORE };
 #define MAXA_PRE	MAXA_CORE + 1
 unsigned char ALST_IMG[] =
-    { ATTR_SRC, ATTR_ALT, ATTR_WIDTH, ATTR_HEIGHT, ATTR_USEMAP, ATTR_CORE };
-#define MAXA_IMG	MAXA_CORE + 5
+    { ATTR_SRC, ATTR_ALT, ATTR_WIDTH, ATTR_HEIGHT, ATTR_ALIGN, ATTR_USEMAP,
+    ATTR_ISMAP, ATTR_CORE
+};
+#define MAXA_IMG	MAXA_CORE + 7
 unsigned char ALST_TABLE[] =
     { ATTR_BORDER, ATTR_WIDTH, ATTR_HBORDER, ATTR_CELLSPACING,
     ATTR_CELLPADDING, ATTR_VSPACE, ATTR_CORE
@@ -61,8 +63,11 @@
 #define MAXA_ISINDEX	MAXA_CORE + 2
 unsigned char ALST_MAP[] = { ATTR_NAME, ATTR_CORE };
 #define MAXA_MAP	MAXA_CORE + 1
-unsigned char ALST_AREA[] = { ATTR_HREF, ATTR_ALT, ATTR_CORE };
-#define MAXA_AREA	MAXA_CORE + 2
+unsigned char ALST_AREA[] =
+    { ATTR_HREF, ATTR_ALT, ATTR_SHAPE, ATTR_COORDS, ATTR_CORE };
+#define MAXA_AREA	MAXA_CORE + 4
+unsigned char ALST_SCRIPT[] = { ATTR_LANGUAGE, ATTR_CORE };
+#define MAXA_SCRIPT   MAXA_CORE + 1
 unsigned char ALST_BASE[] = { ATTR_HREF, ATTR_TARGET, ATTR_CORE };
 #define MAXA_BASE	MAXA_CORE + 2
 unsigned char ALST_BODY[] = { ATTR_BACKGROUND, ATTR_CORE };
@@ -94,8 +99,11 @@
     ATTR_SELECTNUMBER, ATTR_ROWS, ATTR_TOP_MARGIN, ATTR_BOTTOM_MARGIN
 };
 #define MAXA_INPUT_ALT  16
-unsigned char ALST_IMG_ALT[] = { ATTR_SRC };
-#define MAXA_IMG_ALT	1
+unsigned char ALST_IMG_ALT[] =
+    { ATTR_SRC, ATTR_WIDTH, ATTR_HEIGHT, ATTR_USEMAP, ATTR_ISMAP, ATTR_HSEQ,
+    ATTR_XOFFSET, ATTR_YOFFSET, ATTR_TOP_MARGIN, ATTR_BOTTOM_MARGIN
+};
+#define MAXA_IMG_ALT  10
 unsigned char ALST_NOP[] = { ATTR_CORE };
 #define MAXA_NOP	MAXA_CORE
 
@@ -158,7 +166,7 @@
     {"map", ALST_MAP, MAXA_MAP, 0},	/*  55 HTML_MAP        */
     {"/map", NULL, 0, TFLG_END},	/*  56 HTML_N_MAP      */
     {"area", ALST_AREA, MAXA_AREA, 0},	/*  57 HTML_AREA       */
-    {"script", NULL, 0, 0},	/*  58 HTML_SCRIPT     */
+    {"script", ALST_SCRIPT, MAXA_SCRIPT, 0},	/*  58 HTML_SCRIPT     */
     {"/script", NULL, 0, TFLG_END},	/*  59 HTML_N_SCRIPT   */
     {"base", ALST_BASE, MAXA_BASE, 0},	/*  60 HTML_BASE       */
     {"del", NULL, 0, 0},	/*  61 HTML_DEL        */
@@ -278,16 +286,17 @@
     {"selected", VTYPE_NONE, 0},	/* 41 ATTR_SELECTED       */
     {"label", VTYPE_STR, 0},	/* 42 ATTR_LABEL          */
     {"readonly", VTYPE_NONE, 0},	/* 43 ATTR_READONLY       */
+    {"shape", VTYPE_STR, 0},	/* 44 ATTR_SHAPE          */
+    {"coords", VTYPE_STR, 0},	/* 45 ATTR_COORDS         */
+    {"ismap", VTYPE_NONE, 0},	/* 46 ATTR_ISMAP          */
 
-    {NULL, VTYPE_NONE, 0},	/* 44 Undefined           */
-    {NULL, VTYPE_NONE, 0},	/* 45 Undefined           */
-    {NULL, VTYPE_NONE, 0},	/* 46 Undefined           */
-    {NULL, VTYPE_NONE, 0},	/* 47 Undefined           */
+    {"language", VTYPE_STR, 0},       /* 47 ATTR_LANGUAGE       */
+    /* {NULL, VTYPE_NONE, 0},*/	/* 47 Undefined           */
     {NULL, VTYPE_NONE, 0},	/* 48 Undefined           */
-    {NULL, VTYPE_NONE, 0},	/* 49 Undefined           */
-    {NULL, VTYPE_NONE, 0},	/* 50 Undefined           */
 
     /* Internal attribute */
+    {"xoffset", VTYPE_NUMBER, AFLG_INT},	/* 49 ATTR_XOFFSET        */
+    {"yoffset", VTYPE_NUMBER, AFLG_INT},	/* 50 ATTR_YOFFSET        */
     {"top_margin", VTYPE_NUMBER, AFLG_INT},	/* 51 ATTR_TOP_MARGIN,    */
     {"bottom_margin", VTYPE_NUMBER, AFLG_INT},	/* 52 ATTR_BOTTOM_MARGIN, */
     {"tid", VTYPE_NUMBER, AFLG_INT},	/* 53 ATTR_TID            */
diff -u w3m-0.2.4/html.h w3m-0.2.4-img-js/html.h
--- w3m-0.2.4/html.h	Thu Jan 17 17:26:10 2002
+++ w3m-0.2.4-img-js/html.h	Thu Jan 17 17:05:12 2002
@@ -248,11 +248,18 @@
 #define ATTR_START		40
 #define ATTR_SELECTED		41
 #define ATTR_LABEL		42
-#define ATTR_READONLY        43
+#define ATTR_READONLY		43
+#define ATTR_SHAPE		44
+#define ATTR_COORDS		45
+#define ATTR_ISMAP		46
+#define ATTR_LANGUAGE           47
+
 
 /* Internal attribute */
-#define ATTR_TOP_MARGIN        51
-#define ATTR_BOTTOM_MARGIN      52
+#define ATTR_XOFFSET		49
+#define ATTR_YOFFSET		50
+#define ATTR_TOP_MARGIN		51
+#define ATTR_BOTTOM_MARGIN	52
 #define ATTR_TID		53
 #define ATTR_FID		54
 #define ATTR_FOR_TABLE		55
@@ -301,6 +308,12 @@
 #define VTYPE_MLENGTH   9
 #define VTYPE_TYPE      10
 
+#define SHAPE_UNKNOWN	0
+#define SHAPE_DEFAULT	1
+#define SHAPE_RECT	2
+#define SHAPE_CIRCLE	3
+#define SHAPE_POLY	4
+
 extern TagInfo TagMAP[];
 extern TagAttrInfo AttrMAP[];
 
@@ -331,5 +344,8 @@
 #ifdef USE_SSL
 #define SCM_HTTPS       10
 #endif				/* USE_SSL */
+#ifdef USE_JAVASCRIPT
+#define SCM_JAVASCRIPT  11
+#endif
 
 #endif				/* _HTML_H */
Only in w3m-0.2.4-img-js: js_html.c
Only in w3m-0.2.4-img-js: js_html.h
Binary files w3m-0.2.4/keybind.o and w3m-0.2.4-img-js/keybind.o differ
Binary files w3m-0.2.4/libindep.a and w3m-0.2.4-img-js/libindep.a differ
diff -u w3m-0.2.4/main.c w3m-0.2.4-img-js/main.c
--- w3m-0.2.4/main.c	Thu Jan 17 17:26:10 2002
+++ w3m-0.2.4-img-js/main.c	Thu Jan 17 17:03:52 2002
@@ -105,6 +105,9 @@
 #else
 	    "lang=en"
 #endif
+#ifdef USE_IMAGE
+	    ",image"
+#endif
 #ifdef USE_COLOR
 	    ",color"
 #ifdef USE_ANSI_COLOR
@@ -147,6 +150,9 @@
 #ifdef USE_MARK
 	    ",mark"
 #endif
+#ifdef USE_JAVASCRIPT
+	    ",javascript"
+#endif
 	);
 }
 
@@ -180,6 +186,10 @@
 	    "    -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");
@@ -570,6 +580,17 @@
 		    ppc <= MAXIMUM_PIXEL_PER_CHAR)
 		    pixel_per_char = ppc;
 	    }
+#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;
+	    }
+#endif
 	    else if (!strcmp("-num", argv[i]))
 		showLineNum = TRUE;
 	    else if (!strcmp("-no-proxy", argv[i]))
@@ -943,7 +964,15 @@
 	}
 	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
@@ -1126,6 +1155,9 @@
 {
     Buffer *b;
 
+#ifdef USE_IMAGE
+    deleteImage(Currentbuf);
+#endif
     if (clear_buffer)
 	tmpClearBuffer(Currentbuf);
     if (Firstbuf == Currentbuf) {
@@ -2065,6 +2097,12 @@
 void
 quitfm(void)
 {
+#ifdef USE_IMAGE
+    if (fmInitialized && activeImage) {
+	resetImage();
+	termImage();
+    }
+#endif
     fmTerm();
 #ifdef USE_COOKIE
     save_cookies();
@@ -2113,8 +2151,13 @@
 	}
     } 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);
@@ -2580,11 +2623,26 @@
     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);
@@ -2618,7 +2676,12 @@
 	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);
 }
 
@@ -2788,14 +2851,18 @@
 	}
 	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 */
@@ -2816,14 +2883,18 @@
 	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 */
@@ -3678,6 +3749,10 @@
     }
     if (set_param_option(opt))
 	sync_with_option();
+#ifdef USE_IMAGE
+    if (activeImage)
+	displayBuffer(Currentbuf, B_REDRAW_IMAGE);
+#endif
     displayBuffer(Currentbuf, B_FORCE_REDRAW);
 }
 
@@ -3719,12 +3794,8 @@
     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 == '#') {
@@ -4351,6 +4422,32 @@
 
     disp_message(tmp->ptr, FALSE);
 }
+
+#ifdef USE_IMAGE
+void
+dispI(void)
+{
+    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
 
Binary files w3m-0.2.4/main.o and w3m-0.2.4-img-js/main.o differ
diff -u w3m-0.2.4/map.c w3m-0.2.4-img-js/map.c
--- w3m-0.2.4/map.c	Sat Nov 24 02:01:26 2001
+++ w3m-0.2.4-img-js/map.c	Thu Jan 17 16:09:21 2002
@@ -3,16 +3,73 @@
  * client-side image maps
  */
 #include "fm.h"
+#include <math.h>
 
 #ifdef MENU_MAP
+#ifdef USE_IMAGE
+static int
+inMapArea(MapArea * a, int x, int y)
+{
+    int i;
+    double r1, r2, s, c, t;
+
+    if (!a)
+	return FALSE;
+    switch (a->shape) {
+    case SHAPE_RECT:
+	if (x >= a->coords[0] && y >= a->coords[1] &&
+	    x <= a->coords[2] && y <= a->coords[3])
+	    return TRUE;
+	break;
+    case SHAPE_CIRCLE:
+	if ((x - a->coords[0]) * (x - a->coords[0])
+	    + (y - a->coords[1]) * (y - a->coords[1])
+	    <= a->coords[2] * a->coords[2])
+	    return TRUE;
+	break;
+    case SHAPE_POLY:
+	for (t = 0, i = 0; i < a->ncoords; i += 2) {
+	    r1 = sqrt((double)(x - a->coords[i]) * (x - a->coords[i])
+		      + (double)(y - a->coords[i + 1]) * (y -
+							  a->coords[i + 1]));
+	    r2 = sqrt((double)(x - a->coords[i + 2]) * (x - a->coords[i + 2])
+		      + (double)(y - a->coords[i + 3]) * (y -
+							  a->coords[i + 3]));
+	    if (r1 == 0 || r2 == 0)
+		return TRUE;
+	    s = ((double)(x - a->coords[i]) * (y - a->coords[i + 3])
+		 - (double)(x - a->coords[i + 2]) * (y -
+						     a->coords[i +
+							       1])) / r1 / r2;
+	    c = ((double)(x - a->coords[i]) * (x - a->coords[i + 2])
+		 + (double)(y - a->coords[i + 1]) * (y -
+						     a->coords[i +
+							       3])) / r1 / r2;
+	    t += atan2(s, c);
+	}
+	if (fabs(t) > 2 * 3.14)
+	    return TRUE;
+	break;
+    case SHAPE_DEFAULT:
+	return TRUE;
+    default:
+	break;
+    }
+    return FALSE;
+}
+#endif
+
 char *
-follow_map_menu(Buffer *buf, struct parsed_tagarg *arg, int x, int y)
+follow_map_menu(Buffer *buf, struct parsed_tagarg *arg, Anchor *a_img, int x,
+		int y)
 {
     MapList *ml;
+    ListItem *al;
+    MapArea *a;
     char *name;
-    TextListItem *t, *s;
-    int i, n, selected = -1;
+    int i, n, selected = -1, initial;
     char **label;
+    int px, py, map = 0;
 
     name = tag_get_value(arg, "link");
     if (name == NULL)
@@ -22,24 +79,49 @@
 	if (!Strcmp_charp(ml->name, name))
 	    break;
     }
-    if (ml == NULL)
+    if (ml == NULL || ml->area == NULL)
 	return NULL;
 
-    for (n = 0, t = ml->urls->first; t != NULL; n++, t = t->next) ;
+    n = ml->area->nitem;
     if (n == 0)
 	return NULL;
     label = New_N(char *, n + 1);
-    for (i = 0, t = ml->urls->first, s = ml->alts->first; t != NULL;
-	 i++, t = t->next, s = s->next)
-	label[i] = *s->ptr ? s->ptr : t->ptr;
+#ifdef USE_IMAGE
+    if (getMapXY(buf, a_img, &px, &py))
+	map = 1;
+#endif
+    initial = -n;
+    for (i = 0, al = ml->area->first; al != NULL; i++, al = al->next) {
+	a = (MapArea *) al->ptr;
+	if (a) {
+	    label[i] = *a->alt ? a->alt : a->url;
+#ifdef USE_IMAGE
+	    if (initial < 0 && map && inMapArea(a, px, py)) {
+		if (a->shape == SHAPE_DEFAULT) {
+		    if (initial == -n)
+			initial = -i;
+		}
+		else
+		    initial = i;
+	    }
+#endif
+	}
+	else
+	    label[i] = "";
+    }
     label[n] = NULL;
+    if (initial == -n)
+	initial = 0;
+    else if (initial < 0)
+	initial *= -1;
 
-    optionMenu(x, y, label, &selected, 0, NULL);
+    optionMenu(x, y, label, &selected, initial, NULL);
 
     if (selected >= 0) {
-	for (i = 0, t = ml->urls->first; t != NULL; i++, t = t->next)
-	    if (i == selected)
-		return t->ptr;
+	for (i = 0, al = ml->area->first; al != NULL; i++, al = al->next) {
+	    if (al->ptr && i == selected)
+		return ((MapArea *) al->ptr)->url;
+	}
     }
     return NULL;
 }
@@ -53,8 +135,9 @@
 {
     Str mappage;
     MapList *ml;
+    ListItem *al;
+    MapArea *a;
     char *name;
-    TextListItem *t, *s;
     ParsedURL pu;
 
     name = tag_get_value(arg, "link");
@@ -69,15 +152,17 @@
 	return NULL;
 
     mappage = Strnew_charp(map1);
-    for (t = ml->urls->first, s = ml->alts->first; t != NULL;
-	 t = t->next, s = s->next) {
-	parseURL2(t->ptr, &pu, baseURL(buf));
+    for (al = ml->area->first; al != NULL; al = al->next) {
+	a = (MapArea *) al->ptr;
+	if (!a)
+	    continue;
+	parseURL2(a->url, &pu, baseURL(buf));
 	Strcat_charp(mappage, "<a href=\"");
 	Strcat_charp(mappage, html_quote(parsedURL2Str(&pu)->ptr));
 	Strcat_charp(mappage, "\">");
-	Strcat_charp(mappage, html_quote(s->ptr));
+	Strcat_charp(mappage, html_quote(a->alt));
 	Strcat_charp(mappage, " ");
-	Strcat_charp(mappage, html_quote(t->ptr));
+	Strcat_charp(mappage, html_quote(a->url));
 	Strcat_charp(mappage, "</a><br>\n");
     }
     Strcat_charp(mappage, "</body></html>");
@@ -85,6 +170,106 @@
     return loadHTMLString(mappage);
 }
 #endif
+
+#ifdef USE_IMAGE
+int
+getMapXY(Buffer *buf, Anchor *a, int *x, int *y)
+{
+    if (!buf || !a || !a->image || !x || !y)
+	return 0;
+    *x = (int)((buf->currentColumn + buf->cursorX
+		- COLPOS(buf->currentLine, a->start.pos) + 0.5)
+	       * pixel_per_char) - a->image->xoffset;
+    *y = (int)((buf->currentLine->linenumber - a->image->y + 0.5)
+	       * pixel_per_line) - a->image->yoffset;
+    if (*x <= 0)
+	*x = 1;
+    if (*y <= 0)
+	*y = 1;
+    return 1;
+}
+#endif
+
+MapArea *
+newMapArea(char *url, char *alt, char *shape, char *coords)
+{
+    MapArea *a = New(MapArea);
+#ifdef MENU_MAP
+    char *p;
+    int i, max;
+#endif
+
+    a->url = url;
+    a->alt = alt ? alt : "";
+#ifdef MENU_MAP
+#ifdef USE_IMAGE
+    a->shape = SHAPE_RECT;
+    if (shape) {
+	if (!strcasecmp(shape, "default"))
+	    a->shape = SHAPE_DEFAULT;
+	else if (!strncasecmp(shape, "rect", 4))
+	    a->shape = SHAPE_RECT;
+	else if (!strncasecmp(shape, "circ", 4))
+	    a->shape = SHAPE_CIRCLE;
+	else if (!strncasecmp(shape, "poly", 4))
+	    a->shape = SHAPE_POLY;
+	else
+	    a->shape = SHAPE_UNKNOWN;
+    }
+    a->coords = NULL;
+    a->ncoords = 0;
+    if (a->shape == SHAPE_UNKNOWN || a->shape == SHAPE_DEFAULT)
+	return a;
+    if (!coords) {
+	a->shape = SHAPE_UNKNOWN;
+	return a;
+    }
+    if (a->shape == SHAPE_RECT) {
+	a->coords = New_N(short, 4);
+	a->ncoords = 4;
+    }
+    else if (a->shape == SHAPE_CIRCLE) {
+	a->coords = New_N(short, 3);
+	a->ncoords = 3;
+    }
+    max = a->ncoords;
+    for (i = 0, p = coords; (a->shape == SHAPE_POLY || i < a->ncoords) && *p;) {
+	while (IS_SPACE(*p))
+	    p++;
+	if (!IS_DIGIT(*p))
+	    break;
+	if (a->shape == SHAPE_POLY) {
+	    if (max <= i) {
+		max = i ? i * 2 : 6;
+		a->coords = New_Reuse(short, a->coords, max + 2);
+	    }
+	    a->ncoords++;
+	}
+	a->coords[i] = (short)atoi(p);
+	i++;
+	while (IS_DIGIT(*p))
+	    p++;
+	if (*p != ',' && !IS_SPACE(*p))
+	    break;
+	while (IS_SPACE(*p))
+	    p++;
+	if (*p == ',')
+	    p++;
+    }
+    if (i != a->ncoords || (a->shape == SHAPE_POLY && a->ncoords < 6)) {
+	a->shape = SHAPE_UNKNOWN;
+	a->coords = NULL;
+	a->ncoords = 0;
+    }
+    if (a->shape == SHAPE_POLY) {
+	a->ncoords = a->ncoords / 2 * 2;
+	a->coords[a->ncoords] = a->coords[0];
+	a->coords[a->ncoords + 1] = a->coords[1];
+    }
+#endif
+#endif
+    return a;
+}
 
 /* append frame URL */
 static void
Binary files w3m-0.2.4/map.o and w3m-0.2.4-img-js/map.o differ
diff -u w3m-0.2.4/menu.c w3m-0.2.4-img-js/menu.c
--- w3m-0.2.4/menu.c	Mon Dec 10 17:02:44 2001
+++ w3m-0.2.4-img-js/menu.c	Thu Jan 17 16:09:21 2002
@@ -1327,8 +1327,13 @@
 	return;
     for (i = 0, buf = Firstbuf; i < SelectV; i++, buf = buf->nextBuffer) ;
     Currentbuf = buf;
-    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);
     }
 }
Binary files w3m-0.2.4/menu.o and w3m-0.2.4-img-js/menu.o differ
diff -u w3m-0.2.4/parsetagx.c w3m-0.2.4-img-js/parsetagx.c
--- w3m-0.2.4/parsetagx.c	Sun Dec  2 16:26:08 2001
+++ w3m-0.2.4-img-js/parsetagx.c	Thu Jan 17 16:09:21 2002
@@ -73,6 +73,12 @@
 	*align = ALIGN_RIGHT;
     else if (strcasecmp(oval, "center") == 0)
 	*align = ALIGN_CENTER;
+    else if (strcasecmp(oval, "top") == 0)
+	*align = ALIGN_TOP;
+    else if (strcasecmp(oval, "bottom") == 0)
+	*align = ALIGN_BOTTOM;
+    else if (strcasecmp(oval, "middle") == 0)
+	*align = ALIGN_MIDDLE;
     else
 	return 0;
     return 1;
Binary files w3m-0.2.4/parsetagx.o and w3m-0.2.4-img-js/parsetagx.o differ
diff -u w3m-0.2.4/proto.h w3m-0.2.4-img-js/proto.h
--- w3m-0.2.4/proto.h	Thu Jan 17 17:26:10 2002
+++ w3m-0.2.4-img-js/proto.h	Thu Jan 17 17:03:52 2002
@@ -101,6 +101,13 @@
 extern void extbrz(void);
 extern void linkbrz(void);
 extern void curlno(void);
+#ifdef USE_IMAGE
+extern void dispI(void);
+extern void stopI(void);
+#else
+#define dispI nulcmd
+#define stopI nulcmd
+#endif
 #ifdef USE_ALARM
 extern void setAlarm(void);
 extern void setAlarmEvent(int sec, short status, int cmd, void *data);
@@ -131,7 +138,14 @@
 			    struct readbuffer *obuf);
 extern void restore_fonteffect(struct html_feed_environ *h_env,
 			       struct readbuffer *obuf);
-extern Str process_img(struct parsed_tag *tag);
+#ifdef USE_IMAGE
+extern void deleteImage(Buffer *buf);
+extern void getAllImage(Buffer *buf);
+extern void loadImage(int flag);
+extern ImageCache *getImage(Image * image, ParsedURL *current, int flag);
+extern int getImageSize(ImageCache * cache);
+#endif
+extern Str process_img(struct parsed_tag *tag, int width);
 extern Str process_anchor(struct parsed_tag *tag, char *tagbuf);
 extern Str process_input(struct parsed_tag *tag);
 extern void process_select(struct parsed_tag *tag);
@@ -141,6 +155,13 @@
 extern Str process_textarea(struct parsed_tag *tag, int width);
 extern Str process_n_textarea(void);
 extern void feed_textarea(char *str);
+#ifdef USE_SCRIPT
+extern Str process_script(struct parsed_tag *tag);
+extern Str process_n_script(void);
+extern void feed_script(char *str);
+extern Str script_eval(Buffer *buf, char *lang, char *script);
+extern void script_close(Buffer *buf);
+#endif
 extern Str process_form(struct parsed_tag *tag);
 extern Str process_n_form(void);
 extern int HTMLtagproc1(struct parsed_tag *tag,
@@ -162,6 +183,9 @@
 extern Buffer *loadGopherDir(URLFile *uf, Buffer *newBuf);
 #endif				/* USE_GOPHER */
 extern Buffer *loadBuffer(URLFile *uf, Buffer *newBuf);
+#ifdef USE_IMAGE
+extern Buffer *loadImageBuffer(URLFile *uf, Buffer *newBuf);
+#endif
 extern void saveBuffer(Buffer *buf, FILE * f);
 extern void saveBufferDelNum(Buffer *buf, FILE * f, int del);
 extern Buffer *getshell(char *cmd);
@@ -307,11 +331,15 @@
 				 char *filename, char *file);
 extern void follow_map(struct parsed_tagarg *arg);
 #ifdef MENU_MAP
-extern char *follow_map_menu(Buffer *buf, struct parsed_tagarg *arg, int x,
-			     int y);
+extern char *follow_map_menu(Buffer *buf, struct parsed_tagarg *arg,
+			     Anchor *a_img, int x, int y);
 #else
 extern Buffer *follow_map_panel(Buffer *buf, struct parsed_tagarg *arg);
 #endif
+#ifdef USE_IMAGE
+extern int getMapXY(Buffer *buf, Anchor *a, int *x, int *y);
+#endif
+extern MapArea *newMapArea(char *url, char *alt, char *shape, char *coords);
 extern Buffer *page_info_panel(Buffer *buf);
 extern struct frame_body *newFrame(struct parsed_tag *tag, Buffer *buf);
 extern struct frameset *newFrameSet(struct parsed_tag *tag);
@@ -513,6 +541,11 @@
 #define prevMk nulcmd
 #define reMark nulcmd
 #endif				/* not USE_MARK */
+#ifdef JP_CHARSET
+extern char *cURLcode(char *url, char code);
+#else
+#define cURLcode(url,buf) (url)
+#endif
 
 #ifdef USE_MOUSE
 extern void mouse(void);
@@ -525,6 +558,15 @@
 #define mouse nulcmd
 #define msToggle nulcmd
 #endif				/* not USE_MOUSE */
+
+#ifdef USE_IMAGE
+extern void initImage(void);
+extern void termImage(void);
+extern void addImage(ImageCache * cache, int x, int y, int sx, int sy, int w,
+		     int h);
+extern void drawImage(void);
+extern void clearImage(void);
+#endif
 
 extern char *searchKeyData(void);
 
diff -u w3m-0.2.4/rc.c w3m-0.2.4-img-js/rc.c
--- w3m-0.2.4/rc.c	Thu Dec 27 17:37:49 2001
+++ w3m-0.2.4-img-js/rc.c	Thu Jan 17 16:09:21 2002
@@ -52,11 +52,13 @@
 #endif
 #define P_PIXELS   8
 #define P_NZINT    9
+#define P_SCALE    10
 
 #if LANG == JA
 #define CMT_HELPER	 "外部ビューアの編集"
 #define CMT_TABSTOP      "タブ幅"
 #define CMT_PIXEL_PER_CHAR      "文字幅 (4.0...32.0)"
+#define CMT_PIXEL_PER_LINE      "一行の高さ (4.0...64.0)"
 #define CMT_PAGERLINE    "ページャとして利用した時に保存される行数"
 #define CMT_HISTSIZE     "保持するURL履歴の数"
 #define CMT_SAVEHIST     "URL履歴の保存"
@@ -65,6 +67,14 @@
 #define CMT_ARGV_IS_URL  "scheme のない引数も URL とみなす"
 #define CMT_TSELF        "targetが未指定の場合に_selfを使用する"
 #define CMT_DISPLINK     "リンク先の自動表示"
+#ifdef USE_IMAGE
+#define CMT_DISP_IMAGE   "インライン画像を表示"
+#define CMT_AUTO_IMAGE   "インライン画像を自動で読み込む"
+#define CMT_EXT_IMAGE_VIEWER   "画像を外部ビューワで表示"
+#define CMT_IMAGE_SCALE  "画像のスケール(%)"
+#define CMT_IMGDISPLAY   "画像を表示するためのコマンド"
+#define CMT_IMGSIZE      "画像の大きさを得るためのコマンド"
+#endif
 #define CMT_MULTICOL     "ファイル名のマルチカラム表示"
 #define CMT_ALT_ENTITY   "エンティティを ASCII の代替表現で表す"
 #define CMT_FOLD_TEXTAREA "TEXTAREA の行を折り返して表示"
@@ -174,6 +184,7 @@
 #define CMT_HELPER	 "External Viewer Setup"
 #define CMT_TABSTOP      "Tab width"
 #define CMT_PIXEL_PER_CHAR      "# of pixels per character (4.0...32.0)"
+#define CMT_PIXEL_PER_LINE      "# of pixels per line (4.0...64.0)"
 #define CMT_PAGERLINE    "# of reserved line when w3m is used as a pager"
 #define CMT_HISTSIZE     "# of reserved URL"
 #define CMT_SAVEHIST     "Save URL history"
@@ -182,6 +193,14 @@
 #define CMT_ARGV_IS_URL  "Force argument without scheme to URL"
 #define CMT_TSELF        "Use _self as default target"
 #define CMT_DISPLINK     "Automatic display of link URL"
+#ifdef USE_IMAGE
+#define CMT_DISP_IMAGE   "Display of inline image"
+#define CMT_AUTO_IMAGE   "Automatic loading of inline image"
+#define CMT_EXT_IMAGE_VIEWER   "Use external image viewer"
+#define CMT_IMAGE_SCALE  "Scale of image (%)"
+#define CMT_IMGDISPLAY   "External command to display image"
+#define CMT_IMGSIZE      "External command to get size of image"
+#endif
 #define CMT_MULTICOL     "Multi-column output of file names"
 #define CMT_ALT_ENTITY   "Use alternate expression with ASCII for entity"
 #define CMT_FOLD_TEXTAREA "Fold lines of TEXTAREA"
@@ -373,6 +392,10 @@
     {"tabstop", P_NZINT, PI_TEXT, (void *)&Tabstop, CMT_TABSTOP, NULL},
     {"pixel_per_char", P_PIXELS, PI_TEXT, (void *)&pixel_per_char,
      CMT_PIXEL_PER_CHAR, NULL},
+#ifdef USE_IMAGE
+    {"pixel_per_line", P_PIXELS, PI_TEXT, (void *)&pixel_per_line,
+     CMT_PIXEL_PER_LINE, NULL},
+#endif
 #ifdef JP_CHARSET
     {"kanjicode", P_CODE, PI_SEL_C, (void *)&DisplayCode, CMT_KANJICODE,
      kcodestr},
@@ -398,6 +421,18 @@
      CMT_IGNORE_NULL_IMG_ALT, NULL},
     {"view_unseenobject", P_INT, PI_ONOFF, (void *)&view_unseenobject,
      CMT_VIEW_UNSEENOBJECTS, NULL},
+#ifdef USE_IMAGE
+    {"display_image", P_INT, PI_ONOFF, (void *)&displayImage, CMT_DISP_IMAGE,
+     NULL},
+    {"auto_image", P_INT, PI_ONOFF, (void *)&autoImage, CMT_AUTO_IMAGE, NULL},
+    {"ext_image_viewer", P_INT, PI_ONOFF, (void *)&useExtImageViewer,
+     CMT_EXT_IMAGE_VIEWER, NULL},
+    {"image_scale", P_SCALE, PI_TEXT, (void *)&image_scale, CMT_IMAGE_SCALE,
+     NULL},
+    {"imgdisplay", P_STRING, PI_TEXT, (void *)&Imgdisplay, CMT_IMGDISPLAY,
+     NULL},
+    {"imgsize", P_STRING, PI_TEXT, (void *)&Imgsize, CMT_IMGSIZE, NULL},
+#endif
     {"show_lnum", P_INT, PI_ONOFF, (void *)&showLineNum, CMT_SHOW_NUM, NULL},
     {"show_srch_str", P_INT, PI_ONOFF, (void *)&show_srch_str,
      CMT_SHOW_SRCH_STR, NULL},
@@ -764,6 +799,9 @@
 	    case P_PIXELS:
 		t = "number";
 		break;
+	    case P_SCALE:
+		t = "percent";
+		break;
 	    }
 #ifdef JP_CHARSET
 	    if (InnerCode != DisplayCode)
@@ -965,7 +1003,12 @@
 #endif
     case P_PIXELS:
 	ppc = atof(value);
-	if (ppc >= MINIMUM_PIXEL_PER_CHAR && ppc <= MAXIMUM_PIXEL_PER_CHAR)
+	if (ppc >= MINIMUM_PIXEL_PER_CHAR && ppc <= MAXIMUM_PIXEL_PER_CHAR * 2)
+	    *(double *)p->varptr = ppc;
+	break;
+    case P_SCALE:
+	ppc = atof(value);
+	if (ppc >= 10 && ppc <= 1000)
 	    *(double *)p->varptr = ppc;
 	break;
     }
@@ -1201,6 +1244,7 @@
 #endif
 	return Strnew_charp(*(char **)p->varptr);
     case P_PIXELS:
+    case P_SCALE:
 	return Sprintf("%g", *(double *)p->varptr);
     }
     /* not reached */
Binary files w3m-0.2.4/rc.o and w3m-0.2.4-img-js/rc.o differ
Only in w3m-0.2.4-img-js: script.c
Binary files w3m-0.2.4/script.o and w3m-0.2.4-img-js/script.o differ
Common subdirectories: w3m-0.2.4/scripts and w3m-0.2.4-img-js/scripts
diff -u w3m-0.2.4/table.c w3m-0.2.4-img-js/table.c
--- w3m-0.2.4/table.c	Thu Jan 17 17:26:10 2002
+++ w3m-0.2.4-img-js/table.c	Thu Jan 17 17:03:52 2002
@@ -2341,6 +2341,16 @@
     feed_table1(tbl, tmp, mode, width);
 }
 
+#ifdef USE_SCRIPT
+static void
+table_close_script(struct table *tbl, struct table_mode *mode, int width)
+{
+    Str tmp = process_n_script();
+    mode->pre_mode &= ~TBLM_SCRIPT;
+    feed_table1(tbl, tmp, mode, width);
+}
+#endif
+
 static void
 table_close_anchor0(struct table *tbl, struct table_mode *mode)
 {
@@ -2403,9 +2413,11 @@
 	case HTML_N_STYLE:
 	    mode->pre_mode &= ~TBLM_STYLE;
 	    return TAG_ACTION_NONE;
+#ifndef USE_SCRIPT
 	case HTML_N_SCRIPT:
 	    mode->pre_mode &= ~TBLM_SCRIPT;
 	    return TAG_ACTION_NONE;
+#endif
 	default:
 	    return TAG_ACTION_NONE;
 	}
@@ -2419,6 +2431,10 @@
 	    mode->pre_mode &= ~(TBLM_IGNORE | TBLM_XMP | TBLM_LST);
 	if (mode->pre_mode & TBLM_INTXTA)
 	    table_close_textarea(tbl, mode, width);
+#ifdef USE_SCRIPT
+	if (mode->pre_mode & TBLM_SCRIPT)
+	    table_close_script(tbl, mode, width);
+#endif
 	if (mode->pre_mode & TBLM_INSELECT)
 	    table_close_select(tbl, mode, width);
     }
@@ -2441,6 +2457,9 @@
 
     if ((mode->pre_mode & TBLM_INSELECT && cmd != HTML_N_SELECT) ||
 	(mode->pre_mode & TBLM_INTXTA && cmd != HTML_N_TEXTAREA) ||
+#ifdef USE_SCRIPT
+	(mode->pre_mode & TBLM_SCRIPT && cmd != HTML_N_SCRIPT) ||
+#endif
 	(mode->pre_mode & TBLM_XMP && cmd != HTML_N_XMP) ||
 	(mode->pre_mode & TBLM_LST && cmd != HTML_N_LISTING))
 	return TAG_ACTION_FEED;
@@ -2782,7 +2801,22 @@
 	mode->pre_mode &= ~TBLM_PRE_INT;
 	break;
     case HTML_IMG:
-	tok = process_img(tag);
+	w = tbl->fixed_width[tbl->col];
+	if (w < 0) {
+	    if (tbl->total_width > 0)
+		w = -tbl->total_width * w / 100;
+	    else if (width > 0)
+		w = -width * w / 100;
+	    else
+		w = 0;
+	}
+	else if (w == 0) {
+	    if (tbl->total_width > 0)
+		w = tbl->total_width;
+	    else if (width > 0)
+		w = width;
+	}
+	tok = process_img(tag, w);
 	feed_table1(tbl, tok, mode, width);
 	break;
     case HTML_FORM:
@@ -2826,6 +2860,15 @@
     case HTML_N_TEXTAREA:
 	table_close_textarea(tbl, mode, width);
 	break;
+#ifdef USE_SCRIPT
+    case HTML_SCRIPT:
+	process_script(tag);
+	mode->pre_mode |= TBLM_SCRIPT;
+	break;
+    case HTML_N_SCRIPT:
+	table_close_script(tbl, mode, width);
+	break;
+#endif
     case HTML_A:
 	table_close_anchor0(tbl, mode);
 	anchor = NULL;
@@ -2905,9 +2948,11 @@
     case HTML_N_COLGROUP:
     case HTML_COL:
 	break;
+#ifndef USE_SCRIPT
     case HTML_SCRIPT:
 	mode->pre_mode |= TBLM_SCRIPT;
 	break;
+#endif
     case HTML_STYLE:
 	mode->pre_mode |= TBLM_STYLE;
 	break;
@@ -2948,6 +2993,12 @@
 	struct parsed_tag *tag;
 	p = line;
 	tag = parse_tag(&p, internal);
+#ifdef USE_SCRIPT
+	if ((mode->pre_mode & TBLM_SCRIPT) &&
+	    tag && (tag->tagid != HTML_N_SCRIPT))
+		;
+	else
+#endif
 	if (tag) {
 	    action = feed_table_tag(tbl, line, mode, width, tag);
 	    if (action == TAG_ACTION_NONE)
@@ -2961,7 +3012,11 @@
 		line = parsedtag2str(tag)->ptr;
 	}
 	else {
+#ifdef USE_SCRIPT
+	    if (!(mode->pre_mode & (TBLM_PLAIN|TBLM_SCRIPT)))
+#else
 	    if (!(mode->pre_mode & TBLM_PLAIN))
+#endif
 		return -1;
 	}
     }
@@ -2975,6 +3030,12 @@
 	feed_textarea(line);
 	return -1;
     }
+#ifdef USE_SCRIPT
+    if (mode->pre_mode & TBLM_SCRIPT) {
+	feed_script(line);
+	return -1;
+    }
+#endif
     if (mode->pre_mode & TBLM_INSELECT) {
 	feed_select(line);
 	return -1;
diff -u w3m-0.2.4/table.h w3m-0.2.4-img-js/table.h
--- w3m-0.2.4/table.h	Thu Jan 17 17:26:10 2002
+++ w3m-0.2.4-img-js/table.h	Thu Jan 17 17:03:52 2002
@@ -121,12 +121,17 @@
 #define TBLM_PRE_INT 32
 #define TBLM_INTXTA 64
 #define TBLM_INSELECT 128
+#ifdef USE_SCRIPT
+#define TBLM_PREMODE (TBLM_PRE|TBLM_INTXTA|TBLM_INSELECT|TBLM_PLAIN|TBLM_SCRIPT)
+#define TBLM_IGNORE (TBLM_STYLE)
+#else
 #define TBLM_PREMODE (TBLM_PRE|TBLM_INTXTA|TBLM_INSELECT|TBLM_PLAIN)
+#define TBLM_IGNORE (TBLM_SCRIPT|TBLM_STYLE)
+#endif
 #define TBLM_SPECIAL (TBLM_PRE|TBLM_PRE_INT|TBLM_PLAIN)
 #define TBLM_PLAIN (TBLM_PLAINTEXT|TBLM_XMP|TBLM_LST)
 #define TBLM_SCRIPT 256
 #define TBLM_STYLE 512
-#define TBLM_IGNORE (TBLM_SCRIPT|TBLM_STYLE)
 #define TBLM_ANCHOR 1024
 
 #define  uchar           unsigned char
Binary files w3m-0.2.4/table.o and w3m-0.2.4-img-js/table.o differ
diff -u w3m-0.2.4/tagtable.c w3m-0.2.4-img-js/tagtable.c
--- w3m-0.2.4/tagtable.c	Thu Jan 17 17:24:34 2002
+++ w3m-0.2.4-img-js/tagtable.c	Thu Jan 17 17:16:29 2002
@@ -84,77 +84,78 @@
   /* 79 */ {"/h1",HTML_N_H,NULL},
   /* 80 */ {"tr",HTML_TR,&MyHashItem[81]},
   /* 81 */ {"/h2",HTML_N_H,NULL},
-  /* 82 */ {"/h3",HTML_N_H,NULL},
-  /* 83 */ {"pre_int",HTML_PRE_INT,&MyHashItem[84]},
-  /* 84 */ {"/font",HTML_N_FONT,&MyHashItem[85]},
-  /* 85 */ {"tt",HTML_NOP,&MyHashItem[86]},
-  /* 86 */ {"/h4",HTML_N_H,NULL},
-  /* 87 */ {"body",HTML_BODY,&MyHashItem[88]},
-  /* 88 */ {"/form",HTML_N_FORM,&MyHashItem[89]},
-  /* 89 */ {"/h5",HTML_N_H,NULL},
-  /* 90 */ {"/h6",HTML_N_H,NULL},
-  /* 91 */ {"frame",HTML_FRAME,NULL},
-  /* 92 */ {"/img_alt",HTML_N_IMG_ALT,&MyHashItem[93]},
-  /* 93 */ {"/center",HTML_N_CENTER,NULL},
-  /* 94 */ {"/pre",HTML_N_PRE,NULL},
-  /* 95 */ {"tfoot",HTML_TFOOT,NULL},
-  /* 96 */ {"ins",HTML_INS,NULL},
-  /* 97 */ {"/var",HTML_NOP,NULL},
-  /* 98 */ {"h1",HTML_H,NULL},
-  /* 99 */ {"/tfoot",HTML_N_TFOOT,&MyHashItem[100]},
-  /* 100 */ {"input",HTML_INPUT,&MyHashItem[101]},
-  /* 101 */ {"h2",HTML_H,NULL},
-  /* 102 */ {"h3",HTML_H,NULL},
-  /* 103 */ {"h4",HTML_H,NULL},
-  /* 104 */ {"h5",HTML_H,NULL},
-  /* 105 */ {"h6",HTML_H,NULL},
-  /* 106 */ {"/pre_int",HTML_N_PRE_INT,NULL},
-  /* 107 */ {"/menu",HTML_N_UL,NULL},
-  /* 108 */ {"form_int",HTML_FORM_INT,NULL},
-  /* 109 */ {"style",HTML_STYLE,&MyHashItem[110]},
-  /* 110 */ {"address",HTML_BR,NULL},
-  /* 111 */ {"/textarea",HTML_N_TEXTAREA,NULL},
-  /* 112 */ {"/input_alt",HTML_N_INPUT_ALT,NULL},
-  /* 113 */ {"doctype",HTML_DOCTYPE,&MyHashItem[114]},
-  /* 114 */ {"/style",HTML_N_STYLE,NULL},
-  /* 115 */ {"/html",HTML_N_BODY,NULL},
-  /* 116 */ {"pre",HTML_PRE,&MyHashItem[117]},
-  /* 117 */ {"title",HTML_TITLE,NULL},
-  /* 118 */ {"select",HTML_SELECT,NULL},
-  /* 119 */ {"var",HTML_NOP,NULL},
-  /* 120 */ {"/title",HTML_N_TITLE,NULL},
-  /* 121 */ {"embed",HTML_EMBED,&MyHashItem[122]},
-  /* 122 */ {"colgroup",HTML_COLGROUP,&MyHashItem[123]},
-  /* 123 */ {"/head",HTML_N_HEAD,&MyHashItem[124]},
-  /* 124 */ {"isindex",HTML_ISINDEX,NULL},
-  /* 125 */ {"strike",HTML_DEL,&MyHashItem[126]},
-  /* 126 */ {"listing",HTML_LISTING,NULL},
-  /* 127 */ {"bgsound",HTML_BGSOUND,NULL},
-  /* 128 */ {"/address",HTML_BR,NULL},
-  /* 129 */ {"thead",HTML_THEAD,&MyHashItem[130]},
-  /* 130 */ {"wbr",HTML_WBR,&MyHashItem[131]},
-  /* 131 */ {"/del",HTML_N_DEL,&MyHashItem[132]},
-  /* 132 */ {"/nobr",HTML_N_NOBR,&MyHashItem[133]},
-  /* 133 */ {"/select",HTML_N_SELECT,&MyHashItem[134]},
-  /* 134 */ {"frameset",HTML_FRAMESET,&MyHashItem[135]},
-  /* 135 */ {"/xmp",HTML_N_XMP,NULL},
-  /* 136 */ {"/code",HTML_NOP,NULL},
-  /* 137 */ {"/thead",HTML_N_THEAD,&MyHashItem[138]},
-  /* 138 */ {"/samp",HTML_NOP,&MyHashItem[139]},
-  /* 139 */ {"/dfn",HTML_NOP,&MyHashItem[140]},
-  /* 140 */ {"_id",HTML_NOP,NULL},
-  /* 141 */ {"/strike",HTML_N_DEL,&MyHashItem[142]},
-  /* 142 */ {"/a",HTML_N_A,NULL},
-  /* 143 */ {"/b",HTML_N_B,NULL},
-  /* 144 */ {"font",HTML_FONT,&MyHashItem[145]},
-  /* 145 */ {"/dl",HTML_N_DL,NULL},
-  /* 146 */ {"form",HTML_FORM,&MyHashItem[147]},
-  /* 147 */ {"/cite",HTML_NOP,&MyHashItem[148]},
-  /* 148 */ {"a",HTML_A,NULL},
-  /* 149 */ {"b",HTML_B,NULL},
-  /* 150 */ {"/listing",HTML_N_LISTING,&MyHashItem[151]},
-  /* 151 */ {"/em",HTML_N_EM,&MyHashItem[152]},
-  /* 152 */ {"/i",HTML_NOP,NULL},
+  /* 82 */ {"image",HTML_IMG,&MyHashItem[83]},
+  /* 83 */ {"/h3",HTML_N_H,NULL},
+  /* 84 */ {"pre_int",HTML_PRE_INT,&MyHashItem[85]},
+  /* 85 */ {"/font",HTML_N_FONT,&MyHashItem[86]},
+  /* 86 */ {"tt",HTML_NOP,&MyHashItem[87]},
+  /* 87 */ {"/h4",HTML_N_H,NULL},
+  /* 88 */ {"body",HTML_BODY,&MyHashItem[89]},
+  /* 89 */ {"/form",HTML_N_FORM,&MyHashItem[90]},
+  /* 90 */ {"/h5",HTML_N_H,NULL},
+  /* 91 */ {"/h6",HTML_N_H,NULL},
+  /* 92 */ {"frame",HTML_FRAME,NULL},
+  /* 93 */ {"/img_alt",HTML_N_IMG_ALT,&MyHashItem[94]},
+  /* 94 */ {"/center",HTML_N_CENTER,NULL},
+  /* 95 */ {"/pre",HTML_N_PRE,NULL},
+  /* 96 */ {"tfoot",HTML_TFOOT,NULL},
+  /* 97 */ {"ins",HTML_INS,NULL},
+  /* 98 */ {"/var",HTML_NOP,NULL},
+  /* 99 */ {"h1",HTML_H,NULL},
+  /* 100 */ {"/tfoot",HTML_N_TFOOT,&MyHashItem[101]},
+  /* 101 */ {"input",HTML_INPUT,&MyHashItem[102]},
+  /* 102 */ {"h2",HTML_H,NULL},
+  /* 103 */ {"h3",HTML_H,NULL},
+  /* 104 */ {"h4",HTML_H,NULL},
+  /* 105 */ {"h5",HTML_H,NULL},
+  /* 106 */ {"h6",HTML_H,NULL},
+  /* 107 */ {"/pre_int",HTML_N_PRE_INT,NULL},
+  /* 108 */ {"/menu",HTML_N_UL,NULL},
+  /* 109 */ {"form_int",HTML_FORM_INT,NULL},
+  /* 110 */ {"style",HTML_STYLE,&MyHashItem[111]},
+  /* 111 */ {"address",HTML_BR,NULL},
+  /* 112 */ {"/textarea",HTML_N_TEXTAREA,NULL},
+  /* 113 */ {"/input_alt",HTML_N_INPUT_ALT,NULL},
+  /* 114 */ {"doctype",HTML_DOCTYPE,&MyHashItem[115]},
+  /* 115 */ {"/style",HTML_N_STYLE,NULL},
+  /* 116 */ {"/html",HTML_N_BODY,NULL},
+  /* 117 */ {"pre",HTML_PRE,&MyHashItem[118]},
+  /* 118 */ {"title",HTML_TITLE,NULL},
+  /* 119 */ {"select",HTML_SELECT,NULL},
+  /* 120 */ {"var",HTML_NOP,NULL},
+  /* 121 */ {"/title",HTML_N_TITLE,NULL},
+  /* 122 */ {"embed",HTML_EMBED,&MyHashItem[123]},
+  /* 123 */ {"colgroup",HTML_COLGROUP,&MyHashItem[124]},
+  /* 124 */ {"/head",HTML_N_HEAD,&MyHashItem[125]},
+  /* 125 */ {"isindex",HTML_ISINDEX,NULL},
+  /* 126 */ {"strike",HTML_DEL,&MyHashItem[127]},
+  /* 127 */ {"listing",HTML_LISTING,NULL},
+  /* 128 */ {"bgsound",HTML_BGSOUND,NULL},
+  /* 129 */ {"/address",HTML_BR,NULL},
+  /* 130 */ {"thead",HTML_THEAD,&MyHashItem[131]},
+  /* 131 */ {"wbr",HTML_WBR,&MyHashItem[132]},
+  /* 132 */ {"/del",HTML_N_DEL,&MyHashItem[133]},
+  /* 133 */ {"/nobr",HTML_N_NOBR,&MyHashItem[134]},
+  /* 134 */ {"/select",HTML_N_SELECT,&MyHashItem[135]},
+  /* 135 */ {"frameset",HTML_FRAMESET,&MyHashItem[136]},
+  /* 136 */ {"/xmp",HTML_N_XMP,NULL},
+  /* 137 */ {"/code",HTML_NOP,NULL},
+  /* 138 */ {"/thead",HTML_N_THEAD,&MyHashItem[139]},
+  /* 139 */ {"/samp",HTML_NOP,&MyHashItem[140]},
+  /* 140 */ {"/dfn",HTML_NOP,&MyHashItem[141]},
+  /* 141 */ {"_id",HTML_NOP,NULL},
+  /* 142 */ {"/strike",HTML_N_DEL,&MyHashItem[143]},
+  /* 143 */ {"/a",HTML_N_A,NULL},
+  /* 144 */ {"/b",HTML_N_B,NULL},
+  /* 145 */ {"font",HTML_FONT,&MyHashItem[146]},
+  /* 146 */ {"/dl",HTML_N_DL,NULL},
+  /* 147 */ {"form",HTML_FORM,&MyHashItem[148]},
+  /* 148 */ {"/cite",HTML_NOP,&MyHashItem[149]},
+  /* 149 */ {"a",HTML_A,NULL},
+  /* 150 */ {"b",HTML_B,NULL},
+  /* 151 */ {"/listing",HTML_N_LISTING,&MyHashItem[152]},
+  /* 152 */ {"/em",HTML_N_EM,&MyHashItem[153]},
+  /* 153 */ {"/i",HTML_NOP,NULL},
 };
 
 static HashItem_si *MyHashItemTbl[] = {
@@ -206,58 +207,58 @@
   &MyHashItem[77],
   &MyHashItem[80],
   &MyHashItem[82],
-  &MyHashItem[83],
-  &MyHashItem[87],
-  &MyHashItem[90],
+  &MyHashItem[84],
+  &MyHashItem[88],
   &MyHashItem[91],
   &MyHashItem[92],
-  &MyHashItem[94],
+  &MyHashItem[93],
   &MyHashItem[95],
   &MyHashItem[96],
   &MyHashItem[97],
   &MyHashItem[98],
   &MyHashItem[99],
-  &MyHashItem[102],
+  &MyHashItem[100],
   &MyHashItem[103],
   &MyHashItem[104],
   &MyHashItem[105],
-  NULL,
   &MyHashItem[106],
+  NULL,
   &MyHashItem[107],
+  &MyHashItem[108],
   NULL,
   NULL,
-  &MyHashItem[108],
   &MyHashItem[109],
+  &MyHashItem[110],
   NULL,
-  &MyHashItem[111],
   &MyHashItem[112],
   &MyHashItem[113],
-  &MyHashItem[115],
-  NULL,
-  NULL,
+  &MyHashItem[114],
   &MyHashItem[116],
-  &MyHashItem[118],
   NULL,
+  NULL,
+  &MyHashItem[117],
   &MyHashItem[119],
+  NULL,
   &MyHashItem[120],
   &MyHashItem[121],
-  &MyHashItem[125],
-  &MyHashItem[127],
+  &MyHashItem[122],
+  &MyHashItem[126],
   &MyHashItem[128],
   &MyHashItem[129],
+  &MyHashItem[130],
   NULL,
   NULL,
-  &MyHashItem[136],
   &MyHashItem[137],
-  &MyHashItem[141],
-  &MyHashItem[143],
+  &MyHashItem[138],
+  &MyHashItem[142],
+  &MyHashItem[144],
   NULL,
   NULL,
   NULL,
-  &MyHashItem[144],
-  &MyHashItem[146],
-  &MyHashItem[149],
+  &MyHashItem[145],
+  &MyHashItem[147],
   &MyHashItem[150],
+  &MyHashItem[151],
 };
 
 Hash_si tagtable = {100, MyHashItemTbl};
Binary files w3m-0.2.4/tagtable.o and w3m-0.2.4-img-js/tagtable.o differ
diff -u w3m-0.2.4/tagtable.tab w3m-0.2.4-img-js/tagtable.tab
--- w3m-0.2.4/tagtable.tab	Thu Dec  6 15:31:58 2001
+++ w3m-0.2.4-img-js/tagtable.tab	Thu Jan 17 16:09:21 2002
@@ -45,6 +45,7 @@
 blockquote	HTML_BLQ
 /blockquote	HTML_N_BLQ
 img		HTML_IMG
+image		HTML_IMG
 code		HTML_NOP
 /code		HTML_NOP
 dfn		HTML_NOP
diff -u w3m-0.2.4/terms.c w3m-0.2.4-img-js/terms.c
--- w3m-0.2.4/terms.c	Tue Dec 25 16:54:45 2001
+++ w3m-0.2.4-img-js/terms.c	Thu Jan 17 16:09:21 2002
@@ -1865,7 +1865,14 @@
 {
     char c;
 
-    read(tty, &c, 1);
+    /* read(tty, &c, 1); */
+    while (read(tty, &c, 1) < (ssize_t) 1) {
+	if (errno == EINTR || errno == EAGAIN)
+	    continue;
+	/* error happend on read(2) */
+	quitfm();
+	break;			/* unreachable */
+    }
     return c;
 }
 
@@ -2159,3 +2166,233 @@
 {
     fflush(ttyf);
 }
+
+#ifdef USE_IMAGE
+typedef struct _termialImage {
+    ImageCache *cache;
+    short x;
+    short y;
+    short sx;
+    short sy;
+    short width;
+    short height;
+} TerminalImage;
+
+static TerminalImage *terminal_image = NULL;
+static int n_terminal_image = 0;
+static int max_terminal_image = 0;
+static FILE *Imgdisplay_rf = NULL, *Imgdisplay_wf = NULL;
+static pid_t Imgdisplay_pid = 0;
+int activeImgdisplay = FALSE;
+int volatile SigPipeReturn = 0;
+extern image_index;
+
+MySignalHandler
+SigPipe(SIGNAL_ARG)
+{
+    signal(SIGPIPE, SigPipe);
+    SigPipeReturn = 1;
+    SIGNAL_RETURN;
+}
+
+void
+initImage()
+{
+    char *cmd;
+
+    if (activeImage)
+	return;
+    if (Imgdisplay[0] != '/')
+	cmd = Sprintf("%s/%s", LIB_DIR, Imgdisplay)->ptr;
+    else
+	cmd = Imgdisplay;
+    if (system(Sprintf("%s -test", cmd)->ptr)) {
+	activeImage = FALSE;
+	return;
+    }
+    activeImage = TRUE;
+}
+
+void
+initImgdisplay()
+{
+    int rfd[2], wfd[2];
+    char *cmd;
+
+    if (activeImgdisplay)
+	return;
+    activeImage = FALSE;
+    flush_tty();
+    if (pipe(rfd) < 0)
+	return;
+    if (pipe(wfd) < 0) {
+	close(rfd[0]);
+	close(rfd[1]);
+	return;
+    }
+    signal(SIGPIPE, SigPipe);
+    if ((Imgdisplay_pid = fork()) == 0) {
+	signal(SIGHUP, SIG_IGN);
+	signal(SIGINT, SIG_IGN);
+	signal(SIGQUIT, SIG_IGN);
+	signal(SIGTERM, SIG_IGN);
+	close_tty();
+	close(rfd[0]);
+	close(wfd[1]);
+	dup2(rfd[1], 1);
+	dup2(wfd[0], 0);
+	if (Imgdisplay[0] != '/')
+	    cmd = Sprintf("%s/%s", LIB_DIR, Imgdisplay)->ptr;
+	else
+	    cmd = Imgdisplay;
+	execl("/bin/sh", "sh", "-c", cmd, NULL);
+	exit(1);
+    }
+    close(rfd[1]);
+    close(wfd[0]);
+    if (Imgdisplay_pid < 0) {
+	close(rfd[0]);
+	close(wfd[1]);
+	return;
+    }
+    Imgdisplay_rf = fdopen(rfd[0], "r");
+    Imgdisplay_wf = fdopen(wfd[1], "w");
+    if (!Imgdisplay_rf || !Imgdisplay_wf) {
+	close(rfd[0]);
+	close(wfd[1]);
+	Imgdisplay_rf = NULL;
+	Imgdisplay_wf = NULL;
+	return;
+    }
+    activeImage = TRUE;
+    activeImgdisplay = TRUE;
+}
+
+void
+termImage()
+{
+    if (Imgdisplay_rf)
+	fclose(Imgdisplay_rf);
+    if (Imgdisplay_wf)
+	fclose(Imgdisplay_wf);
+    activeImage = FALSE;
+    activeImgdisplay = FALSE;
+}
+
+void
+addImage(ImageCache * cache, int x, int y, int sx, int sy, int w, int h)
+{
+    TerminalImage *i;
+
+    if (!activeImage)
+	return;
+    if (n_terminal_image >= max_terminal_image) {
+	max_terminal_image = max_terminal_image ? (2 * max_terminal_image) : 8;
+	terminal_image = New_Reuse(TerminalImage, terminal_image,
+				   max_terminal_image);
+    }
+    i = &terminal_image[n_terminal_image];
+    i->cache = cache;
+    i->x = x;
+    i->y = y;
+    i->sx = sx;
+    i->sy = sy;
+    i->width = w;
+    i->height = h;
+    n_terminal_image++;
+}
+
+void
+drawImage()
+{
+    static char buf[64];
+    int j, draw = FALSE;
+    TerminalImage *i;
+
+    if (!activeImage)
+	return;
+    if (!n_terminal_image)
+	return;
+    for (j = 0; j < n_terminal_image; j++) {
+	i = &terminal_image[j];
+	if (!(i->cache->loaded == IMG_FLAG_LOADED &&
+	      i->width > 0 && i->height > 0))
+	    continue;
+	if (!activeImgdisplay) {
+	    initImgdisplay();
+	    if (!activeImgdisplay)
+		return;
+	}
+	if (!draw) {
+	    fputs("3;\n", Imgdisplay_wf);	/* XSync() */
+	    draw = TRUE;
+	}
+	if (i->cache->index > 0) {
+	    i->cache->index *= -1;
+	    fputs("0;", Imgdisplay_wf);	/* DrawImage() */
+	}
+	else
+	    fputs("1;", Imgdisplay_wf);	/* DrawImage(redraw) */
+	sprintf(buf, "%d;%d;%d;%d;%d;%d;%d;%d;%d;",
+		(-i->cache->index - 1) % MAX_IMAGE + 1, i->x, i->y,
+		(i->cache->width > 0) ? i->cache->width : 0,
+		(i->cache->height > 0) ? i->cache->height : 0,
+		i->sx, i->sy, i->width, i->height);
+	fputs(buf, Imgdisplay_wf);
+	fputs(i->cache->file, Imgdisplay_wf);
+	fputs("\n", Imgdisplay_wf);
+	fputs("4;\n", Imgdisplay_wf);	/* put '\n' */
+	fflush(Imgdisplay_wf);
+	if (!fgetc(Imgdisplay_rf) || SigPipeReturn) {
+	    int wait_st;
+	    kill(Imgdisplay_pid, SIGKILL);
+#ifdef HAVE_WAITPID
+	    waitpid(Imgdisplay_pid, &wait_st, 0);
+#else
+	    wait(&wait_st);
+#endif
+	    i->cache->loaded = IMG_FLAG_ERROR;
+	    image_index += MAX_IMAGE;
+	    activeImgdisplay = FALSE;
+	    SigPipeReturn = 0;
+	    return;
+	}
+    }
+    if (!draw)
+	return;
+    fputs("3;\n", Imgdisplay_wf);	/* XSync() */
+    fputs("4;\n", Imgdisplay_wf);	/* put '\n' */
+    fflush(Imgdisplay_wf);
+    fgetc(Imgdisplay_rf);
+
+    touch_line();
+    touch_column(CurColumn);
+#ifdef JP_CHARSET
+    if (CurColumn > 0 &&
+	CHMODE(ScreenImage[CurLine]->lineprop[CurColumn]) == C_WCHAR2)
+	touch_column(CurColumn - 1);
+    else if (CurColumn < COLS - 1 &&
+	     CHMODE(ScreenImage[CurLine]->lineprop[CurColumn]) == C_WCHAR1)
+	touch_column(CurColumn + 1);
+#endif
+    refresh();
+}
+
+void
+clearImage()
+{
+    if (!activeImage)
+	return;
+    n_terminal_image = 0;
+}
+
+void
+resetImage()
+{
+    if (!activeImgdisplay)
+	return;
+    fputs("2;\n", Imgdisplay_wf);	/* ClearImage() */
+    fflush(Imgdisplay_wf);
+    clearImage();
+}
+#endif
diff -u w3m-0.2.4/url.c w3m-0.2.4-img-js/url.c
--- w3m-0.2.4/url.c	Thu Jan 17 17:26:10 2002
+++ w3m-0.2.4-img-js/url.c	Thu Jan 17 17:03:52 2002
@@ -57,7 +57,12 @@
     0,				/* mailto - not defined */
 #ifdef USE_SSL
     443,			/* https */
+#else
+    0,
 #endif				/* USE_SSL */
+#ifdef USE_JAVASCRIPT
+    0,                         /* javascript - not defined */
+#endif
 };
 
 struct cmdtable schemetable[] = {
@@ -72,7 +77,12 @@
     {"mailto", SCM_MAILTO},
 #ifdef USE_SSL
     {"https", SCM_HTTPS},
+#else
+    {"???", SCM_UNKNOWN},
 #endif				/* USE_SSL */
+#ifdef USE_JAVASCRIPT
+    {"javascript", SCM_JAVASCRIPT},
+#endif
     {NULL, SCM_UNKNOWN},
 };
 
@@ -802,6 +812,12 @@
 	/* the url doesn't begin with '//' */
 	goto analyze_file;
     }
+#ifdef USE_JAVASCRIPT
+    if (p_url->scheme == SCM_JAVASCRIPT) {
+	p_url->file = allocStr(p, 0);
+	return;
+    }
+#endif
     /* scheme part has been found */
     /* get host and port */
     if (p[0] != '/' || p[1] != '/') {	/* scheme:foo or scheme:/foo */
@@ -1048,6 +1064,10 @@
     parseURL(url, pu, current);
     if (pu->scheme == SCM_MAILTO)
 	return;
+#ifdef USE_JAVASCRIPT
+    if (pu->scheme == SCM_JAVASCRIPT)
+	return;
+#endif
 
     if (pu->scheme == SCM_LOCAL)
 	pu->file = expandName(pu->file);
@@ -1185,7 +1205,12 @@
 	"mailto",
 #ifdef USE_SSL
 	"https",
+#else
+	"???",
 #endif				/* USE_SSL */
+#ifdef USE_JAVASCRIPT
+	"javascript",
+#endif
     };
 
     if (pu->scheme == SCM_UNKNOWN || pu->scheme == SCM_MISSING) {
@@ -1209,6 +1234,12 @@
 	Strcat_charp(tmp, pu->file);
 	return tmp;
     }
+#ifdef USE_JAVASCRIPT
+    if (pu->scheme == SCM_JAVASCRIPT) {
+	Strcat_charp(tmp, pu->file);
+	return tmp;
+    }
+#endif
 #ifdef USE_NNTP
     if (pu->scheme != SCM_NEWS)
 #endif				/* USE_NNTP */
@@ -1815,6 +1846,12 @@
 	fclose(fw);
 	return uf;
 #endif				/* USE_NNTP */
+#ifdef USE_JAVASCRIPT
+    case SCM_JAVASCRIPT:
+	uf.stream = NULL;
+	uf.scheme = SCM_JAVASCRIPT;
+	return uf;
+#endif
     case SCM_UNKNOWN:
     default:
 	return uf;
Binary files w3m-0.2.4/url.o and w3m-0.2.4-img-js/url.o differ
diff -u w3m-0.2.4/version.c w3m-0.2.4-img-js/version.c
--- w3m-0.2.4/version.c	Thu Jan 17 17:23:51 2002
+++ w3m-0.2.4-img-js/version.c	Thu Jan 17 17:16:01 2002
@@ -1,5 +1,5 @@
 /* $Id: version.c.in,v 1.9 2002/01/07 13:27:22 ukai Exp $ */
-#define CURRENT_VERSION "w3m/0.2.4"
+#define CURRENT_VERSION "w3m/0.2.4-img-1.18"
 
 #ifndef FM_H
 char *w3m_version = CURRENT_VERSION;
diff -u w3m-0.2.4/version.c.in w3m-0.2.4-img-js/version.c.in
--- w3m-0.2.4/version.c.in	Mon Jan  7 13:27:22 2002
+++ w3m-0.2.4-img-js/version.c.in	Thu Jan 17 16:09:21 2002
@@ -1,5 +1,5 @@
 /* $Id: version.c.in,v 1.9 2002/01/07 13:27:22 ukai Exp $ */
-#define CURRENT_VERSION "w3m/0.2.4"
+#define CURRENT_VERSION "w3m/0.2.4-img-1.18"
 
 #ifndef FM_H
 char *w3m_version = CURRENT_VERSION;
Binary files w3m-0.2.4/version.o and w3m-0.2.4-img-js/version.o differ
Binary files w3m-0.2.4/w3m and w3m-0.2.4-img-js/w3m differ
Common subdirectories: w3m-0.2.4/w3m-doc and w3m-0.2.4-img-js/w3m-doc
diff -u w3m-0.2.4/w3mhelp-lynx_en.html w3m-0.2.4-img-js/w3mhelp-lynx_en.html
--- w3m-0.2.4/w3mhelp-lynx_en.html	Thu Jan 17 17:23:51 2002
+++ w3m-0.2.4-img-js/w3mhelp-lynx_en.html	Thu Jan 17 17:16:01 2002
@@ -7,7 +7,7 @@
 ******* 
 <A HREF="http://w3m.sourceforge.net/">
 w3m</A>
- (WWW-wo-Miru)  Version 0.2.4 by 
+ (WWW-wo-Miru)  Version 0.2.4-img-1.18 by 
 <A HREF="mailto:aito@fw.ipsj.or.jp">A.ITO</A> ********<BR>
              ***** Key assign table *****
 </CENTER>
diff -u w3m-0.2.4/w3mhelp-lynx_ja.html w3m-0.2.4-img-js/w3mhelp-lynx_ja.html
--- w3m-0.2.4/w3mhelp-lynx_ja.html	Thu Jan 17 17:23:51 2002
+++ w3m-0.2.4-img-js/w3mhelp-lynx_ja.html	Thu Jan 17 17:16:01 2002
@@ -7,7 +7,7 @@
 <CENTER>
  ******* 
  <A HREF="http://w3m.sourceforge.net/">w3m</A>
- (WWW-wo-Miru) Version 0.2.4 by
+ (WWW-wo-Miru) Version 0.2.4-img-1.18 by
  <A HREF="mailto:aito@fw.ipsj.or.jp">A.ITO(伊藤彰則)</A>
  ********
  <BR>
diff -u w3m-0.2.4/w3mhelp-w3m_en.html w3m-0.2.4-img-js/w3mhelp-w3m_en.html
--- w3m-0.2.4/w3mhelp-w3m_en.html	Thu Jan 17 17:23:51 2002
+++ w3m-0.2.4-img-js/w3mhelp-w3m_en.html	Thu Jan 17 17:16:01 2002
@@ -7,7 +7,7 @@
 ******* 
 <A HREF="http://w3m.sourceforge.net/">
 w3m</A>
- (WWW-wo-Miru)  Version 0.2.4 by 
+ (WWW-wo-Miru)  Version 0.2.4-img-1.18 by 
 <A HREF="mailto:aito@fw.ipsj.or.jp">A.ITO</A> ********<BR>
              ***** Key assign table *****
 </CENTER>
diff -u w3m-0.2.4/w3mhelp-w3m_ja.html w3m-0.2.4-img-js/w3mhelp-w3m_ja.html
--- w3m-0.2.4/w3mhelp-w3m_ja.html	Thu Jan 17 17:23:51 2002
+++ w3m-0.2.4-img-js/w3mhelp-w3m_ja.html	Thu Jan 17 17:16:01 2002
@@ -7,7 +7,7 @@
 <CENTER>
  ******* 
  <A HREF="http://w3m.sourceforge.net/">w3m</A>
- (WWW-wo-Miru) Version 0.2.4 by
+ (WWW-wo-Miru) Version 0.2.4-img-1.18 by
  <A HREF="mailto:aito@fw.ipsj.or.jp">A.ITO(伊藤彰則)</A>
  ********
  <BR>
Only in w3m-0.2.4-img-js: w3mimgdisplay
Only in w3m-0.2.4-img-js: w3mimgdisplay.c
Only in w3m-0.2.4-img-js: w3mimgsize
Only in w3m-0.2.4-img-js: w3mimgsize.c