gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-23 08:17:59 +01:00
Code Issues Projects Releases Wiki Activity

use the singleton construction idiom to create v.commands, v.events, v.mappings

Browse Source 
and v.options
This commit is contained in:
Doug Kearns
2007-11-18 10:43:41 +00:00
parent b20dac2b99
commit 5b4b6fe3d2
5 changed files with 969 additions and 954 deletions
Download Patch File Download Diff File Expand all files Collapse all files

194
content/commands.js
View File

@@ -145,15 +145,6 @@ vimperator.Commands = function () //{{{
var ex_commands = []; var ex_commands = [];
var last_run_command = ""; // updated whenever the users runs a command with :! var last_run_command = ""; // updated whenever the users runs a command with :!
function addDefaultCommand(command)
{
ex_commands.push(command);
vimperator.Commands.prototype[command.name] = function (args, special, count, modifiers)
{
command.execute(args, special, count, modifiers);
};
}
// in '-quoted strings, only ' and \ itself are escaped // in '-quoted strings, only ' and \ itself are escaped
// in "-quoted strings, also ", \n and \t are translated // in "-quoted strings, also ", \n and \t are translated
// in non-quoted strings everything is taken literally apart from "\ " and "\\" // in non-quoted strings everything is taken literally apart from "\ " and "\\"
@@ -452,22 +443,23 @@ vimperator.Commands = function () //{{{
////////////////////// PUBLIC SECTION ////////////////////////////////////////// ////////////////////// PUBLIC SECTION //////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////{{{ /////////////////////////////////////////////////////////////////////////////{{{
this.__iterator__ = function () var commandManager = {
__iterator__: function ()
{ {
return commandsIterator(); return commandsIterator();
}; },
this.add = function (command) add: function (command)
{ {
if (!command) this[command.name] = function (args, special, count, modifiers)
return false; {
command.execute(args, special, count, modifiers);
ex_commands.push(command);
return true;
}; };
ex_commands.push(command);
},
this.get = function (name) get: function (name)
{ {
for (var i = 0; i < ex_commands.length; i++) for (var i = 0; i < ex_commands.length; i++)
{ {
@@ -476,13 +468,13 @@ vimperator.Commands = function () //{{{
} }
return null; return null;
}; },
// TODO: generalized 0 count handling -> "Zero count" // TODO: generalized 0 count handling -> "Zero count"
// FIXME: doesn't really belong here... // FIXME: doesn't really belong here...
// return [null, null, null, null, heredoc_tag || false]; // return [null, null, null, null, heredoc_tag || false];
// [count, cmd, special, args] = match; // [count, cmd, special, args] = match;
this.parseCommand = function (str, tag) parseCommand: function (str, tag)
{ {
// remove comments // remove comments
str.replace(/\s*".*$/, ""); str.replace(/\s*".*$/, "");
@@ -519,20 +511,22 @@ vimperator.Commands = function () //{{{
matches[3] = ""; matches[3] = "";
return matches; return matches;
}
}; };
/////////////////////////////////////////////////////////////////////////////}}} /////////////////////////////////////////////////////////////////////////////}}}
////////////////////// DEFAULT COMMANDS //////////////////////////////////////// ////////////////////// DEFAULT COMMANDS ////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////{{{ /////////////////////////////////////////////////////////////////////////////{{{
addDefaultCommand(new vimperator.Command(["addo[ns]"], commandManager.add(new vimperator.Command(["addo[ns]"],
function () { vimperator.open("chrome://mozapps/content/extensions/extensions.xul", vimperator.NEW_TAB); }, function () { vimperator.open("chrome://mozapps/content/extensions/extensions.xul", vimperator.NEW_TAB); },
{ {
short_help: "Show available Browser Extensions and Themes", short_help: "Show available Browser Extensions and Themes",
help: "You can add/remove/disable browser extensions from this dialog.<br/>Be aware that not all Firefox extensions work, because Vimperator overrides some key bindings and changes Firefox's GUI." help: "You can add/remove/disable browser extensions from this dialog.<br/>Be aware that not all Firefox extensions work, because Vimperator overrides some key bindings and changes Firefox's GUI."
} }
)); ));
addDefaultCommand(new vimperator.Command(["ba[ck]"], commandManager.add(new vimperator.Command(["ba[ck]"],
function (args, special, count) function (args, special, count)
{ {
if (special) if (special)
@@ -575,7 +569,7 @@ vimperator.Commands = function () //{{{
} }
} }
)); ));
addDefaultCommand(new vimperator.Command(["bd[elete]", "bw[ipeout]", "bun[load]", "tabc[lose]"], commandManager.add(new vimperator.Command(["bd[elete]", "bw[ipeout]", "bun[load]", "tabc[lose]"],
function (args, special, count) { vimperator.tabs.remove(getBrowser().mCurrentTab, count > 0 ? count : 1, special, 0); }, function (args, special, count) { vimperator.tabs.remove(getBrowser().mCurrentTab, count > 0 ? count : 1, special, 0); },
{ {
usage: ["[count]bd[elete][!]"], usage: ["[count]bd[elete][!]"],
@@ -584,13 +578,13 @@ vimperator.Commands = function () //{{{
"Do <code class=\"command\">:bdelete!</code> to select the tab to the left after removing the current tab." "Do <code class=\"command\">:bdelete!</code> to select the tab to the left after removing the current tab."
} }
)); ));
addDefaultCommand(new vimperator.Command(["beep"], commandManager.add(new vimperator.Command(["beep"],
function () { vimperator.beep(); }, function () { vimperator.beep(); },
{ {
short_help: "Play a system beep" short_help: "Play a system beep"
} }
)); ));
addDefaultCommand(new vimperator.Command(["bma[rk]"], commandManager.add(new vimperator.Command(["bma[rk]"],
function (args) function (args)
{ {
var res = parseArgs(args, this.args); var res = parseArgs(args, this.args);
@@ -628,7 +622,7 @@ vimperator.Commands = function () //{{{
[["-keyword", "-k"], OPTION_STRING, function (arg) { return /\w/.test(arg); }]] [["-keyword", "-k"], OPTION_STRING, function (arg) { return /\w/.test(arg); }]]
} }
)); ));
addDefaultCommand(new vimperator.Command(["bmarks"], commandManager.add(new vimperator.Command(["bmarks"],
function (args, special) function (args, special)
{ {
var res = parseArgs(args, this.args); var res = parseArgs(args, this.args);
@@ -649,7 +643,7 @@ vimperator.Commands = function () //{{{
args: [[["-tags", "-T"], OPTION_LIST]] args: [[["-tags", "-T"], OPTION_LIST]]
} }
)); ));
addDefaultCommand(new vimperator.Command(["b[uffer]"], commandManager.add(new vimperator.Command(["b[uffer]"],
function (args, special) { vimperator.buffer.switchTo(args, special); }, function (args, special) { vimperator.buffer.switchTo(args, special); },
{ {
usage: ["b[uffer][!] {url|index}"], usage: ["b[uffer][!] {url|index}"],
@@ -662,7 +656,7 @@ vimperator.Commands = function () //{{{
completer: function (filter) { return vimperator.completion.get_buffer_completions(filter); } completer: function (filter) { return vimperator.completion.get_buffer_completions(filter); }
} }
)); ));
addDefaultCommand(new vimperator.Command(["buffers", "files", "ls", "tabs"], commandManager.add(new vimperator.Command(["buffers", "files", "ls", "tabs"],
function (args, special) function (args, special)
{ {
if (args) if (args)
@@ -680,7 +674,7 @@ vimperator.Commands = function () //{{{
"Call the special version of this command again to close the window." "Call the special version of this command again to close the window."
} }
)); ));
addDefaultCommand(new vimperator.Command(["delbm[arks]"], commandManager.add(new vimperator.Command(["delbm[arks]"],
function (args, special) function (args, special)
{ {
var url = args; var url = args;
@@ -701,7 +695,7 @@ vimperator.Commands = function () //{{{
completer: function (filter) { return vimperator.bookmarks.get(filter); } completer: function (filter) { return vimperator.bookmarks.get(filter); }
} }
)); ));
addDefaultCommand(new vimperator.Command(["com[mand]"], commandManager.add(new vimperator.Command(["com[mand]"],
function (args) function (args)
{ {
var res = parseArgs(args, this.args); var res = parseArgs(args, this.args);
@@ -719,7 +713,7 @@ vimperator.Commands = function () //{{{
[["-bar"], OPTION_NOARG]] [["-bar"], OPTION_NOARG]]
} }
)); ));
addDefaultCommand(new vimperator.Command(["delm[arks]"], commandManager.add(new vimperator.Command(["delm[arks]"],
function (args, special) function (args, special)
{ {
if (!special && !args) if (!special && !args)
@@ -772,7 +766,7 @@ vimperator.Commands = function () //{{{
} }
)); ));
addDefaultCommand(new vimperator.Command(["delqm[arks]"], commandManager.add(new vimperator.Command(["delqm[arks]"],
function (args, special) function (args, special)
{ {
// TODO: finish arg parsing - we really need a proper way to do this. :) // TODO: finish arg parsing - we really need a proper way to do this. :)
@@ -801,7 +795,7 @@ vimperator.Commands = function () //{{{
"<code class=\"command\">:delqmarks!</code> deletes all QuickMarks" "<code class=\"command\">:delqmarks!</code> deletes all QuickMarks"
} }
)); ));
addDefaultCommand(new vimperator.Command(["downl[oads]", "dl"], commandManager.add(new vimperator.Command(["downl[oads]", "dl"],
function () { vimperator.open("chrome://mozapps/content/downloads/downloads.xul", vimperator.NEW_TAB); }, function () { vimperator.open("chrome://mozapps/content/downloads/downloads.xul", vimperator.NEW_TAB); },
{ {
short_help: "Show progress of current downloads", short_help: "Show progress of current downloads",
@@ -838,7 +832,7 @@ vimperator.Commands = function () //{{{
return arg; return arg;
} }
addDefaultCommand(new vimperator.Command(["ec[ho]"], commandManager.add(new vimperator.Command(["ec[ho]"],
function (args) function (args)
{ {
var res = argToString(args, true); var res = argToString(args, true);
@@ -854,7 +848,7 @@ vimperator.Commands = function () //{{{
completer: function (filter) { return vimperator.completion.javascript(filter); } completer: function (filter) { return vimperator.completion.javascript(filter); }
} }
)); ));
addDefaultCommand(new vimperator.Command(["echoe[rr]"], commandManager.add(new vimperator.Command(["echoe[rr]"],
function (args) function (args)
{ {
var res = argToString(args, false); var res = argToString(args, false);
@@ -868,7 +862,7 @@ vimperator.Commands = function () //{{{
completer: function (filter) { return vimperator.completion.javascript(filter); } completer: function (filter) { return vimperator.completion.javascript(filter); }
} }
)); ));
addDefaultCommand(new vimperator.Command(["exe[cute]"], commandManager.add(new vimperator.Command(["exe[cute]"],
function (args) function (args)
{ {
// TODO: :exec has some difficult semantics -> later // TODO: :exec has some difficult semantics -> later
@@ -886,13 +880,13 @@ vimperator.Commands = function () //{{{
help: "Example: <code class=\"command\">:execute echo test</code> shows a message with the text &#34;test&#34;.<br/>" help: "Example: <code class=\"command\">:execute echo test</code> shows a message with the text &#34;test&#34;.<br/>"
} }
)); ));
addDefaultCommand(new vimperator.Command(["exu[sage]"], commandManager.add(new vimperator.Command(["exu[sage]"],
function (args, special, count, modifiers) { vimperator.help("commands", special, null, modifiers); }, function (args, special, count, modifiers) { vimperator.help("commands", special, null, modifiers); },
{ {
short_help: "Show help for Ex commands" short_help: "Show help for Ex commands"
} }
)); ));
addDefaultCommand(new vimperator.Command(["fo[rward]", "fw"], commandManager.add(new vimperator.Command(["fo[rward]", "fw"],
function (args, special, count) function (args, special, count)
{ {
if (special) if (special)
@@ -935,14 +929,14 @@ vimperator.Commands = function () //{{{
} }
} }
)); ));
addDefaultCommand(new vimperator.Command(["ha[rdcopy]"], commandManager.add(new vimperator.Command(["ha[rdcopy]"],
function () { getBrowser().contentWindow.print(); }, function () { getBrowser().contentWindow.print(); },
{ {
short_help: "Print current document", short_help: "Print current document",
help: "Open a GUI dialog where you can select the printer, number of copies, orientation, etc." help: "Open a GUI dialog where you can select the printer, number of copies, orientation, etc."
} }
)); ));
addDefaultCommand(new vimperator.Command(["h[elp]"], commandManager.add(new vimperator.Command(["h[elp]"],
function (args, special, count, modifiers) { vimperator.help(args, special, null, modifiers); }, function (args, special, count, modifiers) { vimperator.help(args, special, null, modifiers); },
{ {
usage: ["h[elp] {subject}"], usage: ["h[elp] {subject}"],
@@ -958,7 +952,7 @@ vimperator.Commands = function () //{{{
completer: function (filter) { return vimperator.completion.get_help_completions(filter); } completer: function (filter) { return vimperator.completion.get_help_completions(filter); }
} }
)); ));
addDefaultCommand(new vimperator.Command(["hist[ory]", "hs"], commandManager.add(new vimperator.Command(["hist[ory]", "hs"],
function (args, special) { vimperator.history.list(args, special); }, function (args, special) { vimperator.history.list(args, special); },
{ {
usage: ["hist[ory] [filter]", "history!"], usage: ["hist[ory] [filter]", "history!"],
@@ -968,7 +962,7 @@ vimperator.Commands = function () //{{{
completer: function (filter) { return vimperator.history.get(filter); } completer: function (filter) { return vimperator.history.get(filter); }
} }
)); ));
addDefaultCommand(new vimperator.Command(["javas[cript]", "js"], commandManager.add(new vimperator.Command(["javas[cript]", "js"],
function (args, special) function (args, special)
{ {
if (special) // open javascript console if (special) // open javascript console
@@ -1018,7 +1012,7 @@ vimperator.Commands = function () //{{{
completer: function (filter) { return vimperator.completion.javascript(filter); } completer: function (filter) { return vimperator.completion.javascript(filter); }
} }
)); ));
addDefaultCommand(new vimperator.Command(["let"], commandManager.add(new vimperator.Command(["let"],
function (args) function (args)
{ {
if (!args) if (!args)
@@ -1116,7 +1110,7 @@ vimperator.Commands = function () //{{{
} }
)); ));
// code for abbreviations // code for abbreviations
addDefaultCommand(new vimperator.Command(["ab[breviate]"], commandManager.add(new vimperator.Command(["ab[breviate]"],
function (args) function (args)
{ {
if (!args) if (!args)
@@ -1140,7 +1134,7 @@ vimperator.Commands = function () //{{{
"List all abbreviations, if no arguments to are given.<br/>" "List all abbreviations, if no arguments to are given.<br/>"
} }
)); ));
addDefaultCommand(new vimperator.Command(["ca[bbrev]"], commandManager.add(new vimperator.Command(["ca[bbrev]"],
function (args) function (args)
{ {
if (!args) if (!args)
@@ -1162,7 +1156,7 @@ vimperator.Commands = function () //{{{
help: "Same as <code class='command'>:ab[reviate]</code>, but for Command-line mode only." help: "Same as <code class='command'>:ab[reviate]</code>, but for Command-line mode only."
} }
)); ));
addDefaultCommand(new vimperator.Command(["ia[bbrev]"], commandManager.add(new vimperator.Command(["ia[bbrev]"],
function (args) function (args)
{ {
if (!args) if (!args)
@@ -1184,14 +1178,14 @@ vimperator.Commands = function () //{{{
help: "Same as <code class='command'>:ab[breviate]</code>, but for Insert mode only." help: "Same as <code class='command'>:ab[breviate]</code>, but for Insert mode only."
} }
)); ));
addDefaultCommand(new vimperator.Command(["una[bbreviate]"], commandManager.add(new vimperator.Command(["una[bbreviate]"],
function (args) { vimperator.editor.removeAbbreviation("!", args); }, function (args) { vimperator.editor.removeAbbreviation("!", args); },
{ {
usage: ["una[bbreviate] {lhs}"], usage: ["una[bbreviate] {lhs}"],
short_help: "Remove an abbreviation" short_help: "Remove an abbreviation"
} }
)); ));
addDefaultCommand(new vimperator.Command(["cuna[bbrev]"], commandManager.add(new vimperator.Command(["cuna[bbrev]"],
function (args) { vimperator.editor.removeAbbreviation("c", args); }, function (args) { vimperator.editor.removeAbbreviation("c", args); },
{ {
usage: ["cuna[bbrev] {lhs}"], usage: ["cuna[bbrev] {lhs}"],
@@ -1199,7 +1193,7 @@ vimperator.Commands = function () //{{{
help: "Same as <code class='command'>:una[bbreviate]</code>, but for Command-line mode only." help: "Same as <code class='command'>:una[bbreviate]</code>, but for Command-line mode only."
} }
)); ));
addDefaultCommand(new vimperator.Command(["iuna[bbrev]"], commandManager.add(new vimperator.Command(["iuna[bbrev]"],
function (args) { vimperator.editor.removeAbbreviation("i", args); }, function (args) { vimperator.editor.removeAbbreviation("i", args); },
{ {
usage: ["iuna[bbrev] {lhs}"], usage: ["iuna[bbrev] {lhs}"],
@@ -1207,15 +1201,15 @@ vimperator.Commands = function () //{{{
help: "Same as <code class='command'>:una[bbreviate]</code>, but for Insert mode only." help: "Same as <code class='command'>:una[bbreviate]</code>, but for Insert mode only."
} }
)); ));
addDefaultCommand(new vimperator.Command(["abc[lear]"], commandManager.add(new vimperator.Command(["abc[lear]"],
function (args) { vimperator.editor.removeAllAbbreviations("!"); }, function (args) { vimperator.editor.removeAllAbbreviations("!"); },
{ short_help: "Remove all abbreviations" } { short_help: "Remove all abbreviations" }
)); ));
addDefaultCommand(new vimperator.Command(["cabc[lear]"], commandManager.add(new vimperator.Command(["cabc[lear]"],
function (args) { vimperator.editor.removeAllAbbreviations("c"); }, function (args) { vimperator.editor.removeAllAbbreviations("c"); },
{ short_help: "Remove all abbreviations for Command-line mode" } { short_help: "Remove all abbreviations for Command-line mode" }
)); ));
addDefaultCommand(new vimperator.Command(["iabc[lear]"], commandManager.add(new vimperator.Command(["iabc[lear]"],
function (args) { vimperator.editor.removeAllAbbreviations("i"); }, function (args) { vimperator.editor.removeAllAbbreviations("i"); },
{ short_help: "Remove all abbreviations for Insert mode" } { short_help: "Remove all abbreviations for Insert mode" }
)); ));
@@ -1255,7 +1249,7 @@ vimperator.Commands = function () //{{{
vimperator.mappings.list(vimperator.modes.NORMAL, lhs); vimperator.mappings.list(vimperator.modes.NORMAL, lhs);
} }
} }
addDefaultCommand(new vimperator.Command(["map"], commandManager.add(new vimperator.Command(["map"],
function (args) { map(args, false); }, function (args) { map(args, false); },
{ {
usage: ["map {lhs} {rhs}", "map {lhs}", "map"], usage: ["map {lhs} {rhs}", "map {lhs}", "map"],
@@ -1264,7 +1258,7 @@ vimperator.Commands = function () //{{{
"Mappings are NOT saved during sessions, make sure you put them in your vimperatorrc file!" "Mappings are NOT saved during sessions, make sure you put them in your vimperatorrc file!"
} }
)); ));
addDefaultCommand(new vimperator.Command(["mapc[lear]"], commandManager.add(new vimperator.Command(["mapc[lear]"],
function (args) function (args)
{ {
if (args) if (args)
@@ -1281,7 +1275,7 @@ vimperator.Commands = function () //{{{
"<code class=\"command\">:map</code> or <code class=\"command\">:noremap</code> are cleared." "<code class=\"command\">:map</code> or <code class=\"command\">:noremap</code> are cleared."
} }
)); ));
addDefaultCommand(new vimperator.Command(["ma[rk]"], commandManager.add(new vimperator.Command(["ma[rk]"],
function (args) function (args)
{ {
if (!args) if (!args)
@@ -1307,7 +1301,7 @@ vimperator.Commands = function () //{{{
short_help: "Mark current location within the web page" short_help: "Mark current location within the web page"
} }
)); ));
addDefaultCommand(new vimperator.Command(["marks"], commandManager.add(new vimperator.Command(["marks"],
function (args) function (args)
{ {
// ignore invalid mark characters unless there are no valid mark chars // ignore invalid mark characters unless there are no valid mark chars
@@ -1326,7 +1320,7 @@ vimperator.Commands = function () //{{{
help: "If <code class=\"argument\">[arg]</code> is specified then limit the list to those marks mentioned." help: "If <code class=\"argument\">[arg]</code> is specified then limit the list to those marks mentioned."
} }
)); ));
addDefaultCommand(new vimperator.Command(["mkv[imperatorrc]"], commandManager.add(new vimperator.Command(["mkv[imperatorrc]"],
function (args, special) function (args, special)
{ {
// TODO: "E172: Only one file name allowed" // TODO: "E172: Only one file name allowed"
@@ -1385,7 +1379,7 @@ vimperator.Commands = function () //{{{
"WARNING: this differs from Vim's behavior which defaults to writing the file in the current directory." "WARNING: this differs from Vim's behavior which defaults to writing the file in the current directory."
} }
)); ));
addDefaultCommand(new vimperator.Command(["noh[lsearch]"], commandManager.add(new vimperator.Command(["noh[lsearch]"],
function (args) function (args)
{ {
vimperator.search.clear(); vimperator.search.clear();
@@ -1396,7 +1390,7 @@ vimperator.Commands = function () //{{{
"<code class=\"option\">'hlsearch'</code> option is set." "<code class=\"option\">'hlsearch'</code> option is set."
} }
)); ));
addDefaultCommand(new vimperator.Command(["norm[al]"], commandManager.add(new vimperator.Command(["norm[al]"],
function (args, special) function (args, special)
{ {
if (!args) if (!args)
@@ -1415,7 +1409,7 @@ vimperator.Commands = function () //{{{
} }
)); ));
// TODO: remove duplication in :map // TODO: remove duplication in :map
addDefaultCommand(new vimperator.Command(["no[remap]"], commandManager.add(new vimperator.Command(["no[remap]"],
function (args) { map(args, true); }, function (args) { map(args, true); },
{ {
usage: ["no[remap] {lhs} {rhs}", "no[remap] {lhs}", "no[remap]"], usage: ["no[remap] {lhs} {rhs}", "no[remap] {lhs}", "no[remap]"],
@@ -1423,7 +1417,7 @@ vimperator.Commands = function () //{{{
help: "No remapping of the <code class=\"argument\">{rhs}</code> is performed." help: "No remapping of the <code class=\"argument\">{rhs}</code> is performed."
} }
)); ));
addDefaultCommand(new vimperator.Command(["o[pen]", "e[dit]"], commandManager.add(new vimperator.Command(["o[pen]", "e[dit]"],
function (args, special) function (args, special)
{ {
if (args) if (args)
@@ -1466,20 +1460,20 @@ vimperator.Commands = function () //{{{
completer: function (filter) { return vimperator.completion.get_url_completions(filter); } completer: function (filter) { return vimperator.completion.get_url_completions(filter); }
} }
)); ));
addDefaultCommand(new vimperator.Command(["pa[geinfo]"], commandManager.add(new vimperator.Command(["pa[geinfo]"],
function () { vimperator.buffer.pageInfo(true); }, function () { vimperator.buffer.pageInfo(true); },
{ {
short_help: "Show various page information", short_help: "Show various page information",
help: "See :help 'pageinfo' for available options", help: "See :help 'pageinfo' for available options",
} }
)); ));
addDefaultCommand(new vimperator.Command(["pc[lose]"], commandManager.add(new vimperator.Command(["pc[lose]"],
function () { vimperator.previewwindow.hide(); }, function () { vimperator.previewwindow.hide(); },
{ {
short_help: "Close preview window on bottom of screen" short_help: "Close preview window on bottom of screen"
} }
)); ));
addDefaultCommand(new vimperator.Command(["pref[erences]", "prefs"], commandManager.add(new vimperator.Command(["pref[erences]", "prefs"],
function (args, special, count, modifiers) function (args, special, count, modifiers)
{ {
if (!args) if (!args)
@@ -1511,7 +1505,7 @@ vimperator.Commands = function () //{{{
"<code class=\"command\">:prefs!</code> opens about:config in the current tab where you can change advanced Firefox preferences." "<code class=\"command\">:prefs!</code> opens about:config in the current tab where you can change advanced Firefox preferences."
} }
)); ));
addDefaultCommand(new vimperator.Command(["qma[rk]"], commandManager.add(new vimperator.Command(["qma[rk]"],
function (args) function (args)
{ {
if (!args) if (!args)
@@ -1535,7 +1529,7 @@ vimperator.Commands = function () //{{{
"<code class=\"command\">:qmark f http://forum1.com, http://forum2.com, imdb some artist</code>" "<code class=\"command\">:qmark f http://forum1.com, http://forum2.com, imdb some artist</code>"
} }
)); ));
addDefaultCommand(new vimperator.Command(["qmarks"], commandManager.add(new vimperator.Command(["qmarks"],
function (args) function (args)
{ {
// ignore invalid mark characters unless there are no valid mark chars // ignore invalid mark characters unless there are no valid mark chars
@@ -1554,7 +1548,7 @@ vimperator.Commands = function () //{{{
help: "If <code class=\"argument\">[arg]</code> is specified then limit the list to those QuickMarks mentioned." help: "If <code class=\"argument\">[arg]</code> is specified then limit the list to those QuickMarks mentioned."
} }
)); ));
addDefaultCommand(new vimperator.Command(["q[uit]"], commandManager.add(new vimperator.Command(["q[uit]"],
function () { vimperator.tabs.remove(getBrowser().mCurrentTab, 1, false, 1); }, function () { vimperator.tabs.remove(getBrowser().mCurrentTab, 1, false, 1); },
{ {
short_help: "Quit current tab", short_help: "Quit current tab",
@@ -1562,14 +1556,14 @@ vimperator.Commands = function () //{{{
"last window, close Vimperator. When quitting Vimperator, the session is not stored." "last window, close Vimperator. When quitting Vimperator, the session is not stored."
} }
)); ));
addDefaultCommand(new vimperator.Command(["quita[ll]", "qa[ll]"], commandManager.add(new vimperator.Command(["quita[ll]", "qa[ll]"],
function () { vimperator.quit(false); }, function () { vimperator.quit(false); },
{ {
short_help: "Quit Vimperator", short_help: "Quit Vimperator",
help: "Quit Vimperator, no matter how many tabs/windows are open. The session is not stored." help: "Quit Vimperator, no matter how many tabs/windows are open. The session is not stored."
} }
)); ));
addDefaultCommand(new vimperator.Command(["redr[aw]"], commandManager.add(new vimperator.Command(["redr[aw]"],
function () function ()
{ {
var wu = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor). var wu = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor).
@@ -1581,7 +1575,7 @@ vimperator.Commands = function () //{{{
help: "Useful to update the screen halfway executing a script or function." help: "Useful to update the screen halfway executing a script or function."
} }
)); ));
addDefaultCommand(new vimperator.Command(["re[load]"], commandManager.add(new vimperator.Command(["re[load]"],
function (args, special) { vimperator.tabs.reload(getBrowser().mCurrentTab, special); }, function (args, special) { vimperator.tabs.reload(getBrowser().mCurrentTab, special); },
{ {
usage: ["re[load][!]"], usage: ["re[load][!]"],
@@ -1589,7 +1583,7 @@ vimperator.Commands = function () //{{{
help: "Forces reloading of the current page. If <code class=\"command\">!</code> is given, skip the cache." help: "Forces reloading of the current page. If <code class=\"command\">!</code> is given, skip the cache."
} }
)); ));
addDefaultCommand(new vimperator.Command(["reloada[ll]"], commandManager.add(new vimperator.Command(["reloada[ll]"],
function (args, special) { vimperator.tabs.reloadAll(special); }, function (args, special) { vimperator.tabs.reloadAll(special); },
{ {
usage: ["reloada[ll][!]"], usage: ["reloada[ll][!]"],
@@ -1597,14 +1591,14 @@ vimperator.Commands = function () //{{{
help: "Forces reloading of all pages. If <code class=\"command\">!</code> is given, skip the cache." help: "Forces reloading of all pages. If <code class=\"command\">!</code> is given, skip the cache."
} }
)); ));
addDefaultCommand(new vimperator.Command(["res[tart]"], commandManager.add(new vimperator.Command(["res[tart]"],
function () { vimperator.restart(); }, function () { vimperator.restart(); },
{ {
short_help: "Force the browser to restart", short_help: "Force the browser to restart",
help: "Useful when installing extensions." help: "Useful when installing extensions."
} }
)); ));
addDefaultCommand(new vimperator.Command(["sav[eas]", "w[rite]"], commandManager.add(new vimperator.Command(["sav[eas]", "w[rite]"],
function () { saveDocument(window.content.document); }, function () { saveDocument(window.content.document); },
{ {
short_help: "Save current web page to disk", short_help: "Save current web page to disk",
@@ -1612,7 +1606,7 @@ vimperator.Commands = function () //{{{
"There, you can save the current web page to disk with various options." "There, you can save the current web page to disk with various options."
} }
)); ));
addDefaultCommand(new vimperator.Command(["se[t]"], commandManager.add(new vimperator.Command(["se[t]"],
// TODO: support setting multiple options at once // TODO: support setting multiple options at once
function (args, special, count, modifiers) function (args, special, count, modifiers)
{ {
@@ -1827,7 +1821,7 @@ vimperator.Commands = function () //{{{
} }
)); ));
// TODO: sclose instead? // TODO: sclose instead?
addDefaultCommand(new vimperator.Command(["sbcl[ose]"], commandManager.add(new vimperator.Command(["sbcl[ose]"],
function (args) function (args)
{ {
if (args) if (args)
@@ -1845,7 +1839,7 @@ vimperator.Commands = function () //{{{
)); ));
// TODO: sopen instead? Separate :sidebar from :sbopen and make them behave // TODO: sopen instead? Separate :sidebar from :sbopen and make them behave
// more like :cw, :cope etc // more like :cw, :cope etc
addDefaultCommand(new vimperator.Command(["sideb[ar]", "sb[ar]", "sbope[n]"], commandManager.add(new vimperator.Command(["sideb[ar]", "sb[ar]", "sbope[n]"],
function (args) function (args)
{ {
if (!args) if (!args)
@@ -1880,7 +1874,7 @@ vimperator.Commands = function () //{{{
completer: function (filter) { return vimperator.completion.get_sidebar_completions(filter); } completer: function (filter) { return vimperator.completion.get_sidebar_completions(filter); }
} }
)); ));
addDefaultCommand(new vimperator.Command(["so[urce]"], commandManager.add(new vimperator.Command(["so[urce]"],
function (args, special) function (args, special)
{ {
// FIXME: implement proper filename quoting // FIXME: implement proper filename quoting
@@ -1907,14 +1901,14 @@ vimperator.Commands = function () //{{{
completer: function (filter) { return vimperator.completion.get_file_completions(filter); } completer: function (filter) { return vimperator.completion.get_file_completions(filter); }
} }
)); ));
addDefaultCommand(new vimperator.Command(["st[op]"], commandManager.add(new vimperator.Command(["st[op]"],
BrowserStop, BrowserStop,
{ {
short_help: "Stop loading", short_help: "Stop loading",
help: "Stop loading current web page." help: "Stop loading current web page."
} }
)); ));
addDefaultCommand(new vimperator.Command(["tab"], commandManager.add(new vimperator.Command(["tab"],
function (args) { vimperator.execute(args, { inTab: true }); }, function (args) { vimperator.execute(args, { inTab: true }); },
{ {
usage: ["tab {cmd}"], usage: ["tab {cmd}"],
@@ -1925,13 +1919,13 @@ vimperator.Commands = function () //{{{
completer: function (filter) { return vimperator.completion.get_command_completions(filter); } completer: function (filter) { return vimperator.completion.get_command_completions(filter); }
} }
)); ));
addDefaultCommand(new vimperator.Command(["tabl[ast]"], commandManager.add(new vimperator.Command(["tabl[ast]"],
function () { vimperator.tabs.select("$", false); }, function () { vimperator.tabs.select("$", false); },
{ {
short_help: "Switch to the last tab" short_help: "Switch to the last tab"
} }
)); ));
addDefaultCommand(new vimperator.Command(["tabm[ove]"], commandManager.add(new vimperator.Command(["tabm[ove]"],
function (args, special) { vimperator.tabs.move(getBrowser().mCurrentTab, args, special); }, function (args, special) { vimperator.tabs.move(getBrowser().mCurrentTab, args, special); },
{ {
usage: ["tabm[ove] [N]", "tabm[ove][!] +N | -N"], usage: ["tabm[ove] [N]", "tabm[ove][!] +N | -N"],
@@ -1940,7 +1934,7 @@ vimperator.Commands = function () //{{{
"N can also be prefixed with '+' or '-' to indicate a relative movement. If <code class=\"command\">!</code> is specified the movement wraps around the start or end of the tab list." "N can also be prefixed with '+' or '-' to indicate a relative movement. If <code class=\"command\">!</code> is specified the movement wraps around the start or end of the tab list."
} }
)); ));
addDefaultCommand(new vimperator.Command(["tabn[ext]", "tn[ext]"], commandManager.add(new vimperator.Command(["tabn[ext]", "tn[ext]"],
// TODO: count support // TODO: count support
function (args) function (args)
{ {
@@ -1967,13 +1961,13 @@ vimperator.Commands = function () //{{{
help: "Cycles to the first tab when the last is selected and <code class=\"argument\">{count}</code> is not specified." help: "Cycles to the first tab when the last is selected and <code class=\"argument\">{count}</code> is not specified."
} }
)); ));
addDefaultCommand(new vimperator.Command(["tabo[nly]"], commandManager.add(new vimperator.Command(["tabo[nly]"],
function () { vimperator.tabs.keepOnly(getBrowser().mCurrentTab); }, function () { vimperator.tabs.keepOnly(getBrowser().mCurrentTab); },
{ {
short_help: "Close all other tabs" short_help: "Close all other tabs"
} }
)); ));
addDefaultCommand(new vimperator.Command(["tabopen", "t[open]", "tabnew", "tabe[dit]"], commandManager.add(new vimperator.Command(["tabopen", "t[open]", "tabnew", "tabe[dit]"],
function (args, special) function (args, special)
{ {
var where = special ? vimperator.NEW_TAB : vimperator.NEW_BACKGROUND_TAB; var where = special ? vimperator.NEW_TAB : vimperator.NEW_BACKGROUND_TAB;
@@ -1993,7 +1987,7 @@ vimperator.Commands = function () //{{{
completer: function (filter) { return vimperator.completion.get_url_completions(filter); } completer: function (filter) { return vimperator.completion.get_url_completions(filter); }
} }
)); ));
addDefaultCommand(new vimperator.Command(["tabp[revious]", "tp[revious]", "tabN[ext]", "tN[ext]"], commandManager.add(new vimperator.Command(["tabp[revious]", "tp[revious]", "tabN[ext]", "tN[ext]"],
// TODO: count support // TODO: count support
function (args) function (args)
{ {
@@ -2010,14 +2004,14 @@ vimperator.Commands = function () //{{{
help: "Wraps around from the first tab to the last tab." help: "Wraps around from the first tab to the last tab."
} }
)); ));
addDefaultCommand(new vimperator.Command(["tabr[ewind]", "tabfir[st]"], commandManager.add(new vimperator.Command(["tabr[ewind]", "tabfir[st]"],
function () { vimperator.tabs.select(0, false); }, function () { vimperator.tabs.select(0, false); },
{ {
usage: ["tabr[ewind]", "tabfir[st]"], usage: ["tabr[ewind]", "tabfir[st]"],
short_help: "Switch to the first tab" short_help: "Switch to the first tab"
} }
)); ));
addDefaultCommand(new vimperator.Command(["time"], commandManager.add(new vimperator.Command(["time"],
function (args, special, count) function (args, special, count)
{ {
try try
@@ -2108,7 +2102,7 @@ vimperator.Commands = function () //{{{
"Use the special version with [!] if you just want to run any command multiple times without showing profiling statistics." "Use the special version with [!] if you just want to run any command multiple times without showing profiling statistics."
} }
)); ));
addDefaultCommand(new vimperator.Command(["u[ndo]"], commandManager.add(new vimperator.Command(["u[ndo]"],
function (args, special, count) function (args, special, count)
{ {
if (count < 1) if (count < 1)
@@ -2152,7 +2146,7 @@ vimperator.Commands = function () //{{{
} }
} }
)); ));
addDefaultCommand(new vimperator.Command(["undoa[ll]"], commandManager.add(new vimperator.Command(["undoa[ll]"],
function (args, special, count) function (args, special, count)
{ {
if (count > -1) if (count > -1)
@@ -2176,7 +2170,7 @@ vimperator.Commands = function () //{{{
help: "Firefox stores up to 10 closed tabs, even after a browser restart." help: "Firefox stores up to 10 closed tabs, even after a browser restart."
} }
)); ));
addDefaultCommand(new vimperator.Command(["unl[et]"], commandManager.add(new vimperator.Command(["unl[et]"],
function (args, special) function (args, special)
{ {
if (!args) if (!args)
@@ -2208,7 +2202,7 @@ vimperator.Commands = function () //{{{
"Several variable names can be given." "Several variable names can be given."
} }
)); ));
addDefaultCommand(new vimperator.Command(["unm[ap]"], commandManager.add(new vimperator.Command(["unm[ap]"],
function (args) function (args)
{ {
if (!args) if (!args)
@@ -2230,7 +2224,7 @@ vimperator.Commands = function () //{{{
help: "" help: ""
} }
)); ));
addDefaultCommand(new vimperator.Command(["ve[rsion]"], commandManager.add(new vimperator.Command(["ve[rsion]"],
function (args, special) function (args, special)
{ {
if (special) if (special)
@@ -2245,13 +2239,13 @@ vimperator.Commands = function () //{{{
help: "You can show the Firefox version page with <code class=\"command\">:version!</code>." help: "You can show the Firefox version page with <code class=\"command\">:version!</code>."
} }
)); ));
addDefaultCommand(new vimperator.Command(["viu[sage]"], commandManager.add(new vimperator.Command(["viu[sage]"],
function (args, special, count, modifiers) { vimperator.help("mappings", special, null, modifiers); }, function (args, special, count, modifiers) { vimperator.help("mappings", special, null, modifiers); },
{ {
short_help: "Show help for normal mode commands" short_help: "Show help for normal mode commands"
} }
)); ));
addDefaultCommand(new vimperator.Command(["winc[lose]", "wc[lose]"], commandManager.add(new vimperator.Command(["winc[lose]", "wc[lose]"],
function (args) function (args)
{ {
window.close(); window.close();
@@ -2261,7 +2255,7 @@ vimperator.Commands = function () //{{{
short_help: "Close window" short_help: "Close window"
} }
)); ));
addDefaultCommand(new vimperator.Command(["wino[pen]", "wo[pen]", "wine[dit]"], commandManager.add(new vimperator.Command(["wino[pen]", "wo[pen]", "wine[dit]"],
function (args) function (args)
{ {
if (args) if (args)
@@ -2275,7 +2269,7 @@ vimperator.Commands = function () //{{{
help: "Like <code class=\"command\">:open</code> but open URLs in a new window.<br/>" help: "Like <code class=\"command\">:open</code> but open URLs in a new window.<br/>"
} }
)); ));
addDefaultCommand(new vimperator.Command(["wqa[ll]", "wq", "xa[ll]"], commandManager.add(new vimperator.Command(["wqa[ll]", "wq", "xa[ll]"],
function () { vimperator.quit(true); }, function () { vimperator.quit(true); },
{ {
usage: ["wqa[ll]", "xa[ll]"], usage: ["wqa[ll]", "xa[ll]"],
@@ -2284,7 +2278,7 @@ vimperator.Commands = function () //{{{
"<code class=\"command\">:wq</code> is different as in Vim, as it closes the window instead of just one tab by popular demand. Complain on the mailing list, if you want to change that." "<code class=\"command\">:wq</code> is different as in Vim, as it closes the window instead of just one tab by popular demand. Complain on the mailing list, if you want to change that."
} }
)); ));
addDefaultCommand(new vimperator.Command(["zo[om]"], commandManager.add(new vimperator.Command(["zo[om]"],
function (args, special) function (args, special)
{ {
var level; var level;
@@ -2329,7 +2323,7 @@ vimperator.Commands = function () //{{{
"Normally this command operates on the text zoom, if used with <code class=\"argument\">[!]</code> it operates on full zoom." "Normally this command operates on the text zoom, if used with <code class=\"argument\">[!]</code> it operates on full zoom."
} }
)); ));
addDefaultCommand(new vimperator.Command(["!", "run"], commandManager.add(new vimperator.Command(["!", "run"],
function (args, special) function (args, special)
{ {
// :!! needs to be treated specially as the command parser sets the special flag but removes the ! from args // :!! needs to be treated specially as the command parser sets the special flag but removes the ! from args
@@ -2354,6 +2348,8 @@ vimperator.Commands = function () //{{{
} }
)); ));
//}}} //}}}
return commandManager;
}; //}}} }; //}}}
// vim: set fdm=marker sw=4 ts=4 et: // vim: set fdm=marker sw=4 ts=4 et:

85
content/events.js
View File

@@ -244,9 +244,12 @@ vimperator.Events = function () //{{{
/////////////////////////////////////////////////////////////////////////////}}} /////////////////////////////////////////////////////////////////////////////}}}
////////////////////// PUBLIC SECTION ////////////////////////////////////////// ////////////////////// PUBLIC SECTION //////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////{{{ /////////////////////////////////////////////////////////////////////////////{{{
this.wantsModeReset = true; // used in onFocusChange since Firefox is so buggy here
this.destroy = function () var eventManager = {
wantsModeReset: true, // used in onFocusChange since Firefox is so buggy here
destroy: function ()
{ {
// removeEventListeners() to avoid mem leaks // removeEventListeners() to avoid mem leaks
window.dump("TODO: remove all eventlisteners\n"); window.dump("TODO: remove all eventlisteners\n");
@@ -260,7 +263,7 @@ vimperator.Events = function () //{{{
window.removeEventListener("keypress", this.onKeyPress, true); window.removeEventListener("keypress", this.onKeyPress, true);
window.removeEventListener("keydown", this.onKeyDown, true); window.removeEventListener("keydown", this.onKeyDown, true);
}; },
// This method pushes keys into the event queue from vimperator // This method pushes keys into the event queue from vimperator
// it is similar to vim's feedkeys() method, but cannot cope with // it is similar to vim's feedkeys() method, but cannot cope with
@@ -268,7 +271,7 @@ vimperator.Events = function () //{{{
// //
// @param keys: a string like "2<C-f>" to pass // @param keys: a string like "2<C-f>" to pass
// if you want < to be taken literally, prepend it with a \\ // if you want < to be taken literally, prepend it with a \\
this.feedkeys = function (keys, noremap) feedkeys: function (keys, noremap)
{ {
var doc = window.document; var doc = window.document;
var view = window.document.defaultView; var view = window.document.defaultView;
@@ -326,13 +329,13 @@ vimperator.Events = function () //{{{
evt.noremap = noremap; evt.noremap = noremap;
elem.dispatchEvent(evt); elem.dispatchEvent(evt);
} }
}; },
// this function converts the given event to // this function converts the given event to
// a keycode which can be used in mappings // a keycode which can be used in mappings
// e.g. pressing ctrl+n would result in the string "<C-n>" // e.g. pressing ctrl+n would result in the string "<C-n>"
// null if unknown key // null if unknown key
this.toString = function (event) //{{{ toString: function (event) //{{{
{ {
if (!event) if (!event)
return; return;
@@ -406,23 +409,24 @@ vimperator.Events = function () //{{{
// a key like F1 is always enclosed in < and > // a key like F1 is always enclosed in < and >
return "<" + modifier + key + ">"; return "<" + modifier + key + ">";
}; //}}} }, //}}}
this.isAcceptKey = function (key) isAcceptKey: function (key)
{ {
return (key == "<Return>" || key == "<C-j>" || key == "<C-m>"); return (key == "<Return>" || key == "<C-j>" || key == "<C-m>");
}; },
this.isCancelKey = function (key)
isCancelKey: function (key)
{ {
return (key == "<Esc>" || key == "<C-[>" || key == "<C-c>"); return (key == "<Esc>" || key == "<C-[>" || key == "<C-c>");
}; },
// argument "event" is delibarately not used, as i don't seem to have // argument "event" is delibarately not used, as i don't seem to have
// access to the real focus target // access to the real focus target
// //
// the ugly wantsModeReset is needed, because firefox generates a massive // the ugly wantsModeReset is needed, because firefox generates a massive
// amount of focus changes for things like <C-v><C-k> (focusing the search field) // amount of focus changes for things like <C-v><C-k> (focusing the search field)
this.onFocusChange = function (event) onFocusChange: function (event)
{ {
// command line has it's own focus change handler // command line has it's own focus change handler
if (vimperator.mode == vimperator.modes.COMMAND_LINE) if (vimperator.mode == vimperator.modes.COMMAND_LINE)
@@ -460,9 +464,9 @@ vimperator.Events = function () //{{{
vimperator.modes.reset(); vimperator.modes.reset();
}, 10); }, 10);
} }
}; },
this.onSelectionChange = function (event) onSelectionChange: function (event)
{ {
var could_copy = false; var could_copy = false;
var controller = document.commandDispatcher.getControllerForCommand("cmd_copy"); var controller = document.commandDispatcher.getControllerForCommand("cmd_copy");
@@ -485,10 +489,10 @@ vimperator.Events = function () //{{{
// if (!could_copy && vimperator.modes.extended & vimperator.modes.CARET) // if (!could_copy && vimperator.modes.extended & vimperator.modes.CARET)
// vimperator.mode = vimperator.modes.CARET; // vimperator.mode = vimperator.modes.CARET;
//} //}
}; },
// global escape handler, is called in ALL modes // global escape handler, is called in ALL modes
this.onEscape = function () onEscape: function ()
{ {
if (!vimperator.modes.passNextKey) if (!vimperator.modes.passNextKey)
{ {
@@ -545,11 +549,11 @@ vimperator.Events = function () //{{{
vimperator.focusContent(true); vimperator.focusContent(true);
} }
} }
}; },
// this keypress handler gets always called first, even if e.g. // this keypress handler gets always called first, even if e.g.
// the commandline has focus // the commandline has focus
this.onKeyPress = function (event) onKeyPress: function (event)
{ {
var key = vimperator.events.toString(event); var key = vimperator.events.toString(event);
if (!key) if (!key)
@@ -728,23 +732,19 @@ vimperator.Events = function () //{{{
var motion_map = (vimperator.input.pendingMotionMap && vimperator.input.pendingMotionMap.names[0]) || ""; var motion_map = (vimperator.input.pendingMotionMap && vimperator.input.pendingMotionMap.names[0]) || "";
vimperator.statusline.updateInputBuffer(motion_map + vimperator.input.buffer); vimperator.statusline.updateInputBuffer(motion_map + vimperator.input.buffer);
return false; return false;
}; },
window.addEventListener("keypress", this.onKeyPress, true);
// this is need for sites like msn.com which focus the input field on keydown // this is need for sites like msn.com which focus the input field on keydown
this.onKeyUpOrDown = function (event) onKeyUpOrDown: function (event)
{ {
if (vimperator.modes.passNextKey ^ vimperator.modes.passAllKeys || isFormElemFocused()) if (vimperator.modes.passNextKey ^ vimperator.modes.passAllKeys || isFormElemFocused())
return true; return true;
event.stopPropagation(); event.stopPropagation();
return false; return false;
}; },
window.addEventListener("keydown", this.onKeyUpOrDown, true);
window.addEventListener("keyup", this.onKeyUpOrDown, true);
this.progressListener = progressListener: {
{
QueryInterface: function (aIID) QueryInterface: function (aIID)
{ {
if (aIID.equals(Components.interfaces.nsIWebProgressListener) || if (aIID.equals(Components.interfaces.nsIWebProgressListener) ||
@@ -830,20 +830,9 @@ vimperator.Events = function () //{{{
setJSDefaultStatus: function (status) { ; }, setJSDefaultStatus: function (status) { ; },
setDefaultStatus: function (status) { ; }, setDefaultStatus: function (status) { ; },
onLinkIconAvailable: function () { ; } onLinkIconAvailable: function () { ; }
}; },
window.XULBrowserWindow = this.progressListener; prefObserver: {
window.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
.getInterface(Components.interfaces.nsIWebNavigation)
.QueryInterface(Components.interfaces.nsIDocShellTreeItem).treeOwner
.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
.getInterface(Components.interfaces.nsIXULWindow)
.XULBrowserWindow = window.XULBrowserWindow;
getBrowser().addProgressListener(this.progressListener, Components.interfaces.nsIWebProgress.NOTIFY_ALL);
this.prefObserver =
{
register: function () register: function ()
{ {
var prefService = Components.classes["@mozilla.org/preferences-service;1"] var prefService = Components.classes["@mozilla.org/preferences-service;1"]
@@ -872,9 +861,25 @@ vimperator.Events = function () //{{{
break; break;
} }
} }
}
}; };
this.prefObserver.register();
window.XULBrowserWindow = eventManager.progressListener;
window.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
.getInterface(Components.interfaces.nsIWebNavigation)
.QueryInterface(Components.interfaces.nsIDocShellTreeItem).treeOwner
.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
.getInterface(Components.interfaces.nsIXULWindow)
.XULBrowserWindow = window.XULBrowserWindow;
getBrowser().addProgressListener(eventManager.progressListener, Components.interfaces.nsIWebProgress.NOTIFY_ALL);
eventManager.prefObserver.register();
window.addEventListener("keypress", eventManager.onKeyPress, true);
window.addEventListener("keydown", eventManager.onKeyUpOrDown, true);
window.addEventListener("keyup", eventManager.onKeyUpOrDown, true);
return eventManager;
//}}} //}}}
}; //}}} }; //}}}

62
content/mappings.js
View File

@@ -176,6 +176,7 @@ vimperator.Mappings = function () //{{{
////////////////////// PUBLIC SECTION ////////////////////////////////////////// ////////////////////// PUBLIC SECTION //////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////{{{ /////////////////////////////////////////////////////////////////////////////{{{
// FIXME:
vimperator.Mappings.flags = { vimperator.Mappings.flags = {
ALLOW_EVENT_ROUTING: 1 << 0, // if set, return true inside the map command to pass the event further to firefox ALLOW_EVENT_ROUTING: 1 << 0, // if set, return true inside the map command to pass the event further to firefox
MOTION: 1 << 1, MOTION: 1 << 1,
@@ -183,25 +184,27 @@ vimperator.Mappings = function () //{{{
ARGUMENT: 1 << 3 ARGUMENT: 1 << 3
}; };
var mappingManager = {
// NOTE: just normal mode for now // NOTE: just normal mode for now
this.__iterator__ = function () __iterator__: function ()
{ {
return mappingsIterator(vimperator.modes.NORMAL, main); return mappingsIterator(vimperator.modes.NORMAL, main);
}; },
// FIXME // FIXME
this.getIterator = function (mode) getIterator: function (mode)
{ {
return mappingsIterator(mode, main); return mappingsIterator(mode, main);
}; },
// FIXME // FIXME
this.getUserIterator = function (mode) getUserIterator: function (mode)
{ {
return mappingsIterator(mode, user); return mappingsIterator(mode, user);
}; },
this.hasMap = function (mode, cmd) hasMap: function (mode, cmd)
{ {
var user_maps = user[mode]; var user_maps = user[mode];
@@ -212,9 +215,9 @@ vimperator.Mappings = function () //{{{
} }
return false; return false;
}; },
this.add = function (map) add: function (map)
{ {
for (var i = 0; i < map.names.length; i++) for (var i = 0; i < map.names.length; i++)
{ {
@@ -226,19 +229,19 @@ vimperator.Mappings = function () //{{{
for (var k = 0; k < map.modes.length; k++) for (var k = 0; k < map.modes.length; k++)
user[map.modes[k]].push(map); user[map.modes[k]].push(map);
}; },
this.remove = function (mode, cmd) remove: function (mode, cmd)
{ {
removeMap(mode, cmd); removeMap(mode, cmd);
}; },
this.removeAll = function (mode) removeAll: function (mode)
{ {
user[mode] = []; user[mode] = [];
}; },
this.get = function (mode, cmd) get: function (mode, cmd)
{ {
var map = getMap(mode, cmd, user); var map = getMap(mode, cmd, user);
@@ -246,16 +249,16 @@ vimperator.Mappings = function () //{{{
map = getMap(mode, cmd, main); map = getMap(mode, cmd, main);
return map; return map;
}; },
// TODO: move default maps to their own v.normal namespace // TODO: move default maps to their own v.normal namespace
this.getDefaultMap = function (mode, cmd) getDefaultMap: function (mode, cmd)
{ {
return getMap(mode, cmd, main); return getMap(mode, cmd, main);
}; },
// returns an array of mappings with names which start with "cmd" // returns an array of mappings with names which start with "cmd"
this.getCandidates = function (mode, cmd) getCandidates: function (mode, cmd)
{ {
var mappings = []; var mappings = [];
var matches = []; var matches = [];
@@ -277,9 +280,9 @@ vimperator.Mappings = function () //{{{
} }
return matches; return matches;
}; },
this.list = function (mode, filter) list: function (mode, filter)
{ {
var maps = user[mode]; var maps = user[mode];
@@ -304,6 +307,8 @@ vimperator.Mappings = function () //{{{
list += "</table>"; list += "</table>";
vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, vimperator.commandline.FORCE_MULTILINE); vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, vimperator.commandline.FORCE_MULTILINE);
}
}; };
/////////////////////////////////////////////////////////////////////////////}}} /////////////////////////////////////////////////////////////////////////////}}}
@@ -324,7 +329,7 @@ vimperator.Mappings = function () //{{{
vimperator.modes.TEXTAREA]; vimperator.modes.TEXTAREA];
// //
// Normal mode // NORMAL mode
// {{{ // {{{
// vimperator management // vimperator management
@@ -1187,9 +1192,8 @@ vimperator.Mappings = function () //{{{
} }
)); ));
// }}} // }}}
// Hints mode // HINTS mode
// {{{ // {{{
// // action keys // // action keys
@@ -1418,7 +1422,7 @@ vimperator.Mappings = function () //{{{
// )); // ));
// }}} // }}}
// Caret mode // CARET mode
// {{{ // {{{
function getSelectionController() function getSelectionController()
@@ -1766,9 +1770,8 @@ vimperator.Mappings = function () //{{{
{ } { }
)); ));
// }}} // }}}
// Textarea mode // TEXTAREA mode
// {{{ // {{{
addDefaultMap(new vimperator.Map([vimperator.modes.TEXTAREA], ["i", "<Insert>"], addDefaultMap(new vimperator.Map([vimperator.modes.TEXTAREA], ["i", "<Insert>"],
@@ -1977,6 +1980,7 @@ vimperator.Mappings = function () //{{{
// }}} // }}}
// INSERT mode // INSERT mode
// {{{ // {{{
addDefaultMap(new vimperator.Map([vimperator.modes.INSERT, vimperator.modes.COMMAND_LINE], ["<C-w>"], addDefaultMap(new vimperator.Map([vimperator.modes.INSERT, vimperator.modes.COMMAND_LINE], ["<C-w>"],
function () { vimperator.editor.executeCommand("cmd_deleteWordBackward", 1); }, function () { vimperator.editor.executeCommand("cmd_deleteWordBackward", 1); },
{ } { }
@@ -2038,6 +2042,7 @@ vimperator.Mappings = function () //{{{
//}}} //}}}
// COMMAND_LINE mode // COMMAND_LINE mode
//{{{ //{{{
addDefaultMap(new vimperator.Map([vimperator.modes.COMMAND_LINE], ["<Space>"], addDefaultMap(new vimperator.Map([vimperator.modes.COMMAND_LINE], ["<Space>"],
function () { return vimperator.editor.expandAbbreviation("c"); }, function () { return vimperator.editor.expandAbbreviation("c"); },
{ flags: vimperator.Mappings.flags.ALLOW_EVENT_ROUTING } { flags: vimperator.Mappings.flags.ALLOW_EVENT_ROUTING }
@@ -2046,8 +2051,9 @@ vimperator.Mappings = function () //{{{
["<C-]>", "<C-5>"], function () { vimperator.editor.expandAbbreviation("c"); }, { } ["<C-]>", "<C-5>"], function () { vimperator.editor.expandAbbreviation("c"); }, { }
)); ));
//}}} //}}} }}}
return mappingManager;
}; //}}} }; //}}}
// vim: set fdm=marker sw=4 ts=4 et: // vim: set fdm=marker sw=4 ts=4 et:

121
content/options.js
View File

@@ -125,6 +125,7 @@ vimperator.Options = function () //{{{
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
////////////////////// PRIVATE SECTION ///////////////////////////////////////// ////////////////////// PRIVATE SECTION /////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////{{{ /////////////////////////////////////////////////////////////////////////////{{{
var firefox_prefs = Components.classes["@mozilla.org/preferences-service;1"] var firefox_prefs = Components.classes["@mozilla.org/preferences-service;1"]
.getService(Components.interfaces.nsIPrefBranch); .getService(Components.interfaces.nsIPrefBranch);
var vimperator_prefs = firefox_prefs.getBranch("extensions.vimperator."); var vimperator_prefs = firefox_prefs.getBranch("extensions.vimperator.");
@@ -312,12 +313,14 @@ vimperator.Options = function () //{{{
////////////////////// PUBLIC SECTION ////////////////////////////////////////// ////////////////////// PUBLIC SECTION //////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////{{{ /////////////////////////////////////////////////////////////////////////////{{{
this.__iterator__ = function () var optionManager = {
__iterator__: function ()
{ {
return optionsIterator(); return optionsIterator();
}; },
this.get = function (name) get: function (name)
{ {
for (var i = 0; i < options.length; i++) for (var i = 0; i < options.length; i++)
{ {
@@ -325,24 +328,24 @@ vimperator.Options = function () //{{{
return options[i]; return options[i];
} }
return null; return null;
}; },
this.add = function (option) add: function (option)
{ {
this.__defineGetter__(option.name, function () { return option.value; }); this.__defineGetter__(option.name, function () { return option.value; });
this.__defineSetter__(option.name, function (value) { option.value = value; }); this.__defineSetter__(option.name, function (value) { option.value = value; });
options.push(option); options.push(option);
}; },
this.destroy = function () destroy: function ()
{ {
// reset some modified firefox prefs // reset some modified firefox prefs
if (loadPreference("dom.popup_allowed_events", "change click dblclick mouseup reset submit") if (loadPreference("dom.popup_allowed_events", "change click dblclick mouseup reset submit")
== popup_allowed_events + " keypress") == popup_allowed_events + " keypress")
storePreference("dom.popup_allowed_events", popup_allowed_events); storePreference("dom.popup_allowed_events", popup_allowed_events);
}; },
this.list = function (only_non_default) list: function (only_non_default)
{ {
// TODO: columns like Vim? // TODO: columns like Vim?
var list = ":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) + "<br/>" + var list = ":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) + "<br/>" +
@@ -382,10 +385,10 @@ vimperator.Options = function () //{{{
list += "</table>"; list += "</table>";
vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, vimperator.commandline.FORCE_MULTILINE); vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, vimperator.commandline.FORCE_MULTILINE);
}; },
// this hack is only needed, because we need to do asynchronous loading of the .vimperatorrc // this hack is only needed, because we need to do asynchronous loading of the .vimperatorrc
this.setInitialGUI = function () setInitialGUI: function ()
{ {
if (!guioptions_done) if (!guioptions_done)
this.get("guioptions").reset(); this.get("guioptions").reset();
@@ -393,28 +396,30 @@ vimperator.Options = function () //{{{
this.get("laststatus").reset(); this.get("laststatus").reset();
if (!showtabline_done) if (!showtabline_done)
this.get("showtabline").reset(); this.get("showtabline").reset();
}; },
// TODO: separate Preferences from Options? Would these utility functions // TODO: separate Preferences from Options? Would these utility functions
// be better placed in the 'core' vimperator namespace somewhere? // be better placed in the 'core' vimperator namespace somewhere?
this.setPref = function (name, value) setPref: function (name, value)
{ {
return storePreference(name, value, true); return storePreference(name, value, true);
}; },
this.getPref = function (name, forced_default) getPref: function (name, forced_default)
{ {
return loadPreference(name, forced_default, true); return loadPreference(name, forced_default, true);
}; },
this.setFirefoxPref = function (name, value) setFirefoxPref: function (name, value)
{ {
return storePreference(name, value); return storePreference(name, value);
}; },
this.getFirefoxPref = function (name, forced_default) getFirefoxPref: function (name, forced_default)
{ {
return loadPreference(name, forced_default); return loadPreference(name, forced_default);
}
}; };
/////////////////////////////////////////////////////////////////////////////}}} /////////////////////////////////////////////////////////////////////////////}}}
@@ -426,7 +431,7 @@ vimperator.Options = function () //{{{
"//xhtml:*[@onclick or @onmouseover or @onmousedown or @onmouseup or @oncommand or @class='lk' or @class='s'] | " + "//xhtml:*[@onclick or @onmouseover or @onmousedown or @onmouseup or @oncommand or @class='lk' or @class='s'] | " +
"//xhtml:input[not(@type='hidden')] | //xhtml:a | //xhtml:area | //xhtml:iframe | //xhtml:textarea | //xhtml:button | //xhtml:select"; "//xhtml:input[not(@type='hidden')] | //xhtml:a | //xhtml:area | //xhtml:iframe | //xhtml:textarea | //xhtml:button | //xhtml:select";
this.add(new vimperator.Option(["activate", "act"], "stringlist", optionManager.add(new vimperator.Option(["activate", "act"], "stringlist",
{ {
short_help: "Define when tabs are automatically activated", short_help: "Define when tabs are automatically activated",
help: "Available items:<br/>" + help: "Available items:<br/>" +
@@ -443,7 +448,7 @@ vimperator.Options = function () //{{{
} }
} }
)); ));
this.add(new vimperator.Option(["complete", "cpt"], "charlist", optionManager.add(new vimperator.Option(["complete", "cpt"], "charlist",
{ {
short_help: "Items which are completed at the :[tab]open prompt", short_help: "Items which are completed at the :[tab]open prompt",
help: "Available items:<br/>" + help: "Available items:<br/>" +
@@ -459,7 +464,7 @@ vimperator.Options = function () //{{{
validator: function (value) { return !/[^sfbh]/.test(value); } validator: function (value) { return !/[^sfbh]/.test(value); }
} }
)); ));
this.add(new vimperator.Option(["defsearch", "ds"], "string", optionManager.add(new vimperator.Option(["defsearch", "ds"], "string",
{ {
short_help: "Set the default search engine", short_help: "Set the default search engine",
help: "The default search engine is used in the <code class=\"command\">:[tab]open [arg]</code> command " + help: "The default search engine is used in the <code class=\"command\">:[tab]open [arg]</code> command " +
@@ -467,7 +472,7 @@ vimperator.Options = function () //{{{
default_value: "google" default_value: "google"
} }
)); ));
this.add(new vimperator.Option(["editor"], "string", optionManager.add(new vimperator.Option(["editor"], "string",
{ {
short_help: "Set the external text editor", short_help: "Set the external text editor",
help: "Sets the editor to run when <code class=\"mapping\">&lt;C-i&gt;</code> " + help: "Sets the editor to run when <code class=\"mapping\">&lt;C-i&gt;</code> " +
@@ -477,20 +482,20 @@ vimperator.Options = function () //{{{
default_value: "gvim -f" default_value: "gvim -f"
} }
)); ));
this.add(new vimperator.Option(["extendedhinttags", "eht"], "string", optionManager.add(new vimperator.Option(["extendedhinttags", "eht"], "string",
{ {
short_help: "XPath string of hintable elements activated by ';'", short_help: "XPath string of hintable elements activated by ';'",
default_value: DEFAULT_HINTTAGS default_value: DEFAULT_HINTTAGS
} }
)); ));
this.add(new vimperator.Option(["focusedhintstyle", "fhs"], "string", optionManager.add(new vimperator.Option(["focusedhintstyle", "fhs"], "string",
{ {
short_help: "CSS specification of focused hints", short_help: "CSS specification of focused hints",
default_value: "z-index:5000; font-family:monospace; font-size:12px; color:ButtonText; background-color:ButtonShadow; " + default_value: "z-index:5000; font-family:monospace; font-size:12px; color:ButtonText; background-color:ButtonShadow; " +
"border-color:ButtonShadow; border-width:1px; border-style:solid; padding:0px 1px 0px 1px; position:absolute;" "border-color:ButtonShadow; border-width:1px; border-style:solid; padding:0px 1px 0px 1px; position:absolute;"
} }
)); ));
this.add(new vimperator.Option(["fullscreen", "fs"], "boolean", optionManager.add(new vimperator.Option(["fullscreen", "fs"], "boolean",
{ {
short_help: "Show the current window fullscreen", short_help: "Show the current window fullscreen",
setter: function (value) { window.fullScreen = value; }, setter: function (value) { window.fullScreen = value; },
@@ -498,7 +503,7 @@ vimperator.Options = function () //{{{
default_value: false default_value: false
} }
)); ));
this.add(new vimperator.Option(["guioptions", "go"], "charlist", optionManager.add(new vimperator.Option(["guioptions", "go"], "charlist",
{ {
short_help: "Show or hide the menu, toolbar and scrollbars", short_help: "Show or hide the menu, toolbar and scrollbars",
help: "Supported characters:<br/>" + help: "Supported characters:<br/>" +
@@ -512,7 +517,7 @@ vimperator.Options = function () //{{{
validator: function (value) { return !/[^mTb]/.test(value); } validator: function (value) { return !/[^mTb]/.test(value); }
} }
)); ));
this.add(new vimperator.Option(["hinttimeout", "hto"], "number", optionManager.add(new vimperator.Option(["hinttimeout", "hto"], "number",
{ {
short_help: "Automatically follow non unique numerical hint after {arg} ms", short_help: "Automatically follow non unique numerical hint after {arg} ms",
help: "Set to 0 (the default) to only follow numeric hints after pressing &lt;Return&gt; or when the hint is unique.", help: "Set to 0 (the default) to only follow numeric hints after pressing &lt;Return&gt; or when the hint is unique.",
@@ -520,46 +525,46 @@ vimperator.Options = function () //{{{
validator: function (value) { return value >= 0; } validator: function (value) { return value >= 0; }
} }
)); ));
this.add(new vimperator.Option(["hintstyle", "hs"], "string", optionManager.add(new vimperator.Option(["hintstyle", "hs"], "string",
{ {
short_help: "CSS specification of unfocused hints", short_help: "CSS specification of unfocused hints",
default_value: "z-index:5000; font-family:monospace; font-size:12px; color:white; background-color:red; " + default_value: "z-index:5000; font-family:monospace; font-size:12px; color:white; background-color:red; " +
"border-color:ButtonShadow; border-width:0px; border-style:solid; padding:0px 1px 0px 1px; position:absolute;" "border-color:ButtonShadow; border-width:0px; border-style:solid; padding:0px 1px 0px 1px; position:absolute;"
} }
)); ));
this.add(new vimperator.Option(["hinttags", "ht"], "string", optionManager.add(new vimperator.Option(["hinttags", "ht"], "string",
{ {
short_help: "XPath string of hintable elements activated by <code class=\"mapping\">'f'</code> and <code class=\"mapping\">'F'</code>", short_help: "XPath string of hintable elements activated by <code class=\"mapping\">'f'</code> and <code class=\"mapping\">'F'</code>",
default_value: DEFAULT_HINTTAGS default_value: DEFAULT_HINTTAGS
} }
)); ));
this.add(new vimperator.Option(["hlsearch", "hls"], "boolean", optionManager.add(new vimperator.Option(["hlsearch", "hls"], "boolean",
{ {
short_help: "Highlight previous search pattern matches", short_help: "Highlight previous search pattern matches",
setter: function (value) { if (value) vimperator.search.highlight(); else vimperator.search.clear(); }, setter: function (value) { if (value) vimperator.search.highlight(); else vimperator.search.clear(); },
default_value: false default_value: false
} }
)); ));
this.add(new vimperator.Option(["hlsearchstyle", "hlss"], "string", optionManager.add(new vimperator.Option(["hlsearchstyle", "hlss"], "string",
{ {
short_help: "CSS specification of highlighted search items", short_help: "CSS specification of highlighted search items",
default_value: "color: black; background-color: yellow; padding: 0; display: inline;" default_value: "color: black; background-color: yellow; padding: 0; display: inline;"
} }
)); ));
this.add(new vimperator.Option(["ignorecase", "ic"], "boolean", optionManager.add(new vimperator.Option(["ignorecase", "ic"], "boolean",
{ {
short_help: "Ignore case in search patterns", short_help: "Ignore case in search patterns",
default_value: true default_value: true
} }
)); ));
this.add(new vimperator.Option(["incsearch", "is"], "boolean", optionManager.add(new vimperator.Option(["incsearch", "is"], "boolean",
{ {
short_help: "Show where the search pattern matches as it is typed", short_help: "Show where the search pattern matches as it is typed",
help: "NOTE: Incremental searching currently only works in the forward direction.", help: "NOTE: Incremental searching currently only works in the forward direction.",
default_value: true default_value: true
} }
)); ));
this.add(new vimperator.Option(["insertmode", "im"], "boolean", optionManager.add(new vimperator.Option(["insertmode", "im"], "boolean",
{ {
short_help: "Use Insert mode as the default for text areas", short_help: "Use Insert mode as the default for text areas",
help: "Makes Vimperator work in a way that Insert mode is the default mode for text areas. " + help: "Makes Vimperator work in a way that Insert mode is the default mode for text areas. " +
@@ -567,7 +572,7 @@ vimperator.Options = function () //{{{
default_value: true default_value: true
} }
)); ));
this.add(new vimperator.Option(["laststatus", "ls"], "number", optionManager.add(new vimperator.Option(["laststatus", "ls"], "number",
{ {
short_help: "Show the status line", short_help: "Show the status line",
help: "Determines when the last window will have a status line. " + help: "Determines when the last window will have a status line. " +
@@ -583,20 +588,20 @@ vimperator.Options = function () //{{{
validator: function (value) { return (value >= 0 && value <= 2); } validator: function (value) { return (value >= 0 && value <= 2); }
} }
)); ));
this.add(new vimperator.Option(["linksearch", "lks"], "boolean", optionManager.add(new vimperator.Option(["linksearch", "lks"], "boolean",
{ {
short_help: "Limit the search to hyperlink text", short_help: "Limit the search to hyperlink text",
help: "This includes (X)HTML elements with an \"href\" atrribute and XLink \"simple\" links.", help: "This includes (X)HTML elements with an \"href\" atrribute and XLink \"simple\" links.",
default_value: false default_value: false
} }
)); ));
this.add(new vimperator.Option(["more"], "boolean", optionManager.add(new vimperator.Option(["more"], "boolean",
{ {
short_help: "Pause the message list window when more than one screen of listings is displayed", short_help: "Pause the message list window when more than one screen of listings is displayed",
default_value: true default_value: true
} }
)); ));
this.add(new vimperator.Option(["pageinfo", "pa"], "charlist", optionManager.add(new vimperator.Option(["pageinfo", "pa"], "charlist",
{ {
short_help: "Desired info on :pa[geinfo]", short_help: "Desired info on :pa[geinfo]",
help: "Available items:<br/>" + help: "Available items:<br/>" +
@@ -610,7 +615,7 @@ vimperator.Options = function () //{{{
validator: function (value) { return !(/[^gfm]/.test(value) || value.length > 3 || value.length < 1); } validator: function (value) { return !(/[^gfm]/.test(value) || value.length > 3 || value.length < 1); }
} }
)); ));
this.add(new vimperator.Option(["popups", "pps"], "number", optionManager.add(new vimperator.Option(["popups", "pps"], "number",
{ {
short_help: "Where to show requested popup windows", short_help: "Where to show requested popup windows",
help: "Define where to show requested popup windows. Does not apply to windows which are opened by middle clicking a link, they always open in a new tab. " + help: "Define where to show requested popup windows. Does not apply to windows which are opened by middle clicking a link, they always open in a new tab. " +
@@ -627,7 +632,7 @@ vimperator.Options = function () //{{{
validator: function (value) { return (value >= 0 && value <= 3); } validator: function (value) { return (value >= 0 && value <= 3); }
} }
)); ));
this.add(new vimperator.Option(["preload"], "boolean", optionManager.add(new vimperator.Option(["preload"], "boolean",
{ {
short_help: "Speed up first time history/bookmark completion", short_help: "Speed up first time history/bookmark completion",
help: "History access can be quite slow for a large history. Vimperator maintains a cache to speed it up significantly on subsequent access.<br/>" + help: "History access can be quite slow for a large history. Vimperator maintains a cache to speed it up significantly on subsequent access.<br/>" +
@@ -635,7 +640,7 @@ vimperator.Options = function () //{{{
default_value: true default_value: true
} }
)); ));
this.add(new vimperator.Option(["previewheight", "pvh"], "number", optionManager.add(new vimperator.Option(["previewheight", "pvh"], "number",
{ {
short_help: "Default height for preview window", short_help: "Default height for preview window",
help: "Value must be between 1 and 50. If the value is too high, completions may cover the command-line. " + help: "Value must be between 1 and 50. If the value is too high, completions may cover the command-line. " +
@@ -645,7 +650,7 @@ vimperator.Options = function () //{{{
validator: function (value) { return (value >= 1 && value <= 50); } validator: function (value) { return (value >= 1 && value <= 50); }
} }
)); ));
this.add(new vimperator.Option(["scroll", "scr"], "number", optionManager.add(new vimperator.Option(["scroll", "scr"], "number",
{ {
short_help: "Number of lines to scroll with <code class=\"mapping\">C-u</code> and <code class=\"mapping\">C-d</code> commands", short_help: "Number of lines to scroll with <code class=\"mapping\">C-u</code> and <code class=\"mapping\">C-d</code> commands",
help: "The number of lines scrolled defaults to half the window size. " + help: "The number of lines scrolled defaults to half the window size. " +
@@ -655,13 +660,13 @@ vimperator.Options = function () //{{{
validator: function (value) { return value >= 0; } validator: function (value) { return value >= 0; }
} }
)); ));
this.add(new vimperator.Option(["showmode", "smd"], "boolean", optionManager.add(new vimperator.Option(["showmode", "smd"], "boolean",
{ {
short_help: "Show the current mode in the command line", short_help: "Show the current mode in the command line",
default_value: true default_value: true
} }
)); ));
this.add(new vimperator.Option(["showstatuslinks", "ssli"], "number", optionManager.add(new vimperator.Option(["showstatuslinks", "ssli"], "number",
{ {
short_help: "Show the destination of the link under the cursor in the status bar", short_help: "Show the destination of the link under the cursor in the status bar",
help: "Also links which are focused by keyboard commands like <code class=\"mapping\">&lt;Tab&gt;</code> are shown. " + help: "Also links which are focused by keyboard commands like <code class=\"mapping\">&lt;Tab&gt;</code> are shown. " +
@@ -675,7 +680,7 @@ vimperator.Options = function () //{{{
validator: function (value) { return (value >= 0 && value <= 2); } validator: function (value) { return (value >= 0 && value <= 2); }
} }
)); ));
this.add(new vimperator.Option(["showtabline", "stal"], "number", optionManager.add(new vimperator.Option(["showtabline", "stal"], "number",
{ {
short_help: "Control when to show the tab bar of opened web pages", short_help: "Control when to show the tab bar of opened web pages",
help: "Possible values:<br/>" + help: "Possible values:<br/>" +
@@ -689,14 +694,14 @@ vimperator.Options = function () //{{{
validator: function (value) { return (value >= 0 && value <= 2); } validator: function (value) { return (value >= 0 && value <= 2); }
} }
)); ));
this.add(new vimperator.Option(["smartcase", "scs"], "boolean", optionManager.add(new vimperator.Option(["smartcase", "scs"], "boolean",
{ {
short_help: "Override the 'ignorecase' option if the pattern contains uppercase characters", short_help: "Override the 'ignorecase' option if the pattern contains uppercase characters",
help: "This is only used if the <code class=\"option\">'ignorecase'</code> option is set.", help: "This is only used if the <code class=\"option\">'ignorecase'</code> option is set.",
default_value: true default_value: true
} }
)); ));
this.add(new vimperator.Option(["titlestring"], "string", optionManager.add(new vimperator.Option(["titlestring"], "string",
{ {
short_help: "Change the title of the browser window", short_help: "Change the title of the browser window",
help: "Vimperator changes the browser title from \"Title of web page - Mozilla Firefox\" to " + help: "Vimperator changes the browser title from \"Title of web page - Mozilla Firefox\" to " +
@@ -706,7 +711,7 @@ vimperator.Options = function () //{{{
default_value: "Vimperator" default_value: "Vimperator"
} }
)); ));
this.add(new vimperator.Option(["usermode", "um"], "boolean", optionManager.add(new vimperator.Option(["usermode", "um"], "boolean",
{ {
short_help: "Show current website with a minimal style sheet to make it easily accessible", short_help: "Show current website with a minimal style sheet to make it easily accessible",
help: "Note that this is a local option for now, later it may be split into a global and <code class=\"command\">:setlocal</code> part", help: "Note that this is a local option for now, later it may be split into a global and <code class=\"command\">:setlocal</code> part",
@@ -715,7 +720,7 @@ vimperator.Options = function () //{{{
default_value: false default_value: false
} }
)); ));
this.add(new vimperator.Option(["verbose", "vbs"], "number", optionManager.add(new vimperator.Option(["verbose", "vbs"], "number",
{ {
short_help: "Define which type of messages are logged", short_help: "Define which type of messages are logged",
help: "When bigger than zero, Vimperator will give messages about what it is doing. They are printed to the error console which can be shown with <code class=\"command\">:javascript!</code>.<br/>" + help: "When bigger than zero, Vimperator will give messages about what it is doing. They are printed to the error console which can be shown with <code class=\"command\">:javascript!</code>.<br/>" +
@@ -724,14 +729,14 @@ vimperator.Options = function () //{{{
validator: function (value) { return (value >= 0 && value <= 9); } validator: function (value) { return (value >= 0 && value <= 9); }
} }
)); ));
this.add(new vimperator.Option(["visualbell", "vb"], "boolean", optionManager.add(new vimperator.Option(["visualbell", "vb"], "boolean",
{ {
short_help: "Use visual bell instead of beeping on errors", short_help: "Use visual bell instead of beeping on errors",
setter: function (value) { vimperator.options.setFirefoxPref("accessibility.typeaheadfind.enablesound", !value); }, setter: function (value) { vimperator.options.setFirefoxPref("accessibility.typeaheadfind.enablesound", !value); },
default_value: false default_value: false
} }
)); ));
this.add(new vimperator.Option(["wildmode", "wim"], "stringlist", optionManager.add(new vimperator.Option(["wildmode", "wim"], "stringlist",
{ {
short_help: "Define how command line completion works", short_help: "Define how command line completion works",
help: "It is a comma-separated list of parts, where each part specifies " + help: "It is a comma-separated list of parts, where each part specifies " +
@@ -755,7 +760,7 @@ vimperator.Options = function () //{{{
} }
} }
)); ));
this.add(new vimperator.Option(["wildoptions", "wop"], "stringlist", optionManager.add(new vimperator.Option(["wildoptions", "wop"], "stringlist",
{ {
short_help: "Change how command line completion is done", short_help: "Change how command line completion is done",
help: "A list of words that change how command line completion is done.<br/>" + help: "A list of words that change how command line completion is done.<br/>" +
@@ -767,7 +772,7 @@ vimperator.Options = function () //{{{
validator: function (value) { return /^(sort|)$/.test(value); } validator: function (value) { return /^(sort|)$/.test(value); }
} }
)); ));
this.add(new vimperator.Option(["nextpattern"], "stringlist", optionManager.add(new vimperator.Option(["nextpattern"], "stringlist",
{ {
short_help: "String to search when looking for 'next' page in document relation", short_help: "String to search when looking for 'next' page in document relation",
help: "Change it to make it look for another string in links when pressing ]n<br/>" + help: "Change it to make it look for another string in links when pressing ]n<br/>" +
@@ -775,7 +780,7 @@ vimperator.Options = function () //{{{
default_value: "\\bnext,^>$" default_value: "\\bnext,^>$"
} }
)); ));
this.add(new vimperator.Option(["previouspattern"], "stringlist", optionManager.add(new vimperator.Option(["previouspattern"], "stringlist",
{ {
short_help: "String to search when looking for 'prev' page in document relation", short_help: "String to search when looking for 'prev' page in document relation",
help: "Change it to make it look for another string in links when pressing ]p<br/>" + help: "Change it to make it look for another string in links when pressing ]p<br/>" +
@@ -792,8 +797,10 @@ vimperator.Options = function () //{{{
setLastStatus(0); setLastStatus(0);
guioptions_done = showtabline_done = laststatus_done = false; guioptions_done = showtabline_done = laststatus_done = false;
setTitleString(this.titlestring); setTitleString(optionManager.titlestring);
setPopups(this.popups); setPopups(optionManager.popups);
return optionManager;
}; //}}} }; //}}}
// vim: set fdm=marker sw=4 ts=4 et: // vim: set fdm=marker sw=4 ts=4 et:

9
content/vimperator.js
View File

@@ -47,6 +47,7 @@ const vimperator = (function () //{{{
/////////////////////////////////////////////////////////////////////////////{{{ /////////////////////////////////////////////////////////////////////////////{{{
return { return {
get mode() { return vimperator.modes.main; }, get mode() { return vimperator.modes.main; },
set mode(value) { vimperator.modes.main = value; }, set mode(value) { vimperator.modes.main = value; },
@@ -581,11 +582,11 @@ const vimperator = (function () //{{{
// these objects are created here only after the chrome is ready // these objects are created here only after the chrome is ready
vimperator.log("Loading module options...", 3); vimperator.log("Loading module options...", 3);
vimperator.options = new vimperator.Options(); vimperator.options = vimperator.Options();
vimperator.log("Loading module events...", 3); vimperator.log("Loading module events...", 3);
vimperator.events = new vimperator.Events(); vimperator.events = vimperator.Events();
vimperator.log("Loading module commands...", 3); vimperator.log("Loading module commands...", 3);
vimperator.commands = new vimperator.Commands(); vimperator.commands = vimperator.Commands();
vimperator.log("Loading module bookmarks...", 3); vimperator.log("Loading module bookmarks...", 3);
vimperator.bookmarks = vimperator.Bookmarks(); vimperator.bookmarks = vimperator.Bookmarks();
vimperator.log("Loading module history...", 3); vimperator.log("Loading module history...", 3);
@@ -599,7 +600,7 @@ const vimperator = (function () //{{{
vimperator.log("Loading module buffer window...", 3); vimperator.log("Loading module buffer window...", 3);
vimperator.bufferwindow = vimperator.InformationList("vimperator-bufferwindow", { incremental_fill: false, max_items: 10 }); vimperator.bufferwindow = vimperator.InformationList("vimperator-bufferwindow", { incremental_fill: false, max_items: 10 });
vimperator.log("Loading module mappings...", 3); vimperator.log("Loading module mappings...", 3);
vimperator.mappings = new vimperator.Mappings(); vimperator.mappings = vimperator.Mappings();
vimperator.log("Loading module statusline...", 3); vimperator.log("Loading module statusline...", 3);
vimperator.statusline = vimperator.StatusLine(); vimperator.statusline = vimperator.StatusLine();
vimperator.log("Loading module buffer...", 3); vimperator.log("Loading module buffer...", 3);