[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 From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
This commit is contained in:
14
ChangeLog
14
ChangeLog
@@ -1,3 +1,15 @@
|
||||
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
|
||||
@@ -5437,4 +5449,4 @@ a * [w3m-dev 03276] compile error on EWS4800
|
||||
* release-0-2-1
|
||||
* import w3m-0.2.1
|
||||
|
||||
$Id: ChangeLog,v 1.587 2002/12/04 17:02:34 ukai Exp $
|
||||
$Id: ChangeLog,v 1.588 2002/12/04 17:08:26 ukai Exp $
|
||||
|
@@ -94,6 +94,7 @@ QUIT w3m
|
||||
READ_SHELL <09><><EFBFBD>ޥ<EFBFBD><DEA5>ɤ<EFBFBD><C9A4>¹Ԥ<C2B9><D4A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̤<EFBFBD><CCA4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɤ<EFBFBD><C9A4>Ǥ<EFBFBD><C7A4><EFBFBD>ɽ<EFBFBD><C9BD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD>
|
||||
REDRAW <09><><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>
|
||||
REINIT <09><><EFBFBD><EFBFBD><EFBFBD>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɹ<EFBFBD><C9B9><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>
|
||||
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>
|
||||
SAVE ʸ<><CAB8><EFBFBD>Υ<EFBFBD><CEA5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¸<EFBFBD><C2B8><EFBFBD>ޤ<EFBFBD>
|
||||
|
@@ -94,6 +94,7 @@ QUIT Quit w3m
|
||||
READ_SHELL Execute shell command and load
|
||||
REDRAW Redraw screen
|
||||
REG_MARK Set mark using regexp
|
||||
REINIT Reload configuration files
|
||||
RELOAD Reload buffer
|
||||
RIGHT Shift screen one column right
|
||||
SAVE Save document source to file
|
||||
|
@@ -1,5 +1,5 @@
|
||||
#!@PERL@
|
||||
# $Id: w3mhelp.cgi.in,v 1.17 2002/11/26 18:03:30 ukai Exp $
|
||||
# $Id: w3mhelp.cgi.in,v 1.18 2002/12/04 17:08:28 ukai Exp $
|
||||
|
||||
if ( $^O =~ /^(ms)?(dos|win(32|nt)?)/i ) {
|
||||
$CYGPATH = 1;
|
||||
@@ -130,11 +130,12 @@ for $otherlang (@docdirs) {
|
||||
}
|
||||
|
||||
&show_keymap("Page/Cursor motion",
|
||||
split(" ", "pgFore pgBack movR movL movD movU ldown1 lup1
|
||||
split(" ", "pgFore pgBack movR movL movD movU
|
||||
movR1 movL1 movD1 movU1 ldown1 lup1
|
||||
shiftl shiftr col1L col1R linbeg linend ctrCsrH ctrCsrV
|
||||
goLine goLineF goLineL movRW movLW
|
||||
topA lastA nextA prevA
|
||||
nextR nextRD nextL nextRD nextLU nextD nextU"));
|
||||
nextR nextL nextD nextU nextRD nextLU"));
|
||||
|
||||
&show_keymap("Hyperlink operation",
|
||||
split(" ", "followA tabA svA followI svI submitForm
|
||||
@@ -142,7 +143,8 @@ for $otherlang (@docdirs) {
|
||||
rFrame extbrz linkbrz"));
|
||||
|
||||
&show_keymap("File/Stream operation",
|
||||
split(" ", "goURL gorURL tabURL tabrURL ldfile readsh pipesh"));
|
||||
split(" ", "goURL gorURL tabURL tabrURL ldfile readsh pipesh
|
||||
pipeBuf"));
|
||||
|
||||
&show_keymap("Buffer operation",
|
||||
split(" ", "backBf nextBf prevBf selMn selBuf vwSrc svSrc svBuf
|
||||
@@ -164,8 +166,9 @@ for $otherlang (@docdirs) {
|
||||
split(" ", "_mark nextMk prevMk reMark"));
|
||||
|
||||
&show_keymap("Miscellany",
|
||||
split(" ", "mainMn ldhelp ldOpt cooLst ldHist ldDL msgs msToggle
|
||||
wrapToggle setAlarm setOpt setEnv execsh susp qquitfm quitfm defKey"));
|
||||
split(" ", "mainMn ldhelp ldOpt dispVer cooLst ldHist ldDL
|
||||
msgs msToggle wrapToggle execCmd setAlarm setOpt setEnv defKey
|
||||
reinit execsh susp qquitfm quitfm"));
|
||||
|
||||
&show_keymap("Buffer selection mode",
|
||||
split(" ", "buffer_next buffer_prev buffer_delete buffer_go"));
|
||||
@@ -189,13 +192,14 @@ sub load_keymap {
|
||||
local($func) = @_;
|
||||
|
||||
while (<FH>) {
|
||||
next if /^#/;
|
||||
next if /^\s*$/;
|
||||
($keymap, $key, $fname, $data) = split;
|
||||
next if $data;
|
||||
next unless $keymap =~ /keymap/;
|
||||
/^#/ && next;
|
||||
s/^\s*keymap\s+// || next;
|
||||
s/^(\"(\\\"|[^\"])+\"|\'(\\\'|[^\'])+\'|\S+)\s+(\S+)\s*// || next;
|
||||
($key, $fname) = ($1, $4);
|
||||
($data = $_) && next;
|
||||
$fname =~ tr/a-z/A-Z/;
|
||||
next unless (defined($funcdesc{$fname}));
|
||||
defined($funcdesc{$fname}) || next;
|
||||
$key =~ s/^["'](.*)["']$/$1/;
|
||||
$key = &norm_key($key);
|
||||
$keyfunc{$key} = $fname;
|
||||
}
|
||||
@@ -205,19 +209,18 @@ sub norm_key {
|
||||
local($_) = @_;
|
||||
|
||||
s/\\(.)/$1/g;
|
||||
s/^\^(.)/C-$1/;
|
||||
s/^(C-\[|M-)/ESC-/;
|
||||
s/(^|\s+|-)\^(.)/${1}C-$2/g;
|
||||
s/(^|\s+|-)(C-\[|M-)/${1}ESC-/g;
|
||||
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-$1/;
|
||||
s/^(ESC-)?C-[iI]/${1}TAB/;
|
||||
s/^(ESC-)?C-\?/${1}DEL/;
|
||||
s/(^|\s+|-)ESC-\[/$1\^\[\[/g;
|
||||
s/(^|\s+|-)ESC-\^(.)/${1}ESC-C-$2/g;
|
||||
s/(^|\s+|-)(ESC-)?C-[iI]/$1${2}TAB/g;
|
||||
s/(^|\s+|-)(ESC-)?C-\?/$1${2}DEL/g;
|
||||
return $_;
|
||||
}
|
||||
|
||||
@@ -242,7 +245,7 @@ PAGE
|
||||
$keys =~ s/[<>&]/$htmlesc{$&}/ge;
|
||||
$desc =~ s/[<>&]/$htmlesc{$&}/ge;
|
||||
print <<PAGE;
|
||||
<TR><TD$attr>$keys</TD><TD>$desc</TD></TR>
|
||||
<TR><TD$attr>$keys<TD>$desc
|
||||
PAGE
|
||||
$attr = "";
|
||||
}
|
||||
|
Reference in New Issue
Block a user