--- w3m/menu.c Fri Jan 21 03:29:35 2000 +++ w3m-0.1.6-2000FEB16JM01/menu.c Thu Feb 10 23:11:20 2000 @@ -69,6 +69,8 @@ static int mTop(char c); static int mNext(char c); static int mPrev(char c); +static int mFore(char c); +static int mBack(char c); static int mOk(char c); static int mCancel(char c); static int mClose(char c); @@ -157,7 +159,7 @@ }; static int (*MenuEscDKeymap[128])(char c) = { /* 0 1 INS 3 4 PgUp, PgDn 7 */ - mNull, mNull, mClose, mNull, mNull, mUp, mDown, mNull, + mNull, mNull, mClose, mNull, mNull, mBack, mFore, mNull, /* 8 9 10 F1 F2 F3 F4 F5 */ mNull, mNull, mNull, mNull, mNull, mNull, mNull, mNull, /* 16 F6 F7 F8 F9 F10 22 23 */ @@ -737,6 +739,24 @@ return(MENU_NOTHING); } +static int +mFore(char c) +{ + if (CurrentMenu->select >= CurrentMenu->nitem - 1) + return(MENU_NOTHING); + goto_menu(CurrentMenu, (CurrentMenu->select + CurrentMenu->height - 1), (CurrentMenu->height + 1)); + return(MENU_NOTHING); +} + +static int +mBack(char c) +{ + if (CurrentMenu->select <= 0) + return(MENU_NOTHING); + goto_menu(CurrentMenu, (CurrentMenu->select - CurrentMenu->height + 1), (-1 - CurrentMenu->height)); + return(MENU_NOTHING); +} + static int mOk(char c) { diff -urdN w3m/Str.c w3m-0.1.6-2000FEB12JM01/Str.c --- w3m/Str.c Fri Jan 14 01:13:26 2000 +++ w3m-0.1.6-2000FEB12JM01/Str.c Sat Feb 12 06:47:21 2000 @@ -24,9 +24,9 @@ #ifdef STR_DEBUG #define STR_LENGTH_CHECK(x) if (((x)->ptr==0&&(x)->length!=0)||(strlen((x)->ptr)!=(x)->length))abort(); -#else +#else /* not STR_DEBUG */ #define STR_LENGTH_CHECK(x) -#endif +#endif /* not STR_DEBUG */ Str Strnew() diff -urdN w3m/Str.h w3m-0.1.6-2000FEB12JM01/Str.h --- w3m/Str.h Fri Jan 14 01:13:27 2000 +++ w3m-0.1.6-2000FEB12JM01/Str.h Sat Feb 12 06:47:59 2000 @@ -71,4 +71,4 @@ #define Strlastchar(s) ((s)->length>0?(s)->ptr[(s)->length-1]:'\0') -#endif +#endif /* not GC_STR_H */ diff -urdN w3m/anchor.c w3m-0.1.6-2000FEB12JM01/anchor.c --- w3m/anchor.c Fri Jan 14 04:58:35 2000 +++ w3m-0.1.6-2000FEB12JM01/anchor.c Sat Feb 12 06:48:26 2000 @@ -354,9 +354,9 @@ ml->marks = New_N(BufferPoint, ml->markmax); #ifdef __CYGWIN__ bzero((char *)ml->marks, sizeof(BufferPoint) * ml->markmax); -#else +#else /* not __CYGWIN__ */ bzero(ml->marks, sizeof(BufferPoint) * ml->markmax); -#endif /* __CYGWIN__ */ +#endif /* not __CYGWIN__ */ } if (seq+1 > ml->nmark) ml->nmark = seq+1; diff -urdN w3m/buffer.c w3m-0.1.6-2000FEB12JM01/buffer.c --- w3m/buffer.c Fri Jan 14 04:13:22 2000 +++ w3m-0.1.6-2000FEB12JM01/buffer.c Sat Feb 12 06:48:59 2000 @@ -4,7 +4,7 @@ #include extern int do_getch(); #define getch() do_getch() -#endif +#endif /* USE_GPM */ char *NullLine = ""; Lineprop NullProp[] = {0}; @@ -252,9 +252,9 @@ setfcolor(basic_color); #ifdef BG_COLOR setbcolor(bg_color); -#endif +#endif /* BG_COLOR */ } -#endif +#endif /* COLOR */ clrtobotx(); for (i = 0; i < LASTLINE; i++) { if (buf == current) { diff -urdN w3m/conv.c w3m-0.1.6-2000FEB12JM01/conv.c --- w3m/conv.c Tue Jan 11 23:23:32 2000 +++ w3m-0.1.6-2000FEB12JM01/conv.c Sat Feb 12 06:49:45 2000 @@ -7,7 +7,7 @@ #ifdef DEBUG #include -#endif +#endif /* DEBUG */ #define BF_SIZ 4096 #define uchar unsigned char @@ -457,4 +457,4 @@ return hint; } } -#endif +#endif /* JP_CHARSET */ diff -urdN w3m/cookie.c w3m-0.1.6-2000FEB12JM01/cookie.c --- w3m/cookie.c Fri Jan 21 02:18:56 2000 +++ w3m-0.1.6-2000FEB12JM01/cookie.c Sat Feb 12 06:50:41 2000 @@ -129,10 +129,10 @@ #ifdef USE_SSL if (cookie->flag & COO_SECURE && pu->scheme != SCM_HTTPS) return 0; -#else +#else /* not USE_SSL */ if (cookie->flag & COO_SECURE) return 0; -#endif +#endif /* not USE_SSL */ if (cookie->portl && !port_match(cookie->portl, pu->port)) return 0; @@ -235,7 +235,7 @@ fprintf(stderr, "version: [%d]\n", version); if (port) fprintf(stderr, "port: [%s]\n", port->ptr); -#endif +#endif /* DEBUG */ if (!domainname) return 1; @@ -245,7 +245,7 @@ #if 0 if (domain->ptr[0] != '.') return 1; -#endif +#endif /* 0 */ if (nodots(&domain->ptr[1], &domain->ptr[domain->length])) return 1; if (!(dp = domain_match(domainname, domain->ptr))) @@ -569,4 +569,4 @@ } backBf(); } -#endif +#endif /* USE_COOKIE */ diff -urdN w3m/dict.c w3m-0.1.6-2000FEB12JM01/dict.c --- w3m/dict.c Tue Jan 11 23:23:32 2000 +++ w3m-0.1.6-2000FEB12JM01/dict.c Sat Feb 12 06:51:05 2000 @@ -125,4 +125,4 @@ static char word[100]; execdict(GetWord(word)); } -#endif +#endif /* DICT */ diff -urdN w3m/display.c w3m-0.1.6-2000FEB12JM01/display.c --- w3m/display.c Fri Jan 21 02:14:07 2000 +++ w3m-0.1.6-2000FEB12JM01/display.c Sat Feb 12 08:53:43 2000 @@ -83,7 +83,7 @@ } -#else /* no color */ +#else /* not COLOR */ #define EFFECT_ANCHOR_START underline() #define EFFECT_ANCHOR_END underlineend() @@ -94,12 +94,12 @@ #define EFFECT_ACTIVE_START bold() #define EFFECT_ACTIVE_END boldend() -#endif /* COLOR */ +#endif /* not COLOR */ #ifndef KANJI_SYMBOLS static char g_rule[] = "ntwluxkavmqajaaa"; -#endif +#endif /* not KANJI_SYMBOLS */ /* * Terminate routine. @@ -115,7 +115,7 @@ #ifdef MOUSE if (use_mouse) mouse_end(); -#endif +#endif /* MOUSE */ reset_tty(); fmInitialized = NIL; } @@ -149,7 +149,7 @@ #ifdef MOUSE if (use_mouse) mouse_init(); -#endif +#endif /* MOUSE */ } fmInitialized = T; } @@ -164,7 +164,7 @@ static int anch_mode = 0, emph_mode = 0, imag_mode = 0, form_mode = 0, active_mode = 0; #ifndef KANJI_SYMBOLS static int graph_mode = 0; -#endif +#endif /* not KANJI_SYMBOLS */ void displayBuffer(Buffer * buf, int mode) @@ -219,12 +219,12 @@ else #if LANG == JA msg = Sprintf("≪↑↓Viewing <%s> ", cleanup_str(buf->buffername)); -#else +#else /* LANG != JA */ msg = Sprintf("<=UpDn Viewing <%s> ", cleanup_str(buf->buffername)); -#endif -#else +#endif /* LANG != JA */ +#else /* not MOUSE */ msg = Sprintf("Viewing <%s> ", cleanup_str(buf->buffername)); -#endif +#endif /* not MOUSE */ if (displayLink) { aa = retrieveCurrentAnchor(buf); if (aa) { @@ -238,9 +238,9 @@ Strcat(msg,Strsubstr(s, 0, (l - 2) / 2)); #if LANG == JA Strcat_charp(msg,"…"); -#else +#else /* LANG != JA */ Strcat_charp(msg,".."); -#endif +#endif /* LANG != JA */ l = buf->width - msg->length; Strcat(msg,Strsubstr(s, s->length - l, l)); } else { @@ -270,9 +270,9 @@ EFFECT_ANCHOR_END_C; #ifdef BG_COLOR setbcolor(bg_color); -#endif +#endif /* BG_COLOR */ } -#endif +#endif /* COLOR */ for (i = 0, l = buf->topLine; i < LASTLINE; i++) { if (i >= LASTLINE-n || i < -n) l0 = redrawLine(buf, l, i); @@ -322,7 +322,7 @@ addChar(' ', 0); rcol++; } else -#endif +#endif /* JP_CHARSET */ if (*p == '\t') { do { addChar(' ', *pr); @@ -339,7 +339,7 @@ #ifdef JP_CHARSET if (rcol-column == COLS-1 && CharType(pr[j]) == PC_KANJI1) break; -#endif +#endif /* JP_CHARSET */ if (p[j] == '\t') { do { addChar(' ', 0); @@ -388,7 +388,7 @@ graph_mode = NIL; graphend(); } -#endif +#endif /* not KANJI_SYMBOLS */ if (rcol - column < COLS) clrtoeolx(); return l->next; @@ -427,7 +427,7 @@ } rcol++; } else -#endif +#endif /* JP_CHARSET */ if (p[j] == '\t') { do { if (j >= bcol && j < ecol) { @@ -481,7 +481,7 @@ graph_mode = NIL; graphend(); } -#endif +#endif /* not KANJI_SYMBOLS */ return rcol - column; } @@ -517,7 +517,7 @@ graphend(); graph_mode = NIL; } -#endif +#endif /* not KANJI_SYMBOLS */ /* effect start */ do_effect1(PE_UNDER, ulmode, underline(), underlineend()) @@ -535,7 +535,7 @@ graph_mode = T; } } -#endif +#endif /* not KANJI_SYMBOLS */ } void @@ -549,14 +549,14 @@ if (c & 0x80 && CharType(mode) == PC_ASCII) { addch(' '); } else -#else +#else /* not JP_CHARSET */ do_effects(m); -#endif +#endif /* not JP_CHARSET */ #ifndef KANJI_SYMBOLS if (graph_mode) addch(g_rule[PC_RULE_VAL(m)]); else -#endif +#endif /* not KANJI_SYMBOLS */ if (c == '\t') { addch(c); } else if (!(c & ~0x1f) && c != CTRL_J) { /* Control code */ @@ -669,7 +669,7 @@ #ifdef JP_CHARSET if (CharType(p[i]) == PC_KANJI1) delta = 2; -#endif +#endif /* JP_CHARSET */ if (i >= buf->currentLine->len - delta) return; if (buf->visualpos >= COLS - delta) @@ -693,7 +693,7 @@ #ifdef JP_CHARSET if (i >=2 && CharType(p[i - 1]) == PC_KANJI2) delta = 2; -#endif +#endif /* JP_CHARSET */ if (i > delta) buf->pos = i - delta; else diff -urdN w3m/etc.c w3m-0.1.6-2000FEB12JM01/etc.c --- w3m/etc.c Fri Jan 14 01:13:27 2000 +++ w3m-0.1.6-2000FEB12JM01/etc.c Sat Feb 12 06:59:08 2000 @@ -9,7 +9,7 @@ #ifdef GETCWD #include #include -#endif +#endif /* GETCWD */ #include #include @@ -48,7 +48,7 @@ return x; return 0; } -#endif +#endif /* not STRCASECMP */ int arg_is(char *str, char *tag) @@ -263,7 +263,7 @@ if (ShowEffect #ifdef JP_CHARSET && mode != PC_KANJI1 -#endif +#endif /* JP_CHARSET */ ) { if (!strncmp(str, "_\b", 2)) { str += 2; @@ -280,7 +280,7 @@ *(prop - 1) |= PE_UNDER; *(prop - 2) |= PE_UNDER; } else -#endif +#endif /* JP_CHARSET */ if (s->length > 0) { str += 2; *(prop - 1) |= PE_UNDER; @@ -295,7 +295,7 @@ *(prop - 1) |= PE_UNDER; *(prop - 2) |= PE_UNDER; } else -#endif +#endif /* JP_CHARSET */ if (s->length > 0) { str += 3; *(prop - 1) |= PE_UNDER; @@ -316,7 +316,7 @@ str += 2; } } else -#endif +#endif /* JP_CHARSET */ if (s->length > 0) { if (*(str-1) == *(str+2)) { *(prop - 1) |= PE_BOLD; @@ -343,7 +343,7 @@ str++; } } else -#endif +#endif /* JP_CHARSET */ if (s->length > 0) { if (*(str-1) == *(str+1)) { *(prop - 1) |= PE_BOLD; @@ -370,12 +370,12 @@ if (mode == PC_KANJI2) *(prop++) = (leffect | mode); else -#endif +#endif /* JP_CHARSET */ *(prop++) = (effect | mode); Strcat_char(s,*(str++)); #ifdef JP_CHARSET if (mode != PC_KANJI1) -#endif +#endif /* JP_CHARSET */ effect = PE_NORMAL; } return s; @@ -446,7 +446,7 @@ for (i = 0; i < len; i++) *(ptr++) = 0; } -#endif +#endif /* NOBCOPY */ /* fgets() substitute which terminates \n, \r or \n\r */ char * @@ -512,7 +512,7 @@ return s; return conv(s->ptr,fcode,tcode); } -#endif +#endif /* JP_CHARSET */ char* mybasename(char* s) @@ -534,7 +534,7 @@ extern char *sys_errlist[]; return sys_errlist[errno]; } -#endif +#endif /* not STRERROR */ #ifndef SYS_ERRLIST char **sys_errlist; @@ -552,7 +552,7 @@ for (i = 1; i < n; i++) sys_errlist[i] = strerror(i); } -#endif +#endif /* not SYS_ERRLIST */ int next_status(char c, int *status) @@ -882,7 +882,7 @@ if (is_kanji1(ch, InnerCode)) return PC_KANJI1; else -#endif +#endif /* JP_CHARSET */ if (!(ch & ~0x1f)) return PC_CTRL; else @@ -1068,7 +1068,7 @@ } return p; } -#endif +#endif /* USE_SSL */ static Str sgets(char **str) @@ -1109,7 +1109,7 @@ if (!f->stream.ss || f->stream.ss->status <= 0) f->iseof = T; break; -#endif +#endif /* USE_SSL */ case SMT_FILE: default: s = Strfgets(f->stream.f); @@ -1138,7 +1138,7 @@ if (!f->stream.ss || f->stream.ss->status <= 0) f->iseof = T; break; -#endif +#endif /* USE_SSL */ case SMT_FILE: default: s = Strmyfgets(f->stream.f); @@ -1168,7 +1168,7 @@ if (!f->stream.ss || f->stream.ss->status <= 0) f->iseof = T; break; -#endif +#endif /* USE_SSL */ case SMT_FILE: default: if (f->stream.f) @@ -1193,7 +1193,7 @@ if (f->stream.ss) SSundogetc(f->stream.ss); break; -#endif +#endif /* USE_SSL */ case SMT_FILE: default: if (f->stream.f) @@ -1214,7 +1214,7 @@ case SMT_SSL: SSclose(f->stream.ss); break; -#endif +#endif /* USE_SSL */ case SMT_FILE: default: if (closep) @@ -1448,7 +1448,7 @@ #ifdef DEBUG fprintf(stderr, "mktime: %s\n", timestr); -#endif +#endif /* DEBUG */ while (*s && isalpha((unsigned char)*s)) s++; @@ -1504,7 +1504,7 @@ #ifdef DEBUG fprintf(stderr, "year=%d month=%d day=%d hour:min:sec=%d:%d:%d\n", year, mon, day, hour, min, sec); -#endif +#endif /* DEBUG */ mon -= 3; if (mon < 0) { @@ -1529,7 +1529,7 @@ char *p; #ifndef INET6 struct hostent *entry; -#else +#else /* INET6 */ int *af; #endif /* INET6 */ @@ -1546,7 +1546,7 @@ return NULL; return entry->h_name; -#else +#else /* INET6 */ for (af = ai_family_order_table[DNS_order]; ; af++) { int error; struct addrinfo hints; @@ -1580,7 +1580,7 @@ } /* all failed */ return NULL; -#endif +#endif /* INET6 */ } -#endif +#endif /* USE_COOKIE */ diff -urdN w3m/file.c w3m-0.1.6-2000FEB12JM01/file.c --- w3m/file.c Fri Jan 21 02:18:57 2000 +++ w3m-0.1.6-2000FEB12JM01/file.c Sat Feb 12 07:13:18 2000 @@ -15,10 +15,10 @@ #ifndef max #define max(a,b) ((a) > (b) ? (a) : (b)) -#endif +#endif /* not max */ #ifndef min #define min(a,b) ((a) > (b) ? (b) : (a)) -#endif +#endif /* not min */ extern Hist *SaveHist; @@ -45,7 +45,7 @@ static int cur_option_maxwidth; static int cur_status = R_ST_NORMAL; static int n_select; -#endif +#endif /* MENU_SELECT */ static Str cur_select; static int n_selectitem; @@ -72,9 +72,9 @@ static int form_max = 0; static int forms_size = 0; #define cur_form_id ((form_sp >= 0)? form_stack[form_sp] : -1) -#else +#else /* not NEW_FORM */ static FormList *form_stack[FORMSTACK_SIZE]; -#endif +#endif /* not NEW_FORM */ static int form_sp = 0; static int current_content_length; @@ -88,7 +88,7 @@ }; #define HR_RULE "━" #define HR_RULE_WIDTH 2 -#else +#else /* not KANJI_SYMBOLS */ char *ullevel[MAX_UL_LEVEL] = { " *", " +", " o", " #", " @", " -", " =", "**", "--" @@ -97,7 +97,7 @@ #define HR_RULE_WIDTH 1 static int graph_mode = NIL; -#endif +#endif /* not KANJI_SYMBOLS */ #ifndef STRCHR char * @@ -110,7 +110,7 @@ } return NULL; } -#endif +#endif /* not STRCHR */ static MySignalHandler KeyAbort(SIGNAL_ARG) @@ -217,7 +217,7 @@ #ifdef JP_CHARSET if ((*code = checkShiftCode(line->ptr, *code)) != '\0') line = conv(line->ptr, *code, InnerCode); -#endif +#endif /* JP_CHARSET */ if (uf->scheme == SCM_NEWS) Strchop(line); return line; @@ -284,7 +284,7 @@ } return 0; } -#endif +#endif /* USE_COOKIE */ void readHeader(URLFile * uf, @@ -303,7 +303,7 @@ if (uf->scheme == SCM_HTTP #ifdef USE_SSL || uf->scheme == SCM_HTTPS -#endif +#endif /* USE_SSL */ ) http_response_code = -1; else @@ -318,7 +318,7 @@ Strfputs(tmp, ff); fclose(ff); } -#endif +#endif /* HTTP_DEBUG */ if ((uf->scheme == SCM_NEWS && Str_news_endline(tmp) && (uf->iseof = T)) || @@ -344,7 +344,7 @@ #ifdef JP_CHARSET if ((code = checkShiftCode(lineBuf2->ptr, '\0')) != '\0') lineBuf2 = conv(lineBuf2->ptr, code, InnerCode); -#endif +#endif /* JP_CHARSET */ /* separated with line and stored */ for (p = lineBuf2->ptr; *p; p = q) { for (q = p; *q && *q != '\r' && *q != '\n'; q++) @@ -360,7 +360,7 @@ if ((uf->scheme == SCM_HTTP #ifdef USE_SSL || uf->scheme == SCM_HTTPS -#endif +#endif /* USE_SSL */ ) && http_response_code == -1) { p = lineBuf2->ptr; while (*p && !IS_SPACE(*p)) p++; @@ -409,7 +409,7 @@ } #ifdef DEBUG fprintf(stderr, "Set-Cookie: [%s]\n", p); -#endif +#endif /* DEBUG */ SKIP_BLANKS(p); while (*p != '=' && !IS_ENDT(*p)) Strcat_char(name, *(p++)); @@ -471,7 +471,7 @@ "to prevent security violation.", NIL, 10, 1); } } -#endif +#endif /* USE_COOKIE */ else if (!strncasecmp(lineBuf2->ptr, "w3m-control:", 12) && uf->scheme == SCM_LOCAL) { Str funcname = Strnew(); @@ -721,7 +721,7 @@ if (pu.scheme == SCM_HTTP || #ifdef USE_SSL pu.scheme == SCM_HTTPS || -#endif +#endif /* USE_SSL */ (pu.scheme == SCM_GOPHER && GOPHER_proxy) || (pu.scheme == SCM_FTP && (FTP_proxy != NULL && !Do_not_use_proxy && !check_no_proxy(pu.host)))) { @@ -949,9 +949,9 @@ int ln; #ifdef JP_CHARSET ln = searchURLLabelLine(b, conv(pu.label, b->document_code, InnerCode)->ptr); -#else +#else /* not JP_CHARSET */ ln = searchURLLabelLine(b, pu.label); -#endif +#endif /* not JP_CHARSET */ if (ln >= 0) { gotoLine(b, ln); arrangeCursor(b); @@ -1072,7 +1072,7 @@ return 0; if (128+64 <= ch) return 1; -#endif +#endif /* not JP_CHARSET */ return 0; } @@ -1096,7 +1096,7 @@ if ((mode2==PC_KANJI1 || (mode2==PC_ASCII && !IS_SPACE(ch2))) && mode1==PC_ASCII && is_beginning_char(ch1)) return 0; -#else +#else /* not JP_CHARSET */ if (mode1==PC_ASCII && !IS_SPACE(ch1) && mode2==PC_ASCII && is_period_char(ch2)) return 0; @@ -1104,7 +1104,7 @@ if (mode2==PC_ASCII && !IS_SPACE(ch2) && mode1==PC_ASCII && is_beginning_char(ch1)) return 0; -#endif +#endif /* not JP_CHARSET */ if (mode1==PC_ASCII && is_word_char(ch1) && mode2==PC_ASCII && is_word_char(ch2)) @@ -1127,7 +1127,7 @@ obuf->bp.flag = obuf->flag; #ifdef FORMAT_NICE obuf->bp.flag &= ~RB_FILL; -#endif +#endif /* FORMAT_NICE */ obuf->bp.anchor = obuf->anchor; obuf->bp.anchor_target = obuf->anchor_target; obuf->bp.anchor_hseq = obuf->anchor_hseq; @@ -1282,7 +1282,7 @@ if ((!(obuf->flag & (RB_SPECIAL&~RB_NOBR)) && Strlastchar(obuf->line)==' ') #ifdef JP_CHARSET || obuf->prev_ctype == PC_KANJI1 -#endif +#endif /* JP_CHARSET */ ) Strshrink(obuf->line, 1); append_tags(obuf); @@ -1359,7 +1359,7 @@ } } } -#endif +#endif /* FORMAT_NICE */ if (force || (obuf->pos > 0 && !is_blank_line(obuf->line->ptr,indent))){ if (buf) @@ -1563,13 +1563,13 @@ Strcat(tmp, Sprintf("\">", cur_hseq++, cur_form_id)); -#else +#else /* not NEW_FORM */ Strcat_charp(tmp,"" "", cur_hseq++)); -#endif +#endif /* not NEW_FORM */ } if (q != NULL && *q != '\0') Strcat_charp(tmp,""); -#else +#else /* not KANJI_SYMBOLS */ Strcat_charp(tmp,"#"); -#endif +#endif /* not KANJI_SYMBOLS */ } } goto img_end; @@ -1632,9 +1632,9 @@ #ifdef NEW_FORM Strcat_charp(tmp,""); process_n_form(); -#else +#else /* not NEW_FORM */ Strcat_charp(tmp,""); -#endif +#endif /* not NEW_FORM */ } return tmp; } @@ -1719,11 +1719,11 @@ "name=\"%s\" width=%d maxlength=%d value=\"%s\"", cur_hseq++,cur_form_id, p,htmlquote_str(r),w,i,(q?htmlquote_str(q):""))); -#else +#else /* not NEW_FORM */ Strcat(tmp, Sprintf("["); cur_option = Strnew(); cur_option_value = Strnew(); @@ -1862,7 +1862,7 @@ cur_status = R_ST_NORMAL; return tmp; } -#endif +#endif /* MENU_SELECT */ cur_select = Strnew_charp(p); n_selectitem = 0; return NULL; @@ -1891,7 +1891,7 @@ n_select++; return tmp; } -#endif +#endif /* MENU_SELECT */ cur_select = NULL; n_selectitem = 0; return Strnew_charp("
"); @@ -1963,7 +1963,7 @@ } } -#endif +#endif /* MENU_SELECT */ Str process_option(struct parsed_tagarg *targ) @@ -1989,11 +1989,11 @@ "name=\"%s\" value=\"%s\"",begin_char, cur_hseq++, cur_form_id, select_is_multiple?"checkbox":"radio", cur_select->ptr, htmlquote_str(p)); -#else +#else /* not NEW_FORM */ tmp = Sprintf("
ptr,htmlquote_str(p)); -#endif +#endif /* not NEW_FORM */ if (n_selectitem == 0) Strcat_charp(tmp," checked>*"); else @@ -2050,12 +2050,12 @@ "name=\"%s\" size=%d rows=%d textareanumber=%d>", cur_hseq++,cur_form_id,cur_textarea->ptr,cur_textarea_size, cur_textarea_rows,n_textarea); -#else +#else /* not NEW_FORM */ tmp = Sprintf("[", cur_hseq++,cur_textarea->ptr,cur_textarea_size, cur_textarea_rows,n_textarea); -#endif +#endif /* not NEW_FORM */ Strcat(tmp,textfieldrep(textarea_str[n_textarea],cur_textarea_size)); Strcat_charp(tmp,"]"); n_textarea++; @@ -2131,7 +2131,7 @@ form_sp--; return NULL; } -#endif +#endif /* NEW_FORM */ static void clear_ignore_p_flag(int cmd, struct readbuffer *obuf) @@ -2211,7 +2211,7 @@ int hseq; #ifdef TABLE_EXPAND int ppc = PIXEL_PER_CHAR; -#endif +#endif /* TABLE_EXPAND */ switch (cmd) { case HTML_B: @@ -2415,7 +2415,7 @@ case 's': push_charp(obuf, 0 ,"□", PC_ASCII); break; -#endif +#endif /* KANJI_SYMBOLS */ default: push_charp(obuf, 0, ullevel[(h_env->envc_real - 1) % MAX_UL_LEVEL], PC_ASCII); break; @@ -2450,9 +2450,9 @@ } #if INDENT_INCR >= 4 Strcat_charp(num, ". "); -#else +#else /* INDENT_INCR < 4 */ Strcat_char(num, '.'); -#endif +#endif /* INDENT_INCR < 4 */ for (i = 0; i < INDENT_INCR - num->length; i++) push_char(obuf, 1, 0, ' ', PC_ASCII); push_str(obuf, num->length-INDENT_INCR, num, PC_ASCII); @@ -2586,13 +2586,13 @@ w -= envs[h_env->envc].indent; #ifndef KANJI_SYMBOLS push_charp(obuf,0,"<_RULE TYPE=10>",PC_ASCII); -#endif +#endif /* not KANJI_SYMBOLS */ for (i = 0; i < w-(HR_RULE_WIDTH-1); i += HR_RULE_WIDTH) { push_nchars(obuf, HR_RULE_WIDTH, HR_RULE, HR_RULE_WIDTH, PC_ASCII); } #ifndef KANJI_SYMBOLS push_charp(obuf,0,"",PC_ASCII); -#endif +#endif /* not KANJI_SYMBOLS */ if (p == NULL || !strcasecmp(p,"center")) { obuf->line = Stralign_center(obuf->line,h_env->limit); } @@ -2770,7 +2770,7 @@ else { #ifndef TABLE_EXPAND table_width[obuf->table_level] = i/PIXEL_PER_CHAR; -#else +#else /* TABLE_EXPAND */ if (obuf->table_level == 0) { int v = h_env->limit - envs[h_env->envc].indent; ppc = i/v; @@ -2785,7 +2785,7 @@ table_width[obuf->table_level] = i/tables[0]->ppc; else table_width[obuf->table_level] = 0; -#endif +#endif /* TABLE_EXPAND */ } } else if (!strcasecmp(t->arg,"hborder")) @@ -2814,7 +2814,7 @@ tables[0]->ppc = ppc; else tables[obuf->table_level]->ppc = tables[0]->ppc; -#endif +#endif /* TABLE_EXPAND */ table_mode[obuf->table_level].pre_mode = 0; table_mode[obuf->table_level].indent_level = 0; table_mode[obuf->table_level].nobr_level = 0; @@ -2860,16 +2860,16 @@ case HTML_FORM_INT: process_form(parse_tag(h_env->tagbuf->ptr)); return 1; -#endif +#endif /* NEW_FORM */ case HTML_N_FORM: #ifdef NEW_FORM case HTML_N_FORM_INT: process_n_form(); return 1; -#else +#else /* not NEW_FORM */ flushline(h_env, obuf, envs[h_env->envc].indent,0,h_env->limit); return 0; -#endif +#endif /* not NEW_FORM */ case HTML_INPUT: tmp = process_input(parse_tag(h_env->tagbuf->ptr)); if (tmp) { @@ -2885,12 +2885,12 @@ HTMLlineproc1(tmp->ptr,h_env); obuf->flag |= RB_INSELECT; } -#endif +#endif /* MENU_SELECT */ return 1; case HTML_N_SELECT: #ifdef MENU_SELECT obuf->flag &= ~RB_INSELECT; -#endif +#endif /* MENU_SELECT */ tmp = process_n_select(); HTMLlineproc1(tmp->ptr,h_env); return 1; @@ -3023,7 +3023,7 @@ int hseq; #ifdef NEW_FORM int form_id; -#endif +#endif /* NEW_FORM */ if (w3m_debug) debug = fopen("zzzerr","a"); @@ -3033,7 +3033,7 @@ nlines = -1; #ifdef NEW_FORM buf->formlist = (form_max >= 0)? forms[form_max] : NULL; -#endif +#endif /* NEW_FORM */ while ((istr = feed()) != NULL) { if (++nlines == llimit) break; @@ -3079,7 +3079,7 @@ } str--; } -#else +#else /* not JP_CHARSET */ if (mode == PC_ASCII && *str != '<' && *str != '&') { PPUSH(mode|effect,*str); } @@ -3096,7 +3096,7 @@ } str--; } -#endif +#endif /* not JP_CHARSET */ else { /* tag processing */ tagbuf = Strnew(); @@ -3192,11 +3192,11 @@ FormList *form; #ifdef NEW_FORM int form_id = -1; -#endif +#endif /* NEW_FORM */ #ifndef NEW_FORM if (form_sp < 0) break; /* outside of
..
*/ -#endif +#endif /* not NEW_FORM */ t_arg = parse_tag(tagbuf->ptr); hseq = 0; for (t = t_arg; t; t = t->next) { @@ -3207,14 +3207,14 @@ else if (!strcasecmp(t->arg, "fid") && t->value) { form_id = atoi(t->value); } -#endif +#endif /* NEW_FORM */ } #ifdef NEW_FORM if (form_id < 0) break; /* outside of
..
*/ form = forms[form_id]; -#else +#else /* not NEW_FORM */ form = form_stack[form_sp]; -#endif +#endif /* not NEW_FORM */ if (hseq > 0) { int hpos = pos; if (str[1]=='[') @@ -3270,7 +3270,7 @@ if (form_sp >= 0) form_sp--; break; -#endif +#endif /* not NEW_FORM */ case HTML_MAP: p = NULL; t_arg = parse_tag(tagbuf->ptr); @@ -3357,7 +3357,7 @@ case HTML_N_RULE: effect &= ~(PC_ISRULE | PC_RULE); break; -#endif +#endif /* not KANJI_SYMBOLS */ } } } @@ -3497,7 +3497,7 @@ str = p; } } -#endif +#endif /* MENU */ /* script */ if (obuf->flag & RB_IGNORE) { @@ -3639,13 +3639,13 @@ if (*str == '\0') break; #ifdef MENU if (obuf->flag & (RB_INTXTA|RB_INSELECT|RB_IGNORE)) goto beginning; -#else +#else /* not MENU */ if (obuf->flag & (RB_INTXTA|RB_IGNORE)) goto beginning; -#endif +#endif /* not MENU */ if ((*str == '<' #ifdef JP_CHARSET && mode != PC_KANJI1 -#endif +#endif /* JP_CHARSET */ ) || ST_IS_TAG(obuf->status)) { str_bak = str; /* @@ -3706,7 +3706,7 @@ Strshrink(obuf->line, 1); push_char(obuf, 1, 0, ' ', PC_ASCII); } -#endif +#endif /* JP_CHARSET */ if (obuf->flag & (RB_SPECIAL&~RB_NOBR)) { if (*str != '\n' && *str != '\r') obuf->flag &= ~RB_IGNORE_P; @@ -3775,7 +3775,7 @@ obuf->pos--; } } -#endif +#endif /* JP_CHARSET */ if (*str == '&') proc_escape(obuf, &str); else @@ -3785,7 +3785,7 @@ if (need_flushline(h_env, obuf, mode) #ifdef JP_CHARSET && mode != PC_KANJI1 -#endif +#endif /* JP_CHARSET */ ) { char *bp = obuf->line->ptr +obuf->bp.len; char *tp = bp -obuf->bp.tlen; @@ -3808,11 +3808,11 @@ #ifdef FORMAT_NICE if (obuf->pos > h_env->limit) obuf->flag |= RB_FILL; -#endif +#endif /* FORMAT_NICE */ flushline(h_env, obuf, indent, 0, h_env->limit); #ifdef FORMAT_NICE obuf->flag &= ~RB_FILL; -#endif +#endif /* FORMAT_NICE */ HTMLlineproc1(line->ptr, h_env); } } @@ -3824,11 +3824,11 @@ if (!(obuf->flag & (RB_PREMODE|RB_NOBR)) && obuf->pos -i > h_env->limit) { #ifdef FORMAT_NICE obuf->flag |= RB_FILL; -#endif +#endif /* FORMAT_NICE */ flushline(h_env, obuf, indent, 0, h_env->limit); #ifdef FORMAT_NICE obuf->flag &= ~RB_FILL; -#endif +#endif /* FORMAT_NICE */ } } @@ -3975,13 +3975,13 @@ #if 0 /*def KANJI_SYMBOLS */ for (j = pos; j <= i; j += 2) addstr("■"); -#else +#else /* not 0 */ standout(); addch(' '); for (j = pos + 1; j <= i; j++) addch('|'); standend(); -#endif +#endif /* not 0 */ /* no_clrtoeol(); */ refresh(); } @@ -4070,13 +4070,13 @@ n_textarea = 0; #ifdef MENU_SELECT n_select = 0; -#endif +#endif /* MENU_SELECT */ form_sp = -1; #ifdef NEW_FORM form_max = -1; forms_size = 0; forms = NULL; -#endif +#endif /* NEW_FORM */ cur_hseq = 1; @@ -4084,7 +4084,7 @@ newBuf->buffername = "---"; #ifdef JP_CHARSET newBuf->document_code = '\0'; -#endif +#endif /* JP_CHARSET */ HTMLlineproc3(newBuf,f->stream.f); w3m_halfload = NIL; if (fmInitialized) { @@ -4167,7 +4167,7 @@ HTMLlineproc2(newBuf, htmlenv1.buf); #ifdef JP_CHARSET newBuf->document_code = code; -#endif +#endif /* JP_CHARSET */ } /* @@ -4206,7 +4206,7 @@ newBuf->currentLine = newBuf->firstLine; #ifdef JP_CHARSET newBuf->document_code = InnerCode; -#endif +#endif /* JP_CHARSET */ return newBuf; } @@ -4239,7 +4239,7 @@ #ifdef JP_CHARSET if ((code = checkShiftCode(lbuf->ptr, '\0')) != '\0') lbuf = conv(lbuf->ptr, code, InnerCode); -#endif +#endif /* JP_CHARSET */ p = lbuf->ptr; for (name = Strnew(); *p && *p != '\t'; p++) @@ -4415,7 +4415,7 @@ newBuf->trbyte = trbyte + linelen; #ifdef JP_CHARSET newBuf->document_code = code; -#endif +#endif /* JP_CHARSET */ if (src) fclose(src); return newBuf; @@ -4435,9 +4435,9 @@ for (; l != NULL; l = l->next) { #ifdef JP_CHARSET tmp = conv(l->lineBuf,InnerCode,DisplayCode); -#else +#else /* not JP_CHARSET */ tmp = Strnew_charp(l->lineBuf); -#endif +#endif /* not JP_CHARSET */ Strfputs(tmp,f); if (Strlastchar(tmp) != '\n') putc('\n',f); @@ -4624,7 +4624,7 @@ #ifdef JP_CHARSET if ((code = checkShiftCode(lbuf->ptr, '\0')) != '\0') lbuf = conv(lbuf->ptr, code, InnerCode); -#endif +#endif /* JP_CHARSET */ lbuf = checkType(lbuf->ptr, propBuffer,LINELEN); len = lbuf->length; l = New(Line); diff -urdN w3m/fm.h w3m-0.1.6-2000FEB12JM01/fm.h --- w3m/fm.h Fri Jan 21 02:18:57 2000 +++ w3m-0.1.6-2000FEB12JM01/fm.h Sat Feb 12 07:17:19 2000 @@ -19,7 +19,7 @@ #ifdef MENU #define MENU_SELECT -#endif +#endif /* MENU */ #include "ctrlcode.h" #include "html.h" @@ -35,25 +35,25 @@ #ifdef NOBCOPY void bcopy(void*,void*,int); void bzero(void*,int); -#else +#else /* not NOBCOPY */ #include -#endif +#endif /* not NOBCOPY */ #ifdef DEBUG #include -#endif +#endif /* DEBUG */ #ifdef MAINPROGRAM #define global #define init(x) =(x) -#else +#else /* not MAINPROGRAM */ #define global extern #define init(x) -#endif +#endif /* not MAINPROGRAM */ #if LANG == JA #define JP_CHARSET -#endif +#endif /* LANG == JA */ /* * Constants. @@ -75,7 +75,7 @@ #ifdef DICT #define DICTCMD "w3mdict" #define DICTBUFFERNAME "*dictionary*" -#endif +#endif /* DICT */ /* * Line Property @@ -88,19 +88,19 @@ #define PC_KANJI2 0x4000 #define PC_CTRL 0x8000 -#else /* ISO-8859-1 charset */ +#else /* ISO-8859-1 charset (not JP_CHARSET) */ #define P_CHARTYPE 0x2000 #define PC_ASCII 0x0000 #define PC_CTRL 0x2000 -#endif +#endif /* not JP_CHARSET */ #ifndef KANJI_SYMBOLS #define PC_RULE 0x0f00 #define PC_ISRULE 0x1000 #define PC_RULE_FLAG(x) (((x)&0xf)<<8) #define PC_RULE_VAL(x) (((x)&PC_RULE)>>8) -#endif +#endif /* not KANJI_SYMBOLS */ /* Effect ( standout/underline ) */ #define P_EFFECT 0xfe @@ -120,9 +120,9 @@ #define CharType(c) ((c)&P_CHARTYPE) #ifdef KANJI_SYMBOLS #define CharEffect(c) ((c)&P_EFFECT) -#else +#else /* not KANJI_SYMBOLS */ #define CharEffect(c) ((c)&(P_EFFECT|PC_ISRULE|PC_RULE)) -#endif +#endif /* not KANJI_SYMBOLS */ #define SetCharType(v,c) ((v)=(((v)&~P_CHARTYPE)|(c))) @@ -156,9 +156,9 @@ int REV_LB[MAX_LB] = { LB_N_FRAME, LB_FRAME, LB_N_INFO, LB_INFO, LB_N_SOURCE, }; -#else +#else /* not MAINPROGRAM */ extern int REV_LB[]; -#endif +#endif /* not MAINPROGRAM */ /* Flags for calcPosition() */ #define CP_AUTO 0 @@ -281,7 +281,7 @@ int trbyte; #ifdef JP_CHARSET char document_code; -#endif +#endif /* JP_CHARSET */ TextList *document_header; FormItemList *form_submit; } Buffer; @@ -349,7 +349,7 @@ #define RB_RIGHT 0x20 #ifdef FORMAT_NICE #define RB_FILL 0x200000 -#endif +#endif /* FORMAT_NICE */ #define RB_NOBR 0x40 #define RB_P 0x80 #define RB_PRE_INT 0x100 @@ -364,7 +364,7 @@ #define RB_IGNORE_P 0x4000 #ifdef MENU #define RB_INSELECT 0x800 -#endif +#endif /* MENU */ #define RB_IN_DT 0x200 #define RB_N_TABLE 0x100000 @@ -451,7 +451,7 @@ #define COO_DOMAIN 4 #define COO_PATH 8 #define COO_DISCARD 16 -#endif +#endif /* USE_COOKIE */ typedef struct _Hist { int offset; @@ -493,16 +493,16 @@ extern int LINES, COLS; #if defined(CYGWIN) && LANG == JA #define LASTLINE (LINES-2) -#else +#else /* not defined(CYGWIN) && LANG == JA */ #define LASTLINE (LINES-1) -#endif +#endif /* not defined(CYGWIN) && LANG == JA */ global int Tabstop init(8); global int ShowEffect init(T); global int PagerMax init(PAGER_MAX_LINE); #ifdef JP_CHARSET global char InnerCode init(INTERNAL_CODE); -#endif +#endif /* JP_CHARSET */ global char SearchHeader init(NIL); global char *DefaultType init(NULL); @@ -523,7 +523,7 @@ #ifdef INET6 global int DNS_order init(0); extern int ai_family_order_table[3][3]; /* XXX */ -#endif +#endif /* INET6 */ global TextList *NO_proxy_domains; global int Do_not_use_proxy init(NIL); global int Do_not_use_ti_te init(NIL); @@ -550,10 +550,10 @@ global int form_color init(1); /* red */ #ifdef BG_COLOR global int bg_color init(8); /* don't change */ -#endif +#endif /* BG_COLOR */ global int useActiveColor init(NIL); global int active_color init(6); /* cyan */ -#endif +#endif /* COLOR */ global int confirm_on_quit init(T); global int displayLink init(NIL); global int showLineNum init(NIL); @@ -580,7 +580,7 @@ global struct auth_cookie *Auth_cookie init(NULL); #ifdef USE_COOKIE global struct cookie *First_cookie init(NULL); -#endif +#endif /* USE_COOKIE */ global struct mailcap *UserMailcap; global struct mailcap *SysMailcap; @@ -590,27 +590,27 @@ #ifdef USE_HISTORY global int URLHistSize init(100); global int URLSaveHist init(T); -#endif +#endif /* USE_HISTORY */ global int multicolList init(NIL); #ifdef JP_CHARSET extern char DisplayCode; -#endif +#endif /* JP_CHARSET */ #ifndef KANJI_SYMBOLS global int no_graphic_char init(NIL); -#endif +#endif /* not KANJI_SYMBOLS */ extern char *rc_dir; #ifdef MOUSE global int use_mouse init(T); extern int mouseActive; global int reverse_mouse init(NIL); -#endif +#endif /* MOUSE */ #ifdef USE_COOKIE global int default_use_cookie init(T); global int use_cookie init(T); -#endif +#endif /* USE_COOKIE */ /* * Externals @@ -619,4 +619,4 @@ #include "table.h" #include "proto.h" -#endif +#endif /* not FM_H */ diff -urdN w3m/form.c w3m-0.1.6-2000FEB12JM01/form.c --- w3m/form.c Fri Jan 14 01:13:29 2000 +++ w3m-0.1.6-2000FEB12JM01/form.c Sat Feb 12 07:58:27 2000 @@ -11,7 +11,7 @@ #ifdef MENU_SELECT extern FormSelectOption select_option[]; #include "menu.h" -#endif +#endif /* MENU_SELECT */ struct { char *action; @@ -21,7 +21,7 @@ {"option", panel_set_option}, #ifdef USE_COOKIE {"cookie", set_cookie_flag}, -#endif +#endif /* USE_COOKIE */ {NULL, NULL}, }; @@ -109,7 +109,7 @@ #ifdef MENU_SELECT } else if (!strcasecmp(t->arg,"selectnumber") && t->value) { item->select_option = select_option[atoi(t->value)].first; -#endif +#endif /* MENU_SELECT */ } else if (!strcasecmp(t->arg,"rows") && t->value) { item->rows = atoi(t->value); } @@ -123,7 +123,7 @@ item->value = chooseSelectOption(item->select_option,CHOOSE_VALUE); item->label = chooseSelectOption(item->select_option,CHOOSE_OPTION); } -#endif +#endif /* MENU_SELECT */ item->parent = fl; item->next = NULL; if (fl->item == NULL) { @@ -196,7 +196,7 @@ case FORM_INPUT_RADIO: #ifdef MENU_SELECT case FORM_SELECT: -#endif +#endif /* MENU_SELECT */ spos = a->start.pos -1; epos = a->end.pos; break; @@ -216,7 +216,7 @@ case FORM_SELECT: p = form->label->ptr; /* continue to the next label */ -#endif +#endif /* MENU_SELECT */ case FORM_INPUT_TEXT: case FORM_INPUT_FILE: case FORM_INPUT_PASSWORD: @@ -229,7 +229,7 @@ c_type = PC_KANJI2; else if (p[j] & 0x80) c_type = PC_KANJI1; -#endif +#endif /* JP_CHARSET */ else if (p[j] & ~0x1f) c_type = PC_ASCII; else @@ -259,7 +259,7 @@ SetCharType(buf->currentLine->propBuf[i],PC_ASCII); buf->currentLine->lineBuf[i] = ' '; } -#endif +#endif /* JP_CHARSET */ break; } copyBuffer(buf,&save); @@ -280,7 +280,7 @@ else if (s->ptr[i] & 0x80) c_type = PC_KANJI1; else -#endif +#endif /* JP_CHARSET */ c_type = PC_ASCII; if (!(s->ptr[i] & 0x80) && s->ptr[i] < ' ') Strcat_char(n,' '); @@ -298,7 +298,7 @@ Strshrink(n,1); i--; } -#endif +#endif /* JP_CHARSET */ for (; i < width; i++) Strcat_char(n,' '); return n; @@ -327,7 +327,7 @@ if (*(p+1) == '\n') p++; /* continue to the next label */ -#endif +#endif /* !defined(CYGWIN) && !defined(__EMX__) */ default: Strcat_char(z,*p); p++; @@ -336,9 +336,9 @@ } #ifdef JP_CHARSET fputs(Strkconv(z,InnerCode,DisplayCode)->ptr,f); -#else +#else /* not JP_CHARSET */ fputs(z->ptr,f); -#endif +#endif /* not JP_CHARSET */ } @@ -383,9 +383,9 @@ } #ifdef JP_CHARSET Strcat(fi->value,Strkconv(tmp,DisplayCode,InnerCode)); -#else +#else /* not JP_CHARSET */ Strcat(fi->value,tmp); -#endif +#endif /* not JP_CHARSET */ } fclose(f); unlink(tmpname->ptr); @@ -476,7 +476,7 @@ } } } -#endif +#endif /* MENU_SELECT */ void form_write_data(FILE *f, char *boundary, char *name, char *value) diff -urdN w3m/form.h w3m-0.1.6-2000FEB12JM01/form.h --- w3m/form.h Tue Jan 11 23:23:33 2000 +++ w3m-0.1.6-2000FEB12JM01/form.h Sat Feb 12 07:59:13 2000 @@ -35,7 +35,7 @@ #define MAX_TEXTAREA 100 /* max number of within one document */ #ifdef MENU_SELECT #define MAX_SELECT 100 /* max number of within one document */ -#endif +#endif /* MENU_SELECT */ typedef struct form_list { struct form_item_list *item; @@ -71,7 +71,7 @@ /* macros for chooseSelectOption */ #define CHOOSE_OPTION 0 #define CHOOSE_VALUE 1 -#endif +#endif /* MENU_SELECT */ typedef struct form_item_list { int type; @@ -85,10 +85,10 @@ #ifdef MENU FormSelectOptionItem *select_option; Str label; -#endif +#endif /* MENU */ struct form_list *parent; struct form_item_list *next; int anchor_num; } FormItemList; -#endif +#endif /* not FORM_H */ diff -urdN w3m/frame.c w3m-0.1.6-2000FEB12JM01/frame.c --- w3m/frame.c Fri Jan 14 04:13:23 2000 +++ w3m-0.1.6-2000FEB12JM01/frame.c Sat Feb 12 07:59:37 2000 @@ -6,9 +6,9 @@ #ifdef KANJI_SYMBOLS #define RULE_WIDTH 2 -#else +#else /* not KANJI_SYMBOLS */ #define RULE_WIDTH 1 -#endif +#endif /* not KANJI_SYMBOLS */ static JMP_BUF AbortLoading; @@ -313,7 +313,7 @@ if (code != '\0' && code != InnerCode) { tmp = conv(tmp->ptr,code,InnerCode); } -#endif +#endif /* JP_CHARSET */ if (pre) Strchop(tmp); p = tmp->ptr; diff -urdN w3m/ftp.c w3m-0.1.6-2000FEB12JM01/ftp.c --- w3m/ftp.c Tue Jan 11 23:23:33 2000 +++ w3m-0.1.6-2000FEB12JM01/ftp.c Sat Feb 12 07:59:57 2000 @@ -12,7 +12,7 @@ #ifdef DEBUG #include -#endif +#endif /* DEBUG */ typedef struct _FTP { FILE *rcontrol; @@ -403,7 +403,7 @@ pathStr = conv(realpath, code, InnerCode); realpath = pathStr->ptr; } -#endif +#endif /* JP_CHARSET */ pu->file = realpath; return FTPDATA(ftp); } diff -urdN w3m/func.h w3m-0.1.6-2000FEB12JM01/func.h --- w3m/func.h Tue Jan 11 23:23:33 2000 +++ w3m-0.1.6-2000FEB12JM01/func.h Sat Feb 12 08:00:15 2000 @@ -16,4 +16,4 @@ FuncList *getFuncList(char*,FuncList*,int); -#endif +#endif /* not FUNC_H */ diff -urdN w3m/hash.h w3m-0.1.6-2000FEB12JM01/hash.h --- w3m/hash.h Tue Jan 11 23:23:33 2000 +++ w3m-0.1.6-2000FEB12JM01/hash.h Sat Feb 12 08:00:40 2000 @@ -79,5 +79,4 @@ return hi->value;\ } -#endif - +#endif /* not HASH_H */ diff -urdN w3m/history.c w3m-0.1.6-2000FEB12JM01/history.c --- w3m/history.c Tue Jan 11 23:23:33 2000 +++ w3m-0.1.6-2000FEB12JM01/history.c Sat Feb 12 08:01:03 2000 @@ -62,7 +62,7 @@ } fclose(f); } -#endif +#endif /* USE_HISTORY */ Hist * initHist(int size) diff -urdN w3m/html.h w3m-0.1.6-2000FEB12JM01/html.h --- w3m/html.h Tue Jan 11 23:23:33 2000 +++ w3m-0.1.6-2000FEB12JM01/html.h Sat Feb 12 08:01:46 2000 @@ -3,7 +3,7 @@ #define _HTML_H #ifdef USE_SSL #include -#endif +#endif /* USE_SSL */ struct cmdtable { char *cmdname; @@ -47,14 +47,14 @@ int status; }; typedef struct ssl_stream *SSLStream; -#endif +#endif /* USE_SSL */ typedef union { FILE *f; char *is; #ifdef USE_SSL SSLStream ss; -#endif +#endif /* USE_SSL */ } Stream; typedef struct { @@ -73,7 +73,7 @@ #define SMT_STRING 1 #ifdef USE_SSL #define SMT_SSL 2 -#endif +#endif /* USE_SSL */ #define ENC_7BIT 0 #define ENC_BASE64 1 @@ -212,6 +212,6 @@ #define SCM_MAILTO 7 #ifdef USE_SSL #define SCM_HTTPS 8 -#endif +#endif /* USE_SSL */ -#endif +#endif /* _HTML_H */ diff -urdN w3m/indep.c w3m-0.1.6-2000FEB12JM01/indep.c --- w3m/indep.c Tue Jan 11 23:23:33 2000 +++ w3m-0.1.6-2000FEB12JM01/indep.c Sat Feb 12 08:02:58 2000 @@ -164,7 +164,7 @@ return dummy; } } -#else +#else /* not JP_CHARSET */ char *conv_latin1(int ch) { static char dummy[2] = {0,0}; @@ -175,7 +175,7 @@ dummy[0] = ch; return dummy; } -#endif +#endif /* not JP_CHARSET */ char* getescapecmd(char **s) @@ -272,11 +272,11 @@ #ifdef GETCWD path = New_N(char,MAXPATHLEN); getcwd(path,MAXPATHLEN); -#else +#else /* not GETCWD */ #ifdef GETWD path = New_N(char,1024); getwd(path); -#else +#else /* not GETWD */ FILE *f; char *p; path = New_N(char,1024); @@ -288,8 +288,8 @@ *p = '\0'; break; } -#endif /* GETWD */ -#endif /* GETCWD */ +#endif /* not GETWD */ +#endif /* not GETCWD */ return path; } @@ -342,7 +342,7 @@ q += 2; continue; } -#endif +#endif /* CYGWIN */ *p = '\0'; q++; strcat(buf, q); diff -urdN w3m/indep.h w3m-0.1.6-2000FEB12JM01/indep.h --- w3m/indep.h Tue Jan 11 23:23:33 2000 +++ w3m-0.1.6-2000FEB12JM01/indep.h Sat Feb 12 08:03:10 2000 @@ -24,4 +24,4 @@ #define NewAtom_N(type,n) ((type*)GC_MALLOC_ATOMIC((n)*sizeof(type))) #define New_Reuse(type,ptr,n) ((type*)GC_REALLOC((ptr),(n)*sizeof(type))) -#endif +#endif /* INDEP_H */ diff -urdN w3m/linein.c w3m-0.1.6-2000FEB12JM01/linein.c --- w3m/linein.c Fri Jan 21 02:58:41 2000 +++ w3m-0.1.6-2000FEB12JM01/linein.c Sat Feb 12 08:04:14 2000 @@ -7,7 +7,7 @@ #include extern int do_getch(); #define getch() do_getch() -#endif +#endif /* USE_GPM */ #define STR_LEN 256 @@ -69,7 +69,7 @@ Lineprop mode; #ifdef JP_CHARSET Str tmp = Strnew(); -#endif +#endif /* JP_CHARSET */ mode = PC_ASCII; in_kanji = NIL; @@ -160,7 +160,7 @@ Strcat_char(tmp, (c | 0x80)); mode = PC_KANJI1; redrawOK = NIL; -#endif +#endif /* JP_CHARSET */ } else { i_quote = NIL; cm_next = NIL; @@ -200,7 +200,7 @@ addstr(" "); i++; } -#endif +#endif /* JP_CHARSET */ } for (; strBuf[i] != '\0'; i++) { if (flag & IN_PASSWORD) @@ -296,7 +296,7 @@ #ifdef JP_CHARSET if (strProp[i] == PC_KANJI1) delta = 2; -#endif +#endif /* JP_CHARSET */ for (i = CPos; i < CLen; i++) { strBuf[i] = strBuf[i + delta]; strProp[i] = strProp[i + delta]; @@ -312,7 +312,7 @@ #ifdef JP_CHARSET if (strProp[CPos] == PC_KANJI2) CPos--; -#endif +#endif /* JP_CHARSET */ } static void @@ -323,7 +323,7 @@ #ifdef JP_CHARSET if (strProp[CPos] == PC_KANJI2) CPos++; -#endif +#endif /* JP_CHARSET */ } static void @@ -610,6 +610,6 @@ #ifdef JP_CHARSET if (prev_ctype == PC_KANJI1 && ctype != PC_KANJI2) *(p-1) = PC_ASCII; -#endif +#endif /* JP_CHARSET */ } } diff -urdN w3m/local.c w3m-0.1.6-2000FEB12JM01/local.c --- w3m/local.c Tue Jan 11 23:23:33 2000 +++ w3m-0.1.6-2000FEB12JM01/local.c Sat Feb 12 08:05:27 2000 @@ -4,7 +4,7 @@ #include #ifdef READLINK #include -#endif +#endif /* READLINK */ #include "pq.h" #include "local.h" @@ -25,7 +25,7 @@ #ifdef READLINK struct stat lst; char lbuf[1024]; -#endif +#endif /* READLINK */ int l, nrow, n = 0, maxlen = 0; Str dirname; @@ -63,7 +63,7 @@ #ifdef READLINK if (lstat(fbuf,&lst) < 0) continue; -#endif +#endif /* READLINK */ if (stat(fbuf,&st) < 0) continue; if (multicolList) { @@ -75,7 +75,7 @@ #ifdef READLINK else if (S_ISLNK(lst.st_mode)) Strcat_charp(tmp,"[LINK] "); -#endif +#endif /* READLINE */ else Strcat_charp(tmp,"[FILE] "); } @@ -110,7 +110,7 @@ Strcat_char(tmp,'/'); } } -#endif +#endif /* READLINK */ Strcat_charp(tmp,"
\n"); } } @@ -149,13 +149,13 @@ { #ifdef HAVE_SETENV setenv(var,value,1); -#else +#else /* not HAVE_SETENV */ #ifdef HAVE_PUTENV Str tmp = Strnew_charp(var); Strcat_char(tmp,'='); Strcat_charp(tmp,value); putenv(tmp->ptr); -#else +#else /* not HAVE_PUTENV */ extern char **environ; char **ne; char *p; @@ -188,8 +188,8 @@ *(ne++) = p; *ne = NULL; environ = newenv; -#endif /* HAVE_PUTENV */ -#endif /* HAVE_SETENV */ +#endif /* not HAVE_PUTENV */ +#endif /* not HAVE_SETENV */ } static void diff -urdN w3m/local.h w3m-0.1.6-2000FEB12JM01/local.h --- w3m/local.h Tue Jan 11 23:23:33 2000 +++ w3m-0.1.6-2000FEB12JM01/local.h Sat Feb 12 08:06:52 2000 @@ -9,35 +9,35 @@ #ifdef DIRENT #include typedef struct dirent Directory; -#else +#else /* DIRENT */ #include typedef struct direct Directory; -#endif +#endif /* not DIRENT */ #include #ifndef S_IFMT #define S_IFMT 0170000 -#endif +#endif /* not S_IFMT */ #ifndef S_IFREG #define S_IFREG 0100000 -#endif +#endif /* not S_IFREG */ #define NOT_REGULAR(m) (((m) & S_IFMT) != S_IFREG) #ifndef S_ISDIR #ifndef S_IFDIR #define S_IFDIR 0040000 -#endif +#endif /* not S_IFDIR */ #define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) -#endif +#endif /* not S_ISDIR */ #ifdef READLINK #ifndef S_IFLNK #define S_IFLNK 0120000 -#endif +#endif /* not S_IFLNK */ #ifndef S_ISLNK #define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK) -#endif -#endif +#endif /* not S_ISLNK */ +#endif /* READLINK */ -#endif +#endif /* not LOCAL_H */ diff -urdN w3m/main.c w3m-0.1.6-2000FEB12JM01/main.c --- w3m/main.c Fri Jan 21 02:18:58 2000 +++ w3m-0.1.6-2000FEB12JM01/main.c Sat Feb 12 08:14:57 2000 @@ -48,7 +48,7 @@ static void keyPressEventProc(int c); #ifdef USE_MARK static void cmd_mark(Lineprop * p); -#endif +#endif /* USE_MARK */ static int display_ok = NIL; int w3m_dump = 0; @@ -68,9 +68,9 @@ #if defined(DEBIAN) # include "gc/private/gc_priv.h" -#else +#else /* not defined(DEBIAN) */ # include "gc_private.h" -#endif +#endif /* not defined(DEBIAN) */ int real_main(int,char**,char**); int @@ -80,9 +80,9 @@ GC_stackbottom = (ptr_t)(&dummy); return(real_main(argc, argv, envp)); } -#else +#else /* not defined(AIX) || defined(linux) */ #define MAIN main -#endif +#endif /* not defined(AIX) || defined(linux) */ static void usage() @@ -96,7 +96,7 @@ fprintf(stderr, " -s Shift_JIS\n"); fprintf(stderr, " -j JIS\n"); fprintf(stderr, " -e EUC-JP\n"); -#endif +#endif /* JP_CHARSET */ fprintf(stderr, " -B load bookmark\n"); fprintf(stderr, " -bookmark file specify bookmark file\n"); fprintf(stderr, " -T type specify content-type\n"); @@ -104,7 +104,7 @@ fprintf(stderr, " -v visual startup mode\n"); #ifdef COLOR fprintf(stderr, " -M monochrome display\n"); -#endif +#endif /* COLOR */ fprintf(stderr, " -F automatically render frame\n"); fprintf(stderr, " -dump dump formatted page into stdout\n"); fprintf(stderr, " -cols width specify column width (used with -dump)\n"); @@ -115,13 +115,13 @@ fprintf(stderr, " -no-proxy don't use proxy\n"); #ifdef MOUSE fprintf(stderr, " -no-mouse don't use mouse\n"); -#endif +#endif /* MOUSE */ #ifdef USE_COOKIE fprintf(stderr, " -cookie use cookie (-no-cookie: don't use cookie)\n"); -#endif +#endif /* USE_COOKIE */ #ifndef KANJI_SYMBOLS fprintf(stderr, " -no-graph don't use graphic character\n"); -#endif +#endif /* not KANJI_SYMBOLS */ fprintf(stderr, " -S squeeze multiple blank lines\n"); fprintf(stderr, " -W toggle wrap search mode\n"); fprintf(stderr, " -X don't use termcap init/deinit\n"); @@ -147,7 +147,7 @@ #ifndef SYS_ERRLIST prepare_sys_errlist(); -#endif +#endif /* not SYS_ERRLIST */ NO_proxy_domains = newTextList(); fileToDelete = newTextList(); @@ -175,10 +175,10 @@ initKeymap(); #ifdef MENU initMenu(); -#endif +#endif /* MENU */ #ifdef USE_COOKIE initCookie(); -#endif +#endif /* USE_COOKIE */ SearchHist = initHist(HIST_SIZE + 1); MarkHist = initHist(HIST_SIZE + 1); @@ -188,9 +188,9 @@ #ifdef USE_HISTORY URLHist = initHist(URLHistSize + 1); loadHistory(URLHist); -#else +#else /* not USE_HISTORY */ URLHist = initHist(HIST_SIZE + 1); -#endif +#endif /* not USE_HISTORY */ if (HTTP_proxy == NULL && ((p = getenv("HTTP_PROXY")) || @@ -242,11 +242,11 @@ DisplayCode = CODE_JIS1; else if (!strcmp("-e", argv[i])) DisplayCode = CODE_EUC; -#endif +#endif /* JP_CHARSET */ #ifndef KANJI_SYMBOLS else if (!strcmp("-no-graph",argv[i])) no_graphic_char = T; -#endif +#endif /* not KANJI_SYMBOLS */ else if (!strcmp("-T", argv[i])) DefaultType = argv[++i]; else if (!strcmp("-m", argv[i])) @@ -256,7 +256,7 @@ #ifdef COLOR else if (!strcmp("-M", argv[i])) useColor = NIL; -#endif +#endif /* COLOR */ else if (!strcmp("-B", argv[i])) load_bookmark = T; else if (!strcmp("-bookmark",argv[i])) @@ -305,7 +305,7 @@ mouse_end(); use_mouse = NIL; } -#endif +#endif /* MOUSE */ #ifdef USE_COOKIE else if (!strcmp("-no-cookie", argv[i])) { use_cookie = NIL; @@ -313,7 +313,7 @@ else if (!strcmp("-cookie", argv[i])) { use_cookie = T; } -#endif +#endif /* USE_COOKIE */ else if (!strcmp("-S", argv[i])) squeezeBlankLine = T; else if (!strcmp("-X", argv[i])) @@ -400,7 +400,7 @@ deleteFiles(); #ifdef USE_COOKIE save_cookies(); -#endif +#endif /* USE_COOKIE */ exit(0); } if (Currentbuf == NULL) @@ -459,9 +459,9 @@ s_page = Strnew_charp("W3M startup page
Welcome to "); #ifdef JP_CHARSET Strcat_charp(s_page,""); -#else +#else /* not JP_CHARSET */ Strcat_charp(s_page,""); -#endif +#endif /* not JP_CHARSET */ Strcat_m_charp(s_page, "w3m!

This is w3m version ", version, @@ -472,7 +472,7 @@ "

Debian package is maintained by Fumitoshi UKAI.", "You can read w3m documents on your local system.", NULL); -#endif +#endif /* DEBIAN */ newbuf = loadHTMLString(s_page->ptr); if (newbuf == NULL) fprintf(stderr, "w3m: Can't load string\n"); @@ -493,7 +493,7 @@ } #ifdef SIGWINCH signal(SIGWINCH, resize_hook); -#endif +#endif /* SIGWINCH */ Currentbuf = Firstbuf; displayBuffer(Currentbuf, B_NORMAL); if (line_str){ @@ -512,11 +512,11 @@ /* get keypress event */ #ifdef MOUSE if (use_mouse) mouse_active(); -#endif +#endif /* MOUSE */ c = getch(); #ifdef MOUSE if (use_mouse) mouse_inactive(); -#endif +#endif /* MOUSE */ if ((c & 0x80) == 0) { /* Ascii */ if (('0' <= c) && (c <= '9')) { prec_num = prec_num * 10 + (int)(c - '0'); @@ -668,7 +668,7 @@ signal(SIGWINCH,resize_hook); SIGNAL_RETURN; } -#endif +#endif /* SIGWINCH */ static void curHome(void) @@ -691,9 +691,9 @@ return; #ifdef VI_PREC_NUM Currentbuf->topLine = lineSkip(Currentbuf->topLine, PREC_NUM * (LASTLINE - 1)); -#else +#else /* not VI_PREC_NUM */ Currentbuf->topLine = lineSkip(Currentbuf->topLine, prec_num ? prec_num : LASTLINE - 1); -#endif +#endif /* not VI_PREC_NUM */ curHome(); } @@ -705,9 +705,9 @@ return; #ifdef VI_PREC_NUM Currentbuf->topLine = lineSkip(Currentbuf->topLine, PREC_NUM * (-LASTLINE + 1)); -#else +#else /* not VI_PREC_NUM */ Currentbuf->topLine = lineSkip(Currentbuf->topLine, prec_num ? -prec_num : -LASTLINE + 1); -#endif +#endif /* not VI_PREC_NUM */ curHome(); } @@ -954,7 +954,7 @@ if (CharType(p[i]) == PC_KANJI1) delta = 2; else -#endif +#endif /* JP_CHARSET */ delta = 1; if (buf->currentColumn == buf->pos) buf->pos += delta; @@ -981,7 +981,7 @@ if (CharType(p[i - 1]) == PC_KANJI2) delta = 2; else -#endif +#endif /* JP_CHARSET */ delta = 1; if ( buf->visualpos == COLS-1 ) buf->pos = MAX(0, buf->pos-delta); @@ -1330,11 +1330,11 @@ deleteFiles(); #ifdef USE_COOKIE save_cookies(); -#endif +#endif /* USE_COOKIE */ #ifdef USE_HISTORY if (URLSaveHist) saveHistory(URLHist); -#endif +#endif /* USE_HISTORY */ exit(0); } @@ -1383,7 +1383,7 @@ { #ifndef SIGSTOP char *shell; -#endif +#endif /* not SIGSTOP */ move(LASTLINE, 0); clrtoeolx(); refresh(); @@ -1393,9 +1393,9 @@ if (shell == NULL) shell = "/bin/sh"; system(shell); -#else +#else /* SIGSTOP */ kill(getpid(), SIGSTOP); -#endif +#endif /* SIGSTOP */ fmInit(); displayBuffer(Currentbuf, B_FORCE_REDRAW); } @@ -1673,7 +1673,7 @@ displayBuffer(Currentbuf, B_FORCE_REDRAW); } -#endif +#endif /* USE_MARK */ #ifdef JP_CHARSET static char* @@ -1691,9 +1691,9 @@ } return url; } -#else +#else /* not JP_CHARSET */ #define cURLcode(url,buf) (url) -#endif +#endif /* not JP_CHARSET */ static Buffer * loadLink(char *url, char *target, char *referer, FormList *request) @@ -1838,7 +1838,7 @@ FormSelectOptionItem *opt; FormSelectOptionItem *curopt; FormSelectOptionItem *srcopt; -#endif +#endif /* MENU_SELECT */ if (src == NULL) return NULL; @@ -1882,7 +1882,7 @@ item->select_option = opt; if (srcitem->label) item->label = Strdup(srcitem->label); -#endif +#endif /* MENU_SELECT */ item->parent = list; item->next = NULL; @@ -1949,9 +1949,9 @@ *query = conv(f2->value->ptr,InnerCode,fi->parent->charset); else *query = conv(f2->value->ptr,InnerCode,Currentbuf->document_code); - #else + #else /* not JP_CHARSET */ *query = f2->value; - #endif + #endif /* not JP_CHARSET */ if (f2->type == FORM_INPUT_FILE) form_write_form_file(body, fi->parent->boundary, f2->name->ptr, (*query)->ptr); else @@ -1976,9 +1976,9 @@ Strcat(*query,form_quote(conv(f2->value->ptr,InnerCode,fi->parent->charset))); else Strcat(*query,form_quote(conv(f2->value->ptr,InnerCode,Currentbuf->document_code))); - #else + #else /* not JP_CHARSET */ Strcat(*query,form_quote(f2->value)); - #endif + #endif /* not JP_CHARSET */ } } if (f2->next) @@ -2064,7 +2064,7 @@ Currentbuf->cursorY); formUpdateBuffer(a,Currentbuf,fi); break; -#endif +#endif /* MENU_SELECT */ case FORM_INPUT_IMAGE: case FORM_INPUT_SUBMIT: case FORM_INPUT_BUTTON: @@ -2525,7 +2525,7 @@ #ifdef JP_CHARSET if (buf != NULL) buf->document_code = Currentbuf->document_code; -#endif +#endif /* JP_CHARSET */ cmd_loadBuffer(buf, BP_NORMAL, LB_INFO); } @@ -2550,7 +2550,7 @@ if (buf != NULL) cmd_loadBuffer(buf, BP_NO_URL, LB_NOLINK); } -#endif +#endif /* USE_COOKIE */ #ifdef USE_HISTORY /* History page */ @@ -2559,7 +2559,7 @@ { cmd_loadBuffer(historyBuffer(URLHist), BP_NO_URL, LB_NOLINK); } -#endif +#endif /* USE_HISTORY */ /* download HREF link */ void @@ -2806,7 +2806,7 @@ "http://[a-zA-Z0-9][a-zA-Z0-9:%\\-\\./?=~_\\&+@#,]*", #ifdef USE_SSL "https://[a-zA-Z0-9][a-zA-Z0-9:%\\-\\./?=~_\\&+@#,]*", -#endif +#endif /* USE_SSL */ "gopher://[a-zA-Z0-9][a-zA-Z0-9:%\\-\\./_]*", "ftp://[a-zA-Z0-9][a-zA-Z0-9%\\-\\./_+:@]*", "news:[^<> ][^<> ]*", @@ -2953,9 +2953,9 @@ #ifdef JP_CHARSET tmp = Sprintf("line %d/%d (%d%%) code %c",cur,all,cur*100/all, Currentbuf->document_code); -#else +#else /* not JP_CHARSET */ tmp = Sprintf("line %d/%d (%d%%)",cur,all,cur*100/all); -#endif +#endif /* not JP_CHARSET */ disp_message(tmp->ptr,NIL); } @@ -3025,7 +3025,7 @@ #ifdef JP_CHARSET || ((Currentbuf->currentLine->propBuf[Currentbuf->pos] & PC_KANJI1) && x == Currentbuf->cursorX + 1) -#endif +#endif /* JP_CHARSET */ )) { followA(); return; @@ -3044,7 +3044,7 @@ cursorXY(Currentbuf, x, y); onA(); mainMenu(x, y); -#endif +#endif /* MENU */ break; } } else { @@ -3103,8 +3103,8 @@ process_mouse(btn, x-1, y-1); return 0; } -#endif -#endif +#endif /* USE_GPM */ +#endif /* MOUSE */ void wrapToggle( void ) { @@ -3182,4 +3182,4 @@ { execdict(GetWord(Currentbuf)); } -#endif +#endif /* DICT */ diff -urdN w3m/map.c w3m-0.1.6-2000FEB12JM01/map.c --- w3m/map.c Fri Jan 14 00:34:25 2000 +++ w3m-0.1.6-2000FEB12JM01/map.c Sat Feb 12 08:15:11 2000 @@ -105,7 +105,7 @@ #ifdef JP_CHARSET Strcat_charp(tmp,"Document Code"); Strcat_charp(tmp,code_str(buf->document_code)); -#endif +#endif /* JP_CHARSET */ Strcat_charp(tmp,"Number of line"); all = buf->allLine; if (all == 0 && buf->lastLine) diff -urdN w3m/matrix.c w3m-0.1.6-2000FEB12JM01/matrix.c --- w3m/matrix.c Tue Jan 11 23:23:34 2000 +++ w3m-0.1.6-2000FEB12JM01/matrix.c Sat Feb 12 08:16:06 2000 @@ -51,14 +51,14 @@ #ifndef NO_FLOAT_H # include -#endif +#endif /* not NO_FLOAT_H */ #if defined(DBL_MAX) static double Tiny = 10.0/DBL_MAX; #elif defined(FLT_MAX) static double Tiny = 10.0/FLT_MAX; -#else +#else /* not defined(FLT_MAX) */ static double Tiny = 1.0e-30; -#endif +#endif /* not defined(FLT_MAX */ /* * LUfactor -- gaussian elimination with scaled partial pivoting @@ -149,7 +149,7 @@ LUfactor(A1, index); return LUinverse(A1, index, out); } -#endif +#endif /* 0 */ Matrix LUinverse(Matrix A, int *index, Matrix out) diff -urdN w3m/matrix.h w3m-0.1.6-2000FEB12JM01/matrix.h --- w3m/matrix.h Tue Jan 11 23:23:34 2000 +++ w3m-0.1.6-2000FEB12JM01/matrix.h Sat Feb 12 08:16:36 2000 @@ -43,9 +43,9 @@ #define v_entry(v,i) (V_VAL(v,i)) #ifdef __CYGWIN__ #define m_copy(m1,m2) (bcopy((const char *)(m1)->me,(char *)(m2)->me,(m1)->dim*(m1)->dim*sizeof(double))) -#else +#else /* not __CYGWIN__ */ #define m_copy(m1,m2) (bcopy((m1)->me,(m2)->me,(m1)->dim*(m1)->dim*sizeof(double))) -#endif /* __CYGWIN__ */ +#endif /* not __CYGWIN__ */ #define v_free(v) ((v)=NULL) #define m_free(m) ((m)=NULL) #define px_free(px) ((px)=NULL) @@ -70,4 +70,4 @@ extern Vector new_vector(int); #define _MATRIX_H -#endif +#endif /* _MATRIX_H */ diff -urdN w3m/menu.c w3m-0.1.6-2000FEB12JM01/menu.c --- w3m/menu.c Fri Jan 21 03:29:35 2000 +++ w3m-0.1.6-2000FEB12JM01/menu.c Sat Feb 12 08:51:58 2000 @@ -16,7 +16,7 @@ static int X_Gpm_Selection; extern int do_getch(); #define getch() do_getch() -#endif +#endif /* USE_GPM */ #ifdef MENU @@ -26,18 +26,18 @@ "┌", "─", "┐", "│", " ", "│", "└", "─", "┘", -#else +#else /* not MENU_THIN_FRAME */ "┏", "━", "┓", "┃", " ", "┃", "┗", "━", "┛", -#endif +#endif /* not MENU_THIN_FRAME */ "：", "："}; #define FRAME_WIDTH 2 #define G_start /**/ #define G_end /**/ -#else +#else /* not KANJI_SYMBOLS */ static char *N_FRAME[] = { "+", "-", "+", "|", " ", "|", @@ -56,7 +56,7 @@ #define G_start {if (graph_mode) graphstart();} #define G_end {if (graph_mode) graphend();} -#endif +#endif /* not KANJI_SYMBOLS */ static int mEsc(char c); static int mEscB(char c); @@ -218,7 +218,7 @@ { MENU_FUNC, "終了 (q)", NULL, 0, qquitfm, NULL, "qQ" }, { MENU_END, "", NULL, 0, nulcmd, NULL, "" }, }; -#else +#else /* LANG != JA */ static MenuItem MainMenuItem[] = { /* type label variable value func popup keys */ { MENU_FUNC, " Back (b) ", NULL, 0, backBf, NULL, "b" }, @@ -239,7 +239,7 @@ { MENU_FUNC, " Quit (q) ", NULL, 0, qquitfm, NULL, "qQ" }, { MENU_END, "", NULL, 0, nulcmd, NULL, "" }, }; -#endif +#endif /* LANG != JA */ /* --- MainMenu (END) --- */ @@ -363,7 +363,7 @@ FRAME = N_FRAME; } } -#endif +#endif /* not KANJI_SYMBOLS */ if (menu->offset == 0) { G_start; @@ -512,17 +512,17 @@ while(1) { #ifdef MOUSE if (use_mouse) mouse_active(); -#endif +#endif /* MOUSE */ c = getch(); #ifdef MOUSE if (use_mouse) mouse_inactive(); -#endif +#endif /* MOUSE */ #ifdef USE_GPM if (c == X_GPM_SELECTED) { select = X_Gpm_Selection; break; } -#endif +#endif /* USE_GPM */ if ((c & 0x80) == 0) { /* Ascii */ select = (*menu->keymap[(int)c])(c); if (select != MENU_NOTHING) @@ -562,7 +562,7 @@ #ifdef USE_GPM gpm_handler = gpm_process_menu_mouse; -#endif +#endif /* USE_GPM */ menu->parent = parent; menu->select = menu->initial; menu->offset = 0; @@ -582,7 +582,7 @@ #ifdef USE_GPM if (CurrentMenu == NULL) gpm_handler = gpm_process_mouse; -#endif +#endif /* USE_GPM */ } void @@ -883,14 +883,14 @@ return X_GPM_SELECTED; return 0; } -#endif -#else +#endif /* USE_GPM */ +#else /* not MOUSE */ static int mMouse(char c) { return(MENU_NOTHING); } -#endif +#endif /* not MOUSE */ /* --- MenuFunctions (END) --- */ diff -urdN w3m/menu.h w3m-0.1.6-2000FEB12JM01/menu.h --- w3m/menu.h Tue Jan 11 23:23:34 2000 +++ w3m-0.1.6-2000FEB12JM01/menu.h Sat Feb 12 08:19:35 2000 @@ -49,4 +49,4 @@ MenuItem *item; } MenuList; -#endif +#endif /* not MENU_H */ diff -urdN w3m/parsetag.h w3m-0.1.6-2000FEB12JM01/parsetag.h --- w3m/parsetag.h Tue Jan 11 23:23:34 2000 +++ w3m-0.1.6-2000FEB12JM01/parsetag.h Sat Feb 12 08:20:12 2000 @@ -10,4 +10,4 @@ extern char * tag_get_value ( struct parsed_tagarg *t, char *arg ); extern int tag_exists ( struct parsed_tagarg *t, char *arg ); extern struct parsed_tagarg * cgistr2tagarg ( char *cgistr ); -#endif +#endif /* not PARSETAG_H */ diff -urdN w3m/pq.c w3m-0.1.6-2000FEB12JM01/pq.c --- w3m/pq.c Tue Jan 11 23:23:34 2000 +++ w3m-0.1.6-2000FEB12JM01/pq.c Sat Feb 12 08:20:45 2000 @@ -8,7 +8,7 @@ #ifndef NULL #define NULL 0 -#endif +#endif /* not NULL */ PriorityQueue * PQ_new(int init_size,int (*p_rout)(void*,void*)) @@ -94,7 +94,7 @@ } } } -#endif +#endif /* PQ_DEBUG */ void PQ_push(PriorityQueue *pq, void *d) @@ -115,7 +115,7 @@ siftup(pq,pq->n_data-1); #ifdef PQ_DEBUG check(pq,"PQ_push"); -#endif +#endif /* PQ_DEBUG */ } void* @@ -130,7 +130,7 @@ siftdown(pq,0); #ifdef PQ_DEBUG check(pq,"PQ_pop"); -#endif +#endif /* PQ_DEBUG */ return res; } diff -urdN w3m/pq.h w3m-0.1.6-2000FEB12JM01/pq.h --- w3m/pq.h Tue Jan 11 23:23:34 2000 +++ w3m-0.1.6-2000FEB12JM01/pq.h Sat Feb 12 08:20:58 2000 @@ -28,4 +28,4 @@ int string_alphabetical(void*,void*); int string_reverse_alphabetical(void*,void*); -#endif +#endif /* not PQ_H */ diff -urdN w3m/proto.h w3m-0.1.6-2000FEB12JM01/proto.h --- w3m/proto.h Fri Jan 21 02:18:58 2000 +++ w3m-0.1.6-2000FEB12JM01/proto.h Sat Feb 12 08:22:48 2000 @@ -97,7 +97,7 @@ extern Str process_n_select(void); #ifdef MENU_SELECT extern void feed_select(char *str); -#endif +#endif /* MENU_SELECT */ extern Str process_option(struct parsed_tagarg *targ); extern Str process_textarea(struct parsed_tagarg *targ, int width); extern Str process_n_textarea(void); @@ -105,7 +105,7 @@ #ifdef NEW_FORM extern Str process_form(struct parsed_tagarg *targ); extern Str process_n_form(void); -#endif +#endif /* NEW_FORM */ extern int HTMLtagproc1 ( int cmd, struct html_feed_environ * h_env ); extern void HTMLlineproc2 ( Buffer *buf, TextList *tl ); extern void HTMLlineproc1 ( char *istr, struct html_feed_environ * h_env ); @@ -178,7 +178,7 @@ extern Str Strmyfgets ( FILE * stream ); #ifdef JP_CHARSET extern Str Strkconv ( Str s, int fcode, int tcode ); -#endif +#endif /* JP_CHARSET */ extern char* mybasename ( char* s ); extern int next_status ( char c, int *status ); extern int read_token ( Str buf, char **instr, int *status, int pre, int append ); @@ -198,9 +198,9 @@ extern void loadHistory(Hist *hist); extern void saveHistory(Hist *hist); extern void ldHist(void); -#else +#else /* not USE_HISTORY */ #define ldHist nulcmd -#endif +#endif /* not USE_HISTORY */ extern double log_like ( int x ); extern struct table* newTable ( void ); extern void pushdata ( struct table * t, int row, int col, char *data ); @@ -267,8 +267,8 @@ extern void setfcolor ( int color ); #ifdef BG_COLOR extern void setbcolor ( int color ); -#endif -#endif +#endif /* BG_COLOR */ +#endif /* COLOR */ extern void refresh ( void ); extern void clear ( void ); extern void scroll_raw ( void ); @@ -300,7 +300,7 @@ extern char * GetSOCode( char key ); extern Str conv ( char *is, char fc, char tc ); extern char checkShiftCode ( char *buf, char hint ); -#endif +#endif /* JP_CHARSET */ extern ParsedURL * baseURL ( Buffer *buf ); extern int openSocket ( char *hostname, char *remoteport_name, unsigned short remoteport_num ); extern void parseURL ( char *url, ParsedURL * p_url, ParsedURL *current); @@ -360,7 +360,7 @@ #ifdef USE_SSL extern SSLStream newSSLStream(SSL *handle, int sock); extern void SSclose(SSLStream ss); -#endif +#endif /* USE_SSL */ extern Str StrUFgets(URLFile * f); extern Str StrmyUFgets(URLFile * f); extern int UFgetc(URLFile *f); @@ -382,21 +382,21 @@ extern void cooLst(void); extern Buffer *cookie_list_panel(void); extern void set_cookie_flag(struct parsed_tagarg* arg); -#else +#else /* not USE_COOKIE */ #define cooLst nulcmd -#endif +#endif /* not USE_COOKIE */ #ifdef USE_MARK extern void _mark ( void ); extern void nextMk ( void ); extern void prevMk ( void ); extern void reMark ( void ); -#else +#else /* not USE_MARK */ #define _mark nulcmd #define nextMk nulcmd #define prevMk nulcmd #define reMark nulcmd -#endif +#endif /* not USE_MARK */ #ifdef MOUSE extern void mouse( void ); @@ -405,10 +405,10 @@ extern void mouse_active( void ); extern void mouse_inactive( void ); extern void msToggle( void ); -#else +#else /* not MOUSE */ #define mouse nulcmd #define msToggle nulcmd -#endif +#endif /* not MOUSE */ extern void initKeymap( void ); extern int countFuncList(FuncList *list); @@ -440,17 +440,17 @@ extern void mainMn( void ); extern void optionMenu(int x, int y, char **label, int *variable, int initial, void (*func)()); extern void initMenu( void ); -#else +#else /* not MENU */ #define mainMn nulcmd -#endif +#endif /* not MENU */ #ifdef DICT extern void dictword( void ); extern void dictwordat( void ); -#else +#else /* not DICT */ #define dictword nulcmd #define dictwordat nulcmd -#endif +#endif /* not DICT */ extern void wrapToggle( void ); diff -urdN w3m/rc.c w3m-0.1.6-2000FEB12JM01/rc.c --- w3m/rc.c Fri Jan 14 00:49:57 2000 +++ w3m-0.1.6-2000FEB12JM01/rc.c Sat Feb 12 08:54:19 2000 @@ -13,7 +13,7 @@ #ifdef USE_HISTORY extern Hist *URLHist; -#endif +#endif /* USE_HISTORY */ #define P_INT 0 #define P_SHORT 1 @@ -67,9 +67,9 @@ #ifdef MOUSE #define CMT_MOUSE "マウスを使う" #define CMT_REVERSE_MOUSE "マウスのドラッグ動作を逆にする" -#endif +#endif /* MOUSE */ #define CMT_NOSENDREFERER "Referer: を送らないようにする" -#else +#else /* LANG != JA */ #define CMT_HELPER "External Viewer Setup" #define CMT_TABSTOP "Tab width" #define CMT_PAGERLINE "# of reserved line when w3m is used as a pager" @@ -115,9 +115,9 @@ #ifdef MOUSE #define CMT_MOUSE "Use mouse" #define CMT_REVERSE_MOUSE "Reverse mouse dragging action" -#endif +#endif /* MOUSE */ #define CMT_NOSENDREFERER "Don't send header `Referer:'" -#endif +#endif /* LANG != JA */ #define PI_TEXT 0 #define PI_ONOFF 1 @@ -132,17 +132,17 @@ "m - JIS X0208-1978 + US_ASCII", "n - JIS X0208-1983 + US_ASCII", NULL}; -#endif +#endif /* JP_CHARSET */ #ifdef COLOR static char *colorstr[] = { #if LANG== JA "0:黒","1:赤","2:緑","3:黄","4:青","5:紫","6:空色","7:白","8:端末",NULL -#else +#else /* LANG != JA */ "0:black","1:red","2:green","3:yellow","4:blue","5:magenta","6:cyan","7:white","8:terminal",NULL -#endif +#endif /* LANG != JA */ }; -#endif +#endif /* COLOR */ #ifdef INET6 static char *dnsorders[] = { @@ -151,7 +151,7 @@ "2:inet6 inet", NULL, }; -#endif +#endif /* INET6 */ struct param_section { char *name; @@ -171,7 +171,7 @@ {"tabstop", P_INT, PI_TEXT, (void*)&Tabstop,CMT_TABSTOP,NULL}, #ifdef JP_CHARSET {"kanjicode", P_CHAR, PI_SEL_C, (void*)&DisplayCode, CMT_KANJICODE,kcodestr}, -#endif +#endif /* JP_CHARSET */ {"frame", P_CHARINT,PI_ONOFF, (void*)&RenderFrame, CMT_FRAME, NULL}, {"display_link", P_INT, PI_ONOFF, (void*)&displayLink, CMT_DISPLINK,NULL}, {"ext_dirlist", P_INT, PI_ONOFF, (void*)&UseExternalDirBuffer,CMT_EXT_DIRLIST,NULL}, @@ -190,12 +190,12 @@ {"form_color", P_INT, PI_SEL_C, (void*)&form_color,CMT_F_COLOR,colorstr}, #ifdef BG_COLOR {"bg_color", P_INT, PI_SEL_C, (void*)&bg_color,CMT_BG_COLOR,colorstr}, -#endif +#endif /* BG_COLOR */ {"active_style", P_INT, PI_ONOFF, (void*)&useActiveColor, CMT_ACTIVE_STYLE, NULL}, {"active_color", P_INT, PI_SEL_C, (void*)&active_color,CMT_C_COLOR,colorstr}, {NULL, 0, 0, NULL, NULL, NULL}, }; -#endif +#endif /* COLOR */ static struct param_ptr params3[] = { @@ -203,7 +203,7 @@ #ifdef USE_HISTORY {"history", P_INT, PI_TEXT, (void*)&URLHistSize,CMT_HISTSIZE,NULL}, {"save_hist", P_INT, PI_ONOFF, (void*)&URLSaveHist,CMT_SAVEHIST,NULL}, -#endif +#endif /* USE_HISTORY */ {"confirm_qq", P_INT, PI_ONOFF, (void*)&confirm_on_quit, CMT_CONFIRM_QQ,NULL}, {"show_lnum", P_INT, PI_ONOFF, (void*)&showLineNum, CMT_SHOW_NUM,NULL}, {"ftppasswd", P_STRING, PI_TEXT, (void*)&ftppasswd, CMT_FTPPASS, NULL}, @@ -213,11 +213,11 @@ {"wrap_search", P_INT, PI_ONOFF, (void*)&WrapDefault, CMT_WRAP, NULL}, #ifdef USE_COOKIE {"use_cookie", P_INT, PI_ONOFF, (void*)&use_cookie, CMT_USECOOKIE, NULL}, -#endif +#endif /* USE_COOKIE */ #ifdef MOUSE {"use_mouse", P_INT, PI_ONOFF, (void*)&use_mouse, CMT_MOUSE, NULL}, {"reverse_mouse", P_INT, PI_ONOFF, (void*)&reverse_mouse, CMT_REVERSE_MOUSE, NULL}, -#endif +#endif /* MOUSE */ {NULL, 0, 0, NULL, NULL, NULL}, }; @@ -229,7 +229,7 @@ {"noproxy_netaddr", P_INT, PI_ONOFF, (void*)&NOproxy_netaddr, CMT_NOPROXY_NETADDR, NULL }, #ifdef INET6 {"dns_order", P_INT, PI_SEL_C, (void*)&DNS_order,CMT_DNS_ORDER, dnsorders}, -#endif +#endif /* INET6 */ {NULL, 0, 0, NULL, NULL, NULL}, }; @@ -256,21 +256,21 @@ {"表示関係", params1}, #ifdef COLOR {"表示色", params2}, -#endif +#endif /* COLOR */ {"その他の設定",params3}, {"プロキシの設定",params4}, {"ディレクトリ設定", params5}, {"外部プログラム",params6}, -#else +#else /* LANG != JA */ {"Display", params1}, #ifdef COLOR {"Color Setting", params2}, -#endif +#endif /* COLOR */ {"Other Behavior",params3}, {"Proxy Setting",params4}, {"Directory Setting", params5}, {"External Programs",params6}, -#endif +#endif /* LANG != JA */ {NULL,NULL} }; @@ -504,7 +504,7 @@ parse_proxy(); #ifdef USE_HISTORY resizeHist(URLHist, URLHistSize + 1); -#endif +#endif /* USE_HISTORY */ WrapSearch = WrapDefault; backBf(); } diff -urdN w3m/rcparams.h w3m-0.1.6-2000FEB12JM01/rcparams.h --- w3m/rcparams.h Tue Jan 11 23:23:34 2000 +++ w3m-0.1.6-2000FEB12JM01/rcparams.h Sat Feb 12 08:26:46 2000 @@ -3,7 +3,7 @@ global int Tabstop init(8); #ifdef JP_CHARSET extern char DisplayCode; -#endif +#endif /* JP_CHARSET */ global char RenderFrame init(NIL); global int displayLink init(NIL); global int UseExternalDirBuffer init(T); @@ -19,10 +19,10 @@ global int form_color init(1); /* red */ #ifdef BG_COLOR global int bg_color init(8); /* don't change */ -#endif +#endif /* BG_COLOR */ global int useActiveColor init(NIL); global int active_color init(6); /* cyan */ -#endif +#endif /* COLOR */ /* params3 */ @@ -30,7 +30,7 @@ #ifdef USE_HISTORY global int URLHistSize init(100); global int URLSaveHist init(T); -#endif +#endif /* USE_HISTORY */ global int confirm_on_quit init(T); global int showLineNum init(NIL); global char *ftppasswd init(NULL); @@ -39,7 +39,7 @@ global int WrapDefault init(NIL); #ifdef USE_COOKIE global int use_cookie init(T); -#endif +#endif /* USE_COOKIE */ /* params4 */ @@ -50,7 +50,7 @@ global char *NO_proxy init(NULL); #ifdef INET6 global int DNS_order init(0); -#endif +#endif /* INET6 */ /* params5 */ diff -urdN w3m/regex.c w3m-0.1.6-2000FEB12JM01/regex.c --- w3m/regex.c Fri Jan 14 04:13:23 2000 +++ w3m-0.1.6-2000FEB12JM01/regex.c Sat Feb 12 08:27:38 2000 @@ -7,7 +7,7 @@ #ifdef DEBUG #include #include -#endif +#endif /* DEBUG */ #include #include @@ -16,9 +16,9 @@ #ifdef NOBCOPY void bcopy(void*,void*,int); void bzero(void*,int); -#else +#else /* not NOBCOPY */ #include -#endif +#endif /* not NOBCOPY */ #define KANJI1(c) ((c)&0x80) /* for EUC */ @@ -196,7 +196,7 @@ #ifdef DEBUG debugre(re, str); -#endif +#endif /* DEBUG */ while ((re->mode & RE_ENDMARK) == 0) { if (re->mode & RE_BEGIN) { if (!firstp) @@ -271,12 +271,12 @@ case RE_ANY: #ifdef DEBUG printf("%c vs any. -> 1\n", c); -#endif +#endif /* DEBUG */ return 1; case RE_NORMAL: #ifdef DEBUG printf("RE=%c vs %c -> %d\n", *re->pattern, c, *re->pattern == c); -#endif +#endif /* DEBUG */ if (re->mode & RE_IGNCASE) { if (*re->pattern < 127 && c < 127 && isalpha(*re->pattern) && isalpha(c)) @@ -302,7 +302,7 @@ #ifdef DEBUG printf("RE pattern = %s char=%c", pattern, c); -#endif +#endif /* DEBUG */ while (*p != '\0') { if (*(p + 1) == RE_WHICH_RANGE && *(p + 2) != '\0') { /* Char class. */ if (*p <= c && c <= *(p + 2)) { @@ -320,7 +320,7 @@ } #ifdef DEBUG printf(" -> %d\n", ans); -#endif +#endif /* DEBUG */ return ans; } @@ -378,4 +378,4 @@ putchar('\n'); } -#endif +#endif /* DEBUG */ diff -urdN w3m/regex.h w3m-0.1.6-2000FEB12JM01/regex.h --- w3m/regex.h Tue Jan 11 23:23:34 2000 +++ w3m-0.1.6-2000FEB12JM01/regex.h Sat Feb 12 08:27:48 2000 @@ -3,7 +3,7 @@ #ifndef NULL #define NULL 0 -#endif +#endif /* not NULL */ #define RE_NORMAL 0 #define RE_MATCHMODE 0x07 diff -urdN w3m/table.c w3m-0.1.6-2000FEB12JM01/table.c --- w3m/table.c Fri Jan 21 02:58:42 2000 +++ w3m-0.1.6-2000FEB12JM01/table.c Sat Feb 12 08:34:13 2000 @@ -19,7 +19,7 @@ #define TN_VERTICALBAR "│" #define HORIZONTALBAR "━" #define RULE_WIDTH 2 -#else +#else /* not KANJI_SYMBOLS */ static char *rule[] = { "<_RULE TYPE=0>+", "<_RULE TYPE=1>+", @@ -41,7 +41,7 @@ #define TN_VERTICALBAR "<_RULE TYPE=5>|" #define HORIZONTALBAR "<_RULE TYPE=10>-" #define RULE_WIDTH 1 -#endif +#endif /* not KANJI_SYMBOLS */ #define RULE(mode) (((mode)==BORDER_THICK)?ruleB:rule) #define TK_VERTICALBAR(mode) (RULE(mode)[5]) @@ -60,29 +60,29 @@ #define HTT_TRSET 0x40 #ifdef NOWRAP #define HTT_NOWRAP 4 -#endif +#endif /* NOWRAP */ #define TAG_IS(s,tag,len) (strncasecmp(s,tag,len)==0&&(s[len] == '>' || IS_SPACE((int)s[len]))) #ifndef max #define max(a,b) ((a) > (b) ? (a) : (b)) -#endif +#endif /* not max */ #ifndef min #define min(a,b) ((a) > (b) ? (b) : (a)) -#endif +#endif /* not min */ #ifndef abs #define abs(a) ((a) >= 0. ? (a) : -(a)) -#endif +#endif /* not abs */ #ifdef MATRIX #ifndef MESCHACH #include "matrix.c" -#endif -#endif +#endif /* not MESCHACH */ +#endif /* MATRIX */ #ifdef MATRIX int correct_table_matrix(struct table *, int, int, int, double); void set_table_matrix(struct table *, int); -#endif +#endif /* MATRIX */ #ifdef MATRIX static double @@ -105,7 +105,7 @@ #define sigma_td_nw(a) (32*weight2(a)) /* */ #define sigma_table(a) (0.25*weight2(a)) /* */ #define sigma_table_nw(a) (2*weight2(a)) /* */ -#else +#else /* not MATRIX */ static double weight3(int x) { @@ -116,7 +116,7 @@ else return LOG_MIN*(log((double)x/LOG_MIN) + 1.); } -#endif +#endif /* not MATRIX */ static int dsort_index(short e1, short *ent1, short e2, short *ent2, int base, @@ -284,7 +284,7 @@ #ifdef MATRIX t->matrix = NULL; t->vector = NULL; -#endif +#endif /* MATRIX */ t->prev_ctype = PC_ASCII; t->prev_spaces = -1; t->trattr = 0; @@ -780,11 +780,11 @@ cell->necell++; } } -#else +#else /* not MATRIX */ check_cell_width(t->tabwidth, cell->width, cell->col, cell->colspan, cell->maxcell, cell->index, t->cellspacing, 0); check_minimum_width(t, t->tabwidth); -#endif +#endif /* not MATRIX */ } @@ -896,10 +896,10 @@ #ifdef __GNUC__ short orgwidth[t->maxcol +1]; short cwidth[cell->maxcell +1], swidth[cell->maxcell +1]; -#else +#else /* __GNUC__ */ short orgwidth[MAXCOL]; short cwidth[MAXCELL], swidth[MAXCELL]; -#endif +#endif /* __GNUC__ */ int twidth; double sxx, sxy, *Sxx, stotal; @@ -1017,7 +1017,7 @@ return corr; } -#else +#else /* not MATRIX */ void set_table_width(struct table *t, short *newwidth, int maxwidth) { @@ -1133,7 +1133,7 @@ } } while (try_again); } -#endif +#endif /* not MATRIX */ void check_table_height(struct table *t) @@ -1214,9 +1214,9 @@ { #ifdef __GNUC__ short newwidth[t->maxcol +1]; -#else +#else /* not __GNUC__ */ short newwidth[MAXCOL]; -#endif +#endif /* not __GNUC__ */ int i; int swidth; struct table_cell *cell = &t->cell; @@ -1255,9 +1255,9 @@ int width, nwidth, indent, maxwidth; #ifdef __GNUC__ short newwidth[tbl->maxcol +1]; -#else +#else /* not __GNUC__ */ short newwidth[MAXCOL]; -#endif +#endif /* not __GNUC__ */ for (i=0; i <= tbl->maxcol; i++) newwidth[i] = tbl->tabwidth[i]; @@ -1288,7 +1288,7 @@ maxwidth = h_env.limit -indent; else maxwidth = t->total_width; -#else +#else /* TABLE_EXPAND */ maxwidth = h_env.limit -indent; if (t->total_width > 0) { double r = ((double) maxwidth) / t->total_width; @@ -1304,7 +1304,7 @@ } t->total_width = maxwidth; } -#endif +#endif /* TABLE_EXPAND */ renderTable(t, maxwidth, &h_env); width = t->total_width -b_width +indent; if (width > nwidth) { @@ -1372,7 +1372,7 @@ VEC *newwidth; MAT *mat, *minv; PERM *pivot; -#endif +#endif /* MATRIX */ int maxheight = 0; Str vrulea, vruleb, vrulec; @@ -1420,7 +1420,7 @@ for(i=0;i<=t->maxcol;i++) fprintf(stderr,"%2d ",new_tabwidth[i]); fprintf(stderr,"\n"); -#endif +#endif /* TABLE_DEBUG */ itr++; } while (check_table_width(t, new_tabwidth, minv, itr)); @@ -1434,12 +1434,12 @@ t->tabwidth[i] = new_tabwidth[i]; } } -#else +#else /* not MATRIX */ set_table_width(t, new_tabwidth, max_width); for (i = 0; i <= t->maxcol; i++) { t->tabwidth[i] = new_tabwidth[i]; } -#endif +#endif /* not MATRIX */ renderCoTable(t); check_minimum_width(t, t->tabwidth); @@ -1659,7 +1659,7 @@ #ifdef NOWRAP if (t->tabattr[t->row][t->col] & HTT_NOWRAP) check_minimum0(t, width); -#endif +#endif /* NOWRAP */ if (mode->pre_mode & (TBLM_NOBR|TBLM_PRE|TBLM_PRE_INT) && mode->nobr_offset >= 0) check_minimum0(t, width -mode->nobr_offset); @@ -1880,7 +1880,7 @@ #ifdef NOWRAP else if (!strcasecmp(t->arg, "nowrap")) tbl->tabattr[tbl->row][tbl->col] |= HTT_NOWRAP; -#endif +#endif /* NOWRAP */ else if (!strcasecmp(t->arg,"width") && t->value) { if (IS_DIGIT(*t->value)) { v = atoi(t->value); @@ -1893,9 +1893,9 @@ } else { #ifdef TABLE_EXPAND v = max(v/tbl->ppc,1); -#else +#else /* not TABLE_EXPAND */ v = v/PIXEL_PER_CHAR; -#endif +#endif /* not TABLE_EXPAND */ } } else continue; @@ -1935,7 +1935,7 @@ if (v0 == 0 || (v0 > 0 && v > v0) || (v0 < 0 && v < v0)) { #ifdef TABLE_DEBUG fprintf(stderr,"width(%d) = %d\n",tbl->col,v); -#endif +#endif /* TABLE_DEBUG */ tbl->fixed_width[tbl->col] = v; } } else if (cell->icell >= 0) { @@ -2071,7 +2071,7 @@ case HTML_N_FORM: process_n_form(); break; -#else +#else /* not NEW_FORM */ case HTML_FORM: case HTML_N_FORM: check_rowcol(tbl); @@ -2088,7 +2088,7 @@ } pushdata(tbl, tbl->row, tbl->col, tok->ptr); break; -#endif +#endif /* not NEW_FORM */ case HTML_INPUT: tmp = process_input(parse_tag(line + 6)); if (tmp) @@ -2102,12 +2102,12 @@ #ifdef MENU_SELECT if (!tag_exists(t_arg,"multiple")) /* non-multiple select */ mode->pre_mode |= TBLM_INSELECT; -#endif +#endif /* MENU_SELECT */ break; case HTML_N_SELECT: #ifdef MENU_SELECT mode->pre_mode &= ~TBLM_INSELECT; -#endif +#endif /* MENU_SELECT */ tmp = process_n_select(); if (tmp) feed_table(tbl,tmp->ptr,mode,width); @@ -2119,7 +2119,7 @@ #ifdef MENU_SELECT else feed_select(line); -#endif +#endif /* MENU_SELECT */ break; case HTML_TEXTAREA: w = 0; @@ -2268,7 +2268,7 @@ feed_select(line); continue; } -#endif +#endif /* MENU_SELECT */ if (!(mode->pre_mode & (TBLM_PRE|TBLM_PRE_INT))) { Lineprop ctype; if (!(tbl->flag & TBL_IN_COL)) { @@ -2328,7 +2328,7 @@ if (ctype==PC_KANJI1 && tbl->prev_ctype==PC_KANJI2) i += tbl->prev_spaces; else -#endif +#endif /* JP_CHARSET */ i += tbl->prev_spaces -1; } tbl->prev_spaces = 0; @@ -2382,9 +2382,9 @@ if (tbl->tables) #ifdef __CYGWIN__ bcopy((const char *)tbl->tables, (char *)tmp, (size_t)tbl->ntable*sizeof(struct table_in)); -#else +#else /* not __CYGWIN__ */ bcopy(tbl->tables, tmp, tbl->ntable*sizeof(struct table_in)); -#endif /* __CYGWIN__ */ +#endif /* not __CYGWIN__ */ tbl->tables = tmp; } @@ -2478,10 +2478,10 @@ #ifdef __GNUC__ double we[size]; char expand[size]; -#else +#else /* not __GNUC__ */ double we[MAXCOL]; char expand[MAXCOL]; -#endif +#endif /* not __GNUC__ */ struct table_cell *cell = &t->cell; w0 = 0.; @@ -2592,4 +2592,4 @@ } correct_table_matrix(t, 0, size, width, b); } -#endif +#endif /* MATRIX */ diff -urdN w3m/table.h w3m-0.1.6-2000FEB12JM01/table.h --- w3m/table.h Tue Jan 11 23:23:34 2000 +++ w3m-0.1.6-2000FEB12JM01/table.h Sat Feb 12 08:35:04 2000 @@ -1,15 +1,15 @@ /* $Id: table.h,v 1.1.1.1 2000/01/04 05:46:50 aito Exp $ */ #if (defined(MESCHACH) && !defined(MATRIX)) #define MATRIX -#endif +#endif /* (defined(MESCHACH) && !defined(MATRIX)) */ #ifdef MATRIX #ifdef MESCHACH #include -#else +#else /* not MESCHACH */ #include "matrix.h" -#endif -#endif +#endif /* not MESCHACH */ +#endif /* MATRIX */ #include "Str.h" @@ -43,7 +43,7 @@ #ifdef MATRIX char eindex[MAXCELL]; short necell; -#endif +#endif /* MATRIX */ short width[MAXCELL]; short minimum_width[MAXCELL]; short fixed_width[MAXCELL]; @@ -75,7 +75,7 @@ int flag; #ifdef TABLE_EXPAND int ppc; -#endif +#endif /* TABLE_EXPAND */ Str suspended_input; Str caption; TextList ***tabdata; @@ -95,7 +95,7 @@ #ifdef MATRIX MAT *matrix; VEC *vector; -#endif +#endif /* MATRIX */ }; #define TBLM_PRE 1 diff -urdN w3m/terms.c w3m-0.1.6-2000FEB12JM01/terms.c --- w3m/terms.c Fri Jan 21 03:32:03 2000 +++ w3m-0.1.6-2000FEB12JM01/terms.c Sat Feb 12 08:44:23 2000 @@ -14,14 +14,14 @@ #include #ifdef USE_GPM #include -#endif +#endif /* USE_GPM */ #ifdef MOUSE static int is_xterm = 0; -#endif +#endif /* MOUSE */ #ifdef AIX #include -#endif +#endif /* AIX */ #include "terms.h" #include "fm.h" @@ -34,11 +34,11 @@ #ifdef MOUSE void mouse_init(),mouse_end(); int mouseActive = 0; -#endif +#endif /* MOUSE */ #ifndef SIGIOT #define SIGIOT SIGABRT -#endif +#endif /* not SIGIOT */ #ifdef TERMIO #include @@ -48,7 +48,7 @@ #define TerminalGet(fd,x) ioctl(fd,TCGETA,x) #define MODEFLAG(d) ((d).c_lflag) #define IMODEFLAG(d) ((d).c_iflag) -#endif +#endif /* TERMIO */ #ifdef TERMIOS #include @@ -58,7 +58,7 @@ #define TerminalGet(fd,x) tcgetattr(fd,x) #define MODEFLAG(d) ((d).c_lflag) #define IMODEFLAG(d) ((d).c_iflag) -#endif +#endif /* TERMIOS */ #ifdef SGTTY #include @@ -67,7 +67,7 @@ #define TerminalSet(fd,x) ioctl(fd,TIOCSETP,x) #define TerminalGet(fd,x) ioctl(fd,TIOCGETP,x) #define MODEFLAG(d) ((d).sg_flags) -#endif +#endif /* SGTTY */ #define MAX_LINE 200 #define MAX_COLUMN 300 @@ -86,7 +86,7 @@ #ifdef JP_CHARSET #define C_WCHAR1 0x40 #define C_WCHAR2 0x80 -#endif +#endif /* JP_CHARSET */ #define C_CTRL 0xc0 #define CHMODE(c) ((c)&C_WHICHCHAR) @@ -120,7 +120,7 @@ #define COL_BTERM 0x0000 #define S_BCOLORED 0xf000 -#endif +#endif /* BG_COLOR */ #define S_GRAPHICS 0x10 @@ -185,7 +185,7 @@ #ifdef JP_CHARSET void switch_wchar(FILE*); void switch_ascii(FILE*); -#endif +#endif /* JP_CHARSET */ void need_clrtoeol(void), clrtoeol(void); int write1(char); @@ -208,9 +208,9 @@ else #ifndef __EMX__ ttyn = "/dev/tty"; -#else +#else /* __EMX__ */ ttyn = "con"; -#endif +#endif /* __EMX__ */ tty = open(ttyn, O_RDWR); if (tty < 0) { /* use stderr instead of stdin... is it OK???? */ @@ -231,7 +231,7 @@ MODEFLAG(ioval) |= mode; #ifndef SGTTY IMODEFLAG(ioval) |= imode; -#endif +#endif /* not SGTTY */ er = TerminalSet(tty, &ioval); @@ -251,7 +251,7 @@ MODEFLAG(ioval) &= ~mode; #ifndef SGTTY IMODEFLAG(ioval) &= ~imode; -#endif +#endif /* not SGTTY */ er = TerminalSet(tty, &ioval); @@ -276,7 +276,7 @@ reset_exit(SIGNAL_ARGLIST); } } -#endif +#endif /* not SGTTY */ void reset_tty(void) @@ -304,7 +304,7 @@ #ifdef MOUSE if (mouseActive) mouse_end(); -#endif +#endif /* MOUSE */ exit(0); SIGNAL_RETURN; } @@ -410,7 +410,7 @@ T_as[0] = '\0'; T_ae[0] = '\0'; T_ac[0] = '\0'; -#endif +#endif /* CYGWIN */ LINES = COLS = 0; setlinescols(); @@ -419,7 +419,7 @@ #ifndef TIOCGWINSZ #include -#endif +#endif /* not TIOCGWINSZ */ void setlinescols(void) @@ -434,7 +434,7 @@ LINES = wins.ws_row; COLS = wins.ws_col; } -#endif +#endif / * defined(TERMIOS) && defined(TIOCGWINSZ) */ if (LINES <= 0 && (p = getenv("LINES")) != NULL && (i = atoi(p)) >= 0) @@ -494,7 +494,7 @@ { #ifdef SCREEN_DEBUG usleep(50); -#endif +#endif /* SCREEN_DEBUG */ #ifdef JP_CHARSET if (c & 0x80) { switch (wmode) { @@ -525,12 +525,12 @@ } putc(c, ttyf); } -#else +#else /* not JP_CHARSET */ putc(c, ttyf); -#endif +#endif /* not JP_CHARSET */ #ifdef SCREEN_DEBUG fflush(ttyf); -#endif +#endif /* SCREEN_DEBUG */ return 0; } @@ -595,7 +595,7 @@ break; } } -#endif +#endif /* JP_CHARSET */ void move(int line, int column) @@ -608,9 +608,9 @@ #ifdef BG_COLOR #define M_SPACE (S_SCREENPROP|S_COLORED|S_BCOLORED|S_GRAPHICS) -#else +#else /* not BG_COLOR */ #define M_SPACE (S_SCREENPROP|S_COLORED|S_GRAPHICS) -#endif +#endif /* not BG_COLOR */ static int need_redraw(char c1, l_prop pr1, char c2, l_prop pr2) @@ -648,7 +648,7 @@ if (c == ' ' && #ifdef JP_CHARSET CHMODE(CurrentMode) != C_WCHAR1 && -#endif +#endif /* JP_CHARSET */ !(CurrentMode & M_SPACE)) { CurColumn++; return; @@ -666,7 +666,7 @@ SETCHMODE(CurrentMode, C_WCHAR2); else if (c & 0x80) SETCHMODE(CurrentMode, C_WCHAR1); -#endif +#endif /* JP_CHARSET */ else if (c & ~0x1f) SETCHMODE(CurrentMode, C_ASCII); else @@ -687,7 +687,7 @@ #ifdef JP_CHARSET else if (CHMODE(pr[CurColumn+1]) == C_WCHAR1 && CurColumn < COLS-2) touch_column(CurColumn+2); -#endif +#endif /* JP_CHARSET */ } } @@ -713,7 +713,7 @@ p = ScreenImage[CurLine]->lineimage; pr = ScreenImage[CurLine]->lineprop; } -#endif +#endif /* JP_CHARSET */ if (CHMODE(CurrentMode) != C_CTRL) { if (need_redraw(p[CurColumn], pr[CurColumn], c, CurrentMode)) { p[CurColumn] = c; @@ -725,7 +725,7 @@ touch_column(CurColumn+1); else if (CHMODE(CurrentMode) == C_WCHAR2) touch_column(CurColumn-1); -#endif +#endif /* JP_CHARSET */ } CurColumn++; } else if (c == '\t') { @@ -756,7 +756,7 @@ if (CurColumn > 0 && CHMODE(pr[CurColumn]) == C_WCHAR2) CurColumn--; -#endif +#endif /* JP_CHARSET */ } } @@ -808,7 +808,7 @@ #ifdef JP_CHARSET if (CHMODE(pr[CurColumn]) == C_WCHAR1) pr[CurColumn+1] ^= S_STANDOUT; -#endif +#endif /* JP_CHARSET */ } void @@ -853,7 +853,7 @@ #ifndef KANJI_SYMBOLS if (no_graphic_char) return 0; -#endif +#endif /* not KANJI_SYMBOLS */ return T_as[0] != 0 && T_ae[0] != 0 && T_ac[0] != 0; } @@ -889,16 +889,16 @@ sprintf(seqbuf, "\033[%dm", ((colmode >> 12) & 7) + 40); return seqbuf; } -#endif +#endif /* BG_COLOR */ #define RF_NEED_TO_MOVE 0 #define RF_CR_OK 1 #define RF_NONEED_TO_MOVE 2 #ifdef BG_COLOR #define M_MEND (S_STANDOUT|S_UNDERLINE|S_BOLD|S_COLORED|S_BCOLORED|S_GRAPHICS) -#else +#else /* not BG_COLOR */ #define M_MEND (S_STANDOUT|S_UNDERLINE|S_BOLD|S_COLORED|S_GRAPHICS) -#endif +#endif /* not BG_COLOR */ void refresh(void) { @@ -910,7 +910,7 @@ l_prop color = COL_FTERM; #ifdef BG_COLOR l_prop bcolor = COL_BTERM; -#endif +#endif /* BG_COLOR */ short *dirty; for (line = 0; line < LINES; line++) { @@ -978,19 +978,19 @@ #ifndef BG_COLOR if (line == LINES-1 && col == COLS-1) break; -#endif +#endif /* not BG_COLOR */ if ((!(pr[col] & S_STANDOUT) && (mode & S_STANDOUT)) || (!(pr[col] & S_UNDERLINE) && (mode & S_UNDERLINE)) || (!(pr[col] & S_BOLD) && (mode & S_BOLD)) || (!(pr[col] & S_COLORED) && (mode & S_COLORED)) #ifdef BG_COLOR || (!(pr[col] & S_BCOLORED) && (mode & S_BCOLORED)) -#endif +#endif /* BG_COLOR */ || (!(pr[col] & S_GRAPHICS) && (mode & S_GRAPHICS))) { if ((!(pr[col] & S_COLORED) && (mode & S_COLORED)) #ifdef BG_COLOR || (!(pr[col] & S_BCOLORED) && (mode & S_BCOLORED)) -#endif +#endif /* BG_COLOR */ ) writestr(T_op); if (!(pr[col] & S_GRAPHICS) && (mode & S_GRAPHICS)) @@ -1016,7 +1016,7 @@ mode = (mode & ~COL_BCOLOR | bcolor); writestr(bcolor_seq(bcolor)); } -#endif +#endif /* BG_COLOR */ if ((pr[col] & S_STANDOUT) && !(mode & S_STANDOUT)) { writestr(T_so); mode |= S_STANDOUT; @@ -1051,7 +1051,7 @@ if (mode & (S_COLORED #ifdef BG_COLOR |S_BCOLORED -#endif +#endif /* BG_COLOR */ )) writestr(T_op); if (mode & S_GRAPHICS) @@ -1061,7 +1061,7 @@ } #ifdef JP_CHARSET endline(); -#endif +#endif /* JP_CHARSET */ } MOVE(CurLine, CurColumn); fflush(ttyf); @@ -1152,7 +1152,7 @@ ScreenImage[CurLine]->isdirty |= L_NEED_CE; } -#endif +#endif /* 0 */ void clrtoeol(void) @@ -1200,14 +1200,14 @@ { clrtoeol_with_bcolor(); } -#else +#else /* not BG_COLOR */ void clrtoeolx(void) { clrtoeol(); } -#endif +#endif /* not BG_COLOR */ void clrtobot_eol(void (* clrtoeol)()) @@ -1246,7 +1246,7 @@ ScreenImage[CurLine]->isdirty &= ~L_CLRTOEOL; } -#endif +#endif /* 0 */ void addstr(char *s) @@ -1270,10 +1270,10 @@ } else /* Ascii or WCHAR2 */ addch(*s); } -#else +#else /* not JP_CHARSET */ for(i = 0; i < n && *s != '\0'; i++) addch(*(s++)); -#endif +#endif /* not JP_CHARSET */ } void @@ -1295,10 +1295,10 @@ i++; } } -#else +#else /* not JP_CHARSET */ for(i = 0; i < n && *s != '\0'; i++) addch(*(s++)); -#endif +#endif /* not JP_CHARSET */ for(; i< n; i++) addch(' '); } @@ -1311,15 +1311,15 @@ ttymode_set(ISIG,0); #ifdef TERMIOS set_cc(VMIN, 1); -#else +#else /* not TERMIOS */ set_cc(VEOF, 1); -#endif +#endif /* not TERMIOS */ } -#else +#else /* SGTTY */ { ttymode_set(CBREAK,0); } -#endif +#endif /* SGTTY */ void nocrmode(void) @@ -1328,15 +1328,15 @@ ttymode_set(ICANON,0); #ifdef TERMIOS set_cc(VMIN, 4); -#else +#else /* not TERMIOS */ set_cc(VEOF, 4); -#endif +#endif /* not TERMIOS */ } -#else +#else /* SGTTY */ { ttymode_reset(CBREAK,0); } -#endif +#endif /* SGTTY */ void term_echo(void) { @@ -1353,22 +1353,22 @@ #ifndef SGTTY #ifdef IEXTEN #define TTY_MODE ISIG|ICANON|ECHO|IEXTEN -#else +#else /* not IEXTEN */ #define TTY_MODE ISIG|ICANON|ECHO -#endif +#endif /* not IEXTEN */ { ttymode_reset(TTY_MODE,IXON|IXOFF); #ifdef TERMIOS set_cc(VMIN, 1); -#else +#else /* not TERMIOS */ set_cc(VEOF, 1); -#endif +#endif /* not TERMIOS */ } -#else +#else /* SGTTY */ { ttymode_set(RAW,0); } -#endif +#endif /* SGTTY */ void term_cooked(void) @@ -1377,15 +1377,15 @@ ttymode_set(TTY_MODE,0); #ifdef TERMIOS set_cc(VMIN, 4); -#else +#else /* not TERMIOS */ set_cc(VEOF, 4); -#endif +#endif /* not TERMIOS */ } -#else +#else /* SGTTY */ { ttymode_reset(RAW,0); } -#endif +#endif /* SGTTY */ void term_cbreak(void) @@ -1421,7 +1421,7 @@ else return Gpm_Getch(); } -#endif +#endif /* USE_GPM */ void bell(void) @@ -1479,12 +1479,12 @@ Gpm_Open(&conn,0); /* don't care even if it fails */ gpm_handler = gpm_process_mouse; } -#else +#else /* not USE_GPM */ term = getenv("TERM"); if (!strncmp(term,"kterm",5) || !strncmp(term,"xterm",5)) { is_xterm = 1; } -#endif +#endif /* not USE_GPM */ mouseActive = 1; } @@ -1497,7 +1497,7 @@ #ifdef USE_GPM else Gpm_Close(); -#endif +#endif /* USE_GPM */ mouseActive = 0; } @@ -1515,7 +1515,7 @@ XTERM_OFF; } -#endif +#endif /* MOUSE */ void flush_tty() { diff -urdN w3m/textlist.h w3m-0.1.6-2000FEB12JM01/textlist.h --- w3m/textlist.h Tue Jan 11 23:23:35 2000 +++ w3m-0.1.6-2000FEB12JM01/textlist.h Sat Feb 12 08:44:56 2000 @@ -20,4 +20,4 @@ extern char * popText ( TextList *tl ); extern TextList *appendTextList(TextList *, TextList *); -#endif +#endif /* not TEXTLIST_H */ diff -urdN w3m/url.c w3m-0.1.6-2000FEB12JM01/url.c --- w3m/url.c Fri Jan 14 02:21:24 2000 +++ w3m-0.1.6-2000FEB12JM01/url.c Sat Feb 12 08:49:18 2000 @@ -37,7 +37,7 @@ 0, /* mailto - not defined */ #ifdef USE_SSL 443, /* https */ -#endif +#endif /* USE_SSL */ }; struct cmdtable schemetable[] = { @@ -51,7 +51,7 @@ {"mailto", SCM_MAILTO}, #ifdef USE_SSL {"https", SCM_HTTPS}, -#endif +#endif /* USE_SSL */ {NULL, SCM_UNKNOWN}, }; @@ -91,7 +91,7 @@ #ifndef HTTP_DEFAULT_FILE #define HTTP_DEFAULT_FILE "/" -#endif +#endif /* not HTTP_DEFAULT_FILE */ static char * DefaultFile(int scheme) @@ -100,7 +100,7 @@ case SCM_HTTP: #ifdef USE_SSL case SCM_HTTPS: -#endif +#endif /* USE_SSL */ return allocStr(HTTP_DEFAULT_FILE, 0); case SCM_GOPHER: return allocStr("1", 0); @@ -135,12 +135,12 @@ #if SSLEAY_VERSION_NUMBER < 0x0800 ssl_ctx = SSL_CTX_new(); X509_set_default_verify_paths(ssl_ctx->cert); -#else +#else /* SSLEAY_VERSION_NUMBER >= 0x0800 */ SSLeay_add_ssl_algorithms(); ssl_ctx = SSL_CTX_new(SSLv23_client_method()); SSL_CTX_set_options(ssl_ctx, SSL_OP_ALL); SSL_CTX_set_default_verify_paths(ssl_ctx); -#endif +#endif /* SSLEAY_VERSION_NUMBER >= 0x0800 */ atexit(free_ssl_ctx); } handle = SSL_new(ssl_ctx); @@ -166,7 +166,7 @@ } } -#endif +#endif /* USE_SSL */ static void write_from_file(int sock, char *file) @@ -209,14 +209,14 @@ int *af; struct addrinfo hints, *res0, *res; int error; -#else +#else /* not INET6 */ struct sockaddr_in hostaddr; struct hostent *entry; struct servent *serv; struct protoent *proto; int a1, a2, a3, a4; unsigned long adr; -#endif +#endif /* not INET6 */ MySignalHandler(*trap) (); if (SETJMP(AbortLoading) != 0) { @@ -275,7 +275,7 @@ freeaddrinfo(res0); break; } -#else +#else /* not INET6 */ if ((serv = getservbyname(remoteport_name, "tcp")) == NULL) { serv = New(struct servent); } @@ -321,7 +321,7 @@ if ( result < 0 ) goto error; } -#endif +#endif /* not INET6 */ if (fmInitialized) term_raw(); @@ -395,7 +395,7 @@ } #ifdef CYGWIN goto analyze_file; /* file://DRIVE/foo or file://machine/share/foo */ -#endif +#endif /* CYGWIN */ } p += 2; /* scheme://foo */ analyze_url: @@ -619,7 +619,7 @@ "http","gopher","ftp","ftp","file","nntp","news","mailto", #ifdef USE_SSL "https", -#endif +#endif /* USE_SSL */ }; if (pu->scheme == SCM_UNKNOWN || pu->scheme == SCM_MISSING) { @@ -685,9 +685,9 @@ else { #if LANG == JA Strcat_charp(s,"ja; q=1.0, en; q=0.5\r\n"); -#else /* must be EN */ +#else /* LANG != JA (must be EN) */ Strcat_charp(s,"en; q=1.0\r\n"); -#endif +#endif /* LANG != JA */ } if (target->host) { Strcat_charp(s,"Host: "); @@ -724,7 +724,7 @@ TextListItem *i; #ifdef USE_COOKIE Str cookie; -#endif +#endif /* USE_COOKIE */ switch (hr->command) { case HR_COMMAND_CONNECT: tmp = Strnew_charp("CONNECT "); @@ -764,7 +764,7 @@ Strcat(tmp, cookie); Strcat_charp(tmp,"\r\n"); } -#endif +#endif /* USE_COOKIE */ if (hr->command == HR_COMMAND_POST) { if (hr->request->enctype == FORM_ENCTYPE_MULTIPART){ Strcat_charp(tmp,"Content-type: multipart/form-data; boundary="); @@ -784,7 +784,7 @@ Strcat_charp(tmp,"\r\n"); #ifdef DEBUG fprintf(stderr, "HTTPrequest: [ %s ]\n\n", tmp->ptr); -#endif +#endif /* DEBUG */ return tmp; } @@ -802,7 +802,7 @@ HRequest hr; #ifdef USE_SSL SSL *sslh; -#endif +#endif /* USE_SSL */ if (ouf) { uf = *ouf; @@ -921,7 +921,7 @@ case SCM_HTTP: #ifdef USE_SSL case SCM_HTTPS: -#endif +#endif /* USE_SSL */ if (pu->file == NULL) pu->file = allocStr("/",0); if (request && request->method == FORM_METHOD_POST && request->body) @@ -945,11 +945,11 @@ HTTP_proxy_parsed.port); sslh = NULL; } -#else +#else /* not USE_SSL */ sock = openSocket(HTTP_proxy_parsed.host, schemetable[HTTP_proxy_parsed.scheme].cmdname, HTTP_proxy_parsed.port); -#endif +#endif /* not USE_SSL */ if (sock < 0) goto no_http_proxy; save_label = pu->label; @@ -966,7 +966,7 @@ *status = HTST_NORMAL; } } else -#endif +#endif /* USE_SSL */ { tmp = HTTPrequest(pu,current,&hr,extra_header); *status = HTST_NORMAL; @@ -988,7 +988,7 @@ return uf; } } -#endif +#endif /* USE_SSL */ hr.flag |= HR_FLAG_LOCAL; tmp = HTTPrequest(pu,current,&hr,extra_header); *status = HTST_NORMAL; @@ -1010,7 +1010,7 @@ } return uf; } else -#endif +#endif /* USE_SSL */ { write(sock, tmp->ptr, tmp->length); #ifdef HTTP_DEBUG @@ -1019,7 +1019,7 @@ fwrite(tmp->ptr,sizeof(char),tmp->length,ff); fclose(ff); } -#endif +#endif /* HTTP_DEBUG */ if (hr.command == HR_COMMAND_POST && request->enctype == FORM_ENCTYPE_MULTIPART) write_from_file(sock, request->body); diff -urdN w3m/version.c w3m-0.1.6-2000FEB12JM01/version.c --- w3m/version.c Fri Jan 21 02:58:09 2000 +++ w3m-0.1.6-2000FEB12JM01/version.c Sat Feb 12 08:49:27 2000 @@ -2,4 +2,4 @@ #ifndef FM_H char *version = CURRENT_VERSION; -#endif +#endif /* not FM_H */ diff -urdN w3m/w3mbookmark.c w3m-0.1.6-2000FEB12JM01/w3mbookmark.c --- w3m/w3mbookmark.c Tue Jan 11 23:23:35 2000 +++ w3m-0.1.6-2000FEB12JM01/w3mbookmark.c Sat Feb 12 08:49:55 2000 @@ -19,7 +19,7 @@ \n\
\n\ \n"; -#else +#else /* LANG != JA */ static char *bkmark_src1 = "Bookmark Registration\n\

Register to my bookmark

\n\
\n\ @@ -33,7 +33,7 @@ \n\ \n\ \n"; -#endif +#endif /* LANG != JA */ static char *end_section = "\n"; diff -urdN w3m/w3mhelperpanel.c w3m-0.1.6-2000FEB12JM01/w3mhelperpanel.c --- w3m/w3mhelperpanel.c Tue Jan 11 23:23:35 2000 +++ w3m-0.1.6-2000FEB12JM01/w3mhelperpanel.c Sat Feb 12 08:50:14 2000 @@ -14,7 +14,7 @@ #define MSG_REGISTER "登録" #define MSG_DELETE "削除" #define MSG_DOIT "実行" -#else +#else /* LANG != JP */ #define MSG_TITLE "External Viewers" #define MSG_NEW_ENTRY "New Entry" #define MSG_TYPE "Type" @@ -22,7 +22,7 @@ #define MSG_REGISTER "Register" #define MSG_DELETE "Delete" #define MSG_DOIT "Do it" -#endif +#endif /* LANG != JP */ void extractMailcapEntry(char *mcap_entry, char **type, char **cmd) diff -durN w3m/XMakefile w3m-0.1.6-2000FEB12JM02/XMakefile --- w3m/XMakefile Fri Jan 14 02:40:32 2000 +++ w3m-0.1.6-2000FEB12JM02/XMakefile Sat Feb 12 10:13:58 2000 @@ -54,8 +54,8 @@ -$(MKDIR) $(DESTDIR)$(HELP_DIR) -$(MKDIR) $(DESTDIR)$(LIB_DIR) $(INSTALL) -m 755 $(TARGET) $(DESTDIR)$(BIN_DIR)/$(TARGET) - $(INSTALL) -m 644 w3mhelp_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp_en.html - $(INSTALL) -m 644 w3mhelp_ja.html $(DESTDIR)$(HELP_DIR)/w3mhelp_ja.html + $(INSTALL) -m 644 w3mhelp-w3m_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-w3m_en.html + $(INSTALL) -m 644 w3mhelp-w3m_ja.html $(DESTDIR)$(HELP_DIR)/w3mhelp-w3m_ja.html $(INSTALL) -m 644 w3mhelp-lynx_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-lynx_en.html $(INSTALL) -m 644 w3mhelp-lynx_ja.html $(DESTDIR)$(HELP_DIR)/w3mhelp-lynx_ja.html $(INSTALL) -m 644 $(HELP_FILE) $(DESTDIR)$(HELP_DIR)/w3mhelp.html @@ -66,8 +66,8 @@ -$(RM) $(BIN_DIR)/$(TARGET) -$(RM) $(HELP_DIR)/w3mhelp-lynx_en.html -$(RM) $(HELP_DIR)/w3mhelp-lynx_ja.html - -$(RM) $(HELP_DIR)/w3mhelp_en.html - -$(RM) $(HELP_DIR)/w3mhelp_ja.html + -$(RM) $(HELP_DIR)/w3mhelp-w3m_en.html + -$(RM) $(HELP_DIR)/w3mhelp-w3m_ja.html -$(RM) $(HELP_DIR)/w3mhelp.html clean: sweep diff -durN w3m/XMakefile.dist w3m-0.1.6-2000FEB12JM02/XMakefile.dist --- w3m/XMakefile.dist Fri Jan 14 02:40:22 2000 +++ w3m-0.1.6-2000FEB12JM02/XMakefile.dist Sat Feb 12 10:14:35 2000 @@ -54,8 +54,8 @@ -$(MKDIR) $(DESTDIR)$(HELP_DIR) -$(MKDIR) $(DESTDIR)$(LIB_DIR) $(INSTALL) -m 755 $(TARGET) $(DESTDIR)$(BIN_DIR)/$(TARGET) - $(INSTALL) -m 644 w3mhelp_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp_en.html - $(INSTALL) -m 644 w3mhelp_ja.html $(DESTDIR)$(HELP_DIR)/w3mhelp_ja.html + $(INSTALL) -m 644 w3mhelp-w3m_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-w3m_en.html + $(INSTALL) -m 644 w3mhelp-w3m_ja.html $(DESTDIR)$(HELP_DIR)/w3mhelp-w3m_ja.html $(INSTALL) -m 644 w3mhelp-lynx_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-lynx_en.html $(INSTALL) -m 644 w3mhelp-lynx_ja.html $(DESTDIR)$(HELP_DIR)/w3mhelp-lynx_ja.html $(INSTALL) -m 644 $(HELP_FILE) $(DESTDIR)$(HELP_DIR)/w3mhelp.html @@ -66,8 +66,8 @@ -$(RM) $(BIN_DIR)/$(TARGET) -$(RM) $(HELP_DIR)/w3mhelp-lynx_en.html -$(RM) $(HELP_DIR)/w3mhelp-lynx_ja.html - -$(RM) $(HELP_DIR)/w3mhelp_en.html - -$(RM) $(HELP_DIR)/w3mhelp_ja.html + -$(RM) $(HELP_DIR)/w3mhelp-w3m_en.html + -$(RM) $(HELP_DIR)/w3mhelp-w3m_ja.html -$(RM) $(HELP_DIR)/w3mhelp.html clean: sweep diff -durN w3m/config.h w3m-0.1.6-2000FEB12JM02/config.h --- w3m/config.h Fri Jan 21 03:05:08 2000 +++ w3m-0.1.6-2000FEB12JM02/config.h Sat Feb 12 10:14:53 2000 @@ -52,7 +52,7 @@ BIN_DIR = /usr/local/bin HELP_DIR = /usr/local/lib/w3m LIB_DIR = /usr/local/lib/w3m -HELP_FILE = w3mhelp_ja.html +HELP_FILE = w3mhelp-w3m_ja.html SYS_LIBRARIES = -lgpm -lbsd -ltermcap -L/usr/local/ssl/lib -lssl -lcrypto LOCAL_LIBRARIES = CC = gcc diff -durN w3m/configure w3m-0.1.6-2000FEB12JM02/configure --- w3m/configure Fri Jan 21 03:06:21 2000 +++ w3m-0.1.6-2000FEB12JM02/configure Sat Feb 12 10:15:12 2000 @@ -325,13 +325,13 @@ if [ "$lynx_key" = y ]; then helpfile="w3mhelp-lynx_ja.html" else - helpfile="w3mhelp_ja.html" + helpfile="w3mhelp-w3m_ja.html" fi else if [ "$lynx_key" = y ]; then helpfile="w3mhelp-lynx_en.html" else - helpfile="w3mhelp_en.html" + helpfile="w3mhelp-w3m_en.html" fi fi diff -durN w3m/w3mhelp-lynx_en.html w3m-0.1.6-2000FEB12JM02/w3mhelp-lynx_en.html --- w3m/w3mhelp-lynx_en.html Tue Jan 11 23:23:35 2000 +++ w3m-0.1.6-2000FEB12JM02/w3mhelp-lynx_en.html Sat Feb 12 10:11:02 2000 @@ -12,7 +12,7 @@ ***** Key assign table *****
-Japanese +Japanese

Page/Cursor motion

diff -durN w3m/w3mhelp-w3m_en.html w3m-0.1.6-2000FEB12JM02/w3mhelp-w3m_en.html --- w3m/w3mhelp-w3m_en.html Wed Dec 31 19:00:00 1969 +++ w3m-0.1.6-2000FEB12JM02/w3mhelp-w3m_en.html Sat Feb 12 10:11:16 2000 @@ -0,0 +1,132 @@ + + +w3m help page + + +
+******* + +w3m + (WWW-wo-Miru) Version beta by +A.ITO ********
+ ***** Key assign table ***** +
+ +Japanese + +

Page/Cursor motion

+
+
SPC,C-vForward page +
b,ESC vBackward page +
l,C-fCursor right +
h,C-bCursor left +
j,C-nCursor down +
k,C-pCursor up +
JRoll up one line +
KRoll down one line +
wGo to next word +
WGo to previous word +
>Shift screen right +
<Shift screen left +
.Shift screen one column right +
,Shift screen one column left +
gGo to the first line +
GGo to the last line +
ESC gGo to specified line +
TABMove to next hyperlink +
C-u,ESC TABMove to previous hyperlink +
[Go to the first link +
]Go to the last link +
+ +

Hyperlink operation

+ +
RETFollow hyperlink +
a, ESC RETSave link to file +
uPeek link URL +
IView inline image +
ESC ISave inline image to file +
:Mark URL-like strings as anchors +
ESC :Mark Message-ID-like strings as news anchors +
cPeek current URL +
=Display infomation about current document +
FRender frame +
MBrowse current document using external browser +(use 2M and 3M to invoke second and third browser) +
ESC MBrowse link using external browser +(use 2ESC M and 3ESC M to invoke second and third browser) +
+ +

File/Stream operation

+ +
UOpen URL +
VView new file +
@Execute shell command and load +
#Execute shell command and browse +
+ +

Buffer operation

+ +
BBack to the previous buffer +
vView HTML source +
sSelect buffer +
EEdit buffer source +
RReload buffer +
SSave buffer +
ESC sSave source +
ESC eEdit buffer image +
+ +

Bookmark operation

+ +
ESC bLoad bookmark +
ESC aAdd current to bookmark +
+ +

Search

+ +
/,C-sSearch forward +
?,C-rSearch backward +
nSearch next +
NSearch previous +
+ +

Mark operation

+ +
C-SPCSet/unset mark +
ESC pGo to previous mark +
ESC nGo to next mark +
"Mark by regular expression +
+ +

Miscellany

+ +
!Execute shell command +
HHelp (load this file) +
oSet option +
C-kShow cookie jar +
C-cStop +
C-zSuspend +
qQuit (with confirmation, if you like) +
QQuit without confirmation +
+ +

Line-edit mode

+ +
C-fMove cursor forward +
C-bMove cursor backward +
C-hDelete previous character +
C-dDelete current character +
C-kKill everything after cursor +
C-uKill everything before cursor +
C-aMove to the top of line +
C-eMove to the bottom of line +
C-pFetch the previous string from the history list +
C-nFetch the next string from the history list +
TAB,SPCComplete filename +
RETURNAccept +
+
+ + + diff -durN w3m/w3mhelp-w3m_ja.html w3m-0.1.6-2000FEB12JM02/w3mhelp-w3m_ja.html --- w3m/w3mhelp-w3m_ja.html Wed Dec 31 19:00:00 1969 +++ w3m-0.1.6-2000FEB12JM02/w3mhelp-w3m_ja.html Sat Feb 12 10:11:27 2000 @@ -0,0 +1,132 @@ + + +w3m ヘルプ ページ + + + +
+ ******* + w3m + (WWW-wo-Miru) Version beta by + A.ITO(伊藤彰則) + ******** +
+ ***** キー割り当て ***** +
+ +English + +

ページ/カーソル移動

+ + + + + + + + + + + + + + + + + + + + + + +
SPC,C-v 次ページ
b,ESC v 前ページ
l,C-f カーソルを右へ移動
h,C-b カーソルを左へ移動
j,C-n カーソルを下へ移動
k,C-p カーソルを上へ移動
J一行上にスクロール(進む)
K一行下にスクロール(戻る)
w次の単語に移動
W前の単語に移動
> 右に一画面分シフト
< 左に一画面分シフト
. 右に一文字分シフト
, 左に一文字分シフト
g ページの先頭行に移動
G ページの最終行に移動
ESC g 指定行に移動
TAB 次のハイパーリンクに移動
C-u, ESC TAB 前のハイパーリンクに移動
[ 最初のハイパーリンクに移動
] 最後のハイパーリンクに移動
+ +

ハイパーリンク操作

+ + + + + + + + + + + + + + +
RET カーソル下のリンクへ飛ぶ
a, ESC RET リンク先の文書をファイルに保存
ESC I リンク先の画像をファイルに保存
u リンク先URLの表示
I インラインイメージの表示
: URLのような文字をアンカーとしてマーク
ESC : Message-IDのような文字をアンカーとしてマーク
c 現ページのURLを表示
= 現ドキュメントの情報を表示
F フレームを表示する
M 現ページを外部ブラウザで表示する(2M,3Mで2番目と3番目のブラウザを呼びだす)
ESC M リンク先を外部ブラウザで表示する(2ESC M,3ESC Mで2番目と3番目のブラウザを呼びだす)
+ +

ファイル/ストリーム操作

+ + + + + +
U URLを指定
V ファイルを開く
@ シェルを起動し読み込む
# シェルを起動し読み込む
+ +

バッファ操作

+ + + + + + + + + +
B 前のバッファに移動
v HTMLソースを表示
s バッファを選択
E バッファのソースを編集
R バッファを再読み込み
S バッファを保存
ESC s HTMLソースを保存
ESC e バッファの表示イメージを編集
+ +

ブックマーク操作

+ + + +
ESC b ブックマークを読み込む
ESC a 現ページをブックマークに追加
+ +

検索

+ + + + + +
/,C-s 前方検索
?,C-r 後方検索
n 次を検索
N 前を検索
+ +

マーク操作

+ + + + + +
C-SPC マークの設定/消去
ESC p 前のマークへ移動
ESC n 次のマークへ移動
" 正規表現によるマーク
+ +

その他

+ + + + + + + + + +
! シェルの実行
H ヘルプ(このファイルを表示)
o オプション設定
C-k クッキー一覧を表示
C-c 文書の読み込みを中断
C-z サスペンド
q w3mを終了(確認あり)
Q w3mを終了(確認なし)
+ +

行編集モード

+ + + + + + + + + + + + + +
C-f カーソルを右へ移動
C-b カーソルを左へ移動
C-h 前の文字を削除
C-d カーソル位置の文字を削除
C-k カーソルの後方を全て削除
C-u カーソルの前までを全て削除
C-a 行頭に移動
C-e 行末へ移動
C-p ヒストリから一つ前の文字列を取り出す
C-n ヒストリから次の文字列を取り出す
TAB,SPC ファイル名の補完
RETURN 入力終了
+
+ + diff -durN w3m/w3mhelp_en.html w3m-0.1.6-2000FEB12JM02/w3mhelp_en.html --- w3m/w3mhelp_en.html Tue Jan 11 23:23:35 2000 +++ w3m-0.1.6-2000FEB12JM02/w3mhelp_en.html Wed Dec 31 19:00:00 1969 @@ -1,132 +0,0 @@ - - -w3m help page - - -
-******* - -w3m - (WWW-wo-Miru) Version beta by -A.ITO ********
- ***** Key assign table ***** -
- -Japanese - -

Page/Cursor motion

- -
SPC,C-vForward page -
b,ESC vBackward page -
l,C-fCursor right -
h,C-bCursor left -
j,C-nCursor down -
k,C-pCursor up -
JRoll up one line -
KRoll down one line -
wGo to next word -
WGo to previous word -
>Shift screen right -
<Shift screen left -
.Shift screen one column right -
,Shift screen one column left -
gGo to the first line -
GGo to the last line -
ESC gGo to specified line -
TABMove to next hyperlink -
C-u,ESC TABMove to previous hyperlink -
[Go to the first link -
]Go to the last link -
- -

Hyperlink operation

- -
RETFollow hyperlink -
a, ESC RETSave link to file -
uPeek link URL -
IView inline image -
ESC ISave inline image to file -
:Mark URL-like strings as anchors -
ESC :Mark Message-ID-like strings as news anchors -
cPeek current URL -
=Display infomation about current document -
FRender frame -
MBrowse current document using external browser -(use 2M and 3M to invoke second and third browser) -
ESC MBrowse link using external browser -(use 2ESC M and 3ESC M to invoke second and third browser) -
- -

File/Stream operation

- -
UOpen URL -
VView new file -
@Execute shell command and load -
#Execute shell command and browse -
- -

Buffer operation

- -
BBack to the previous buffer -
vView HTML source -
sSelect buffer -
EEdit buffer source -
RReload buffer -
SSave buffer -
ESC sSave source -
ESC eEdit buffer image -
- -

Bookmark operation

- -
ESC bLoad bookmark -
ESC aAdd current to bookmark -
- -

Search

- -
/,C-sSearch forward -
?,C-rSearch backward -
nSearch next -
NSearch previous -
- -

Mark operation

- -
C-SPCSet/unset mark -
ESC pGo to previous mark -
ESC nGo to next mark -
"Mark by regular expression -
- -

Miscellany

- -
!Execute shell command -
HHelp (load this file) -
oSet option -
C-kShow cookie jar -
C-cStop -
C-zSuspend -
qQuit (with confirmation, if you like) -
QQuit without confirmation -
- -

Line-edit mode

- -
C-fMove cursor forward -
C-bMove cursor backward -
C-hDelete previous character -
C-dDelete current character -
C-kKill everything after cursor -
C-uKill everything before cursor -
C-aMove to the top of line -
C-eMove to the bottom of line -
C-pFetch the previous string from the history list -
C-nFetch the next string from the history list -
TAB,SPCComplete filename -
RETURNAccept -
-
- - - diff -durN w3m/w3mhelp_ja.html w3m-0.1.6-2000FEB12JM02/w3mhelp_ja.html --- w3m/w3mhelp_ja.html Tue Jan 11 23:23:35 2000 +++ w3m-0.1.6-2000FEB12JM02/w3mhelp_ja.html Wed Dec 31 19:00:00 1969 @@ -1,132 +0,0 @@ - - -w3m ヘルプ ページ - - - -
- ******* - w3m - (WWW-wo-Miru) Version beta by - A.ITO(伊藤彰則) - ******** -
- ***** キー割り当て ***** -
- -English - -

ページ/カーソル移動

- - - - - - - - - - - - - - - - - - - - - - -
SPC,C-v 次ページ
b,ESC v 前ページ
l,C-f カーソルを右へ移動
h,C-b カーソルを左へ移動
j,C-n カーソルを下へ移動
k,C-p カーソルを上へ移動
J一行上にスクロール(進む)
K一行下にスクロール(戻る)
w次の単語に移動
W前の単語に移動
> 右に一画面分シフト
< 左に一画面分シフト
. 右に一文字分シフト
, 左に一文字分シフト
g ページの先頭行に移動
G ページの最終行に移動
ESC g 指定行に移動
TAB 次のハイパーリンクに移動
C-u, ESC TAB 前のハイパーリンクに移動
[ 最初のハイパーリンクに移動
] 最後のハイパーリンクに移動
- -

ハイパーリンク操作

- - - - - - - - - - - - - - -
RET カーソル下のリンクへ飛ぶ
a, ESC RET リンク先の文書をファイルに保存
ESC I リンク先の画像をファイルに保存
u リンク先URLの表示
I インラインイメージの表示
: URLのような文字をアンカーとしてマーク
ESC : Message-IDのような文字をアンカーとしてマーク
c 現ページのURLを表示
= 現ドキュメントの情報を表示
F フレームを表示する
M 現ページを外部ブラウザで表示する(2M,3Mで2番目と3番目のブラウザを呼びだす)
ESC M リンク先を外部ブラウザで表示する(2ESC M,3ESC Mで2番目と3番目のブラウザを呼びだす)
- -

ファイル/ストリーム操作

- - - - - -
U URLを指定
V ファイルを開く
@ シェルを起動し読み込む
# シェルを起動し読み込む
- -

バッファ操作

- - - - - - - - - -
B 前のバッファに移動
v HTMLソースを表示
s バッファを選択
E バッファのソースを編集
R バッファを再読み込み
S バッファを保存
ESC s HTMLソースを保存
ESC e バッファの表示イメージを編集
- -

ブックマーク操作

- - - -
ESC b ブックマークを読み込む
ESC a 現ページをブックマークに追加
- -

検索

- - - - - -
/,C-s 前方検索
?,C-r 後方検索
n 次を検索
N 前を検索
- -

マーク操作

- - - - - -
C-SPC マークの設定/消去
ESC p 前のマークへ移動
ESC n 次のマークへ移動
" 正規表現によるマーク
- -

その他

- - - - - - - - - -
! シェルの実行
H ヘルプ(このファイルを表示)
o オプション設定
C-k クッキー一覧を表示
C-c 文書の読み込みを中断
C-z サスペンド
q w3mを終了(確認あり)
Q w3mを終了(確認なし)
- -

行編集モード

- - - - - - - - - - - - - -
C-f カーソルを右へ移動
C-b カーソルを左へ移動
C-h 前の文字を削除
C-d カーソル位置の文字を削除
C-k カーソルの後方を全て削除
C-u カーソルの前までを全て削除
C-a 行頭に移動
C-e 行末へ移動
C-p ヒストリから一つ前の文字列を取り出す
C-n ヒストリから次の文字列を取り出す
TAB,SPC ファイル名の補完
RETURN 入力終了
-
- - --- w3m/main.c Fri Jan 21 02:18:58 2000 +++ w3m-0.1.6-2000FEB12JM03/main.c Sat Feb 12 13:10:47 2000 @@ -2431,7 +2431,7 @@ return; } - message(Sprintf("loading %s\n", url)->ptr, 0, 0); +/* message(Sprintf("loading %s\n", url)->ptr, 0, 0); */ refresh(); buf = loadGeneralFile(url, current,NO_REFERER,0,NULL); if (buf == NULL) { --- w3m/url.c Fri Jan 14 02:21:24 2000 +++ w3m-0.1.6-2000FEB12JM03/url.c Sat Feb 12 13:28:33 2000 @@ -304,6 +304,8 @@ else { char **h_addr_list ; int result ; + message(Sprintf("Performing hostname lookup on %s\n", hostname)->ptr, 0, 0); + refresh(); if ((entry = gethostbyname(hostname)) == NULL) { goto error; } @@ -313,6 +315,8 @@ { bcopy((void*)h_addr_list[0], (void*)&hostaddr.sin_addr, entry->h_length); + message(Sprintf("Connecting to %s\n", hostname)->ptr, 0, 0); + refresh(); if ((result=connect(sock, (struct sockaddr *) & hostaddr, sizeof(struct sockaddr_in))) == 0) { break; --- w3m/doc/HISTORY Fri Jan 21 03:32:42 2000 +++ w3m-0.1.6-2000FEB12JM01/doc/HISTORY Sat Feb 12 16:41:44 2000 @@ -1,3 +1,17 @@ +2000.2.12 +From: roguemtl@stampede.org (Jacob Moorman of the [MH] Free Software Group) +- added GNU-style commenting for all #ifdef/#else/#endif +- renamed w3mhelp_en and w3mhelp_ja to w3mhelp-w3m_en and w3mhelp-w3m_ja +- corrected error in w3mhelp-lynx_en ('Japanese' link was pointing to + Japanese language help file for w3m keybindings, not lynx keybindings) +- added additional messages during DNS resolve and connecting phases of + a URL load (replacing the old 'loading {URL}' message with two messages, + thus helping the end-user know when w3m is attempting to resolve a hostname) + +2000.2.10 +From: roguemtl@stampede.org (Jacob Moorman of the [MH] Free Software Group) +- added support for PageUp and PageDown in list boxes + 2000.1.21 From: naddy@mips.rhein-neckar.de (Christian Weisgerber) 1. conn.eventMask is set to 0 which disables reception of all types --- w3m/doc-jp/HISTORY Fri Jan 21 03:31:16 2000 +++ w3m-0.1.6-2000FEB12JM01/doc-jp/HISTORY Sat Feb 12 16:42:09 2000 @@ -1,3 +1,17 @@ +2000.2.12 +From: roguemtl@stampede.org (Jacob Moorman of the [MH] Free Software Group) +- added GNU-style commenting for all #ifdef/#else/#endif +- renamed w3mhelp_en and w3mhelp_ja to w3mhelp-w3m_en and w3mhelp-w3m_ja +- corrected error in w3mhelp-lynx_en ('Japanese' link was pointing to + Japanese language help file for w3m keybindings, not lynx keybindings) +- added additional messages during DNS resolve and connecting phases of + a URL load (replacing the old 'loading {URL}' message with two messages, + thus helping the end-user know when w3m is attempting to resolve a hostname) + +2000.2.10 +From: roguemtl@stampede.org (Jacob Moorman of the [MH] Free Software Group) +- added support for PageUp and PageDown in list boxes + 2000.1.21 From: naddy@mips.rhein-neckar.de (Christian Weisgerber) 1. conn.eventMask is set to 0 which disables reception of all types