X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/41c3aa4f3f9017f7d5933ec3e3535124a2b4e6f6..2a99bcdadec88d7483903e2c8420ad3e78fcb805:/vimperator.inc.pl

diff --git a/vimperator.inc.pl b/vimperator.inc.pl
index 6f18abd..ae80cf5 100644
--- a/vimperator.inc.pl
+++ b/vimperator.inc.pl
@@ -1,101 +1,163 @@
 use utf8;
+{
 
 '' => {
-	desc => 'normal mode',
-
-	'~' => ["open home$sign{_}dir"],
-	'@' => ["play macro", 'arg'],
-	'%' => ["to line pct", 'pm'], #TODO: G?
-	'0' => ["left of page", 'pm'],
-	'$' => ["right of page", 'pm'],
-	'#' => ["rev. find word", 'pm'],
-	'*' => ["find word", 'pm'],
-	#'+'
-	#'`'
-	'^^'=> ["last tab"],
-	'?' => ["find rev.", 'pm arg modec'],
-	'/' => ["find", 'pm arg modec'],
-
-	'a' => ["add bookm$sign{_}ark"],
-	'A' => ["toggle bookm$sign{_}ark$sign{_}ed"],
-	'^a'=> ["increment url nr"],
-	'b' => ["to buffer"],
-	'B' => ["list buffers"],
-	'^b'=> ["page up", 'pm'],
-	'^c'=> ["stop loading"],
-	'd' => ["close tab"],
-	'D' => ["close left tab"],
-	#'^d'
-	#'^u'
-	'^i'=> 'L',
-	'^e'=> 'j',
-	'f' => ["quick$sign{_}hint mode", 'arg'],
-	'F' => ["f in tab", 'arg'],
-	'^f'=> ["page down", 'pm'], # spacebar
-	'g' => ["extra cmds", 'me modeg'],
-	'G' => ["last/% line", 'pm'],
-	'^g'=> ["file name"],
-	'h' => [$sign{left}, 'pm'],
-	'H' => ["page back"],
-	'j' => [$sign{down}, 'pm'],
-	'k' => [$sign{up}, 'pm'],
-	'l' => [$sign{right}, 'pm'],
-	'L' => ["page forw$sign{_}ard"],
-	'M' => ["mark url", 'arg'],
-	'm' => ["mark line", 'arg'],
-	'n' => ["find next", 'pm'],
-	'N' => ["find prev$sign{_}ious", 'pm'],
-	'^n'=> 'gt',
-	'o' => ["open", ''],
-	'O' => ["alter url"],
-	'^o'=> 'H',
-	'p' => ["open pasted url"],
-	'P' => ["p in tab"],
-	'^p'=> 'gT',
-	'q' => ["record macro", 'arg'],
-	'r' => ["reload page"],
-	'R' => ["reload uncach$sign{_}e$sign{_}d"],
-	't' => ["tab open new"],
-	'T' => ["tab open curr$sign{_}ent"],
-	'^v'=> ["pass single", 'arg'],
-	'u' => ["restore closed tab"],
-	'y' => ["copy url"],
-	'Y' => ["copy select$sign{_}ion"],
-	'^y'=> 'k',
-	'Z' => ["quit", 'me modeZ arg'],
-	'^z'=> ["pass throu$sign{_}gh"],
+	'~' => 'g5',
+	'@' => 'g7 arg',
+	'^' => 'g2',
+	'0' => '=^',
+	'$' => 'g2',
+	'#' => 'g2',
+	'*' => 'g2',
+	'+' => '=zi',
+	'-' => '=zo',
+	'^^'=> 'g3',
+	'?' => 'g2 args modec',
+	'/' => 'g2 args modec',
+	'[' => 'g9 arg mode[',
+	']' => 'g9 arg mode]',
+	':' => 'g7 args',
+	';' => 'g9 arg args mode;',
+	"'" => 'g2',
+	'`' => "='",
+	'|' => 'g5 v2 v2.2',
+
+	'a' => 'g7 args',
+	'A' => 'g7',
+	'^a'=> 'g5',
+	'b' => 'g3 args',
+	'B' => 'g1',
+	'^b'=> 'g2',
+	'^c'=> 'g4',
+	'^d'=> 'g2',
+	'd' => 'g4',
+	'D' => 'g4',
+	'i' => 'g8',
+	'^i'=> '=L',
+	'^e'=> '=j',
+	'f' => 'g5 args',
+	'F' => 'g6 args',
+	'^f'=> 'g2', # spacebar
+	'g' => 'g9 modeg arg',
+	'G' => 'g2',
+	'^g'=> 'g1',
+	'h' => 'g2',
+	'H' => 'g5',
+	'j' => 'g2',
+	'k' => 'g2',
+	'l' => 'g2',
+	'L' => 'g5',
+	'M' => 'g7 arg',
+	'm' => 'g7 arg',
+	'n' => 'g2',
+	'N' => 'g2',
+	'^n'=> 'g3',
+	'o' => 'g5',
+	'O' => 'g5',
+	'^o'=> '=H',
+	'p' => 'g5',
+	'P' => 'g6',
+	'^p'=> '=gT',
+	'q' => 'g8 arg',
+	'r' => 'g4',
+	'R' => 'g5',
+	't' => 'g6',
+	'T' => 'g6',
+	'^v'=> 'g4 arg',
+	'^u'=> 'g2',
+	'u' => 'g6',
+	'^x'=> 'g5',
+	'y' => 'g7',
+	'Y' => 'g7',
+	'^y'=> '=k',
+	'z' => 'g1 modez arg',
+	'Z' => 'g9 modeZ arg',
+	'^z'=> 'g8',
 }, # normal mode
 
 g => {
-	desc => 'extended commands (g)',
 	lead => 'g',
 
-	'0' => ["first tab"],
-	'$' => ["last tab"],
-	'^' => 'g0',
-
-	'b' => ["repeat buffer cmd"],
-	'B' => ["reverse gb"],
-	'i' => ["last input field"],
-	'^g'=> ["file details"],
-	'g' => ["first line"],
-	'f' => ["view source"],
-	'F' => ["source extern$sign{_}al"],
-	'm' => ["repeat output"],
-	'n' => ["tabopen url mark", '', 'Go in New tab'],
-	'o' => ["open url mark"],
-	'P' => ["P inactive"],
-	'h' => ["open home$sign{_}page"],
-	'H' => ["tab with home$sign{_}page"],
-	'u' => ["parent dir$sign{_}ectory"],
-	'U' => ["site root"],
+	'0' => 'g3',
+	'$' => 'g3',
+	'^' => '=g0',
+
+	'b' => 'g3',
+	'B' => 'g3',
+	'f' => 'g5',
+	'F' => 'g7',
+	'^g'=> 'g1',
+	'g' => 'g2',
+	'h' => 'g5',
+	'H' => 'g6',
+	'i' => 'g2',
+	'n' => 'g6 arg',
+	'o' => 'g5 arg',
+	'P' => 'g6',
+	't' => 'g3',
+	'T' => 'g3',
+	'u' => 'g5',
+	'U' => 'g5',
 }, # mode g
 
+';' => {
+	lead => ';',
+
+	';' => 'g2',
+	'?' => 'g1',
+	'a' => 'g7 args',
+	'b' => 'g6 v2',
+	'c' => 'v2 v2.2',
+	'f' => 'g2 v2', # previously ';o'
+	'F' => 'g6 v2', # previously ';t'
+	'i' => 'g5 v2 v2.2',
+	'I' => 'g6 v2 v2.2',
+	'o' => 'g5',
+	'O' => 'g5 args',
+	's' => 'g7',
+	't' => 'g6',
+	'T' => 'g6 args',
+	'v' => 'g5',
+	'w' => 'g6',
+	'W' => 'g6 args',
+	'y' => 'g7',
+	'Y' => 'g7',
+}, # mode ;
+
+']' => {
+	lead => ']',
+
+	'f' => 'g2',
+	']' => 'g5',
+}, # mode ]
+
+'[' => {
+	lead => '[',
+
+	'f' => 'g2',
+	'[' => 'g5',
+}, # mode [
+
+z => {
+	lead => 'z',
+
+	'i' => 'g1',
+	'm' => 'g1',
+	'o' => 'g1',
+	'r' => 'g1',
+	'z' => 'g1',
+	'I' => 'g1',
+	'M' => 'g1',
+	'O' => 'g1',
+	'R' => 'g1',
+	'Z' => 'g1',
+}, # mode z
+
 Z => {
-	desc => 'quit commands (Z)',
 	lead => 'Z',
 
-	'Q' => ["quit no save"],
-	'Z' => ["quit save ses$sign{_}s$sign{_}ion"],
+	'Q' => 'g7',
+	'Z' => 'g7',
 }, # mode Z
 
+}