keys: replace omni-present escape keys

Instead of hardcoding the esc key in html, implement it as a standard row.

diff --git a/Shiar_Sheet/Keyboard.pm b/Shiar_Sheet/Keyboard.pm
index c5ab0167c0877b7a6ce20acbadc595c48afb6fe0..2cbaffe4087f8da9db5c7e41394a25fb9d014229 100644 (file)
--- a/Shiar_Sheet/Keyboard.pm
+++ b/Shiar_Sheet/Keyboard.pm
@@ -128,7 +128,7 @@ sub print_rows {
                my $keyrow = $row < 0 ? [["\e"]] : $keyrows{$self->{map}}->[$row];
 
                printf qq{<li class="row row%d"><ul>\n}, $row+1;
                my $keyrow = $row < 0 ? [["\e"]] : $keyrows{$self->{map}}->[$row];
 
                printf qq{<li class="row row%d"><ul>\n}, $row+1;

-               for my $basemode ($row < 0 ? '' : @modes) {
+               for my $basemode (@modes) {

                        my @moderows = split /\s+/,
                                defined $moderows{$basemode} ? $moderows{$basemode} : $moderows{-DEFAULT};
 
                        my @moderows = split /\s+/,
                                defined $moderows{$basemode} ? $moderows{$basemode} : $moderows{-DEFAULT};
 

diff --git a/less.inc.pl b/less.inc.pl
index dcd651204e5069641ab75a1101a1af4bf5a170b3..0fdedf6bd2d8f5e0a664ed1a00aea5d8713a8244 100644 (file)
--- a/less.inc.pl
+++ b/less.inc.pl
@@ -2,6 +2,8 @@ use utf8;
 { # less v418
 
 '' => {
 { # less v418
 
 '' => {

+       "\e"=> ['mo mode^[', "alt$sign{_}/meta"],
+

        'b' => ['pm more'],
        '^b'=> 'b',
        'd' => ['pm more'],
        'b' => ['pm more'],
        '^b'=> 'b',
        'd' => ['pm more'],


@@ -65,6 +67,7 @@ use utf8;
 },
 
 '^[' => { # esc
 },
 
 '^[' => { # esc

+       "\e"=> ['mo mode', 'noop'],

        'n' => ['co'],
        'N' => ['co'],
        'u' => ['ci'],
        'n' => ['co'],
        'N' => ['co'],
        'u' => ['ci'],


@@ -76,11 +79,13 @@ use utf8;
 },
 
 #'^x' => {
 },
 
 #'^x' => {

+#      "\e"=> ['mo mode', 'noop'],

 #      '^x' => "'",
 #      '^v' => ':e',
 #},
 
 ':' => {
 #      '^x' => "'",
 #      '^v' => ':e',
 #},
 
 ':' => {

+       "\e"=> ['mo mode', 'noop'],

        'd' => ['mo'],
        'e' => ['mo'],
        'f' => '=',
        'd' => ['mo'],
        'e' => ['mo'],
        'f' => '=',


@@ -92,6 +97,7 @@ use utf8;
 },
 
 '-' => {
 },
 
 '-' => {

+       "\e"=> ['mo mode', 'noop'],

        'a' => ['co'],
        'b' => ['mo arg'],
        'B' => ['mo'],
        'a' => ['co'],
        'b' => ['mo arg'],
        'B' => ['mo'],

diff --git a/less.plp b/less.plp
index 52ca4710bc6544bf03c38748ff7dd88fe9797780..b3632038f95be5d110770de4d419b9b6f6ac3e12 100644 (file)
--- a/less.plp
+++ b/less.plp
@@ -23,29 +23,6 @@ Html({
 
 <ul id="rows">
 
 
 <ul id="rows">
 

-<li class="row"><ul>
-       <li>
-               <ul class="keys omni">
-               <li class="mo chr27" onclick="setmode('mode_c_sbo')"><b>Esc</b> alt<:=$sign{_}:>/meta
-               </ul>
-       <li class="mode mode_c_sbo">
-               <ul class="keys omni">
-               <li class="mo chr27" onclick="setmode()"><b>Esc</b> noop
-               </ul>
-       <li class="mode mode:">
-               <ul class="keys omni">
-               <li class="mo chr27" onclick="setmode()"><b>Esc</b> noop
-               </ul>
-       <li class="mode mode-">
-               <ul class="keys omni">
-               <li class="mo chr27" onclick="setmode()"><b>Esc</b> noop
-               </ul>
-       <li class="mode mode^x">
-               <ul class="keys omni">
-               <li class="mo chr27" onclick="setmode()"><b>Esc</b> noop
-               </ul>
-       </ul>
-

 <:
 use Shiar_Sheet::Keyboard 2;
 my $info = do 'less.eng.inc.pl' or die $@;
 <:
 use Shiar_Sheet::Keyboard 2;
 my $info = do 'less.eng.inc.pl' or die $@;

diff --git a/mplayer.inc.pl b/mplayer.inc.pl
index f0874e0550fd5b9d9aecc579af46bd748ae63801..e07b78c9495b9b5af1bf0c3ed40294ed42be3379 100644 (file)
--- a/mplayer.inc.pl
+++ b/mplayer.inc.pl
@@ -2,6 +2,7 @@ use utf8;
 {
 
 '' => {
 {
 
 '' => {

+       "\e"=> 'q',

        '[' => ['mo'],
        ']' => ['mo'],
        '{' => ['mo'],
        '[' => ['mo'],
        ']' => ['mo'],
        '{' => ['mo'],

diff --git a/mplayer.plp b/mplayer.plp
index ef31e6b7640d3860f7fa767219456f969eaad422..689ee84d69486d42f724fff4c35a10e3ca122f03 100644 (file)
--- a/mplayer.plp
+++ b/mplayer.plp
@@ -22,13 +22,6 @@ Html({
 
 <ul id="rows">
 
 
 <ul id="rows">
 

-<li class="row">
-       <ul class="keys omni">
-       <li class="mo chr27" onclick="setmode()"><b>Esc</b> q
-               <!-- not as static anymore, but never bothered; just see ^[ -->
-       </ul>
-</li>
-

 <:
 use Shiar_Sheet::Keyboard 2;
 my $info = do 'mplayer.eng.inc.pl' or die $@;
 <:
 use Shiar_Sheet::Keyboard 2;
 my $info = do 'mplayer.eng.inc.pl' or die $@;

diff --git a/mutt.inc.pl b/mutt.inc.pl
index 21ca05b2aa49afc3a901b2a85b0bf44de0286685..90185c9befe5dbe48d89360d156ee3d6f8ffef21 100644 (file)
--- a/mutt.inc.pl
+++ b/mutt.inc.pl
@@ -1,6 +1,8 @@
 use utf8;
 
 my %common = (
 use utf8;
 
 my %common = (

+       "\e"=> ['me mode', '+'],
+

        'H' => ['pm'], # top-page
        'j' => ['pm'], # next-entry, next-undeleted
        'k' => ['pm'], # previous-entry, previous-undeleted
        'H' => ['pm'], # top-page
        'j' => ['pm'], # next-entry, next-undeleted
        'k' => ['pm'], # previous-entry, previous-undeleted


@@ -151,6 +153,7 @@ my %common = (
 }, # compose
 
 w => {
 }, # compose
 
 w => {

+       "\e"=> ['me mode', '+'],

        'D' => ['co'],
        'd' => 'wD',
        'N' => ['co'],
        'D' => ['co'],
        'd' => 'wD',
        'N' => ['co'],


@@ -164,6 +167,7 @@ w => {
 }, # flag
 
 '/~' => {
 }, # flag
 
 '/~' => {

+       "\e"=> ['me mode', '+'],

        A => [undef],
        b => ['X arg'],
        B => ['arg'],
        A => [undef],
        b => ['X arg'],
        B => ['arg'],

diff --git a/mutt.plp b/mutt.plp
index f3909fea5d1ac60ea1f32b9e348ca46f73e311c3..3ce3d027c9fc01e3ab53e8f1ef8ae9e8f4a1cfc6 100644 (file)
--- a/mutt.plp
+++ b/mutt.plp
@@ -22,13 +22,6 @@ Html({
 
 <ul id="rows">
 
 
 <ul id="rows">
 

-<li class="row">
-       <ul class="keys omni">
-       <li class="me chr27" onclick="setmode()"><b>Esc</b> +
-               <!-- not as static anymore, but never bothered; just see ^[ -->
-       </ul>
-</li>
-

 <:
 use Shiar_Sheet::Keyboard 2;
 my $info = do 'mutt.eng.inc.pl' or die $@;
 <:
 use Shiar_Sheet::Keyboard 2;
 my $info = do 'mutt.eng.inc.pl' or die $@;

diff --git a/nethack.plp b/nethack.plp
index 3115e28d696a12121aad0da7a55218a169c3b31e..7e46c37c5e4d95ff1efea00d0f4a30c74d88fcd1 100644 (file)
--- a/nethack.plp
+++ b/nethack.plp
@@ -22,18 +22,13 @@ Html({
 
 <ul id="rows">
 
 
 <ul id="rows">
 

-<li class="row">
-       <ul class="keys omni">
-       <li class="me chr27" onclick="setmode()"><b>Esc</b>
-               <!-- static reset button, even though it's not (officially) in the game -->
-       </ul>
-</li>
-

 <:
 use Shiar_Sheet::Keyboard 2;
 my $info = do 'nethack.eng.inc.pl' or die $@;
 $info->{def} = do 'nethack.inc.pl';
 my $keys = Shiar_Sheet::Keyboard->new($info);
 <:
 use Shiar_Sheet::Keyboard 2;
 my $info = do 'nethack.eng.inc.pl' or die $@;
 $info->{def} = do 'nethack.inc.pl';
 my $keys = Shiar_Sheet::Keyboard->new($info);

+$_->{"\e"} = ['me mode'] for values %{ $info->{def} };
+       # static reset button, even though it's not (officially) in the game

 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows} || '4321-421', [3,2,1,0]);
 :>
 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows} || '4321-421', [3,2,1,0]);
 :>

diff --git a/readline.plp b/readline.plp
index a7be846f78e519aee5f41bf9737d91d6d771882b..6d8c4995ba67ef19adf5096c1b7c50089d07a6ed 100644 (file)
--- a/readline.plp
+++ b/readline.plp
@@ -22,12 +22,6 @@ Html({
 
 <ul id="rows">
 
 
 <ul id="rows">
 

-<li class="row">
-       <ul class="keys omni">
-       <li class="me" onclick="setmode()"><b>Esc</b> +
-       </ul>
-</li>
-

 <:
 use Shiar_Sheet::Keyboard 2;
 my $info = do 'readline.eng.inc.pl' or die $@;
 <:
 use Shiar_Sheet::Keyboard 2;
 my $info = do 'readline.eng.inc.pl' or die $@;

diff --git a/vi.eng.inc.pl b/vi.eng.inc.pl
index e4f99e64cea3b3d35481d6d40b8c3410a5821b16..a4c1d7e1fcaaeb9ac4d33e518fe41146a29373c9 100644 (file)
--- a/vi.eng.inc.pl
+++ b/vi.eng.inc.pl
@@ -127,7 +127,7 @@ key => {
 'g8' => ["char hex val$sign{_}ue$sign{_}s"],
 'g0' => ["virtual bol"],
 'g-' => ["earlier undo"],
 'g8' => ["char hex val$sign{_}ue$sign{_}s"],
 'g0' => ["virtual bol"],
 'g-' => ["earlier undo"],

-'g^['=> ["esc"],
+"g\e"=> ["normal mode"],

 'g]' => ["go to tselect"],
 'g^]'=> ["go to tjump"],
 'g;' => ["to prev change pos"],
 'g]' => ["go to tselect"],
 'g^]'=> ["go to tjump"],
 'g;' => ["to prev change pos"],


@@ -172,7 +172,7 @@ key => {
 'gw' => ["for$sign{_}mat still"],
 'gx' => ["Netrw$sign{_}BrowseX"],
 
 'gw' => ["for$sign{_}mat still"],
 'gx' => ["Netrw$sign{_}BrowseX"],
 

-'Z^['=> ["esc"],
+"Z\e"=> ["normal mode"],

 'ZQ' => [" :q! (force)"],
 'ZZ' => [" :wq (write)"],
 
 'ZQ' => [" :q! (force)"],
 'ZZ' => [" :wq (write)"],
 


@@ -181,7 +181,7 @@ key => {
 'z-' => ["line at bottom bol", "don't (-) see any further"],
 'z=' => ["sug$sign{_}gest spell$sign{_}ing"],
 'z.' => ["line at center bol"],
 'z-' => ["line at bottom bol", "don't (-) see any further"],
 'z=' => ["sug$sign{_}gest spell$sign{_}ing"],
 'z.' => ["line at center bol"],

-'z^['=> ["esc"],
+"z\e"=> ["normal mode"],

 
 'za' => ["toggle fold"],
 'zA' => ["toggle fold rec$sign{_}urs$sign{_}ive$sign{_}ly"],
 
 'za' => ["toggle fold"],
 'zA' => ["toggle fold rec$sign{_}urs$sign{_}ive$sign{_}ly"],


@@ -228,7 +228,7 @@ key => {
 '[/' => ["start of C com$sign{_}m$sign{_}ent"],
 '[{' => ["previous open {"],
 '[[' => ["section back$sign{_}ward$sign{_}s"],
 '[/' => ["start of C com$sign{_}m$sign{_}ent"],
 '[{' => ["previous open {"],
 '[[' => ["section back$sign{_}ward$sign{_}s"],

-'[^['=> ["esc"],
+"[\e"=> ["normal mode"],

 '[]' => [qq'<span style="font-variant:small-caps">section</span> back$sign{_}ward$sign{_}s'],
 
 '[c' => ["start of change backw$sign{_}ards"],
 '[]' => [qq'<span style="font-variant:small-caps">section</span> back$sign{_}ward$sign{_}s'],
 
 '[c' => ["start of change backw$sign{_}ards"],


@@ -250,7 +250,7 @@ key => {
 '])' => ["next open )"],
 ']/' => ["end of C com$sign{_}m$sign{_}ent"],
 '][' => [qq'<span style="font-variant:small-caps">section</span> forw$sign{_}ard'],
 '])' => ["next open )"],
 ']/' => ["end of C com$sign{_}m$sign{_}ent"],
 '][' => [qq'<span style="font-variant:small-caps">section</span> forw$sign{_}ard'],

-']^['=> ["esc"],
+"]\e"=> ["normal mode"],

 ']]' => ["section forw$sign{_}ard"],
 ']}' => ["next open }"],
 
 ']]' => ["section forw$sign{_}ard"],
 ']}' => ["next open }"],
 


@@ -274,7 +274,7 @@ key => {
 '^w+' => ["height incr$sign{_}ease"],
 '^w-' => ["height decr$sign{_}ease"],
 '^w=' => ["same height"],
 '^w+' => ["height incr$sign{_}ease"],
 '^w-' => ["height decr$sign{_}ease"],
 '^w=' => ["same height"],

-'^w^['=> ["esc"],
+"^w\e"=> ["normal mode"],

 '^w]' => ["split, to tag"],
 '^w}' => ["pre$sign{_}view tag"],
 '^w|' => ["set width"],
 '^w]' => ["split, to tag"],
 '^w}' => ["pre$sign{_}view tag"],
 '^w|' => ["set width"],


@@ -310,7 +310,7 @@ key => {
 '^wx' => ["ex$sign{_}chan$sign{_}ge"],
 '^wz' => ["close pre$sign{_}view"],
 
 '^wx' => ["ex$sign{_}chan$sign{_}ge"],
 '^wz' => ["close pre$sign{_}view"],
 

-'^wg^['=> ["esc"],
+"^wg\e"=> ["normal mode"],

 '^wg]' => ["split, :ts$sign{_}elect"],
 '^wg}' => [":ptj$sign{_}ump to tag"],
 '^wg^]'=> ["split, :tj$sign{_}ump"],
 '^wg]' => ["split, :ts$sign{_}elect"],
 '^wg}' => [":ptj$sign{_}ump to tag"],
 '^wg^]'=> ["split, :tj$sign{_}ump"],


@@ -323,7 +323,7 @@ key => {
 'v=' => ["re$sign{_}ind$sign{_}ent"],
 'v>' => ["ind$sign{_}ent"],
 'v~' => ["toggle case"],
 'v=' => ["re$sign{_}ind$sign{_}ent"],
 'v>' => ["ind$sign{_}ent"],
 'v~' => ["toggle case"],

-'v^['=> ["esc"],
+"v\e"=> ["normal mode"],

 'v^]'=> ["jump to tag"],
 
 'va' => ["ex$sign{_}tend area"],
 'v^]'=> ["jump to tag"],
 
 'va' => ["ex$sign{_}tend area"],


@@ -355,7 +355,7 @@ key => {
 'vy' => ["yank area"],
 'vY' => ["yank lines"],
 
 'vy' => ["yank area"],
 'vY' => ["yank lines"],
 

-'vg^['=> ["esc"],
+"vg\e"=> ["visual mode"],

 'vg?' => ["rot13 encode"],
 'vgJ' => ["join literal$sign{_}ly"],
 'vgq' => ["for$sign{_}mat"],
 'vg?' => ["rot13 encode"],
 'vgJ' => ["join literal$sign{_}ly"],
 'vgq' => ["for$sign{_}mat"],


@@ -364,7 +364,7 @@ key => {
 "va'" => ["quoted string"],
 'va<' => ["&lt;&gt; block"],
 'va[' => ["[] block"],
 "va'" => ["quoted string"],
 'va<' => ["&lt;&gt; block"],
 'va[' => ["[] block"],

-'va^['=> ["esc"],
+"va\e"=> ["visual mode"],

 
 'vab' => ["() block"],
 'vaB' => ["{} Block"],
 
 'vab' => ["() block"],
 'vaB' => ["{} Block"],


@@ -388,7 +388,7 @@ key => {
 
 'i^@' => ["last insert"],
 'i^^' => ["toggle :lmap usag$sign{_}e"],
 
 'i^@' => ["last insert"],
 'i^^' => ["toggle :lmap usag$sign{_}e"],

-'i^[' => ["esc"],
+"i\e" => ["normal mode"],

 'i^]' => ["abbrev$sign{_}iate"],
 'i^_' => ["toggle lang$sign{_}uage"],
 
 'i^]' => ["abbrev$sign{_}iate"],
 'i^_' => ["toggle lang$sign{_}uage"],
 


@@ -417,12 +417,13 @@ key => {
 'i^y' => ["ins char above"],
 'i^z' => [":sus$sign{_}pend in <em>im</em>"],
 
 'i^y' => ["ins char above"],
 'i^z' => [":sus$sign{_}pend in <em>im</em>"],
 

+"i^g\e"=> ["insert mode"],

 'i^gk' => ["$sign{up} start col$sign{_}umn"],
 'i^gj' => ["$sign{down} start col$sign{_}umn"],
 'i^gu' => ["break undo seq$sign{_}uence"],
 # other i^g keys (even esc) are not recognized
 
 'i^gk' => ["$sign{up} start col$sign{_}umn"],
 'i^gj' => ["$sign{down} start col$sign{_}umn"],
 'i^gu' => ["break undo seq$sign{_}uence"],
 # other i^g keys (even esc) are not recognized
 

-'i^x^[' => ["esc"],
+"i^x\e" => ["normal mode"],

 'i^x^]' => ["tag comp$sign{_}l$sign{_}et$sign{_}e"],
 'i^x^d' => ["def$sign{_}ine compl$sign{_}et$sign{_}e"],
 'i^x^e' => ["window up"],
 'i^x^]' => ["tag comp$sign{_}l$sign{_}et$sign{_}e"],
 'i^x^d' => ["def$sign{_}ine compl$sign{_}et$sign{_}e"],
 'i^x^e' => ["window up"],

diff --git a/vi.inc.pl b/vi.inc.pl
index 02465d89f6c11f8fafa3d5505d4c35530681b445..d0c259fc39ae8738aabd1bb1510083e94f2eef26 100644 (file)
--- a/vi.inc.pl
+++ b/vi.inc.pl
@@ -2,7 +2,6 @@ use utf8;
 {
 
 '' => {
 {
 
 '' => {

-       "\e"=> ["mo mode"],

        '~' => ["co undo"],
        '!' => ["co argm undo modec"],
        '@' => ["co arg undo"],
        '~' => ["co undo"],
        '!' => ["co argm undo modec"],
        '@' => ["co arg undo"],


@@ -122,6 +121,8 @@ use utf8;
 g => {
        lead => "g",
 
 g => {
        lead => "g",
 

+       "\e"=> ["mo mode"],
+

        '~' => ["co argm ext vim6"],
        '@' => ["co ext vim7 new"],
        '#' => ["pm ext vim6"],
        '~' => ["co argm ext vim6"],
        '@' => ["co ext vim7 new"],
        '#' => ["pm ext vim6"],


@@ -184,7 +185,8 @@ g => {
 Z => {
        lead => "Z",
 
 Z => {
        lead => "Z",
 

-       '^['=> ["mo mode"],
+       "\e"=> ["mo mode"],
+       '^['=> "\e",

 
        'Q' => ["co ext vim6"],
        'Z' => ["co"],
 
        'Q' => ["co ext vim6"],
        'Z' => ["co"],


@@ -193,12 +195,14 @@ Z => {
 z => {
        lead => "z",
 
 z => {
        lead => "z",
 

+       "\e"=> ["mo mode"],
+

        '^' => ["po"],
        '+' => ["po"],
        '-' => ["po"],
        '=' => ["co ext vim7 new"],
        '.' => ["po"],
        '^' => ["po"],
        '+' => ["po"],
        '-' => ["po"],
        '=' => ["co ext vim7 new"],
        '.' => ["po"],

-       '^['=> ["mo mode"],
+       '^['=> "\e",

 
        'a' => ["co ext vim6 folding"],
        'A' => ["co ext vim6 folding"],
 
        'a' => ["co ext vim6 folding"],
        'A' => ["co ext vim6 folding"],


@@ -243,6 +247,8 @@ z => {
 '[' => {
        lead => "[",
 
 '[' => {
        lead => "[",
 

+       "\e"=> ["mo mode"],
+

        "`" => ["pm ext vim6"],
        '#' => ["pm"],
        '(' => ["pm"],
        "`" => ["pm ext vim6"],
        '#' => ["pm"],
        '(' => ["pm"],


@@ -251,7 +257,7 @@ z => {
        "'" => "[` ^", # ext vim6
        '{' => ["pm"],
        '[' => ["pm"],
        "'" => "[` ^", # ext vim6
        '{' => ["pm"],
        '[' => ["pm"],

-       '^['=> ["mo mode"],
+       '^['=> "\e",

        ']' => ["pm"],
 
        'c' => ["pm"],
        ']' => ["pm"],
 
        'c' => ["pm"],


@@ -273,6 +279,8 @@ z => {
 ']' => {
        lead => "]",
 
 ']' => {
        lead => "]",
 

+       "\e"=> ["mo mode"],
+

        "`" => ["pm ext vim6"],
        '#' => ["pm"],
        ')' => ["pm"],
        "`" => ["pm ext vim6"],
        '#' => ["pm"],
        ')' => ["pm"],


@@ -280,7 +288,7 @@ z => {
        "'" => "]` ^", # ext vim6
        '/' => ["pm"],
        '[' => ["pm"],
        "'" => "]` ^", # ext vim6
        '/' => ["pm"],
        '[' => ["pm"],

-       '^['=> ["mo mode"],
+       '^['=> "\e",

        ']' => ["pm"],
        '}' => ["pm"],
 
        ']' => ["pm"],
        '}' => ["pm"],
 


@@ -303,6 +311,8 @@ z => {
 '^w' => {
        lead => $ascii ? "'w"  : "ŵ",
 
 '^w' => {
        lead => $ascii ? "'w"  : "ŵ",
 

+       "\e"=> ["mo mode"],
+

        '<' => ["po"],
        '>' => ["po"],
        '^' => ["co"],
        '<' => ["po"],
        '>' => ["po"],
        '^' => ["co"],


@@ -310,7 +320,7 @@ z => {
        '+' => ["po"],
        '-' => ["po"],
        '=' => ["po"],
        '+' => ["po"],
        '-' => ["po"],
        '=' => ["po"],

-       '^['=> ["mo mode"],
+       '^['=> "\e",

        ']' => ["po"],
        '}' => ["po"],
        '|' => ["po"],
        ']' => ["po"],
        '}' => ["po"],
        '|' => ["po"],


@@ -351,7 +361,8 @@ z => {
 '^wg' => {
        lead => $ascii ? "'wg" : "ŵg",
 
 '^wg' => {
        lead => $ascii ? "'wg" : "ŵg",
 

-       '^['=> ["mo mode"],
+       "\e"=> ["mo mode"],
+       '^['=> "\e",

        ']' => ["po"],
        '}' => ["po"],
        '^]'=> ["po"],
        ']' => ["po"],
        '}' => ["po"],
        '^]'=> ["po"],


@@ -360,13 +371,15 @@ z => {
 }, # mode ^w g
 
 v => {
 }, # mode ^w g
 
 v => {

+       "\e"=> ["mo mode"],
+

        '!' => ["co"],
        ':' => ["mo modec"],
        '<' => ["co"],
        '=' => ['co undo'],
        '>' => ['co'],
        '~' => ["co ext vim6"],
        '!' => ["co"],
        ':' => ["mo modec"],
        '<' => ["co"],
        '=' => ['co undo'],
        '>' => ['co'],
        '~' => ["co ext vim6"],

-       '^['=> ["mo mode"],
+       '^['=> "\e",

        '^]'=> ["po"],
        '^\\'=>'^\\',
 
        '^]'=> ["po"],
        '^\\'=>'^\\',
 


@@ -415,7 +428,9 @@ v => {
 vg => {
        lead => "g",
 
 vg => {
        lead => "g",
 

-       '^['=> ["mv modev"],
+       "\e"=> ["mv modev"],
+
+       '^['=> "\e",

        '?' => ["co ext vim6"],
        'J' => ['co ext vim6'],
        'q' => ["co ext vim6"],
        '?' => ["co ext vim6"],
        'J' => ['co ext vim6'],
        'q' => ["co ext vim6"],


@@ -424,6 +439,8 @@ vg => {
 }, # mode v g
 
 va => {
 }, # mode v g
 
 va => {

+       "\e"=> ["mv modev"],
+

        '(' => 'vab',
        ')' => 'vab',
        '`' => "va'",
        '(' => 'vab',
        ')' => 'vab',
        '`' => "va'",


@@ -433,7 +450,7 @@ va => {
        '>' => 'va&lt;',
        '[' => ['pm ext vim6'],
        '{' => 'vaB',
        '>' => 'va&lt;',
        '[' => ['pm ext vim6'],
        '{' => 'vaB',

-       '^['=> ['mv modev'],
+       '^['=> "\e",

        ']' => 'va[',
        '}' => 'vaB',
 
        ']' => 'va[',
        '}' => 'vaB',
 


@@ -473,9 +490,11 @@ va => {
 #}, # mode c
 
 i => {
 #}, # mode c
 
 i => {

+       "\e" => ["mo mode"],
+

        '^@' => ["co"],
        '^^' => ["co ext vim6"],
        '^@' => ["co"],
        '^^' => ["co ext vim6"],

-       '^[' => ["mo mode"],
+       '^['=> "\e",

        '^]' => ["co ext vim6"],
        '^_' => ["co ext vim6"],
        '^\\'=>'^\\',
        '^]' => ["co ext vim6"],
        '^_' => ["co ext vim6"],
        '^\\'=>'^\\',


@@ -511,6 +530,8 @@ i => {
 'i^g' => {
        lead => $ascii ? "'g"  : "ĝ",
 
 'i^g' => {
        lead => $ascii ? "'g"  : "ĝ",
 

+       "\e"=> ['mi modei'],
+

        'k' => ['pm'],
        'j' => ['pm'],
        'u' => ['co'],
        'k' => ['pm'],
        'j' => ['pm'],
        'u' => ['co'],


@@ -520,7 +541,9 @@ i => {
 'i^x' => {
        lead => $ascii ? "'x"  : "x̂",
 
 'i^x' => {
        lead => $ascii ? "'x"  : "x̂",
 

-       '^[' => ["mo mode"], # yes, it really leaves insert mode
+       "\e" => ["mo mode"], # yes, it really leaves insert mode
+
+       '^['=> "\e",

        '^]' => ['co'],
        '^d' => ['co'],
        '^e' => ["po"],
        '^]' => ['co'],
        '^d' => ['co'],
        '^e' => ["po"],

diff --git a/vimperator.plp b/vimperator.plp
index b54417dba98898a2b9d27eabf6e03117765b41aa..74846f57af3ea0aa5a08e1123eafebdcd3ca0a5a 100644 (file)
--- a/vimperator.plp
+++ b/vimperator.plp
@@ -23,17 +23,12 @@ Html({
 
 <ul id="rows">
 
 
 <ul id="rows">
 

-<li class="row">
-       <ul class="keys omni">
-       <li class="mv 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 'vimperator.eng.inc.pl' or die $@;
 $info->{def} = do 'vimperator.inc.pl';
 <:
 use Shiar_Sheet::Keyboard 2;
 my $info = do 'vimperator.eng.inc.pl' or die $@;
 $info->{def} = do 'vimperator.inc.pl';

+$_->{"\e"} = ['mv mode', "normal mode"] for values %{ $info->{def} };
+delete $info->{def}->{''}->{"\e"};

 my $keys = Shiar_Sheet::Keyboard->new($info);
 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows});
 my $keys = Shiar_Sheet::Keyboard->new($info);
 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows});