vi: generic declaration of the escape key (\e)

diff --git a/Shiar_Sheet/Keyboard.pm b/Shiar_Sheet/Keyboard.pm
index 7713009487f108a9732de3cc61c783b3cf85ce2f..936b811f08c0e1e66be0c22ff7f32f3133660959 100644 (file)
--- a/Shiar_Sheet/Keyboard.pm
+++ b/Shiar_Sheet/Keyboard.pm
@@ -5,7 +5,7 @@ use warnings;
 no  warnings 'uninitialized';  # save some useless checks for more legible code
 use Carp;
 
-our $VERSION = 'v2.01';
+our $VERSION = 'v2.02';
 
 my @casedesc = (undef, qw/shift ctrl meta/, 'shift meta');
 my @rowdesc = qw(numeric top home bottom);
@@ -99,7 +99,7 @@ sub print_key {
        }
 
 #      $key = $keytrans{$key} if defined $keytrans{$key};
-       my $keytxt = $self->{def}{$mode}{lead} . escapehtml($key) if $key ne '^0';
+       my $keytxt = $key eq "\e" ? 'Esc' : $self->{def}{$mode}{lead} . escapehtml($key) if $key ne '^0';
           $keytxt .= $self->{sign}->{$1} while $flags =~ s/(?:^| )(arg[a-ln-z]?)\b//;  # arguments
           $keytxt .= "<small>$self->{sign}->{motion}</small>" if $flags =~ s/ ?\bargm\b//;  # motion argument
           $keytxt =~ s{\^(?=.)}{<small>^</small>};  # element around ctrl-identifier
@@ -127,11 +127,11 @@ sub print_rows {
        my $defrows = shift || [2, 1, 0];
        my @modes = sort keys %{ $self->{def} };
 
-       for (my $row = 0; $row <= $#{ $keyrows{$self->{map}} }; $row++) {
-               my $keyrow = $keyrows{$self->{map}}->[$row];
+       for (my $row = -1; $row <= $#{ $keyrows{$self->{map}} }; $row++) {
+               my $keyrow = $row < 0 ? [["\e"]] : $keyrows{$self->{map}}->[$row];
 
-               print qq{<li class="row row$row"><ul>\n};
-               for my $basemode (@modes) {
+               printf qq{<li class="row row%d"><ul>\n}, $row+1;
+               for my $basemode ($row < 0 ? '' : @modes) {
                        my @moderows = split /\s+/,
                                defined $moderows{$basemode} ? $moderows{$basemode} : $moderows{-DEFAULT};
 
@@ -149,10 +149,11 @@ sub print_rows {
                                printf "\t<li%s>", $basemode ne '' && sprintf(
                                        ' class="%s"', 'mode mode' . escapeclass($basemode)
                                );
-                               printf("<h3>%s<small>: %s</small></h3>\n", # XXX insert &nbsp; here to fix msie<=6
+                               printf('<h3>%s<small>: %s</small></h3>', # XXX insert &nbsp; here to fix msie<=6
                                                $self->{mode}->{$mode} || "mode $basemode",
                                                "$rowdesc[$row] row $casedesc[$case]"
-                               );
+                               ) unless $row < 0;
+                               print "\n";
                                my $caseclass = 'keys';
                                   $caseclass .= ' lead' if defined $modekeys->{lead};  # leading command key shown
                                   $caseclass .= " $casedesc[$case]" if defined $casedesc[$case];

diff --git a/vi.eng.inc.pl b/vi.eng.inc.pl
index 7fb456bfcca459eb084d4d1440698ebb1b35ba5b..67af76c69eba217802994381ce3c7eafc5077404 100644 (file)
--- a/vi.eng.inc.pl
+++ b/vi.eng.inc.pl
@@ -3,6 +3,7 @@ use utf8;
 {
 key => {
 
+"\e"=> ["normal mode"],
 '~' => ["case toggle"],
 '!' => ["filt$sign{_}er lines"],
 '@' => ["play macro"],

diff --git a/vi.inc.pl b/vi.inc.pl
index bd9db3e9faf1685e9a4e0637fd7269157bf61fed..02465d89f6c11f8fafa3d5505d4c35530681b445 100644 (file)
--- a/vi.inc.pl
+++ b/vi.inc.pl
@@ -2,6 +2,7 @@ use utf8;
 {
 
 '' => {
+       "\e"=> ["mo mode"],
        '~' => ["co undo"],
        '!' => ["co argm undo modec"],
        '@' => ["co arg undo"],

diff --git a/vi.plp b/vi.plp
index ba92e1771207a69e000cd23cabde21d52e90a063..dc82a16394e5ae2812f4ff99c450da1c6df4c771 100644 (file)
--- a/vi.plp
+++ b/vi.plp
@@ -22,13 +22,6 @@ Html({
 
 <ul id="rows">
 
-<li class="row">
-       <ul class="keys omni">
-       <li class="mo chr27" onclick="setmode()"><b>Esc</b> normal mode
-               <!-- not as static anymore, but never bothered; just see ^[ -->
-       </ul>
-</li>
-
 <:
 use Shiar_Sheet::Keyboard 2;
 my $info = do 'vi.eng.inc.pl' or die $@;