aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFumitoshi UKAI <ukai@debian.or.jp>2002-03-15 19:02:40 +0000
committerFumitoshi UKAI <ukai@debian.or.jp>2002-03-15 19:02:40 +0000
commit0a01b79dcf678f9fcbd4884d9682e6f464812834 (patch)
treecd1ed89e59647631a67462c7b38ca665b08a1471
parentpart of [w3m-dev-en 00713] contrib: unofficial "current page info" patch, upd... (diff)
downloadw3m-0a01b79dcf678f9fcbd4884d9682e6f464812834.tar.gz
w3m-0a01b79dcf678f9fcbd4884d9682e6f464812834.zip
indent fix
-rw-r--r--buffer.c4
-rw-r--r--file.c14
-rw-r--r--frame.c6
-rw-r--r--main.c25
-rw-r--r--terms.c6
5 files changed, 29 insertions, 26 deletions
diff --git a/buffer.c b/buffer.c
index 183175b..2f45355 100644
--- a/buffer.c
+++ b/buffer.c
@@ -1,4 +1,4 @@
-/* $Id: buffer.c,v 1.12 2002/03/14 16:12:05 ukai Exp $ */
+/* $Id: buffer.c,v 1.13 2002/03/15 19:02:40 ukai Exp $ */
#include "fm.h"
#ifdef USE_MOUSE
@@ -521,7 +521,7 @@ reshapeBuffer(Buffer *buf)
#endif
if (buf->search_header && buf->currentURL.scheme == SCM_LOCAL) {
if (buf->header_source && (buf->mailcap_source ||
- !strcmp(buf->currentURL.file, "-"))) {
+ !strcmp(buf->currentURL.file, "-"))) {
URLFile h;
init_stream(&h, SCM_LOCAL, NULL);
examineFile(buf->header_source, &h);
diff --git a/file.c b/file.c
index 512a25b..f4c7c2f 100644
--- a/file.c
+++ b/file.c
@@ -1,4 +1,4 @@
-/* $Id: file.c,v 1.86 2002/03/15 16:35:46 ukai Exp $ */
+/* $Id: file.c,v 1.87 2002/03/15 19:02:40 ukai Exp $ */
#include "fm.h"
#include <sys/types.h>
#include "myctype.h"
@@ -633,8 +633,10 @@ readHeader(URLFile *uf, Buffer *newBuf, int thru, ParsedURL *pu)
tmpf = xface2xbm(&tmp->ptr[7]);
if (tmpf) {
- src = Sprintf("<img src=\"%s\" alt=\"X-Face\" width=48 height=48>",
- html_quote(tmpf));
+ src =
+ Sprintf
+ ("<img src=\"%s\" alt=\"X-Face\" width=48 height=48>",
+ html_quote(tmpf));
init_stream(&f, SCM_LOCAL, newStrStream(src));
loadHTMLstream(&f, newBuf, NULL, TRUE);
for (l = newBuf->lastLine; l && l->real_linenumber;
@@ -6518,9 +6520,9 @@ loadImageBuffer(URLFile *uf, Buffer *newBuf)
cache->loaded = IMG_FLAG_LOADED;
cache->index = 0;
-/*
- getImageSize(cache);
-*/
+ /*
+ * getImageSize(cache);
+ */
image_buffer:
tmp = Sprintf("<img src=\"%s\"><br><br>", html_quote(image->url));
diff --git a/frame.c b/frame.c
index 9022025..9ec9201 100644
--- a/frame.c
+++ b/frame.c
@@ -1,4 +1,4 @@
-/* $Id: frame.c,v 1.13 2002/03/15 16:35:46 ukai Exp $ */
+/* $Id: frame.c,v 1.14 2002/03/15 19:02:40 ukai Exp $ */
#include "fm.h"
#include "parsetagx.h"
#include "myctype.h"
@@ -416,8 +416,8 @@ frame_download_source(struct frame_body *b, ParsedURL *currentURL,
}
else if ((buf->real_scheme != SCM_LOCAL)
#ifdef USE_IMAGE
- || (activeImage && !useExtImageViewer &&
- buf->real_type && !strncasecmp(buf->real_type, "image/", 6))
+ || (activeImage && !useExtImageViewer &&
+ buf->real_type && !strncasecmp(buf->real_type, "image/", 6))
#endif
) {
tmp = tmpfname(TMPF_FRAME, NULL);
diff --git a/main.c b/main.c
index 38e7afc..4836d70 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.89 2002/03/15 18:33:32 ukai Exp $ */
+/* $Id: main.c,v 1.90 2002/03/15 19:02:40 ukai Exp $ */
#define MAINPROGRAM
#include "fm.h"
#include <signal.h>
@@ -230,7 +230,8 @@ fusage(FILE * f, int err)
#endif
fprintf(f, " -W toggle wrap search mode\n");
fprintf(f, " -X don't use termcap init/deinit\n");
- fprintf(f, " -title[=TERM] set buffer name to terminal title string\n");
+ fprintf(f,
+ " -title[=TERM] set buffer name to terminal title string\n");
fprintf(f, " -o opt=value assign value to config option\n");
fprintf(f, " -config file specify config file\n");
fprintf(f, " -help print this usage message\n");
@@ -663,7 +664,7 @@ MAIN(int argc, char **argv, char **envp)
else if (!strcmp("-title", argv[i]))
displayTitleTerm = getenv("TERM");
else if (!strncmp("-title=", argv[i], 7))
- displayTitleTerm = argv[i]+7;
+ displayTitleTerm = argv[i] + 7;
else if (!strcmp("-o", argv[i])) {
if (++i >= argc || !strcmp(argv[i], "?")) {
show_params_p = 1;
@@ -2173,7 +2174,7 @@ qquitfm(void)
void
quitfm(void)
{
- term_title(""); /* XXX */
+ term_title(""); /* XXX */
#ifdef USE_IMAGE
if (activeImage)
termImage();
@@ -4557,10 +4558,10 @@ dispI(void)
if (!activeImage)
return;
displayImage = TRUE;
-/*
- if (!(Currentbuf->type && !strcmp(Currentbuf->type, "text/html")))
- return;
-*/
+ /*
+ * if (!(Currentbuf->type && !strcmp(Currentbuf->type, "text/html")))
+ * return;
+ */
Currentbuf->image_flag = IMG_FLAG_AUTO;
Currentbuf->need_reshape = TRUE;
displayBuffer(Currentbuf, B_REDRAW_IMAGE);
@@ -4571,10 +4572,10 @@ stopI(void)
{
if (!activeImage)
return;
-/*
- if (!(Currentbuf->type && !strcmp(Currentbuf->type, "text/html")))
- return;
-*/
+ /*
+ * if (!(Currentbuf->type && !strcmp(Currentbuf->type, "text/html")))
+ * return;
+ */
Currentbuf->image_flag = IMG_FLAG_SKIP;
displayBuffer(Currentbuf, B_REDRAW_IMAGE);
}
diff --git a/terms.c b/terms.c
index cbdb020..e0f0620 100644
--- a/terms.c
+++ b/terms.c
@@ -1,4 +1,4 @@
-/* $Id: terms.c,v 1.29 2002/03/15 18:33:32 ukai Exp $ */
+/* $Id: terms.c,v 1.30 2002/03/15 19:02:40 ukai Exp $ */
/*
* An original curses library for EUC-kanji by Akinori ITO, December 1989
* revised by Akinori ITO, January 1995
@@ -484,6 +484,7 @@ writestr(char *s)
#define XTERM_TITLE "\033]0;w3m: %s\007"
#define SCREEN_TITLE "\033k%s\033\134"
+/* *INDENT-OFF* */
static struct term_info {
char *term;
char *title_str;
@@ -491,7 +492,6 @@ static struct term_info {
int mouse_flag;
#endif
} term_info_list[] = {
- /* *INDENT-OFF* */
{TERM_INFO("xterm", XTERM_TITLE, (NEED_XTERM_ON|NEED_XTERM_OFF))},
{TERM_INFO("kterm", XTERM_TITLE, (NEED_XTERM_ON|NEED_XTERM_OFF))},
{TERM_INFO("rxvt", XTERM_TITLE, (NEED_XTERM_ON|NEED_XTERM_OFF))},
@@ -501,9 +501,9 @@ static struct term_info {
{TERM_INFO("cygwin", NULL, NEED_XTERM_ON)},
#endif
{TERM_INFO(NULL, NULL, 0)}
- /* *INDENT-ON * */
};
#undef TERM_INFO
+/* *INDENT-ON * */
int
set_tty(void)