+ $_
+
+ EOF
+ }
+ $i++;
+ }
+ print <
+ ) {
+ if (/"\177-\377]/sprintf('%%%02X', unpack('C', $&))/eg;
+ $url .= "search?q=$_&hl=ja&lr=lang_ja&ie=EUC-JP";
+ } else {
+ $input = "w3m-control: GOTO_LINK";
+ }
+ print <
+ # [ username = ]
+ # [ password = ]
+ # [ password_file = ]
+ # ----------------------
+ # --- ---
+ #
+ # -----------------------
+ # default:
+ # = $USER
+ # = $PASSWD (Don't use!)
+ # = $PASSWD_FILE
+
+ $DEBUG = 1;
+
+ $MIME_TYPE = "~/.mime.types";
+ $AUTH_FILE = "~/.w3m/smb";
+ $MIME_TYPE =~ s@^~/@$ENV{"HOME"}/@;
+ $AUTH_FILE =~ s@^~/@$ENV{"HOME"}/@;
+ $WORKGROUP = "-";
+ $USER = $ENV{"USER"};
+ $PASSWD = $ENV{"PASSWD"};
+ $PASSWD_FILE = $ENV{"PASSWD_FILE"};
+ &load_auth_file($AUTH_FILE);
+
+ $NMBLOOKUP = "nmblookup";
+ $SMBCLIENT = "smbclient";
+ @NMBLOOKUP_OPT = ("-T");
+ @SMBCLIENT_OPT = ("-N");
+ $USE_OPT_A = defined($PASSWD) && (-f $AUTH_FILE) && &check_opt_a();
+ if ($USE_OPT_A) {
+ push(@SMBCLIENT_OPT, "-A", $AUTH_FILE);
+ } elsif (-f $PASSWD_FILE) {
+ $USE_PASSWD_FILE = 1;
+ } elsif (defined($PASSWD)) {
+ $USE_PASSWD_FD = 1;
+ $PASSWD_FD = 0;
+ }
+ if (defined($PASSWD)) {
+ $passwd = "*" x 8;
+ }
+ $DEBUG && print <) {
+ $DEBUG && print "DEBUG: $_";
+ /^\s/ && last;
+ }
+ close($F);
+ if (s/\s+([A-Z]*) {1,8}\d+ (\w{3} ){2}[ \d]\d \d\d:\d\d:\d\d \d{4}\s*$//
+ && $1 !~ /D/) {
+ &get_file($service, $file);
+ exit;
+ }
+
+ get_list:
+ $_ = "$file/*";
+ s@/+@\\@g;
+ @cmd = ($SMBCLIENT, $service, @SMBCLIENT_OPT, "-c", "ls \"$_\"");
+ $F = &open_pipe(1, @cmd);
+ while (<$F>) {
+ /^\s*$/ && last;
+ $DEBUG && print "DEBUG: $_";
+ /^cd\s+/ && last;
+ /^\S/ && next;
+ s/\r?\n//;
+ push(@files, $_);
+ }
+ close($F);
+
+ $qservice = &html_quote($service);
+ $service = &file_encode($service);
+ $qfile = &html_quote($file);
+ $file = &file_encode($file);
+
+ print "Content-Type: text/html\n\n";
+ print "$qservice$qfile \n";
+ print "$qservice$qfile \n";
+ print "\n";
+ for (sort @files) {
+ s/\s+([A-Z]*) {1,8}\d+ (\w{3} ){2}[ \d]\d \d\d:\d\d:\d\d \d{4}\s*$// || next;
+ $c = $&;
+ s/^ //;
+ $_ eq "." && next;
+ print ""
+ . &html_quote($_) . " "
+ . &html_quote($c) . "\n";
+ }
+ print " \n";
+ }
+
+ sub get_file {
+ local($service, $file) = @_;
+ local($encoding, $type);
+ local($_, @cmd);
+
+ $_ = $file;
+ s@/@\\@g;
+ @cmd = ($SMBCLIENT, $service, @SMBCLIENT_OPT, "-E", "-c", "more \"$_\"");
+ $DEBUG && print "DEBUG: @cmd\n";
+
+ ($encoding, $type) = &guess_type($file);
+ $file =~ s@^.*/@@;
+ $| = 1;
+ print "Content-Encoding: $encoding\n" if $encoding;
+ print "Content-Type: $type; name=\"$file\"\n\n";
+
+ $ENV{"PAGER"} = $PAGER if $PAGER;
+ &exec_cmd(1, @cmd);
+ }
+
+ sub share_list {
+ local($server) = @_;
+ local(@share);
+ local($qserver, $_, $d, @c);
+
+ @share = &get_list(1, $server, "Share");
+
+ $qserver = &html_quote($server);
+ $server = &file_encode($server);
+
+ print "Content-Type: text/html\n\n";
+ print "Share list: $qserver \n";
+ print "\n";
+ print "$qserver ";
+ for (sort @share) {
+ ($_, $d, @c) = split(" ");
+ if ($d eq 'Disk') {
+ print "+ "
+ . &html_quote($_) . " ";
+ } else {
+ print " + "
+ . &html_quote($_);
+ }
+ print " "
+ . &html_quote($d) . " "
+ . &html_quote("@c") . "\n";
+ }
+ print "
\n";
+ }
+
+ sub server_list {
+ local($group) = @_;
+ local($master, @server);
+ local($_, @c);
+
+ $master = &get_master($group);
+ @server = &get_list(0, $master, "Server");
+
+ $group = &html_quote($group);
+
+ print "Content-Type: text/html\n\n";
+ print "Server list: $group \n";
+ print "\n";
+ print "$group \n";
+ for (sort @server) {
+ ($_, @c) = split(" ");
+ print "+ "
+ . &html_quote($_) . " "
+ . &html_quote("@c") . "\n";
+ }
+ print "
\n";
+ }
+
+ sub group_list {
+ local($master, @group);
+ local($_, @c);
+
+ $master = &get_master($WORKGROUP || "-");
+ @group = &get_list(0, $master, "Workgroup");
+
+ print "Content-Type: text/html\n\n";
+ print "Workgroup list \n";
+ print "\n";
+ for (sort @group) {
+ ($_, @c) = split(" ");
+ print ""
+ . &html_quote($_) . " "
+ . &html_quote("@c") . "\n";
+ }
+ print "
\n";
+ }
+
+ sub check_opt_a {
+ local($_, $F, @cmd);
+
+ @cmd = ($SMBCLIENT, "-h");
+ $F = &open_pipe(0, @cmd);
+ while (<$F>) {
+ if (/^\s*-A\s/) {
+ $DEBUG && print "DEBUG: $_";
+ close($F);
+ return 1;
+ }
+ }
+ close($F);
+ return 0;
+ }
+
+ sub get_master {
+ local($group) = @_;
+ local($_, $F, @cmd);
+
+ @cmd = ($NMBLOOKUP, "-M", @NMBLOOKUP_OPT, $group);
+ $F = &open_pipe(0, @cmd);
+ $_ = <$F>;
+ $_ = <$F>;
+ close($F);
+ ($_) = split(/[,\s]/);
+ s/\.*$//;
+ return $_;
+ }
+
+ sub get_list {
+ local($passwd, $server, $header) = @_;
+ local(@list) = ();
+ local($_, @cmd, $F);
+
+ @cmd = ($SMBCLIENT, @SMBCLIENT_OPT, "-L", $server);
+ $F = &open_pipe($passwd, @cmd);
+ while (<$F>) {
+ if (/^\s*$header/) {
+ $DEBUG && print "DEBUG: $_";
+ last;
+ }
+ }
+ while (<$F>) {
+ /^\s*$/ && last;
+ $DEBUG && print "DEBUG: $_";
+ /^\S/ && last;
+ /^\s*-/ && next;
+ push(@list, $_);
+ }
+ close($F);
+ return @list;
+ }
+
+ sub open_pipe {
+ local($passwd, @cmd) = @_;
+ local($F) = $FILE++;
+
+ $DEBUG && print "DEBUG: @cmd\n";
+ open($F, "-|") || &exec_cmd($passwd, @cmd);
+ return $F;
+ }
+
+ sub exec_cmd {
+ local($passwd, @cmd) = @_;
+
+ $ENV{"LC_ALL"} = "C";
+ $ENV{"USER"} = $USER;
+ if ($passwd && !$USE_OPT_A) {
+ if ($USE_PASSWD_FILE) {
+ $ENV{"PASSWD_FILE"} = $PASSWD_FILE;
+ } elsif ($USE_PASSWD_FD) {
+ $ENV{"PASSWD_FD"} = $PASSWD_FD;
+ if (open(W, "|-")) {
+ print W $PASSWD;
+ close(W);
+ exit;
+ }
+ }
+ }
+ open(STDERR, ">/dev/null");
+ exec @cmd;
+ exit 1;
+ }
+
+ sub print_form {
+ local($_) = @_;
+ local($q) = &html_quote($_);
+ $_ = &file_encode($_);
+
+ print <$q
+
+ EOF
+ }
+
+ sub load_auth_file {
+ local($_) = @_;
+
+ if ($USER =~ s/%(.*)$//) {
+ $PASSWD = $1 unless $PASSWD;
+ }
+ open(F, $_) || return;
+ while () {
+ s/\s+$//;
+ if (s/^workgroup\s*=\s*//i) {
+ $WORKGROUP = $_;
+ } elsif (s/^user(name)?\s*=\s*//i) {
+ $USER = $_;
+ } elsif (s/^passw(or)?d\s*=\s*//i) {
+ $PASSWD = $_;
+ } elsif (s/^passw(or)?d_file\s*=\s*//i) {
+ $PASSWD_FILE = $_;
+ }
+ }
+ close(F);
+ }
+
+ sub load_mime_type {
+ local($_) = @_;
+ local(%mime) = ();
+ local($type, @suffix);
+
+ open(F, $_) || return ();
+ while() {
+ /^#/ && next;
+ chop;
+ (($type, @suffix) = split(" ")) >= 2 || next;
+ for (@suffix) {
+ $mime{$_} = $type;
+ }
+ }
+ close(F);
+ return %mime;
+ }
+
+ sub guess_type {
+ local($_) = @_;
+ local(%mime) = &load_mime_type($MIME_TYPE);
+ local($encoding) = undef;
+
+ if (s/\.gz$//i) {
+ $encoding = "gzip";
+ } elsif (s/\.Z$//i) {
+ $encoding = "compress";
+ } elsif (s/\.bz2?$//i) {
+ $encoding = "bzip2";
+ }
+ /\.(\w+)$/;
+ $_ = $1;
+ tr/A-Z/a-z/;
+ return ($encoding, $mime{$_} || "text/plain");
+ }
+
+ sub cleanup {
+ local($_) = @_;
+
+ $_ .= "/";
+ s@//+@/@g;
+ s@/\./@/@g;
+ while(m@/\.\./@) {
+ s@^/(\.\./)+@/@;
+ s@/[^/]+/\.\./@/@;
+ }
+ s@(.)/$@$1@;
+ return $_;
+ }
+
+ sub file_encode {
+ local($_) = @_;
+ s/[\000-\040\+:#?&%<>"\177-\377]/sprintf('%%%02X', unpack('C', $&))/eg;
+ return $_;
+ }
+
+ sub file_decode {
+ local($_) = @_;
+ s/\+/ /g;
+ s/%([\da-f][\da-f])/pack('C', hex($1))/egi;
+ s@[\r\n\0\\"]@@g;
+ return $_;
+ }
+
+ sub html_quote {
+ local($_) = @_;
+ local(%QUOTE) = (
+ '<', '<',
+ '>', '>',
+ '&', '&',
+ '"', '"',
+ );
+ s/[<>&"]/$QUOTE{$&}/g;
+ return $_;
+ }
diff -crN -x CVS w3m-0.3.2.2/ChangeLog w3m-js-1.743/ChangeLog
*** w3m-0.3.2.2/ChangeLog 2002-12-06 01:53:19.000000000 +0900
--- w3m-js-1.743/ChangeLog 2003-02-08 02:29:54.000000000 +0900
***************
*** 1,40 ****
2002-12-06 Fumitoshi UKAI
! * w3m 0.3.2.2
! * version.c.in: update
! * doc/README: version 0.3.2.2, release date
! * doc-jp/README: ditto
! * NEWS: update
2002-12-06 Hironori SAKAMOTO
!
! * w3m 0.3.2 branch: security fix
* file.c (process_img): html_quote()
! (loadHTMLstream): HTMLlineproc0 internal
2002-11-27 Fumitoshi UKAI
! * w3m 0.3.2.1
! * version.c.in: update
! * doc/README: version 0.3.2.1, release date
! * doc-jp/README: ditto
! * NEWS: update
! 2002-11-26 Hironori SAKAMOTO
- * w3m 0.3.2 branch: security fix
* frame.c (createFrameFile): html_quote()
2002-11-16 Hironori SAKAMOTO
- * w3m 0.3.2 branch: backport from trunk
* [w3m-dev 03438] Re: segmentation fault by large complex table.
* table.c (check_table_height): check MAXROWCELL
* table.h (MAXROWCELL): added
! 2002-11-26 Hironori SAKAMOTO
- * w3m 0.3.2 branch: backport from trunk
* [w3m-dev 03371] segmentation fault by large complex table.
* table.c (bsearch_2short): indexarry char to short
(bsearch_double): ditto
--- 1,3011 ----
+ 2003-02-08 Hiroyuki Ito
+
+ * [w3m-dev 03736] dirlist sort
+ * scripts/dirlist.cgi.in (right_dir): use cmp for filename comparison
+
+ 2003-02-07 Hironori SAKAMOTO
+
+ * [w3m-dev 03735] Re: make error of checkType arg
+ * etc.c (checkType): delete USE_ANSI_COLOR
+ * file.c (addnewline): macro for USE_ANSI_COLOR
+ (readHeader): rewrite of USE_ANSI_COLOR
+ (HTMLlineproc2body): ditto
+ (addnewline2): ditto
+ (addnewline): ditto
+ (loadBuffer): ditto
+ (getNextPage): ditto
+ * proto.h (checkType): macro for USE_ANSI_COLOR
+
+ 2003-02-07 Hironori SAKAMOTO
+
+ * [w3m-dev 03733] Re: display decoded URL
+ * display.c (make_lastline_link): buf->document_code
+
+ 2003-02-07 Hironori SAKAMOTO
+
+ * [w3m-dev 03732] Re: scroll() is slow ?
+ * configure (use_raw_scroll): added
+ (config.h) use_raw_scroll
+ * config.h.dist (USE_RAW_SCROLL): added
+ * display.c (displayBuffer): ifdef USE_RAW_SCROLL
+ * proto.h (scroll): ifdef USE_RAW_SCROLL
+ (rscroll): ditto
+ (need_clrtoeol): if 0
+ (terms.c): if 0 need_clrtoeol
+ (scroll_raw): ifdef USE_RAW_SCROLL
+
+ 2003-02-06 Fumitoshi UKAI
+
+ * NEWS: rc: decode_url
+
+ 2003-02-06 Hironori SAKAMOTO
+
+ * [w3m-dev 03730] display decoded URL
+ * anchor.c (link_list_panel): support DecodeURL
+ * display.c (make_lastline_link): support DecodeURL
+ * etc.c (url_unquote_conv): added
+ * fm.h (DecodeURL): added
+ * history.c (historyBuffer): support DecodeURL
+ * indep.c (QUOTE_MAP): added
+ (HTML_QUOTE_MAP): added
+ (html_quote_char): deleted
+ (url_quote): use is_url_quote
+ (file_quote): use is_file_quote
+ (is_url_safe): deleted
+ (Str_form_quote): use is_url_unsafe
+ (Str_url_unquote): add safe args
+ (is_shell_safe): delete
+ (shell_quote): use is_shell_unsafe
+ * indep.h (QUOTE_MAP): added
+ (HTML_QUOTE_MAP): added
+ (HTML_QUOTE_MASK): added
+ (SHELL_UNSAFE_MASK): added
+ (URL_QUOTE_MASK): added
+ (FILE_QUOTE_MASK): added
+ (URL_UNSAFE_MASK): added
+ (GET_QUOTE_TYPE): added
+ (is_html_quote): added
+ (is_shell_unsafe): added
+ (is_url_quote): added
+ (is_file_quote): added
+ (is_url_unsafe): added
+ (html_quote_char): added
+ (html_quote_char): deleted
+ (Str_url_unquote): added safe
+ (form_unquote): Str_url_unquote changes
+ * linein.c (_prev): support DecodeURL
+ (_next): ditto
+ * main.c (goURL0): support DecodeURL
+ (_peekURL): ditto
+ (curURL): ditto
+ * map.c (follow_map_panel): support DecodeURL
+ (append_map_info): ditto
+ (append_link_info): ditto
+ (append_frame_info): ditto
+ (page_info_panel): ditto
+ * menu.c (initSelectMenu): delete SCM_LOCAL_CGI
+ support DecodeURL
+ (initSelTabMenu): delete SCM_LOCAL_CGI
+ support DecodeURL
+ (link_menu): support DecodeURL
+ * parsetagx.c (parse_tag): is_html_quote
+ * proto.h (url_unquote_conv): added
+ * rc.c (CMT_DECODE_URL): added
+ (params1): add decode_url
+ * url.c (openURL): Str_url_unquote non safe
+
+ 2003-02-06 Hironori SAKAMOTO
+
+ * [w3m-dev 03729] buf fix of reAnchorNewsheader()
+ * anchor.c (reAnchorAny): check l->bpos
+ (reAnchorNewsheader): check l->bpos
+ strlen(*q)
+ lineBuf[l->size]
+
+ 2003-02-06 Hironori SAKAMOTO
+
+ * [w3m-dev 03728] IPv6 hostname
+ * url.c (parseURL): rewrite IPv6 address parser
+
+ 2003-02-04 Hironori SAKAMOTO
+
+ * [w3m-dev 03724] Re: view source, edit source
+ * buffer.c (reshapeBuffer): initialize buf->width first
+ * display.c (displayBuffer): no need to check buf>sourcefile
+
+ 2003-02-01 Hironori SAKAMOTO
+
+ * [w3m-dev 03721] PATH_INFO support of local CGI
+ * local.c (CGIFN_DROOT): deleted
+ (CGIFN_LIBDIR): added
+ (CGIFN_MODE): deleted
+ (CGIFN_CONTAIN_SLASH): deleted
+ (check_local_cgi): rewrite
+ (cgi_filename): rewrite
+ (localcgi_post): support PATH_INFO
+ * url.c (openURL): rewrite
+ * Bonus/smb.cgi: use PATH_INFO
+
+ 2003-02-01 Hironori SAKAMOTO
+
+ * [w3m-dev 03720] mark remains
+ * main.c (srchcore): PREC_NUM
+
+ 2003-01-31 Hironori SAKAMOTO
+
+ * [w3m-dev 03719] Re: Too slow when loading big file with fold_line=1
+ * file.c (addnewline): check i len
+
+ 2003-01-31 Hironori SAKAMOTO
+
+ * [w3m-dev 03718] Too slow when loading big file with fold_line=1
+ * etc.c (nextColumn): added
+ (calcPosition): use New_N
+ rewrite with nextColumn
+ (columnLen): added
+ * file.c (addnewline): rewrite with columnLen
+ * proto.h (columnLen): added
+
+ 2003-01-31 Hironori SAKAMOTO
+
+ * [w3m-dev 03717] print newline before exec shell command.
+ * main.c (execsh): print newline
+
+ 2003-01-31 Hironori SAKAMOTO
+
+ * [w3m-dev 03715] initial currentLine when pager mode.
+ * file.c (getNextPage): fix cur
+
+ 2003-01-31 Hironori SAKAMOTO
+
+ * [w3m-dev 03714] -cols 1 -dump -o fold_line=1
+ * file.c (addnewline): check i == 0, i == l->len
+ * fm.h (_INIT_BUFFER_WIDTH): added
+ (INIT_BUFFER_WIDTH): use _INIT_BUFFER_WIDTH
+
+ 2003-01-31 Hironori SAKAMOTO
+
+ * [w3m-dev 03713] search with "$"
+ * search.c (forwardSearch): check l->next && l->next->bpos
+ (backwardSearch): check l->size, l->next && l->next->bpos
+
+ 2003-01-31 Hironori SAKAMOTO
+
+ * [w3m-dev 03712] buf fix of LINE_INFO
+ * main.c (curlno): rewrite
+
+ 2003-01-30 Hironori SAKAMOTO
+
+ * [w3m-dev 03709] Re: view source, edit source
+ * display.c (displayBuffer): INIT_BUFFER_WIDTH
+ * file.c (_saveBuffer): added
+ (saveBuffer): use _saveBuffer
+ (saveBufferBody): added
+ * main.c (vmSrc): saveBufferBody
+ * proto.h (saveBufferBody): added
+
+ 2003-01-30 Hironori SAKAMOTO
+
+ * [w3m-dev-en 00852] Re: Enhancement: content type detection of files
+ * url.c (DefaultGuess): remove upppercases
+ (guessContentTypeFromTable): rewrite, strcasecmp
+
+ 2003-01-30 Hironori SAKAMOTO
+
+ * [w3m-dev 03708] Re: Don't stop loading image when moving to next page.
+ * config.h.dist (lstat): define ifndef HAVE_LSTAT
+ * configure (config.h) ditto
+ * display.c (fmTerm): new loadImage
+ (save_current_buf): only ifdef USE_BUFINFO
+ (displayBuffer): new loadImage
+ * etc.c (setup_child): TrapSignal
+ * file.c (loadGeneralFile): TRAP_OFF, TRAP_ON
+ (loadHTMLstream): ditto
+ (loadGopherDir): ditto
+ (loadBuffer): ditto
+ (loadImageBuffer): ditto
+ (getNextPage): ditto
+ (save2tmp): ditto
+ * fm.h (TrapSignal): added
+ (TRAP_ON): added
+ (TRAP_OFF): added
+ * form.c (HAVE_LSTAT): deleted
+ * frame.c (createFrameFile): TRAP_OFF, TRAP_ON
+ * image.c (image_buffer): added
+ (deleteImage): new loadImage
+ (getAllImage): initialize image_buffer
+ (loadImage): rewrite
+ * main.c (main): new loadImage
+ (checkDownloadList): remove ifdef HAVE_LSTAT
+ * news.c (loadNwesgroup): TRAP_ON, TRAP_OFF
+ * proto.h (loadImage): add buf arg
+ * url.c (openSocket): TRAP_ON, TRAP_OFF
+ (check_no_proxy): TRAP_ON, TRAP_OFF
+
+ 2003-01-29 Hironori SAKAMOTO
+
+ * [w3m-dev 03707] Don't stop loading image when moving to next page.
+ * display.c (save_current_buf): required when defined USE_IMAGE
+ (displayBuffer): stop only buffer changed
+ * image.c (loadImage): IMG_FLAG_START load from maxLoadImage
+
+ 2003-01-29 Hironori SAKAMOTO
+
+ * [w3m-dev 03706] X-Image-URL: support, bug fix of reshapeBuffer()
+ * buffer.c (reshapeBuffer): rewrite
+ * file.c (readHeader): rewrite
+
+ 2003-01-29 NAKAJIMA Mikio
+
+ * [w3m-dev 03705] goodict.cgi (was: Re: google.cgi (was: Re: keymap key SEARCH string))
+ * Bonus/goodict.cgi: added
+
+ 2003-01-29 Hironori SAKAMOTO
+
+ * [w3m-dev 03700] Re: google.cgi (was: Re: keymap key SEARCH string)
+ * main.c (goURL0): check relative or *url == '#'
+
+ 2003-01-28 Hironori SAKAMOTO
+
+ * [w3m-dev 03689] Re: fold patch
+ * fm.h (BufferPos): add bpos
+ * main.c (save_buffer_position): bpos initialize
+ (resetPos): reset bpos
+
+ 2003-01-26 Hironori SAKAMOTO
+
+ * [w3m-dev 03686] Re: fold patch
+ * buffer.c (writeBufferCache): rewrite
+ (readBufferCache): rewrite
+ * etc.c (calcPosition): short -> int realColumn
+ * fm.h (Line): short -> int len,width,size,bpos,bwidth
+ (BufferPoint): short->int pos
+ (Buffer): short->int currentColumn,pos,visualpos
+ (BufferPos): short->int currentColumn,pos
+ * frame.h (frameset_queue): short->int pos,currentColumn
+ * main.c (clear_mark): short->int pos
+ (dispincsrch): short->int pos
+ (backBf): short->int pos
+ (set_buffer_environ): short->int prev_pos
+
+ 2003-01-25 Hironori SAKAMOTO
+
+ * [w3m-dev 03684] Re: fold patch
+ * file.c (PSIZE): added
+ (HTMLlineproc2body): outc,outp is created by NewAtom_N
+ use PSIZE
+
+ 2003-01-25 Fumitoshi UKAI
+
+ * file.c (getNextPage): no need volatile for code
+
+ 2003-01-25 Hironori SAKAMOTO
+
+ * [w3m-dev 03683] interrupt in getNextPage()
+ * file.c (getNextPage): trap SIGINT
+
+ 2003-01-25 Hironori SAKAMOTO
+
+ * [w3m-dev 03682] open null file on tab
+ * display.c (displayBuffer): if empty, clear()
+
+ 2003-01-25 Hironori SAKAMOTO
+
+ * [w3m-dev 03681] Re: fold patch
+ * buffer.c (reshapeBuffer): buf->pos, sbuf.currentLine fix
+ FoldLine
+ * display.c (arrangeCursor): buf->pos fix
+ (restorePosition): buf->pos fix
+
+ 2003-01-24 Fumitoshi UKAI
+
+ * NEWS: func: RESHAPE
+ rc: fold_line
+
+ 2003-01-24 Fumitoshi UKAI
+
+ * fix compiler warnings
+ * display.c (displayBuffer): fix suggest parentheses around && within ||
+ 2003-01-24 Hironori SAKAMOTO
+
+ * [w3m-dev 03667] fold patch
+ * anchor.c (reAnchorPos): rewrite
+ (reAnchorWord): delete reseq_anchor()
+ (reAnchorAny): use l->size
+ delete reseq_anchor()
+ * backend.c (internal_get): pass TRUE to saveBuffer
+ * buffer.c (newBuffer): delete n->linelen
+ (reshapeBuffer): rewrite
+ * display.c (displayBuffer): FoldLine
+ (redrawLine): l->bpos
+ (cursorUp0): added
+ (cursorUp): rewrite
+ (cursorDown0): added
+ (cursowDown): rewrite
+ (cursorRight): check l->next
+ l->bwidth
+ (cursorLeft): l->prev && l->bpos
+ l->bwidth
+ (arrangeCursor): buf->currentLine->bwidth
+ buf->cursorX
+ * etc.c (checkType): **oporp
+ rewrite
+ (calcPosition): realColumn allocated by New_reuse
+ * file.c (addnewline): add nlines arg
+ (propBuffer): deleted
+ (colorBuffer): deleted
+ (readHeader): propBuffer
+ FOLD_BUFFER_WIDTH
+ (HTMLlineproc2body): rewrite
+ (addnewline2): added
+ (addnewline): rewrite
+ (loadBuffer): propBuffer, colorBuffer
+ (saveBuffer): cont arg
+ (getNextPage): rewrite
+ * fm.h (LINELEN): 256
+ (FNLEN): deleted
+ (Line): add size, bpos, bwidth
+ (Buffer): delete linelen
+ (INIT_BUFFER_WIDTH): check showLineNum
+ (FOLD_BUFFER_WIDTH): added
+ (FoldLine): added
+ * funcname.tab (RESHAPE): added
+ * main.c (do_dump): pass FALSE to saveBuffer
+ (nscroll): rewrite
+ (clear_mark): l->size
+ (shiftvisualpos): rewrite
+ (pipeBuf): pass TRUE to saveBuffer
+ (linebeg): check line->prev && line->bpos
+ (linend): check line->next, line->next->bpos
+ (editScr): pass TRUE to saveBuffer
+ (svBuf): pass TRUE to saveBuffer
+ (vmSrc): pass TRUE to saveBuffer
+ (reshape): added
+ (curlno): rewrite
+ * mimehead.c (LINELEN): deleted
+ * proto.h (reshape): added
+ (saveBuffer): add cont arg
+ (cursorUp0): added
+ (cursorDown0): added
+ (checkType): change type oprop, ocolor, delete check_color, len
+ * rc.c (CMT_FOLD_LINE): added
+ (params1): add fold_line
+ (sync_with_option): check PagerMax
+ * search.c (set_mark): l->size
+ (forwardSearch): rewrite
+ (backwardSearch): rewrite
+ * doc/README.func (RESHAPE): added
+ * doc-jp/README.func (RESHAPE): added
+ * scripts/w3mhelp.cgi.in (Buffer operation): add reshape
+
+ 2003-01-24 Hironori SAKAMOTO
+
+ * etc.c (next_status): after = is R_ST_VALUE
+ R_ST_VALUE > => R_ST_NORMAL
+ R_ST_VALUE SP => R_ST_TAG
+ (read_token): R_ST_VALUE
+ (correct_irrtag): R_ST_VALUE
+ * rm.h (R_ST_VALUE): added
+ (ST_IS_REAL_TAG): rewrite
+ (ST_IS_COMMENT): deleted
+ (ST_IS_TAG): deleted
+ * parsetagx.c (parse_tag): skip too long tagname
+ skip too long attrname
+ if attrvalue has quote char, need reconstruct
+ if unknown attr, need reconstruct
+ * table.c (visible_length): R_ST_VALUE
+
+ 2003-01-24 Hironori SAKAMOTO
+
+ * [w3m-dev 03680] showProgress() on fast system
+ * file.c (showProgress): check line len, time
+
+ 2003-01-24 Hironori SAKAMOTO
+
+ * [w3m-dev 03679] Re: cleanup for pipe
+ * etc.c (open_pipe_rw): check stdin, stdout
+ * file.c (uncompress_stream): rewrite
+
+ 2003-01-23 Fumitoshi UKAI
+
+ * [w3m-dev 03678] Re: config.param is clear when configure -help
+ * configure: don't override config.param
+
+ 2003-01-23 Hironori SAKAMOTO
+
+ * [w3m-dev 03677] view source, edit source
+ * buffer.c (discardBuffer): unlink header source
+ * file.c (loadFile): delete skip header
+ * fm.h (BP_SOURCE): deleted
+ (SkipHeader): deleted
+ * main (editBf): cleanup
+ (vmSrc): cleanup
+
+ 2003-01-23 Hironori SAKAMOTO
+
+ * [w3m-dev 03676] cleanup for pipe
+ * etc.c (open_pipe_rw): added
+ * file.c (uncompress_stream): rewrite using open_pipe_rw
+ * image.c (openImgdisplay): rewrite using open_pipe_rw
+ * local.c (localcgi_popen_rw): deleted
+ (localcgi_post): rewrite using open_pipe_rw
+ * proto.h (open_pipe_rw): added
+ * search.c (migemor): initialized to NULL
+ (migemow): initialized to NULL
+ (migemo_pid): initialized to 0
+ (open_migemo): rewrite using open_pipe_rw
+
+ 2003-01-23 Hironori SAKAMOTO
+
+ * [w3m-dev 03675] x-face
+ * file.c (xface2xpm): use getImage()
+ (readHeader): check same file
+ (loadImageBuffer): rewrite
+ (lessopen_stream): shell_quote()
+
+ 2003-01-23 Hironori SAKAMOTO
+
+ * [w3m-dev 03674] -dump problem
+ * file.c (loadGeneralFile): return NULL when dump
+ * main.c (dump_source): deleted
+ (dump_head): deleted
+ (dupm_extra): deleted
+ (do_dump): added
+ (main): singal when dump
+
+ 2003-01-23 Yoshinobu Sakane
+
+ * [w3m-dev 03671] Re: config.param is clear when configure -help
+ * configure: test -f config.param
+
+ 2003-01-22 Hironori SAKAMOTO
+
+ * [w3m-dev 03665] imlib2 support (on X11)
+ * configure: X11 inline image with Imlib2
+ fix typo in fb/imlib2
+ * w3mimg/x11/x11_w3mimg.c: USE_IMLIB2
+ (x11_load_image): USE_IMLIB2
+ (x11_show_image): USE_IMLIB2
+ (x11_free_image): USE_IMLIB2
+ (x11_get_image_size): USE_IMLIB2
+
+ 2003-01-22 Hironori SAKAMOTO
+
+ * [w3m-dev 03664] config.param is clear when configure -help
+ * configure: config.param created after arg parsing
+
+ 2003-01-21 Fumitoshi UKAI
+
+ * map.c (follow_map_menu): if USE_IMAGE or MENU_MAP
+ * proto.h (follow_map_menu): ditto
+
+ 2003-01-21 Hironori SAKAMOTO
+
+ * [w3m-dev 03660] Re: fputs -> Strfputs
+ * Str.h (Strncmp_charp): paren
+ (Strncasecmp_charp): ditto
+ (Strinsert): ditto
+ (Strshrinkfirst): ditto
+ * display.c (disp_err_message): added
+ * file.c (loadGeneralFile): don't put function in macro arg
+ (saveBuffer): ditto
+ * frame.c (createFrameFile): ditto
+ * proto.h (disp_err_message): macro->function
+ * table.c (pushdata): if data is NULL, use ""
+ (suspend_or_pushdata): if line is NULL, use ""
+ * textlist.h (pushText): don't use (s) twice in a macro
+
+ 2003-01-21 Hironori SAKAMOTO
+
+ * [w3m-dev 03659] Can't download from SSL.
+ * istream.c (ISfileno): case IST_SSL
+
+ 2003-01-21 Hironori SAKAMOTO
+
+ * [w3m-dev 03658] Re: Other user can see local cookie.
+ * fm.h (rc_dir): init(NULL)
+ * rc.c (config_file): deleted
+ (init_rc): use rc_dir
+
+ 2003-01-21 Hironori SAKAMOTO
+
+ * [w3m-dev 03657] fputs -> Strfputs
+ * form.c (form_fputs_decode): use Strfputs()
+
+ 2003-01-19 Fumitoshi UKAI
+
+ * [w3m-dev 03655] Re: file.c:image_source when undef USE_IMAGE
+ * map.c (follow_map_menu): fix warnings
+
+ 2003-01-19 WATANABE Katsuyuki
+
+ * [w3m-dev 03654] file.c:image_source when undef USE_IMAGE
+ * file.c (readHeader): image_source ifdef USE_IMAGE
+ (loadGeneralFile): ditto
+ (uncompress_stream): ditto
+
+ 2003-01-19 Fumitoshi UKAI
+
+ * [w3m-dev 03653] SourceForge.net: 576032 w3m https crashes with OpenSSL-0.9.7
+ * istream.c (ssl_check_cert_ident): use sk_GENERAL_NAME_free()
+
+ 2003-01-18 Fumitoshi UKAI
+
+ * [w3m-dev 03652] Re: Debian bug #176981
+ * file.c (checkHeader): always remove_space
+ (loadGeneralFile): no need remove_space
+
+ 2003-01-18 Hironori SAKAMOTO
+
+ * [w3m-dev 03651] Debian bug #176981
+ * file.c (checkRedirection): added
+ (loadGeneralFile): check redirection
+ t_buf only is created when it is NULL
+ remove_space
+
+ 2003-01-18 Hironori SAKAMOTO
+
+ * [w3m-dev 03647] expandName() and expandPath()
+ * etc.c (openSecretFile): use expandPath
+ (expandName): rewrite
+ (file_to_url): use expandPath
+ * file.c (_doFileCopy): use expandPath
+ (doFileSave): use expandPath
+ * indep.c (expandPath): rewrite
+ * linein.c (inputLineHistSearch): use expandPath
+ (next_dcompl): use expandPath
+ (doComplete): use expandPath
+ * local.c (set_cgi_environ): rewrite
+ * mailcap.c (loadMailcap): use expandPath
+ * main.c (svBuf): use expandPath
+ (addDownloadList): use expandPath
+ * rc.c (init_rc): use expandPath
+ (rcFile): rewrite
+ (auxbinFile): use expandPath
+ (libFile): use expandPath
+ (etcFile): use expandPath
+ (helpFile): use expandPath
+ * url.c (loadMimeTypes): use expandPath
+ (loadURIMethods): use expandPath
+
+ 2003-01-18 Hironori SAKAMOTO
+
+ * [w3m-dev 03646] setup child process, local CGI
+ * etc.c (reset_signals): static
+ don't ignore SIGUSR1
+ (close_all_fds_except): static
+ DEV_NULL_PATH
+ (setup_child): added
+ (myExec): rewrite
+ (mySystem): rewrite
+ * file.c (readHeader): check image_source
+ (loadGeneralFile): check image_source
+ (doExternal): use setup_child
+ (_doFileCopy): use setup_child
+ (doFileSave): use setup_child
+ (uncompress_stream): check image_source
+ use setup_child
+ * image.c (getCharSize): no need stderr redirect
+ (openImgdisplay): use setup_child
+ (loadImage): use setup_child
+ (getImageSize): no need stderr redirect
+ * local.c (writeLocalCookie): check Local_cookie_file
+ (localcgi_popen_rw): added
+ (localcgi_popen_r): deleted
+ (localcgi_post): rewrite
+ (localcgi_get): deleted
+ * proto.h (localcgi_get): defined by localcgi_post
+ (reset_signals): deleted
+ (close_all_fds_except): deleted
+ (close_all_fds): deleted
+ (setup_child): added
+ * search.c (open_migemo): use setup_child, myExec
+ * w3mimgdisplay.c (main): use DEV_NULL_PATH
+
+ 2003-01-16 Hironori SAKAMOTO
+
+ * [w3m-dev 03644] Re: Other user can see local cookie.
+ * cookie.c (save_cookies): return if no_rc_dir
+ * etc.c (tmpf_base): add cookie
+ (tmpfname): use tmp_dir instead of rc_dir
+ * file.c (loadGeneralFile): cookie is not passed via URL
+ * fm.h (TMPF_COOKIE): incl
+ (MAX_TMPF_TYPE): incl
+ (no_rc_dir): added
+ (tmp_dir): added
+ (config_file): added
+ * local.c (Local_cookie_file): added
+ (writeLocalCookie): added
+ (setLocalCookie): dont set environment LOCAL_COOKIE
+ (localcgi_post): writeLocalCookie
+ (localcgi_get): writeLocalCookie
+ * main.c (config_filename): deleted
+ (cmd_loadURL): arg FormList
+ (main): rewrite config_file, rc
+ (ldhelp): no cookie in URL
+ (cmd_loadURL): arg FormList
+ (goURL0): cmd_loadURL change
+ (cmd_loadBuffer): cmd_loadURL change
+ (adBmark): cookie is posted
+ (follow_map): cmd_loadURL change
+ (linkMn): cmd_loadURL change
+ (reinit): init_rc change
+ * proto.h (create_option_search_table): deleted
+ (init_rc): no args
+ * rc.c (create_option_search_table): static
+ (init_rc): no args
+ rewrite
+ (optionpanel_src1): rewrite
+ (load_option_panel): html_quote
+ (panel_set_option): no_rc_dir
+ * w3mbookmark.c: rewrite
+ * w3mhelperpanel.c: rewrite
+ * scripts/dirlist.cgi.in: rewrite
+ * scripts/w3mhelp.cgi.in: rewrite
+ * scripts/w3mmail.cgi.in: rewrite
+ * scripts/multipart/multipart.cgi.in: rewrite
+
+ 2003-01-16 Fumitoshi UKAI
+
+ * file.c (loadGopherDir): convertLine RAW_MODE
+ * ftp.c (loadFTPDir): ditto
+
+ 2003-01-16 Hironori SAKAMOTO
+
+ * [w3m-dev 03642] Re: cleanup (don't close connection of news server)
+ * local.c (localcgi_post): localcgi_popen_r first
+
+ 2003-01-16 Hironori SAKAMOTO
+
+ * [w3m-dev 03641] Re: cleanup (don't close connection of news server)
+ * ftp.c (ftp_command): fix fwrite arg
+ * news.c (news_command): fix fwrite arg
+
+ 2003-01-16 Hironori SAKAMOTO
+
+ * [w3m-dev 03640] Re: cleanup (don't close connection of news server)
+ * anchor.c (_put_ahchor_news): always conv_str
+ (_put_anchor_all): always conv_str
+ * etc.c (close_all_fds): deleted
+ (close_all_fds_except): added, except fd=f is left open
+ * file.c (guess_filename): added
+ (UFhalfclose): added
+ (convertLine): cleanup_line if not raw mode
+ check uf
+ (readHeader): always convertLine
+ (loadGeneralFile): rewrite
+ (loadGopherDir): return Str, args change to ParsedURL and code
+ rewrite
+ (saveBuffer): always conv_str
+ (_doFileCopy): close_all_fds
+ (doFileSave): close_all_fds_except
+ (uncompress_stream): dup, close_all_fds_except
+ * form.c (form_fputs_decode): always conv_str
+ (input_textarea): convertLine
+ * frame.c (createFrameFile): convertLine
+ * ftp.c (loadFTPDir): arg code
+ rewrite
+ (readFTPDir): convertLine
+ * html.h (UFfileno): added
+ * image.c (loadImage): close_all_fds
+ * indep.h (RAW_MODE): added
+ * local.c (loadLocalDir): return Str
+ (dirBuffer): rewrite
+ (localcgi_popen_r): close_all_fds
+ * main.c (main): check SCM_LOCAL
+ print err_msg
+ * news.c (news_command): args cmd and arg
+ (news_quit): news_command
+ (openNewsStream): news_command
+ (readNewsgroup): deleted
+ (loadNewsgroup): added
+ (closeNews): added
+ * proto.h (loadGopherDir): update
+ (conv_str): define for no JP_CHARSET
+ (readFTPDir): deleted
+ (loadFTPDir): added
+ (readNewsgroup): deleted
+ (loadNewsgroup): added
+ (dirBuffer): deleted
+ (loadLocalDir): added
+ (close_all_fds): defined by close_all_fds_except
+ (close_all_fds_except): added
+
+ 2003-01-16 Hironori SAKAMOTO
+
+ * [w3m-dev 03639] Re: smb.cgi
+ * Bonus/2ch.cgi: change password handling
+ * Bonus/README: update
+ * Bonus/README.eng: ditto
+
+ 2003-01-12 qhwt@myrealbox.com
+
+ * [w3m-dev 03636] segfault in main.c
+ * main.c (main): check newbuf->currentURL.file
+
+ 2003-01-12 Fumitoshi UKAI
+
+ * Bonus/README.eng: sync with Bonus/README
+
+ 2003-01-12 Hironori SAKAMOTO
+
+ * [w3m-dev 03635] 2ch.cgi
+ * Bonus/2ch.cgi: added
+ * Bonus/README: update
+
+ 2003-01-12 Fumitoshi UKAI
+
+ * Bonus/README.eng: sync with Bonus/README
+
+ 2003-01-12 Hironori SAKAMOTO
+
+ * [w3m-dev 03634] smb.cgi
+ * Bonus/smb.cgi: added
+ * Bonus/README: update
+
+ 2003-01-12 Fumitoshi UKAI
+
+ * ftp.c (ftp_pasv): ftp_command response
+ (readFTPDir): masked declaration of realpathname
+
+ 2003-01-12 Hironori SAKAMOTO
+
+ * [w3m-dev 03633] Re: cleanup (don't close connection of news server)
+ * file.c (FTPhalfclose): deleted
+ (loadGeneralFile): closeFTP when doFileSave is done
+ (_doFileCopy): return int
+ (doFileMove): return int
+ (doFileSave): return int
+ * ftp.c: rewrite
+ * main.c (w3m_exit): disconnectFTP
+ * proto.h (_doFileCopy): return int
+ (doFileMove): return int
+ (doFileSave): return int
+ (openFTP): deleted
+ (openFTPStream): return InputStream
+ (closeFTP): no arg
+ (Ftpfclose): disconnectFTP
+ * url.c (openFTPstream): deleted
+
+ 2003-01-11 Fumitoshi UKAI
+
+ * fix compiler warnings
+ * html.h (UFclose): value computed but not used
+
+ 2003-01-11 Hironori SAKAMOTO
+
+ * [w3m-dev 03632] cleanup (don't close connection of news server)
+ * file.c (loadSomething): remove UFclose nntp:,news:
+ (loadFile): UFclose
+ (loadGeneralFile): always UFclose
+ * html.h (UFclose): only reset when ISclose ==0
+ * istream.c (ISclose): return int
+ (ISfileno): flag IST_UNCLOSE
+ * istream.h (ISclose): return int
+ (IST_UNCLOSE): added
+ * news.c (news_close): reset IST_UNCLOSE
+ (news_open): set IST_UNCLOSE
+
+ 2003-01-11 Hironori SAKAMOTO
+
+ * [w3m-dev 03631] display current form item
+ * form.c (form2str): rewrite
+ * istream.c (ssl_get_certificate): fix typo
+ * map.c (follow_map_panel): valign=top
+ (append_map_info): valign=top
+ (append_link_info): valign=top
+ (append_frame_info):
+ html_quote ssl_certificate
+ (page_info_panel): rewrite, html_quote
+
+ 2003-01-11 Fumitoshi UKAI
+
+ * doc/README.pre_form: update
+ * doc-jp/README.pre_form: ditto
+
+ 2003-01-11 Hironori SAKAMOTO
+
+ * [w3m-dev 03630] improved pre_form
+ * form.c (pre_form): add re_url, name
+ (add_pre_form): add name
+ rewrite
+ (loadPreForm): add "form"
+ (preFormUpdateBuffer): handle re_url
+
+ 2003-01-11 Hironori SAKAMOTO
+
+ * [w3m-dev 03629] delete tmp file
+ * etc.c (tempfname): always file to delete
+ * file.c (xface2xpm): no need fileToDelete
+ (readHeader): ditto
+ (loadGeneralFile): ditto
+ (loadHTMLBuffer): ditto
+ (loadHTMLString): ditto
+ (loadGopherDir): ditto
+ (loadImageBuffer): ditto
+ (doExternal): rewrite
+ (doFileSave): no need fileToDelete
+ (uncompress_stream): ditto
+ * fm.h (CurrentPid): added
+ * image.c (getImage): cache->touch to delete
+ * local.c (setLocalCookie): use CurrentPid
+ (localcgi_post): fileToDelete
+ * main.c (main): CurrentPid
+ (pipeBuf): no need fileToDelete
+ (query_from_followform): CurrentPid
+ (vmSrc): no need fileToDelete
+
+ 2003-01-11 Hironori SAKAMOTO
+
+ * [w3m-dev 03628] Re: Error occured while reset
+ * file.c (doExternal): bufp = NULL, return 1
+ (uncompress_stream): tempfname fileToDelete
+
+ 2003-01-11 Hironori SAKAMOTO
+
+ * [w3m-dev 03626] Re: relative URL
+ * url.c (parseURL2): copy if scheme is local or local-cgi
+
+ 2003-01-11 Hironori SAKAMOTO
+
+ * [w3m-dev 03625] keymap key SEARCH string
+ * main.c (srch): accept command argument
+ (reMark): accept command argument
+ * Bonus/google.cgi: added
+
+ 2003-01-11 Hironori SAKAMOTO
+
+ * [w3m-dev 03622] Re: Error occured while reset
+ * file.c (uncompress_stream): child process initialized
+ * terms.c (close_tty): close unless stdin,out,err
+ (reset_tty): flush_tty, close_tty
+ (write1): flush_tty
+ (refresh): flush_tty
+ (flush_tty): check ttyf
+
+ 2003-01-11 Hironori SAKAMOTO
+
+ * [w3m-dev 03620] -m option and header
+ * buffer.c (reshapeBuffer): fix reading from stdin
+ fix -m option
+ * display.c (redrawNLine): rewrite
+ (redrawLine): return l instead of l->next
+ (redrawLineImage): ditto
+ * file.c (loadFile): read header even if skip header
+ (loadGeneralFile): read header even if skip header
+ * fm.h (SkipHeader): added
+ * main.c (main): check whether reading from stdin
+ SkipHeader
+
+ 2003-01-10 Hironori SAKAMOTO
+
+ * [w3m-dev 03619] Re: Error occured while reset
+ * file.c (process_img): check image.ext
+ (HTMLlineproc2body): check image.ext
+ (loadImageBuffer): url, ext is in URLFile
+ * frame.c (unloadFrame): no need to push to fileToDelete
+ (copyFrame): no need to reset FB_TODELETE
+ (resetFrameElement): f_body->source, buf->sourcefile
+ (frame_download_source): buf->source
+ buf->sourcefile reset
+ * frame.h (FB_NOCACHE): deleted
+ (FB_TODELETE): deleted
+ * main.c (vmSrc): Currentbuf->sourcefile
+ need_reshape if images exist
+
+ 2003-01-09 Hironori SAKAMOTO
+
+ * [w3m-dev 03617] sourcefile when Content-Encoding: is specified.
+ * file.c (uncompress_stream): add src arg
+ (examineFile): change uncompress_stream
+ (loadGeneralFile): change uncompress_stream
+ (doExternal): src
+ (uncompress_stream): ext
+ tmpfile with same ext
+
+ 2003-01-09 Hironori SAKAMOTO
+
+ * [w3m-dev 03616] Re: data: URL scheme
+ * file.c (loadGeneralFile): check SCM_DATA
+ (loadImageBuffer): newBuffer()
+ * html.h (SCM_DATA): added
+ * indep.c (url_unquote): deleted
+ (Str_url_unquote): renamed from Str_form_unquote
+ + is decoded is_form only
+ * indep.h (url_unquote): deleted
+ (Str_url_unquote): added
+ (Str_form_unquote): define by Str_url_unquote
+ * main.c (followA): file_unquote
+ (cmd_loadURL): file_unquote
+ * url.c (DefaultPort): add for data:
+ (schemetable): add "data"
+ (DefaultFile): SCM_FTPDIR
+ (parseURL): scheme copied from current
+ (parseURL2): SCM_DATA
+ check SCM_FTP, SCM_FTPDIR
+ (_parsedURL2Str): add data in scheme_str
+ handle SCM_DATA
+ SCM_FTPDIR
+ (openURL): file_unquote
+ handle SCM_DATA
+
+ 2003-01-08 Hironori SAKAMOTO
+
+ * [w3m-dev 03611] relative URL
+ * news.c (openNewsStream): don't skip '/' for nntp:
+ (readNewsgroup): cleanup
+ * url.c (parseURL): don't copy user & password
+ (parseURL2): fix for group, don't copy user & password
+
+ 2003-01-07 Fumitoshi UKAI
+
+ * fix build warnings
+ * url.c (parseURL2): fix comparison between pointer and integer
+ * news.c (readNewsgroup): variable `scheme',`group',`list' might be clobbered by `longjmp' or `vfork'
+
+ 2003-01-07 Hironori SAKAMOTO
+
+ * [w3m-dev 03610] Re: news:
+ * anchor.c (_put_anchor_news): check '<'
+ (reAnchorNewsheader): added
+ * file.c (loadSomething): Subject: as buffername
+ (checkHeader): check buf->document_header
+ (loadGeneralFile): reAnchorNewsheader
+ * html.h (SCM_NNTP_GROUP): added
+ * main.c (main): delete USE_NNTP in switch (newbuf->real_scheme)
+ (chkNMIDBuffer): lowercase in url_like_pat
+ * news.c (add_news_message): add scheme, group as arg
+ (openNewsStream): check SCM_NNTP_GROUP
+ check current_news.host
+ (readNewsgroup): rewrite to support nntp:,news: extension
+ * proto.h (reAnchorNewsheader): added
+ * url.c (DefaultPort): add 119 for nntp group
+ (parseURL2): rewrite to support nntp:,news: extension
+ (_parsedURL2Str): add for SCM_NNTP_GROUP
+ (openURL): rewrite to support nntp:,news: extension
+
+ 2002-12-28 Fumitoshi UKAI
+
+ * fix build errors
+ * display.c (make_lastline_message): fix error for undef JP_CHARSET
+ * news.c (readNewsgroup: `code' always required
+
+ * gcc -Wall -Werror clean
+ * file.c (loadHTMLstream): unused variable `p'
+ * news.c (news_command): unused variable `c'
+ (news_open): unused variable `tmp'
+ (readNewsgroup): volatile page, qgroup, flag, start, end
+ uninitialized variable `page'
+ * url.c (openURL): unused variable `fw', `r', `stream'
+
+ 2002-12-28 Fumitoshi UKAI
+
+ * rc: nntpserver, nntpmode, max_news
+
+ 2002-12-28 Hironori SAKAMOTO
+
+ * [w3m-dev 03608] news:
+ * XMakefile (LSRCS): add news.c
+ (LOBJS): add news.o
+ * file.c (loadSOmething): don't UFclose() for nntp/news
+ (readHeader): remove . at beginning of line for news
+ img link to file:
+ (loadGeneralFile): add SCM_NEWS_GROUP
+ don't UFclose() for nntp/news
+ (loadHTMLstream): . line check for news
+ (loadBuffer): . line check for news
+ * fm.h (NNTP_server): added
+ (NNTP_mode): added
+ (MaxNewsMessage): added
+ * html.h (SCM_NEWS_GROUP): added
+ * main.c (main): NNTP_server or NNTPSERVER
+ NNTP_mode or NNTPMODE
+ add SCM_NEWS_GROUP
+ (followA): remove news:..@.. check
+ (cmd_loadURL): remove news:...@.. check
+ (w3m_exit): disconnectNews
+ * proto.h (openNewsStream): added
+ (readNewsgroup): added
+ (disconnectNews): added
+ * rc.c (CMT_NNTP_SERVER): added
+ (CMT_NNTP_MODE): added
+ (CMT_MAX_NEWS): added
+ (params9): add nntpserver, nntpmode, max_news
+ * url.c (DefaultPort): add 119 for news group
+ (parseURL2): news:..@... is SCM_NEWS_GROUP
+ (_parsedURL2Str): add news for SCM_NEWS_GROUP
+ (openURL): cleanup SCM_NEWS
+ add SCM_NEWS_GROUP
+ * news.c: added
+
+ 2002-12-28 Hironori SAKAMOTO
+
+ * [w3m-dev 03607] mymktime: time zone support
+ * etc.c (get_zone): added
+ (mymktime): parse timezone
+
+ 2002-12-28 Hironori SAKAMOTO
+
+ * [w3m-dev 03606] Re: clean up displayBuffer()
+ * main.c (followA): B_FORCE_REDRAW
+ (follow_map): ditto
+
+ 2002-12-27 Hironori SAKAMOTO
+
+ * [w3m-dev 03604] http response code and content-type
+ * file.c (loadGeneralFile): don't guessContentType if http errors
+
+ 2002-12-26 Hiroyuki Ito
+
+ * [w3m-dev 03602] Re: w3mimgdisplay core dump
+ * w3mimgdisplay.c (DrawImage): check load_image, imageBuf[n].pixmap
+ * w3mimg/fb/fb_w3mimg.c (w3mfb_show_image): check img->pixmap
+ * w3mimg/x11/x11_w3mimg.c (x11_show_image): check img->pixmap
+
+ 2002-12-26 Hironori SAKAMOTO
+
+ * [w3m-dev 03601] Re: meta refresh
+ * main.c (LastEvent): added
+ (pushEvent): add to LastEvent
+
+ 2002-12-26 Hironori SAKAMOTO
+
+ * [w3m-dev 03600] Re: meta refresh
+ * main.c (main): move add_download_list
+
+ 2002-12-25 Hironori SAKAMOTO
+
+ * [w3m-dev 03598] restore cursor when download list panel is updated.
+ * main.c (stopDownload): delete->replace
+ (ldDL): use DownloadListBuffer()
+
+ 2002-12-25 Hironori SAKAMOTO
+
+ * [w3m-dev 03597] Re: meta refresh
+ * main.c (Event): next, linked list
+ (N_EVENT_QUEUE): deleted
+ (eventQueue): deleted
+ (n_event_queue): deleted
+ (CurrentEvent): added
+ (main): event processing, add CurrentEvent linked list
+ (pushEvent): add Event to CurrentEvent
+ (SigAlarm): Currentbuf->event
+ * proto.h (pushEvent): rename args
+
+ 2002-12-25 Hiroaki Shimotsu
+
+ * [w3m-dev 03596] LIST
+ * anchor.c (link_list_panel): check internal
+
+ 2002-12-25 Hironori SAKAMOTO
+
+ * [w3m-dev 03595] tolower, toupper
+ * Str.c (Strlower): TOLOWER
+ (Strupper): TOUPPER
+ * backend.c: delete ctype.h
+ * etc.c (gethtmlcmd): TOLOWER
+ * file.c (readHeader): TOLOWER
+ (checkOverWrite): TOLOWER
+ (guess_charset): TOLOWER
+ * ftp.c: delete ctype.h
+ * indep.c (strcasecmp): TOLOWER
+ (strncasecmp): TOLOWER
+ (strcasematch): TOLOWER
+ * istream.c: include myctype.h
+ (ssl_get_certificate): TOLOWER
+ * mailcap.c (mailcapMatch): TOLOWER
+ * main.c (_quitfm): TOLOWER
+ * menu.c (accesskey_menu): TOLOWER
+ * mimehead.c: include myctype.h
+ (decodeWord): TOUPPER
+ * mktable.c: delete ctype.h, include myctype.h
+ (main): IS_SPACE
+ * myctype.h: delete ctype.h
+ (TOLOWER): added
+ (TOUPPER): added
+ * parsetagx.c (parse_tag): TOLOWER
+ * rc.c (str_to_bool): TOLOWER
+ (str_to_color): TOLOWER
+ * regex.c: delete ctype.h, include myctype.h
+ (TOLOWER): added
+ (TOUPPER): added
+ (regmatch1): TOLOWER
+ (matchWhich): TOLOWER, TOUPPER
+
+ 2002-12-22 Fumitoshi UKAI
+
+ * mimehead.c (decodeWord): don't use toupper() (requires ctype.h)
+
+ 2002-12-22 ABE Yuji
+
+ * [w3m-dev 03594] mime decode with encoding named 'b' & 'q'
+ * mimehead.c (decodeWord): toupeer(method)
+
+ 2002-12-22 Fumitoshi UKAI
+
+ * file.c (discardline): not used
+
+ 2002-12-22 Hironori SAKAMOTO
+
+ * [w3m-dev 03593] Re: segmentation fault when exist after <img>
+ * file.c (cur_title): added
+ (save_obuf): deleted
+ (process_title): added
+ (process_n_title): added
+ (feed_title): added
+ (HTMLtagproc1): rewrite HTML_TITLE, HTML_N_TITLE,
+ HTML_TITLE_ALT, HTML_N_HEAD, HTML_HEAD
+ (HTMLlineproc0): check RB_TITLE
+ (completeHTMLstream): add RB_TITLE
+ (loadHTMLstream): initialize cur_title
+
+ 2002-12-21 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03590] segmentation fault when <title> exist after <img>
+ * file.c (save_line): deleted
+ (save_prevchar): deleted
+ (save_obuf): added
+ (HTMLtagproc1): bcopy save_obuf
+
+ 2002-12-20 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03588] include time.h in ftp.c
+ * ftp.c: include <time.h>
+
+ 2002-12-19 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03583] w3mman
+ * scripts/w3mman/README: W3MMAN_W3M, W3MMAN_MAN
+ * scripts/w3mman/w3mman.1.in: add ENVIRONMENT
+ * scripts/w3mman/w3mman.in: $ENV{'W3MMAN_W3M'}, $ENV{'W3MMAN_MAN'}
+ * scripts/w3mman/w3mman2html.cgi.in: $ENV{'W3MMAN_MAN'}
+ hyphenation
+
+ 2002-12-19 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03582] add config options graphic_char and use_proxy
+ * NEWS: rc: graphic_char, use_proxy
+ * fm.h (Do_no_use_proxy): macro using use_proxy
+ (use_proxy): added
+ (no_graphic_char): deleted
+ (UseGraphicChar): added
+ * main.c (main): UseGraphicChar, use_proxy
+ * rc.c (CMT_GRAPHIC_CHAR): added
+ (CMT_USE_PROXY): added
+ (params1): graphic_char
+ (params4): use_proxy
+ * terms.c (graph_ok): UseGraphicChar
+
+ 2002-12-19 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03581] MARK_URL, MARK_WORD
+ * main.c (chkWORD): accept ()[]{}&|;*?$ as anchor
+
+ 2002-12-19 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03580] Re: clean up displayBuffer()
+ * main.c (main): force redraw
+
+ 2002-12-19 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03579] Re: clean up displayBuffer()
+ * display.c (displayBuffer): re calcTabPos() when force or image redraw
+ * main.c (_mark): force redraw
+ (reinit): redraw image
+ * search.c (backwardSearch): found_last
+
+ 2002-12-19 Fumitoshi UKAI <ukai@debian.or.jp>
+
+ * [w3m-dev 03584] Re: meta refresh
+ * main.c (DefaultAlarm): fix initialize value
+
+ 2002-12-19 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03578] meta refresh
+ * file.c (getMetaRefreshParam): do nothing if refresh_interval < 0
+ (HTMLtagproc1): rewrite refresh
+ (HTMLlineproc2body): add HTML_META
+ * fm.h (BP_RELOAD): deleted
+ (Buffer): add event
+ (AL_IMPLICIT_DONE): deleted
+ (AL_ONCE): deleted
+ (AL_RESTORE): deleted
+ (AlarmEvent): added
+ * main.c (AlarmEvent): deleted
+ (PrevAlarm): deleted
+ (DefaultAlarm): added
+ (CurrentAlarm): point to DefaultAlarm
+ (main): CurrentKeyData, CurrentCmdData
+ handle Currentbuf->event
+ (SigAlarm): CurrentAlarm is pointer
+ (copyAlarmEvent): deleted
+ (setAlarm): setAlarmEvent pass &DefaultAlarm
+ (setAlarmEvent): arg event
+ (ldDL): no BP_RELOAD
+ * proto.h (setAlarmEvent): arg event
+
+ 2002-12-18 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03577] incorrect table width
+ * table.c (dv2sv): fix move direction
+ (set_integered_width): ditto
+ (check_table_height): ditto
+ (feed_table_tag): ditto
+
+ 2002-12-17 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03576] Re: news support
+ * anchor.c (_put_anchor_news): convert to document code and quote
+ (_put_anchor_all): convert to document code
+ * main.c (chkNMIDBuffer): change url_like_pat
+
+ 2002-12-15 Fumitoshi UKAI <ukai@debian.or.jp>
+
+ * NEWS: rc: preserve_timestamp
+
+ 2002-12-15 Takahashi Youichirou <nikuq@hk.airnet.ne.jp>
+
+ * [w3m-dev 03574] Re: preserve timestamp
+ * ftp.c (getFtpModtime): don't call localtime,gettime in same expr
+
+ 2002-12-15 Fumitoshi UKAI <ukai@debian.or.jp>
+
+ * [w3m-dev 03573] Re: Bug#172851: w3m: In form, takes hostname as baseref for relative URI action
+ * url.c (parseURL): if empty is URL, base URL is used
+
+ 2002-12-15 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03571] base=0 -> 10 in toNumber()
+ * parsetagx.c (toNumber): strtol base=10
+
+ 2002-12-15 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03570] meta tag in frame
+ * frame.c (createFrameFile): fix meta equiv parse in frame
+
+ 2002-12-15 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03569] Re: preserve timestamp
+ * file.c (loadGeneralFile): PresetveTimestamp
+ (_doFileCopy): is_pipe, PreserveTimestamp
+ (doFileSave): PreserveTImestamp
+ * fm.h (PreserveTimestamp): added
+ * rc.c (CMT_PRESERVE_TIMESTAMP): added
+ (params3): add preserve_timestamp
+
+ 2002-12-15 Takahashi Youichirou <nikuq@hk.airnet.ne.jp>
+
+ * [w3m-dev 03568] Re: preserve timestamp
+ * etc.c (USE_COOKIE): moved
+ * file.c (utime.h): include
+ (setModtime): added
+ (loadGeneralFile): set f.modtime
+ (_doFileCopy): setModtime()
+ (doFileSave): setModtime()
+ * ftp.c (getFtpModtime): added
+ (openFTP): pass URLFile, set modtime
+ * html.h (URLFile): add modtime
+ * proto.h (openFTP): arg URLFile *uf
+ (mymktime): always
+ * url.c (init_stream): initialize modtime
+ (openFTPStream): pass URLFile
+ (openURL): openFTPStream
+
+ 2002-12-13 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03567] default keybinding
+ * doc-jp/keymap.default (C-q,C-t,(,),+,-,D,L,T,m,r,{,|,},
+ M-c,M-k,M-l,M-m,M-o,M-t): assign
+ * doc/keymap.default: ditto
+ * keybind.c: ditto
+ * doc-jp/keymap.lynx (C-q,C-t,C-u,(,),,,.,;,D,L,T,W,[,],
+ m,r,w,{,|,},M-<,M->,M-W,M-c,M-g,
+ M-k,M-l,M-m,M-n,M-o,M-p,M-t,M-w): assign
+ * doc/keymap.lynx: ditto
+ * keybind_lynx.c: ditto
+ * doc-jp/menu.default (Main): Select,SelectTab,TAB_LINK
+ * doc/menu.default: ditto
+
+ 2002-12-13 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03566] configure prefix
+ * configure: add X prefix for expr args
+
+ 2002-12-13 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03564] clean up displayBuffer()
+ * display.c (delayed_msg): static
+ (drawAnchorCursor): static
+ (redrawBuffer): define
+ (redrawNLine): static
+ (redrawLine): static
+ (redrawLineRegion): static
+ (do_effects): static
+ (do_color): static
+ (make_lastline_link): added
+ (make_lastline_message): added
+ (displayBuffer): rewrite with make_lastline_message()
+ (drawAnchorCursor0): added
+ (drawAnchorCursor): added
+ * main.c (main): remove onA()
+ (keyPressEventProc): remove onA()
+ (disp_srchresult): static
+ disp_message TRUE
+ (isrch): remove onA()
+ (srch): displayBuffer
+ remove onA()
+ (srch_nxtprv): remove onA()
+ (pipeBuf): disp_message TRUE
+ (pipesh): disp_message TRUE
+ (readsh): disp_message TRUE
+ (_mark): dispBuffer
+ (_followForm): break, always dispBuffer
+ (drawAnchorCursor0): deleted
+ (drawAnchorCursor): deleted
+ (onA): deleted
+ (anchorMn): delete onA()
+ (svBuf): displayBuffer B_NORMAL
+ (reload): disp_err_message TRUE
+ displayBuffer
+ (rFrame): displayBuffer
+ (invoke_browser): displayBuffer
+ (extbrz): disp_err_message TRUE
+ (process_mouse): onA -> displayBuffer
+ (movMs): delete onA()
+ (menuMs): onA -> displayBuffer
+ (closeTMs): disp_message TRUE
+ (wrapToggle): disp_message TRUE
+ (execdict): disp_message TRUE
+ (SigAlarm): displayBuffer, delete onA
+ (reinit): displayBuffer
+ * map.c (getCurrentMapLabel): deleted
+ (retrieveCurrentMapArea): added
+ * proto.h (redrawBuffer): deleted
+ (redrawNLine): deleted
+ (redrawLine): deleted
+ (redrawLineRegion): deleted
+ (do_effects): deleted
+ (do_color): deleted
+ (message_list): deleted
+ (getCurrentMapLabel): deleted
+ (retrieveCurrentMapArea): added
+
+ 2002-12-13 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03563] Directory Traversal Vulnerabilities in FTP Clients
+ * file.c (guess_save_name): pass guess_filename
+
+ 2002-12-13 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03562] #undef BUFINFO
+ * config.h.dist (BUFINFO): undef
+ * configure (use_bufinfo): n
+ * main.c (saveBufferInfo): ifdef USE_BUFINFO
+ * proto.h (reloadBuffer): if 0
+ (saveBufferInfo): ifdef USE_BUFINFO
+
+ 2002-12-12 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03559] Re: use select instead of signal for loading images
+ * fm.h (Buffer): add image_loaded
+ * image.c (W3M_SIGIMG): deleted
+ (image_lock): deleted
+ (need_load_image): deleted
+ (load_image_handler): deleted
+ (load_image_next): deleted
+ (getAllImage): check image_loaded
+ (loadImage): delete image_lock
+ delete IMG_FLAG_NEXT
+ * main.c (main): check image_loaded
+ * proto.h (sleep_till_anykey): return int
+ * terms.c (sleep_till_anykey): return int
+
+ 2002-12-12 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03558] long title is displayed over tab region
+ * display.c (redrawNLine): check l < 0
+ use addnstr
+
+ 2002-12-11 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03554] Re: Undo/Redo
+ * doc/README.func (REDO): added
+ (UNDO): added
+ * doc-jp/README.func (REDO): added
+ (UNDO): added
+ * scripts/w3mhelp.cgi.in: (Page/Cursor motion): add undoPos, redoPos
+
+ 2002-12-11 Fumitoshi UKAI <ukai@debian.or.jp>
+
+ * NEWS: func: REDO, UNDO
+
+ 2002-12-11 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03553] Undo/Redo
+ * fm.h (Buffer): add undo
+ (BufferPos): added
+ * funcname.tab (REDO): added
+ (UNDO): added
+ * main.c (save_buffer_position): added
+ (main): save_buffer_position
+ (resetPos): added
+ (undoPos): added
+ (redoPos): added
+ * proto.h (undoPos): added
+ (redoPos): added
+
+ 2002-12-11 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03552] Re: link list
+ * menu.c (accesskey_menu): check hseq
+ (list_menu): check hseq
+
+ 2002-12-11 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03551] Re: External URI loader
+ * file.c (loadGeneralFile): fix SCM_UNKNONWN
+
+ 2002-12-10 Fumitoshi UKAI <ukai@debian.or.jp>
+
+ * NEWS: func: LIST, LIST_MENU, MOVE_LIST_MENU
+
+ 2002-12-10 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03549] link list
+ * anchor.c (addMultirowsImg): add a->slave
+ (getAnchorText): arg AnchorList *al
+ (link_list_panel): added
+ * funcname.tab (LIST): added
+ (LIST_MENU): added
+ (MOVE_LIST_MENU): added
+ * main.c (anchorMn): added
+ (accessKey): use anchorMn()
+ (listMn): added
+ (movlistMn): added
+ (linkLst): added
+ * map.c (searchMapList): not static
+ * menu.c (accesskey_menu): pass AnchorList to getAnchorText()
+ (lmKeys): added
+ (lmKeys2): added
+ (nlmKeys): added
+ (nlmKeys2): added
+ (lmGoto): added
+ (lmSelect): added
+ (list_menu): added
+ * proto.h (linkLst): added
+ (listMn): added
+ (movlistMn): added
+ (list_menu): added
+ (searchMapList): added
+ (getAnchorText): arg AnchorList *al
+ (link_list_panel): added
+ * doc/README.func (LIST): added
+ (LIST_MENU): added
+ (MOVE_LIST_MENU): added
+ * doc-jp/README.func (LINK_MENU): fix message
+ (LIST): added
+ (LIST_MENU): added
+ (MOVE_LIST_MENU): added
+ * scripts/w3mhelp.cgi.in (Page/Cursor motion): add movlistMn
+ (Hyperlink operation): add linkLst linkMn
+
+ 2002-12-10 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03548] close anchor before <img align=...>
+ * file.c (process_img): use div_int
+ (process_hr): use div_int
+ (process_idattr): don't close_anchor
+ (CLOSE_A): added
+ (HTMLtagproc1): </p> close anchor
+ <dl>,<ul>,<ol>,<blockquote>,<li>,<dt>,<dd> close anchor
+ <noframes> close anchor
+ <pre> close anchor
+ <center> close anchor
+ <div> close anchor
+ add DIV_INT
+ <form> close anchor
+ * html.c (TagMAP): add div_int
+ * html.h (HTML_DIV_INT): added
+ (HTML_N_DIV_INT): added
+ * tagtable.tab (div_int): added
+ (/div_int): added
+
+ 2002-12-10 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03544] Can't display "1&2" in table
+ * file.c (HTMLlineproc0): continue -> R_ST_NORMAL
+
+ 2002-12-10 Fumitoshi UKAI <ukai@debian.or.jp>
+
+ * file.c (loadGeneralFile): missing `{', fix indent for SCM_UNKNOWN
+ * main.c (set_buffer_environ): unused variables `prev_col'
+
+ 2002-12-10 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03543] External URI loader (Debian closes: Bug#169962)
+ * file.c (loadGeneralFile): rewrite SCM_UNKNOWN
+
+ 2002-12-10 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03542] news support
+ * file.c (loadGeneralFile): NNTP as well as NEWS
+ * indep.c (url_unquote_char): check % hex hex
+ (url_unquote): unquote except \0, \n, \r
+
+ 2002-12-10 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03541] Re: W3M_LINE_NO / W3M_CURRENT_COLUMN
+ * main.c (goLine): check searchKeyData()
+ (set_buffer_environ): W3M_CURRENT_*
+
+ 2002-12-07 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03536] <del>, <s>
+ * file.c (HTMLtagproc1): <s>..</s> is [S:...:S]
+ (HTMLtagproc0): <del> will delete <table>
+ * fm.h (RB_S): added
+ * html.c (TagMAP): <s>,</s>
+ move <internal>, </internal>
+ * html.h (HTML_S): added
+ (HTML_N_S): added
+ (HTML_INTERNAL): renumed
+ (HTML_N_INTERNAL): ditto
+ (MAX_HTMLTAG): add 2
+ * rc.c (CMT_DISP_INS_DEL): update
+ * table.c (feed_table_tag): add HTML_S, HTML_N_S
+ * table.h (TBLM_S): added
+ (TBLM_ANCHOR): renum
+ * tagtable.tab: (strike, s): HTML_S
+ (/strike, /s): HTML_N_S
+
+ 2002-12-07 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03535] close anchor, quote <
+ * file.c (HTMLtagproc1): close_anchor
+ * frame.c (createFrameFile): quote <
+
+ 2002-12-07 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03534] cleanup file.c
+ * file.c (HTMLlineproc2body): cleanup
+
2002-12-06 Fumitoshi UKAI <ukai@debian.or.jp>
! * version.c.in: w3m/0.3.2.2+cvs
! * NEWS: 0.3.2.2
2002-12-06 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * security fix
* file.c (process_img): html_quote()
!
! 2002-12-06 Takahashi Youichirou <nikuq@hk.airnet.ne.jp>
!
! * [w3m-dev 03530] save history
! * history.c (saveHistory): save tmpfile and rename
!
! 2002-12-06 Fumitoshi UKAI <ukai@debian.or.jp>
!
! * NEWS: func: ACCESSKEY, LINK_MENU
!
! 2002-12-06 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03529] Support of title, accesskey of anchor
! * anchor.c (putAnchor): arg title, key
! initialize slave
! (registerHref): arg title, key
! (registerName): title = NULL, key = '\0'
! (registerForm): title = NULL, key = '\0'
! (_put_anchor_news): title = NULL, key = '\0'
! (_put_anchor_all): title = NULL, key = '\0'
! (addMultirowsImg): register title, accesskey
! (addMultirowsForm): title = NULL, key = '\0'
! (getAnchorText): added
! * display.c (displayBuffer): show title if any
! * file.c (set_breakpoint): use bcopy
! (back_to_breakpoint): use bcopy
! (flushline): s/anchor/anchor.url/
! s/anchor_hseq/anchor.hseq/
! s/anchor_target/anchor.target/
! add anchor.*
! (close_effect0): s/anchor/anchor.url/
! s/anchor_hseq/anchor.hseq/
! (close_anchor): use bzero
! (process_img): ATTR_TITLE,
! (HTMLtagproc1): s/anchor/anchor.url/
! target, referer, title, accesskey, hseq
! (HTMLlineproc2body): ATTR_TITLE, ATTR_ACCESSKEY
! (init_henv): use bzero
! * fm.h (Anchor): add title, accesskey, slave
! (Breakpoint): use Anchor
! (struct readbuffer): use Anchor
! * funcname.tab (ACCESSKEY): added
! (LINK_MENU): added
! * html.c (ALST_A): add ATTR_TITLE, ATTR_ACCESSKEY
! (ALST_IMG): add ATTR_TITLE
! (ALST_IMG_ALT): add ATTR_TITLE
! (AttrMAP): add accesskey, renum
! * html.h (ATTR_ACCESSKEY): added
! (ATTR_*): renum 50->60
! * main.c (linkMn): added
! (accessKey): added
! * menu.c (LinkMenu): deleted
! (LinkV): deleted
! (initLinkMenu): deleted
! (lmGoURL): deleted
! (popupMenu): delete initLinkMenu()
! (initMenu): delete Link
! (link_menu): added
! (accesskey_menu): added
! * proto.h (linkMn): added
! (link_menu): added
! (accessKey): added
! (accesskey_menu): added
! (putAnchor): arg title, key
! (registerHref): arg title, key
! (registerImg): arg title
! (getAnchorText): added
! * doc/README.func (ACCESSKEY): added
! (LINK_MENU): added
! * doc-jp/README.func (ACCESSKEY): added
! (LINK_MENU): added
! * scripts/w3mhelp.cgi.in (Hyperlink operation): add linkMn accessKey
!
! 2002-12-06 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03528] area without alt
! * map.c (getCurrentMapLabel): when a->alt is empty
!
! 2002-12-06 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03527] fix frame.c
! * frame.c (createFrameFile): move need_reconstruct
!
! 2002-12-06 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03526] Re: fix doc*/README.func, w3mhelp.cgi.in
! * scripts/w3mhelp.cgi.in: (load_keymap):
! always upcase ESC,SPC,TAB,DEL,UP,DOWN,RIGHT,LEFT
!
! 2002-12-05 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03525] Re: sync option
! * func.c (initKeymap): delete check force, keymap_initialized
!
! 2002-12-05 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03524] fix doc*/README.func, w3mhelp.cgi.in
! * doc/README.func (REINIT): added
! * doc-jp/README.func (REINIT): added
! * scripts/w3mhelp.cgi.in (Page/Cursor motion):
! add moveR1 movL1 movD1 movU1 ldown1 lup1
! (File/Stream operation): add pipeBuf
! (Miscellany): add dispVer execCmd reinit
! (load_keymap): rewrite
! (norm_key): rewrite
!
! 2002-12-05 Fumitoshi UKAI <ukai@debian.or.jp>
!
! * NEWS: rc: display_ins_del
!
! 2002-12-05 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03523] Re: del/ins
! * file.c (HTMLtagproc1): check displayInsDel, RB_DEL
! * fm.h (RB_DEL): added
! (displayInsDel): added
! * rc.c (CMT_DISP_INS_DEL): added
! (display_ins_del): added
! * table.c (feed_table_tag): check displayInsDel, TBLM_DEL
! * table.h (TBLM_DEL): added
! (TBLM_ANCHOR): renum
! (struct table_mode): unsigned int pre_mode
!
! 2002-12-05 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03522] newline around <pre>..</pre>
! * file.c (HTMLtagproc1): break before <pre>/after </pre> if necessary
!
! 2002-12-05 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03521] sync option
! * display.c (redrawNLine): calcTabPos()
! * func.c (initKeymap): return if keymap_initialized
! * main.c (calcTabPos): no more static
! (main): move sync_with_option, initCookie, setLocalCookie
! move backend
! move initKeymap, initMouseAction, initMenu
! remove calcTabPos
! add displayBuffer
! (numTab): static
! (deleteTab): delete calcTabPos
! (moveTab): delete calcTabPos
! * proto.h (calcTabPos): added
!
! 2002-12-05 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev-en 00841] Re: w3m segfaults if the terminal is not writable
! * terms.c (reset_tty): don't close stderr
!
! 2002-12-04 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03516] Re: 2 stroke keybinding
! * func.c (keymap_initialized): initialized to FALSE
! (setKeymap): push KeyData
!
! 2002-12-04 Fumitoshi UKAI <ukai@debian.or.jp>
!
! * NEWS: 2 stroke keybinding
! func: MULTIMAP
!
! 2002-12-04 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03515] 2 stroke keybinding
! * func.c (setKeymap): add map
! K_MULTI support
! (getKey2): added
! (getKey): rewrite to use getKey2()
! * func.h (K_MULTI): added
! (MULTI_KEY): added
! * funcname.tab (MULTIMAP): added
! * main.c (escKeyProc): added
! (escmap): rewrite to use escKeyProc()
! (escbmap): rewrite to use escKeyProc()
! (escdmap): rewrite to use escKeyProc()
! (multimap): added
! * proto.h (multimap): added
!
! 2002-12-04 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03514] Effect of tab title
! * display.c (redrawNLine): rewrite, do without clrtoeolx()
!
! 2002-12-04 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03512] Re: HTML parser
! * table.c (feed_table_tag): HTML_N_SELECT, HTML_N_CAPTION
!
! 2002-12-04 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03510] waiting time when cookie was rejected.
! * file.c (readHeader): display cookie warnings for only 1 sec
!
! 2002-12-04 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03509] HTML parser
! * file.c (close_textarea): delete
! (HTMLtagproc1): rewrite
! delete HTML_EOL
! move HTML_LISTING, HTML_N_LISTING
! add HTML_PRE_PLAIN, HTML_N_PRE_PLAIN
! add HTML_PLAINTEXT
! end_tag
! (HTMLlineproc0): s/str/line/
! rewrite
! (completeHTMLstream): </textarea> if necessary
! * fm.h (struct readbuffer): delete ignore_tag
! add end_tag
! (RB_XMPMODE): deleted
! (RB_LSTMODE): deleted
! (RB_SCRIPT): added
! (RB_STYLE): added
! (RB_*): renumber
! (R_ST_EOL): added
! (R_ST_*): renumber
! (ST_IS_TAG): check R_ST_EOL
! * form.c (form_fputs_decode): remove <eol> handling
! * frame.c (newFrame): remove_space()
! (CASE_TABLE_TAG): added
! (createFrameFile): rewrite
! * html.c (TagMAP): delete eol
! add pre_plain, /pre_plain
! * html.h (HTML_EOL): deleted
! (HTML_PRE_PLAIN): added
! (HTML_N_PRE_PLAIN): added
! * table.c (visible_length): rewrite
! (visible_length_plain): added
! (maximum_visible_length_plain): added
! (do_refill): R_ST_EOL
! (table_close_select): end_tag
! (table_close_textarea): end_tag
! (TAG_ACTION_PLAIN): added
! (feed_table_tag): rewrite
! (feed_table): rewrite
! * table.h (TBLM_*) reassign
! (struct table_mode): delete ignore_tag
! add end_tag
! * tagtable.tab (eol): deleted
! (pre_plain): added
! (/pre_plain): added
!
! 2002-12-03 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03505] Re: coredump when ssl error
! * file.c (loadGeneralFile): term_raw(), SIGINT before retry
!
! 2002-12-03 AIDA Shinra <aida-s@jcom.home.ne.jp>
!
! * [w3m-dev 03504] coredump when ssl error
! * file.c (loadGeneralFile): term_raw, SIGINT
!
! 2002-12-03 Fumitoshi UKAI <ukai@debian.or.jp>
!
! * remove ununsed variables
! * file.c (addLink): unused variable `t'
! * menu.c (lmGoURL): unused variable `pu'
!
! 2002-12-03 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03501] link tag support
! * buffer.c (reshapeBuffer): initialize formlist, linklist,
! maplist, hmarklist, imarklist
! * file.c (addLink): added
! (HTMLlineproc2body): add HTML_LINK
! (loadHTMLstream): use HTMLlineproc0 not in R_ST_NORMAL
! (reloadBuffer): initialize linklist, maplist,
! hmarklist, imarklist
! * fm.h (LINK_TYPE_NONE): added
! (LINK_TYPE_REL): added
! (LINK_TYPE_REV): added
! (LinkList): added
! (Buffer): add linklist
! * html.c (ALST_LINK): added
! (TagMAP): add link
! (AtrMAP): add rel, rev, title
! * html.h (HTML_LINK): added
! (ATTR_REL): added
! (ATTR_REV): added
! (ATTR_TITLE): added
! * map.c (append_map_info): anchor
! (append_link_info): added
! (page_info_panel): append_link_info
! * menu.c (LinkMenu): added
! (linkV): added
! (initLinkMenu): added
! (lmGoURL): added
! (popupMenu): initLinkMenu()
! (initMenu): w3mMenuList new 4
! add "Link"
! * tagtable.tab (link): added
!
! 2002-11-29 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m bug] internal tag
! * display.c (loadHTMLstream): HTMLlineproc0 internal
!
! 2002-11-29 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03498] Re: parse <!-- ... --> in <script>
! * file.c (HTMLlineproc0): tag in textarea
! * frame.c (createFrameFile): fix comment processing in frame
!
! 2002-11-28 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03497] incorrect image size
! * image.c (getImageSize): invoke w3mimgdiplay -size instead of "5;..."
! * w3mimgdisplay.c (defined_size): added
! (main): if defined_size get_image_size()
! (GetOption): -size
!
! 2002-11-28 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03496] parse <!-- ... --> in <script>
! * etc.c (read_token): check <pre>
! * file.c (HTMLlineproc0): remove comment processing
! check pre mode
! comment processing move
!
! 2002-11-28 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03495] local CGI can't work
! * local.c: #include "hash.h"
! (set_environ): env string put in hash
!
! 2002-11-28 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03494] Number of line is few when pager mode.
! * display.c (redrawLine): buf->rootY
!
! 2002-11-28 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03493] scroll menu
! * menu.c (mLineU): added
! (mLineD): added
! (MenuKeymap): C-r, C-s, J, K
! (mouse_scroll_line): added
! (process_mMouse): drag
! BTN4, BTN5
! * doc-jp/README.menu: update
2002-11-27 Fumitoshi UKAI <ukai@debian.or.jp>
! * version.c.in: w3m/0.3.2.1+cvs
! 2002-11-27 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03491] Re: case insensitive regexp search
! * regex.c (matchWhich): tolower
!
! 2002-11-27 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * use local_cookie for support local-cgi commands
! * file.c (loadGeneralFile): pass Local_cookie to DirBufferCommand
! * fm.h (Local_cookie): Str
! * local.c (setLocalCookie): Str, set_environ()
! (set_cgi_environ): remove LOCAL_COOKIE
! * main.c (ldhelp): pass Local_cookie
! (adBmark): ditto
! * rc.c (optionpanel_src1): cookie
! (load_option_panel): pass Local_cookie
! * w3mbookmark.c (main): check Local_cookie
! * w3mhelperpanel (main): ditto
! * scripts/dirlist.cgi.in: ditto
! * scripts/w3mhelp.cgi.in: ditto
! * scripts/multipart/multipart.cgi.in: ditto
!
! 2002-11-27 Fumitoshi UKAI <ukai@debian.or.jp>
* frame.c (createFrameFile): html_quote()
+ 2002-11-27 Hiroyuki Ito <hito@crl.go.jp>
+
+ * [w3m-dev 03488] meta refresh in frame
+ * file.c (getMetaRefreshParam): added
+ (HTMLtagproc1): use getMetaRefreshParam()
+ * frame.c (createFrameFile): check meta refresh
+ * proto.h (getMetaRefreshProgram): added
+
+ 2002-11-27 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * w3m 0.3.2.1 security fix
+ * frame.c (createFrameFile): html_quote()
+
+ 2002-11-27 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03486] fix of displayLineInfo
+ * display.c (displayBuffer): don't divide by 0
+
+ 2002-11-26 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03485] fix mouse menu position
+ * main.c (do_mouse_action): use anchor_map is no active_map
+ check top left corner
+ (FRAME_WIDTH): added
+ (menuMs): adjust cursorX using FRAME_WIDTH
+
+ 2002-11-26 Fumitoshi UKAI <ukai@debian.or.jp>
+
+ * NEWS: func: CLOSE_TAB_MOUSE, MENU_MOUSE, MOVE_MOUSE, TAB_MOUSE
+
+ 2002-11-26 Fumitoshi UKAI <ukai@debian.or.jp>
+
+ * doc/README.mouse_menu: deleted
+ * doc/README.mouse: added
+ * doc-jp/README.mouse_menu: deleted
+ * doc-jp/README.mouse: added
+
+ 2002-11-26 Fumitoshi UKAI <ukai@debian.or.jp>
+
+ * map.c (follow_map_menu): MapArea *a is used ifdef MENU_MAP
+ * func.c (initMouseAction): remove unsed variables: x, width, map
+
+ 2002-11-26 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03478] mouse action configuration
+ * display.c (displayBuffer): mouse_menu -> mouse_action.menu_str
+ mouse_action.lastline_str
+ (redrawNLine): mouse_menu -> mouse_action.menu_str
+ * fm.h (MouseMenuMap): deleted
+ (MouseActionMap): added
+ (MouseAction): added
+ (mouse_action): added
+ * func.c (default_mouse_action): added
+ (setMouseAction0): added
+ (setMouseAction1): added
+ (setMouseAction2): added
+ (initMouseMenu): deleted
+ (initMouseAction): added
+ * funcname.tab (CLOSE_TAB_MOUSE): added
+ (MENU_MOUSE): added
+ (MOVE_MOUSE): added
+ (TAB_MOUSE): added
+ * main.c (main): initMouseMenu() -> initMouseAction()
+ mouse_menu -> mouse_action
+ (posTab): mouse_menu -> mouse_action
+ check y > LastTab->y
+ (mouse_menu_action): deleted
+ (do_mouse_action): added
+ (process_mouse): mouse_menu -> mouse_action
+ do_mouse_action()
+ (movMs): added
+ (menuMs): added
+ (tabMs): added
+ (closeTMs): added
+ (reinit): initMouseMenu() -> initMouseAction()
+ resource: MOUSE_MENU -> MOUSE
+ (calcTabPos): mouse_menu -> mouse_action
+ * menu.c (mainMn): mouse_menu -> mouse_action
+ (selMn): mouse_menu -> mouse_action
+ (tabMn): mouse_menu -> mouse_action
+ (initMenu): add SelectTag to w3mMenuList
+ * proto.h (movMs): added
+ (menuMs): added
+ (tabMs): added
+ (closeTMs): added
+ (initMouseMenu): deleted
+ (initMouseAction): added
+ * rc.c (sync_with_option): initMouseMenu() -> initMouseAction()
+ * doc/README.func (CLOSE_TAB_MOUSE): added
+ (MENU_MOUSE): added
+ (MOVE_MOUSE): added
+ (TAB_MOUSE): added
+ * doc-jp/README.func (CLOSE_TAB_MOUSE): added
+ (MENU_MOUSE): added
+ (MOVE_MOUSE): added
+ (TAB_MOUSE): added
+
+ 2002-11-26 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03476] Re: Bug#170506: w3m: Unable to use mozilla bugzilla
+ * file.c (HTMLtagproc1): initialize ignore_tag in table_mode
+ (HTMLtagproc0): check table_level
+ * table.c (feed_table_tag): set mode->ignore_tag
+ * table.h (struct table_mode): add ignore_tag
+
+ 2002-11-25 Fumitoshi UKAI <ukai@debian.or.jp>
+
+ * [w3m-dev 03471] Re: SETPGRP()
+ * configure: SETPGRP() always defined
+ * proto.h (close_all_fds): added
+ (myExec): #ifdef HAVE_SETPGRP
+ * etc.c (close_all_fds): added
+ (myExec): #ifdef HAVE_SETPGRP
+ (mySystem): #ifndef -> #ifdef
+ * file.c (_doFileCopy): delete #ifdef HAVE_SETPGRP
+ (doFileSave): ditto
+ * image.c (openImgdisplay): delete #ifdef HAVE_SETPGRP
+ use close_all_fds()
+ * search.c (open_migemo): ditto
+
+ 2002-11-23 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03466] Re: background download when external viewer
+ * file.c (doExternal): UFclose(&uf);
+
+ 2002-11-23 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03464] Re: case insensitive regexp search
+ (rewrite [w3m-dev 03462] by Hiroyuki Ito <hito@crl.go.jp>)
+ * regex.c (matchWhich): add int
+ (newRegex0): igncase
+ (regmatch1): matchWhich with re->mode & RE_IGNCASE
+ (matchWhich): add igncase
+
+ 2002-11-23 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03459] background download when external viewer
+ * etc.c (myExec): added
+ (mySystem): rewrite to use myExec()
+ * file.c (doExternal): run background if BackgroundExtViewer
+ * proto.h (myExec): added
+
+ 2002-11-23 Fumitoshi UKAI <ukai@debian.or.jp>
+
+ * doc/README.mouse_menu: delete column 10 limit
+ * doc-jp/README.mouse_menu: ditto
+
+ 2002-11-23 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03458] Re: mouse menu
+ * display.c (displayBuffer): nTab2 -> nTab, mouse_menu
+ * fm.h (nTab2): deleted
+ (MouseMenuMap): added
+ (MouseMenu): added
+ (LIMIT_MOUSE_MENU): added
+ * func.c (initMouseMenu): delete mouse_menu_map initialization
+ conv_from_system
+ mouse_menu->width
+ * main.c (main): mouse_menu->in_action = FALSE
+ (posTab): check mouse_menu
+ (mouse_menu_action): add y arg
+ mouse_menu_width check
+ (process_mouse): nTab2 -> nTab, mouse_menu
+ (nTabLine): deleted
+ (calcTabPos): check mouse_menu
+ * menu.c (mainMn): x, y
+ (selMn): mouse_menu check
+ (tabMn): mosue_menu check
+ * proto.h (nTabLine): deleted
+
+ 2002-11-22 Fumitoshi UKAI <ukai@debian.or.jp>
+
+ * NEWS: options: -N
+
+ 2002-11-22 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03457] open URL of command line on each new tabs
+ * main.c (delBuffer): static
+ (fusage): -N
+ (main): add open_new_tab for -N
+
+ 2002-11-22 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03456] tiling of tab
+ * display.c (displayBuffer): use LastTab->y
+ (redrawNLine): fix column calculation
+ * fm.h (TabBuffer): add x1, x2, y
+ * main.c (calcTabPos): added
+ (main): calcTabPos()
+ (mouse_scroll_line): rewrite
+ (process_mouse): use LastTab->y
+ (_newT): calcTabPos()
+ (calcTabPos): added
+ (deleteTab): calcTabPos()
+ (moveTab): calcTabPos()
+
+ 2002-11-22 Fumitoshi UKAI <ukai@debian.or.jp>
+
+ * doc/README.mouse_menu: added
+ * doc-jp/README.mouse_menu: added
+
+ 2002-11-22 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03455] mouse menu
+ * configure (config.h): MOUSE_FILE
+ * display.c (displayBuffer): nTab -> nTab2, N_TAB -> nTabLine()
+ (redrawNLine): nTab -> nTab2, N_TAB -> nTabLine()
+ mouse_menu support
+ * fm.h (nTab2): added
+ (N_TAB): deleted
+ (NO_TABBUFFER): added
+ (struct _MouseMenu): added
+ (mouse_menu_map): added
+ (mouse_menu): added
+ * func.c (initMouseMenu): added
+ * main.c (main): initMouseMenu()
+ (posTab): mouse_menu support
+ (mouse_menu_action): added
+ (process_mouse): mouse_menu support
+ (reinit): initMouseMenu()
+ (nTabLine): added
+ (moveTab): check NO_TABBUFFER
+ * proto.h (nTabLine): added
+ (initMouseMenu): added
+ * rc.c (sync_with_option): initMouseMenu()
+
+ 2002-11-22 Fumitoshi UKAI <ukai@debian.or.jp>
+
+ * NEWS: func: NEXT, PREV
+
+ 2002-11-22 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03454] next / previous buffer
+ * funcname.tab (NEXT): added
+ (PREV): added
+ * main.c (nextBf): added
+ (prevBf): added
+ * proto.h (nextBf): added
+ (prevBf): added
+ * doc/README.func (NEXT): added
+ (PREV): added
+ * doc-jp/README.func (NEXT): added
+ (PREV): added
+ * scripts/w3mhelp.cgi.in (Buffer operation): nextBf prevBf
+
+ 2002-11-20 Fumitoshi UKAI <ukai@debian.or.jp>
+
+ * NEWS: rc: image_map_list
+
+ 2002-11-20 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03452] image map
+ * display.c (displayBuffer): use getCurrentMapLabel()
+ * fm.h (MapArea): delete ifdef MENU_MAP
+ (image_map_list): added
+ * main.c (followA): don't call retrieveCurrentImg() ifdef USE_IMAGE
+ use retrieveCurrentMap() ifndef USE_IMAGE
+ (_followForm): indent
+ (drawAnchorCursor0): add AnchorList
+ (drawAnchorCuror): pass AnchorList to drawAnchorCursor0
+ (follow_map): follow_map_panel
+ * map.c (searchMapList): added
+ (nearestMapArea): n, min default value to -1
+ (searchMapArea): added
+ (getCurrentMapLabel): added
+ (getMapXY): moved
+ (retrieveCurrentMap): added
+ (follow_map_menu): parsed_tagarg -> name
+ rewrite to search map list/area
+ (follow_map_panel): parsed_tagarg -> name
+ rewrite to search map list/area
+ (newMapArea): delete ifdef MENU_MAP
+ (append_map_info): added
+ (page_info_panel): append_map_info
+ * proto.h (follow_map_menu): parsed_tagarg -> name
+ (follow_map_panel): parsed_tagarg -> name
+ (getCurrentMapLabel): added
+ (retrieveCurrentMap): added
+ * rc.c (CMT_IMAGE_MAP_LIST): added
+ (image_map_list): added
+
+ 2002-11-20 Yoshinobu Sakane <sakane@d4.bsd.nes.nec.co.jp>
+
+ * [w3m-dev 03450] Re: cygwin console on Win9X
+ * terms.c (mouse_init): ifdef __CYGWIN__
+ (mouse_end): ditto
+
+ 2002-11-19 Fumitoshi UKAI <ukai@debian.or.jp>
+
+ * ftp.c (ftp_fclose): void return
+
+ 2002-11-19 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03444] download from ftp.
+ * file.c (FTPhalfclose: static
+ (loadGeneralFile): UFclose
+ FTPhalfclose for SCM_FTP
+ UFclose before signal back
+ (loadImageBuffer): UFclose before signal back
+ (openGeneralPagerBuffer): UFclose
+ * ftp.c (ftp_fclose): added
+ (Ftpfclose): dont read response(), but ftp_fclose()
+ (FtpBye): ftp_fclose()
+
+ 2002-11-19 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03449] Add DOWNLOAD_LIST to doc*/README.func and scripts/w3mhelp.cgi.in
+ * doc-jp/README.func (DOWNLOAD_LIST): added
+ * doc/README.func (DOWNLOAD_LIST): added
+ * scripts/w3mhelp.cgi.in (Miscellany): add ldDL
+
+ 2002-11-19 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03448] Some fixes
+ * url.c (KeyAbort): SIGNAL_RETURN
+ * .cvsginore: delete w3mimgsize
+ * scripts/.cvsignore: delete xface2xbm
+ * scripts/xface2xbm.in: deleted
+
+ 2002-11-19 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03447] Re: Open download list panel on new tab
+ * main.c (download_action): buffer management deleted
+ (ldDL): buffer management moved here
+
+ 2002-11-19 Fumitoshi UKAI <ukai@debian.or.jp>
+
+ * NEWS: rc: open_tab_dl_list
+
+ 2002-11-19 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03446] Open download list panel on new tab
+ * fm.h (open_tab_dl_list): added
+ * main.c (download_action): buffer delete when download done
+ (ldDL): open buf in new tab if open_tab_dl_list
+ * rc.c (CMT_OPEN_TAB_DL_LIST): added
+ (open_tab_dl_list): added
+
+ 2002-11-19 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03445] download list for "w3m foo.tar.gz"
+ * main.c (main): display download list
+
+ 2002-11-19 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03443] Can't display "echo only_one_line | w3m"
+ * display.c (redrawNLine): check 1st line
+
+ 2002-11-16 Fumitoshi UKAI <ukai@debian.or.jp>
+
+ * [w3m-dev 03442] Re: setting form on loading
+ * form.c (preFormUpdateBuffer): ifdef MENU_SELECT
+
+ 2002-11-16 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03441] charset of save file
+ * file.c (_doFileCopy): use conv_from_system()
+ (doFileSave): conv_from_system()
+ * main.c (DownloadListBuffer): conv_from_system()
+
+ 2002-11-16 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03440] Re: restore alarm event
+ * fm.h (BP_RELOAD): added
+ (DOWNLOAD_LIST_TITLE): added
+ * main.c (main): if BP_RELOAD, do reload
+ (reload): if buffer is DOWNLOAD_LIST, ldDL()
+ (DownloadListBuffer): rewrite with DOWNLOAD_LIST_TITLE
+ (download_action): delete "update"
+ don't delete prev buffer
+ (ldDL): rewrite to do reload
+
+ 2002-11-16 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03439] restore alarm event
+ * fm.h (AL_RESTORE): added
+ * main.c (alarm_sec): deleted
+ (alarm_status): deleted
+ (alarm_buffer): deleted
+ (alarm_event): deleted
+ (AlarmEvent): added
+ (CurrentAlarm): added
+ (PrevAlarm): added
+ (main): rewrite with CurrentAlarm
+ (SigAlarm): rewrite with CurrentAlarm
+ (copyAlarmEvent): added
+ (setAlarm): if AL_RESTORE, copy back from PrevAlarm
+ rewrite with CurrentAlarm
+
2002-11-16 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
* [w3m-dev 03438] Re: segmentation fault by large complex table.
* table.c (check_table_height): check MAXROWCELL
* table.h (MAXROWCELL): added
! 2002-11-16 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03437] Re: Check image size
! * fm.h (MAX_IMAGE_SIZE): changed to 2048
!
! 2002-11-16 Hiroyuki Ito <hito@crl.go.jp>
!
! * [w3m-dev 03436] Check image size
! * file.c (process_img): check w > MAX_IMAGE_SIZE
! (HTMLlineproc2body): check w,h > MAX_IMAGE_SIZE
! * fm.h (MAX_IMAGE_SIZE): added
! * image.c (getImageSize): check w,h,width,height > MAX_IMAGE_SIZE
!
! 2002-11-16 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03435] save image with SAVE
! * buffer.c (discardBuffer): check image
! * file.c (loadImageBuffer): add st
! IMG_FLAG_DONE_REMOVE
! s/sourcefile/mailcap_source/
! * fm.h (IMG_FLAG_DONT_REMOVE): added
! * image.c (drawImage): & IMG_FLAG_LOADED
! (deleteImage): & IMG_FLAG_DONT_REMOVE
! (showImageProgress): & IMG_FLAG_LOADED
! (getImage): & IMG_FLAG_LOADED
! (getImageSize): & IMG_FLAG_LOADED
! * main.c (vmSrc): delete ifdef USE_IMAGE
!
! 2002-11-16 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03434] Re: cygwin console on Win9X
! * terms.c (cygwin_mouse_btn_swapped): ifdef USE_MOUSE
! (lastConMouse): deleted
! (check_win9x): static
! (read_win32_console): static
! (GetConsoleHwnd): static
! (cygwin_version): ifdef USE_MOUSE, static
! (check_cygwin_console): static
! (NEED_XTERM_ON): added
! (NEED_XTERM_OFF): added
! (NEED_CYGWIN_ON): added
! (NEED_CYGWIN_OFF): added
! (XTERM_TITLE): static char[]
! (SCREEN_TITLE): static char[]
! (CYGWIN_TITLE): static char[]
! (term_title): check title_str
! * terms.h (LASTLINE): added
! (is_xterm): deleted
! (enable_win9x_console_input): extern
! (disable_win9x_console_input): extern
! (NEED_XTERM_ON): deleted
! (NEED_XTERM_OFF): deleted
!
! 2002-11-16 WATANABE Katsuyuki <katsuyuki_1.watanabe@toppan.co.jp>
!
! * [w3m-dev 03433] cygwin console on Win9X
! * configure (config.h): SUPPORT_WIN9X_CONSOLE_MBCS
! * linein.c (inputLineHistSearch): enable_win9x_console_input()
! disable_win9x_console_input()
! * main.c (mouse): cygin_mouse_btn_swapped
! * terms.c (is_xterm): static
! (isLocalConsole): added
! (cygwin_mouse_btn_swapped): added
! (check_win32_console): deleted
! (check_win9x): added
! (init_win32_console_handle): check ttyslot()
! (enable_win9x_console_input): added
! (disable_win9x_console_input): added
! (read_win32_console_input): delete ifdef MOUSE
! (cmp_tv): deleted
! (subtract_tv): deleted
! (GetConsoleHwnd): added
! (cygwin_version): added
! (select_or_poll_win32_console): deleted
! (check_cygwin_console): added
! (select_win32_console): deleted
! (set_tty): check_cygin_console()
! (term_title): SetConsoleTitle()
! (CYGWIN_ON): added
! (CYGIN_OFF): added
! (mouse_init): NEED_CYGWIN_ON
! (mouse_end): NEED_CYGWIN_OFF
! * terms.h (cygwin_mouse_btn_swapped): added
! (enable_win9x_console_input): added
! (disable_win9x_console_input): added
! (NEED_CYGWIN_ON): added
! (NEED_CYGWIN_OFF): added
!
! 2002-11-16 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03432] Re: tab browser
! * display.c (displayBuffer): s/buf->LINES/LASTLINES/ in cygwin
!
! 2002-11-16 Fumitoshi UKAI <ukai@debian.or.jp>
!
! * NEWS: func: DOWNLOAD_LIST
!
! 2002-11-16 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03431] save file by background process
! * file.c (loadGeneralFile): use _doFileCopy()
! (_doFileCopy): renamed from doFileCopy()
! lock
! fork & save
! (doFileSave): lock
! fork & save
! * fm.h (DownloadList): added
! (FirstDL): added
! (LastDL): added
! * form.c (struct internal_action): add download
! * funcname.tab (DOWNLOAD_LIST): added
! * html.h (URLFile): add url
! * main.c (dump_extra): add add_download_list
! (main): add_download_list, ldDL()
! (_quitfm): added
! (quitfm): rewrite with _quitfm()
! (qquitfm): ditto
! (w3m_exit): stopDownload()
! (addDownloadList): added
! (checkDownloadList): added
! (convert_size3): added
! (DownloadListBuffer): added
! (download_action): added
! (stopDownload): added
! (ldDL): added
! * proto.h (ldDL): added
! (convert_size): added
! (convert_size2): added
! (doFileCopy): deleted
! (_doFileCopy): added
! (addDownloadList): added
! (stopDownload): added
! (checkDownloadList): added
! (download_action): added
! * url.c (openURL): save url in uf
!
! 2002-11-15 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03430] disable display of alarm command
! * main.c (SigAlarm): remove display_message_nsec()
! (setAlarm): show sec
!
! 2002-11-15 Fumitoshi UKAI <ukai@debian.or.jp>
!
! * NEWS: env,rc: https_proxy
!
! 2002-11-15 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03429] https proxy
! * fm.h (HTTPS_proxy): added
! (HTTPS_proxy_parsed): added
! * main.c (main): check https_proxy
! * rc.c (CMT_HTTPS_PROXY): added
! (https_proxy): added
! (parse_proxy): HTTPS_proxy
! * url.c (openURL): for HTTPS, use HTTPS_proxy
! (schemeToProxy): HTTPS_proxy_parsed
!
! 2002-11-14 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03428] install manual as w3m.exe.1 on Cygwin
! * XMakefile (MAN1_TARGET): added
! (HELP_TARGET): added
! (install): use MAN1_TARGET, HELP_TARGET
! (uninstall): use MAN1_TARGET, uninstall HELP_TARGET
!
! 2002-11-14 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03427] Re: Select the nearest map area as default.
! * map.c (newMapArea): accept sign chars
! if points is not enough, return as SHAPE_UNKNOWN
!
! 2002-11-14 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03425] charset of title
! * display.c (displayBuffer): buffername converted to system coding
! for term title
!
! 2002-11-14 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03424] Content length
! * file.c (loadGeneralFile): current_content_length before do_download
! (save2tmp): current_content_length move before return
!
! 2002-11-12 Fumitoshi UKAI <ukai@debian.or.jp>
!
! * [w3m-dev 03422] Re: setting form on loading
! * form.c (loadPreForm): initialize name
! check textarea, name for /textarea
!
! 2002-11-12 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03418] Re: tab browser
! * display.c (redrawNLine): s/clrtoeol/clrtoeolx/
! move rootY
!
! 2002-11-12 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03417] install_w3mimgdisplay
! * configure: define install_w3mimgdisplay
! after use_w3mimg_fb determined
!
! 2002-11-12 Akira TAGOH <at@gclab.org>
!
! * [w3m-dev 03415] fix a build issue for 64bit arch
! * gcmain.c: deleted
! * main.c: no need gcmain.c
! s/MAIN/main/
! * mktable.c: ditto
! * w3mbookmark.c: ditto
! * w3mhelperpanel.c: ditto
!
! 2002-11-12 Fumitoshi UKAI <ukai@debian.or.jp>
!
! * doc/w3m.1: update
! * doc-jp/w3m.1: update
! * NEWS: update: -show-option
!
! 2002-11-12 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03414] Re: show parameter
! * main.c (fusage): add -show-option
! (MAIN): check -show-option
!
! 2002-11-12 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03413] Re: setting form on loading
! * form.c (loadPreForm): add textarea
! (preFormUpdateBuffer): submit if value is matched as well
! case FORM_TEXTAREA
! case FORM_SELECT ifdef MENU_SELECT
!
! 2002-11-12 Yuji Abe <cbo46560@pop12.odn.ne.jp>
!
! * [w3m-dev 03411] do AUXBIN_TARGETS
! * scripts/Makefile (all): add AUXBIN_TARGETS
! (clean): add AUXBIN_TARGETS
!
! 2002-11-12 AIDA Shinra <aida-s@jcom.home.ne.jp>
!
! * [w3m-dev 03408] edit From in w3mail.cgi
! * scripts/w3mmail.cgi.in: edit from as well
!
! 2002-11-12 AIDA Shinra <aida-s@jcom.home.ne.jp>
!
! * [w3m-dev 03408] fix Bug#87472
! MOUSE_SCROLL_LINE should be a run-time option
! * fm.h (relative_wheel_scroll): added
! (fixed_wheel_scroll_count): added
! (relative_wheel_scroll_ratio): added
! * main.c (mouse_scroll_line): added
! (process_mouse): s/MOUSE_SCROLL_LINE/mouse_scroll_line()/
! * menu.c (MOUSE_SCROLL_LINE): deleted
! * terms.h (MOUSE_SCROLL_LINE): deleted
! * rc.c (CMT_RELATIVE_WHEEL_SCROLL): added
! (CMT_RELATIVE_WHEEL_SCROLL_RATIO): added
! (CMT_FIXED_WHEEL_SCROLL_COUNT): added
! (wheelmode): added
! (params3): add relative_wheel_scroll,
! relative_wheel_scroll_ratio,
! fixed_wheel_scroll_count
! * NEWS: updated
!
! 2002-11-12 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03407] char GlobalKeymap -> unsigned char GlobalKeymap
! * fm.h (GlobalKeymap): char->unsigned char
! (EscKeymap): ditto
! (EscBKeymap): ditto
! (EscDKeymap): ditto
! (PcKeymap): ditto
! * keybind.c: ditto
! * keybind_lynx.c: ditto
!
! 2002-11-12 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03406]
! * scripts/Makefile: add AUXBIN_DIR
! update LIB_DIR, HELP_DIR
! xface2xpm installed in AUXBIN_DIR
! * scripts/multipart/Makefile: update LIB_DIR
! * scripts/w3mman/Makefile: update LIB_DIR
!
! 2002-11-12 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03405] Re: tab browser
! * main.c (moveTab): B_FORCE_REDRAW
!
! 2002-11-10 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03401] w3mhelp.cgi
! * proto.h (tabMn): nulcmd ifndef USE_MENU
! * scripts/w3mhelp-funcdesc.en.pl.in: add LINEEDIT:EDITOR
! * scripts/w3mhelp-funcdesc.ja.pl.in: add LINEEDIT:EDITOR
! Tab operation
! * scripts/w3mhelp-funcname.pl.in: add LINEEDIT:EDITOR C-o
! * scripts/w3mhelp.cgi.in: add tabA in Hyperlink operation
! add tabURL, tabrURL in File/Stream operation
! add Tab operation
! add lineedit_editor in Line edit mode
!
! 2002-11-10 NOMIYA Masaru <nomiya@ttmy.ne.jp>
!
! * [w3m-dev 03399]
! * XMakefile: ;; -> ;
!
! 2002-11-10 Fumitoshi UKAI <ukai@debian.or.jp>
!
! * [w3m-dev 03398] auxbindir
! * XMakefile: EXT_TARGETS -> LIB_TARGETS, AUXBIN_TARGETS
! * config.h.dist: add AUXBIN_DIR
! LIB_DIR is cgi-bin
! * configure: add -auxbindir
! add AUXBIN_DIR
! LIB_DIR is cgi-bin
! EXT_TARGETS -> LIB_TARGETS, AUXBIN_TARGETS
! * file.c (compression_decoder): libfile_p -> auxbin_p
! (check_command): libfile_p -> auxbin_p
! use w3m_auxbin_dir() instead of w3m_lib_dir()
! (acceptableEncoding): libfile_p -> auxbin_p
! (xface2xpm): use auxbinFile() instead of libFile()
! (uncompress_stream): libfile_p -> auxbin_p
! use auxbinFile() instead of libFile()
! * image.c (getCharSize): use w3m_auxbin_dir() instead of w3m_lib_dir()
! (openImgdisplay): use w3m_auxbin_dir() instead of w3m_lib_dir()
! * indep.c (w3m_auxbin_dir): added
! * indep.h (w3m_auxbin_dir): added
! * proto.h (auxbinFile): added
! * rc.c (auxbinFile): added
! (libFile): #if 0, no longer used
! (helpFile): used only #ifndef USE_HELP_CGI
! * NEWS: separate auxbindir and libdir (local-CGI, file:///$LIB/)
!
! 2002-11-09 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03396] Re: meta refresh problem
! * main.c (MAIN): AL_IMPLICIT -> alarm_status
! (SigAlarm): AL_IMPLICIT -> alarm_status
!
! 2002-11-09 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03391] use editor when input at last line
! * linein.c (_editor): added
!
! 2002-11-09 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03390] some fixes related with form
! * form.c (input_textarea): goto input_end
! unlink(tmpf);
! * main.c (_followForm): s/TEXT/Password/
!
! 2002-11-09 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03388] meta refresh problem
! * fm.h (AL_IMPLICIT_DONE): 3->4
! (AL_ONCE): 8
! (AL_IMPLICIT_ONCE): (AL_IMPLICIT|AL_ONCE)
! * main.c (MAIN): & AL_IMPLICIT, & AL_IMPLICIT_DONE
! (SigAlarm): & AL_IMPLICIT, & AL_IMPLICIT_DONE, & AL_ONCE
! (setAlaramEvent): & AL_IMPLICIT
!
! 2002-11-09 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03387] Re: tab browser
! * buffer.c (newBuffer): buf->LINES initialize
! (gotoLine): use buf->LINES
! (gotoRealLine): use buf->LINES
! * display.c (displayBuffer): check by buf->LINES
! (redrawNLine): buf->LINES
! (redrawLine): buf->LINES
! (redrawLineImage): no need buf->rootY
! (cursorDown): buf->LINES
! (arrangeCursor): buf->LINES
! * etc.c (columnSkip): buf->LINES
! (lineSkip): buf->LINES
! (currentLineSkip): buf->LINES
! * fm.h (Buffer): add LINES
! * main.c (nscroll): Currentbuf->LINES
! (pgFore): Currentbuf->LINES
! (pgBack): Currentbuf->LINES
! (ctrCsrV): Currentbuf->LINES
! (movD): Currentbuf->LINES
! (movU): Currentbuf->LINES
! (_goLine): Currentbuf->LINES
! (drawAnchorCursor): Currentbuf->LINES
! (setOpt): B_REDRAW_IMAGE
! (newT): B_REDRAW_IMAGE
! (closeT): B_REDRAW_IMAGE
! (nextT): B_REDRAW_IMAGE
! (prevT): B_REDRAW_IMAGE
! (moveTab): B_NORMAL
!
! 2002-11-09 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03386] Re: Interrupt in no_proxy_check()
! * file.c (getAuthCookie): term_cbreak()
! (loadGeneralFile): term_cbreak()
! term_raw()
! preFormUpdateBuffer() before term_raw()
! (loadHTMLstream): term_raw()
!
! 2002-11-07 Katsumi@yamaoka.cc
!
! * [w3m-dev 03385] install-sh typo
! * install-sh: s/'/"/
!
! 2002-11-07 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03383] Select the nearest map area as default.
! * fm.h (MapArea): add center_x, center_y
! * map.c (nearestMapArea): added
! (follow_map_menu): initial by nearestMapArea()
! (newMapArea): set center_x, center_y
!
! 2002-11-07 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03382] Interrupt in no_proxy_check()
! * url.c (check_no_proxy): SIGINT trap by KeyAbort
!
! 2002-11-06 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03380] fix configure
! * configure: s/INSTALL_W3MIMGDISPLAY/install_w3mimgdisplay/
! already define
! * config.h.dist (INSTALL_W3MIMGDISPLAY): added
!
! 2002-11-06 Fumitoshi UKAI <ukai@debian.or.jp>
!
! * [w3m-dev 03379] setuid w3mimgdisplay and check console tty
! * XMakefile: w3mimgdisplay install by INSTALL_W3MIMGDISPLAY
! * configure: ask setuid w3mimgdisplay
! (w3mimgdisplay_setuid): added
! (INSTALL_W3MIMGDISPLAY): added
! * etc.c (mySystem): close until FOPEN_MAX
! * image.c (openImgdisplay): setenv W3M_TTY
! stderr to /dev/null
! close until FOPEN_MAX
! * install-sh: -o, -g for owner, group
! * proto.h (ttyname_tty): added
! * search.c (open_migemo): stderr to /dev/null
! close until FOPEN_MAX
! * terms.c (ttyname_tty): added
! * w3mimgdisplay.c: include <sys/types.h>, <unistd.h>
! W3MIMGDISPLAY_SETUID
! stderr to /dev/null
! * w3mimg/w3mimg.c: include <sys/types.h>, <unistd.h>
! W3MIMGDISPLAY_SETUID
! * w3mimg/fb/fb_w3mimg.c (check_tty_console): added
!
! 2002-11-06 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03377] sync_with_option
! * etc.c (loadPassword): reset passwords
! * form.c (loadPreForm): reset PreForm
! * main.c (option_assigned): deleted
! (parse_proxy): deleted
! (MAIN): move initCookie(), setLocalCookie()
! after sync_with_option()
! delete parseURL for *_proxy
! s/WrapSearch/WrapDefault/
! move initKeymap(), initMenu() after setupscreen()
! sync_with_option() after init_rc()
! * rc.c (pre_form_file): move in params9 (network settting)
! (sync_with_option): initKeymap(), initMenu() is done
! if fmInitialized
! (init_rc): delete sync_with_option()
!
! 2002-11-06 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03375] NULL check of CurrentTab
! * display.c (disp_message_nsec): check CurrentTab
! * file.c (doExternal): check CurrentTab
! * image.c (loadImage): check CurrentTab
!
! 2002-11-06 Fumitoshi UKAI <ukai@debian.or.jp>
!
! * [w3m-dev 03374] disable_secret_security_check
! * etc.c (openSecurityFile): disable_secret_security_check
! * fm.h (disable_secret_security_check): added
! * rc.c (CMT_DISABLE_SECRET_SECURITY_CHECK): added
! (disable_secret_security_check): added
! * NEWS: rc: disable_secret_security_check
!
! 2002-11-06 Fumitoshi UKAI <ukai@debian.or.jp>
!
! * NEWS: update
!
! 2002-11-06 Fumitoshi UKAI <ukai@debian.or.jp>
!
! * rc.c (CMT_PRE_FORM_FILE): added
! (pre_form_file): added
!
! 2002-11-06 Fumitoshi UKAI <ukai@debian.or.jp>
!
! * doc-jp/README.tab: added [w3m-dev 03372]
! * doc/README.tab: brief translation
!
! 2002-11-06 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03372] tab browser
! * display.c (displayBuffer): add ny
! rootY offset by tab
! tab line
! (cursorDown): offset rootY
! (arrangeCursor): offset rootY
! * etc.c (columnSkip): offset rootY
! (lineSkip): offset rootY
! (currentLineSkip): offset rootY
! * file.c (HTMLlineproc2body): ATTR_TARGET
! * fm.h (MapArea): add target
! (Buffer): add rootY
! (TabBuffer): added
! (Currentbuf): comment out
! (Firstbuf): comment out
! (CurrentTab): added
! (FirstTab): added
! (LastTab): added
! (open_tab_blank): added
! (close_tab_back): added
! (nTab): added
! (TabCols): added
! (N_TAB): added
! (Currentbuf): CurrentTab->currentBuffer
! (Firstbuf): CurrentTab->firstBuffer
! * funcname.tab (CLOSE_TAB): added
! (NEW_TAB): added
! (NEXT_TAB): added
! (PREV_TAB): added
! (TAB_GOTO): added
! (TAB_GOTO_RELATIVE): added
! (TAB_LEFT): added
! (TAB_LINK): added
! (TAB_MENU): added
! (TAB_RIGHT): added
! * html.c (ALST_AREA): add ATTR_TARGET
! * image.c (showImageProgress): offset rootY
! * main.c (_newT): added
! (followTab): added
! (moveTab): added
! (check_target): added
! (MAIN): init tab related values
! buf => tab
! (nscroll): offset rootY
! (pgFore): offset rootY
! (pgBack): offset rootY
! (ctrCsrV): offset rootY
! (_movD): offset rootY
! (_movU): offset rootY
! (_goLine): offset rootY
! (_mark): offset rootY
! (followA): check target
! (_followForm): offset rootY
! (drawAnchorCursor0): offset rootY
! (drawAnchorCursor): offset rootY
! (backBf): check close_tab_back
! (follow_map): rewrite for tab, check target
! (posTab): added
! (process_mouse): tab operation
! offset rootY
! (deleteFiles): for all buffers in all tabs
! (newTab): added
! (newT): added
! (numTab): added
! (deleteTab): added
! (closeT): added
! (nextT): added
! (prevT): added
! (followTab): added
! (tabA): added
! (tabURL0): added
! (tabURL): added
! (tabrURL): added
! (moveTab): added
! (tabR): added
! (tabL): added
! * map.c (follow_map_menu): return MapArea
! (newMapArea): add target args
! * menu.c (SelTabMenu): added
! (SelTabV): added
! (initSelTabMenu): added
! (smChTab): added
! (smDelTab): added
! (MainMenuItem): add Select Tab
! on New Tab
! (popupMenu): add initSelTabMenu()
! offset rootY
! (mainMn): offset rootY
! (selMn): offset rootY
! (initSelectMenu): offset rootY
! (tabMn): added
! * proto.h (newT): added
! (closeT): added
! (nextT): added
! (prevT): added
! (tabA): added
! (tabURL): added
! (tabrURL): added
! (tabR): added
! (tabL): added
! (newTab): added
! (deleteTab): added
! (follow_map_menu): return MapArea
! (newMapArea): add target arg
! (tabMn): added
! * rc.c (CMT_OPEN_TAB_BLANK): added
! (CMT_CLOSE_TAB_BACK): added
! (open_tab_blank): added
! (close_tab_back): added
! * doc/README.func (CLOSE_TAB): added
! (NEW_TAB): added
! (NEXT_TAB): added
! (PREV_TAB): added
! (TAB_GOTO): added
! (TAB_GOTO_RELATIVE): added
! (TAB_LEFT): added
! (TAB_LINK): added
! (TAB_MENU): added
! (TAB_RIGHT): added
! * doc-jp/README.func: ditto doc/README.func
!
! 2002-11-06 Fumitoshi UKAI <ukai@debian.or.jp>
!
! * doc-jp/README.pre_form: added [w3m-dev 03373]
! * doc/README.pre_form: brief translation
!
! 2002-11-06 Fumitoshi UKAI <ukai@debian.or.jp>
!
! * etc.c (PASS_IS_READABLE_MSG): deleted
! (FILE_IS_READABLE_MSG): added
! (openPasswdFile): deleted
! (openSecretFile): delete error_msg arg
! (loadPasswd): use openSecretFile()
! * form.c (next_token): delete unused static decl
! (FILE_IS_READABLE_MSG): deleted
! (loadPreForm): no need pass error_msg
! * proto.h (openSecretFile): delete error_msg arg
!
! 2002-11-06 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
!
! * [w3m-dev 03373] setting form on loading
! * config.h.dist (PRE_FORM_FILE): added
! * configure (PRE_FORM_FILE): added
! * etc.c (openPasswdFile): define by openSecretFile()
! (openSecretFile): renamed, not static
! * file.c (loadGeneralFile): preFOrmUpdateBuffer()
! * fm.h (Buffer): add submit
! (pre_form_file): added
! * form.c (struct pre_form_item): added
! (struct pre_form): added
! (next_token): added
! (PreForm): added
! (add_pre_form): added
! (add_pre_form_item): added
! (loadPreForm): added
! (preFormUpdateBuffer): added
! * frame.c (renderFrame): add preFormUpdateBuffer()
! * main.c (MAIN): buf->submit check
! * proto.h (preFormUpdateBuffer): added
! (openSecretFile): added
! (loadPreForm): added
! * rc.c (sync_with_option): add loadPreForm()
!
! 2002-11-06 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
* [w3m-dev 03371] segmentation fault by large complex table.
* table.c (bsearch_2short): indexarry char to short
(bsearch_double): ditto
***************
*** 53,58 ****
--- 3024,3033 ----
* doc-jp/README: ditto
* NEWS: update
+ 2002-11-05 Fumitoshi UKAI <ukai@debian.or.jp>
+
+ * scripts/w3mhelp.cgi.in: add chkWORD
+
2002-11-04 Fumitoshi UKAI <ukai@debian.or.jp>
* [w3m-dev-en 00827] Re: w3m-cvs segfaults on news://<mid> URLs
***************
*** 4148,4151 ****
* release-0-2-1
* import w3m-0.2.1
! $Id: ChangeLog,v 1.467.4.7 2002/12/05 16:53:19 ukai Exp $
--- 7123,7126 ----
* release-0-2-1
* import w3m-0.2.1
! $Id: ChangeLog,v 1.743 2003/02/07 15:06:15 ukai Exp $
diff -crN -x CVS w3m-0.3.2.2/NEWS w3m-js-1.743/NEWS
*** w3m-0.3.2.2/NEWS 2002-12-06 01:48:31.000000000 +0900
--- w3m-js-1.743/NEWS 2003-02-06 02:23:01.000000000 +0900
***************
*** 1,7 ****
--- 1,53 ----
+ w3m 0.4?
+
+ * rc: decode_url
+ * func: RESHAPE
+ * rc: fold_line
+ * local cookie: passed via file named $LOCAL_COOKIE or posted not in url query
+ * func: SEARCH can take arg
+ * URL data: support
+ * URL news:, nntp: newsgroup support
+ * rc: nntpserver, nntpmode, max_news
+ * rc: graphic_char
+ * rc: use_proxy
+ * rc: preserve_timestamp
+ * func: REDO, UNDO
+ * func: LIST, LIST_MENU, MOVE_LIST_MENU
+ * func: ACCESSKEY, LINK_MENU
+ * rc: display_ins_del
+ * 2 stroke keybinding
+ * func: MULTIMAP
+ * func: CLOSE_TAB_MOUSE, MENU_MOUSE, MOVE_MOUSE, TAB_MOUSE
+ * options: -N
+ * func: NEXT, PREV
+ * rc: image_map_list
+ * rc: open_tab_dl_list
+ * func: DOWNLOAD_LIST
+ * env: https_proxy
+ * rc: https_proxy
+ * options: -show-option
+ * rc: relative_wheel_scroll
+ * rc: relative_wheel_scroll_ratio
+ * rc: fixed_wheel_scroll_count
+ * separate auxbindir and libdir (local-CGI, file:///$LIB/)
+ * configure: -auxbindir
+ * rc: disable_secret_security_check (for windows?)
+ * tab browsing
+ * rc: open_tab_blank, close_tab_back
+ * func: CLOSE_TAB, NEW_TAB, NEXT_TAB, PREV_TAB,
+ * func: TAB_GOTO, TAB_GOTO_RELATIVE
+ * func: TAB_LEFT, TAB_LINK, TAB_MENU, TAB_RIGHT
+ * pre_form: ~/.w3m/pre_form
+ * rc: pre_form_file: pre_form configuration file
+
+ ----------------------------------------------------------------
+
w3m 0.3.2.2 - 2002-12-06
* security fix: html_quote for img alt attributes
+ ----------------------------------------------------------------
+
w3m 0.3.2.1 - 2002-11-27
* security fix: html_quote for frame contents
***************
*** 9,14 ****
--- 55,61 ----
- fix segmentation fault by large complex table.
[w3m-dev 03371][w3m-dev 03438]
+ ----------------------------------------------------------------
w3m 0.3.2 - 2002-11-05
* ~/.netrc: password for ftp
diff -crN -x CVS w3m-0.3.2.2/Str.c w3m-js-1.743/Str.c
*** w3m-0.3.2.2/Str.c 2001-12-22 06:37:12.000000000 +0900
--- w3m-js-1.743/Str.c 2002-12-25 02:26:32.000000000 +0900
***************
*** 1,4 ****
! /* $Id: Str.c,v 1.7 2001/12/21 21:37:12 ukai Exp $ */
/*
* String manipulation library for Boehm GC
*
--- 1,4 ----
! /* $Id: Str.c,v 1.8 2002/12/24 17:20:46 ukai Exp $ */
/*
* String manipulation library for Boehm GC
*
***************
*** 262,268 ****
int i;
STR_LENGTH_CHECK(s);
for (i = 0; i < s->length; i++)
! s->ptr[i] = tolower(s->ptr[i]);
}
void
--- 262,268 ----
int i;
STR_LENGTH_CHECK(s);
for (i = 0; i < s->length; i++)
! s->ptr[i] = TOLOWER(s->ptr[i]);
}
void
***************
*** 271,277 ****
int i;
STR_LENGTH_CHECK(s);
for (i = 0; i < s->length; i++)
! s->ptr[i] = toupper(s->ptr[i]);
}
void
--- 271,277 ----
int i;
STR_LENGTH_CHECK(s);
for (i = 0; i < s->length; i++)
! s->ptr[i] = TOUPPER(s->ptr[i]);
}
void
diff -crN -x CVS w3m-0.3.2.2/Str.h w3m-js-1.743/Str.h
*** w3m-0.3.2.2/Str.h 2001-11-24 11:01:26.000000000 +0900
--- w3m-js-1.743/Str.h 2003-01-21 22:18:19.000000000 +0900
***************
*** 1,4 ****
! /* $Id: Str.h,v 1.4 2001/11/24 02:01:26 ukai Exp $ */
/*
* String manipulation library for Boehm GC
*
--- 1,4 ----
! /* $Id: Str.h,v 1.5 2003/01/20 15:30:19 ukai Exp $ */
/*
* String manipulation library for Boehm GC
*
***************
*** 70,83 ****
#define Strcmp(x,y) strcmp((x)->ptr,(y)->ptr)
#define Strcmp_charp(x,y) strcmp((x)->ptr,(y))
#define Strncmp(x,y,n) strncmp((x)->ptr,(y)->ptr,(n))
! #define Strncmp_charp(x,y,n) strncmp((x)->ptr,y,(n))
#define Strcasecmp(x,y) strcasecmp((x)->ptr,(y)->ptr)
#define Strcasecmp_charp(x,y) strcasecmp((x)->ptr,(y))
#define Strncasecmp(x,y,n) strncasecmp((x)->ptr,(y)->ptr,(n))
! #define Strncasecmp_charp(x,y,n) strncasecmp((x)->ptr,y,(n))
#define Strlastchar(s) ((s)->length>0?(s)->ptr[(s)->length-1]:'\0')
! #define Strinsert(s,n,p) Strinsert_charp(s,n,(p)->ptr)
! #define Strshrinkfirst(s,n) Strdelete(s,0,n)
#define Strfputs(s,f) fwrite((s)->ptr,1,(s)->length,(f))
#endif /* not GC_STR_H */
--- 70,83 ----
#define Strcmp(x,y) strcmp((x)->ptr,(y)->ptr)
#define Strcmp_charp(x,y) strcmp((x)->ptr,(y))
#define Strncmp(x,y,n) strncmp((x)->ptr,(y)->ptr,(n))
! #define Strncmp_charp(x,y,n) strncmp((x)->ptr,(y),(n))
#define Strcasecmp(x,y) strcasecmp((x)->ptr,(y)->ptr)
#define Strcasecmp_charp(x,y) strcasecmp((x)->ptr,(y))
#define Strncasecmp(x,y,n) strncasecmp((x)->ptr,(y)->ptr,(n))
! #define Strncasecmp_charp(x,y,n) strncasecmp((x)->ptr,(y),(n))
#define Strlastchar(s) ((s)->length>0?(s)->ptr[(s)->length-1]:'\0')
! #define Strinsert(s,n,p) Strinsert_charp((s),(n),(p)->ptr)
! #define Strshrinkfirst(s,n) Strdelete((s),0,(n))
#define Strfputs(s,f) fwrite((s)->ptr,1,(s)->length,(f))
#endif /* not GC_STR_H */
diff -crN -x CVS w3m-0.3.2.2/TODO w3m-js-1.743/TODO
*** w3m-0.3.2.2/TODO 1970-01-01 09:00:00.000000000 +0900
--- w3m-js-1.743/TODO 2003-02-06 02:23:03.000000000 +0900
***************
*** 0 ****
--- 1,71 ----
+ TODO lists
+
+ Documentation
+
+ new features
+ * Keep alive
+ * incremental display, background download
+ [w3m-dev 03389] background download
+ * bookmark editor
+ [w3m-dev 03394] bookmark editor
+ * w3mimgdisplay without X
+ [w3m-dev 03723] Re: w3mimgdisplayfb (independent of X)
+ http://homepage3.nifty.com/slokar/fb/w3mimgfb-0.6.tar.gz
+ http://homepage3.nifty.com/slokar/stimg/stimg-0.0.0.tar.gz
+ * Internationalized Domain Name support
+ [w3m-dev 03727] Re: IDN support (test)
+ idnkit (http://www.nic.ad.jp/ja/idn/) ､ﾈ iconv ､ｬﾉｬﾍﾗ､ﾇ､ｹ｡｣
+
+ * SMB
+ * merge m17n
+ * JavaScript
+
+ cleanups
+ * autoconfisicate
+ * code review, cleanup
+
+ bugs
+ * fix [w3m-dev 02658] problem when form is reset
+ http://mi.med.tohoku.ac.jp/~satodai/w3m-dev/200112.month/2658.html
+
+ * wishlist? [w3m-dev 03507] save space in JP chars
+
+ [sf.net] http://sf.net/projects/w3m
+
+ [bugs] http://bugs.debian.org/w3m
+
+ * parsing bug: omitting </p> should not matter, but it does
+ http://bugs.debian.org/115521
+
+ * MOUSE_SCROLL_LINE should be a run-time option
+ http://bugs.debian.org/87472
+
+ * support for the <button> tag (HTML 4.01)
+ http://bugs.debian.org/136810
+
+ * not working 'Ignore case when search' on non latin pages
+ http://bugs.debian.org/138891
+ => after m17n merge
+
+ * w3m: Unable to use mozilla bugzilla
+ http://bugs.debian.org/170506
+ => [w3m-dev 03469]?
+ backport from w3m-js?
+
+ fixed?
+ * would like "forward to next buffer"
+ http://bugs.debian.org/51771
+ => tab browse?
+
+ * alt attributes in area elements are ignored
+ http://bugs.debian.org/81555
+ => fixed in w3m 0.3?
+
+ wontfix / impossible to fix
+ * w3m -dump generates too long lines
+ http://bugs.debian.org/149288
+
+ wishlist?
+ * w3mman -l doesn't work
+ http://bugs.debian.org/138805
+
diff -crN -x CVS w3m-0.3.2.2/XMakefile w3m-js-1.743/XMakefile
*** w3m-0.3.2.2/XMakefile 2002-10-29 02:09:18.000000000 +0900
--- w3m-js-1.743/XMakefile 2003-02-08 02:38:49.000000000 +0900
***************
*** 1,14 ****
! # $Id: XMakefile,v 1.29 2002/10/28 17:09:18 ukai Exp $
SRCS=main.c file.c buffer.c display.c etc.c search.c linein.c table.c local.c \
form.c map.c frame.c rc.c menu.c mailcap.c image.c\
! func.c cookie.c history.c backend.c $(KEYBIND_SRC)
OBJS=main.o file.o buffer.o display.o etc.o search.o linein.o table.o local.o\
form.o map.o frame.o rc.o menu.o mailcap.o image.o\
! func.o cookie.o history.o backend.o $(KEYBIND_OBJ)
LSRCS=terms.c conv.c url.c ftp.c anchor.c mimehead.c parsetagx.c\
! tagtable.c istream.c
LOBJS=terms.o conv.o url.o ftp.o anchor.o mimehead.o parsetagx.o\
! tagtable.o istream.o
LLOBJS=version.o
ALIBOBJS=Str.o indep.o regex.o textlist.o parsetag.o myctype.o entity.o hash.o
ALIB=libindep.a
--- 1,16 ----
! # $Id: XMakefile,v 1.34 2002/12/27 16:07:44 ukai Exp $
SRCS=main.c file.c buffer.c display.c etc.c search.c linein.c table.c local.c \
form.c map.c frame.c rc.c menu.c mailcap.c image.c\
! func.c cookie.c history.c backend.c $(KEYBIND_SRC)\
! script.c js_html.c
OBJS=main.o file.o buffer.o display.o etc.o search.o linein.o table.o local.o\
form.o map.o frame.o rc.o menu.o mailcap.o image.o\
! func.o cookie.o history.o backend.o $(KEYBIND_OBJ)\
! script.o js_html.o
LSRCS=terms.c conv.c url.c ftp.c anchor.c mimehead.c parsetagx.c\
! tagtable.c istream.c news.c
LOBJS=terms.o conv.o url.o ftp.o anchor.o mimehead.o parsetagx.o\
! tagtable.o istream.o news.o
LLOBJS=version.o
ALIBOBJS=Str.o indep.o regex.o textlist.o parsetag.o myctype.o entity.o hash.o
ALIB=libindep.a
***************
*** 19,27 ****
HELPER=w3mhelperpanel$(EXT)
INFLATE=inflate$(EXT)
IMGDISPLAY=w3mimgdisplay$(EXT)
MAN1=doc/w3m.1
MAN1_JA=doc-jp/w3m.1
! TARGETS=$(TARGET) $(EXT_TARGETS)
HELP_ALLFILES=w3mhelp-w3m_en.html w3mhelp-w3m_ja.html \
w3mhelp-lynx_en.html w3mhelp-lynx_ja.html
--- 21,31 ----
HELPER=w3mhelperpanel$(EXT)
INFLATE=inflate$(EXT)
IMGDISPLAY=w3mimgdisplay$(EXT)
+ MAN1_TARGET=w3m.1
MAN1=doc/w3m.1
MAN1_JA=doc-jp/w3m.1
! TARGETS=$(TARGET) $(LIB_TARGETS) $(AUXBIN_TARGETS)
! HELP_TARGET=w3mhelp.html
HELP_ALLFILES=w3mhelp-w3m_en.html w3mhelp-w3m_ja.html \
w3mhelp-lynx_en.html w3mhelp-lynx_ja.html
***************
*** 121,139 ****
install-core: $(TARGETS)
-$(MKDIR) $(DESTDIR)$(BIN_DIR)
-$(MKDIR) $(DESTDIR)$(LIB_DIR)
-$(MKDIR) $(DESTDIR)$(HELP_DIR)
-$(MKDIR) $(DESTDIR)$(MAN1_DIR)
-$(MKDIR) $(DESTDIR)$(MAN1_JA_DIR)
$(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(BIN_DIR)/$(TARGET)
! $(INSTALL_DATA) $(HELP_FILE) $(DESTDIR)$(HELP_DIR)/w3mhelp.html
! $(INSTALL_DATA) $(MAN1) $(DESTDIR)$(MAN1_DIR)/$(TARGET).1
! $(INSTALL_DATA) $(MAN1_JA) $(DESTDIR)$(MAN1_JA_DIR)/$(TARGET).1
! for file in $(EXT_TARGETS); \
do \
$(INSTALL_PROGRAM) $$file $(DESTDIR)$(LIB_DIR)/$$file; \
done
install-helpfile:
-$(MKDIR) $(DESTDIR)$(HELP_DIR)
for file in $(HELP_ALLFILES); \
--- 125,152 ----
install-core: $(TARGETS)
-$(MKDIR) $(DESTDIR)$(BIN_DIR)
+ -$(MKDIR) $(DESTDIR)$(AUXBIN_DIR)
-$(MKDIR) $(DESTDIR)$(LIB_DIR)
-$(MKDIR) $(DESTDIR)$(HELP_DIR)
-$(MKDIR) $(DESTDIR)$(MAN1_DIR)
-$(MKDIR) $(DESTDIR)$(MAN1_JA_DIR)
$(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(BIN_DIR)/$(TARGET)
! $(INSTALL_DATA) $(HELP_FILE) $(DESTDIR)$(HELP_DIR)/$(HELP_TARGET)
! $(INSTALL_DATA) $(MAN1) $(DESTDIR)$(MAN1_DIR)/$(MAN1_TARGET)
! $(INSTALL_DATA) $(MAN1_JA) $(DESTDIR)$(MAN1_JA_DIR)/$(MAN1_TARGET)
! for file in $(AUXBIN_TARGETS); \
! do \
! case $$file in \
! $(IMGDISPLAY)) $(INSTALL_W3MIMGDISPLAY) $$file $(DESTDIR)$(AUXBIN_DIR)/$$file;; \
! *) $(INSTALL_PROGRAM) $$file $(DESTDIR)$(AUXBIN_DIR)/$$file;; \
! esac; \
! done
! for file in $(LIB_TARGETS); \
do \
$(INSTALL_PROGRAM) $$file $(DESTDIR)$(LIB_DIR)/$$file; \
done
+
install-helpfile:
-$(MKDIR) $(DESTDIR)$(HELP_DIR)
for file in $(HELP_ALLFILES); \
***************
*** 144,162 ****
all-scripts:
for dir in $(SCRIPTSUBDIRS); \
do \
! (cd $$dir; $(MAKE) PERL='$(PERL)' BIN_DIR='$(BIN_DIR)' LIB_DIR='$(LIB_DIR)' HELP_DIR='$(HELP_DIR)' RC_DIR='$(RC_DIR)' KEYBIND_SRC='$(KEYBIND_SRC)'); \
done
install-scripts: all-scripts
topdir=`pwd`; \
for dir in $(SCRIPTSUBDIRS); \
do \
! (cd $$dir; $(MAKE) PERL='$(PERL)' MKDIR='$(MKDIR)' BIN_DIR='$(BIN_DIR)' LIB_DIR='$(LIB_DIR)' HELP_DIR='$(HELP_DIR)' MAN_DIR='$(MAN_DIR)' DESTDIR='$(DESTDIR)' INSTALL="sh $$topdir/install-sh" install); \
done
uninstall:
-rm -f $(BIN_DIR)/$(TARGET)
! -for file in $(EXT_TARGETS); \
do \
rm -f $(LIB_DIR)/$$file; \
done
--- 157,179 ----
all-scripts:
for dir in $(SCRIPTSUBDIRS); \
do \
! (cd $$dir; $(MAKE) PERL='$(PERL)' BIN_DIR='$(BIN_DIR)' AUXBIN_DIR='$(AUXBIN_DIR)' LIB_DIR='$(LIB_DIR)' HELP_DIR='$(HELP_DIR)' RC_DIR='$(RC_DIR)' KEYBIND_SRC='$(KEYBIND_SRC)'); \
done
install-scripts: all-scripts
topdir=`pwd`; \
for dir in $(SCRIPTSUBDIRS); \
do \
! (cd $$dir; $(MAKE) PERL='$(PERL)' MKDIR='$(MKDIR)' BIN_DIR='$(BIN_DIR)' AUXBIN_DIR='$(AUXBIN_DIR)' LIB_DIR='$(LIB_DIR)' HELP_DIR='$(HELP_DIR)' MAN_DIR='$(MAN_DIR)' DESTDIR='$(DESTDIR)' INSTALL="sh $$topdir/install-sh" install); \
done
uninstall:
-rm -f $(BIN_DIR)/$(TARGET)
! -for file in $(AUXBIN_TARGETS); \
! do \
! rm -f $(AUXBIN_DIR)/$$file; \
! done
! -for file in $(LIB_TARGETS); \
do \
rm -f $(LIB_DIR)/$$file; \
done
***************
*** 164,171 ****
do \
rm -f $(HELP_DIR)/$$file; \
done
! -rm -f $(MAN1_DIR)/$(TARGET).1
! -rm -f $(MAN1_JA_DIR)/$(TARGET).1
-for dir in $(SCRIPTSUBDIRS); \
do \
(cd $$dir; $(MAKE) BIN_DIR='$(BIN_DIR)' LIB_DIR='$(LIB_DIR)' HELP_DIR='$(HELP_DIR)' MAN_DIR='$(MAN_DIR)' uninstall); \
--- 181,189 ----
do \
rm -f $(HELP_DIR)/$$file; \
done
! -rm -f $(HELP_DIR)/$(HELP_TARGET)
! -rm -f $(MAN1_DIR)/$(MAN1_TARGET)
! -rm -f $(MAN1_JA_DIR)/$(MAN1_TARGET)
-for dir in $(SCRIPTSUBDIRS); \
do \
(cd $$dir; $(MAKE) BIN_DIR='$(BIN_DIR)' LIB_DIR='$(LIB_DIR)' HELP_DIR='$(HELP_DIR)' MAN_DIR='$(MAN_DIR)' uninstall); \
diff -crN -x CVS w3m-0.3.2.2/anchor.c w3m-js-1.743/anchor.c
*** w3m-0.3.2.2/anchor.c 2002-09-06 00:43:21.000000000 +0900
--- w3m-js-1.743/anchor.c 2003-02-06 02:23:05.000000000 +0900
***************
*** 1,4 ****
! /* $Id: anchor.c,v 1.11 2002/09/05 15:43:21 ukai Exp $ */
#include "fm.h"
#include "myctype.h"
#include "regex.h"
--- 1,4 ----
! /* $Id: anchor.c,v 1.24 2003/02/05 16:45:07 ukai Exp $ */
#include "fm.h"
#include "myctype.h"
#include "regex.h"
***************
*** 7,13 ****
AnchorList *
putAnchor(AnchorList *al, char *url, char *target, Anchor **anchor_return,
! char *referer, int line, int pos)
{
int n, i, j;
Anchor *a;
--- 7,13 ----
AnchorList *
putAnchor(AnchorList *al, char *url, char *target, Anchor **anchor_return,
! char *referer, char *title, unsigned char key, int line, int pos)
{
int n, i, j;
Anchor *a;
***************
*** 44,49 ****
--- 44,52 ----
a->url = url;
a->target = target;
a->referer = referer;
+ a->title = title;
+ a->accesskey = key;
+ a->slave = FALSE;
a->start = bp;
a->end = bp;
al->nanchor++;
***************
*** 54,64 ****
Anchor *
! registerHref(Buffer *buf, char *url, char *target, char *referer, int line,
! int pos)
{
Anchor *a;
! buf->href = putAnchor(buf->href, url, target, &a, referer, line, pos);
return a;
}
--- 57,68 ----
Anchor *
! registerHref(Buffer *buf, char *url, char *target, char *referer, char *title,
! unsigned char key, int line, int pos)
{
Anchor *a;
! buf->href = putAnchor(buf->href, url, target, &a, referer, title, key,
! line, pos);
return a;
}
***************
*** 66,80 ****
registerName(Buffer *buf, char *url, int line, int pos)
{
Anchor *a;
! buf->name = putAnchor(buf->name, url, NULL, &a, NULL, line, pos);
return a;
}
Anchor *
! registerImg(Buffer *buf, char *url, int line, int pos)
{
Anchor *a;
! buf->img = putAnchor(buf->img, url, NULL, &a, NULL, line, pos);
return a;
}
--- 70,86 ----
registerName(Buffer *buf, char *url, int line, int pos)
{
Anchor *a;
! buf->name = putAnchor(buf->name, url, NULL, &a, NULL, NULL, '\0', line,
! pos);
return a;
}
Anchor *
! registerImg(Buffer *buf, char *url, char *title, int line, int pos)
{
Anchor *a;
! buf->img = putAnchor(buf->img, url, NULL, &a, NULL, title, '\0', line,
! pos);
return a;
}
***************
*** 88,95 ****
fi = formList_addInput(flist, tag);
if (fi == NULL)
return NULL;
! buf->formitem = putAnchor(buf->formitem,
! (char *)fi, flist->target, &a, NULL, line, pos);
return a;
}
--- 94,101 ----
fi = formList_addInput(flist, tag);
if (fi == NULL)
return NULL;
! buf->formitem = putAnchor(buf->formitem, (char *)fi, flist->target, &a,
! NULL, NULL, '\0', line, pos);
return a;
}
***************
*** 187,207 ****
{
Str tmp;
! p1++;
! if (*(p2 - 1) == '>')
! p2--;
! tmp = Strnew_size(sizeof("news:") - 1 + (p2 - p1));
! Strcat_charp_n(tmp, "news:", sizeof("news:") - 1);
! Strcat_charp_n(tmp, p1, p2 - p1);
! return registerHref(buf, tmp->ptr, NULL, NO_REFERER, line, pos);
}
#endif /* USE_NNTP */
static Anchor *
_put_anchor_all(Buffer *buf, char *p1, char *p2, int line, int pos)
{
! return registerHref(buf, allocStr(p1, p2 - p1), NULL, NO_REFERER, line,
! pos);
}
static void
--- 193,218 ----
{
Str tmp;
! if (*p1 == '<') {
! p1++;
! if (*(p2 - 1) == '>')
! p2--;
! }
! tmp = conv_str(Strnew_charp_n(p1, p2 - p1), InnerCode, buf->document_code);
! tmp = Sprintf("news:%s", file_quote(tmp->ptr));
! return registerHref(buf, tmp->ptr, NULL, NO_REFERER, NULL, '\0', line,
! pos);
}
#endif /* USE_NNTP */
static Anchor *
_put_anchor_all(Buffer *buf, char *p1, char *p2, int line, int pos)
{
! Str tmp;
!
! tmp = conv_str(Strnew_charp_n(p1, p2 - p1), InnerCode, buf->document_code);
! return registerHref(buf, url_quote(tmp->ptr), NULL, NO_REFERER, NULL,
! '\0', line, pos);
}
static void
***************
*** 283,289 ****
{
Anchor *a;
int spos, epos;
! int i;
spos = p1 - l->lineBuf;
epos = p2 - l->lineBuf;
--- 294,300 ----
{
Anchor *a;
int spos, epos;
! int i, hseq = -2;
spos = p1 - l->lineBuf;
epos = p2 - l->lineBuf;
***************
*** 291,302 ****
if (l->propBuf[i] & (PE_ANCHOR | PE_FORM))
return p2;
}
! a = anchorproc(buf, p1, p2, l->linenumber, p1 - l->lineBuf);
! a->end.line = l->linenumber;
! a->end.pos = epos;
! a->hseq = -2;
! for (i = a->start.pos; i < a->end.pos; i++)
l->propBuf[i] |= PE_ANCHOR;
return p2;
}
--- 302,328 ----
if (l->propBuf[i] & (PE_ANCHOR | PE_FORM))
return p2;
}
! for (i = spos; i < epos; i++)
l->propBuf[i] |= PE_ANCHOR;
+ while (1) {
+ a = anchorproc(buf, p1, p2, l->linenumber, spos);
+ a->hseq = hseq;
+ if (hseq == -2) {
+ reseq_anchor(buf);
+ hseq = a->hseq;
+ }
+ a->end.line = l->linenumber;
+ if (epos > l->len) {
+ a->end.pos = l->len;
+ spos = 0;
+ epos -= l->len;
+ l = l->next;
+ }
+ else {
+ a->end.pos = epos;
+ break;
+ }
+ }
return p2;
}
***************
*** 304,310 ****
reAnchorWord(Buffer *buf, Line *l, int spos, int epos)
{
reAnchorPos(buf, l, &l->lineBuf[spos], &l->lineBuf[epos], _put_anchor_all);
- reseq_anchor(buf);
}
/* search regexp and register them as anchors */
--- 330,335 ----
***************
*** 314,320 ****
Anchor *(*anchorproc) (Buffer *, char *, char *, int, int))
{
Line *l;
! char *p, *p1, *p2;
if (re == NULL || *re == '\0') {
return NULL;
--- 339,345 ----
Anchor *(*anchorproc) (Buffer *, char *, char *, int, int))
{
Line *l;
! char *p = NULL, *p1, *p2;
if (re == NULL || *re == '\0') {
return NULL;
***************
*** 325,333 ****
for (l = MarkAllPages ? buf->firstLine : buf->topLine; l != NULL &&
(MarkAllPages || l->linenumber < buf->topLine->linenumber + LASTLINE);
l = l->next) {
p = l->lineBuf;
for (;;) {
! if (regexMatch(p, &l->lineBuf[l->len] - p, p == l->lineBuf) == 1) {
matchedPosition(&p1, &p2);
p = reAnchorPos(buf, l, p1, p2, anchorproc);
}
--- 350,360 ----
for (l = MarkAllPages ? buf->firstLine : buf->topLine; l != NULL &&
(MarkAllPages || l->linenumber < buf->topLine->linenumber + LASTLINE);
l = l->next) {
+ if (p && l->bpos)
+ continue;
p = l->lineBuf;
for (;;) {
! if (regexMatch(p, &l->lineBuf[l->size] - p, p == l->lineBuf) == 1) {
matchedPosition(&p1, &p2);
p = reAnchorPos(buf, l, p1, p2, anchorproc);
}
***************
*** 335,341 ****
break;
}
}
- reseq_anchor(buf);
return NULL;
}
--- 362,367 ----
***************
*** 351,356 ****
--- 377,439 ----
{
return reAnchorAny(buf, re, _put_anchor_news);
}
+
+ char *
+ reAnchorNewsheader(Buffer *buf)
+ {
+ Line *l;
+ char *p, *p1, *p2;
+ static char *header_mid[] = {
+ "Message-Id:", "References:", "In-Reply-To:", NULL
+ };
+ static char *header_group[] = {
+ "Newsgroups:", NULL
+ };
+ char **header, **q;
+ int i, search = FALSE;
+
+ if (!buf || !buf->firstLine)
+ return NULL;
+ for (i = 0; i <= 1; i++) {
+ if (i == 0) {
+ regexCompile("<[!-;=?-~]+@[a-zA-Z0-9\\.\\-_]+>", 1);
+ header = header_mid;
+ }
+ else {
+ regexCompile("[a-zA-Z0-9\\.\\-_]+", 1);
+ header = header_group;
+ }
+ for (l = buf->firstLine; l != NULL && l->real_linenumber == 0;
+ l = l->next) {
+ if (l->bpos)
+ continue;
+ p = l->lineBuf;
+ if (!IS_SPACE(*p)) {
+ search = FALSE;
+ for (q = header; *q; q++) {
+ if (!strncasecmp(p, *q, strlen(*q))) {
+ search = TRUE;
+ p = strchr(p, ':') + 1;
+ break;
+ }
+ }
+ }
+ if (!search)
+ continue;
+ for (;;) {
+ if (regexMatch(p, &l->lineBuf[l->size] - p, p == l->lineBuf)
+ == 1) {
+ matchedPosition(&p1, &p2);
+ p = reAnchorPos(buf, l, p1, p2, _put_anchor_news);
+ }
+ else
+ break;
+ }
+ }
+ }
+ reseq_anchor(buf);
+ return NULL;
+ }
#endif /* USE_NNTP */
#define FIRST_MARKER_SIZE 30
***************
*** 471,493 ****
if (a_img.start.line == l->linenumber)
continue;
pos = columnPos(l, col);
! a = registerImg(buf, a_img.url, l->linenumber, pos);
a->hseq = -a_img.hseq;
a->image = img;
a->end.pos = pos + ecol - col;
for (k = pos; k < a->end.pos; k++)
l->propBuf[k] |= PE_IMAGE;
if (a_href.url) {
a = registerHref(buf, a_href.url, a_href.target,
! a_href.referer, l->linenumber, pos);
a->hseq = a_href.hseq;
a->end.pos = pos + ecol - col;
for (k = pos; k < a->end.pos; k++)
l->propBuf[k] |= PE_ANCHOR;
}
if (a_form.url) {
buf->formitem = putAnchor(buf->formitem, a_form.url,
! a_form.target, &a, NULL,
l->linenumber, pos);
a->hseq = a_form.hseq;
a->end.pos = pos + ecol - col;
--- 554,579 ----
if (a_img.start.line == l->linenumber)
continue;
pos = columnPos(l, col);
! a = registerImg(buf, a_img.url, a_img.title, l->linenumber, pos);
a->hseq = -a_img.hseq;
+ a->slave = TRUE;
a->image = img;
a->end.pos = pos + ecol - col;
for (k = pos; k < a->end.pos; k++)
l->propBuf[k] |= PE_IMAGE;
if (a_href.url) {
a = registerHref(buf, a_href.url, a_href.target,
! a_href.referer, a_href.title,
! a_href.accesskey, l->linenumber, pos);
a->hseq = a_href.hseq;
+ a->slave = TRUE;
a->end.pos = pos + ecol - col;
for (k = pos; k < a->end.pos; k++)
l->propBuf[k] |= PE_ANCHOR;
}
if (a_form.url) {
buf->formitem = putAnchor(buf->formitem, a_form.url,
! a_form.target, &a, NULL, NULL, '\0',
l->linenumber, pos);
a->hseq = a_form.hseq;
a->end.pos = pos + ecol - col;
***************
*** 542,549 ****
if (a_form.start.line == l->linenumber)
continue;
buf->formitem = putAnchor(buf->formitem, a_form.url,
! a_form.target, &a, NULL, l->linenumber,
! pos);
a->hseq = a_form.hseq;
a->y = a_form.y;
a->end.pos = pos + ecol - col;
--- 628,635 ----
if (a_form.start.line == l->linenumber)
continue;
buf->formitem = putAnchor(buf->formitem, a_form.url,
! a_form.target, &a, NULL, NULL, '\0',
! l->linenumber, pos);
a->hseq = a_form.hseq;
a->y = a_form.y;
a->end.pos = pos + ecol - col;
***************
*** 554,556 ****
--- 640,812 ----
}
}
}
+
+ char *
+ getAnchorText(Buffer *buf, AnchorList *al, Anchor *a)
+ {
+ int hseq, i;
+ Line *l;
+ Str tmp = NULL;
+ char *p, *ep;
+
+ if (!a || a->hseq < 0)
+ return NULL;
+ hseq = a->hseq;
+ l = buf->firstLine;
+ for (i = 0; i < al->nanchor; i++) {
+ a = &al->anchors[i];
+ if (a->hseq != hseq)
+ continue;
+ for (; l; l = l->next) {
+ if (l->linenumber == a->start.line)
+ break;
+ }
+ if (!l)
+ break;
+ p = l->lineBuf + a->start.pos;
+ ep = l->lineBuf + a->end.pos;
+ for (; p < ep && IS_SPACE(*p); p++) ;
+ if (p == ep)
+ continue;
+ if (!tmp)
+ tmp = Strnew_size(ep - p);
+ else
+ Strcat_char(tmp, ' ');
+ Strcat_charp_n(tmp, p, ep - p);
+ }
+ return tmp ? tmp->ptr : NULL;
+ }
+
+ Buffer *
+ link_list_panel(Buffer *buf)
+ {
+ LinkList *l;
+ AnchorList *al;
+ Anchor *a;
+ FormItemList *fi;
+ int i;
+ char *t, *u, *p;
+ ParsedURL pu;
+ Str tmp = Strnew_charp("<title>Link List \
+ Link List \n");
+
+ if (buf->bufferprop & BP_INTERNAL ||
+ (buf->linklist == NULL && buf->href == NULL && buf->img == NULL)) {
+ return NULL;
+ }
+
+ if (buf->linklist) {
+ Strcat_charp(tmp, "Links \n\n");
+ for (l = buf->linklist; l; l = l->next) {
+ if (l->url) {
+ parseURL2(l->url, &pu, baseURL(buf));
+ p = parsedURL2Str(&pu)->ptr;
+ u = html_quote(p);
+ if (DecodeURL)
+ p = html_quote(url_unquote_conv(p, buf->document_code));
+ else
+ p = u;
+ }
+ else
+ u = p = "";
+ if (l->type == LINK_TYPE_REL)
+ t = " [Rel]";
+ else if (l->type == LINK_TYPE_REV)
+ t = " [Rev]";
+ else
+ t = "";
+ t = Sprintf("%s%s\n", l->title ? l->title : "", t)->ptr;
+ t = html_quote(t);
+ Strcat_m_charp(tmp, "", t, " \n");
+ }
+
+ if (buf->href) {
+ Strcat_charp(tmp, "Anchors \n\n");
+ al = buf->href;
+ for (i = 0; i < al->nanchor; i++) {
+ a = &al->anchors[i];
+ if (a->slave)
+ continue;
+ parseURL2(a->url, &pu, baseURL(buf));
+ p = parsedURL2Str(&pu)->ptr;
+ u = html_quote(p);
+ if (DecodeURL)
+ p = html_quote(url_unquote_conv(p, buf->document_code));
+ else
+ p = u;
+ t = getAnchorText(buf, al, a);
+ t = t ? html_quote(t) : "";
+ Strcat_m_charp(tmp, "", t, " \n");
+ }
+
+ if (buf->img) {
+ Strcat_charp(tmp, "Images \n\n");
+ al = buf->img;
+ for (i = 0; i < al->nanchor; i++) {
+ a = &al->anchors[i];
+ if (a->slave)
+ continue;
+ parseURL2(a->url, &pu, baseURL(buf));
+ p = parsedURL2Str(&pu)->ptr;
+ u = html_quote(p);
+ if (DecodeURL)
+ p = html_quote(url_unquote_conv(p, buf->document_code));
+ else
+ p = u;
+ if (a->title && *a->title)
+ t = html_quote(a->title);
+ else if (DecodeURL)
+ t = html_quote(url_unquote_conv(a->url, buf->document_code));
+ else
+ t = html_quote(a->url);
+ Strcat_m_charp(tmp, "", t, " Image map \n\n");
+ for (mi = ml->area->first; mi != NULL; mi = mi->next) {
+ m = (MapArea *) mi->ptr;
+ if (!m)
+ continue;
+ parseURL2(m->url, &pu, baseURL(buf));
+ p = parsedURL2Str(&pu)->ptr;
+ u = html_quote(p);
+ if (DecodeURL)
+ p = html_quote(url_unquote_conv(p,
+ buf->document_code));
+ else
+ p = u;
+ if (m->alt && *m->alt)
+ t = html_quote(m->alt);
+ else if (DecodeURL)
+ t = html_quote(url_unquote_conv(m->url,
+ buf->document_code));
+ else
+ t = html_quote(m->url);
+ Strcat_m_charp(tmp, "", t,
+ " \n");
+ }
+ }
+ Strcat_charp(tmp, " \n");
+ }
+
+ return loadHTMLString(tmp);
+ }
diff -crN -x CVS w3m-0.3.2.2/backend.c w3m-js-1.743/backend.c
*** w3m-0.3.2.2/backend.c 2002-02-04 00:25:45.000000000 +0900
--- w3m-js-1.743/backend.c 2003-01-24 21:58:51.000000000 +0900
***************
*** 1,8 ****
! /* $Id: backend.c,v 1.9 2002/02/03 15:25:45 ukai Exp $ */
#include
#include
#include
- #include
#include "fm.h"
#include "gc.h"
#include "terms.h"
--- 1,7 ----
! /* $Id: backend.c,v 1.11 2003/01/23 18:37:20 ukai Exp $ */
#include
#include
#include
#include "fm.h"
#include "gc.h"
#include "terms.h"
***************
*** 149,155 ****
}
print_headers(buf, len);
printf("\n");
! saveBuffer(buf, stdout);
}
else {
print_headers(buf, 0);
--- 148,154 ----
}
print_headers(buf, len);
printf("\n");
! saveBuffer(buf, stdout, TRUE);
}
else {
print_headers(buf, 0);
diff -crN -x CVS w3m-0.3.2.2/buffer.c w3m-js-1.743/buffer.c
*** w3m-0.3.2.2/buffer.c 2002-03-16 04:02:40.000000000 +0900
--- w3m-js-1.743/buffer.c 2003-02-08 02:38:49.000000000 +0900
***************
*** 1,4 ****
! /* $Id: buffer.c,v 1.13 2002/03/15 19:02:40 ukai Exp $ */
#include "fm.h"
#ifdef USE_MOUSE
--- 1,4 ----
! /* $Id: buffer.c,v 1.27 2003/02/03 15:49:19 ukai Exp $ */
#include "fm.h"
#ifdef USE_MOUSE
***************
*** 32,37 ****
--- 32,38 ----
bzero((void *)n, sizeof(Buffer));
n->width = width;
n->COLS = COLS;
+ n->LINES = LASTLINE;
n->currentURL.scheme = SCM_UNKNOWN;
n->baseURL = NULL;
n->baseTarget = NULL;
***************
*** 39,45 ****
n->bufferprop = BP_NORMAL;
n->clone = New(int);
*n->clone = 1;
- n->linelen = 0;
n->trbyte = 0;
#ifdef USE_SSL
n->ssl_certificate = NULL;
--- 40,45 ----
***************
*** 96,107 ****
return;
if (buf->pagerSource)
ISclose(buf->pagerSource);
! if (buf->sourcefile) {
if (buf->real_scheme != SCM_LOCAL || buf->bufferprop & BP_FRAME)
unlink(buf->sourcefile);
}
if (buf->mailcap_source)
unlink(buf->mailcap_source);
while (buf->frameset) {
deleteFrameSet(buf->frameset);
buf->frameset = popFrameTree(&(buf->frameQ));
--- 96,114 ----
return;
if (buf->pagerSource)
ISclose(buf->pagerSource);
! if (buf->sourcefile &&
! (!buf->real_type || strncasecmp(buf->real_type, "image/", 6))) {
if (buf->real_scheme != SCM_LOCAL || buf->bufferprop & BP_FRAME)
unlink(buf->sourcefile);
}
+ if (buf->header_source)
+ unlink(buf->header_source);
if (buf->mailcap_source)
unlink(buf->mailcap_source);
+ #ifdef USE_SCRIPT
+ if (buf->script_lang)
+ script_close(buf);
+ #endif
while (buf->frameset) {
deleteFrameSet(buf->frameset);
buf->frameset = popFrameTree(&(buf->frameQ));
***************
*** 252,266 ****
sprintf(msg, "Last line is #%ld", buf->lastLine->linenumber);
set_delayed_message(msg);
buf->currentLine = l;
! buf->topLine = lineSkip(buf, buf->currentLine, -(LASTLINE - 1), FALSE);
return;
}
for (; l != NULL; l = l->next) {
if (l->linenumber >= n) {
buf->currentLine = l;
if (n < buf->topLine->linenumber ||
! buf->topLine->linenumber + LASTLINE <= n)
! buf->topLine = lineSkip(buf, l, -(LASTLINE + 1) / 2, FALSE);
break;
}
}
--- 259,274 ----
sprintf(msg, "Last line is #%ld", buf->lastLine->linenumber);
set_delayed_message(msg);
buf->currentLine = l;
! buf->topLine = lineSkip(buf, buf->currentLine, -(buf->LINES - 1),
! FALSE);
return;
}
for (; l != NULL; l = l->next) {
if (l->linenumber >= n) {
buf->currentLine = l;
if (n < buf->topLine->linenumber ||
! buf->topLine->linenumber + buf->LINES <= n)
! buf->topLine = lineSkip(buf, l, -(buf->LINES + 1) / 2, FALSE);
break;
}
}
***************
*** 294,308 ****
sprintf(msg, "Last line is #%ld", buf->lastLine->real_linenumber);
set_delayed_message(msg);
buf->currentLine = l;
! buf->topLine = lineSkip(buf, buf->currentLine, -(LASTLINE - 1), FALSE);
return;
}
for (; l != NULL; l = l->next) {
if (l->real_linenumber >= n) {
buf->currentLine = l;
if (n < buf->topLine->real_linenumber ||
! buf->topLine->real_linenumber + LASTLINE <= n)
! buf->topLine = lineSkip(buf, l, -(LASTLINE + 1) / 2, FALSE);
break;
}
}
--- 302,317 ----
sprintf(msg, "Last line is #%ld", buf->lastLine->real_linenumber);
set_delayed_message(msg);
buf->currentLine = l;
! buf->topLine = lineSkip(buf, buf->currentLine, -(buf->LINES - 1),
! FALSE);
return;
}
for (; l != NULL; l = l->next) {
if (l->real_linenumber >= n) {
buf->currentLine = l;
if (n < buf->topLine->real_linenumber ||
! buf->topLine->real_linenumber + buf->LINES <= n)
! buf->topLine = lineSkip(buf, l, -(buf->LINES + 1) / 2, FALSE);
break;
}
}
***************
*** 495,500 ****
--- 504,510 ----
if (!buf->need_reshape)
return;
buf->need_reshape = FALSE;
+ buf->width = INIT_BUFFER_WIDTH;
if (buf->sourcefile == NULL)
return;
init_stream(&f, SCM_LOCAL, NULL);
***************
*** 513,527 ****
buf->name = NULL;
buf->img = NULL;
buf->formitem = NULL;
! buf->width = INIT_BUFFER_WIDTH;
!
! #ifdef JP_CHARSET
! UseContentCharset = FALSE;
! UseAutoDetect = FALSE;
! #endif
! if (buf->search_header && buf->currentURL.scheme == SCM_LOCAL) {
! if (buf->header_source && (buf->mailcap_source ||
! !strcmp(buf->currentURL.file, "-"))) {
URLFile h;
init_stream(&h, SCM_LOCAL, NULL);
examineFile(buf->header_source, &h);
--- 523,539 ----
buf->name = NULL;
buf->img = NULL;
buf->formitem = NULL;
! buf->formlist = NULL;
! buf->linklist = NULL;
! buf->maplist = NULL;
! if (buf->hmarklist)
! buf->hmarklist->nmark = 0;
! if (buf->imarklist)
! buf->imarklist->nmark = 0;
!
! if (buf->header_source) {
! if (buf->currentURL.scheme != SCM_LOCAL ||
! buf->mailcap_source || !strcmp(buf->currentURL.file, "-")) {
URLFile h;
init_stream(&h, SCM_LOCAL, NULL);
examineFile(buf->header_source, &h);
***************
*** 530,539 ****
UFclose(&h);
}
}
! else
readHeader(&f, buf, TRUE, NULL);
}
if (!strcasecmp(buf->type, "text/html"))
loadHTMLBuffer(&f, buf);
else
--- 542,555 ----
UFclose(&h);
}
}
! else if (buf->search_header) /* -m option */
readHeader(&f, buf, TRUE, NULL);
}
+ #ifdef JP_CHARSET
+ UseContentCharset = FALSE;
+ UseAutoDetect = FALSE;
+ #endif
if (!strcasecmp(buf->type, "text/html"))
loadHTMLBuffer(&f, buf);
else
***************
*** 545,557 ****
#endif
buf->height = LASTLINE + 1;
! if (buf->firstLine)
! restorePosition(buf, &sbuf);
if (buf->check_url & CHK_URL)
chkURLBuffer(buf);
#ifdef USE_NNTP
if (buf->check_url & CHK_NMID)
chkNMIDBuffer(buf);
#endif
formResetBuffer(buf, sbuf.formitem);
}
--- 561,600 ----
#endif
buf->height = LASTLINE + 1;
! if (buf->firstLine && sbuf.firstLine) {
! Line *cur = sbuf.currentLine;
! int n;
!
! buf->pos = sbuf.pos + cur->bpos;
! while (cur->bpos && cur->prev)
! cur = cur->prev;
! if (cur->real_linenumber > 0)
! gotoRealLine(buf, cur->real_linenumber);
! else
! gotoLine(buf, cur->linenumber);
! n = (buf->currentLine->linenumber - buf->topLine->linenumber)
! - (cur->linenumber - sbuf.topLine->linenumber);
! if (n) {
! buf->topLine = lineSkip(buf, buf->topLine, n, FALSE);
! if (cur->real_linenumber > 0)
! gotoRealLine(buf, cur->real_linenumber);
! else
! gotoLine(buf, cur->linenumber);
! }
! buf->pos -= buf->currentLine->bpos;
! if (FoldLine && strcasecmp(buf->type, "text/html"))
! buf->currentColumn = 0;
! else
! buf->currentColumn = sbuf.currentColumn;
! arrangeCursor(buf);
! }
if (buf->check_url & CHK_URL)
chkURLBuffer(buf);
#ifdef USE_NNTP
if (buf->check_url & CHK_NMID)
chkNMIDBuffer(buf);
+ if (buf->real_scheme == SCM_NNTP || buf->real_scheme == SCM_NEWS)
+ reAnchorNewsheader(buf);
#endif
formResetBuffer(buf, sbuf.formitem);
}
***************
*** 607,622 ****
fwrite1(l->usrflags, cache) ||
fwrite1(l->width, cache) ||
fwrite1(l->len, cache) ||
! fwrite(l->lineBuf, 1, l->len, cache) < l->len ||
! fwrite(l->propBuf, sizeof(Lineprop), l->len, cache) < l->len)
goto _error;
#ifdef USE_ANSI_COLOR
colorflag = l->colorBuf ? 1 : 0;
if (fwrite1(colorflag, cache))
goto _error;
if (colorflag) {
! if (fwrite(l->colorBuf, sizeof(Linecolor), l->len, cache) < l->len)
! goto _error;
}
#endif
}
--- 650,673 ----
fwrite1(l->usrflags, cache) ||
fwrite1(l->width, cache) ||
fwrite1(l->len, cache) ||
! fwrite1(l->size, cache) ||
! fwrite1(l->bpos, cache) || fwrite1(l->bwidth, cache))
goto _error;
+ if (l->bpos == 0) {
+ if (fwrite(l->lineBuf, 1, l->size, cache) < l->size ||
+ fwrite(l->propBuf, sizeof(Lineprop), l->size, cache) < l->size)
+ goto _error;
+ }
#ifdef USE_ANSI_COLOR
colorflag = l->colorBuf ? 1 : 0;
if (fwrite1(colorflag, cache))
goto _error;
if (colorflag) {
! if (l->bpos == 0) {
! if (fwrite(l->colorBuf, sizeof(Linecolor), l->size, cache) <
! l->size)
! goto _error;
! }
}
#endif
}
***************
*** 635,641 ****
readBufferCache(Buffer *buf)
{
FILE *cache;
! Line *l = NULL, *prevl = NULL;
long lnum = 0, clnum, tlnum;
#ifdef USE_ANSI_COLOR
int colorflag;
--- 686,692 ----
readBufferCache(Buffer *buf)
{
FILE *cache;
! Line *l = NULL, *prevl = NULL, *basel = NULL;
long lnum = 0, clnum, tlnum;
#ifdef USE_ANSI_COLOR
int colorflag;
***************
*** 666,684 ****
buf->topLine = l;
if (fread1(l->real_linenumber, cache) ||
fread1(l->usrflags, cache) ||
! fread1(l->width, cache) || fread1(l->len, cache))
break;
- l->lineBuf = NewAtom_N(char, l->len + 1);
- fread(l->lineBuf, 1, l->len, cache);
- l->lineBuf[l->len] = '\0';
- l->propBuf = NewAtom_N(Lineprop, l->len);
- fread(l->propBuf, sizeof(Lineprop), l->len, cache);
#ifdef USE_ANSI_COLOR
if (fread1(colorflag, cache))
break;
if (colorflag) {
! l->colorBuf = NewAtom_N(Linecolor, l->len);
! fread(l->colorBuf, sizeof(Linecolor), l->len, cache);
}
else {
l->colorBuf = NULL;
--- 717,751 ----
buf->topLine = l;
if (fread1(l->real_linenumber, cache) ||
fread1(l->usrflags, cache) ||
! fread1(l->width, cache) ||
! fread1(l->len, cache) ||
! fread1(l->size, cache) ||
! fread1(l->bpos, cache) || fread1(l->bwidth, cache))
! break;
! if (l->bpos == 0) {
! basel = l;
! l->lineBuf = NewAtom_N(char, l->size + 1);
! fread(l->lineBuf, 1, l->size, cache);
! l->lineBuf[l->size] = '\0';
! l->propBuf = NewAtom_N(Lineprop, l->size);
! fread(l->propBuf, sizeof(Lineprop), l->size, cache);
! }
! else if (basel) {
! l->lineBuf = basel->lineBuf + l->bpos;
! l->propBuf = basel->propBuf + l->bpos;
! }
! else
break;
#ifdef USE_ANSI_COLOR
if (fread1(colorflag, cache))
break;
if (colorflag) {
! if (l->bpos == 0) {
! l->colorBuf = NewAtom_N(Linecolor, l->size);
! fread(l->colorBuf, sizeof(Linecolor), l->size, cache);
! }
! else
! l->colorBuf = basel->colorBuf + l->bpos;
}
else {
l->colorBuf = NULL;
diff -crN -x CVS w3m-0.3.2.2/config.h.dist w3m-js-1.743/config.h.dist
*** w3m-0.3.2.2/config.h.dist 2002-10-29 02:09:19.000000000 +0900
--- w3m-js-1.743/config.h.dist 2003-02-08 02:38:49.000000000 +0900
***************
*** 37,43 ****
/*
* Save Current-buffer Information
*/
! #define BUFINFO
/*
* Support EGD (Entropy Gathering Daemon)
--- 37,43 ----
/*
* Save Current-buffer Information
*/
! #undef BUFINFO
/*
* Support EGD (Entropy Gathering Daemon)
***************
*** 55,60 ****
--- 55,65 ----
#undef MENU_THIN_FRAME
/*
+ * Use raw scroll
+ */
+ #undef USE_RAW_SCROLL
+
+ /*
*/
#undef TABLE_EXPAND
#undef TABLE_NO_COMPACT
***************
*** 65,71 ****
#ifdef makefile_parameter
BIN_DIR = /usr/local/bin
! LIB_DIR = /usr/local/lib/w3m
HELP_DIR = /usr/local/share/w3m
MAN_DIR = /usr/local/man
MAN1_DIR = $(MAN_DIR)/man1
--- 70,77 ----
#ifdef makefile_parameter
BIN_DIR = /usr/local/bin
! AUXBIN_DIR = /usr/local/lib/w3m
! LIB_DIR = /usr/local/lib/w3m/cgi-bin
HELP_DIR = /usr/local/share/w3m
MAN_DIR = /usr/local/man
MAN1_DIR = $(MAN_DIR)/man1
***************
*** 84,90 ****
MATHLIB=-lm
Z_CFLAGS=-I/usr/include
ZLIB=-L/usr/lib -lz
! EXT_TARGETS=$(BOOKMARKER) $(HELPER) $(INFLATE)
IMGCFLAGS=
IMGLDFLAGS=
IMGX11CFLAGS=
--- 90,97 ----
MATHLIB=-lm
Z_CFLAGS=-I/usr/include
ZLIB=-L/usr/lib -lz
! AUXBIN_TARGETS=$(INFLATE)
! LIB_TARGETS=$(BOOKMARKER) $(HELPER)
IMGCFLAGS=
IMGLDFLAGS=
IMGX11CFLAGS=
***************
*** 98,103 ****
--- 105,111 ----
PERL=/usr/local/bin/perl
VERSION=0.2.2
MODEL=Linux.i686-monster-ja
+ INSTALL_W3MIMGDISPLAY=$(INSTALL_PROGRAM)
#else
***************
*** 137,142 ****
--- 145,151 ----
#undef USE_IMLIB2
#define USE_HELP_CGI
#undef USE_XFACE
+ #undef USE_JAVASCRIPT
#define DEF_EDITOR "/bin/vi"
#define DEF_MAILER "/bin/mail"
***************
*** 149,155 ****
/* for USE_MIGEMO */
#define DEF_MIGEMO_COMMAND "migemo -t egrep /usr/share/migemo/migemo-dict"
! #define LIB_DIR "/usr/local/lib/w3m"
#define HELP_DIR "/usr/local/lib/w3m"
#define ETC_DIR "/usr/local/etc/w3m"
#define HELP_FILE "w3mhelp.html"
--- 158,165 ----
/* for USE_MIGEMO */
#define DEF_MIGEMO_COMMAND "migemo -t egrep /usr/share/migemo/migemo-dict"
! #define AUXBIN_DIR "/usr/local/lib/w3m"
! #define LIB_DIR "/usr/local/lib/w3m/cgi-bin"
#define HELP_DIR "/usr/local/lib/w3m"
#define ETC_DIR "/usr/local/etc/w3m"
#define HELP_FILE "w3mhelp.html"
***************
*** 167,172 ****
--- 177,183 ----
#define HISTORY_FILE "history"
#define PASSWD_FILE RC_DIR "/passwd"
+ #define PRE_FORM_FILE RC_DIR "/pre_form"
#define USER_MAILCAP RC_DIR "/mailcap"
#define SYS_MAILCAP "/etc/mailcap"
#define USER_MIMETYPES "~/.mime.types"
***************
*** 233,238 ****
--- 244,253 ----
#endif /* HAVE_SRANDOM */
#endif
+ #ifndef HAVE_LSTAT
+ #define lstat stat
+ #endif
+
#if defined( __CYGWIN32__ ) && !defined( __CYGWIN__ )
#define __CYGWIN__
#endif
diff -crN -x CVS w3m-0.3.2.2/configure w3m-js-1.743/configure
*** w3m-0.3.2.2/configure 2002-10-29 02:09:20.000000000 +0900
--- w3m-js-1.743/configure 2003-02-08 02:38:49.000000000 +0900
***************
*** 1,5 ****
#!/bin/sh
! # $Id: configure,v 1.81 2002/10/28 17:09:20 ukai Exp $
# Configuration.
#
--- 1,5 ----
#!/bin/sh
! # $Id: configure,v 1.97 2003/02/06 17:15:10 ukai Exp $
# Configuration.
#
***************
*** 22,36 ****
echo $sysname $sysversion1 $sysversion2 $sysversion3 /$platform at $host
- if [ -f config.param ] ; then
- confhost=`awk 'NR==1{print $4}' config.param`
- if [ "$confhost" = "$host" ] ; then
- . ./config.param
- fi
- fi
-
- echo "# Configuration at $host" > config.param
-
# parameters:
prefix=/usr/local
--- 22,27 ----
***************
*** 40,45 ****
--- 31,44 ----
gc_libdir=
mimetypes=
+ # local overrides
+ if [ -f config.param ] ; then
+ confhost=`awk 'NR==1{print $4}' config.param`
+ if [ "$confhost" = "$host" ] ; then
+ . ./config.param
+ fi
+ fi
+
all_yes=0
while [ $# -gt 0 ]
do
***************
*** 53,74 ****
shift
;;
-prefix=*|--prefix=*)
! prefix=`expr "$1" : "-*prefix=\(.*\)"`
;;
-bindir=*|--bindir=*)
! bindir=`expr "$1" : "-*bindir=\(.*\)"`
;;
-libdir=*|--libdir=*)
! libdir=`expr "$1" : "-*libdir=\(.*\)"`
;;
-helpdir=*|--helpdir=*)
! helpdir=`expr "$1" : "-*helpdir=\(.*\)"`
;;
-mandir=*|--mandir=*)
! mandir=`expr "$1" : "-*mandir=\(.*\)"`
;;
-sysconfdir=*|--sysconfdir=*)
! sysconfdir=`expr "$1" : "-*sysconfdir=\(.*\)"`
;;
-lang=en|--lang=en|-lang=EN|--lang=EN)
lang=EN
--- 52,76 ----
shift
;;
-prefix=*|--prefix=*)
! prefix=`expr "X$1" : "X-*prefix=\(.*\)"`
;;
-bindir=*|--bindir=*)
! bindir=`expr "X$1" : "X-*bindir=\(.*\)"`
! ;;
! -auxbindir=*|--auxbindir=*)
! auxbindir=`expr "X$1" : "X-*auxbindir=\(.*\)"`
;;
-libdir=*|--libdir=*)
! libdir=`expr "X$1" : "X-*libdir=\(.*\)"`
;;
-helpdir=*|--helpdir=*)
! helpdir=`expr "X$1" : "X-*helpdir=\(.*\)"`
;;
-mandir=*|--mandir=*)
! mandir=`expr "X$1" : "X-*mandir=\(.*\)"`
;;
-sysconfdir=*|--sysconfdir=*)
! sysconfdir=`expr "X$1" : "X-*sysconfdir=\(.*\)"`
;;
-lang=en|--lang=en|-lang=EN|--lang=EN)
lang=EN
***************
*** 95,101 ****
dmodel=6
;;
-code=*|--code=*)
! display_code=`expr "$1" : "-*code=\(.*\)"`
;;
-cflags=*|--cflags=*)
dcflags=`echo $1 | sed -e 's/-*cflags=//'`
--- 97,103 ----
dmodel=6
;;
-code=*|--code=*)
! display_code=`expr "X$1" : "X-*code=\(.*\)"`
;;
-cflags=*|--cflags=*)
dcflags=`echo $1 | sed -e 's/-*cflags=//'`
***************
*** 104,129 ****
dldflags=`echo $1 | sed -e 's/-*ldflags=//'`
;;
--ssl-includedir=*)
! ssl_includedir=`expr "$1" : "--ssl-includedir=\(.*\)"`
;;
--ssl-libdir=*)
! ssl_libdir=`expr "$1" : "--ssl-libdir=\(.*\)"`
;;
--gc-includedir=*)
! gc_includedir=`expr "$1" : "--gc-includedir=\(.*\)"`
;;
--gc-libdir=*)
! gc_libdir=`expr "$1" : "--gc-libdir=\(.*\)"`
;;
--mimetypes=*)
! mimetypes=`expr "$1" : "--mimetypes=\(.*\)"`
;;
-help|--help)
echo "-yes, -nonstop Set all parameters to the default"
echo "-prefix=DIR Specify prefix (default: /usr/local)"
echo "-bindir=DIR user executable in DIR (default: PREFIX/bin)"
! echo "-libdir=DIR program executables in DIR (default: PREFIX/lib/w3m)"
echo "-helpdir=DIR help file in DIR (default: PREFIX/share/w3m)"
echo "-mandir=DIR manual in DIR (default: PREFIX/man)"
echo "-sysconfdir=DIR w3mconfig in DIR [PREFIX/etc/w3m]"
--- 106,132 ----
dldflags=`echo $1 | sed -e 's/-*ldflags=//'`
;;
--ssl-includedir=*)
! ssl_includedir=`expr "X$1" : "X--ssl-includedir=\(.*\)"`
;;
--ssl-libdir=*)
! ssl_libdir=`expr "X$1" : "X--ssl-libdir=\(.*\)"`
;;
--gc-includedir=*)
! gc_includedir=`expr "X$1" : "X--gc-includedir=\(.*\)"`
;;
--gc-libdir=*)
! gc_libdir=`expr "X$1" : "X--gc-libdir=\(.*\)"`
;;
--mimetypes=*)
! mimetypes=`expr "X$1" : "X--mimetypes=\(.*\)"`
;;
-help|--help)
echo "-yes, -nonstop Set all parameters to the default"
echo "-prefix=DIR Specify prefix (default: /usr/local)"
echo "-bindir=DIR user executable in DIR (default: PREFIX/bin)"
! echo "-auxbindir=DIR support programs in DIR (default: PREFIX/lib/w3m)"
! echo "-libdir=DIR local cgi in DIR (default: PREFIX/lib/w3m/cgi-bin)"
echo "-helpdir=DIR help file in DIR (default: PREFIX/share/w3m)"
echo "-mandir=DIR manual in DIR (default: PREFIX/man)"
echo "-sysconfdir=DIR w3mconfig in DIR [PREFIX/etc/w3m]"
***************
*** 146,151 ****
--- 149,159 ----
shift
done
+ if [ -f config.param ]; then
+ mv -f config.param config.param.bak
+ fi
+ echo "# Configuration at $host" > config.param
+
if [ "x$IMLIB_CONFIG" = x ]; then
IMLIB_CONFIG=imlib-config
fi
***************
*** 577,594 ****
bindir=$_dir
echo "bindir='$bindir'" >> config.param
d_libdir=$libdir
if [ -z "$d_libdir" ]; then
case "$sysname" in
*BSD)
! d_libdir="$topdir/libexec/w3m"
;;
*)
! d_libdir="$topdir/lib/w3m"
;;
esac
fi
! echo "Which directory do you want to put the support binary files?"
Echo "(default: $d_libdir) "
readdir "$d_libdir"
libdir=$_dir
--- 585,619 ----
bindir=$_dir
echo "bindir='$bindir'" >> config.param
+ d_auxbindir=$auxbindir
+ if [ -z "$d_auxbindir" ]; then
+ case "$sysname" in
+ *BSD)
+ d_auxbindir="$topdir/libexec/w3m"
+ ;;
+ *)
+ d_auxbindir="$topdir/lib/w3m"
+ ;;
+ esac
+ fi
+ echo "Which directory do you want to put the support binary files?"
+ Echo "(default: $d_auxbindir) "
+ readdir "$d_auxbindir"
+ auxbindir=$_dir
+ echo "auxbindir='$auxbindir'" >> config.param
+
d_libdir=$libdir
if [ -z "$d_libdir" ]; then
case "$sysname" in
*BSD)
! d_libdir="$topdir/libexec/w3m/cgi-bin"
;;
*)
! d_libdir="$topdir/lib/w3m/cgi-bin"
;;
esac
fi
! echo "Which directory do you want to use local cgi?"
Echo "(default: $d_libdir) "
readdir "$d_libdir"
libdir=$_dir
***************
*** 794,804 ****
def_param "use_digest_auth" n
fi
ask_param "Inline image support" use_image n
if [ "$use_image" = y ]; then
def_use_image="#define USE_IMAGE"
imgtarget='$(IMGDISPLAY)'
! ask_param "X11 inline image support (you need Imlib1 or GdkPixbuf library)" use_w3mimg_x11 y
d_w3mimg_fb=n
case $sysname in
Linux|linux|LINUX)
--- 819,831 ----
def_param "use_digest_auth" n
fi
+ ask_param "EXPERIMENTAL JavaScript support" use_javascript n
+
ask_param "Inline image support" use_image n
if [ "$use_image" = y ]; then
def_use_image="#define USE_IMAGE"
imgtarget='$(IMGDISPLAY)'
! ask_param "X11 inline image support (you need Imlib, Imlib2 or GdkPixbuf library)" use_w3mimg_x11 y
d_w3mimg_fb=n
case $sysname in
Linux|linux|LINUX)
***************
*** 806,811 ****
--- 833,841 ----
d_w3mimg_fb=y
fi
ask_param "Linux Framebuffer inline image support (you need Imlib2 or GdkPixbuf)" use_w3mimg_fb $d_w3mimg_fb
+ if [ "$use_w3mimg_fb" = y ]; then
+ ask_param "setuid w3mimgdisplay to open /dev/fb0?" w3mimgdisplay_setuid y
+ fi
;;
esac
else
***************
*** 851,860 ****
def_param use_bg_color y
def_param format_nice n
def_param id_ext y
! def_param use_bufinfo y
def_param use_egd y
def_param enable_remove_trailingspaces n
def_param menu_thin_frame n
def_param emacs_like_lineedit $include_opt
def_param vi_prec_num $include_opt
def_param label_topline $include_opt
--- 881,891 ----
def_param use_bg_color y
def_param format_nice n
def_param id_ext y
! def_param use_bufinfo n
def_param use_egd y
def_param enable_remove_trailingspaces n
def_param menu_thin_frame n
+ def_param use_raw_scroll n
def_param emacs_like_lineedit $include_opt
def_param vi_prec_num $include_opt
def_param label_topline $include_opt
***************
*** 1051,1056 ****
--- 1082,1136 ----
if [ -n "$extlib" ]; then
echo "additional library found: $extlib"
fi
+
+ ## Search js
+ jslib=
+ jsinclude=
+ jstype=
+ if [ "$use_javascript" = "y" ]; then
+ for tlibdir in /lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib $prefix/lib ${HOME}/lib
+ do
+ if [ -f $tlibdir/libnjs.a -o -f $tlibdir/libnjs.$so_ext ] ; then
+ echo "$tlibdir/libnjs found"
+ jslib="-L$tlibdir -lnjs"
+ jstype=njs
+ break
+ elif [ -f $tlibdir/libjs.a -o -f $tlibdir/libjs.$so_ext ] ; then
+ echo "$tlibdir/libjs found"
+ jslib="-L$tlibdir -ljs"
+ jstype=js
+ break
+ fi
+ done
+ for inc in /usr/include /usr/local/include $prefix/include ${HOME}/include
+ do
+ if [ -f $inc/njs/njs.h ]; then
+ echo "$inc/njs/njs.h found"
+ if [ "$jstype" != njs ]; then
+ echo "js version mismatch."
+ exit 1
+ fi
+ jsinclude="-I$inc"
+ break
+ elif [ -f $inc/js.h ]; then
+ echo "$inc/js.h found"
+ if [ "$jstype" != js ]; then
+ echo "js version mismatch."
+ exit 1
+ fi
+ jsinclude="-I$inc"
+ break
+ fi
+ done
+ if [ -z "$jslib" -o -z "$jsinclude" ]; then
+ echo "Error: It seems you don't have libjs or js.h."
+ echo " JavaScript cannot be supported."
+ exit 1
+ fi
+ if [ "$jstype" = njs ]; then
+ cflags="$cflags -DHAVE_NJS"
+ fi
+ fi
extlib="$extlib $ldflags"
## Search zlib
***************
*** 1984,1989 ****
--- 2064,2070 ----
def_setpgrp='#define SETPGRP() setpgrp( 0, 0 )'
else
def_have_setpgrp=''
+ def_setpgrp='#define SETPGRP() /* no setpgrp() */'
fi
fi
***************
*** 2151,2156 ****
--- 2232,2243 ----
imgobjs="$imgobjs w3mimg/x11/x11_w3mimg.o"
imgx11cflags="`${IMLIB_CONFIG} --cflags`"
imgx11ldflags="`${IMLIB_CONFIG} --libs`"
+ elif find_imlib2; then
+ def_use_w3mimg_x11="#define USE_W3MIMG_X11"
+ def_use_imlib2='#define USE_IMLIB2'
+ imgobjs="$imgobjs w3mimg/x11/x11_w3mimg.o"
+ imgx11cflags="`${IMLIB2_CONFIG} --cflags`"
+ imgx11ldflags="`${IMLIB2_CONFIG} --libs`"
else
use_w3mimg_x11=n
echo "Disable X11 inline image"
***************
*** 2164,2170 ****
imgfbcflags="`${GDKPIXBUF_CONFIG} --cflags`"
imgfbldflags="`${GDKPIXBUF_CONFIG} --libs`"
elif find_imlib2; then
! def_use_imlib2='#define USE_IMLIB2'
imgobjs="$imgobjs w3mimg/fb/fb_w3mimg.o w3mimg/fb/fb.o w3mimg/fb/fb_img.o"
def_use_imlib2='#define USE_IMLIB2'
imgfbcflags="`${IMLIB2_CONFIG} --cflags`"
--- 2251,2257 ----
imgfbcflags="`${GDKPIXBUF_CONFIG} --cflags`"
imgfbldflags="`${GDKPIXBUF_CONFIG} --libs`"
elif find_imlib2; then
! def_use_w3mimg_fb='#define USE_W3MIMG_FB'
imgobjs="$imgobjs w3mimg/fb/fb_w3mimg.o w3mimg/fb/fb.o w3mimg/fb/fb_img.o"
def_use_imlib2='#define USE_IMLIB2'
imgfbcflags="`${IMLIB2_CONFIG} --cflags`"
***************
*** 2174,2179 ****
--- 2261,2272 ----
echo "Disable Linux framebuffer inline image"
fi
fi
+ install_w3mimgdisplay='$(INSTALL_PROGRAM)'
+ if [ "$use_w3mimg_fb" = y ]; then
+ if [ "$w3mimgdisplay_setuid" = y ]; then
+ install_w3mimgdisplay='$(INSTALL) -o root -m 4755 -s'
+ fi
+ fi
fi
rm -f _zmachdep$extension _zmachdep.c _zmachdep.o
***************
*** 2275,2280 ****
--- 2368,2378 ----
$def_menu_thin_frame
/*
+ * Use raw scroll
+ */
+ $def_use_raw_scroll
+
+ /*
*/
$def_table_expand
$def_table_no_compact
***************
*** 2285,2290 ****
--- 2383,2389 ----
#ifdef makefile_parameter
BIN_DIR = $bindir
+ AUXBIN_DIR = $auxbindir
LIB_DIR = $libdir
HELP_DIR = $helpdir
MAN_DIR = $mandir
***************
*** 2293,2302 ****
ETC_DIR = $sysconfdir
RC_DIR = ~/.w3m
HELP_FILE = $helpfile
! SYS_LIBRARIES = $gpmlib $termlib $ssllib $v6lib
LOCAL_LIBRARIES = $extlib
CC = $cc
! MYCFLAGS = $cflags $bsdinclude $sslinclude
LDFLAGS = $ldflags
GCCFLAGS = $cflags -I./\$(srcdir)/include -DATOMIC_UNCOLLECTABLE -DNO_SIGNALS -DNO_EXECUTE_PERMISSION -DSILENT -DALL_INTERIOR_POINTERS
KEYBIND_SRC = $keymap_file.c
--- 2392,2401 ----
ETC_DIR = $sysconfdir
RC_DIR = ~/.w3m
HELP_FILE = $helpfile
! SYS_LIBRARIES = $gpmlib $termlib $ssllib $v6lib $jslib
LOCAL_LIBRARIES = $extlib
CC = $cc
! MYCFLAGS = $cflags $bsdinclude $sslinclude $jsinclude
LDFLAGS = $ldflags
GCCFLAGS = $cflags -I./\$(srcdir)/include -DATOMIC_UNCOLLECTABLE -DNO_SIGNALS -DNO_EXECUTE_PERMISSION -DSILENT -DALL_INTERIOR_POINTERS
KEYBIND_SRC = $keymap_file.c
***************
*** 2305,2311 ****
MATHLIB=$mathlib
Z_CFLAGS=$z_cflags
ZLIB=$zlib
! EXT_TARGETS=\$(BOOKMARKER) \$(HELPER) $inflate $imgtarget
IMGCFLAGS=$imgx11cflags $imgfbcflags
IMGLDFLAGS=$imgx11ldflags $imgfbldflags
IMGX11CFLAGS=$imgx11cflags
--- 2404,2411 ----
MATHLIB=$mathlib
Z_CFLAGS=$z_cflags
ZLIB=$zlib
! AUXBIN_TARGETS=$inflate $imgtarget
! LIB_TARGETS=\$(BOOKMARKER) \$(HELPER)
IMGCFLAGS=$imgx11cflags $imgfbcflags
IMGLDFLAGS=$imgx11ldflags $imgfbldflags
IMGX11CFLAGS=$imgx11cflags
***************
*** 2319,2324 ****
--- 2419,2425 ----
PERL=$perl
VERSION=$w3mversion
MODEL=$sysname.$platform-$modelname-$lang
+ INSTALL_W3MIMGDISPLAY=$install_w3mimgdisplay
#else
$special_sys
***************
*** 2354,2364 ****
--- 2455,2467 ----
$def_use_image
$def_use_w3mimg_x11
$def_use_w3mimg_fb
+ $def_w3mimgdisplay_setuid
$def_use_imlib
$def_use_gdkpixbuf
$def_use_imlib2
$def_use_help_cgi
$def_use_xface
+ $def_use_javascript
#define DEF_EDITOR "$editor"
#define DEF_MAILER "$mailer"
***************
*** 2371,2376 ****
--- 2474,2480 ----
/* for USE_MIGEMO */
#define DEF_MIGEMO_COMMAND "$def_migemo_command"
+ #define AUXBIN_DIR "$auxbindir"
#define LIB_DIR "$libdir"
#define HELP_DIR "$helpdir"
#define ETC_DIR "$sysconfdir"
***************
*** 2385,2394 ****
--- 2489,2500 ----
#define CONFIG_FILE "config"
#define KEYMAP_FILE "keymap"
#define MENU_FILE "menu"
+ #define MOUSE_FILE "mouse"
#define COOKIE_FILE "cookie"
#define HISTORY_FILE "history"
#define PASSWD_FILE RC_DIR "/passwd"
+ #define PRE_FORM_FILE RC_DIR "/pre_form"
#define USER_MAILCAP RC_DIR "/mailcap"
#define SYS_MAILCAP "/etc/mailcap"
#define USER_MIMETYPES "~/.mime.types"
***************
*** 2456,2461 ****
--- 2562,2571 ----
#endif /* HAVE_SRANDOM */
#endif
+ #ifndef HAVE_LSTAT
+ #define lstat stat
+ #endif
+
#if defined( __CYGWIN32__ ) && !defined( __CYGWIN__ )
#define __CYGWIN__
#endif
***************
*** 2466,2471 ****
--- 2576,2584 ----
#if defined( __CYGWIN__ )
#define SUPPORT_NETBIOS_SHARE 1
+ #if LANG == JA
+ #define SUPPORT_WIN9X_CONSOLE_MBCS 1
+ #endif
#endif
#if defined(__DJGPP__)
diff -crN -x CVS w3m-0.3.2.2/cookie.c w3m-js-1.743/cookie.c
*** w3m-0.3.2.2/cookie.c 2002-01-11 00:39:21.000000000 +0900
--- w3m-js-1.743/cookie.c 2003-01-17 23:37:12.000000000 +0900
***************
*** 1,4 ****
! /* $Id: cookie.c,v 1.7 2002/01/10 15:39:21 ukai Exp $ */
/*
* References for version 0 cookie:
--- 1,4 ----
! /* $Id: cookie.c,v 1.8 2003/01/15 17:13:21 ukai Exp $ */
/*
* References for version 0 cookie:
***************
*** 417,423 ****
check_expired_cookies();
! if (!First_cookie || is_saved || rc_dir_is_tmp)
return;
cookie_file = rcFile(COOKIE_FILE);
--- 417,423 ----
check_expired_cookies();
! if (!First_cookie || is_saved || no_rc_dir)
return;
cookie_file = rcFile(COOKIE_FILE);
diff -crN -x CVS w3m-0.3.2.2/display.c w3m-js-1.743/display.c
*** w3m-0.3.2.2/display.c 2002-10-30 01:19:41.000000000 +0900
--- w3m-js-1.743/display.c 2003-02-07 02:21:13.000000000 +0900
***************
*** 1,4 ****
! /* $Id: display.c,v 1.25 2002/10/29 16:19:41 ukai Exp $ */
#include
#include "fm.h"
--- 1,4 ----
! /* $Id: display.c,v 1.64 2003/02/06 17:16:56 ukai Exp $ */
#include
#include "fm.h"
***************
*** 164,170 ****
refresh();
#ifdef USE_IMAGE
if (activeImage)
! loadImage(IMG_FLAG_STOP);
#endif
#ifdef USE_MOUSE
if (use_mouse)
--- 164,170 ----
refresh();
#ifdef USE_IMAGE
if (activeImage)
! loadImage(NULL, IMG_FLAG_STOP);
#endif
#ifdef USE_MOUSE
if (use_mouse)
***************
*** 214,243 ****
static Buffer *save_current_buf = NULL;
#endif
! char *delayed_msg = NULL;
#ifdef USE_IMAGE
static int image_touch = 0;
static int draw_image_flag = FALSE;
static Line *redrawLineImage(Buffer *buf, Line *l, int i);
#endif
void
displayBuffer(Buffer *buf, int mode)
{
Str msg;
! Anchor *aa = NULL;
if (buf->topLine == NULL && readBufferCache(buf) == 0) { /* clear_buffer */
mode = B_FORCE_REDRAW;
}
if (buf->width == 0)
! buf->width = COLS;
if (buf->height == 0)
buf->height = LASTLINE + 1;
! if ((buf->width != INIT_BUFFER_WIDTH && buf->type &&
! !strcmp(buf->type, "text/html")) || buf->need_reshape) {
buf->need_reshape = TRUE;
reshapeBuffer(buf);
}
--- 214,388 ----
static Buffer *save_current_buf = NULL;
#endif
! static char *delayed_msg = NULL;
+ static void drawAnchorCursor(Buffer *buf);
+ #define redrawBuffer(buf) redrawNLine(buf, LASTLINE)
+ static void redrawNLine(Buffer *buf, int n);
+ static Line *redrawLine(Buffer *buf, Line *l, int i);
#ifdef USE_IMAGE
static int image_touch = 0;
static int draw_image_flag = FALSE;
static Line *redrawLineImage(Buffer *buf, Line *l, int i);
#endif
+ static int redrawLineRegion(Buffer *buf, Line *l, int i, int bpos, int epos);
+ static void do_effects(Lineprop m);
+ #ifdef USE_ANSI_COLOR
+ static void do_color(Linecolor c);
+ #endif
+
+ static Str
+ make_lastline_link(Buffer *buf, char *title, char *url)
+ {
+ Str s = NULL, u;
+ #ifdef JP_CHARSET
+ Lineprop *pr;
+ #endif
+ ParsedURL pu;
+ char *p;
+ int l = COLS - 1, i;
+
+ if (title && *title) {
+ s = Strnew_m_charp("[", title, "]", NULL);
+ for (p = s->ptr; *p; p++) {
+ if (IS_CNTRL(*p) || IS_SPACE(*p))
+ *p = ' ';
+ }
+ if (url)
+ Strcat_charp(s, " ");
+ l -= s->length;
+ if (l <= 0)
+ return s;
+ }
+ if (!url)
+ return s;
+ parseURL2(url, &pu, baseURL(buf));
+ u = parsedURL2Str(&pu);
+ if (DecodeURL)
+ u = Strnew_charp(url_unquote_conv(u->ptr, buf->document_code));
+ #ifdef JP_CHARSET
+ u = checkType(u, &pr, NULL);
+ #endif
+ if (l <= 4 || l >= u->length) {
+ if (!s)
+ return u;
+ Strcat(s, u);
+ return s;
+ }
+ if (!s)
+ s = Strnew_size(COLS);
+ i = (l - 2) / 2;
+ #ifdef JP_CHARSET
+ if (CharType(pr[i]) == PC_KANJI2)
+ i--;
+ #endif
+ Strcat_charp_n(s, u->ptr, i);
+ #if LANG == JA
+ Strcat_charp(s, "｡ﾄ");
+ #else /* LANG != JA */
+ Strcat_charp(s, "..");
+ #endif /* LANG != JA */
+ i = u->length - (COLS - 1 - s->length);
+ #ifdef JP_CHARSET
+ if (CharType(pr[i]) == PC_KANJI2)
+ i++;
+ #endif
+ Strcat_charp(s, &u->ptr[i]);
+ return s;
+ }
+
+ static Str
+ make_lastline_message(Buffer *buf)
+ {
+ Str msg, s = NULL;
+
+ if (displayLink) {
+ #ifdef USE_IMAGE
+ MapArea *a = retrieveCurrentMapArea(buf);
+ if (a)
+ s = make_lastline_link(buf, a->alt, a->url);
+ else
+ #endif
+ {
+ Anchor *a = retrieveCurrentAnchor(buf);
+ char *p = NULL;
+ if (a && a->title && *a->title)
+ p = a->title;
+ else {
+ Anchor *a_img = retrieveCurrentImg(buf);
+ if (a_img && a_img->title && *a_img->title)
+ p = a_img->title;
+ }
+ if (p || a)
+ s = make_lastline_link(buf, p, a ? a->url : NULL);
+ }
+ if (s && s->length >= COLS - 3)
+ return s;
+ }
+
+ #ifdef USE_MOUSE
+ if (use_mouse && mouse_action.lastline_str)
+ msg = Strnew_charp(mouse_action.lastline_str);
+ else
+ #endif /* not USE_MOUSE */
+ msg = Strnew();
+ if (displayLineInfo && buf->currentLine != NULL && buf->lastLine != NULL) {
+ int cl = buf->currentLine->real_linenumber;
+ int ll = buf->lastLine->real_linenumber;
+ int r = (int)((double)cl * 100.0 / (double)(ll ? ll : 1) + 0.5);
+ Strcat(msg, Sprintf("%d/%d (%d%%)", cl, ll, r));
+ }
+ else
+ Strcat_charp(msg, "Viewing");
+ #ifdef USE_SSL
+ if (buf->ssl_certificate)
+ Strcat_charp(msg, "[SSL]");
+ #endif
+ Strcat_charp(msg, " <");
+ Strcat_charp(msg, buf->buffername);
+
+ if (s) {
+ int l = COLS - 3 - s->length;
+ if (msg->length > l) {
+ #ifdef JP_CHARSET
+ char *p;
+ int i;
+ for (p = msg->ptr; *p; p += i) {
+ i = get_mclen(get_mctype(p));
+ l -= i;
+ if (l < 0)
+ break;
+ }
+ l = p - msg->ptr;
+ #endif
+ Strtruncate(msg, l);
+ }
+ Strcat_charp(msg, "> ");
+ Strcat(msg, s);
+ }
+ else {
+ Strcat_charp(msg, ">");
+ }
+ return msg;
+ }
void
displayBuffer(Buffer *buf, int mode)
{
Str msg;
! int ny = 0;
if (buf->topLine == NULL && readBufferCache(buf) == 0) { /* clear_buffer */
mode = B_FORCE_REDRAW;
}
if (buf->width == 0)
! buf->width = INIT_BUFFER_WIDTH;
if (buf->height == 0)
buf->height = LASTLINE + 1;
! if ((buf->width != INIT_BUFFER_WIDTH &&
! ((buf->type && !strcmp(buf->type, "text/html")) || FoldLine))
! || buf->need_reshape) {
buf->need_reshape = TRUE;
reshapeBuffer(buf);
}
***************
*** 253,276 ****
else
buf->rootX = 0;
buf->COLS = COLS - buf->rootX;
! if (mode == B_FORCE_REDRAW || mode == B_SCROLL ||
! #ifdef USE_IMAGE
! mode == B_REDRAW_IMAGE ||
#endif
cline != buf->topLine || ccolumn != buf->currentColumn) {
if (
#ifdef USE_IMAGE
!(activeImage && displayImage && draw_image_flag) &&
#endif
mode == B_SCROLL && cline && buf->currentColumn == ccolumn) {
int n = buf->topLine->linenumber - cline->linenumber;
! if (n > 0 && n < LASTLINE) {
move(LASTLINE, 0);
clrtoeolx();
refresh();
scroll(n);
}
! else if (n < 0 && n > -LASTLINE) {
#if defined(__CYGWIN__) && LANG == JA
move(LASTLINE + n + 1, 0);
clrtoeolx();
--- 398,436 ----
else
buf->rootX = 0;
buf->COLS = COLS - buf->rootX;
! if (nTab > 1
! #ifdef USE_MOUSE
! || mouse_action.menu_str
#endif
+ ) {
+ if (mode == B_FORCE_REDRAW || mode == B_REDRAW_IMAGE)
+ calcTabPos();
+ ny = LastTab->y + 2;
+ if (ny > LASTLINE)
+ ny = LASTLINE;
+ }
+ if (buf->rootY != ny || buf->LINES != LASTLINE - ny) {
+ buf->rootY = ny;
+ buf->LINES = LASTLINE - ny;
+ arrangeCursor(buf);
+ mode = B_REDRAW_IMAGE;
+ }
+ if (mode == B_FORCE_REDRAW || mode == B_SCROLL || mode == B_REDRAW_IMAGE ||
cline != buf->topLine || ccolumn != buf->currentColumn) {
+ #ifdef USE_RAW_SCROLL
if (
#ifdef USE_IMAGE
!(activeImage && displayImage && draw_image_flag) &&
#endif
mode == B_SCROLL && cline && buf->currentColumn == ccolumn) {
int n = buf->topLine->linenumber - cline->linenumber;
! if (n > 0 && n < buf->LINES) {
move(LASTLINE, 0);
clrtoeolx();
refresh();
scroll(n);
}
! else if (n < 0 && n > -buf->LINES) {
#if defined(__CYGWIN__) && LANG == JA
move(LASTLINE + n + 1, 0);
clrtoeolx();
***************
*** 280,286 ****
}
redrawNLine(buf, n);
}
! else {
#ifdef USE_IMAGE
if (activeImage &&
(mode == B_REDRAW_IMAGE ||
--- 440,448 ----
}
redrawNLine(buf, n);
}
! else
! #endif
! {
#ifdef USE_IMAGE
if (activeImage &&
(mode == B_REDRAW_IMAGE ||
***************
*** 288,294 ****
if (draw_image_flag)
clear();
clearImage();
! loadImage(IMG_FLAG_STOP);
image_touch++;
draw_image_flag = FALSE;
}
--- 450,456 ----
if (draw_image_flag)
clear();
clearImage();
! loadImage(buf, IMG_FLAG_STOP);
image_touch++;
draw_image_flag = FALSE;
}
***************
*** 308,386 ****
}
#endif
! #ifdef USE_MOUSE
! if (use_mouse)
! #if LANG == JA
! msg = Strnew_charp("｢罎ｬ｢ｭ");
! #else /* LANG != JA */
! msg = Strnew_charp("<=UpDn ");
! #endif /* LANG != JA */
! else
! #endif /* not USE_MOUSE */
! msg = Strnew();
! if (displayLineInfo && buf->currentLine != NULL && buf->lastLine != NULL) {
! int cl = buf->currentLine->real_linenumber;
! int ll = buf->lastLine->real_linenumber;
! int r = (int)((double)cl * 100.0 / (double)ll + 0.5);
! Strcat(msg, Sprintf("%d/%d (%d%%)", cl, ll, r));
! }
! else
! Strcat_charp(msg, "Viewing");
! #ifdef USE_SSL
! if (buf->ssl_certificate)
! Strcat_charp(msg, "[SSL]");
! #endif
! Strcat_charp(msg, " <");
! Strcat_charp(msg, buf->buffername);
! if (displayLink)
! aa = retrieveCurrentAnchor(buf);
! if (aa) {
! ParsedURL url;
! Str s;
! int l;
! parseURL2(aa->url, &url, baseURL(buf));
! s = parsedURL2Str(&url);
! l = buf->width - 2;
! if (s->length > l) {
! if (l >= 4) {
! msg = Strsubstr(s, 0, (l - 2) / 2);
! #if LANG == JA
! Strcat_charp(msg, "｡ﾄ");
! #else /* LANG != JA */
! Strcat_charp(msg, "..");
! #endif /* LANG != JA */
! l = buf->width - msg->length;
! Strcat(msg, Strsubstr(s, s->length - l, l));
! }
! else {
! msg = s;
! }
! }
! else {
! l -= s->length;
! if (msg->length > l) {
! #ifdef JP_CHARSET
! char *bn = msg->ptr;
! int i, j;
! for (i = 0; bn[i]; i += j) {
! j = get_mclen(get_mctype(&bn[i]));
! if (i + j > l)
! break;
! }
! l = i;
! #endif
! Strtruncate(msg, l);
! }
! Strcat_charp(msg, "> ");
! Strcat(msg, s);
! }
! }
! else {
! Strcat_charp(msg, ">");
! }
if (buf->firstLine == NULL) {
Strcat_charp(msg, "\tNo Line");
- clear();
}
if (delayed_msg != NULL) {
disp_message(delayed_msg, FALSE);
--- 470,480 ----
}
#endif
! drawAnchorCursor(buf);
!
! msg = make_lastline_message(buf);
if (buf->firstLine == NULL) {
Strcat_charp(msg, "\tNo Line");
}
if (delayed_msg != NULL) {
disp_message(delayed_msg, FALSE);
***************
*** 388,402 ****
refresh();
}
standout();
! message(msg->ptr, buf->cursorX + buf->rootX, buf->cursorY);
standend();
! term_title(buf->buffername);
refresh();
#ifdef USE_IMAGE
if (activeImage && displayImage && buf->img) {
- /*
- * loadImage(IMG_FLAG_START);
- */
drawImage();
}
#endif
--- 482,493 ----
refresh();
}
standout();
! message(msg->ptr, buf->cursorX + buf->rootX, buf->cursorY + buf->rootY);
standend();
! term_title(conv_to_system(buf->buffername));
refresh();
#ifdef USE_IMAGE
if (activeImage && displayImage && buf->img) {
drawImage();
}
#endif
***************
*** 408,423 ****
#endif
}
! void
! redrawBuffer(Buffer *buf)
{
! redrawNLine(buf, LASTLINE);
}
! void
redrawNLine(Buffer *buf, int n)
{
! Line *l, *l0;
int i;
#ifdef USE_COLOR
--- 499,584 ----
#endif
}
! static void
! drawAnchorCursor0(Buffer *buf, AnchorList *al, int hseq, int prevhseq,
! int tline, int eline, int active)
{
! int i, j;
! Line *l;
! Anchor *an;
!
! l = buf->topLine;
! for (j = 0; j < al->nanchor; j++) {
! an = &al->anchors[j];
! if (an->start.line < tline)
! continue;
! if (an->start.line >= eline)
! return;
! for (;; l = l->next) {
! if (l == NULL)
! return;
! if (l->linenumber == an->start.line)
! break;
! }
! if (hseq >= 0 && an->hseq == hseq) {
! for (i = an->start.pos; i < an->end.pos; i++) {
! if (l->propBuf[i] & (PE_IMAGE | PE_ANCHOR | PE_FORM)) {
! if (active)
! l->propBuf[i] |= PE_ACTIVE;
! else
! l->propBuf[i] &= ~PE_ACTIVE;
! }
! }
! if (active)
! redrawLineRegion(buf, l, l->linenumber - tline + buf->rootY,
! an->start.pos, an->end.pos);
! }
! else if (prevhseq >= 0 && an->hseq == prevhseq) {
! if (active)
! redrawLineRegion(buf, l, l->linenumber - tline + buf->rootY,
! an->start.pos, an->end.pos);
! }
! }
}
! static void
! drawAnchorCursor(Buffer *buf)
! {
! Anchor *an;
! int hseq, prevhseq;
! int tline, eline;
!
! if (!buf->firstLine || !buf->hmarklist)
! return;
! if (!buf->href && !buf->formitem)
! return;
!
! an = retrieveCurrentAnchor(buf);
! if (!an)
! an = retrieveCurrentMap(buf);
! if (an)
! hseq = an->hseq;
! else
! hseq = -1;
! tline = buf->topLine->linenumber;
! eline = tline + buf->LINES;
! prevhseq = buf->hmarklist->prevhseq;
!
! if (buf->href) {
! drawAnchorCursor0(buf, buf->href, hseq, prevhseq, tline, eline, 1);
! drawAnchorCursor0(buf, buf->href, hseq, -1, tline, eline, 0);
! }
! if (buf->formitem) {
! drawAnchorCursor0(buf, buf->formitem, hseq, prevhseq, tline, eline, 1);
! drawAnchorCursor0(buf, buf->formitem, hseq, -1, tline, eline, 0);
! }
! buf->hmarklist->prevhseq = hseq;
! }
!
! static void
redrawNLine(Buffer *buf, int n)
{
! Line *l;
int i;
#ifdef USE_COLOR
***************
*** 428,459 ****
#endif /* USE_BG_COLOR */
}
#endif /* USE_COLOR */
! for (i = 0, l = buf->topLine; i < LASTLINE; i++) {
! if (i >= LASTLINE - n || i < -n)
! l0 = redrawLine(buf, l, i);
! else {
! l0 = (l) ? l->next : NULL;
! }
! if (l0 == NULL && l == NULL)
break;
- l = l0;
}
! if (n > 0)
clrtobotx();
#ifdef USE_IMAGE
if (!(activeImage && displayImage && buf->img))
return;
! move(buf->cursorY, buf->cursorX);
! for (i = 0, l = buf->topLine; i < LASTLINE; i++) {
! if (i >= LASTLINE - n || i < -n)
! l0 = redrawLineImage(buf, l, i);
! else {
! l0 = (l) ? l->next : NULL;
! }
! if (l0 == NULL && l == NULL)
! break;
! l = l0;
}
getAllImage(buf);
#endif
--- 589,656 ----
#endif /* USE_BG_COLOR */
}
#endif /* USE_COLOR */
! if (nTab > 1
! #ifdef USE_MOUSE
! || mouse_action.menu_str
! #endif
! ) {
! TabBuffer *t;
! int l;
!
! move(0, 0);
! #ifdef USE_MOUSE
! if (mouse_action.menu_str)
! addstr(mouse_action.menu_str);
! #endif
! clrtoeolx();
! for (t = FirstTab; t; t = t->nextTab) {
! move(t->y, t->x1);
! if (t == CurrentTab)
! bold();
! addch('[');
! l = t->x2 - t->x1 - 1 - strlen(t->currentBuffer->buffername);
! if (l < 0)
! l = 0;
! if (l / 2 > 0)
! addnstr_sup(" ", l / 2);
! if (t == CurrentTab)
! EFFECT_ACTIVE_START;
! addnstr(t->currentBuffer->buffername, t->x2 - t->x1 - l);
! if (t == CurrentTab)
! EFFECT_ACTIVE_END;
! if ((l + 1) / 2 > 0)
! addnstr_sup(" ", (l + 1) / 2);
! move(t->y, t->x2);
! addch(']');
! if (t == CurrentTab)
! boldend();
! }
! #if 0
! move(0, COLS - 2);
! addstr(" x");
! #endif
! move(LastTab->y + 1, 0);
! for (i = 0; i < COLS; i++)
! addch('~');
! }
! for (i = 0, l = buf->topLine; i < buf->LINES; i++, l = l->next) {
! if (i >= buf->LINES - n || i < -n)
! l = redrawLine(buf, l, i + buf->rootY);
! if (l == NULL)
break;
}
! if (n > 0) {
! move(i + buf->rootY, 0);
clrtobotx();
+ }
#ifdef USE_IMAGE
if (!(activeImage && displayImage && buf->img))
return;
! move(buf->cursorY + buf->rootY, buf->cursorX + buf->rootX);
! for (i = 0, l = buf->topLine; i < buf->LINES && l; i++, l = l->next) {
! if (i >= buf->LINES - n || i < -n)
! redrawLineImage(buf, l, i + buf->rootY);
}
getAllImage(buf);
#endif
***************
*** 461,467 ****
#define addKanji(pc,pr) (addChar((pc)[0],(pr)[0]),addChar((pc)[1],(pr)[1]))
! Line *
redrawLine(Buffer *buf, Line *l, int i)
{
int j, pos, rcol, ncol, delta;
--- 658,664 ----
#define addKanji(pc,pr) (addChar((pc)[0],(pr)[0]),addChar((pc)[1],(pr)[1]))
! static Line *
redrawLine(Buffer *buf, Line *l, int i)
{
int j, pos, rcol, ncol, delta;
***************
*** 479,485 ****
if (l == NULL) {
if (buf->pagerSource) {
! l = getNextPage(buf, LASTLINE - i);
if (l == NULL)
return NULL;
}
--- 676,682 ----
if (l == NULL) {
if (buf->pagerSource) {
! l = getNextPage(buf, buf->LINES + buf->rootY - i);
if (l == NULL)
return NULL;
}
***************
*** 499,505 ****
buf->rootX = COLS;
buf->COLS = COLS - buf->rootX;
}
! if (l->real_linenumber)
sprintf(tmp, "%*ld:", buf->rootX - 1, l->real_linenumber);
else
sprintf(tmp, "%*s ", buf->rootX - 1, "");
--- 696,702 ----
buf->rootX = COLS;
buf->COLS = COLS - buf->rootX;
}
! if (l->real_linenumber && !l->bpos)
sprintf(tmp, "%*ld:", buf->rootX - 1, l->real_linenumber);
else
sprintf(tmp, "%*s ", buf->rootX - 1, "");
***************
*** 510,516 ****
l->width = COLPOS(l, l->len);
if (l->len == 0 || l->width - 1 < column) {
clrtoeolx();
! return l->next;
}
/* need_clrtoeol(); */
pos = columnPos(l, column);
--- 707,713 ----
l->width = COLPOS(l, l->len);
if (l->len == 0 || l->width - 1 < column) {
clrtoeolx();
! return l;
}
/* need_clrtoeol(); */
pos = columnPos(l, column);
***************
*** 626,636 ****
#endif
if (rcol - column < buf->COLS)
clrtoeolx();
! return l->next;
}
#ifdef USE_IMAGE
! Line *
redrawLineImage(Buffer *buf, Line *l, int i)
{
int j, pos, rcol;
--- 823,833 ----
#endif
if (rcol - column < buf->COLS)
clrtoeolx();
! return l;
}
#ifdef USE_IMAGE
! static Line *
redrawLineImage(Buffer *buf, Line *l, int i)
{
int j, pos, rcol;
***************
*** 643,649 ****
if (l->width < 0)
l->width = COLPOS(l, l->len);
if (l->len == 0 || l->width - 1 < column)
! return l->next;
pos = columnPos(l, column);
rcol = COLPOS(l, pos);
for (j = 0; rcol - column < buf->COLS && pos + j < l->len; j++) {
--- 840,846 ----
if (l->width < 0)
l->width = COLPOS(l, l->len);
if (l->len == 0 || l->width - 1 < column)
! return l;
pos = columnPos(l, column);
rcol = COLPOS(l, pos);
for (j = 0; rcol - column < buf->COLS && pos + j < l->len; j++) {
***************
*** 696,706 ****
}
rcol = COLPOS(l, pos + j + 1);
}
! return l->next;
}
#endif
! int
redrawLineRegion(Buffer *buf, Line *l, int i, int bpos, int epos)
{
int j, pos, rcol, ncol, delta;
--- 893,903 ----
}
rcol = COLPOS(l, pos + j + 1);
}
! return l;
}
#endif
! static int
redrawLineRegion(Buffer *buf, Line *l, int i, int bpos, int epos)
{
int j, pos, rcol, ncol, delta;
***************
*** 853,859 ****
modeflag = FALSE; \
}
! void
do_effects(Lineprop m)
{
/* effect end */
--- 1050,1056 ----
modeflag = FALSE; \
}
! static void
do_effects(Lineprop m)
{
/* effect end */
***************
*** 898,904 ****
}
#ifdef USE_ANSI_COLOR
! void
do_color(Linecolor c)
{
if (c & 0x8)
--- 1095,1101 ----
}
#ifdef USE_ANSI_COLOR
! static void
do_color(Linecolor c)
{
if (c & 0x8)
***************
*** 951,957 ****
addch(' ');
}
! GeneralList *message_list = NULL;
void
record_err_message(char *s)
--- 1148,1154 ----
addch(' ');
}
! static GeneralList *message_list = NULL;
void
record_err_message(char *s)
***************
*** 999,1004 ****
--- 1196,1208 ----
}
void
+ disp_err_message(char *s, int redraw_current)
+ {
+ record_err_message(s);
+ disp_message(s, redraw_current);
+ }
+
+ void
disp_message_nsec(char *s, int redraw_current, int sec, int purge, int mouse)
{
if (QuietMessage)
***************
*** 1007,1015 ****
fprintf(stderr, "%s\n", conv_to_system(s));
return;
}
! if (Currentbuf != NULL)
message(s, Currentbuf->cursorX + Currentbuf->rootX,
! Currentbuf->cursorY);
else
message(s, LASTLINE, 0);
refresh();
--- 1211,1219 ----
fprintf(stderr, "%s\n", conv_to_system(s));
return;
}
! if (CurrentTab != NULL && Currentbuf != NULL)
message(s, Currentbuf->cursorX + Currentbuf->rootX,
! Currentbuf->cursorY + Currentbuf->rootY);
else
message(s, LASTLINE, 0);
refresh();
***************
*** 1022,1028 ****
if (mouse && use_mouse)
mouse_inactive();
#endif
! if (Currentbuf != NULL && redraw_current)
displayBuffer(Currentbuf, B_NORMAL);
}
--- 1226,1232 ----
if (mouse && use_mouse)
mouse_inactive();
#endif
! if (CurrentTab != NULL && Currentbuf != NULL && redraw_current)
displayBuffer(Currentbuf, B_NORMAL);
}
***************
*** 1046,1055 ****
}
void
! cursorUp(Buffer *buf, int n)
{
- if (buf->firstLine == NULL)
- return;
if (buf->cursorY > 0)
cursorUpDown(buf, -1);
else {
--- 1250,1257 ----
}
void
! cursorUp0(Buffer *buf, int n)
{
if (buf->cursorY > 0)
cursorUpDown(buf, -1);
else {
***************
*** 1061,1071 ****
}
void
! cursorDown(Buffer *buf, int n)
{
if (buf->firstLine == NULL)
return;
! if (buf->cursorY < LASTLINE - 1)
cursorUpDown(buf, 1);
else {
buf->topLine = lineSkip(buf, buf->topLine, n, FALSE);
--- 1263,1290 ----
}
void
! cursorUp(Buffer *buf, int n)
{
+ Line *l = buf->currentLine;
if (buf->firstLine == NULL)
return;
! while (buf->currentLine->prev && buf->currentLine->bpos)
! cursorUp0(buf, n);
! if (buf->currentLine == buf->firstLine) {
! gotoLine(buf, l->linenumber);
! arrangeLine(buf);
! return;
! }
! cursorUp0(buf, n);
! while (buf->currentLine->prev && buf->currentLine->bpos &&
! buf->currentLine->bwidth >= buf->currentColumn + buf->visualpos)
! cursorUp0(buf, n);
! }
!
! void
! cursorDown0(Buffer *buf, int n)
! {
! if (buf->cursorY < buf->LINES - 1)
cursorUpDown(buf, 1);
else {
buf->topLine = lineSkip(buf, buf->topLine, n, FALSE);
***************
*** 1076,1081 ****
--- 1295,1320 ----
}
void
+ cursorDown(Buffer *buf, int n)
+ {
+ Line *l = buf->currentLine;
+ if (buf->firstLine == NULL)
+ return;
+ while (buf->currentLine->next && buf->currentLine->next->bpos)
+ cursorDown0(buf, n);
+ if (buf->currentLine == buf->lastLine) {
+ gotoLine(buf, l->linenumber);
+ arrangeLine(buf);
+ return;
+ }
+ cursorDown0(buf, n);
+ while (buf->currentLine->next && buf->currentLine->next->bpos &&
+ buf->currentLine->bwidth + buf->currentLine->width <
+ buf->currentColumn + buf->visualpos)
+ cursorDown0(buf, n);
+ }
+
+ void
cursorUpDown(Buffer *buf, int n)
{
Line *cl = buf->currentLine;
***************
*** 1096,1102 ****
if (buf->firstLine == NULL)
return;
! if (buf->pos == l->len)
return;
i = buf->pos;
p = l->propBuf;
--- 1335,1341 ----
if (buf->firstLine == NULL)
return;
! if (buf->pos == l->len && !(l->next && l->next->bpos))
return;
i = buf->pos;
p = l->propBuf;
***************
*** 1110,1115 ****
--- 1349,1360 ----
else if (l->len == 0) {
buf->pos = 0;
}
+ else if (l->next && l->next->bpos) {
+ cursorDown0(buf, 1);
+ buf->pos = 0;
+ arrangeCursor(buf);
+ return;
+ }
else {
buf->pos = l->len - 1;
#ifdef JP_CHARSET
***************
*** 1118,1124 ****
#endif /* JP_CHARSET */
}
cpos = COLPOS(l, buf->pos);
! buf->visualpos = cpos - buf->currentColumn;
delta = 1;
#ifdef JP_CHARSET
if (CharType(p[buf->pos]) == PC_KANJI1)
--- 1363,1369 ----
#endif /* JP_CHARSET */
}
cpos = COLPOS(l, buf->pos);
! buf->visualpos = l->bwidth + cpos - buf->currentColumn;
delta = 1;
#ifdef JP_CHARSET
if (CharType(p[buf->pos]) == PC_KANJI1)
***************
*** 1127,1135 ****
vpos2 = COLPOS(l, buf->pos + delta) - buf->currentColumn - 1;
if (vpos2 >= buf->COLS && n) {
columnSkip(buf, n + (vpos2 - buf->COLS) - (vpos2 - buf->COLS) % n);
! buf->visualpos = cpos - buf->currentColumn;
}
! buf->cursorX = buf->visualpos;
}
void
--- 1372,1380 ----
vpos2 = COLPOS(l, buf->pos + delta) - buf->currentColumn - 1;
if (vpos2 >= buf->COLS && n) {
columnSkip(buf, n + (vpos2 - buf->COLS) - (vpos2 - buf->COLS) % n);
! buf->visualpos = l->bwidth + cpos - buf->currentColumn;
}
! buf->cursorX = buf->visualpos - l->bwidth;
}
void
***************
*** 1147,1163 ****
if (i >= 2 && CharType(p[i - 1]) == PC_KANJI2)
delta = 2;
#endif /* JP_CHARSET */
! if (i > delta)
buf->pos = i - delta;
else
buf->pos = 0;
cpos = COLPOS(l, buf->pos);
! buf->visualpos = cpos - buf->currentColumn;
! if (buf->visualpos < 0 && n) {
! columnSkip(buf, -n + buf->visualpos - buf->visualpos % n);
! buf->visualpos = cpos - buf->currentColumn;
}
! buf->cursorX = buf->visualpos;
}
void
--- 1392,1416 ----
if (i >= 2 && CharType(p[i - 1]) == PC_KANJI2)
delta = 2;
#endif /* JP_CHARSET */
! if (i >= delta)
buf->pos = i - delta;
+ else if (l->prev && l->bpos) {
+ cursorUp0(buf, -1);
+ buf->pos = buf->currentLine->len - 1;
+ arrangeCursor(buf);
+ return;
+ }
else
buf->pos = 0;
cpos = COLPOS(l, buf->pos);
! buf->visualpos = l->bwidth + cpos - buf->currentColumn;
! if (buf->visualpos - l->bwidth < 0 && n) {
! columnSkip(buf,
! -n + buf->visualpos - l->bwidth - (buf->visualpos -
! l->bwidth) % n);
! buf->visualpos = l->bwidth + cpos - buf->currentColumn;
}
! buf->cursorX = buf->visualpos - l->bwidth;
}
void
***************
*** 1175,1191 ****
void
arrangeCursor(Buffer *buf)
{
! int col, col2;
int delta = 1;
if (buf == NULL || buf->currentLine == NULL)
return;
/* Arrange line */
! if (buf->currentLine->linenumber - buf->topLine->linenumber >= LASTLINE ||
! buf->currentLine->linenumber < buf->topLine->linenumber) {
! buf->topLine = buf->currentLine;
}
/* Arrange column */
! if (buf->currentLine->len == 0)
buf->pos = 0;
else if (buf->pos >= buf->currentLine->len)
buf->pos = buf->currentLine->len - 1;
--- 1428,1458 ----
void
arrangeCursor(Buffer *buf)
{
! int col, col2, pos;
int delta = 1;
if (buf == NULL || buf->currentLine == NULL)
return;
/* Arrange line */
! if (buf->currentLine->linenumber - buf->topLine->linenumber >= buf->LINES
! || buf->currentLine->linenumber < buf->topLine->linenumber) {
! /*
! * buf->topLine = buf->currentLine;
! */
! buf->topLine = lineSkip(buf, buf->currentLine, 0, FALSE);
}
/* Arrange column */
! while (buf->pos < 0 && buf->currentLine->prev && buf->currentLine->bpos) {
! pos = buf->pos + buf->currentLine->prev->len;
! cursorUp0(buf, 1);
! buf->pos = pos;
! }
! while (buf->pos >= buf->currentLine->len && buf->currentLine->next &&
! buf->currentLine->next->bpos) {
! pos = buf->pos - buf->currentLine->len;
! cursorDown0(buf, 1);
! buf->pos = pos;
! }
! if (buf->currentLine->len == 0 || buf->pos < 0)
buf->pos = 0;
else if (buf->pos >= buf->currentLine->len)
buf->pos = buf->currentLine->len - 1;
***************
*** 1206,1213 ****
}
/* Arrange cursor */
buf->cursorY = buf->currentLine->linenumber - buf->topLine->linenumber;
! buf->visualpos = buf->cursorX =
COLPOS(buf->currentLine, buf->pos) - buf->currentColumn;
#ifdef DISPLAY_DEBUG
fprintf(stderr,
"arrangeCursor: column=%d, cursorX=%d, visualpos=%d, pos=%d, len=%d\n",
--- 1473,1481 ----
}
/* Arrange cursor */
buf->cursorY = buf->currentLine->linenumber - buf->topLine->linenumber;
! buf->visualpos = buf->currentLine->bwidth +
COLPOS(buf->currentLine, buf->pos) - buf->currentColumn;
+ buf->cursorX = buf->visualpos - buf->currentLine->bwidth;
#ifdef DISPLAY_DEBUG
fprintf(stderr,
"arrangeCursor: column=%d, cursorX=%d, visualpos=%d, pos=%d, len=%d\n",
***************
*** 1224,1230 ****
if (buf->firstLine == NULL)
return;
buf->cursorY = buf->currentLine->linenumber - buf->topLine->linenumber;
! i = columnPos(buf->currentLine, buf->currentColumn + buf->visualpos);
cpos = COLPOS(buf->currentLine, i) - buf->currentColumn;
if (cpos >= 0) {
buf->cursorX = cpos;
--- 1492,1499 ----
if (buf->firstLine == NULL)
return;
buf->cursorY = buf->currentLine->linenumber - buf->topLine->linenumber;
! i = columnPos(buf->currentLine, buf->currentColumn + buf->visualpos
! - buf->currentLine->bwidth);
cpos = COLPOS(buf->currentLine, i) - buf->currentColumn;
if (cpos >= 0) {
buf->cursorX = cpos;
***************
*** 1286,1291 ****
--- 1555,1562 ----
FALSE);
gotoLine(buf, CUR_LINENUMBER(orig));
buf->pos = orig->pos;
+ if (buf->currentLine && orig->currentLine)
+ buf->pos += orig->currentLine->bpos - buf->currentLine->bpos;
buf->currentColumn = orig->currentColumn;
arrangeCursor(buf);
}
diff -crN -x CVS w3m-0.3.2.2/doc/README.func w3m-js-1.743/doc/README.func
*** w3m-0.3.2.2/doc/README.func 2002-09-06 00:43:22.000000000 +0900
--- w3m-js-1.743/doc/README.func 2003-01-24 21:59:01.000000000 +0900
***************
*** 1,4 ****
--- 1,5 ----
ABORT Quit w3m without confirmation
+ ACCESSSKEY Popup acceskey menu
ADD_BOOKMARK Add current page to bookmark
ALARM Set alarm
BACK Back to previous buffer
***************
*** 6,11 ****
--- 7,14 ----
BOOKMARK Read bookmark
CENTER_H Move to the center line
CENTER_V Move to the center column
+ CLOSE_TAB Close current tab
+ CLOSE_TAB_MOUSE Close tab on mouse cursor (for mouse action)
COMMAND Execute w3m command(s)
COOKIE View cookie list
DEFINE_KEY Define a binding between a key stroke and a user command
***************
*** 15,20 ****
--- 18,24 ----
DISPLAY_IMAGE Restart loading and drawing of images
DOWN Scroll down one line
DOWNLOAD Save document source to file
+ DOWNLOAD_LIST Display download list panel
EDIT Edit current document
EDIT_SCREEN Edit currently rendered document
END Go to the last line
***************
*** 40,45 ****
--- 44,52 ----
LINE_INFO Show current line number
LINK_BEGIN Go to the first link
LINK_END Go to the last link
+ LINK_MENU Popup link element menu
+ LIST Show all links and images
+ LIST_MENU Popup link list menu and go to selected link
LOAD Load local file
MAIN_MENU Popup menu
MARK Set/unset mark
***************
*** 47,62 ****
--- 54,74 ----
MARK_URL Mark URL-like strings as anchors
MARK_WORD Mark current word as anchor
MENU Popup menu
+ MENU_MOUSE Popup menu at mouse cursor (for mouse action)
MOUSE_TOGGLE Toggle activity of mouse
MOVE_DOWN Move cursor down (a half screen scroll at the end of screen)
MOVE_DOWN1 Move cursor down (1 line scroll at the end of screen)
MOVE_LEFT Move cursor left (a half screen shift at the left edge)
MOVE_LEFT1 Move cursor left (1 columns shift at the left edge)
+ MOVE_LIST_MENU Popup link list menu and move cursor to selected link
+ MOVE_MOUSE Move cursor to mouse cursor (for mouse action)
MOVE_RIGHT Move cursor right (a half screen shift at the right edge)
MOVE_RIGHT1 Move cursor right (1 columns shift at the right edge)
MOVE_UP Move cursor up (a half screen scroll at the top of screen)
MOVE_UP1 Move cursor up (1 line scrol at the top of screen)
MSGS Display error messages
+ NEW_TAB Open new tab
+ NEXT Move to next buffer
NEXT_DOWN Move to next downward link
NEXT_LEFT Move to next left link
NEXT_LEFT_UP Move to next left (or upward) link
***************
*** 65,70 ****
--- 77,83 ----
NEXT_PAGE Move to next page
NEXT_RIGHT Move to next right link
NEXT_RIGHT_DOWN Move to next right (or downward) link
+ NEXT_TAB Move to next tab
NEXT_UP Move to next upward link
NEXT_WORD Move to next word
NOTHING Do nothing
***************
*** 75,90 ****
--- 88,108 ----
PEEK_LINK Peek link URL
PIPE_BUF Send rendered document to pipe
PIPE_SHELL Execute shell command and browse
+ PREV Move to previous buffer
PREV_LINK Move to previous link
PREV_MARK Move to previous mark
PREV_PAGE Move to previous page
+ PREV_TAB Move to previous tab
PREV_WORD Move to previous word
PRINT Save buffer to file
QUIT Quit w3m
READ_SHELL Execute shell command and load
+ REDO Cancel the last undo
REDRAW Redraw screen
REG_MARK Set mark using regexp
+ REINIT Reload configuration files
RELOAD Reload buffer
+ RESHAPE Re-render buffer
RIGHT Shift screen one column right
SAVE Save document source to file
SAVE_IMAGE Save image to file
***************
*** 106,111 ****
--- 124,137 ----
STOP_IMAGE Stop loading and drawing of images
SUBMIT Submit form
SUSPEND Stop loading document
+ TAB_GOTO Open URL on new tab
+ TAB_GOTO_RELATIVE Open relative URL on new tab
+ TAB_LEFT Move current tab left
+ TAB_LINK Open current link on new tab
+ TAB_MENU Popup tab selection menu
+ TAB_MOUSE Move to tab on mouse cursor (for mouse action)
+ TAB_RIGHT Move current tab right
+ UNDO Cancel the last cursor movement
UP Scroll up one line
VERSION Display version of w3m
VIEW View HTML source
diff -crN -x CVS w3m-0.3.2.2/doc/README.mouse w3m-js-1.743/doc/README.mouse
*** w3m-0.3.2.2/doc/README.mouse 1970-01-01 09:00:00.000000000 +0900
--- w3m-js-1.743/doc/README.mouse 2002-11-26 02:23:45.000000000 +0900
***************
*** 0 ****
--- 1,61 ----
+ ~/.w3m/mouse syntax:
+
+ menu
+ lastline
+ button []
+
+ : 1 : left button
+ 2 : middle button
+ 3 : right button
+
+ : menu : click on menu
+ lastline : click on last line
+ default : default action
+ anchor : click on anchor
+ active : click on active anchor
+ tab : click on tab
+
+ : left column pos
+ : right column pos
+
+ menu in can be omited for backward compatibility.
+
+ default configuration (in func.c)
+
+
+ button 1 default MOVE_MOUSE
+ button 2 default BACK
+ button 3 default MENU_MOUSE
+
+ button 1 active GOTO_LINK
+
+ button 1 tab TAB_MOUSE
+ button 2 tab CLOSE_TAB_MOUSE
+
+ lastline "<=UpDn"
+ button 1 lastline 0 1 BACK
+ button 1 lastline 2 3 PREV_PAGE
+ button 1 lastline 4 5 NEXT_PAGE
+
+ For example
+
+ - In ~/.w3m/mouse
+
+ button 1 anchor COMMAND "MOVE_MOUSE; GOTO_LINK"
+
+ you can jump to link by left click on non-active anchor.
+
+ - In ~/.w3m/menu
+
+ menu Active
+ func "Display LInk (a)" GOTO_LINK "a"
+ func "Open in new tag (t)" TAB_LINK "t"
+ func "Save link (d)" SAVE_LINK "d"
+ func "External browser (m)" EXTERN_LINK "m"
+ end
+
+ and ~/.w3m/mouse
+
+ button 3 anchor MENU_MOUSE Active
+
+ then you can open menu by right click on anchor.
diff -crN -x CVS w3m-0.3.2.2/doc/README.pre_form w3m-js-1.743/doc/README.pre_form
*** w3m-0.3.2.2/doc/README.pre_form 1970-01-01 09:00:00.000000000 +0900
--- w3m-js-1.743/doc/README.pre_form 2003-01-11 11:38:48.000000000 +0900
***************
*** 0 ****
--- 1,43 ----
+ pre_form: Feature to configure form parameters when opening specific site.
+
+ It would be convinient for sites where you often visit, but it may introduce
+ some security issues. Be careful to use this feature, especially `submit'
+ params described below.
+
+ Default configuration file for pre_form is ~/.w3m/pre_form.
+
+ Syntax as follows:
+
+ url |//
+ form []
+ text
+ file
+ password
+ checkbox []
+ radio
+ section
+ submit []
+ textarea
+
+ :
+ /textarea
+
+ If is set, form which has matched attributes
+ will be configured by this pre_form.
+
+ The line begining with text, file, passwd, select, textarea means that
+ it will set value to in input, select or textarea element which
+ name attribute matches with .
+
+ The line beginning with checkbox, radio means that it will check
+ input element which name and value attribute matches with and
+ respectively. If is 0, no, or off, disable check of the checkbox.
+
+ The line beginning with submit means that it will submit input element which
+ name attribute matches with , or submit last specified.
+
+ You quote \, ' (single-quote) or " (double quote) as you do in shell.
+
+
+
diff -crN -x CVS w3m-0.3.2.2/doc/README.tab w3m-js-1.743/doc/README.tab
*** w3m-0.3.2.2/doc/README.tab 1970-01-01 09:00:00.000000000 +0900
--- w3m-js-1.743/doc/README.tab 2002-11-06 02:24:47.000000000 +0900
***************
*** 0 ****
--- 1,45 ----
+ w3m tab browsing
+
+ No default keybinding for tab browsing. Pleaes configure following
+ function to appropriate keys:
+
+ NEW_TAB open new tab, clone current page
+ TAB_LINK open document refered by link in a new tab
+ Num(N) + TAB_LINK will open in Nth tab
+ TAB_GOTO open URL in a new tab
+ Num(N) + TAB_GOTO will open in Nth tab
+ TAB_GOTO_RELATIVE
+ open relative URL in a new tab
+ Num(N) + TAB_GOTO_RELATIVE will open in Nth tab
+ CLOSE_TAB close current tab
+ Num(N) + CLOSE_TAB will close Nth tab
+ NEXT_TAB change to next tab
+ Num(N) + NEXT_TAB will change to Nth next tab
+ PREV_TAB change to prev tab
+ Num(N) + PREV_TAB will change to Nth prev tab
+ TAB_RIGHT move current tab to right
+ Num(N) + TAB_RIGHT will move current tab to N right
+ TAB_LEFT move current tab to left
+ Num(N) + TAB_LEFT will move current tab to N left
+ TAB_MENU open tab selection menu
+ operation in tab selection menu is same as operation
+ in buffer selection menu
+
+ You can operate with mouse
+
+ left button .. move the tab if you click on the tab
+ dragging a tab to another tab will move tab
+ dragging a link to tab will open the link in the tab
+ clicking on right upper `x' will current tab
+ middle button .. close the tab if you clink on the tab
+ right button .. open menu as usual
+
+ Options:
+
+ open_tab_blank ... open new tab if target is _blank or _new
+ default: OFF
+ close_tab_back ... close the tab when you back from last buffer in the tab
+ default: OFF (= Can't back...)
+
+
+
diff -crN -x CVS w3m-0.3.2.2/doc/keymap.default w3m-js-1.743/doc/keymap.default
*** w3m-0.3.2.2/doc/keymap.default 2002-09-06 00:43:22.000000000 +0900
--- w3m-js-1.743/doc/keymap.default 2002-12-13 22:15:54.000000000 +0900
***************
*** 24,31 ****
--- 24,33 ----
keymap C-m GOTO_LINK
keymap C-n MOVE_DOWN
keymap C-p MOVE_UP
+ keymap C-q CLOSE_TAB
keymap C-r ISEARCH_BACK
keymap C-s ISEARCH
+ keymap C-t TAB_LINK
keymap C-u PREV_LINK
keymap C-v NEXT_PAGE
keymap C-w WRAP_TOGGLE
***************
*** 36,52 ****
keymap \" REG_MARK
keymap # PIPE_SHELL
keymap $ LINE_END
keymap , LEFT
keymap . RIGHT
keymap / SEARCH
keymap : MARK_URL
! keymap ; MARK_WORD
keymap < SHIFT_LEFT
keymap = INFO
keymap > SHIFT_RIGHT
keymap ? SEARCH_BACK
keymap @ READ_SHELL
keymap B BACK
keymap E EDIT
keymap F FRAME
keymap G END
--- 38,59 ----
keymap \" REG_MARK
keymap # PIPE_SHELL
keymap $ LINE_END
+ keymap ( UNDO
+ keymap ) REDO
+ keymap + NEXT_PAGE
keymap , LEFT
+ keymap - PREV_PAGE
keymap . RIGHT
keymap / SEARCH
keymap : MARK_URL
! keymap ; MARK_WORD
keymap < SHIFT_LEFT
keymap = INFO
keymap > SHIFT_RIGHT
keymap ? SEARCH_BACK
keymap @ READ_SHELL
keymap B BACK
+ keymap D DOWNLOAD_LIST
keymap E EDIT
keymap F FRAME
keymap G END
***************
*** 54,64 ****
--- 61,73 ----
keymap I VIEW_IMAGE
keymap J UP
keymap K DOWN
+ keymap L LIST
keymap M EXTERN
keymap N SEARCH_PREV
keymap Q EXIT
keymap R RELOAD
keymap S SAVE_SCREEN
+ keymap T NEW_TAB
keymap U GOTO
keymap V LOAD
keymap W PREV_WORD
***************
*** 75,88 ****
keymap j MOVE_DOWN
keymap k MOVE_UP
keymap l MOVE_RIGHT
keymap n SEARCH_NEXT
keymap o OPTIONS
keymap q QUIT
! keymap s SELECT_MENU
keymap u PEEK_LINK
keymap v VIEW
keymap w NEXT_WORD
keymap z CENTER_V
keymap M-TAB PREV_LINK
keymap M-C-j SAVE_LINK
--- 84,102 ----
keymap j MOVE_DOWN
keymap k MOVE_UP
keymap l MOVE_RIGHT
+ keymap m MOUSE_TOGGLE
keymap n SEARCH_NEXT
keymap o OPTIONS
keymap q QUIT
! keymap r VERSION
! keymap s SELECT_MENU
keymap u PEEK_LINK
keymap v VIEW
keymap w NEXT_WORD
keymap z CENTER_V
+ keymap { PREV_TAB
+ keymap | PIPE_BUF
+ keymap } NEXT_TAB
keymap M-TAB PREV_LINK
keymap M-C-j SAVE_LINK
***************
*** 96,106 ****
--- 110,126 ----
keymap M-W DICT_WORD_AT
keymap M-a ADD_BOOKMARK
keymap M-b BOOKMARK
+ keymap M-c COMMAND
keymap M-e EDIT_SCREEN
keymap M-g GOTO_LINE
+ keymap M-k DEFINE_KEY
+ keymap M-l LIST_MENU
+ keymap M-m MOVE_LIST_MENU
keymap M-n NEXT_MARK
+ keymap M-o SET_OPTION
keymap M-p PREV_MARK
keymap M-s SAVE
+ keymap M-t TAB_MENU
keymap M-u GOTO_RELATIVE
keymap M-v PREV_PAGE
keymap M-w DICT_WORD
diff -crN -x CVS w3m-0.3.2.2/doc/keymap.lynx w3m-js-1.743/doc/keymap.lynx
*** w3m-0.3.2.2/doc/keymap.lynx 2002-01-24 02:19:47.000000000 +0900
--- w3m-js-1.743/doc/keymap.lynx 2002-12-13 22:15:54.000000000 +0900
***************
*** 24,31 ****
--- 24,34 ----
keymap C-m GOTO_LINK
keymap C-n NEXT_LINK
keymap C-p PREV_LINK
+ keymap C-q CLOSE_TAB
keymap C-r RELOAD
keymap C-s SEARCH
+ keymap C-t TAB_LINK
+ keymap C-u PREV_LINK
keymap C-v NEXT_PAGE
keymap C-w REDRAW
keymap C-z SUSPEND
***************
*** 35,50 ****
--- 38,59 ----
keymap \" REG_MARK
keymap # PIPE_SHELL
keymap $ LINE_END
+ keymap ( UNDO
+ keymap ) REDO
keymap + NEXT_PAGE
+ keymap , LEFT
keymap - PREV_PAGE
+ keymap . RIGHT
keymap / SEARCH
keymap : MARK_URL
+ keymap ; MARK_WORD
keymap < SHIFT_LEFT
keymap = INFO
keymap > SHIFT_RIGHT
keymap ? HELP
keymap @ READ_SHELL
keymap B BACK
+ keymap D DOWNLOAD_LIST
keymap E EDIT
keymap F FRAME
keymap G GOTO_LINE
***************
*** 52,67 ****
--- 61,81 ----
keymap I VIEW_IMAGE
keymap J UP
keymap K DOWN
+ keymap L LIST
keymap M EXTERN
keymap N NEXT_MARK
keymap P PREV_MARK
keymap Q EXIT
keymap R RELOAD
keymap S SAVE_SCREEN
+ keymap T NEW_TAB
keymap U GOTO
keymap V LOAD
+ keymap W PREV_WORD
keymap Z CENTER_H
+ keymap [ LINK_BEGIN
keymap \\ SOURCE
+ keymap ] LINK_END
keymap \^ LINE_BEGIN
keymap a ADD_BOOKMARK
keymap b PREV_PAGE
***************
*** 73,101 ****
keymap j MOVE_DOWN
keymap k MOVE_UP
keymap l MOVE_RIGHT
keymap n SEARCH_NEXT
keymap o OPTIONS
keymap p SAVE_SCREEN
keymap q QUIT
! keymap s SELECT_MENU
keymap u PEEK_LINK
keymap v BOOKMARK
! keymap w WRAP_TOGGLE
keymap z CENTER_V
keymap M-TAB PREV_LINK
keymap M-C-j SAVE_LINK
keymap M-C-m SAVE_LINK
keymap M-: MARK_MID
keymap M-I SAVE_IMAGE
keymap M-M EXTERN_LINK
keymap M-a ADD_BOOKMARK
keymap M-b BOOKMARK
keymap M-e EDIT_SCREEN
keymap M-s SAVE
keymap M-u GOTO_RELATIVE
keymap M-v PREV_PAGE
keymap UP PREV_LINK
keymap DOWN NEXT_LINK
--- 87,133 ----
keymap j MOVE_DOWN
keymap k MOVE_UP
keymap l MOVE_RIGHT
+ keymap m MOUSE_TOGGLE
keymap n SEARCH_NEXT
keymap o OPTIONS
keymap p SAVE_SCREEN
keymap q QUIT
! keymap r VERSION
! keymap s SELECT_MENU
keymap u PEEK_LINK
keymap v BOOKMARK
! keymap w NEXT_WORD
keymap z CENTER_V
+ keymap { PREV_TAB
+ keymap | PIPE_BUF
+ keymap } NEXT_TAB
keymap M-TAB PREV_LINK
keymap M-C-j SAVE_LINK
keymap M-C-m SAVE_LINK
keymap M-: MARK_MID
+ keymap M-< BEGIN
+ keymap M-> END
keymap M-I SAVE_IMAGE
keymap M-M EXTERN_LINK
+ keymap M-W DICT_WORD_AT
keymap M-a ADD_BOOKMARK
keymap M-b BOOKMARK
+ keymap M-c COMMAND
keymap M-e EDIT_SCREEN
+ keymap M-g GOTO_LINE
+ keymap M-k DEFINE_KEY
+ keymap M-l LIST_MENU
+ keymap M-m MOVE_LIST_MENU
+ keymap M-n NEXT_MARK
+ keymap M-o SET_OPTION
+ keymap M-p PREV_MARK
keymap M-s SAVE
+ keymap M-t TAB_MENU
keymap M-u GOTO_RELATIVE
keymap M-v PREV_PAGE
+ keymap M-w DICT_WORD
keymap UP PREV_LINK
keymap DOWN NEXT_LINK
diff -crN -x CVS w3m-0.3.2.2/doc/menu.default w3m-js-1.743/doc/menu.default
*** w3m-0.3.2.2/doc/menu.default 2001-11-08 14:16:15.000000000 +0900
--- w3m-js-1.743/doc/menu.default 2002-12-13 22:15:54.000000000 +0900
***************
*** 12,18 ****
menu Main
func " Back (b) " BACK "b"
! func " Select Buffer(s) " SELECT "s"
func " View Source (v) " VIEW "vV"
func " Edit Source (e) " EDIT "eE"
func " Save Source (S) " SAVE "S"
--- 12,19 ----
menu Main
func " Back (b) " BACK "b"
! popup " Select Buffer(s) " Select "s"
! popup " Select Tab (t) " SelectTab "tT"
func " View Source (v) " VIEW "vV"
func " Edit Source (e) " EDIT "eE"
func " Save Source (S) " SAVE "S"
***************
*** 20,25 ****
--- 21,27 ----
nop " -----------------"
func " Go Link (a) " GOTO_LINK "a"
+ func " on New Tab (n) " TAB_LINK "nN"
func " Save Link (A) " SAVE_LINK "A"
func " View Image (i) " VIEW_IMAGE "i"
func " Save Image (I) " SAVE_IMAGE "I"
diff -crN -x CVS w3m-0.3.2.2/doc/w3m.1 w3m-js-1.743/doc/w3m.1
*** w3m-0.3.2.2/doc/w3m.1 2001-11-21 13:29:14.000000000 +0900
--- w3m-js-1.743/doc/w3m.1 2002-11-12 22:18:55.000000000 +0900
***************
*** 53,67 ****
.B -l line
# of preserved line (default 10000)
.TP
- .B -s
- Shift_JIS
- .TP
- .B -j
- JIS
- .TP
- .B -e
- EUC-JP
- .TP
.B -B
load bookmark
.TP
--- 53,58 ----
***************
*** 123,128 ****
--- 114,125 ----
.B -no-mouse
don't use mouse
.TP
+ .B -cookie
+ use cookie.
+ .TP
+ .B -no-cookie
+ don't use cookie
+ .TP
.B -pauth user:pass
proxy authentication
.TP
***************
*** 135,146 ****
--- 132,156 ----
.B -X
don't use termcap init/deinit
.TP
+ .B -title [=TERM]
+ set buffer name to termianl title string.
+ If TERM is specified, use the TERM style title configuration.
+ .TP
.B -o opt=value
assign value to config option
.TP
+ .B -show-option
+ show all available config option
+ .TP
.B -config file
specify config file
.TP
+ .B -help
+ show usage
+ .TP
+ .B -version
+ show w3m version
+ .TP
.B -debug
DO NOT USE
.SH EXAMPLES
diff -crN -x CVS w3m-0.3.2.2/doc-jp/README.func w3m-js-1.743/doc-jp/README.func
*** w3m-0.3.2.2/doc-jp/README.func 2002-09-06 00:43:22.000000000 +0900
--- w3m-js-1.743/doc-jp/README.func 2003-01-24 21:59:02.000000000 +0900
***************
*** 1,4 ****
--- 1,5 ----
ABORT ｳﾎﾇｧ､ｻ､ｺ､ﾋw3m､ｽｪﾎｻ､ｷ､ﾞ､ｹ
+ ACCESSKEY Accesskey ･皈ﾋ･蝪ｼ､ﾎｩ､ﾁｾ螟ｲ､ﾞ､ｹ
ALARM ･｢･鬘ｼ･爨ﾀﾟﾄ熙ｷ､ﾞ､ｹ
ADD_BOOKMARK ｸｽｺﾟｸｫ､ﾆ､､､･ﾚ｡ｼ･ｸ､･ﾖ･ﾃ･ｯ･ﾞ｡ｼ･ｯ､ﾋﾄﾉｲﾃ､ｷ､ﾞ､ｹ
BACK ｰ､ﾄﾁｰ､ﾎ･ﾐ･ﾃ･ﾕ･｡､ﾉｽｼｨ､ｷ､ﾞ､ｹ
***************
*** 6,11 ****
--- 7,14 ----
BOOKMARK ･ﾖ･ﾃ･ｯ･ﾞ｡ｼ･ｯ､ﾆﾉ､ﾟｹ､ﾟ､ﾞ､ｹ
CENTER_H ･ｫ｡ｼ･ｽ･､ﾎ､｢､ｰﾌﾃﾖ､ｹﾔ､ﾎﾃ豎､ﾋｰﾜﾆｰ､ｷ､ﾞ､ｹ
CENTER_V ･ｫ｡ｼ･ｽ･､ﾎ､｢､ｹﾔ､ｲ靂ﾌ､ﾎﾃ豎､ﾋｰﾜﾆｰ､ｷ､ﾞ､ｹ
+ CLOSE_TAB ｸｽｺﾟ､ﾎ･ｿ･ﾖ､ﾊﾄ､ｸ､ﾞ､ｹ
+ CLOSE_TAB_MOUSE ･ﾞ･ｦ･ｹ･ｫ｡ｼ･ｽ･､ﾎｰﾌﾃﾖ､ﾎ･ｿ･ﾖ､ﾊﾄ､ｸ､ﾞ､ｹ(･ﾞ･ｦ･ｹﾁ犲ﾍﾑ)
COMMAND w3m､ﾎ･ｳ･ﾞ･･ﾉ､ｼﾂｹﾔ､ｷ､ﾞ､ｹ
COOKIE ･ｯ･ﾃ･ｭ｡ｼｰﾍ､ﾉｽｼｨ､ｷ､ﾞ､ｹ
DEFINE_KEY ･ｭ｡ｼﾆﾎﾏ､ﾈ･ｳ･ﾞ･･ﾉ､ﾎﾂﾐｱ､ﾄｵﾁ､ｷ､ﾞ､ｹ
***************
*** 15,20 ****
--- 18,24 ----
DISPLAY_IMAGE ｲ霖､ﾎﾆﾉｹ/ﾉｽｼｨ､ｺﾆｳｫ､ｷ､ﾞ､ｹ
DOWN ｲ靂ﾌ､1ｹﾔｲｼ､ﾋ･ｹ･ｯ･｡ｼ･､ｷ､ﾞ､ｹ
DOWNLOAD ﾊｸｽ､ﾎ･ｽ｡ｼ･ｹ､･ﾕ･｡･､･､ﾋﾊﾝﾂｸ､ｷ､ﾞ､ｹ
+ DOWNLOAD_LIST ･ﾀ･ｦ･･｡ｼ･ﾉｾｶｷ､ﾎｰﾍ､ﾉｽｼｨ､ｷ､ﾞ､ｹ
EDIT ･ｽ｡ｼ･ｹ･ﾕ･｡･､･､･ｨ･ﾇ･｣･ｿ､ﾇﾊﾔｽｸ､ｷ､ﾞ､ｹ
EDIT_SCREEN ･ﾐ･ﾃ･ﾕ･｡､ﾎﾉｽｼｨﾆ簣ﾆ､･ｨ･ﾇ･｣･ｿ､ﾇﾊﾔｽｸ､ｷ､ﾞ､ｹ
END ﾊｸｽ､ﾎ､､､ﾁ､ﾐ､ｲｼ､ﾎｹﾔ､ﾋｰﾜﾆｰ､ｷ､ﾞ､ｹ
***************
*** 40,45 ****
--- 44,52 ----
LINE_INFO ･ﾚ｡ｼ･ｸﾃ讀ﾇ､ﾎｸｽｺﾟｰﾌﾃﾖ､ﾉｽｼｨ､ｷ､ﾞ､ｹ
LINK_BEGIN ｺﾇｽ鬢ﾎ･･･ｯ､ﾋｰﾜﾆｰ､ｷ､ﾞ､ｹ
LINK_END ｺﾇｸ螟ﾎ･･･ｯ､ﾋｰﾜﾆｰ､ｷ､ﾞ､ｹ
+ LINK_MENU Link ﾍﾗﾁﾇｰﾍ､ﾎ･皈ﾋ･蝪ｼ､ﾎｩ､ﾁｾ螟ｲ､ﾞ､ｹ
+ LIST ･･･ｯ､ﾈｲ霖､ﾎｰﾍ､ﾉｽｼｨ､ｷ､ﾞ､ｹ
+ LIST_MENU ･･･ｯﾀ隹ﾍ､ﾎ･皈ﾋ･蝪ｼ､ﾎｩ､ﾁｾ螟ｲ｡｢･･･ｯﾀ隍ﾎﾊｸｽ､ﾆﾉ､ﾟ､ｳ､ﾟ､ﾞ､ｹ
LOAD ･｡ｼ･ｫ･･ﾕ･｡･､･､ｻﾘﾄ熙ｷ､ﾆｳｫ､ｭ､ﾞ､ｹ
MAIN_MENU ･皈ﾋ･蝪ｼ､ﾎｩ､ﾁｾ螟ｲ､ﾞ､ｹ
MARK ･ﾞ｡ｼ･ｯ､ﾀﾟﾄ遙ｿｲｽ､ｷ､ﾞ､ｹ
***************
*** 47,62 ****
--- 54,74 ----
MARK_URL URLﾉ､ﾎﾊｸｻﾎ､･･･ｯ､ﾋ､ｷ､ﾞ､ｹ
MARK_WORD ･ｫ｡ｼ･ｽ･､ﾎ､｢､ｸ､･･･ｯ､ﾋ､ｷ､ﾞ､ｹ
MENU ･皈ﾋ･蝪ｼ､ﾎｩ､ﾁｾ螟ｲ､ﾞ､ｹ
+ MENU_MOUSE ･ﾞ･ｦ･ｹ･ｫ｡ｼ･ｽ･､ﾎｰﾌﾃﾖ､ﾇ･皈ﾋ･蝪ｼ､ﾎｩ､ﾁｾ螟ｲ､ﾞ､ｹ(･ﾞ･ｦ･ｹﾁ犲ﾍﾑ)
MOUSE_TOGGLE ･ﾞ･ｦ･ｹ､ﾎﾍｭｸ/ﾌｵｸ､･ﾈ･ｰ･､ｹ､
MOVE_DOWN ･ｫ｡ｼ･ｽ･､ｲｼ､ﾋｰﾜﾆｰ､ｷ､ﾞ､ｹ(ｲ･ﾚ｡ｼ･ｸｻ､ﾋ､ﾏﾈｾ･ﾚ｡ｼ･ｸ･ｹ･ｯ･｡ｼ･)
MOVE_DOWN1 ･ｫ｡ｼ･ｽ･､ｲｼ､ﾋｰﾜﾆｰ､ｷ､ﾞ､ｹ(ｲ･ﾚ｡ｼ･ｸｻ､ﾋ､ﾏ｣ｱｹﾔ･ｹ･ｯ･｡ｼ･)
MOVE_LEFT ･ｫ｡ｼ･ｽ･､ｺｸ､ﾋｰﾜﾆｰ､ｷ､ﾞ､ｹ(ｺｸﾃｼ､ﾎｾｹ遉ﾋ､ﾏﾈｾｲ靂ﾌﾊｬ･ｷ･ﾕ･ﾈ)
MOVE_LEFT1 ･ｫ｡ｼ･ｽ･､ｺｸ､ﾋｰﾜﾆｰ､ｷ､ﾞ､ｹ(ｺｸﾃｼ､ﾎｾｹ遉ﾋ､ﾏ｣ｱﾊｸｻﾊｬ･ｷ･ﾕ･ﾈ)
+ MOVE_LIST_MENU ･･･ｯﾀ隹ﾍ､ﾎ･皈ﾋ･蝪ｼ､ﾎｩ､ﾁｾ螟ｲ｡｢･ｫ｡ｼ･ｽ･､ｰﾜﾆｰ､ｷ､ﾞ､ｹ
+ MOVE_MOUSE ･ｫ｡ｼ･ｽ･､･ﾞ･ｦ･ｹ･ｫ｡ｼ･ｽ･､ﾎｰﾌﾃﾖ､ﾋｰﾜﾆｰ､ｷ､ﾞ､ｹ(･ﾞ･ｦ･ｹﾁ犲ﾍﾑ)
MOVE_RIGHT ･ｫ｡ｼ･ｽ･､ｱｦ､ﾋｰﾜﾆｰ､ｷ､ﾞ､ｹ(ｱｦﾃｼ､ﾎｾｹ遉ﾋ､ﾏﾈｾｲ靂ﾌﾊｬ･ｷ･ﾕ･ﾈ)
MOVE_RIGHT1 ･ｫ｡ｼ･ｽ･､ｱｦ､ﾋｰﾜﾆｰ､ｷ､ﾞ､ｹ(ｱｦﾃｼ､ﾎｾｹ遉ﾋ､ﾏ｣ｱﾊｸｻﾊｬ･ｷ･ﾕ･ﾈ)
MOVE_UP ･ｫ｡ｼ･ｽ･､ｾ螟ﾋｰﾜﾆｰ､ｷ､ﾞ､ｹ(ｲ･ﾚ｡ｼ･ｸｻ､ﾋ､ﾏﾈｾ･ﾚ｡ｼ･ｸ･ｹ･ｯ･｡ｼ･)
MOVE_UP1 ･ｫ｡ｼ･ｽ･､ｾ螟ﾋｰﾜﾆｰ､ｷ､ﾞ､ｹ(ｲ･ﾚ｡ｼ･ｸｻ､ﾋ､ﾏ｣ｱｹﾔ･ｹ･ｯ･｡ｼ･)
MSGS ･ｨ･鬘ｼ･皈ﾃ･ｻ｡ｼ･ｸ､ﾎｰﾍ､ﾎﾉｽｼｨ
+ NEW_TAB ｿｷ､ｷ､､･ｿ･ﾖ､ｳｫ､ｭ､ﾞ､ｹ
+ NEXT ｼ｡､ﾎ･ﾐ･ﾃ･ﾕ･｡､ﾉｽｼｨ､ｷ､ﾞ､ｹ
NEXT_DOWN ･ｫ｡ｼ･ｽ･､ﾎｲｼﾂｦ､ﾋ､｢､･･･ｯ､ﾋｰﾜﾆｰ､ｷ､ﾞ､ｹ
NEXT_LEFT ･ｫ｡ｼ･ｽ･､ﾎｺｸﾂｦ､ﾋ､｢､･･･ｯ､ﾋｰﾜﾆｰ､ｷ､ﾞ､ｹ
NEXT_LEFT_UP ･ｫ｡ｼ･ｽ･､ﾎｺｸﾂｦ(ﾌｵ､ｱ､､ﾐﾁｰ､ﾎｹﾔｰﾊﾁｰ)､ﾋ､｢､･･･ｯ､ﾋｰﾜﾆｰ､ｷ､ﾞ､ｹ
***************
*** 65,70 ****
--- 77,83 ----
NEXT_PAGE ｼ｡､ﾎ･ﾚ｡ｼ･ｸ､ﾉｽｼｨ､ｷ､ﾞ､ｹ
NEXT_RIGHT ･ｫ｡ｼ･ｽ･､ﾎｱｦﾂｦ､ﾋ､｢､･･･ｯ､ﾋｰﾜﾆｰ､ｷ､ﾞ､ｹ
NEXT_RIGHT_DOWN ･ｫ｡ｼ･ｽ･､ﾎｱｦﾂｦ(ﾌｵ､ｱ､､ﾐｼ｡ｹﾔｰﾊｹﾟ)､ﾋ､｢､･･･ｯ､ﾋｰﾜﾆｰ､ｷ､ﾞ､ｹ
+ NEXT_TAB ｼ｡､ﾎ･ｿ･ﾖ､ﾋｰﾜﾆｰ､ｷ､ﾞ､ｹ
NEXT_UP ･ｫ｡ｼ･ｽ･､ﾎｾ蠶ｦ､ﾋ､｢､･･･ｯ､ﾋｰﾜﾆｰ､ｷ､ﾞ､ｹ
NEXT_WORD ｼ｡､ﾎﾃｱｸ､ﾋｰﾜﾆｰ､ｷ､ﾞ､ｹ
NOTHING ｲｿ､筅ｷ､ﾞ､ｻ､
***************
*** 75,90 ****
--- 88,108 ----
PEEK_LINK ･･･ｯ､ｬｻﾘ､ｹﾀ隍ﾎURL､ﾉｽｼｨ､ｷ､ﾞ､ｹ
PIPE_BUF ･ﾐ･ﾃ･ﾕ･｡､ﾎﾆ簣ﾆ､･ﾑ･､･ﾗ､ﾋﾅﾏ､ｷ､ﾞ､ｹ
PIPE_SHELL ･ｳ･ﾞ･･ﾉ､ｼﾂｹﾔ､ｷ｡､ｷｲﾌ､ﾆﾉ､ﾟ､ｳ､ﾟ､ﾊ､ｬ､鯔ｽｼｨ､ｷ､ﾞ､ｹ
+ PREV ﾁｰ､ﾎ･ﾐ･ﾃ･ﾕ･｡､ﾉｽｼｨ､ｷ､ﾞ､ｹ
PREV_LINK ﾁｰ､ﾎ･･･ｯ､ﾋｰﾜﾆｰ､ｷ､ﾞ､ｹ
PREV_MARK ｰ､ﾄﾁｰ､ﾎ･ﾞ｡ｼ･ｯ､ﾋｰﾜﾆｰ､ｷ､ﾞ､ｹ
PREV_PAGE ﾁｰ､ﾎ･ﾚ｡ｼ･ｸ､ﾉｽｼｨ､ｷ､ﾞ､ｹ
+ PREV_TAB ﾁｰ､ﾎ･ｿ･ﾖ､ﾋｰﾜﾆｰ､ｷ､ﾞ､ｹ
PREV_WORD ﾁｰ､ﾎﾃｱｸ､ﾋｰﾜﾆｰ､ｷ､ﾞ､ｹ
PRINT ･ﾐ･ﾃ･ﾕ･｡､ﾎﾉｽｼｨﾆ簣ﾆ､･ﾕ･｡･､･､ﾋﾊﾝﾂｸ､ｷ､ﾞ､ｹ
QUIT w3m､ｽｪﾎｻ､ｷ､ﾞ､ｹ
READ_SHELL ･ｳ･ﾞ･･ﾉ､ｼﾂｹﾔ､ｷ｡､ｷｲﾌ､ﾁｴﾉﾆﾉ､､ﾇ､ｫ､鯔ｽｼｨ､ｷ､ﾞ､ｹ
+ REDO Undo ､ｼ隍ｾﾃ､ｷ､ﾞ､ｹ
REDRAW ｺﾆﾉﾁｲ隍ｷ､ﾞ､ｹ
REG_MARK ﾀｵｵｬﾉｽｸｽ､ﾇｻﾘﾄ熙ｵ､､ｿﾊｸｻﾎ､ﾁｴ､ﾆ･ﾞ｡ｼ･ｯ､ｷ､ﾞ､ｹ
+ REINIT ﾀﾟﾄ･ﾕ･｡･､･､ｺﾆﾆﾉｹ､ｷ､ﾞ､ｹ｡｣
RELOAD ･ﾐ･ﾃ･ﾕ･｡､ｺﾆﾅﾙﾆﾉ､ﾟｹ､ﾟ､ﾞ､ｹ
+ RESHAPE ｺﾆ･･･ﾀ･･･ｰ､ｹ､
RIGHT ｲ靂ﾌﾁｴﾂﾎ､1ﾊｸｻｱｦ､ﾋ､ｺ､鬢ｷ､ﾞ､ｹ
SAVE ﾊｸｽ､ﾎ･ｽ｡ｼ･ｹ､･ﾕ･｡･､･､ﾋﾊﾝﾂｸ､ｷ､ﾞ､ｹ
SAVE_IMAGE ･･･ｯ､ｬｻﾘ､ｹｲ霖､･ﾕ･｡･､･､ﾋﾊﾝﾂｸ､ｷ､ﾞ､ｹ
***************
*** 106,111 ****
--- 124,137 ----
STOP_IMAGE ｲ霖､ﾎﾆﾉｹ/ﾉｽｼｨ､ﾄ莉ﾟ､ｷ､ﾞ､ｹ
SUBMIT ･ﾕ･ｩ｡ｼ･爨ﾋ･ｵ･ﾖ･ﾟ･ﾃ･ﾈ､ｷ､ﾞ､ｹ
SUSPEND ･ｵ･ｹ･ﾚ･･ﾉ
+ TAB_GOTO URL､ｻﾘﾄ熙ｷ､ﾆｿｷ､ｷ､､･ｿ･ﾖ､ﾇｳｫ､ｭ､ﾞ､ｹ
+ TAB_GOTO_RELATIVE ﾁﾂﾐURL､ｻﾘﾄ熙ｷ､ﾆｿｷ､ｷ､､･ｿ･ﾖ､ﾇｳｫ､ｭ､ﾞ､ｹ
+ TAB_LEFT ｸｽｺﾟ､ﾎ･ｿ･ﾖ､ｺｸ､ﾋｰﾜﾆｰ､ｷ､ﾞ､ｹ
+ TAB_LINK ･･･ｯ､ｬｻﾘ､ｹﾀ隍ﾎﾊｸｽ､ｿｷ､ｷ､､･ｿ･ﾖ､ﾇｳｫ､ｭ､ﾞ､ｹ
+ TAB_MENU ･ｿ･ﾖﾁｪﾂ･皈ﾋ･蝪ｼ､ﾎｩ､ﾁｾ螟ｲ､ﾞ､ｹ
+ TAB_MOUSE ･ﾞ･ｦ･ｹ･ｫ｡ｼ･ｽ･､ﾎｰﾌﾃﾖ､ﾎ･ｿ･ﾖ､ﾋｰﾜﾆｰ､ｷ､ﾞ､ｹ(･ﾞ･ｦ･ｹﾁ犲ﾍﾑ)
+ TAB_RIGHT ｸｽｺﾟ､ﾎ･ｿ･ﾖ､ｱｦ､ﾋｰﾜﾆｰ､ｷ､ﾞ､ｹ
+ UNDO ｺﾇｸ螟ﾎ･ｫ｡ｼ･ｽ･ｰﾜﾆｰ､ｼ隍ｾﾃ､ｷ､ﾞ､ｹ
UP ｲ靂ﾌ､1ｹﾔｾ螟ﾋ･ｹ･ｯ･｡ｼ･､ｷ､ﾞ､ｹ
VERSION w3m ､ﾎ･ﾐ｡ｼ･ｸ･逾､ﾉｽｼｨ､ｷ､ﾞ､ｹ
VIEW HTML､ﾎ･ｽ｡ｼ･ｹ､ﾉｽｼｨ､ｷ､ﾞ､ｹ
diff -crN -x CVS w3m-0.3.2.2/doc-jp/README.menu w3m-js-1.743/doc-jp/README.menu
*** w3m-0.3.2.2/doc-jp/README.menu 2001-11-08 14:16:37.000000000 +0900
--- w3m-js-1.743/doc-jp/README.menu 2002-11-28 01:29:44.000000000 +0900
***************
*** 1,6 ****
w3m ､ﾎ･皈ﾋ･蝪ｼ､ﾋ､ﾄ､､､ﾆ
! (1999/11/03) ｺ萢ﾜ ｹﾀﾂｧ
hsaka@mth.biglobe.ne.jp
[1] ･ｭ｡ｼﾁ犲
--- 1,6 ----
w3m ､ﾎ･皈ﾋ･蝪ｼ､ﾋ､ﾄ､､､ﾆ
! (2002/11/27) ｺ萢ﾜ ｹﾀﾂｧ
hsaka@mth.biglobe.ne.jp
[1] ･ｭ｡ｼﾁ犲
***************
*** 13,22 ****
--- 13,28 ----
BS(C-h), DEL(C-?), ｢ｫ･ｭ｡ｼ : ﾌ皃
C-n, j, ｢ｭ･ｭ｡ｼ : ｲｼ､ﾎｹ猯ﾜ､ﾘ
C-p, k, ｢ｬ･ｭ｡ｼ : ｾ螟ﾎｹ猯ﾜ､ﾘ
+ J : ｹ猯ﾜ､ｾ螟ﾋ･ｹ･ｯ･｡ｼ･
+ K : ｹ猯ﾜ､ｲｼ､ﾋ･ｹ･ｯ･｡ｼ･
C-a : ﾀ霹ｬ､ﾎｹ猯ﾜ､ﾘ
C-e : ｺﾇｸ螟ﾎｹ猯ﾜ､ﾘ
C-f, C-v : ｼ｡･ﾚ｡ｼ･ｸ､ﾎｹ猯ﾜ､ﾘ
C-b, M-v : ﾁｰ･ﾚ｡ｼ･ｸ､ﾎｹ猯ﾜ､ﾘ
+ C-s, / : ｹ猯ﾜ､ｲｼ､ﾋｸ､ｫ､ﾃ､ﾆｸ｡ｺ
+ C-r, ? : ｹ猯ﾜ､ｾ螟ﾋｸ､ｫ､ﾃ､ﾆｸ｡ｺ
+ n : ｼ｡､ﾎｹ猯ﾜ､ｸ｡ｺ
+ N : ﾁｰ､ﾎｹ猯ﾜ､ｸ｡ｺ
C-z : ･ｵ･ｹ･ﾚ･･ﾉ
# INS ､ﾏﾄﾌｾ ^[[2~ ､ﾇ､ｹ､ｬ ^[[L(･ｳ･･ｽ｡ｼ･), ^[[E(PocketBSD) ､ﾋ､
***************
*** 41,46 ****
--- 47,53 ----
｡ (ﾏﾈｳｰ) : ﾌ皃(･皈ﾋ･蝪ｼ､ﾎｾﾃｵ)
｡ ( : ) : ｼ｡･ﾚ｡ｼ･ｸ､ﾞ､ｿ､ﾏﾁｰ･ﾚ｡ｼ･ｸ､ﾎｹ猯ﾜ､ﾘ
(ﾄｹ､､･皈ﾋ･蝪ｼ､ﾎｾｹ)
+ ｡ (･ﾉ･鬣ﾃ･ｰ) : ･ｹ･ｯ･｡ｼ･
[3] ･皈ﾋ･蝪ｼ､ﾎ･ｫ･ｹ･ｿ･ﾞ･､･ｺ
***************
*** 62,68 ****
ﾎ网ﾏ menu.default ､ menu.submenu ､ｸｫ､ﾆ､ｯ､ﾀ､ｵ､､｡｣
ﾀﾟﾄ熙ﾇ､ｭ､･ｳ･ﾞ･･ﾉ(FUNCTION)､ﾏ README.func ､ｸｫ､ﾆ､ｯ､ﾀ､ｵ､､｡｣
MENU_ID ､ﾈ､ｷ､ﾆ "Main" ､ﾏ･皈､･･皈ﾋ･蝪ｼ､ﾋ｡｢"Select" ､ﾏ･ﾐ･ﾃ･ﾕ･｡ﾁｪﾂ
! ･皈ﾋ･蝪ｼ､ﾋﾍｽﾌ､ｵ､､ﾆ､､､ﾞ､ｹ｡｣
KEYS ､ﾏ･ﾐ･､･･ﾉ､ｹ､･ｭ｡ｼ､ﾇﾊ｣ｿｻﾘﾄｲﾄﾇｽ､ﾇ､ｹ｡｣
DATA ､ｬﾀﾟﾄ熙ｵ､､ﾆ､､､､ﾐ･ｳ･ﾞ･･ﾉ(FUNCTION)､ﾎｰｿ､ﾈ､ｷ､ﾆｻﾈ､､､ﾞ､ｹ｡｣
--- 69,75 ----
ﾎ网ﾏ menu.default ､ menu.submenu ､ｸｫ､ﾆ､ｯ､ﾀ､ｵ､､｡｣
ﾀﾟﾄ熙ﾇ､ｭ､･ｳ･ﾞ･･ﾉ(FUNCTION)､ﾏ README.func ､ｸｫ､ﾆ､ｯ､ﾀ､ｵ､､｡｣
MENU_ID ､ﾈ､ｷ､ﾆ "Main" ､ﾏ･皈､･･皈ﾋ･蝪ｼ､ﾋ｡｢"Select" ､ﾏ･ﾐ･ﾃ･ﾕ･｡ﾁｪﾂ
! ･皈ﾋ･蝪ｼ､ﾋ｡｢"SelectTab" ､ﾏ･ｿ･ﾖﾁｪﾂ･皈ﾋ･蝪ｼ､ﾋﾍｽﾌ､ｵ､､ﾆ､､､ﾞ､ｹ｡｣
KEYS ､ﾏ･ﾐ･､･･ﾉ､ｹ､･ｭ｡ｼ､ﾇﾊ｣ｿｻﾘﾄｲﾄﾇｽ､ﾇ､ｹ｡｣
DATA ､ｬﾀﾟﾄ熙ｵ､､ﾆ､､､､ﾐ･ｳ･ﾞ･･ﾉ(FUNCTION)､ﾎｰｿ､ﾈ､ｷ､ﾆｻﾈ､､､ﾞ､ｹ｡｣
diff -crN -x CVS w3m-0.3.2.2/doc-jp/README.mouse w3m-js-1.743/doc-jp/README.mouse
*** w3m-0.3.2.2/doc-jp/README.mouse 1970-01-01 09:00:00.000000000 +0900
--- w3m-js-1.743/doc-jp/README.mouse 2002-11-26 02:23:47.000000000 +0900
***************
*** 0 ****
--- 1,66 ----
+ ~/.w3m/mouse ､ﾎｷﾁｼｰ､ﾏ｡｢
+
+ menu ･皈ﾋ･蝪ｼ､ﾎﾊｸｻﾎ(･ﾇ･ﾕ･ｩ･･ﾈ､ﾊ､ｷ)
+ lastline ｺﾇｲｼｹﾔ､ﾎﾊｸｻﾎ(･ﾇ･ﾕ･ｩ･･ﾈ｡ﾘ｢罎ｬ｢ｭ｡ﾙ)
+ button ﾈﾖｹ ｰﾌﾃﾖ ｴﾘｿ [ｰｿ]
+
+
+ ﾈﾖｹ: 1｡ﾄｺｸ･ﾜ･ｿ･
+ 2｡ﾄﾃ讌ﾜ･ｿ･
+ 3｡ﾄｱｦ･ﾜ･ｿ･
+
+ ｰﾌﾃﾖ: menu ｡ﾄ ･皈ﾋ･蝪ｼｾ螟ﾇ･ｯ･･ﾃ･ｯ
+ lastline ｡ﾄ ｺﾇｲｼｹﾔ､ﾇ･ｯ･･ﾃ･ｯ
+ default ｡ﾄ ﾂｾ､ﾎﾀﾟﾄ熙ｬﾌｵ､､ｻ､ﾎ･ﾇ･ﾕ･ｩ･･ﾈ
+ anchor ｡ﾄ ･｢･･ｫ｡ｼｾ螟ﾇ･ｯ･･ﾃ･ｯ
+ active ｡ﾄ ･｢･ｯ･ﾆ･｣･ﾖ､ﾊ･｢･･ｫ｡ｼｾ螟ﾇ･ｯ･･ﾃ･ｯ
+ tab ｡ﾄ ･ｿ･ﾖｾ螟ﾇ･ｯ･･ﾃ･ｯ
+
+ : ｺｸﾃｼ､ﾎ･ｫ･鬣牴ﾌﾃﾖ
+ : ｱｦﾃｼ､ﾎ･ｫ･鬣牴ﾌ
+
+ ､ﾇ､ｹ｡｣
+ ｸﾟｴｹﾀｭ､ﾎ､ｿ､皃ﾋ <ｰﾌﾃﾖ> ､ﾇ､ﾎ menu ､ﾏｾﾊﾎｬｲﾄﾇｽ､ﾇ､ｹ｡｣
+
+ ･ﾇ･ﾕ･ｩ･･ﾈ､ﾎﾀﾟﾄ(func.c ﾆ)､ﾏ｡｢
+
+ button 1 default MOVE_MOUSE
+ button 2 default BACK
+ button 3 default MENU_MOUSE
+
+ button 1 active GOTO_LINK
+
+ button 1 tab TAB_MOUSE
+ button 2 tab CLOSE_TAB_MOUSE
+
+ lastline "｢罎ｬ｢ｭ"
+ button 1 lastline 0 1 BACK
+ button 1 lastline 2 3 PREV_PAGE
+ button 1 lastline 4 5 NEXT_PAGE
+
+ ､ﾈﾆｱﾅ､ﾇ､ｹ｡｣(､ｳ､､ﾞ､ﾇ､ﾈﾆｱ､ｸ､ﾏ､ｺ)
+
+ ｡ｦﾎ网ｨ､ﾐ｡｢
+
+ button 1 anchor COMMAND "MOVE_MOUSE; GOTO_LINK"
+
+ ､ﾈﾀﾟﾄ熙ｹ､､ﾈ･｢･ｯ･ﾆ･｣･ﾖ､ﾇ､ﾊ､､･｢･･ｫ｡ｼｾ螟ﾇ､篌ｸ･ｯ･･ﾃ･ｯ､ｷ､ｿ､ﾀ､ｱ､ﾇ｡｢
+ ･･･ｯﾀ隍ﾋﾈ､ﾓ､ﾞ､ｹ｡｣(GUI ･ﾖ･鬣ｦ･ｶ､ﾈﾆｱ､ｸﾍﾍ､ﾊﾆｰｺ)
+
+ ｡ｦ~/.w3m/menu ､ﾇ
+
+ menu Active
+ func "･･･ｯ､ﾉｽｼｨ (a)" GOTO_LINK "a"
+ func "ｿｷ､ｷ､､･ｿ･ﾖ､ﾇﾉｽｼｨ (t)" TAB_LINK "t"
+ func "･･･ｯ､ﾊﾝﾂｸ (d)" SAVE_LINK "d"
+ func "ｳｰﾉ･ﾖ･鬣ｦ･ｶ､ﾇﾉｽｼｨ (m)" EXTERN_LINK "m"
+ end
+
+ ､ﾎﾍﾍ､ﾋﾀﾟﾄ熙ｷ､ﾆ､ｪ､､､ﾆ｡｢~/.w3m/mouse ､ﾇ
+
+ button 3 anchor MENU_MOUSE Active
+
+ ､ﾈﾀﾟﾄ熙ｹ､､ﾈ｡｢･｢･･ｫ｡ｼｾ螟ﾇｱｦ･ｯ･･ﾃ･ｯ､ｷ､ｹ､､ﾈ･｢･･ｫ｡ｼﾍﾑ､ﾎ
+ ･皈ﾋ･蝪ｼ､ｬｳｫ､ｭ､ﾞ､ｹ｡｣
+
+ ､ｳ､､ﾊｴｶ､ｸ､ﾇｻﾈ､ﾃ､ﾆ､ﾟ､ﾆ､ｯ､ﾀ､ｵ､､｡｣
diff -crN -x CVS w3m-0.3.2.2/doc-jp/README.pre_form w3m-js-1.743/doc-jp/README.pre_form
*** w3m-0.3.2.2/doc-jp/README.pre_form 1970-01-01 09:00:00.000000000 +0900
--- w3m-js-1.743/doc-jp/README.pre_form 2003-01-11 11:38:49.000000000 +0900
***************
*** 0 ****
--- 1,34 ----
+ pre_form: $BFCDj$N%5%$%H$r3+$$$?;~$K!"(Bform $B$rM=$a@_Dj$9$k5!G=$G$9!#(B
+
+ $BNI$/;H$&7G<(HD$H$+$G$OJXMx$H;W$$$^$9$,!"0BA4@-$,5>@7$K$J$k$+$b(B
+ $B$7$l$^$;$s!#FC$K(B submit $B$O5$$r$D$1$F;H$C$F2<$5$$!#(B
+
+ $B%G%U%)%k%H$N@_Dj%U%!%$%k$O(B ~/.w3m/pre_form $B$G$9!#(B
+ $B@_Dj%U%)!<%^%C%H$O!"(B
+
+ url |//
+ form []
+ text
+ file
+ password
+ checkbox []
+ radio
+ section
+ submit []
+ textarea
+
+ :
+ /textarea
+
+ $B$G$9!#(B
+ $B$,@_Dj$7$F$"$k;~$O!"0lCW$9$k(B action $BB0@-$r;}$D(B form $B$N$_(B
+ $B@_Dj$7$^$9!#(B
+ text, file, password, select, textarea $B$O0lCW$9$k(B name $BB0@-$r;}$D(B
+ input, select $B$^$?$O(B textarea $BMWAG$N(B value $BB0@-$r@_Dj$7$^$9!#(B
+ checkbox, radio $B$O(B name $BB0@-$H(B value $BB0@-$,0lCW$9$k(B input $BMWAG$r(B
+ check $B$7$^$9!#(B
+ $B$,(B 0$B!"(Bno $B$^$?$O(B off $B$N>l9g$O(B checkbox $B$N(B check $B$r30$7$^$9!#(B
+ submit $B$N>l9g!"(B $B$,@_Dj$7$F$"$k;~$O!"0lCW$9$k(B name $BB0@-$r;}$D(B
+ input $BMWAG$r(B submit $B$7$^$9!#(B $B$,@_Dj$7$F$$$J$$>l9g$O!":G8e$N(B
+ input type=submit $BMWAG$r(B submit $B$7$^$9!#(B
+ $B$d(B $B$O!"%7%'%k$NMM$K(B \,'$B!A(B',"$B!A(B" $B$G%/%)!<%H2DG=$G$9!#(B
diff -crN -x CVS w3m-0.3.2.2/doc-jp/README.tab w3m-js-1.743/doc-jp/README.tab
*** w3m-0.3.2.2/doc-jp/README.tab 1970-01-01 09:00:00.000000000 +0900
--- w3m-js-1.743/doc-jp/README.tab 2002-11-06 02:24:48.000000000 +0900
***************
*** 0 ****
--- 1,43 ----
+ w3m $B$r%?%V%V%i%&%62=(B
+
+ $B%-!e$2$^$9(B
+ $B%?%VA*Br%a%K%e!<$NA`:n$O%P%C%U%!A*Br%a%K%e!<$HF1MM$G$9!#(B
+
+ $B$^$?!"%^%&%9$G$NA`:n$b=PMh$^$9!#(B
+
+ $B:8%\%?%s(B $B!D(B $B%?%V>e$G%/%j%C%/$9$k$H!"$=$N%?%V$K0\F0$7$^$9(B
+ $B%?%V$+$iJL$N%?%V$^$G%I%i%C%0$9$k$H!"%?%V$r0\F0$7$^$9!#(B
+ $B%j%s%/$+$i%?%V$^$G%I%i%C%0$9$k$H!"$=$N%?%V$G%j%s%/$r3+$-$^$9(B
+ $B1&>e6y$N!V(Bx$B!W$r%/%j%C%/$9$k$H!"8=:_$N%?%V$rJD$8$^$9(B
+ $BCf%\%?%s(B $B!D(B $B%?%V>e$G%/%j%C%/$9$k$H!"%?%V$rJD$8$^$9(B
+ $B1&%\%?%s(B $B!D(B $BFC$K$J$7(B(= $B%a%K%e!<$r3+$/(B)
+
+ $B%*%W%7%g%s$H$7$F!"(B
+
+ open_tab_blank $B!D(B target $B$,(B _blank $B$+(B _new $B$N>l9g$O?7$7$$%?%V$G3+$/(B
+ $B%G%U%)%k%H$O(B OFF
+ close_tab_back $B!D(B $BLa$k;~$K%P%C%U%!$,:G8e$J$i%?%V$rJD$8$k(B
+ $B%G%U%)%k%H$O(B OFF (= Can't back...)
+
+ $B$rDI2C$7$F$$$^$9!#(B
diff -crN -x CVS w3m-0.3.2.2/doc-jp/keymap.default w3m-js-1.743/doc-jp/keymap.default
*** w3m-0.3.2.2/doc-jp/keymap.default 2002-09-06 00:43:22.000000000 +0900
--- w3m-js-1.743/doc-jp/keymap.default 2002-12-13 22:15:54.000000000 +0900
***************
*** 24,31 ****
--- 24,33 ----
keymap C-m GOTO_LINK
keymap C-n MOVE_DOWN
keymap C-p MOVE_UP
+ keymap C-q CLOSE_TAB
keymap C-r ISEARCH_BACK
keymap C-s ISEARCH
+ keymap C-t TAB_LINK
keymap C-u PREV_LINK
keymap C-v NEXT_PAGE
keymap C-w WRAP_TOGGLE
***************
*** 36,42 ****
--- 38,48 ----
keymap \" REG_MARK
keymap # PIPE_SHELL
keymap $ LINE_END
+ keymap ( UNDO
+ keymap ) REDO
+ keymap + NEXT_PAGE
keymap , LEFT
+ keymap - PREV_PAGE
keymap . RIGHT
keymap / SEARCH
keymap : MARK_URL
***************
*** 47,52 ****
--- 53,59 ----
keymap ? SEARCH_BACK
keymap @ READ_SHELL
keymap B BACK
+ keymap D DOWNLOAD_LIST
keymap E EDIT
keymap F FRAME
keymap G END
***************
*** 54,64 ****
--- 61,73 ----
keymap I VIEW_IMAGE
keymap J UP
keymap K DOWN
+ keymap L LIST
keymap M EXTERN
keymap N SEARCH_PREV
keymap Q EXIT
keymap R RELOAD
keymap S SAVE_SCREEN
+ keymap T NEW_TAB
keymap U GOTO
keymap V LOAD
keymap W PREV_WORD
***************
*** 75,88 ****
keymap j MOVE_DOWN
keymap k MOVE_UP
keymap l MOVE_RIGHT
keymap n SEARCH_NEXT
keymap o OPTIONS
keymap q QUIT
! keymap s SELECT_MENU
keymap u PEEK_LINK
keymap v VIEW
keymap w NEXT_WORD
keymap z CENTER_V
keymap M-TAB PREV_LINK
keymap M-C-j SAVE_LINK
--- 84,102 ----
keymap j MOVE_DOWN
keymap k MOVE_UP
keymap l MOVE_RIGHT
+ keymap m MOUSE_TOGGLE
keymap n SEARCH_NEXT
keymap o OPTIONS
keymap q QUIT
! keymap r VERSION
! keymap s SELECT_MENU
keymap u PEEK_LINK
keymap v VIEW
keymap w NEXT_WORD
keymap z CENTER_V
+ keymap { PREV_TAB
+ keymap | PIPE_BUF
+ keymap } NEXT_TAB
keymap M-TAB PREV_LINK
keymap M-C-j SAVE_LINK
***************
*** 96,106 ****
--- 110,126 ----
keymap M-W DICT_WORD_AT
keymap M-a ADD_BOOKMARK
keymap M-b BOOKMARK
+ keymap M-c COMMAND
keymap M-e EDIT_SCREEN
keymap M-g GOTO_LINE
+ keymap M-k DEFINE_KEY
+ keymap M-l LIST_MENU
+ keymap M-m MOVE_LIST_MENU
keymap M-n NEXT_MARK
+ keymap M-o SET_OPTION
keymap M-p PREV_MARK
keymap M-s SAVE
+ keymap M-t TAB_MENU
keymap M-u GOTO_RELATIVE
keymap M-v PREV_PAGE
keymap M-w DICT_WORD
diff -crN -x CVS w3m-0.3.2.2/doc-jp/keymap.lynx w3m-js-1.743/doc-jp/keymap.lynx
*** w3m-0.3.2.2/doc-jp/keymap.lynx 2002-01-24 02:19:47.000000000 +0900
--- w3m-js-1.743/doc-jp/keymap.lynx 2002-12-13 22:15:54.000000000 +0900
***************
*** 24,31 ****
--- 24,34 ----
keymap C-m GOTO_LINK
keymap C-n NEXT_LINK
keymap C-p PREV_LINK
+ keymap C-q CLOSE_TAB
keymap C-r RELOAD
keymap C-s SEARCH
+ keymap C-t TAB_LINK
+ keymap C-u PREV_LINK
keymap C-v NEXT_PAGE
keymap C-w REDRAW
keymap C-z SUSPEND
***************
*** 35,50 ****
--- 38,59 ----
keymap \" REG_MARK
keymap # PIPE_SHELL
keymap $ LINE_END
+ keymap ( UNDO
+ keymap ) REDO
keymap + NEXT_PAGE
+ keymap , LEFT
keymap - PREV_PAGE
+ keymap . RIGHT
keymap / SEARCH
keymap : MARK_URL
+ keymap ; MARK_WORD
keymap < SHIFT_LEFT
keymap = INFO
keymap > SHIFT_RIGHT
keymap ? HELP
keymap @ READ_SHELL
keymap B BACK
+ keymap D DOWNLOAD_LIST
keymap E EDIT
keymap F FRAME
keymap G GOTO_LINE
***************
*** 52,67 ****
--- 61,81 ----
keymap I VIEW_IMAGE
keymap J UP
keymap K DOWN
+ keymap L LIST
keymap M EXTERN
keymap N NEXT_MARK
keymap P PREV_MARK
keymap Q EXIT
keymap R RELOAD
keymap S SAVE_SCREEN
+ keymap T NEW_TAB
keymap U GOTO
keymap V LOAD
+ keymap W PREV_WORD
keymap Z CENTER_H
+ keymap [ LINK_BEGIN
keymap \\ SOURCE
+ keymap ] LINK_END
keymap \^ LINE_BEGIN
keymap a ADD_BOOKMARK
keymap b PREV_PAGE
***************
*** 73,101 ****
keymap j MOVE_DOWN
keymap k MOVE_UP
keymap l MOVE_RIGHT
keymap n SEARCH_NEXT
keymap o OPTIONS
keymap p SAVE_SCREEN
keymap q QUIT
! keymap s SELECT_MENU
keymap u PEEK_LINK
keymap v BOOKMARK
! keymap w WRAP_TOGGLE
keymap z CENTER_V
keymap M-TAB PREV_LINK
keymap M-C-j SAVE_LINK
keymap M-C-m SAVE_LINK
keymap M-: MARK_MID
keymap M-I SAVE_IMAGE
keymap M-M EXTERN_LINK
keymap M-a ADD_BOOKMARK
keymap M-b BOOKMARK
keymap M-e EDIT_SCREEN
keymap M-s SAVE
keymap M-u GOTO_RELATIVE
keymap M-v PREV_PAGE
keymap UP PREV_LINK
keymap DOWN NEXT_LINK
--- 87,133 ----
keymap j MOVE_DOWN
keymap k MOVE_UP
keymap l MOVE_RIGHT
+ keymap m MOUSE_TOGGLE
keymap n SEARCH_NEXT
keymap o OPTIONS
keymap p SAVE_SCREEN
keymap q QUIT
! keymap r VERSION
! keymap s SELECT_MENU
keymap u PEEK_LINK
keymap v BOOKMARK
! keymap w NEXT_WORD
keymap z CENTER_V
+ keymap { PREV_TAB
+ keymap | PIPE_BUF
+ keymap } NEXT_TAB
keymap M-TAB PREV_LINK
keymap M-C-j SAVE_LINK
keymap M-C-m SAVE_LINK
keymap M-: MARK_MID
+ keymap M-< BEGIN
+ keymap M-> END
keymap M-I SAVE_IMAGE
keymap M-M EXTERN_LINK
+ keymap M-W DICT_WORD_AT
keymap M-a ADD_BOOKMARK
keymap M-b BOOKMARK
+ keymap M-c COMMAND
keymap M-e EDIT_SCREEN
+ keymap M-g GOTO_LINE
+ keymap M-k DEFINE_KEY
+ keymap M-l LIST_MENU
+ keymap M-m MOVE_LIST_MENU
+ keymap M-n NEXT_MARK
+ keymap M-o SET_OPTION
+ keymap M-p PREV_MARK
keymap M-s SAVE
+ keymap M-t TAB_MENU
keymap M-u GOTO_RELATIVE
keymap M-v PREV_PAGE
+ keymap M-w DICT_WORD
keymap UP PREV_LINK
keymap DOWN NEXT_LINK
diff -crN -x CVS w3m-0.3.2.2/doc-jp/menu.default w3m-js-1.743/doc-jp/menu.default
*** w3m-0.3.2.2/doc-jp/menu.default 2001-11-08 14:16:38.000000000 +0900
--- w3m-js-1.743/doc-jp/menu.default 2002-12-13 22:15:54.000000000 +0900
***************
*** 12,24 ****
menu Main
func "ﾌ皃 (b)" BACK "b"
! func "･ﾐ･ﾃ･ﾕ･｡ﾁｪﾂ (s)" SELECT "s"
func "･ｽ｡ｼ･ｹ､ﾉｽｼｨ (v)" VIEW "vV"
func "･ｽ｡ｼ･ｹ､ﾊﾔｽｸ (e)" EDIT "eE"
func "･ｽ｡ｼ･ｹ､ﾊﾝﾂｸ (S)" SAVE "S"
func "ｺﾆﾆﾉ､ﾟｹ､ﾟ (r)" RELOAD "rR"
nop "ｨ｡ｨ｡ｨ｡ｨ｡ｨ｡ｨ｡ｨ｡ｨ｡"
func "･･･ｯ､ﾉｽｼｨ (a)" GOTO_LINK "a"
func "･･･ｯ､ﾊﾝﾂｸ (A)" SAVE_LINK "A"
func "ｲ霖､ﾉｽｼｨ (i)" VIEW_IMAGE "i"
func "ｲ霖､ﾊﾝﾂｸ (I)" SAVE_IMAGE "I"
--- 12,26 ----
menu Main
func "ﾌ皃 (b)" BACK "b"
! popup "･ﾐ･ﾃ･ﾕ･｡ﾁｪﾂ (s)" Select "s"
! popup "･ｿ･ﾖﾁｪﾂ (t)" SelectTab "tT"
func "･ｽ｡ｼ･ｹ､ﾉｽｼｨ (v)" VIEW "vV"
func "･ｽ｡ｼ･ｹ､ﾊﾔｽｸ (e)" EDIT "eE"
func "･ｽ｡ｼ･ｹ､ﾊﾝﾂｸ (S)" SAVE "S"
func "ｺﾆﾆﾉ､ﾟｹ､ﾟ (r)" RELOAD "rR"
nop "ｨ｡ｨ｡ｨ｡ｨ｡ｨ｡ｨ｡ｨ｡ｨ｡"
func "･･･ｯ､ﾉｽｼｨ (a)" GOTO_LINK "a"
+ func "ｿｷ･ｿ･ﾖ､ﾇﾉｽｼｨ (n)" TAB_LINK "nN"
func "･･･ｯ､ﾊﾝﾂｸ (A)" SAVE_LINK "A"
func "ｲ霖､ﾉｽｼｨ (i)" VIEW_IMAGE "i"
func "ｲ霖､ﾊﾝﾂｸ (I)" SAVE_IMAGE "I"
diff -crN -x CVS w3m-0.3.2.2/doc-jp/w3m.1 w3m-js-1.743/doc-jp/w3m.1
*** w3m-0.3.2.2/doc-jp/w3m.1 2001-11-21 13:29:14.000000000 +0900
--- w3m-js-1.743/doc-jp/w3m.1 2002-11-12 22:18:55.000000000 +0900
***************
*** 48,53 ****
--- 48,56 ----
.B \-j
JIS (ISO-2022-JP)･ｳ｡ｼ･ﾉ､ﾇﾉｽｼｨ､ｹ､｡･
.TP
+ .BI \-O\ e|s|j|N|m
+ ﾉｽｼｨ､ﾋｻﾈ､ｦﾊｸｻ･ｳ｡ｼ･ﾉ､ｻﾘﾄ熙ｹ､.
+ .TP
.BI \-I\ e|s
ﾆﾎﾏﾊｸｽ､ﾎﾊｸｻ･ｳ｡ｼ･ﾉ､ｻﾘﾄ熙ｹ､｡･
.TP
***************
*** 94,105 ****
--- 97,114 ----
.B w3m
ｽｪﾎｻｻ､ﾋ｡､ｰﾊﾁｰ､ﾎｲ靂ﾌ､ﾋﾌ皃鬢ﾊ､､｡･
.TP
+ .BI \-title =TERM
+ ﾃｼﾋ､ﾎ･ｿ･､･ﾈ･ﾊｸｻﾎ､ﾀﾟﾄ熙ｹ､.
+ .TP
.B \-W
ﾀﾞ､ﾊﾖ､ｷ･ｵ｡ｼ･ﾁ､ｻﾈ､ｦ､ｫ､ﾉ､ｦ､ｫ､ﾀﾚ､熙ｫ､ｨ､｡･
.TP
.BI \-o\ option=value
･ｪ･ﾗ･ｷ･逾､ｻﾘﾄ熙ｹ､｡･
.TP
+ .B \-show-option
+ ﾍﾍﾑ､ﾇ､ｭ､･ｪ･ﾗ･ｷ･逾､ﾉｽｼｨ､ｹ､.
+ .TP
.B \-no\-proxy
･ﾗ･･ｭ･ｷ､ﾍﾍﾑ､ｷ､ﾊ､､｡･
.TP
***************
*** 151,156 ****
--- 160,171 ----
.TP
.BI \-config\ file
config､ﾎ･ﾕ･｡･､･､ｻﾘﾄ熙ｹ､｡･
+ .TP
+ .B -help
+ ･ﾘ･･ﾗ､ﾉｽｼｨ､ｹ､.
+ .TP
+ .B -version
+ w3m version､ﾉｽｼｨ､ｹ､.
.SS ﾊｸｽ､ﾎﾉｽｼｨﾆ簣ﾆ
HTMLﾊｸｽ､ﾉｽｼｨ､ｷ､ﾆ､､､､ﾈ､ｭ､ﾋ､ﾏ｡､ｼ｡､ﾎ､隍ｦ､ﾊﾉｽｼｨ､ﾋ､ﾊ､熙ﾞ､ｹ｡･
.in +8n
diff -crN -x CVS w3m-0.3.2.2/etc.c w3m-js-1.743/etc.c
*** w3m-0.3.2.2/etc.c 2002-10-31 02:21:40.000000000 +0900
--- w3m-js-1.743/etc.c 2003-02-07 02:21:13.000000000 +0900
***************
*** 1,4 ****
! /* $Id: etc.c,v 1.28 2002/10/30 17:21:40 ukai Exp $ */
#include "fm.h"
#include
#include "myctype.h"
--- 1,4 ----
! /* $Id: etc.c,v 1.64 2003/02/06 17:21:43 ukai Exp $ */
#include "fm.h"
#include
#include "myctype.h"
***************
*** 7,17 ****
#include "hash.h"
#include "terms.h"
! #ifdef HAVE_GETCWD /* ??? ukai */
! #include
! #include
! #endif /* HAVE_GETCWD */
!
#include
#include
#if defined(HAVE_WAITPID) || defined(HAVE_WAIT3)
--- 7,13 ----
#include "hash.h"
#include "terms.h"
! #include
#include
#include
#if defined(HAVE_WAITPID) || defined(HAVE_WAIT3)
***************
*** 42,48 ****
{
int i, maxColumn;
int column = buf->currentColumn + offset;
! int nlines = LASTLINE + 1;
Line *l;
maxColumn = 0;
--- 38,44 ----
{
int i, maxColumn;
int column = buf->currentColumn + offset;
! int nlines = buf->LINES + 1;
Line *l;
maxColumn = 0;
***************
*** 91,97 ****
#ifdef NEXTPAGE_TOPLINE
if (!nextpage_topline)
#endif
! for (i = (LASTLINE - 1) - (buf->lastLine->linenumber - l->linenumber);
i > 0 && l->prev != NULL; i--, l = l->prev) ;
return l;
}
--- 87,93 ----
#ifdef NEXTPAGE_TOPLINE
if (!nextpage_topline)
#endif
! for (i = buf->LINES - 1 - (buf->lastLine->linenumber - l->linenumber);
i > 0 && l->prev != NULL; i--, l = l->prev) ;
return l;
}
***************
*** 103,109 ****
Line *l = line;
if (buf->pagerSource && !(buf->bufferprop & BP_CLOSE)) {
! n = line->linenumber + offset + LASTLINE;
if (buf->lastLine->linenumber < n)
getNextPage(buf, n - buf->lastLine->linenumber);
while ((last || (buf->lastLine->linenumber < n)) &&
--- 99,105 ----
Line *l = line;
if (buf->pagerSource && !(buf->bufferprop & BP_CLOSE)) {
! n = line->linenumber + offset + buf->LINES;
if (buf->lastLine->linenumber < n)
getNextPage(buf, n - buf->lastLine->linenumber);
while ((last || (buf->lastLine->linenumber < n)) &&
***************
*** 134,147 ****
(*s)++;
/* first character */
! if (IS_ALNUM(**s) || **s == '_' || **s == '/')
! *(p++) = tolower(*((*s)++));
else
return HTML_UNKNOWN;
if (p[-1] == '/')
SKIP_BLANKS(*s);
while ((IS_ALNUM(**s) || **s == '_') && p - cmdstr < MAX_CMD_LEN) {
! *(p++) = tolower(*((*s)++));
}
if (p - cmdstr == MAX_CMD_LEN) {
/* buffer overflow: perhaps caused by bad HTML source */
--- 130,146 ----
(*s)++;
/* first character */
! if (IS_ALNUM(**s) || **s == '_' || **s == '/') {
! *(p++) = TOLOWER(**s);
! (*s)++;
! }
else
return HTML_UNKNOWN;
if (p[-1] == '/')
SKIP_BLANKS(*s);
while ((IS_ALNUM(**s) || **s == '_') && p - cmdstr < MAX_CMD_LEN) {
! *(p++) = TOLOWER(**s);
! (*s)++;
}
if (p - cmdstr == MAX_CMD_LEN) {
/* buffer overflow: perhaps caused by bad HTML source */
***************
*** 237,286 ****
*/
Str
! checkType(Str s, Lineprop *oprop,
! #ifdef USE_ANSI_COLOR
! Linecolor *ocolor, int *check_color,
! #endif
! int len)
{
Lineprop mode;
Lineprop effect = PE_NORMAL;
! Lineprop *prop = oprop;
char *str = s->ptr, *endp = &s->ptr[s->length], *bs = NULL;
#ifdef USE_ANSI_COLOR
Lineprop ceffect = PE_NORMAL;
Linecolor cmode = 0;
Linecolor *color = NULL;
char *es = NULL;
#endif
int do_copy = FALSE;
- int size = (len < s->length) ? len : s->length;
! #ifdef USE_ANSI_COLOR
! if (check_color)
! *check_color = FALSE;
! #endif
if (ShowEffect) {
bs = memchr(str, '\b', s->length);
#ifdef USE_ANSI_COLOR
if (ocolor) {
es = memchr(str, ESC_CODE, s->length);
! if (es)
! color = ocolor;
}
#endif
! if (s->length > size || (bs != NULL)
#ifdef USE_ANSI_COLOR
|| (es != NULL)
#endif
) {
! s = Strnew_size(size);
do_copy = TRUE;
}
}
while (str < endp) {
! if (prop - oprop >= len)
break;
if (bs != NULL) {
if (str == bs - 2 && !strncmp(str, "__\b\b", 4)) {
--- 236,293 ----
*/
Str
! checkType(Str s, Lineprop **oprop, Linecolor **ocolor)
{
Lineprop mode;
Lineprop effect = PE_NORMAL;
! Lineprop *prop;
! static Lineprop *prop_buffer = NULL;
! static int prop_size = 0;
char *str = s->ptr, *endp = &s->ptr[s->length], *bs = NULL;
#ifdef USE_ANSI_COLOR
Lineprop ceffect = PE_NORMAL;
Linecolor cmode = 0;
+ int check_color = FALSE;
Linecolor *color = NULL;
+ static Linecolor *color_buffer = NULL;
+ static int color_size = 0;
char *es = NULL;
#endif
int do_copy = FALSE;
! if (prop_size < s->length) {
! prop_size = (s->length > LINELEN) ? s->length : LINELEN;
! prop_buffer = New_Reuse(Lineprop, prop_buffer, prop_size);
! }
! prop = prop_buffer;
!
if (ShowEffect) {
bs = memchr(str, '\b', s->length);
#ifdef USE_ANSI_COLOR
if (ocolor) {
es = memchr(str, ESC_CODE, s->length);
! if (es) {
! if (color_size < s->length) {
! color_size = (s->length > LINELEN) ? s->length : LINELEN;
! color_buffer = New_Reuse(Linecolor, color_buffer,
! color_size);
! }
! color = color_buffer;
! }
}
#endif
! if ((bs != NULL)
#ifdef USE_ANSI_COLOR
|| (es != NULL)
#endif
) {
! s = Strnew_size(s->length);
do_copy = TRUE;
}
}
while (str < endp) {
! if (prop - prop_buffer >= prop_size)
break;
if (bs != NULL) {
if (str == bs - 2 && !strncmp(str, "__\b\b", 4)) {
***************
*** 411,417 ****
es = memchr(str, ESC_CODE, endp - str);
if (ok) {
if (cmode)
! *check_color = TRUE;
continue;
}
}
--- 418,424 ----
es = memchr(str, ESC_CODE, endp - str);
if (ok) {
if (cmode)
! check_color = TRUE;
continue;
}
}
***************
*** 459,471 ****
}
effect = PE_NORMAL;
}
return s;
}
int
calcPosition(char *l, Lineprop *pr, int len, int pos, int bpos, int mode)
{
! static short realColumn[LINELEN + 1];
static char *prevl = NULL;
int i, j;
--- 466,500 ----
}
effect = PE_NORMAL;
}
+ *oprop = prop_buffer;
+ #ifdef USE_ANSI_COLOR
+ if (ocolor)
+ *ocolor = check_color ? color_buffer : NULL;
+ #endif
return s;
}
+ static int
+ nextColumn(int n, char *p, Lineprop *pr)
+ {
+ if (*p == '\t' && *pr == PC_CTRL)
+ return (n + Tabstop) / Tabstop * Tabstop;
+ #ifndef KANJI_SYMBOLS
+ else if (*pr & PC_RULE)
+ return n + 1;
+ #endif
+ else if (IS_UNPRINTABLE_ASCII(*p, *pr))
+ return n + 4;
+ else if (IS_UNPRINTABLE_CONTROL(*p, *pr))
+ return n + 2;
+ return n + 1;
+ }
+
int
calcPosition(char *l, Lineprop *pr, int len, int pos, int bpos, int mode)
{
! static int *realColumn = NULL;
! static int size = 0;
static char *prevl = NULL;
int i, j;
***************
*** 475,504 ****
if (pos <= len)
return realColumn[pos];
}
prevl = l;
j = bpos;
for (i = 0;; i++) {
realColumn[i] = j;
if (i == len)
break;
! if (l[i] == '\t' && pr[i] == PC_CTRL)
! j = (j + Tabstop) / Tabstop * Tabstop;
! #ifndef KANJI_SYMBOLS
! else if (pr[i] & PC_RULE)
! j++;
! #endif
! else if (IS_UNPRINTABLE_ASCII(l[i], pr[i]))
! j = j + 4;
! else if (IS_UNPRINTABLE_CONTROL(l[i], pr[i]))
! j = j + 2;
! else
! j++;
}
if (pos >= i)
return j;
return realColumn[pos];
}
char *
lastFileName(char *path)
{
--- 504,544 ----
if (pos <= len)
return realColumn[pos];
}
+ if (size < len + 1) {
+ size = (len + 1 > LINELEN) ? (len + 1) : LINELEN;
+ realColumn = New_N(int, size);
+ }
prevl = l;
j = bpos;
for (i = 0;; i++) {
realColumn[i] = j;
if (i == len)
break;
! j = nextColumn(j, &l[i], &pr[i]);
}
if (pos >= i)
return j;
return realColumn[pos];
}
+ int
+ columnLen(Line *line, int column)
+ {
+ int i, j;
+
+ for (i = 0, j = 0; i < line->len; i++) {
+ j = nextColumn(j, &line->lineBuf[i], &line->propBuf[i]);
+ if (j > column) {
+ #ifdef JP_CHARSET
+ if (CharType(line->propBuf[i]) == PC_KANJI2)
+ return i - 1;
+ #endif
+ return i;
+ }
+ }
+ return line->len;
+ }
+
char *
lastFileName(char *path)
{
***************
*** 637,643 ****
else if (c == '>')
*status = R_ST_NORMAL;
else
! *status = R_ST_TAG;
return 0;
case R_ST_QUOTE:
if (c == '\'')
--- 677,683 ----
else if (c == '>')
*status = R_ST_NORMAL;
else
! *status = R_ST_VALUE;
return 0;
case R_ST_QUOTE:
if (c == '\'')
***************
*** 647,652 ****
--- 687,698 ----
if (c == '"')
*status = R_ST_TAG;
return 0;
+ case R_ST_VALUE:
+ if (c == '>')
+ *status = R_ST_NORMAL;
+ else if (IS_SPACE(c))
+ *status = R_ST_TAG;
+ return 0;
case R_ST_AMP:
if (c == ';') {
*status = R_ST_NORMAL;
***************
*** 755,762 ****
}
if (prev_status == R_ST_NCMNT2 || prev_status == R_ST_NCMNT3 ||
prev_status == R_ST_IRRTAG || prev_status == R_ST_CMNT1) {
! if (prev_status == R_ST_CMNT1 && !append)
Strclear(buf);
p++;
goto proc_end;
}
--- 801,810 ----
}
if (prev_status == R_ST_NCMNT2 || prev_status == R_ST_NCMNT3 ||
prev_status == R_ST_IRRTAG || prev_status == R_ST_CMNT1) {
! if (prev_status == R_ST_CMNT1 && !append && !pre)
Strclear(buf);
+ if (pre)
+ Strcat_char(buf, *p);
p++;
goto proc_end;
}
***************
*** 779,785 ****
}
if (*status == R_ST_TAG0 && !REALLY_THE_BEGINNING_OF_A_TAG(p)) {
/* it seems that this '<' is not a beginning of a tag */
! Strcat_charp(buf, "<");
*status = R_ST_NORMAL;
}
else
--- 827,836 ----
}
if (*status == R_ST_TAG0 && !REALLY_THE_BEGINNING_OF_A_TAG(p)) {
/* it seems that this '<' is not a beginning of a tag */
! /*
! * Strcat_charp(buf, "<");
! */
! Strcat_char(buf, '<');
*status = R_ST_NORMAL;
}
else
***************
*** 788,799 ****
case R_ST_EQL:
case R_ST_QUOTE:
case R_ST_DQUOTE:
case R_ST_AMP:
Strcat_char(buf, *p);
break;
case R_ST_CMNT:
case R_ST_IRRTAG:
! if (!append)
Strclear(buf);
break;
case R_ST_CMNT1:
--- 839,853 ----
case R_ST_EQL:
case R_ST_QUOTE:
case R_ST_DQUOTE:
+ case R_ST_VALUE:
case R_ST_AMP:
Strcat_char(buf, *p);
break;
case R_ST_CMNT:
case R_ST_IRRTAG:
! if (pre)
! Strcat_char(buf, *p);
! else if (!append)
Strclear(buf);
break;
case R_ST_CMNT1:
***************
*** 802,807 ****
--- 856,863 ----
case R_ST_NCMNT2:
case R_ST_NCMNT3:
/* do nothing */
+ if (pre)
+ Strcat_char(buf, *p);
break;
}
}
***************
*** 830,835 ****
--- 886,892 ----
case R_ST_TAG:
case R_ST_TAG0:
case R_ST_EQL: /* required ">" */
+ case R_ST_VALUE:
c = '>';
break;
case R_ST_QUOTE:
***************
*** 1033,1080 ****
add_auth_pass_entry(&ent, netrc);
}
! #define PASS_IS_READABLE_MSG "SECURITY NOTE: passwd file must not be accessible by others"
! static FILE *
! openPasswdFile(char *fname)
{
struct stat st;
if (fname == NULL)
return NULL;
! if (stat(expandName(fname), &st) < 0)
return NULL;
/* check permissions, if group or others readable or writable,
* refuse it, because it's insecure.
*/
! if ((st.st_mode & (S_IRWXG | S_IRWXO)) != 0) {
if (fmInitialized) {
! message(PASS_IS_READABLE_MSG, 0, 0);
refresh();
}
else {
! fputs(PASS_IS_READABLE_MSG, stderr);
fputc('\n', stderr);
}
sleep(2);
return NULL;
}
! return fopen(expandName(fname), "r");
}
void
loadPasswd(void)
{
FILE *fp;
! fp = openPasswdFile(passwd_file);
if (fp != NULL) {
parsePasswd(fp, 0);
fclose(fp);
}
/* for FTP */
! fp = openPasswdFile("~/.netrc");
if (fp != NULL) {
parsePasswd(fp, 1);
fclose(fp);
--- 1090,1150 ----
add_auth_pass_entry(&ent, netrc);
}
! #define FILE_IS_READABLE_MSG "SECURITY NOTE: file %s must not be accessible by others"
! FILE *
! openSecretFile(char *fname)
{
+ char *efname;
struct stat st;
+
if (fname == NULL)
return NULL;
! efname = expandPath(fname);
! if (stat(efname, &st) < 0)
return NULL;
/* check permissions, if group or others readable or writable,
* refuse it, because it's insecure.
+ *
+ * XXX: disable_secret_security_check will introduce some
+ * security issues, but on some platform such as Windows
+ * it's not possible (or feasible) to disable group|other
+ * readable and writable.
+ * [w3m-dev 03368][w3m-dev 03369][w3m-dev 03370]
*/
! if (disable_secret_security_check)
! /* do nothing */ ;
! else if ((st.st_mode & (S_IRWXG | S_IRWXO)) != 0) {
if (fmInitialized) {
! message(Sprintf(FILE_IS_READABLE_MSG, fname)->ptr, 0, 0);
refresh();
}
else {
! fputs(Sprintf(FILE_IS_READABLE_MSG, fname)->ptr, stderr);
fputc('\n', stderr);
}
sleep(2);
return NULL;
}
! return fopen(efname, "r");
}
void
loadPasswd(void)
{
FILE *fp;
!
! passwords = NULL;
! fp = openSecretFile(passwd_file);
if (fp != NULL) {
parsePasswd(fp, 0);
fclose(fp);
}
/* for FTP */
! fp = openSecretFile("~/.netrc");
if (fp != NULL) {
parsePasswd(fp, 1);
fclose(fp);
***************
*** 1262,1268 ****
#define SIGIOT SIGABRT
#endif /* not SIGIOT */
! void
reset_signals(void)
{
signal(SIGHUP, SIG_DFL); /* terminate process */
--- 1332,1338 ----
#define SIGIOT SIGABRT
#endif /* not SIGIOT */
! static void
reset_signals(void)
{
signal(SIGHUP, SIG_DFL); /* terminate process */
***************
*** 1281,1314 ****
#ifdef SIGPIPE
signal(SIGPIPE, SIG_IGN);
#endif
! signal(SIGUSR1, SIG_IGN);
}
void
mySystem(char *command, int background)
{
if (background) {
! #ifndef HAVE_SETPGRP
Str cmd = Strnew_charp("start /f ");
Strcat_charp(cmd, command);
system(cmd->ptr);
- #else
- int pid;
- flush_tty();
- if ((pid = fork()) == 0) {
- int fd, i;
- reset_signals();
- SETPGRP();
- close_tty();
- dup2(open("/dev/null", O_RDONLY), 0);
- dup2(open("/dev/null", O_WRONLY), 1);
- dup2(fd = open("/dev/null", O_WRONLY), 2);
- /* close all other file descriptors (socket, ...) */
- for (i = 3; i <= fd; i++)
- close(i);
- execl("/bin/sh", "sh", "-c", command, NULL);
- exit(127);
- }
#endif
}
else
--- 1351,1474 ----
#ifdef SIGPIPE
signal(SIGPIPE, SIG_IGN);
#endif
! }
!
! #ifndef FOPEN_MAX
! #define FOPEN_MAX 1024 /* XXX */
! #endif
!
! static void
! close_all_fds_except(int i, int f)
! {
! switch (i) { /* fall through */
! case 0:
! dup2(open(DEV_NULL_PATH, O_RDONLY), 0);
! case 1:
! dup2(open(DEV_NULL_PATH, O_WRONLY), 1);
! case 2:
! dup2(open(DEV_NULL_PATH, O_WRONLY), 2);
! }
! /* close all other file descriptors (socket, ...) */
! for (i = 3; i < FOPEN_MAX; i++) {
! if (i != f)
! close(i);
! }
! }
!
! void
! setup_child(int child, int i, int f)
! {
! reset_signals();
! signal(SIGINT, SIG_IGN);
! if (!child)
! SETPGRP();
! close_tty();
! close_all_fds_except(i, f);
! QuietMessage = TRUE;
! fmInitialized = FALSE;
! TrapSignal = FALSE;
! }
!
! pid_t
! open_pipe_rw(FILE ** fr, FILE ** fw)
! {
! int fdr[2];
! int fdw[2];
! pid_t pid;
!
! if (fr && pipe(fdr) < 0)
! goto err0;
! if (fw && pipe(fdw) < 0)
! goto err1;
!
! flush_tty();
! pid = fork();
! if (pid < 0)
! goto err2;
! if (pid == 0) {
! /* child */
! if (fr) {
! close(fdr[0]);
! dup2(fdr[1], 1);
! }
! if (fw) {
! close(fdw[1]);
! dup2(fdw[0], 0);
! }
! }
! else {
! if (fr) {
! close(fdr[1]);
! if (*fr == stdin)
! dup2(fdr[0], 0);
! else
! *fr = fdopen(fdr[0], "r");
! }
! if (fw) {
! close(fdw[0]);
! if (*fw == stdout)
! dup2(fdw[1], 1);
! else
! *fw = fdopen(fdw[1], "w");
! }
! }
! return pid;
! err2:
! if (fw) {
! close(fdw[0]);
! close(fdw[1]);
! }
! err1:
! if (fr) {
! close(fdr[0]);
! close(fdr[1]);
! }
! err0:
! return (pid_t) - 1;
! }
!
! void
! myExec(char *command)
! {
! signal(SIGINT, SIG_DFL);
! execl("/bin/sh", "sh", "-c", command, NULL);
! exit(127);
}
void
mySystem(char *command, int background)
{
if (background) {
! #ifndef __EMX__
! flush_tty();
! if (!fork()) {
! setup_child(FALSE, 0, -1);
! myExec(command);
! }
! #else
Str cmd = Strnew_charp("start /f ");
Strcat_charp(cmd, command);
system(cmd->ptr);
#endif
}
else
***************
*** 1380,1414 ****
char *
expandName(char *name)
{
- Str userName = NULL;
char *p;
struct passwd *passent, *getpwnam(const char *);
! Str extpath = Strnew();
p = name;
! if (*p == '/' && *(p + 1) == '~' && IS_ALPHA(*(p + 2))) {
! if (personal_document_root != NULL) {
! userName = Strnew();
p += 2;
! while (IS_ALNUM(*p) || *p == '_' || *p == '-')
! Strcat_char(userName, *(p++));
! passent = getpwnam(userName->ptr);
! if (passent == NULL) {
! p = name;
! goto rest;
}
! Strcat_charp(extpath, passent->pw_dir);
! Strcat_char(extpath, '/');
! Strcat_charp(extpath, personal_document_root);
! if (Strcmp_charp(extpath, "/") == 0 && *p == '/')
p++;
}
}
else
! p = expandPath(p);
rest:
! Strcat_charp(extpath, p);
! return extpath->ptr;
}
char *
--- 1540,1583 ----
char *
expandName(char *name)
{
char *p;
struct passwd *passent, *getpwnam(const char *);
! Str extpath = NULL;
+ if (name == NULL)
+ return NULL;
p = name;
! if (*p == '/') {
! if (*(p + 1) == '~' && IS_ALPHA(*(p + 2)) && personal_document_root) {
! char *q;
p += 2;
! q = strchr(p, '/');
! if (q) { /* /~user/dir... */
! passent = getpwnam(allocStr(p, q - p));
! p = q;
! }
! else { /* /~user */
! passent = getpwnam(p);
! p = "";
}
! if (!passent)
! goto rest;
! extpath = Strnew_m_charp(passent->pw_dir, "/",
! personal_document_root, NULL);
! if (*personal_document_root == '\0' && *p == '/')
p++;
}
+ else
+ goto rest;
+ if (Strcmp_charp(extpath, "/") == 0 && *p == '/')
+ p++;
+ Strcat_charp(extpath, p);
+ return extpath->ptr;
}
else
! return expandPath(p);
rest:
! return name;
}
char *
***************
*** 1422,1428 ****
char *host = NULL;
#endif
! file = expandName(file);
#ifdef SUPPORT_NETBIOS_SHARE
if (file[0] == '/' && file[1] == '/') {
char *p;
--- 1591,1597 ----
char *host = NULL;
#endif
! file = expandPath(file);
#ifdef SUPPORT_NETBIOS_SHARE
if (file[0] == '/' && file[1] == '/') {
char *p;
***************
*** 1463,1470 ****
return tmp->ptr;
}
static char *tmpf_base[MAX_TMPF_TYPE] = {
! "tmp", "src", "frame", "cache"
};
static unsigned int tmpf_seq[MAX_TMPF_TYPE];
--- 1632,1652 ----
return tmp->ptr;
}
+ char *
+ url_unquote_conv(char *url, char code)
+ {
+ Str tmp;
+ tmp = Str_url_unquote(Strnew_charp(url), FALSE, TRUE);
+ #ifdef JP_CHARSET
+ if (code == CODE_INNER_EUC)
+ code = CODE_EUC;
+ tmp = convertLine(NULL, tmp, &code, RAW_MODE);
+ #endif
+ return tmp->ptr;
+ }
+
static char *tmpf_base[MAX_TMPF_TYPE] = {
! "tmp", "src", "frame", "cache", "cookie",
};
static unsigned int tmpf_seq[MAX_TMPF_TYPE];
***************
*** 1473,1485 ****
{
Str tmpf;
tmpf = Sprintf("%s/w3m%s%d-%d%s",
! rc_dir,
tmpf_base[type],
! (int)getpid(), tmpf_seq[type]++, (ext) ? ext : "");
return tmpf;
}
- #ifdef USE_COOKIE
static char *monthtbl[] = {
"Jan", "Feb", "Mar", "Apr", "May", "Jun",
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
--- 1655,1667 ----
{
Str tmpf;
tmpf = Sprintf("%s/w3m%s%d-%d%s",
! tmp_dir,
tmpf_base[type],
! CurrentPid, tmpf_seq[type]++, (ext) ? ext : "");
! pushText(fileToDelete, tmpf->ptr);
return tmpf;
}
static char *monthtbl[] = {
"Jan", "Feb", "Mar", "Apr", "May", "Jun",
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
***************
*** 1605,1616 ****
return 0;
}
/* RFC 1123 or RFC 850 or ANSI C asctime() format string -> time_t */
time_t
mymktime(char *timestr)
{
char *s;
! int day, mon, year, hour, min, sec;
if (!(timestr && *timestr))
return -1;
--- 1787,1824 ----
return 0;
}
+ static int
+ get_zone(char **s, int *z_hour, int *z_min)
+ {
+ Str tmp = Strnew();
+ int zone;
+ char *ss = *s;
+
+ if (!**s)
+ return -1;
+
+ if (**s == '+' || **s == '-')
+ Strcat_char(tmp, *((*s)++));
+ while (**s && IS_DIGIT(**s))
+ Strcat_char(tmp, *((*s)++));
+ if (!(tmp->length == 4 && IS_DIGIT(*ss)) &&
+ !(tmp->length == 5 && (*ss == '+' || *ss == '-'))) {
+ *s = ss;
+ return -1;
+ }
+
+ zone = atoi(tmp->ptr);
+ *z_hour = zone / 100;
+ *z_min = zone - (zone / 100) * 100;
+ return 0;
+ }
+
/* RFC 1123 or RFC 850 or ANSI C asctime() format string -> time_t */
time_t
mymktime(char *timestr)
{
char *s;
! int day, mon, year, hour, min, sec, z_hour = 0, z_min = 0;
if (!(timestr && *timestr))
return -1;
***************
*** 1647,1654 ****
min = 0;
sec = 0;
}
! else if (get_time(&s, &hour, &min, &sec) == -1) {
! return -1;
}
}
else {
--- 1855,1866 ----
min = 0;
sec = 0;
}
! else {
! if (get_time(&s, &hour, &min, &sec) == -1)
! return -1;
! while (*s && !IS_DIGIT(*s) && *s != '+' && *s != '-')
! s++;
! get_zone(&s, &z_hour, &z_min);
}
}
else {
***************
*** 1674,1681 ****
return -1;
}
#ifdef DEBUG
! fprintf(stderr, "year=%d month=%d day=%d hour:min:sec=%d:%d:%d\n",
! year, mon, day, hour, min, sec);
#endif /* DEBUG */
mon -= 3;
--- 1886,1894 ----
return -1;
}
#ifdef DEBUG
! fprintf(stderr,
! "year=%d month=%d day=%d hour:min:sec=%d:%d:%d zone=%d:%d\n", year,
! mon, day, hour, min, sec, z_hour, z_min);
#endif /* DEBUG */
mon -= 3;
***************
*** 1685,1694 ****
--- 1898,1910 ----
}
day += (year - 1968) * 1461 / 4;
day += ((((mon * 153) + 2) / 5) - 672);
+ hour -= z_hour;
+ min -= z_min;
return (time_t) ((day * 60 * 60 * 24) +
(hour * 60 * 60) + (min * 60) + sec);
}
+ #ifdef USE_COOKIE
#ifdef INET6
#include
#endif /* INET6 */
diff -crN -x CVS w3m-0.3.2.2/file.c w3m-js-1.743/file.c
*** w3m-0.3.2.2/file.c 2002-12-06 01:53:19.000000000 +0900
--- w3m-js-1.743/file.c 2003-02-08 02:38:49.000000000 +0900
***************
*** 1,4 ****
! /* $Id: file.c,v 1.109.2.2 2002/12/05 16:53:19 ukai Exp $ */
#include "fm.h"
#include
#include "myctype.h"
--- 1,4 ----
! /* $Id: file.c,v 1.218 2003/02/06 17:21:43 ukai Exp $ */
#include "fm.h"
#include
#include "myctype.h"
***************
*** 11,16 ****
--- 11,17 ----
#include
#include
#include
+ #include
/* foo */
#include "html.h"
***************
*** 27,62 ****
static int frame_source = 0;
static int _MoveFile(char *path1, char *path2);
! static void uncompress_stream(URLFile *uf);
static FILE *lessopen_stream(char *path);
static Buffer *loadcmdout(char *cmd,
Buffer *(*loadproc) (URLFile *, Buffer *),
Buffer *defaultbuf);
! static void close_textarea(struct html_feed_environ *h_env);
! static void addnewline(Buffer *buf, char *line, Lineprop *prop,
! #ifdef USE_ANSI_COLOR
! Linecolor *color,
! #endif
! int pos, int nlines);
!
! static Lineprop propBuffer[LINELEN];
! #ifdef USE_ANSI_COLOR
! static Linecolor colorBuffer[LINELEN];
#endif
static JMP_BUF AbortLoading;
static struct table *tables[MAX_TABLE];
static struct table_mode table_mode[MAX_TABLE];
! #ifdef USE_IMAGE
static ParsedURL *cur_baseURL = NULL;
#ifdef JP_CHARSET
static char cur_document_code;
#endif
#endif
static Str cur_select;
static Str select_str;
static int select_is_multiple;
--- 28,60 ----
static int frame_source = 0;
+ static char *guess_filename(char *file);
static int _MoveFile(char *path1, char *path2);
! static void uncompress_stream(URLFile *uf, char **src);
static FILE *lessopen_stream(char *path);
static Buffer *loadcmdout(char *cmd,
Buffer *(*loadproc) (URLFile *, Buffer *),
Buffer *defaultbuf);
! #ifndef USE_ANSI_COLOR
! #define addnewline(a,b,c,d,e,f,g) _addnewline(a,b,c,e,f,g)
#endif
+ static void addnewline(Buffer *buf, char *line, Lineprop *prop,
+ Linecolor *color, int pos, int width, int nlines);
+ static void addLink(Buffer *buf, struct parsed_tag *tag);
static JMP_BUF AbortLoading;
static struct table *tables[MAX_TABLE];
static struct table_mode table_mode[MAX_TABLE];
! #if defined(USE_IMAGE) || defined(USE_SCRIPT)
static ParsedURL *cur_baseURL = NULL;
#ifdef JP_CHARSET
static char cur_document_code;
#endif
#endif
+ static Str cur_title;
static Str cur_select;
static Str select_str;
static int select_is_multiple;
***************
*** 93,101 ****
static char check_accept_charset(char *s);
#endif
- static Str save_line = NULL;
- static int save_prevchar = ' ';
-
struct link_stack {
int cmd;
short offset;
--- 91,96 ----
***************
*** 163,169 ****
int type;
char *ext;
char *mime_type;
! int libfile_p;
char *cmd;
char *name;
char *encoding;
--- 158,164 ----
int type;
char *ext;
char *mime_type;
! int auxbin_p;
char *cmd;
char *name;
char *encoding;
***************
*** 194,199 ****
--- 189,213 ----
SIGNAL_RETURN;
}
+ static void
+ UFhalfclose(URLFile *f)
+ {
+ switch (f->scheme) {
+ case SCM_FTP:
+ closeFTP();
+ break;
+ #ifdef USE_NNTP
+ case SCM_NEWS:
+ case SCM_NNTP:
+ closeFTP();
+ break;
+ #endif
+ default:
+ UFclose(f);
+ break;
+ }
+ }
+
int
currentLn(Buffer *buf)
{
***************
*** 215,228 ****
return NULL;
buf->filename = path;
! if (buf->buffername == NULL || buf->buffername[0] == '\0')
! buf->buffername = conv_from_system(lastFileName(path));
if (buf->currentURL.scheme == SCM_UNKNOWN)
buf->currentURL.scheme = f->scheme;
buf->real_scheme = f->scheme;
if (f->scheme == SCM_LOCAL && buf->sourcefile == NULL)
buf->sourcefile = path;
- UFclose(f);
return buf;
}
--- 229,244 ----
return NULL;
buf->filename = path;
! if (buf->buffername == NULL || buf->buffername[0] == '\0') {
! buf->buffername = checkHeader(buf, "Subject:");
! if (buf->buffername == NULL)
! buf->buffername = conv_from_system(lastFileName(path));
! }
if (buf->currentURL.scheme == SCM_UNKNOWN)
buf->currentURL.scheme = f->scheme;
buf->real_scheme = f->scheme;
if (f->scheme == SCM_LOCAL && buf->sourcefile == NULL)
buf->sourcefile = path;
return buf;
}
***************
*** 330,335 ****
--- 346,365 ----
return t0;
}
+ static int
+ setModtime(char *path, time_t modtime)
+ {
+ struct utimbuf t;
+ struct stat st;
+
+ if (stat(path, &st) == 0)
+ t.actime = st.st_atime;
+ else
+ t.actime = time(NULL);
+ t.modtime = modtime;
+ return utime(path, &t);
+ }
+
void
examineFile(char *path, URLFile *uf)
{
***************
*** 363,369 ****
char *t0 = uncompressed_file_type(path, &ext);
uf->guess_type = t0;
uf->ext = ext;
! uncompress_stream(uf);
return;
}
}
--- 393,399 ----
char *t0 = uncompressed_file_type(path, &ext);
uf->guess_type = t0;
uf->ext = ext;
! uncompress_stream(uf, NULL);
return;
}
}
***************
*** 372,378 ****
#define S_IXANY (S_IXUSR|S_IXGRP|S_IXOTH)
int
! check_command(char *cmd, int libfile_p)
{
static char *path = NULL;
Str dirs;
--- 402,408 ----
#define S_IXANY (S_IXUSR|S_IXGRP|S_IXOTH)
int
! check_command(char *cmd, int auxbin_p)
{
static char *path = NULL;
Str dirs;
***************
*** 382,389 ****
if (path == NULL)
path = getenv("PATH");
! if (libfile_p)
! dirs = Strnew_charp(w3m_lib_dir());
else
dirs = Strnew_charp(path);
for (p = dirs->ptr; p != NULL; p = np) {
--- 412,419 ----
if (path == NULL)
path = getenv("PATH");
! if (auxbin_p)
! dirs = Strnew_charp(w3m_auxbin_dir());
else
dirs = Strnew_charp(path);
for (p = dirs->ptr; p != NULL; p = np) {
***************
*** 413,419 ****
return encodings->ptr;
l = newTextList();
for (d = compression_decoders; d->type != CMP_NOCOMPRESS; d++) {
! if (check_command(d->cmd, d->libfile_p)) {
pushText(l, d->encoding);
}
}
--- 443,449 ----
return encodings->ptr;
l = newTextList();
for (d = compression_decoders; d->type != CMP_NOCOMPRESS; d++) {
! if (check_command(d->cmd, d->auxbin_p)) {
pushText(l, d->encoding);
}
}
***************
*** 440,448 ****
line = conv_str(line, *code, InnerCode);
}
#endif /* JP_CHARSET */
! cleanup_line(line, mode);
#ifdef USE_NNTP
! if (uf->scheme == SCM_NEWS)
Strchop(line);
#endif /* USE_NNTP */
return line;
--- 470,479 ----
line = conv_str(line, *code, InnerCode);
}
#endif /* JP_CHARSET */
! if (mode != RAW_MODE)
! cleanup_line(line, mode);
#ifdef USE_NNTP
! if (uf && uf->scheme == SCM_NEWS)
Strchop(line);
#endif /* USE_NNTP */
return line;
***************
*** 454,469 ****
Buffer *
loadFile(char *path)
{
URLFile uf;
init_stream(&uf, SCM_LOCAL, NULL);
examineFile(path, &uf);
if (uf.stream == NULL)
return NULL;
current_content_length = 0;
#ifdef JP_CHARSET
content_charset = '\0';
#endif
! return loadSomething(&uf, path, loadBuffer, NULL);
}
int
--- 485,504 ----
Buffer *
loadFile(char *path)
{
+ Buffer *buf;
URLFile uf;
init_stream(&uf, SCM_LOCAL, NULL);
examineFile(path, &uf);
if (uf.stream == NULL)
return NULL;
+ buf = newBuffer(INIT_BUFFER_WIDTH);
current_content_length = 0;
#ifdef JP_CHARSET
content_charset = '\0';
#endif
! buf = loadSomething(&uf, path, loadBuffer, buf);
! UFclose(&uf);
! return buf;
}
int
***************
*** 509,530 ****
static char *
xface2xpm(char *xface)
{
! char *xpm;
FILE *f;
struct stat st;
! xpm = tmpfname(TMPF_DFL, ".xpm")->ptr;
! f = popen(Sprintf("%s > %s", libFile(XFACE2XPM), xpm)->ptr, "w");
if (!f)
return NULL;
! fprintf(f, "%s", xface);
pclose(f);
! if (stat(xpm, &st))
return NULL;
! pushText(fileToDelete, xpm);
! if (!st.st_size)
! return NULL;
! return xpm;
}
#endif
#endif
--- 544,576 ----
static char *
xface2xpm(char *xface)
{
! Image image;
! ImageCache *cache;
FILE *f;
struct stat st;
! SKIP_BLANKS(xface);
! image.url = xface;
! image.ext = ".xpm";
! image.width = 48;
! image.height = 48;
! image.cache = NULL;
! cache = getImage(&image, NULL, IMG_FLAG_AUTO);
! if (cache->loaded & IMG_FLAG_LOADED && !stat(cache->file, &st))
! return cache->file;
! cache->loaded = IMG_FLAG_ERROR;
!
! f = popen(Sprintf("%s > %s", shell_quote(auxbinFile(XFACE2XPM)),
! shell_quote(cache->file))->ptr, "w");
if (!f)
return NULL;
! fputs(xface, f);
pclose(f);
! if (stat(cache->file, &st) || !st.st_size)
return NULL;
! cache->loaded = IMG_FLAG_LOADED | IMG_FLAG_DONT_REMOVE;
! cache->index = 0;
! return cache->file;
}
#endif
#endif
***************
*** 540,549 ****
Str lineBuf2 = NULL;
Str tmp;
TextList *headerlist;
! #ifdef JP_CHARSET
! char code = DocumentCode, ic;
! #endif
FILE *src = NULL;
headerlist = newBuf->document_header = newTextList();
if (uf->scheme == SCM_HTTP
--- 586,595 ----
Str lineBuf2 = NULL;
Str tmp;
TextList *headerlist;
! char code;
! char *tmpf;
FILE *src = NULL;
+ Lineprop *propBuffer;
headerlist = newBuf->document_header = newTextList();
if (uf->scheme == SCM_HTTP
***************
*** 555,568 ****
else
http_response_code = 0;
! if (thru && !newBuf->header_source) {
! Str tmpf = tmpfname(TMPF_DFL, NULL);
! pushText(fileToDelete, tmpf->ptr);
! src = fopen(tmpf->ptr, "w");
if (src)
! newBuf->header_source = tmpf->ptr;
}
while ((tmp = StrmyUFgets(uf))->length) {
#ifdef HTTP_DEBUG
{
FILE *ff;
--- 601,624 ----
else
http_response_code = 0;
! if (thru && !newBuf->header_source
! #ifdef USE_IMAGE
! && !image_source
! #endif
! ) {
! tmpf = tmpfname(TMPF_DFL, NULL)->ptr;
! src = fopen(tmpf, "w");
if (src)
! newBuf->header_source = tmpf;
}
+ #ifdef JP_CHARSET
+ code = DocumentCode;
+ #endif
while ((tmp = StrmyUFgets(uf))->length) {
+ #ifdef USE_NNTP
+ if (uf->scheme == SCM_NEWS && tmp->ptr[0] == '.')
+ Strshrinkfirst(tmp, 1);
+ #endif
#ifdef HTTP_DEBUG
{
FILE *ff;
***************
*** 574,586 ****
if (src)
Strfputs(tmp, src);
cleanup_line(tmp, HEADER_MODE);
! if ((tmp->ptr[0] == '\n' || tmp->ptr[0] == '\r' || tmp->ptr[0] == '\0')
! #ifdef USE_NNTP
! ||
! (uf->scheme == SCM_NEWS &&
! Str_news_endline(tmp) && (iseos(uf->stream) = TRUE))
! #endif /* USE_NNTP */
! ) {
if (!lineBuf2)
/* there is no header */
break;
--- 630,636 ----
if (src)
Strfputs(tmp, src);
cleanup_line(tmp, HEADER_MODE);
! if (tmp->ptr[0] == '\n' || tmp->ptr[0] == '\r' || tmp->ptr[0] == '\0') {
if (!lineBuf2)
/* there is no header */
break;
***************
*** 599,644 ****
/* header line is continued */
continue;
lineBuf2 = decodeMIME(lineBuf2->ptr);
! #ifdef JP_CHARSET
! if ((ic = checkShiftCode(lineBuf2, code)) != '\0') {
! if (UseAutoDetect)
! code = ic;
! lineBuf2 = conv_str(lineBuf2, code, InnerCode);
! }
! #endif /* JP_CHARSET */
/* separated with line and stored */
tmp = Strnew_size(lineBuf2->length);
for (p = lineBuf2->ptr; *p; p = q) {
for (q = p; *q && *q != '\r' && *q != '\n'; q++) ;
! lineBuf2 = checkType(Strnew_charp_n(p, q - p), propBuffer,
! #ifdef USE_ANSI_COLOR
! NULL, NULL,
! #endif
! min(LINELEN, q - p));
Strcat(tmp, lineBuf2);
if (thru)
! addnewline(newBuf, lineBuf2->ptr, propBuffer,
! #ifdef USE_ANSI_COLOR
! NULL,
! #endif
! lineBuf2->length, -1);
for (; *q && (*q == '\r' || *q == '\n'); q++) ;
}
#ifdef USE_IMAGE
#ifdef USE_XFACE
! if (thru && activeImage && displayImage &&
! !strncasecmp(tmp->ptr, "X-Face:", 7)) {
! char *tmpf;
! Str src;
! URLFile f;
! Line *l;
!
! tmpf = xface2xpm(&tmp->ptr[7]);
! if (tmpf) {
! src =
! Sprintf
! ("