From 849789d23dc120e7e721db9834815cef32afe8b7 Mon Sep 17 00:00:00 2001
From: Martin Stubenschrott <stubenschrott@gmx.net>
Date: Mon, 16 Apr 2007 23:31:55 +0000
Subject: [PATCH] Added Ctrl-[ alias, and 's' guioption

---
 ChangeLog                                | 3 +++
 Contributors                             | 0
 Donators                                 | 1 +
 TODO                                     | 1 +
 build.sh                                 | 2 +-
 chrome/content/vimperator/commands.js    | 2 +-
 chrome/content/vimperator/settings.js    | 6 +++---
 chrome/content/vimperator/vimperator.js  | 4 ++--
 chrome/content/vimperator/vimperator.xul | 1 +
 9 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 Contributors
 create mode 100644 Donators

diff --git a/ChangeLog b/ChangeLog
index 813b9866..7d42c941 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 <pre>
 date:
 	* version 0.3
+	* fixed :tabnext/:tabprevious commands
+	* documented 's' guioptions flag for statusbar
+	* implemented the possibility to use CTRL-[ as an alternative to ESC, to leave the command line
 
 11/04/2007:
 	* version 0.2
diff --git a/Contributors b/Contributors
new file mode 100644
index 00000000..e69de29b
diff --git a/Donators b/Donators
new file mode 100644
index 00000000..82c30a43
--- /dev/null
+++ b/Donators
@@ -0,0 +1 @@
+* Andrew Pantyukhin
diff --git a/TODO b/TODO
index e3fdf26d..a38155af 100644
--- a/TODO
+++ b/TODO
@@ -37,6 +37,7 @@ FEATURES:
 6 gf = view source?
 6 make a real one-tab-mode, divert _all_ other targets, possible by setting a firefox option (set popup=0-3)
 6 Shift-Insert in textboxes pastes clipboard contents
+5 Use arrow keys in preview window
 5 make use of the ] and [ keys to e.g. jump to the next heading ]], next image ]i, previous textbox [t and so on
 5 add tag support to adding/deleting bookmarks
 4 Support multiple top-level windows?
diff --git a/build.sh b/build.sh
index 41b855e4..f23aa325 100755
--- a/build.sh
+++ b/build.sh
@@ -19,5 +19,5 @@ fi
 
 
 if [ x$1 = xtest ]; then
-	cp -v chrome/vimperator.jar '/home/test/.mozilla/firefox/trsj6obw.default//extensions/{f9570b26-e246-4753-9b68-61aa95994237}/chrome'
+	cp -v chrome/vimperator.jar '/home/test/.mozilla/firefox/7ij36ukn.default/extensions/{f9570b26-e246-4753-9b68-61aa95994237}/chrome'
 fi
diff --git a/chrome/content/vimperator/commands.js b/chrome/content/vimperator/commands.js
index c040b00e..8452bdf0 100644
--- a/chrome/content/vimperator/commands.js
+++ b/chrome/content/vimperator/commands.js
@@ -634,7 +634,7 @@ var g_mappings = [/*{{{*/
 		function(count) { openVimperatorBar(null); }
 	],
 	[ 
-		["<Esc>"],
+		["<Esc>", "<C-[>"],
 		"Cancel any operation",
 		"Stops loading the current webpage and exits any command line or hint mode.<br>"+
 		"Also focuses the web page, in case a form field has focus, and eats our key presses.",
diff --git a/chrome/content/vimperator/settings.js b/chrome/content/vimperator/settings.js
index 11af006b..c5204b60 100644
--- a/chrome/content/vimperator/settings.js
+++ b/chrome/content/vimperator/settings.js
@@ -110,7 +110,7 @@ var g_settings = [/*{{{*/
 	[
 		["guioptions", "go"],
 		"Shows or hides the menu, toolbar and scrollbars",
-		"Supported characters:<br><ul><li><b>m</b>: menubar</li><li><b>T</b>: toolbar</ul>",
+		"Supported characters:<br><ul><li><b>m</b>: menubar</li><li><b>T</b>: toolbar<li><b>b</b>: bookmark bar</li><li><b>s</b>: original Firefox statusbar</ul>",
 		function(value) { set_pref("guioptions", value); set_guioptions(value); },
 		function() { return get_pref("guioptions"); },
 		"charlist",
@@ -334,8 +334,8 @@ function set_guioptions(value)
 	document.getElementById("PersonalToolbar").collapsed = value.indexOf("b") > -1 ? false : true;
 	document.getElementById("PersonalToolbar").hidden = value.indexOf("b") > -1 ? false : true;
 	// and original status bar (default), but show it, e.g. when needed for extensions
-	document.getElementById("status-bar").collapsed = value.indexOf("S") > -1 ? false : true;
-	document.getElementById("status-bar").hidden = value.indexOf("S") > -1 ? false : true;
+	document.getElementById("status-bar").collapsed = value.indexOf("s") > -1 ? false : true;
+	document.getElementById("status-bar").hidden = value.indexOf("s") > -1 ? false : true;
 }
 
 function set_showtabline(value)
diff --git a/chrome/content/vimperator/vimperator.js b/chrome/content/vimperator/vimperator.js
index d01b51ff..4971f393 100644
--- a/chrome/content/vimperator/vimperator.js
+++ b/chrome/content/vimperator/vimperator.js
@@ -496,7 +496,6 @@ function onCommandBarKeypress(evt)/*{{{*/
 		else
 			special = false;
 
-
 		/* user pressed ENTER to carry out a command */
 		if (evt.keyCode == KeyEvent.DOM_VK_RETURN)
 		{
@@ -507,7 +506,8 @@ function onCommandBarKeypress(evt)/*{{{*/
 			execute_command(count, cmd, special, args);
 		}
 
-		else if (evt.keyCode == KeyEvent.DOM_VK_ESCAPE)
+		else if ((evt.keyCode == KeyEvent.DOM_VK_ESCAPE) ||
+		         (keyToString(evt) == "<C-[>"))
 		{
 			add_to_command_history(command);
 			focusContent(true, true);
diff --git a/chrome/content/vimperator/vimperator.xul b/chrome/content/vimperator/vimperator.xul
index a6f6fd13..b922438d 100644
--- a/chrome/content/vimperator/vimperator.xul
+++ b/chrome/content/vimperator/vimperator.xul
@@ -88,6 +88,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
 		<keyset id="mainKeyset">
 			<key id="key_open_vimbar" key=":" oncommand="openVimperatorBar();" modifiers=""/>
 			<key id="key_stop" keycode="VK_ESCAPE" oncommand="onEscape();"/> 
+			<!--key id="key_cancel" keycode="[" modifiers="control" oncommand="onEscape();"/--> 
 
 			<!-- other keys are handled inside vimperator.js event loop -->
 		</keyset>