w3m

commit e666d42a1aad998307718c39098fa82c387a5100
parent 1dd13ceda32fd7a813a4375edfd0b8a3b0b9fd84
Author: ukai <ukai>
Date:   Thu, 28 Feb 2002 16:21:54 +0000

[w3m-dev 03073] frame + image
* file.c (loadGeneralFile): w3m_dump & ~DUMP_FRAME
* file.c (loadImageBuffer): comment out if (frame_source)
From: Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>

Diffstat:
M
ChangeLog
 | 
6
++++++
M
file.c
 | 
6
+++++-

2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2002-03-01  Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
+
+	* [w3m-dev 03073] frame + image
+	* file.c (loadGeneralFile): w3m_dump & ~DUMP_FRAME
+	* file.c (loadImageBuffer): comment out if (frame_source)
+
 2002-03-01  Fumitoshi UKAI  <ukai@debian.or.jp>
 
 	* [w3m-dev 03072] Proxy-Authorization (Re:  Re: https through proxy)
diff --git a/file.c b/file.c
@@ -1840,7 +1840,7 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
 	proc = loadBuffer;
 #ifdef USE_IMAGE
     else if (activeImage && displayImage && !useExtImageViewer &&
-	     !w3m_dump && !strncasecmp(t, "image/", 6))
+	     !(w3m_dump & ~DUMP_FRAME) && !strncasecmp(t, "image/", 6))
 	proc = loadImageBuffer;
 #endif
 #ifdef USE_GOPHER
@@ -6448,12 +6448,16 @@ loadImageBuffer(URLFile *uf, Buffer *newBuf)
     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)