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

[w3m-dev 02729]

Browse Source 
From: Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
This commit is contained in:
Fumitoshi UKAI
2001-12-25 17:29:31 +00:00
parent 9f16cac5b2
commit 403031b581
4 changed files with 69 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ChangeLog
View File

@@ -1,3 +1,18 @@
2001-12-26 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
* [w3m-dev 02729]
* doc-jp/README.func (DOWNLOAD): update
* doc-jp/README.func (EDIT): ditto
* doc-jp/README.func (EDIT_SCREEN): ditto
* doc-jp/README.func (SAVE): ditto
* doc/README.func (DOWNLOAD): ditto
* doc/README.func (SAVE): ditto
* doc/README.func (SUBMIT): ditto
* scripts/w3mhelp.cgi.in: $key is normalized by &norm_key
* scripts/w3mhelp.cgi.in: keyfunc update
* scripts/w3mhelp.cgi.in (load_keymap): check data, &norm_key
* scripts/w3mhelp.cgi.in (norm_key): added
2001-12-26 Fumitoshi UKAI <ukai@debian.or.jp> 2001-12-26 Fumitoshi UKAI <ukai@debian.or.jp>
* [#496613] LASTLINE in terms.c * [#496613] LASTLINE in terms.c
@@ -1563,4 +1578,4 @@
* release-0-2-1 * release-0-2-1
* import w3m-0.2.1 * import w3m-0.2.1
$Id: ChangeLog,v 1.175 2001/12/25 16:54:45 ukai Exp $ $Id: ChangeLog,v 1.176 2001/12/25 17:29:31 ukai Exp $

8
doc-jp/README.func
View File

@@ -11,9 +11,9 @@ DELETE_PREVBUF
DICT_WORD <09><><EFBFBD>Ϥ<EFBFBD><CFA4><EFBFBD>ñ<EFBFBD><C3B1><EFBFBD>򼭽񥳥ޥ<F1A5B3A5><DEA5>ɤ<EFBFBD>Ĵ<EFBFBD>٤ޤ<D9A4> DICT_WORD <09><><EFBFBD>Ϥ<EFBFBD><CFA4><EFBFBD>ñ<EFBFBD><C3B1><EFBFBD>򼭽񥳥ޥ<F1A5B3A5><DEA5>ɤ<EFBFBD>Ĵ<EFBFBD>٤ޤ<D9A4>
DICT_WORD_AT <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>֤<EFBFBD>ñ<EFBFBD><C3B1><EFBFBD>򼭽񥳥ޥ<F1A5B3A5><DEA5>ɤ<EFBFBD>Ĵ<EFBFBD>٤ޤ<D9A4> DICT_WORD_AT <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>֤<EFBFBD>ñ<EFBFBD><C3B1><EFBFBD>򼭽񥳥ޥ<F1A5B3A5><DEA5>ɤ<EFBFBD>Ĵ<EFBFBD>٤ޤ<D9A4>
DOWN <09><><EFBFBD>̤<EFBFBD>1<EFBFBD>Բ<EFBFBD><D4B2>˥<EFBFBD><CBA5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>뤷<EFBFBD>ޤ<EFBFBD> DOWN <09><><EFBFBD>̤<EFBFBD>1<EFBFBD>Բ<EFBFBD><D4B2>˥<EFBFBD><CBA5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>뤷<EFBFBD>ޤ<EFBFBD>
DOWNLOAD HTML<EFBFBD>Υ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ե<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¸<EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD> DOWNLOAD ʸ<><CAB8><EFBFBD>Υ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ե<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¸<EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD>
EDIT <09><><EFBFBD>ǥ<EFBFBD><C7A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Խ<EFBFBD><D4BD><EFBFBD><EFBFBD>ޤ<EFBFBD> EDIT <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ե<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>򥨥ǥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Խ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD>
EDIT_SCREEN <09><><EFBFBD><EFBFBD>ɽ<EFBFBD><C9BD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Хåե<EFBFBD><EFBFBD>򥨥ǥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Խ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD> EDIT_SCREEN <09>Хåե<EFBFBD><EFBFBD><EFBFBD>ɽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƥ򥨥ǥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Խ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD>
END ʸ<><CAB8><EFBFBD>Τ<EFBFBD><CEA4><EFBFBD><EFBFBD>Ф󲼤ιԤ˰<D4A4>ư<EFBFBD><C6B0><EFBFBD>ޤ<EFBFBD> END ʸ<><CAB8><EFBFBD>Τ<EFBFBD><CEA4><EFBFBD><EFBFBD>Ф󲼤ιԤ˰<D4A4>ư<EFBFBD><C6B0><EFBFBD>ޤ<EFBFBD>
EXEC_SHELL <09><><EFBFBD><EFBFBD><EFBFBD>륳<EFBFBD>ޥ<EFBFBD><DEA5>ɤ<EFBFBD><C9A4>¹Ԥ<C2B9><D4A4>ޤ<EFBFBD> EXEC_SHELL <09><><EFBFBD><EFBFBD><EFBFBD>륳<EFBFBD>ޥ<EFBFBD><DEA5>ɤ<EFBFBD><C9A4>¹Ԥ<C2B9><D4A4>ޤ<EFBFBD>
EXIT <09><>ǧ<EFBFBD><C7A7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>w3m<33><6D><EFBFBD><EFBFBD>λ<EFBFBD><CEBB><EFBFBD>ޤ<EFBFBD> EXIT <09><>ǧ<EFBFBD><C7A7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>w3m<33><6D><EFBFBD><EFBFBD>λ<EFBFBD><CEBB><EFBFBD>ޤ<EFBFBD>
@@ -81,7 +81,7 @@ REDRAW
REG_MARK <09><><EFBFBD><EFBFBD>ɽ<EFBFBD><C9BD><EFBFBD>ǻ<EFBFBD><C7BB>ꤵ<EFBFBD>줿ʸ<ECA4BF><CAB8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ƥޡ<C6A5><DEA1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD> REG_MARK <09><><EFBFBD><EFBFBD>ɽ<EFBFBD><C9BD><EFBFBD>ǻ<EFBFBD><C7BB>ꤵ<EFBFBD>줿ʸ<ECA4BF><CAB8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ƥޡ<C6A5><DEA1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD>
RELOAD <09>Хåե<C3A5><D5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɤ߹<C9A4><DFB9>ߤޤ<DFA4> RELOAD <09>Хåե<C3A5><D5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɤ߹<C9A4><DFB9>ߤޤ<DFA4>
RIGHT <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Τ<EFBFBD>1ʸ<31><CAB8><EFBFBD><EFBFBD><EFBFBD>ˤ<EFBFBD><CBA4>餷<EFBFBD>ޤ<EFBFBD> RIGHT <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Τ<EFBFBD>1ʸ<31><CAB8><EFBFBD><EFBFBD><EFBFBD>ˤ<EFBFBD><CBA4>餷<EFBFBD>ޤ<EFBFBD>
SAVE HTML<EFBFBD>Υ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ե<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¸<EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD> SAVE ʸ<EFBFBD><EFBFBD><EFBFBD>Υ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ե<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¸<EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD>
SAVE_IMAGE <09><><EFBFBD>󥯤<EFBFBD><F3A5AFA4>ؤ<EFBFBD><D8A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¸<EFBFBD><C2B8><EFBFBD>ޤ<EFBFBD> SAVE_IMAGE <09><><EFBFBD>󥯤<EFBFBD><F3A5AFA4>ؤ<EFBFBD><D8A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¸<EFBFBD><C2B8><EFBFBD>ޤ<EFBFBD>
SAVE_LINK <09><><EFBFBD>󥯤<EFBFBD><F3A5AFA4>ؤ<EFBFBD><D8A4><EFBFBD><EFBFBD><EFBFBD>ʸ<EFBFBD><CAB8><EFBFBD><EFBFBD><EFBFBD>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¸<EFBFBD><C2B8><EFBFBD>ޤ<EFBFBD> SAVE_LINK <09><><EFBFBD>󥯤<EFBFBD><F3A5AFA4>ؤ<EFBFBD><D8A4><EFBFBD><EFBFBD><EFBFBD>ʸ<EFBFBD><CAB8><EFBFBD><EFBFBD><EFBFBD>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¸<EFBFBD><C2B8><EFBFBD>ޤ<EFBFBD>
SAVE_SCREEN <09>Хåե<C3A5><D5A5><EFBFBD>ɽ<EFBFBD><C9BD><EFBFBD><EFBFBD><EFBFBD>Ƥ<EFBFBD><C6A4>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¸<EFBFBD><C2B8><EFBFBD>ޤ<EFBFBD> SAVE_SCREEN <09>Хåե<C3A5><D5A5><EFBFBD>ɽ<EFBFBD><C9BD><EFBFBD><EFBFBD><EFBFBD>Ƥ<EFBFBD><C6A4>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¸<EFBFBD><C2B8><EFBFBD>ޤ<EFBFBD>

6
doc/README.func
View File

@@ -11,7 +11,7 @@ DELETE_PREVBUF Delete previous buffer (mainly for local-CGI)
DICT_WORD Execute dictionary command (see README.dict) DICT_WORD Execute dictionary command (see README.dict)
DICT_WORD_AT Execute dictionary command for word at cursor DICT_WORD_AT Execute dictionary command for word at cursor
DOWN Scroll down one line DOWN Scroll down one line
DOWNLOAD Save HTML source DOWNLOAD Save document source to file
EDIT Edit current document EDIT Edit current document
EDIT_SCREEN Edit currently rendered document EDIT_SCREEN Edit currently rendered document
END Go to the last line END Go to the last line
@@ -81,7 +81,7 @@ REDRAW Redraw screen
REG_MARK Set mark using regexp REG_MARK Set mark using regexp
RELOAD Reload buffer RELOAD Reload buffer
RIGHT Shift screen one column right RIGHT Shift screen one column right
SAVE Save HTML source to file SAVE Save document source to file
SAVE_IMAGE Save image to file SAVE_IMAGE Save image to file
SAVE_LINK Save link to file SAVE_LINK Save link to file
SAVE_SCREEN Save rendered document to file SAVE_SCREEN Save rendered document to file
@@ -98,7 +98,7 @@ SHELL Execute shell command
SHIFT_LEFT Shift screen left SHIFT_LEFT Shift screen left
SHIFT_RIGHT Shift screen right SHIFT_RIGHT Shift screen right
SOURCE View HTML source SOURCE View HTML source
SUBMIT submit SUBMIT Submit form
SUSPEND Stop loading document SUSPEND Stop loading document
UP Scroll up one line UP Scroll up one line
VERSION Display version of w3m VERSION Display version of w3m

64
scripts/w3mhelp.cgi.in
View File

@@ -1,5 +1,5 @@
#!@PERL@ #!@PERL@
# $Id: w3mhelp.cgi.in,v 1.8 2001/12/25 09:16:23 ukai Exp $ # $Id: w3mhelp.cgi.in,v 1.9 2001/12/25 17:29:31 ukai Exp $
if ( $^O =~ /^(ms)?(dos|win(32|nt)?)/i ) { if ( $^O =~ /^(ms)?(dos|win(32|nt)?)/i ) {
$CYGPATH = 1; $CYGPATH = 1;
@@ -51,6 +51,13 @@ if (defined($ENV{'QUERY_STRING'})) {
} }
} }
%f = %keyfunc;
%keyfunc = ();
while (($key, $fname) = each %f) {
$key = &norm_key($key);
$keyfunc{$key} = $fname;
}
if (-f $keymap) { if (-f $keymap) {
open(KEYMAP, "< $keymap") || die "cannot open keymap: $keymap, $!"; open(KEYMAP, "< $keymap") || die "cannot open keymap: $keymap, $!";
&load_keymap(*KEYMAP, $func); &load_keymap(*KEYMAP, $func);
@@ -109,42 +116,42 @@ for $otherlang (@docdirs) {
} }
&show_keymap("Page/Cursor motion", &show_keymap("Page/Cursor motion",
split(" ", "pgFore pgBack movR movL movD movU lup1 ldown1 split(" ", "pgFore pgBack movR movL movD movU ldown1 lup1
goLineF goLineL movRW movLW shiftl shiftr shiftl shiftr col1L col1R linbeg linend ctrCsrH ctrCsrV
col1R col1L goLine ctrCsrH ctrCsrV goLine goLineF goLineL movRW movLW
topA lastA nextA prevA topA lastA nextA prevA
nextL nextLU nextR nextRD nextD nextU")); nextR nextRD nextL nextRD nextLU nextD nextU"));
&show_keymap("Hyperlink operation", &show_keymap("Hyperlink operation",
split(" ", "followA svA peekURL peekIMG followI svI split(" ", "followA svA followI svI submitForm
chkURL chkNMID curURL pginfo curlno ldHist curURL peekURL peekIMG pginfo curlno chkURL chkNMID
rFrame extbrz linkbrz")); rFrame extbrz linkbrz"));
&show_keymap("File/Stream operation", &show_keymap("File/Stream operation",
split(" ", "goURL ldfile readsh pipesh")); split(" ", "goURL ldfile readsh pipesh"));
&show_keymap("Buffer operation", &show_keymap("Buffer operation",
split(" ", "backBf vwSrc selMn editBf rdrwSc reload split(" ", "backBf selMn selBuf vwSrc svSrc svBuf
svBuf svSrc editScr")); editBf editScr reload rdrwSc"));
&show_keymap("Buffer selection mode",
split(" ", "buffer_prev buffer_next buffer_delete buffer_go"));
&show_keymap("Bookmark operation", &show_keymap("Bookmark operation",
split(" ", "ldBmark adBmark")); split(" ", "ldBmark adBmark"));
&show_keymap("Search", &show_keymap("Search",
split(" ", "srchfor srchbak srchnxt srchprv")); split(" ", "srchfor srchbak srchnxt srchprv isrchfor isrchbak"));
&show_keymap("Dictionary look-up", &show_keymap("Dictionary look-up",
split(" ", "dictword dictwordat")); split(" ", "dictword dictwordat"));
&show_keymap("Mark operation", &show_keymap("Mark operation",
split(" ", "_mark prevMk nextMk reMark")); split(" ", "_mark nextMk prevMk reMark"));
&show_keymap("Miscellany", &show_keymap("Miscellany",
split(" ", split(" ", "mainMn ldhelp ldOpt cooLst ldHist msgs msToggle
"setAlarm execsh ldhelp ldOpt cooLst susp qquitfm quitfm")); wrapToggle setAlarm setOpt setEnv execsh susp qquitfm quitfm"));
&show_keymap("Buffer selection mode",
split(" ", "buffer_next buffer_prev buffer_delete buffer_go"));
&show_keymap("Line-edit mode", &show_keymap("Line-edit mode",
split(" ", "lineedit_forward lineedit_back lineedit_backspace split(" ", "lineedit_forward lineedit_back lineedit_backspace
@@ -167,15 +174,36 @@ sub load_keymap {
while (<FH>) { while (<FH>) {
next if /^#/; next if /^#/;
next if /^\s*$/; next if /^\s*$/;
($keymap, $key, $fname) = split; ($keymap, $key, $fname, $data) = split;
next if $data;
next unless $keymap =~ /keymap/; next unless $keymap =~ /keymap/;
$fname =~ tr/a-z/A-Z/; $fname =~ tr/a-z/A-Z/;
next unless (defined($funcdesc{$fname})); next unless (defined($funcdesc{$fname}));
$key =~ s/^\\//; $key = &norm_key($key);
$keyfunc{$key} = $fname; $keyfunc{$key} = $fname;
} }
} }
sub norm_key {
local($_) = @_;
s/^\^/C-/;
s/^(C-\[|M-)/ESC-/;
if (/^ESC-\[/) {
/^ESC-\[A$/ && return "UP";
/^ESC-\[B$/ && return "DOWN";
/^ESC-\[C$/ && return "RIGHT";
/^ESC-\[D$/ && return "LEFT";
s/^ESC-/\^\[/;
return $_;
}
s/^(ESC-)\^/ESC-C-/;
s/^(ESC-)?C-[iI]/${1}TAB/;
s/^(ESC-)?C-\?/${1}DEL/;
s/^\\//;
return $_;
}
sub show_keymap { sub show_keymap {
local($head, @list) = @_; local($head, @list) = @_;
local($fid); local($fid);