storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix indent

Browse Source
This commit is contained in:
Fumitoshi UKAI
2003-09-24 18:48:58 +00:00
parent ed6197d1a0
commit b411c1109d
16 changed files with 236 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files
anchor.c
+7 -4
View File
@@ -1,4 +1,4 @@
/* $Id: anchor.c,v 1.28 2003/09/22 21:02:16 ukai Exp $ */ /* $Id: anchor.c,v 1.29 2003/09/24 18:48:58 ukai Exp $ */
#include "fm.h" #include "fm.h"
#include "myctype.h" #include "myctype.h"
#include "regex.h" #include "regex.h"
@@ -811,7 +811,8 @@ link_list_panel(Buffer *buf)
if (a->title && *a->title) if (a->title && *a->title)
t = html_quote(a->title); t = html_quote(a->title);
else if (DecodeURL) else if (DecodeURL)
t = html_quote(url_unquote_conv(a->url, buf->document_charset)); t = html_quote(url_unquote_conv
(a->url, buf->document_charset));
else else
t = html_quote(a->url); t = html_quote(a->url);
Strcat_m_charp(tmp, "<li><a href=\"", u, "\">", t, "</a><br>", p, Strcat_m_charp(tmp, "<li><a href=\"", u, "\">", t, "</a><br>", p,
@@ -838,14 +839,16 @@ link_list_panel(Buffer *buf)
u = html_quote(p); u = html_quote(p);
if (DecodeURL) if (DecodeURL)
p = html_quote(url_unquote_conv(p, p = html_quote(url_unquote_conv(p,
buf->document_charset)); buf->
document_charset));
else else
p = u; p = u;
if (m->alt && *m->alt) if (m->alt && *m->alt)
t = html_quote(m->alt); t = html_quote(m->alt);
else if (DecodeURL) else if (DecodeURL)
t = html_quote(url_unquote_conv(m->url, t = html_quote(url_unquote_conv(m->url,
buf->document_charset)); buf->
document_charset));
else else
t = html_quote(m->url); t = html_quote(m->url);
Strcat_m_charp(tmp, "<li><a href=\"", u, "\">", t, Strcat_m_charp(tmp, "<li><a href=\"", u, "\">", t,
display.c
+17 -8
View File
@@ -1,10 +1,11 @@
/* $Id: display.c,v 1.66 2003/09/22 21:02:17 ukai Exp $ */ /* $Id: display.c,v 1.67 2003/09/24 18:48:59 ukai Exp $ */
#include <signal.h> #include <signal.h>
#include "fm.h" #include "fm.h"
#define MAX(a, b) ((a) > (b) ? (a) : (b)) #define MAX(a, b) ((a) > (b) ? (a) : (b))
#define MIN(a, b) ((a) < (b) ? (a) : (b)) #define MIN(a, b) ((a) < (b) ? (a) : (b))
/* *INDENT-OFF* */
#ifdef USE_COLOR #ifdef USE_COLOR
#define EFFECT_ANCHOR_START effect_anchor_start() #define EFFECT_ANCHOR_START effect_anchor_start()
@@ -20,8 +21,17 @@
#define EFFECT_MARK_START effect_mark_start() #define EFFECT_MARK_START effect_mark_start()
#define EFFECT_MARK_END effect_mark_end() #define EFFECT_MARK_END effect_mark_end()
/* color: * 0 black * 1 red * 2 green * 3 yellow /*-
* * 4 blue * 5 magenta * 6 cyan * 7 white */ * color:
* 0 black
* 1 red
* 2 green
* 3 yellow
* 4 blue
* 5 magenta
* 6 cyan
* 7 white
*/
#define EFFECT_ANCHOR_START_C setfcolor(anchor_color) #define EFFECT_ANCHOR_START_C setfcolor(anchor_color)
#define EFFECT_IMAGE_START_C setfcolor(image_color) #define EFFECT_IMAGE_START_C setfcolor(image_color)
@@ -62,6 +72,7 @@
#define define_effect(name_start,name_end,color_start,color_end,mono_start,mono_end) \ #define define_effect(name_start,name_end,color_start,color_end,mono_start,mono_end) \
static void name_start { if (useColor) { color_start; } else { mono_start; }}\ static void name_start { if (useColor) { color_start; } else { mono_start; }}\
static void name_end { if (useColor) { color_end; } else { mono_end; }} static void name_end { if (useColor) { color_end; } else { mono_end; }}
define_effect(EFFECT_ANCHOR_START, EFFECT_ANCHOR_END, EFFECT_ANCHOR_START_C, define_effect(EFFECT_ANCHOR_START, EFFECT_ANCHOR_END, EFFECT_ANCHOR_START_C,
EFFECT_ANCHOR_END_C, EFFECT_ANCHOR_START_M, EFFECT_ANCHOR_END_M) EFFECT_ANCHOR_END_C, EFFECT_ANCHOR_START_M, EFFECT_ANCHOR_END_M)
define_effect(EFFECT_IMAGE_START, EFFECT_IMAGE_END, EFFECT_IMAGE_START_C, define_effect(EFFECT_IMAGE_START, EFFECT_IMAGE_END, EFFECT_IMAGE_START_C,
@@ -72,7 +83,6 @@ define_effect(EFFECT_MARK_START, EFFECT_MARK_END, EFFECT_MARK_START_C,
EFFECT_MARK_END_C, EFFECT_MARK_START_M, EFFECT_MARK_END_M) EFFECT_MARK_END_C, EFFECT_MARK_START_M, EFFECT_MARK_END_M)
/*****************/ /*****************/
/* *INDENT-OFF* */
static void static void
EFFECT_ACTIVE_START EFFECT_ACTIVE_START
{ {
@@ -131,7 +141,7 @@ EFFECT_VISITED_END
} }
} }
} }
/* *INDENT-ON* */
#else /* not USE_COLOR */ #else /* not USE_COLOR */
#define EFFECT_ANCHOR_START underline() #define EFFECT_ANCHOR_START underline()
@@ -147,9 +157,8 @@ EFFECT_VISITED_END
#define EFFECT_MARK_START standout() #define EFFECT_MARK_START standout()
#define EFFECT_MARK_END standend() #define EFFECT_MARK_END standend()
#endif /* not USE_COLOR */ #endif /* not USE_COLOR */
/* /* *INDENT-ON* */
* Terminate routine.
*/
void void
fmTerm(void) fmTerm(void)
{ {
entity.c
+1 -1
View File
@@ -1,4 +1,4 @@
/* $Id: entity.c,v 1.6 2003/09/22 21:27:42 ukai Exp $ */ /* $Id: entity.c,v 1.7 2003/09/24 18:48:59 ukai Exp $ */
#ifdef DUMMY #ifdef DUMMY
#include "Str.h" #include "Str.h"
#define NBSP " " #define NBSP " "
etc.c
+1 -1
View File
@@ -1,4 +1,4 @@
/* $Id: etc.c,v 1.72 2003/09/22 21:02:18 ukai Exp $ */ /* $Id: etc.c,v 1.73 2003/09/24 18:48:59 ukai Exp $ */
#include "fm.h" #include "fm.h"
#include <pwd.h> #include <pwd.h>
#include "myctype.h" #include "myctype.h"
file.c
+1 -1
View File
@@ -1,4 +1,4 @@
/* $Id: file.c,v 1.227 2003/09/22 21:02:18 ukai Exp $ */ /* $Id: file.c,v 1.228 2003/09/24 18:48:59 ukai Exp $ */
#include "fm.h" #include "fm.h"
#include <sys/types.h> #include <sys/types.h>
#include "myctype.h" #include "myctype.h"
fm.h
+1 -1
View File
@@ -1,4 +1,4 @@
/* $Id: fm.h,v 1.121 2003/09/23 18:42:25 ukai Exp $ */ /* $Id: fm.h,v 1.122 2003/09/24 18:48:59 ukai Exp $ */
/* /*
* w3m: WWW wo Miru utility * w3m: WWW wo Miru utility
* *
func.c
+3 -2
View File
@@ -1,4 +1,4 @@
/* $Id: func.c,v 1.25 2003/09/22 21:02:18 ukai Exp $ */ /* $Id: func.c,v 1.26 2003/09/24 18:48:59 ukai Exp $ */
/* /*
* w3m func.c * w3m func.c
*/ */
@@ -610,7 +610,8 @@ initMouseAction(void)
#else #else
char **symbol = get_symbol(); char **symbol = get_symbol();
#endif #endif
mouse_action.lastline_str = Strnew_charp(symbol[N_GRAPH_SYMBOL + 13])->ptr; mouse_action.lastline_str =
Strnew_charp(symbol[N_GRAPH_SYMBOL + 13])->ptr;
} }
if ((mf = fopen(confFile(MOUSE_FILE), "rt")) != NULL) { if ((mf = fopen(confFile(MOUSE_FILE), "rt")) != NULL) {
hash.h
+1 -1
View File
@@ -1,4 +1,4 @@
/* $Id: hash.h,v 1.5 2003/07/22 17:33:16 ukai Exp $ */ /* $Id: hash.h,v 1.6 2003/09/24 18:48:59 ukai Exp $ */
#ifndef HASH_H #ifndef HASH_H
#define HASH_H #define HASH_H
html.c
+3 -2
View File
@@ -1,4 +1,4 @@
/* $Id: html.c,v 1.26 2003/09/22 21:02:18 ukai Exp $ */ /* $Id: html.c,v 1.27 2003/09/24 18:48:59 ukai Exp $ */
#include "html.h" #include "html.h"
/* Define HTML Tag Infomation Table */ /* Define HTML Tag Infomation Table */
@@ -6,7 +6,8 @@
#define ATTR_CORE ATTR_ID #define ATTR_CORE ATTR_ID
#define MAXA_CORE 1 #define MAXA_CORE 1
unsigned char ALST_A[] = { unsigned char ALST_A[] = {
ATTR_NAME, ATTR_HREF, ATTR_REL, ATTR_CHARSET, ATTR_TARGET, ATTR_HSEQ, ATTR_REFERER, ATTR_NAME, ATTR_HREF, ATTR_REL, ATTR_CHARSET, ATTR_TARGET, ATTR_HSEQ,
ATTR_REFERER,
ATTR_FRAMENAME, ATTR_TITLE, ATTR_ACCESSKEY, ATTR_CORE ATTR_FRAMENAME, ATTR_TITLE, ATTR_ACCESSKEY, ATTR_CORE
}; };
#define MAXA_A MAXA_CORE + 10 #define MAXA_A MAXA_CORE + 10
linein.c
+1 -1
View File
@@ -1,4 +1,4 @@
/* $Id: linein.c,v 1.32 2003/09/22 21:02:19 ukai Exp $ */ /* $Id: linein.c,v 1.33 2003/09/24 18:48:59 ukai Exp $ */
#include "fm.h" #include "fm.h"
#include "local.h" #include "local.h"
#include "myctype.h" #include "myctype.h"
main.c
+7 -4
View File
@@ -1,4 +1,4 @@
/* $Id: main.c,v 1.232 2003/09/23 18:42:25 ukai Exp $ */ /* $Id: main.c,v 1.233 2003/09/24 18:48:59 ukai Exp $ */
#define MAINPROGRAM #define MAINPROGRAM
#include "fm.h" #include "fm.h"
#include <signal.h> #include <signal.h>
@@ -4159,10 +4159,12 @@ adBmark(void)
* WC_CES_SHIFT_JIS, shouldn't it? - ukai * WC_CES_SHIFT_JIS, shouldn't it? - ukai
*/ */
(Str_form_quote(wc_conv_strict(Currentbuf->buffername, (Str_form_quote(wc_conv_strict(Currentbuf->buffername,
InnerCharset, WC_CES_EUC_JP)))->ptr); InnerCharset,
WC_CES_EUC_JP)))->ptr);
#else #else
(Str_form_quote(wc_conv_strict(Currentbuf->buffername, (Str_form_quote(wc_conv_strict(Currentbuf->buffername,
InnerCharset, SystemCharset)))->ptr); InnerCharset,
SystemCharset)))->ptr);
#endif #endif
#else #else
(Str_form_quote(Strnew_charp(Currentbuf->buffername)))->ptr); (Str_form_quote(Strnew_charp(Currentbuf->buffername)))->ptr);
@@ -4509,7 +4511,8 @@ _peekURL(int only_img)
s = parsedURL2Str(&pu); s = parsedURL2Str(&pu);
} }
if (DecodeURL) if (DecodeURL)
s = Strnew_charp(url_unquote_conv(s->ptr, Currentbuf->document_charset)); s = Strnew_charp(url_unquote_conv
(s->ptr, Currentbuf->document_charset));
#ifdef USE_M17N #ifdef USE_M17N
s = checkType(s, &pp, NULL); s = checkType(s, &pp, NULL);
p = NewAtom_N(Lineprop, s->length); p = NewAtom_N(Lineprop, s->length);
map.c
+3 -5
View File
@@ -1,4 +1,4 @@
/* $Id: map.c,v 1.29 2003/09/22 21:02:20 ukai Exp $ */ /* $Id: map.c,v 1.30 2003/09/24 18:49:00 ukai Exp $ */
/* /*
* client-side image maps * client-side image maps
*/ */
@@ -561,8 +561,7 @@ page_info_panel(Buffer *buf)
"<tr valign=top><td nowrap>Document Type<td>", "<tr valign=top><td nowrap>Document Type<td>",
buf->real_type ? html_quote(buf->real_type) : "unknown", buf->real_type ? html_quote(buf->real_type) : "unknown",
"<tr valign=top><td nowrap>Last Modified<td>", "<tr valign=top><td nowrap>Last Modified<td>",
html_quote(last_modified(buf)), html_quote(last_modified(buf)), NULL);
NULL);
#ifdef USE_M17N #ifdef USE_M17N
if (buf->document_charset != InnerCharset) { if (buf->document_charset != InnerCharset) {
list = wc_get_ces_list(); list = wc_get_ces_list();
@@ -572,8 +571,7 @@ page_info_panel(Buffer *buf)
sprintf(charset, "%d", (unsigned int)list->id); sprintf(charset, "%d", (unsigned int)list->id);
Strcat_m_charp(tmp, "<option value=", charset, Strcat_m_charp(tmp, "<option value=", charset,
(buf->document_charset == list->id) ? " selected>" (buf->document_charset == list->id) ? " selected>"
: ">", : ">", list->desc, NULL);
list->desc, NULL);
} }
Strcat_charp(tmp, "</select>"); Strcat_charp(tmp, "</select>");
Strcat_charp(tmp, "<tr><td><td><input type=submit value=Change>"); Strcat_charp(tmp, "<tr><td><td><input type=submit value=Change>");
menu.c
+5 -3
View File
@@ -1,4 +1,4 @@
/* $Id: menu.c,v 1.37 2003/09/24 18:35:06 ukai Exp $ */ /* $Id: menu.c,v 1.38 2003/09/24 18:49:00 ukai Exp $ */
/* /*
* w3m menu.c * w3m menu.c
*/ */
@@ -297,8 +297,10 @@ static int MainMenuEncode = TRUE;
static MenuItem MainMenuItem[] = { static MenuItem MainMenuItem[] = {
/* type label variable value func popup keys data */ /* type label variable value func popup keys data */
{MENU_FUNC, N_(" Back (b) "), NULL, 0, backBf, NULL, "b", NULL}, {MENU_FUNC, N_(" Back (b) "), NULL, 0, backBf, NULL, "b", NULL},
{MENU_POPUP, N_(" Select Buffer(s) "), NULL, 0, NULL, &SelectMenu, "s", NULL}, {MENU_POPUP, N_(" Select Buffer(s) "), NULL, 0, NULL, &SelectMenu, "s",
{MENU_POPUP, N_(" Select Tab (t) "), NULL, 0, NULL, &SelTabMenu, "tT", NULL}, NULL},
{MENU_POPUP, N_(" Select Tab (t) "), NULL, 0, NULL, &SelTabMenu, "tT",
NULL},
{MENU_FUNC, N_(" View Source (v) "), NULL, 0, vwSrc, NULL, "vV", NULL}, {MENU_FUNC, N_(" View Source (v) "), NULL, 0, vwSrc, NULL, "vV", NULL},
{MENU_FUNC, N_(" Edit Source (e) "), NULL, 0, editBf, NULL, "eE", NULL}, {MENU_FUNC, N_(" Edit Source (e) "), NULL, 0, editBf, NULL, "eE", NULL},
{MENU_FUNC, N_(" Save Source (S) "), NULL, 0, svSrc, NULL, "S", NULL}, {MENU_FUNC, N_(" Save Source (S) "), NULL, 0, svSrc, NULL, "S", NULL},
rc.c
+7 -5
View File
@@ -1,4 +1,4 @@
/* $Id: rc.c,v 1.90 2003/09/24 18:35:06 ukai Exp $ */ /* $Id: rc.c,v 1.91 2003/09/24 18:49:00 ukai Exp $ */
/* /*
* Initialization file etc. * Initialization file etc.
*/ */
@@ -1026,7 +1026,9 @@ show_params(FILE * fp)
for (j = 0; sections[j].name != NULL; j++) { for (j = 0; sections[j].name != NULL; j++) {
#if LANG == JA || ENABLE_NLS #if LANG == JA || ENABLE_NLS
if (!OptionEncode) if (!OptionEncode)
cmt = wc_conv(gettext(sections[j].name), OptionCharset, InnerCharset)->ptr; cmt =
wc_conv(gettext(sections[j].name), OptionCharset,
InnerCharset)->ptr;
else else
#endif #endif
cmt = sections[j].name; cmt = sections[j].name;
@@ -1379,9 +1381,9 @@ sync_with_option(void)
AcceptLang = "ja;q=1.0, en;q=0.5"; AcceptLang = "ja;q=1.0, en;q=0.5";
#else /* LANG != JA (must be EN) */ #else /* LANG != JA (must be EN) */
/* TRANSLATORS: /* TRANSLATORS:
AcceptLang default: this is used in Accept-Language: HTTP request * AcceptLang default: this is used in Accept-Language: HTTP request
header. For example, ja.po should translate it as * header. For example, ja.po should translate it as
"ja;q=1.0, en;q=0.5" like that. * "ja;q=1.0, en;q=0.5" like that.
*/ */
AcceptLang = _("en;q=1.0"); AcceptLang = _("en;q=1.0");
#endif #endif
regex.c
+1 -1
View File
@@ -1,4 +1,4 @@
/* $Id: regex.c,v 1.21 2003/09/22 21:02:21 ukai Exp $ */ /* $Id: regex.c,v 1.22 2003/09/24 18:49:00 ukai Exp $ */
/* /*
* regex: Regular expression pattern match library * regex: Regular expression pattern match library
* *
table.c
+1 -1
View File
@@ -1,4 +1,4 @@
/* $Id: table.c,v 1.47 2003/09/22 21:02:21 ukai Exp $ */ /* $Id: table.c,v 1.48 2003/09/24 18:49:00 ukai Exp $ */
/* /*
* HTML table * HTML table
*/ */