[w3m-dev 03125] w3m -m < image

* file.c (openGeneralPagerBuffer): use internal viewer for -m option
From: Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
This commit is contained in:
Fumitoshi UKAI
2002-03-13 15:48:20 +00:00
parent f0778b573d
commit db2d61187d
2 changed files with 16 additions and 2 deletions
+6 -1
View File
@@ -1,3 +1,8 @@
2002-03-14 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
* [w3m-dev 03125] w3m -m < image
* file.c (openGeneralPagerBuffer): use internal viewer for -m option
2002-03-13 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
* [w3m-dev 03116] Re: aligned block in <td align="center">
@@ -3127,4 +3132,4 @@
* release-0-2-1
* import w3m-0.2.1
$Id: ChangeLog,v 1.344 2002/03/12 16:59:50 ukai Exp $
$Id: ChangeLog,v 1.345 2002/03/13 15:48:20 ukai Exp $
+10 -1
View File
@@ -1,4 +1,4 @@
/* $Id: file.c,v 1.82 2002/03/12 16:59:50 ukai Exp $ */
/* $Id: file.c,v 1.83 2002/03/13 15:48:20 ukai Exp $ */
#include "fm.h"
#include <sys/types.h>
#include "myctype.h"
@@ -6675,6 +6675,15 @@ openGeneralPagerBuffer(InputStream stream)
buf = openPagerBuffer(stream, t_buf);
buf->type = "text/plain";
}
#ifdef USE_IMAGE
else if (activeImage && displayImage && !useExtImageViewer &&
!(w3m_dump & ~DUMP_FRAME) && !strncasecmp(t, "image/", 6)) {
cur_baseURL = New(ParsedURL);
parseURL("-", cur_baseURL, NULL);
buf = loadImageBuffer(&uf, t_buf);
buf->type = t;
}
#endif
else {
if (doExternal(uf, "-", t, &buf, t_buf)) {
if (buf == NULL || buf == NO_BUFFER)