From: Mischa POSLAWSKY <perl@shiar.org>
Date: Tue, 20 Jun 2017 12:02:24 +0000 (+0200)
Subject: vimperator: declare escape keys explicitly per mode
X-Git-Tag: v1.11~25
X-Git-Url: http://git.shiar.nl/sheet.git/commitdiff_plain/db3d07fcafd3085df1c3350fb77df54fc0a85803

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 e25b176..6f8f53e 100644
--- a/vimperator.eng.inc.pl
+++ b/vimperator.eng.inc.pl
@@ -64,6 +64,7 @@ key => {
 	'Z' => "quit",
 	'^z'=> "pass throu<>gh",
 
+	"g\e"=> "normal mode",
 	'g0' => "first tab",
 	'g$' => "last tab",
 
@@ -84,6 +85,7 @@ key => {
 	'gu' => "parent dir<>ectory",
 	'gU' => "site root",
 
+	";\e"=> "normal mode",
 	';;' => "focus",
 	';?' => "element details",
 	';a' => "save prompt",
@@ -104,12 +106,15 @@ key => {
 	';y' => "copy url",
 	';Y' => "copy text",
 
+	"]\e"=> "normal mode",
 	']f' => "next frame<>set",
 	']]' => "open <q>next</q>",
 
+	"[\e"=> "normal mode",
 	'[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",
@@ -121,6 +126,7 @@ key => {
 	'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",
 },
@@ -228,6 +234,7 @@ def => {
 	g => {
 		lead => 'g',
 
+		"\e"=> 'g8 mode',
 		'0' => 'g3',
 		'$' => 'g3',
 		'^' => '=g0',
@@ -253,6 +260,7 @@ def => {
 	';' => {
 		lead => ';',
 
+		"\e"=> 'g8 mode',
 		';' => 'g2',
 		'?' => 'g1',
 		'a' => 'g7 args',
@@ -277,6 +285,7 @@ def => {
 	']' => {
 		lead => ']',
 
+		"\e"=> 'g8 mode',
 		'f' => 'g2',
 		']' => 'g5',
 	}, # mode ]
@@ -284,6 +293,7 @@ def => {
 	'[' => {
 		lead => '[',
 
+		"\e"=> 'g8 mode',
 		'f' => 'g2',
 		'[' => 'g5',
 	}, # mode [
@@ -291,6 +301,7 @@ def => {
 	z => {
 		lead => 'z',
 
+		"\e"=> 'g8 mode',
 		'i' => 'g1',
 		'm' => 'g1',
 		'o' => 'g1',
@@ -306,6 +317,7 @@ def => {
 	Z => {
 		lead => 'Z',
 
+		"\e"=> 'g8 mode',
 		'Q' => 'g7',
 		'Z' => 'g7',
 	}, # mode Z
diff --git a/vimperator.plp b/vimperator.plp
index bb4bd9a..f2bea96 100644
--- 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 $@;
-$_->{"\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});