vimperator: declare escape keys explicitly per mode

Automated setup added in commit v1.4-61-g6d38d53c6c (2012-04-10)
[keys: replace omni-present escape keys] has been broken since commit
v1.7-126-ge1226a3e4c (2015-09-22) [dereference class definition includes].
Apply the intended effect as static data like other pages for simplicity.

diff --git a/vimperator.eng.inc.pl b/vimperator.eng.inc.pl
index e25b176d8e2c63135e034bd8d333597f8c00d78c..6f8f53ecca7bfad81f4cd3117b0355618fd6dae7 100644 (file)
--- a/vimperator.eng.inc.pl
+++ b/vimperator.eng.inc.pl
@@ -64,6 +64,7 @@ key => {
        'Z' => "quit",
        '^z'=> "pass throu<>gh",
 
        'Z' => "quit",
        '^z'=> "pass throu<>gh",
 

+       "g\e"=> "normal mode",

        'g0' => "first tab",
        'g$' => "last tab",
 
        'g0' => "first tab",
        'g$' => "last tab",
 


@@ -84,6 +85,7 @@ key => {
        'gu' => "parent dir<>ectory",
        'gU' => "site root",
 
        'gu' => "parent dir<>ectory",
        'gU' => "site root",
 

+       ";\e"=> "normal mode",

        ';;' => "focus",
        ';?' => "element details",
        ';a' => "save prompt",
        ';;' => "focus",
        ';?' => "element details",
        ';a' => "save prompt",


@@ -104,12 +106,15 @@ key => {
        ';y' => "copy url",
        ';Y' => "copy text",
 
        ';y' => "copy url",
        ';Y' => "copy text",
 

+       "]\e"=> "normal mode",

        ']f' => "next frame<>set",
        ']]' => "open <q>next</q>",
 
        ']f' => "next frame<>set",
        ']]' => "open <q>next</q>",
 

+       "[\e"=> "normal mode",

        '[f' => "previous frame<>set",
        '[[' => "open <q>prev</q>",
 
        '[f' => "previous frame<>set",
        '[[' => "open <q>prev</q>",
 

+       "z\e"=> "normal mode",

        'zi' => "en<>large text\nZoom In",
        'zm' => "en<>large more\nZoom More",
        'zo' => "shrink text\nZoom Out",
        'zi' => "en<>large text\nZoom In",
        'zm' => "en<>large more\nZoom More",
        'zo' => "shrink text\nZoom Out",


@@ -121,6 +126,7 @@ key => {
        'zR' => "zoom out more\nZoom Reduce",
        'zZ' => "zoom reset\nZoom Zero",
 
        'zR' => "zoom out more\nZoom Reduce",
        'zZ' => "zoom reset\nZoom Zero",
 

+       "Z\e"=> "normal mode",

        'ZQ' => "quit no save",
        'ZZ' => "quit save ses<>s<>ion",
 },
        'ZQ' => "quit no save",
        'ZZ' => "quit save ses<>s<>ion",
 },


@@ -228,6 +234,7 @@ def => {
        g => {
                lead => 'g',
 
        g => {
                lead => 'g',
 

+               "\e"=> 'g8 mode',

                '0' => 'g3',
                '$' => 'g3',
                '^' => '=g0',
                '0' => 'g3',
                '$' => 'g3',
                '^' => '=g0',


@@ -253,6 +260,7 @@ def => {
        ';' => {
                lead => ';',
 
        ';' => {
                lead => ';',
 

+               "\e"=> 'g8 mode',

                ';' => 'g2',
                '?' => 'g1',
                'a' => 'g7 args',
                ';' => 'g2',
                '?' => 'g1',
                'a' => 'g7 args',


@@ -277,6 +285,7 @@ def => {
        ']' => {
                lead => ']',
 
        ']' => {
                lead => ']',
 

+               "\e"=> 'g8 mode',

                'f' => 'g2',
                ']' => 'g5',
        }, # mode ]
                'f' => 'g2',
                ']' => 'g5',
        }, # mode ]


@@ -284,6 +293,7 @@ def => {
        '[' => {
                lead => '[',
 
        '[' => {
                lead => '[',
 

+               "\e"=> 'g8 mode',

                'f' => 'g2',
                '[' => 'g5',
        }, # mode [
                'f' => 'g2',
                '[' => 'g5',
        }, # mode [


@@ -291,6 +301,7 @@ def => {
        z => {
                lead => 'z',
 
        z => {
                lead => 'z',
 

+               "\e"=> 'g8 mode',

                'i' => 'g1',
                'm' => 'g1',
                'o' => 'g1',
                'i' => 'g1',
                'm' => 'g1',
                'o' => 'g1',


@@ -306,6 +317,7 @@ def => {
        Z => {
                lead => 'Z',
 
        Z => {
                lead => 'Z',
 

+               "\e"=> 'g8 mode',

                'Q' => 'g7',
                'Z' => 'g7',
        }, # mode Z
                'Q' => 'g7',
                'Z' => 'g7',
        }, # mode Z

diff --git a/vimperator.plp b/vimperator.plp
index bb4bd9a90f061d6eeae9d3b8f36fd22678f3c95e..f2bea961ce3d29581798c3f99fdd9f7fa7267101 100644 (file)
--- a/vimperator.plp
+++ b/vimperator.plp
@@ -23,8 +23,6 @@ Html({
 <:
 use Shiar_Sheet::Keyboard 2.07;
 my $info = do 'vimperator.eng.inc.pl' or die $@;
 <:
 use Shiar_Sheet::Keyboard 2.07;
 my $info = do 'vimperator.eng.inc.pl' or die $@;

-$_->{"\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});