{xml}, this.HIGHLIGHT_NORMAL, this.FORCE_MULTILINE); + }, + /** * Hides the command line, and shows any status messages that * are under it. @@ -492,7 +502,7 @@ const CommandLine = Module("commandline", { * commandline.FORCE_MULTILINE - Forces the message to appear in * the MOW. */ - echo: function echo(str, highlightGroup, flags) { + echo: requiresMainThread(function echo(str, highlightGroup, flags) { // dactyl.echo uses different order of flags as it omits the highlight group, change commandline.echo argument order? --mst if (this._silent) return; @@ -506,37 +516,34 @@ const CommandLine = Module("commandline", { services.get("windowWatcher").activeWindow.dactyl) return; - // The DOM isn't threadsafe. It must only be accessed from the main thread. - util.callInMainThread(function () { - if ((flags & this.DISALLOW_MULTILINE) && !this._outputContainer.collapsed) - return; + if ((flags & this.DISALLOW_MULTILINE) && !this._outputContainer.collapsed) + return; - let single = flags & (this.FORCE_SINGLELINE | this.DISALLOW_MULTILINE); - let action = this._echoLine; + let single = flags & (this.FORCE_SINGLELINE | this.DISALLOW_MULTILINE); + let action = this._echoLine; - // TODO: this is all a bit convoluted - clean up. - // assume that FORCE_MULTILINE output is fully styled - if (!(flags & this.FORCE_MULTILINE) && !single && (!this._outputContainer.collapsed || this.widgets.message.value == this._lastEcho)) { - highlightGroup += " Message"; - action = this._echoMultiline; - } + // TODO: this is all a bit convoluted - clean up. + // assume that FORCE_MULTILINE output is fully styled + if (!(flags & this.FORCE_MULTILINE) && !single && (!this._outputContainer.collapsed || this.widgets.message.value == this._lastEcho)) { + highlightGroup += " Message"; + action = this._echoMultiline; + } - if ((flags & this.FORCE_MULTILINE) || (/\n/.test(str) || typeof str == "xml") && !(flags & this.FORCE_SINGLELINE)) - action = this._echoMultiline; + if ((flags & this.FORCE_MULTILINE) || (/\n/.test(str) || typeof str == "xml") && !(flags & this.FORCE_SINGLELINE)) + action = this._echoMultiline; - if (single) - this._lastEcho = null; - else { - if (this.widgets.message.value == this._lastEcho) - this._echoMultiline({this._lastEcho}, - this.widgets.message.getAttributeNS(NS.uri, "highlight")); - this._lastEcho = (action == this._echoLine) && str; - } + if (single) + this._lastEcho = null; + else { + if (this.widgets.message.value == this._lastEcho) + this._echoMultiline({this._lastEcho}, + this.widgets.message.getAttributeNS(NS.uri, "highlight")); + this._lastEcho = (action == this._echoLine) && str; + } - if (action) - action.call(this, str, highlightGroup, single); - }, this); - }, + if (action) + action.call(this, str, highlightGroup, single); + }), /** * Prompt the user. Sets modes.main to COMMAND_LINE, which the user may @@ -675,7 +682,7 @@ const CommandLine = Module("commandline", { modes.pop(); } } - else { // any other key + else { //this.resetCompletions(); } // allow this event to be handled by the host app @@ -1097,7 +1104,7 @@ const CommandLine = Module("commandline", { } let hist = this.store.get(this.index); - // user pressed DOWN when there is no newer this._history item + // user pressed DOWN when there is no newer history item if (!hist) hist = this.original; else @@ -1165,13 +1172,6 @@ const CommandLine = Module("commandline", { get wildtype() this.wildtypes[this.wildIndex] || "", - get type() ({ - list: this.wildmode.checkHas(this.wildtype, "list"), - longest: this.wildmode.checkHas(this.wildtype, "longest"), - first: this.wildmode.checkHas(this.wildtype, ""), - full: this.wildmode.checkHas(this.wildtype, "full") - }), - complete: function complete(show, tabPressed) { this.context.reset(); this.context.tabPressed = tabPressed; @@ -1181,6 +1181,9 @@ const CommandLine = Module("commandline", { this.wildIndex = 0; }, + haveType: function (type) + this.wildmode.checkHas(this.wildtype, type == "first" ? "" : type), + preview: function preview() { this.previewClear(); if (this.wildIndex < 0 || this.suffix || !this.items.length) @@ -1364,7 +1367,7 @@ const CommandLine = Module("commandline", { break; } - if (this.type.list) + if (this.haveType("list")) this.itemList.show(); this.wildIndex = Math.constrain(this.wildIndex + 1, 0, this.wildtypes.length - 1); @@ -1549,17 +1552,14 @@ const ItemList = Class("ItemList", { this._completionElements = []; var iframe = document.getElementById(id); - if (!iframe) { - dactyl.log("No iframe with id: " + id + " found, strange things may happen!"); // "The truth is out there..." -- djk - return; // XXX - } this._doc = iframe.contentDocument; + this._win = iframe.contentWindow; this._container = iframe.parentNode; this._doc.body.id = id + "-content"; this._doc.body.appendChild(this._doc.createTextNode("")); - this._doc.body.style.borderTop = "1px solid black"; // FIXME: For cases where this._completions/MOW are shown at once, or ls=0. Should use :highlight. + this._doc.body.style.borderTop = "1px solid black"; // FIXME: For cases where completions/MOW are shown at once, or ls=0. Should use :highlight. this._gradient = template.gradient("GradientLeft", "GradientRight"); @@ -1578,7 +1578,8 @@ const ItemList = Class("ItemList", { if (this._container.collapsed) this._div.style.minWidth = document.getElementById("dactyl-commandline").scrollWidth + "px"; - this._minHeight = Math.max(this._minHeight, this._divNodes.completions.getBoundingClientRect().bottom); + this._minHeight = Math.max(this._minHeight, + this._win.scrollY + this._divNodes.completions.getBoundingClientRect().bottom); this._container.height = this._minHeight; if (this._container.collapsed) diff --git a/common/content/commands.js b/common/content/commands.js index 1cda7784..cb7cc3ae 100644 --- a/common/content/commands.js +++ b/common/content/commands.js @@ -11,6 +11,75 @@ // Do NOT create instances of this class yourself, use the helper method // commands.add() instead +/** + * A structure representing the options available for a command. + * + * @property {[string]} names An array of option names. The first name + * is the canonical option name. + * @property {number} type The option's value type. This is one of: + * (@link CommandOption.NOARG), + * (@link CommandOption.STRING), + * (@link CommandOption.BOOL), + * (@link CommandOption.INT), + * (@link CommandOption.FLOAT), + * (@link CommandOption.LIST), + * (@link CommandOption.ANY) + * @property {function} validator A validator function + * @property {function (CompletionContext, object)} completer A list of + * completions, or a completion function which will be passed a + * {@link CompletionContext} and an object like that returned by + * {@link commands.parseArgs} with the following additional keys: + * completeOpt - The name of the option currently being completed. + * @property {boolean} multiple Whether this option can be specified multiple times + * @property {string} description A description of the option + */ +const CommandOption = Struct("names", "type", "validator", "completer", "multiple", "description"); +CommandOption.defaultValue("description", function () ""); +CommandOption.defaultValue("type", function () CommandOption.NOARG); +CommandOption.defaultValue("multiple", function () false); +update(CommandOption, { + // FIXME: remove later, when our option handler is better + /** + * @property {number} The option argument is unspecified. Any argument + * is accepted and caller is responsible for parsing the return + * value. + * @final + */ + ANY: 0, + + /** + * @property {number} The option doesn't accept an argument. + * @final + */ + NOARG: 1, + /** + * @property {number} The option accepts a boolean argument. + * @final + */ + BOOL: 2, + /** + * @property {number} The option accepts a string argument. + * @final + */ + STRING: 3, + /** + * @property {number} The option accepts an integer argument. + * @final + */ + INT: 4, + /** + * @property {number} The option accepts a float argument. + * @final + */ + FLOAT: 5, + /** + * @property {number} The option accepts a string list argument. + * E.g. "foo,bar" + * @final + */ + LIST: 6 +}); + /** * A class representing Ex commands. Instances are created by * the {@link Commands} class. @@ -35,8 +104,6 @@ * @private */ const Command = Class("Command", { - requires: ["config"], - init: function (specs, description, action, extraInfo) { specs = Array.concat(specs); // XXX let parsedSpecs = Command.parseSpecs(specs); @@ -51,6 +118,8 @@ const Command = Class("Command", { if (extraInfo) update(this, extraInfo); + if (this.options) + this.options = this.options.map(CommandOption.fromArray, CommandOption); }, /** @@ -191,7 +260,7 @@ const Command = Class("Command", { * invocation which should be restored on subsequent @dactyl * startups. */ - serial: null, + serialize: null, /** * @property {boolean} When true, invocations of this command * may contain private data which should be purged from @@ -240,47 +309,6 @@ const Commands = Module("commands", { this._exMap = {}; }, - // FIXME: remove later, when our option handler is better - /** - * @property {number} The option argument is unspecified. Any argument - * is accepted and caller is responsible for parsing the return - * value. - * @final - */ - OPTION_ANY: 0, - - /** - * @property {number} The option doesn't accept an argument. - * @final - */ - OPTION_NOARG: 1, - /** - * @property {number} The option accepts a boolean argument. - * @final - */ - OPTION_BOOL: 2, - /** - * @property {number} The option accepts a string argument. - * @final - */ - OPTION_STRING: 3, - /** - * @property {number} The option accepts an integer argument. - * @final - */ - OPTION_INT: 4, - /** - * @property {number} The option accepts a float argument. - * @final - */ - OPTION_FLOAT: 5, - /** - * @property {number} The option accepts a string list argument. - * E.g. "foo,bar" - * @final - */ - OPTION_LIST: 6, - /** * @property Indicates that no count was specified for this * command invocation. @@ -442,29 +470,8 @@ const Commands = Module("commands", { * * @param {string} str The Ex command-line string to parse. E.g. * "-x=foo -opt=bar arg1 arg2" - * @param {Array} options The options accepted. These are specified as - * an array [names, type, validator, completions, multiple]. - * names - an array of option names. The first name is the - * canonical option name. - * type - the option's value type. This is one of: - * (@link Commands#OPTION_NOARG), - * (@link Commands#OPTION_STRING), - * (@link Commands#OPTION_BOOL), - * (@link Commands#OPTION_INT), - * (@link Commands#OPTION_FLOAT), - * (@link Commands#OPTION_LIST), - * (@link Commands#OPTION_ANY) - * validator - a validator function - * completer - a list of completions, or a completion function - * multiple - whether this option can be specified multiple times - * E.g. - * options = [[["-force"], OPTION_NOARG], - * [["-fullscreen", "-f"], OPTION_BOOL], - * [["-language"], OPTION_STRING, validateFunc, ["perl", "ruby"]], - * [["-speed"], OPTION_INT], - * [["-acceleration"], OPTION_FLOAT], - * [["-accessories"], OPTION_LIST, null, ["foo", "bar"], true], - * [["-other"], OPTION_ANY]]; + * @param {[CommandOption]} options The options accepted. These are specified + * as an array of {@link CommandOption} structures. * @param {string} argCount The number of arguments accepted. * "0": no arguments * "1": exactly one argument @@ -518,7 +525,7 @@ const Commands = Module("commands", { function matchOpts(arg) { // Push possible option matches into completions if (complete && !onlyArgumentsRemaining) - completeOpts = [[opt[0], opt[0][0]] for ([i, opt] in Iterator(options)) if (!(opt[0][0] in args))]; + completeOpts = options.filter(function (opt) opt.multiple || !(opt.names[0] in args)); } function resetCompletions() { completeOpts = null; @@ -562,14 +569,14 @@ const Commands = Module("commands", { var optname = ""; if (!onlyArgumentsRemaining) { for (let [, opt] in Iterator(options)) { - for (let [, optname] in Iterator(opt[0])) { + for (let [, optname] in Iterator(opt.names)) { if (sub.indexOf(optname) == 0) { invalid = false; arg = null; quote = null; count = 0; let sep = sub[optname.length]; - if (sep == "=" || /\s/.test(sep) && opt[1] != this.OPTION_NOARG) { + if (sep == "=" || /\s/.test(sep) && opt.type != CommandOption.NOARG) { [count, arg, quote, error] = getNextArg(sub.substr(optname.length + 1)); dactyl.assert(!error, error); @@ -595,7 +602,7 @@ const Commands = Module("commands", { args.completeFilter = arg; args.quote = Commands.complQuote[quote] || Commands.complQuote[""]; } - let type = Commands.argTypes[opt[1]]; + let type = Commands.argTypes[opt.type]; if (type && (!complete || arg != null)) { let orig = arg; arg = type.parse(arg); @@ -610,8 +617,8 @@ const Commands = Module("commands", { } // we have a validator function - if (typeof opt[2] == "function") { - if (opt[2].call(this, arg) == false) { + if (typeof opt.validator == "function") { + if (opt.validator.call(this, arg) == false) { echoerr("Invalid argument for option: " + optname); if (complete) complete.highlight(args.completeStart, count - 1, "SPELLCHECK"); @@ -620,11 +627,13 @@ const Commands = Module("commands", { } } + matchOpts(sub); + // option allowed multiple times - if (!!opt[4]) - args[opt[0][0]] = (args[opt[0][0]] || []).concat(arg); + if (opt.multiple) + args[opt.names[0]] = (args[opt.names[0]] || []).concat(arg); else - args[opt[0][0]] = opt[1] == this.OPTION_NOARG || arg; + args[opt.names[0]] = opt.type == this.OPTION_NOARG || arg; i += optname.length + count; if (i == str.length) @@ -683,17 +692,18 @@ const Commands = Module("commands", { if (complete) { if (args.completeOpt) { let opt = args.completeOpt; - let context = complete.fork(opt[0][0], args.completeStart); + let context = complete.fork(opt.names[0], args.completeStart); context.filter = args.completeFilter; - if (typeof opt[3] == "function") - var compl = opt[3](context, args); + if (typeof opt.completer == "function") + var compl = opt.completer(context, args); else - compl = opt[3] || []; - context.title = [opt[0][0]]; + compl = opt.completer || []; + context.title = [opt.names[0]]; context.quote = args.quote; context.completions = compl; } complete.advance(args.completeStart); + complete.keys = { text: "names", description: "description" }; complete.title = ["Options"]; if (completeOpts) complete.completions = completeOpts; @@ -1012,18 +1022,16 @@ const Commands = Module("commands", { // : No, array comprehensions are fine, generator statements aren't. --Kris let cmds = this._exCommands.filter(function (c) c.user && (!cmd || c.name.match("^" + cmd))); - if (cmds.length > 0) { - let str = template.tabular(["", "Name", "Args", "Range", "Complete", "Definition"], ["padding-right: 2em;"], - ([cmd.bang ? "!" : " ", - cmd.name, - cmd.argCount, - cmd.count ? "0c" : "", - completerToString(cmd.completer), - cmd.replacementText || "function () { ... }"] - for ([, cmd] in Iterator(cmds)))); - - commandline.echo(str, commandline.HL_NORMAL, commandline.FORCE_MULTILINE); - } + if (cmds.length > 0) + commandline.commandOutput( + template.tabular(["", "Name", "Args", "Range", "Complete", "Definition"], ["padding-right: 2em;"]), + ([cmd.bang ? "!" : " ", + cmd.name, + cmd.argCount, + cmd.count ? "0c" : "", + completerToString(cmd.completer), + cmd.replacementText || "function () { ... }"] + for ([, cmd] in Iterator(cmds)))); else dactyl.echomsg("No user-defined commands found"); } @@ -1036,23 +1044,33 @@ const Commands = Module("commands", { completion.ex(context); }, options: [ - [["-nargs"], commands.OPTION_STRING, - function (arg) /^[01*?+]$/.test(arg), - [["0", "No arguments are allowed (default)"], - ["1", "One argument is allowed"], - ["*", "Zero or more arguments are allowed"], - ["?", "Zero or one argument is allowed"], - ["+", "One or more arguments is allowed"]]], - [["-bang"], commands.OPTION_NOARG], - [["-count"], commands.OPTION_NOARG], - [["-description"], commands.OPTION_STRING], - // TODO: "E180: invalid complete value: " + arg - [["-complete"], commands.OPTION_STRING, - function (arg) arg in completeOptionMap || /custom,\w+/.test(arg), - function (context) [[k, ""] for ([k, v] in Iterator(completeOptionMap))]] + { names: ["-bang"], description: "Command may be proceeded by a !" }, + { names: ["-count"], description: "Command may be preceeded by a count" }, + { + names: ["-description"], + description: "A user-visible description of the command", + type: CommandOption.STRING + }, { + // TODO: "E180: invalid complete value: " + arg + names: ["-complete"], + description: "The argument completion function", + completer: function (context) [[k, ""] for ([k, v] in Iterator(completeOptionMap))], + type: CommandOption.STRING, + validator: function (arg) arg in completeOptionMap || /custom,\w+/.test(arg), + }, { + names: ["-nargs"], + description: "The allowed number of arguments", + completer: [["0", "No arguments are allowed (default)"], + ["1", "One argument is allowed"], + ["*", "Zero or more arguments are allowed"], + ["?", "Zero or one argument is allowed"], + ["+", "One or more arguments are allowed"]], + type: CommandOption.STRING, + validator: function (arg) /^[01*?+]$/.test(arg) + }, ], literal: 1, - serial: function () [ { + serialize: function () [ { command: this.name, bang: true, options: util.Array.toObject( diff --git a/common/content/completion.js b/common/content/completion.js index 9a9268a0..1434b38e 100755 --- a/common/content/completion.js +++ b/common/content/completion.js @@ -297,7 +297,7 @@ const CompletionContext = Class("CompletionContext", { let [k, v] = i; let _k = "_" + k; if (typeof v == "string" && /^[.[]/.test(v)) - v = eval("(function (i) i" + v + ")"); + v = Function("i", "return i" + v); if (typeof v == "function") res.__defineGetter__(k, function () _k in this ? this[_k] : (this[_k] = v(this.item))); else @@ -325,7 +325,7 @@ const CompletionContext = Class("CompletionContext", { let lock = {}; this.cache.backgroundLock = lock; this.incomplete = true; - let thread = this.getCache("backgroundThread", dactyl.newThread); + let thread = this.getCache("backgroundThread", util.newThread); util.callAsync(thread, this, function () { if (this.cache.backgroundLock != lock) return; @@ -510,7 +510,7 @@ const CompletionContext = Class("CompletionContext", { if (!context.autoComplete && !context.tabPressed && context.editor) context.waitingForTab = true; else if (completer) - return completer.apply(self || this, [context].concat(Array.slice(arguments, arguments.callee.length))); + return completer.apply(self || this, [context].concat(Array.slice(arguments, fork.length))); if (completer) return null; @@ -668,14 +668,13 @@ const Completion = Module("completion", { context = context.contexts["/list"]; context.wait(); - let list = template.commandOutput(commandline.command, + commandline.commandOutput(
{ template.map(context.contextList.filter(function (c) c.hasItems),
function (context)
template.completionRow(context.title, "CompTitle") +
template.map(context.items, function (item) context.createRow(item), null, 100)) }
);
- commandline.echo(list, commandline.HL_NORMAL, commandline.FORCE_MULTILINE);
},
////////////////////////////////////////////////////////////////////////////////
@@ -765,13 +764,11 @@ const Completion = Module("completion", {
commands.add(["contexts"],
"List the completion contexts used during completion of an ex command",
function (args) {
- commandline.echo(template.commandOutput(commandline.command,
+ commandline.commandOutput(
{ template.completionRow(["Context", "Title"], "CompTitle") }
{ template.map(completion.contextList || [], function (item) template.completionRow(item, "CompItem")) }
-
),
- null, commandline.FORCE_MULTILINE);
-
+ );
},
{
argCount: "1",
diff --git a/common/content/configbase.js b/common/content/configbase.js
index 9005f122..5fb75d29 100644
--- a/common/content/configbase.js
+++ b/common/content/configbase.js
@@ -229,13 +229,13 @@ const ConfigBase = Class(ModuleBase, {
HelpOptionalArg color: #6A97D4;
HelpBody display: block; margin: 1em auto; max-width: 100ex;
- HelpBorder,*,dactyl://help/* border-color: silver; border-width: 0px; border-style: solid;
+ HelpBorder,*,dactyl://help/* border-color: silver; border-width: 0px; border-style: solid;
HelpCode display: block; white-space: pre; margin-left: 2em; font-family: Terminus, Fixed, monospace;
HelpDefault margin-right: 1ex; white-space: pre;
HelpDescription display: block;
- HelpEm,html|em,dactyl://help/* font-weight: bold; font-style: normal;
+ HelpEm,html|em,dactyl://help/* font-weight: bold; font-style: normal;
HelpEx display: inline-block; color: #527BBD; font-weight: bold;
@@ -250,21 +250,21 @@ const ConfigBase = Class(ModuleBase, {
HelpKey color: #102663;
- HelpLink,html|a,dactyl://help/* text-decoration: none;
+ HelpLink,html|a,dactyl://help/* text-decoration: none;
HelpLink[href]:hover text-decoration: underline;
- HelpList,html|ul,dactyl://help/* display: block; list-style: outside disc;
- HelpOrderedList,html|ol,dactyl://help/* display: block; list-style: outside decimal;
- HelpListItem,html|li,dactyl://help/* display: list-item;
+ HelpList,html|ul,dactyl://help/* display: block; list-style: outside disc;
+ HelpOrderedList,html|ol,dactyl://help/* display: block; list-style: outside decimal;
+ HelpListItem,html|li,dactyl://help/* display: list-item;
HelpNote color: red; font-weight: bold;
HelpOpt color: #106326;
HelpOptInfo display: inline-block; margin-bottom: 1ex;
- HelpParagraph,html|p,dactyl://help/* display: block; margin: 1em 0em;
+ HelpParagraph,html|p,dactyl://help/* display: block; margin: 1em 0em;
HelpParagraph:first-child margin-top: 0;
- HelpSpec display: block; margin-left: -10em; float: left; clear: left; color: #527BBD;
+ HelpSpec display: block; margin-left: -10em; float: left; clear: left; color: #527BBD; margin-right: 2em;
HelpString display: inline-block; color: green; font-weight: normal; vertical-align: text-top;
HelpString::before content: '"';
diff --git a/common/content/dactyl-overlay.js b/common/content/dactyl-overlay.js
index 32f23e9a..af0cc3be 100644
--- a/common/content/dactyl-overlay.js
+++ b/common/content/dactyl-overlay.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2008 Kris Maglione | Code execution summary | @@ -1705,7 +1679,6 @@ const Dactyl = Module("dactyl", {||
|---|---|---|
| Average time: | {each.toFixed(2)} | {eachUnits} |
| Total time: | {total.toFixed(2)} | {totalUnits} |
{navigator.userAgent})); + commandline.commandOutput(<> + {config.name} {dactyl.version} running on:
{navigator.userAgent} + ); }, { argCount: "0", bang: true diff --git a/common/content/editor.js b/common/content/editor.js index ee77772f..6a2c7197 100644 --- a/common/content/editor.js +++ b/common/content/editor.js @@ -11,8 +11,6 @@ /** @instance editor */ const Editor = Module("editor", { - requires: ["config"], - init: function () { // store our last search with f, F, t or T // @@ -408,10 +406,10 @@ const Editor = Module("editor", { // blink the textbox after returning if (textBox) { let colors = [tmpBg, oldBg, tmpBg, oldBg]; - (function () { + (function next() { textBox.style.backgroundColor = colors.shift(); if (colors.length > 0) - setTimeout(arguments.callee, 100); + setTimeout(next, 100); })(); } @@ -577,10 +575,8 @@ const Editor = Module("editor", { dactyl.echo(mode + " " + lhs + " " + rhs, commandline.FORCE_SINGLELINE); // 2 spaces, 3 spaces } - else { - list = template.tabular(["", "LHS", "RHS"], [], list); - commandline.echo(list, commandline.HL_NORMAL, commandline.FORCE_MULTILINE); - } + else + commandline.commandOutput(template.tabular(["", "LHS", "RHS"], [], list)); }, /** @@ -670,7 +666,7 @@ const Editor = Module("editor", { }, { completer: function (context, args) completion.abbreviation(context, args, mode), literal: 0, - serial: function () [ { + serialize: function () [ { command: this.name, arguments: [lhs], literalArg: abbr[1] diff --git a/common/content/events.js b/common/content/events.js index 574dd3f9..455bd0e0 100644 --- a/common/content/events.js +++ b/common/content/events.js @@ -12,8 +12,6 @@ * @instance events */ const Events = Module("events", { - requires: ["autocommands", "config"], - init: function () { const self = this; @@ -737,12 +735,10 @@ const Events = Module("events", { // TODO: Merge with onFocusChange onFocus: function (event) { - function hasHTMLDocument(win) win && win.document && win.document instanceof HTMLDocument - let elem = event.originalTarget; let win = elem.ownerDocument && elem.ownerDocument.defaultView || elem; - if (hasHTMLDocument(win) && !buffer.focusAllowed(win) + if (Events.isContentNode(elem) && !buffer.focusAllowed(win) && isinstance(elem, [HTMLInputElement, HTMLSelectElement, HTMLTextAreaElement])) elem.blur(); }, @@ -1107,6 +1103,13 @@ const Events = Module("events", { editableInputs: set(["date", "datetime", "datetime-local", "email", "file", "month", "number", "password", "range", "search", "tel", "text", "time", "url", "week"]), + isContentNode: function (node) { + let win = (node.ownerDocument || node).defaultView; + for (; win; win = win.parent != win && win.parent) + if (win == window.content) + return true; + return false; + }, isInputElemFocused: function () { let elem = dactyl.focus; return elem instanceof HTMLInputElement && set.has(Events.editableInputs, elem.type) || diff --git a/common/content/finder.js b/common/content/finder.js index 463506ff..21650c83 100644 --- a/common/content/finder.js +++ b/common/content/finder.js @@ -8,8 +8,6 @@ /** @instance rangefinder */ const RangeFinder = Module("rangefinder", { - requires: ["config"], - init: function () { this.lastSearchPattern = ""; }, @@ -128,7 +126,7 @@ const RangeFinder = Module("rangefinder", { set rangeFind(val) buffer.localStore.rangeFind = val, /** - * Highlights all occurances of str in the buffer. + * Highlights all occurrences of str in the buffer. * * @param {string} str The string to highlight. */ @@ -146,6 +144,11 @@ const RangeFinder = Module("rangefinder", { } }, { }, { + modes: function () { + /* Must come before commandline. */ + modes.addMode("FIND_FORWARD", true); + modes.addMode("FIND_BACKWARD", true); + }, commandline: function () { // Event handlers for search - closure is needed commandline.registerCallback("change", modes.FIND_FORWARD, this.closure.onKeyPress); @@ -197,10 +200,6 @@ const RangeFinder = Module("rangefinder", { }); }, - modes: function () { - modes.addMode("FIND_FORWARD", true); - modes.addMode("FIND_BACKWARD", true); - }, options: function () { options.safeSetPref("accessibility.typeaheadfind.autostart", false); // The above should be sufficient, but: https://bugzilla.mozilla.org/show_bug.cgi?id=348187 @@ -256,8 +255,8 @@ const RangeFinder = Module("rangefinder", { * implementation will begin searching from the position of the * caret in the last active frame. This is contrary to the behavior * of the builtin component, which always starts a search from the - * begining of the first frame in the case of frameset documents, - * and cycles through all frames from begining to end. This makes it + * beginning of the first frame in the case of frameset documents, + * and cycles through all frames from beginning to end. This makes it * impossible to choose the starting point of a search for such * documents, and represents a major detriment to productivity where * large amounts of data are concerned (e.g., for API documents). @@ -302,8 +301,8 @@ const RangeFind = Class("RangeFind", { }, compareRanges: function (r1, r2) - this.backward ? r1.compareBoundaryPoints(Range.END_TO_START, r2) - : -r1.compareBoundaryPoints(Range.START_TO_END, r2), + this.backward ? r1.compareBoundaryPoints(r1.END_TO_START, r2) + : -r1.compareBoundaryPoints(r1.START_TO_END, r2), findRange: function (range) { let doc = range.startContainer.ownerDocument; @@ -331,7 +330,7 @@ const RangeFind = Class("RangeFind", { this.lastRange.commonAncestorContainer).snapshotItem(0); if (node) { node.focus(); - // Rehighlight collapsed selection + // Re-highlight collapsed selection this.selectedRange = this.lastRange; } }, @@ -358,7 +357,7 @@ const RangeFind = Class("RangeFind", { let string = this.lastString; for (let r in this.iter(string)) { let controller = this.range.selectionController; - for (let node=r.startContainer; node; node=node.parentNode) + for (let node = r.startContainer; node; node = node.parentNode) if (node instanceof Ci.nsIDOMNSEditableElement) { controller = node.editor.selectionController; break; @@ -370,11 +369,30 @@ const RangeFind = Class("RangeFind", { this.selections.push(sel); } this.highlighted = this.lastString; - this.selectedRange = this.lastRange; + if (this.lastRange) + this.selectedRange = this.lastRange; this.addListeners(); } }, + indexIter: function (private_) { + let idx = this.range.index; + if (this.backward) + var groups = [util.range(idx + 1, 0, -1), util.range(this.ranges.length, idx, -1)]; + else + var groups = [util.range(idx, this.ranges.length), util.range(0, idx + 1)]; + + for (let i in groups[0]) + yield i; + + if (!private_) { + this.wrapped = true; + this.lastRange = null; + for (let i in groups[1]) + yield i; + } + }, + iter: function (word) { let saved = ["range", "lastRange", "lastString"].map(function (s) [s, this[s]], this); try { @@ -382,7 +400,7 @@ const RangeFind = Class("RangeFind", { this.lastRange = null; this.lastString = word; var res; - while ((res = this.search(null, this.reverse, true))) + while (res = this.search(null, this.reverse, true)) yield res; } finally { @@ -504,25 +522,8 @@ const RangeFind = Class("RangeFind", { if (word == "") var range = this.startRange; - else { - function indices() { - let idx = this.range.index; - if (this.backward) - var groups = [util.range(idx + 1, 0, -1), util.range(this.ranges.length, idx, -1)]; - else - var groups = [util.range(idx, this.ranges.length), util.range(0, idx + 1)]; - - for (let i in groups[0]) - yield i; - - if (!private_) { - this.wrapped = true; - this.lastRange = null; - for (let i in groups[1]) - yield i; - } - } - for (let i in indices.call(this)) { + else + for (let i in this.indexIter(private_)) { if (!private_ && this.range.window != this.ranges[i].window && this.range.window != this.ranges[i].window.parent) { this.range.descroll(); this.range.deselect(); @@ -540,7 +541,6 @@ const RangeFind = Class("RangeFind", { if (range) break; } - } if (range) this.lastRange = range.cloneRange(); @@ -559,11 +559,11 @@ const RangeFind = Class("RangeFind", { }, addListeners: function () { - for (let range in values(this.ranges)) + for (let range in array.itervalues(this.ranges)) range.window.addEventListener("unload", this.closure.onUnload, true); }, purgeListeners: function () { - for (let range in values(this.ranges)) + for (let range in array.itervalues(this.ranges)) range.window.removeEventListener("unload", this.closure.onUnload, true); }, onUnload: function (event) { @@ -591,8 +591,8 @@ const RangeFind = Class("RangeFind", { }, intersects: function (range) - this.range.compareBoundaryPoints(Range.START_TO_END, range) >= 0 && - this.range.compareBoundaryPoints(Range.END_TO_START, range) <= 0, + this.range.compareBoundaryPoints(range.START_TO_END, range) >= 0 && + this.range.compareBoundaryPoints(range.END_TO_START, range) <= 0, save: function () { this.scroll = Point(this.window.pageXOffset, this.window.pageYOffset); @@ -625,8 +625,8 @@ const RangeFind = Class("RangeFind", { }), contains: function (range, r) - range.compareBoundaryPoints(Range.START_TO_END, r) >= 0 && - range.compareBoundaryPoints(Range.END_TO_START, r) <= 0, + range.compareBoundaryPoints(range.START_TO_END, r) >= 0 && + range.compareBoundaryPoints(range.END_TO_START, r) <= 0, endpoint: function (range, before) { range = range.cloneRange(); range.collapse(before); @@ -634,7 +634,7 @@ const RangeFind = Class("RangeFind", { }, equal: function (r1, r2) { try { - return !r1.compareBoundaryPoints(Range.START_TO_START, r2) && !r1.compareBoundaryPoints(Range.END_TO_END, r2) + return !r1.compareBoundaryPoints(r1.START_TO_START, r2) && !r1.compareBoundaryPoints(r1.END_TO_END, r2) } catch (e) {} return false; diff --git a/common/content/hints.js b/common/content/hints.js index 4ffe9ca7..2c6b8efc 100644 --- a/common/content/hints.js +++ b/common/content/hints.js @@ -10,8 +10,6 @@ /** @instance hints */ const Hints = Module("hints", { - requires: ["config"], - init: function () { this._hintMode = null; diff --git a/common/content/history.js b/common/content/history.js index abed5893..d8962567 100644 --- a/common/content/history.js +++ b/common/content/history.js @@ -7,8 +7,6 @@ "use strict"; const History = Module("history", { - requires: ["config"], - get format() bookmarks.format, get service() services.get("history"), @@ -196,7 +194,7 @@ const History = Module("history", { bang: true, completer: function (context) { context.quote = null; completion.history(context); }, // completer: function (filter) completion.history(filter) - options: [[["-max", "-m"], commands.OPTION_INT]] + options: [{ names: ["-max", "-m"], description: "The maximum number of items to list", type: CommandOption.INT }] }); }, completion: function () { diff --git a/common/content/io.js b/common/content/io.js index 51a00e37..ebe86d6a 100755 --- a/common/content/io.js +++ b/common/content/io.js @@ -10,311 +10,27 @@ /** @scope modules */ plugins.contexts = {}; -const Script = Class("Script", { - init: function (file) { - let self = plugins.contexts[file.path]; - if (self) { - if (self.onUnload) - self.onUnload(); - return self; - } - plugins.contexts[file.path] = this; - this.NAME = file.leafName.replace(/\..*/, "").replace(/-([a-z])/g, function (m, n1) n1.toUpperCase()); - this.PATH = file.path; - this.toString = this.toString; - this.__context__ = this; - this.__proto__ = plugins; - - // This belongs elsewhere - for (let [, dir] in Iterator(io.getRuntimeDirectories("plugin"))) { - if (dir.contains(file, false)) - plugins[this.NAME] = this; - } - return this; - } -}); - -/** - * @class File A class to wrap nsIFile objects and simplify operations - * thereon. - * - * @param {nsIFile|string} path Expanded according to {@link IO#expandPath} - * @param {boolean} checkPWD Whether to allow expansion relative to the - * current directory. @default true - */ -const File = Class("File", { - init: function (path, checkPWD) { - if (arguments.length < 2) - checkPWD = true; - - let file = services.create("file"); - - if (path instanceof Ci.nsIFile) - file = path; - else if (/file:\/\//.test(path)) - file = services.create("file:").getFileFromURLSpec(path); - else { - let expandedPath = File.expandPath(path); - - if (!File.isAbsolutePath(expandedPath) && checkPWD) - file = File.joinPaths(io.getCurrentDirectory().path, expandedPath); - else - file.initWithPath(expandedPath); - } - let self = XPCSafeJSObjectWrapper(file); - self.__proto__ = File.prototype; +function Script(file) { + let self = plugins.contexts[file.path]; + if (self) { + if (self.onUnload) + self.onUnload(); return self; - }, + } + self = { __proto__: plugins }; + plugins.contexts[file.path] = self; + self.NAME = file.leafName.replace(/\..*/, "").replace(/-([a-z])/g, function (m, n1) n1.toUpperCase()); + self.PATH = file.path; + self.__context__ = self; + self.__proto__ = plugins; - /** - * Iterates over the objects in this directory. - */ - iterDirectory: function () { - if (!this.isDirectory()) - throw Error("Not a directory"); - let entries = this.directoryEntries; - while (entries.hasMoreElements()) - yield File(entries.getNext().QueryInterface(Ci.nsIFile)); - }, - /** - * Returns the list of files in this directory. - * - * @param {boolean} sort Whether to sort the returned directory - * entries. - * @returns {nsIFile[]} - */ - readDirectory: function (sort) { - if (!this.isDirectory()) - throw Error("Not a directory"); - - let array = [e for (e in this.iterDirectory())]; - if (sort) - array.sort(function (a, b) b.isDirectory() - a.isDirectory() || String.localeCompare(a.path, b.path)); - return array; - }, - - /** - * Reads this file's entire contents in "text" mode and returns the - * content as a string. - * - * @param {string} encoding The encoding from which to decode the file. - * @default options["fileencoding"] - * @returns {string} - */ - read: function (encoding) { - let ifstream = Cc["@mozilla.org/network/file-input-stream;1"].createInstance(Ci.nsIFileInputStream); - let icstream = Cc["@mozilla.org/intl/converter-input-stream;1"].createInstance(Ci.nsIConverterInputStream); - - if (!encoding) - encoding = options["fileencoding"]; - - ifstream.init(this, -1, 0, 0); - icstream.init(ifstream, encoding, 4096, Ci.nsIConverterInputStream.DEFAULT_REPLACEMENT_CHARACTER); // 4096 bytes buffering - - let buffer = []; - let str = {}; - while (icstream.readString(4096, str) != 0) - buffer.push(str.value); - - icstream.close(); - ifstream.close(); - return buffer.join(""); - }, - - /** - * Writes the string buf to this file. - * - * @param {string} buf The file content. - * @param {string|number} mode The file access mode, a bitwise OR of - * the following flags: - * {@link #MODE_RDONLY}: 0x01 - * {@link #MODE_WRONLY}: 0x02 - * {@link #MODE_RDWR}: 0x04 - * {@link #MODE_CREATE}: 0x08 - * {@link #MODE_APPEND}: 0x10 - * {@link #MODE_TRUNCATE}: 0x20 - * {@link #MODE_SYNC}: 0x40 - * Alternatively, the following abbreviations may be used: - * ">" is equivalent to {@link #MODE_WRONLY} | {@link #MODE_CREATE} | {@link #MODE_TRUNCATE} - * ">>" is equivalent to {@link #MODE_WRONLY} | {@link #MODE_CREATE} | {@link #MODE_APPEND} - * @default ">" - * @param {number} perms The file mode bits of the created file. This - * is only used when creating a new file and does not change - * permissions if the file exists. - * @default 0644 - * @param {string} encoding The encoding to used to write the file. - * @default options["fileencoding"] - */ - write: function (buf, mode, perms, encoding) { - let ofstream = Cc["@mozilla.org/network/file-output-stream;1"].createInstance(Ci.nsIFileOutputStream); - function getStream(defaultChar) { - let stream = Cc["@mozilla.org/intl/converter-output-stream;1"].createInstance(Ci.nsIConverterOutputStream); - stream.init(ofstream, encoding, 0, defaultChar); - return stream; - } - - if (!encoding) - encoding = options["fileencoding"]; - - if (mode == ">>") - mode = File.MODE_WRONLY | File.MODE_CREATE | File.MODE_APPEND; - else if (!mode || mode == ">") - mode = File.MODE_WRONLY | File.MODE_CREATE | File.MODE_TRUNCATE; - - if (!perms) - perms = parseInt('0644', 8); - - ofstream.init(this, mode, perms, 0); - let ocstream = getStream(0); - try { - ocstream.writeString(buf); - } - catch (e) { - dactyl.dump(e); - if (e.result == Cr.NS_ERROR_LOSS_OF_SIGNIFICANT_DATA) { - ocstream = getStream("?".charCodeAt(0)); - ocstream.writeString(buf); - return false; - } - else - throw e; - } - finally { - try { - ocstream.close(); - } - catch (e) {} - ofstream.close(); - } - return true; + // This belongs elsewhere + for (let [, dir] in Iterator(io.getRuntimeDirectories("plugin"))) { + if (dir.contains(file, false)) + plugins[self.NAME] = self; } -}, { - /** - * @property {number} Open for reading only. - * @final - */ - MODE_RDONLY: 0x01, - - /** - * @property {number} Open for writing only. - * @final - */ - MODE_WRONLY: 0x02, - - /** - * @property {number} Open for reading and writing. - * @final - */ - MODE_RDWR: 0x04, - - /** - * @property {number} If the file does not exist, the file is created. - * If the file exists, this flag has no effect. - * @final - */ - MODE_CREATE: 0x08, - - /** - * @property {number} The file pointer is set to the end of the file - * prior to each write. - * @final - */ - MODE_APPEND: 0x10, - - /** - * @property {number} If the file exists, its length is truncated to 0. - * @final - */ - MODE_TRUNCATE: 0x20, - - /** - * @property {number} If set, each write will wait for both the file - * data and file status to be physically updated. - * @final - */ - MODE_SYNC: 0x40, - - /** - * @property {number} With MODE_CREATE, if the file does not exist, the - * file is created. If the file already exists, no action and NULL - * is returned. - * @final - */ - MODE_EXCL: 0x80, - - expandPathList: function (list) list.map(this.expandPath), - - expandPath: function (path, relative) { - - // expand any $ENV vars - this is naive but so is Vim and we like to be compatible - // TODO: Vim does not expand variables set to an empty string (and documents it). - // Kris reckons we shouldn't replicate this 'bug'. --djk - // TODO: should we be doing this for all paths? - function expand(path) path.replace( - !dactyl.has("Win32") ? /\$(\w+)\b|\${(\w+)}/g - : /\$(\w+)\b|\${(\w+)}|%(\w+)%/g, - function (m, n1, n2, n3) services.get("environment").get(n1 || n2 || n3) || m - ); - path = expand(path); - - // expand ~ - // Yuck. - if (!relative && RegExp("~(?:$|[/" + util.escapeRegex(IO.PATH_SEP) + "])").test(path)) { - // Try $HOME first, on all systems - let home = services.get("environment").get("HOME"); - - // Windows has its own idiosyncratic $HOME variables. - if (!home && dactyl.has("Win32")) - home = services.get("environment").get("USERPROFILE") || - services.get("environment").get("HOMEDRIVE") + services.get("environment").get("HOMEPATH"); - - path = home + path.substr(1); - } - - // TODO: Vim expands paths twice, once before checking for ~, once - // after, but doesn't document it. Is this just a bug? --Kris - path = expand(path); - return path.replace("/", IO.PATH_SEP, "g"); - }, - - getPathsFromPathList: function (list) { - if (!list) - return []; - // empty list item means the current directory - return list.replace(/,$/, "").split(",") - .map(function (dir) dir == "" ? io.getCurrentDirectory().path : dir); - }, - - replacePathSep: function (path) path.replace("/", IO.PATH_SEP, "g"), - - joinPaths: function (head, tail) { - let path = this(head); - try { - path.appendRelativePath(this.expandPath(tail, true)); // FIXME: should only expand env vars and normalise path separators - // TODO: This code breaks the external editor at least in ubuntu - // because /usr/bin/gvim becomes /usr/bin/vim.gnome normalized and for - // some strange reason it will start without a gui then (which is not - // optimal if you don't start firefox from a terminal ;) - // Why do we need this code? - // if (path.exists() && path.normalize) - // path.normalize(); - } - catch (e) { - return { exists: function () false, __noSuchMethod__: function () { throw e; } }; - } - return path; - }, - - isAbsolutePath: function (path) { - try { - services.create("file").initWithPath(path); - return true; - } - catch (e) { - return false; - } - } -}); + return self; +} // TODO: why are we passing around strings rather than file objects? /** @@ -322,8 +38,6 @@ const File = Class("File", { * @instance io */ const IO = Module("io", { - requires: ["config", "services"], - init: function () { this._processDir = services.get("directory").get("CurWorkD", Ci.nsIFile); this._cwd = this._processDir; @@ -363,7 +77,10 @@ const IO = Module("io", { * @property {function} File class. * @final */ - File: File, + File: Class("File", File, { + init: function init(path, checkCWD) + init.supercall(this, path, (arguments.length < 2 || checkCWD) && io.getCurrentDirectory()) + }), /** * @property {Object} The current file sourcing context. As a file is @@ -423,7 +140,7 @@ const IO = Module("io", { if (newDir == "-") [this._cwd, this._oldcwd] = [this._oldcwd, this.getCurrentDirectory()]; else { - let dir = File(newDir); + let dir = io.File(newDir); if (!dir.exists() || !dir.isDirectory()) { dactyl.echoerr("E344: Can't find directory " + dir.path.quote()); @@ -489,7 +206,7 @@ const IO = Module("io", { file.append(config.tempFile); file.createUnique(Ci.nsIFile.NORMAL_FILE_TYPE, parseInt('0600', 8)); - return File(file); + return io.File(file); }, /** @@ -507,7 +224,7 @@ const IO = Module("io", { let file; if (File.isAbsolutePath(program)) - file = File(program, true); + file = io.File(program, true); else { let dirs = services.get("environment").get("PATH").split(dactyl.has("Win32") ? ";" : ":"); // Windows tries the CWD first TODO: desirable? @@ -600,7 +317,7 @@ lookup: dactyl.dump("sourcing " + filename); let time = Date.now(); try { - var file = File(filename); + var file = io.File(filename); this.sourcing = { file: file.path, line: 0 @@ -803,12 +520,7 @@ lookup: /** * @property {string} The current platform's path seperator. */ - get PATH_SEP() { - delete this.PATH_SEP; - let f = services.get("directory").get("CurProcD", Ci.nsIFile); - f.append("foo"); - return this.PATH_SEP = f.path.substr(f.parent.path.length, 1); - } + PATH_SEP: File.PATH_SEP }, { commands: function () { commands.add(["cd", "chd[ir]"], @@ -876,13 +588,13 @@ lookup: dactyl.assert(args.length <= 1, "E172: Only one file name allowed"); let filename = args[0] || io.getRCFile(null, true).path; - let file = File(filename); + let file = io.File(filename); dactyl.assert(!file.exists() || args.bang, "E189: " + filename.quote() + " exists (add ! to override)"); // TODO: Use a set/specifiable list here: - let lines = [cmd.serial().map(commands.commandToString) for (cmd in commands) if (cmd.serial)]; + let lines = [cmd.serialize().map(commands.commandToString) for (cmd in commands) if (cmd.serialize)]; lines = util.Array.flatten(lines); // source a user .pentadactylrc file @@ -922,10 +634,9 @@ lookup: commands.add(["scrip[tnames]"], "List all sourced script names", function () { - let list = template.tabular(["
@@ -192,23 +205,13 @@ const Template = Module("template", {
return str;
},
- commandOutput: function generic(command, xml) {
- return <>:{command}
{xml}; - }, - - genericTable: function genericTable(items, format) { - completion.listCompleter(function (context) { - context.filterFunc = null; - if (format) - context.format = format; - context.completions = items; - }); - }, + icon: function (item, text) <> + {item.icon ?
: <>}{text}
+ ,
jumps: function jumps(index, elems) {
//
- return this.commandOutput(
-
+ return
);
+
;
//
},
options: function options(title, opts) {
//
- return this.commandOutput(
-
+ return
);
+
;
//
},
@@ -269,8 +271,7 @@ const Template = Module("template", {
tabular: function tabular(headings, style, iter) {
// TODO: This might be mind-bogglingly slow. We'll see.
//
- return this.commandOutput(
-
+ return
);
+
;
//
},
usage: function usage(iter) {
//
- return this.commandOutput(
-
+ return
{
this.map(iter, function (item)
);
+
;
//
}
});
-// vim: set fdm=marker sw=4 ts=4 et:
+endmodule();
+
+// vim: set fdm=marker sw=4 ts=4 et ft=javascript:
diff --git a/common/content/util.js b/common/modules/util.jsm
similarity index 83%
rename from common/content/util.js
rename to common/modules/util.jsm
index a0ae92c7..5d854b44 100644
--- a/common/content/util.js
+++ b/common/modules/util.jsm
@@ -6,25 +6,71 @@
// given in the LICENSE.txt file included with this file.
"use strict";
-/** @scope modules */
+Components.utils.import("resource://dactyl/base.jsm");
+defmodule("util", this, {
+ exports: ["Math", "NS", "Util", "XHTML", "XUL", "util"],
+ require: ["services"],
+ use: ["template"]
+});
const XHTML = Namespace("html", "http://www.w3.org/1999/xhtml");
const XUL = Namespace("xul", "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
const NS = Namespace("dactyl", "http://vimperator.org/namespaces/liberator");
default xml namespace = XHTML;
-const Util = Module("util", {
+const Util = Module("Util", {
init: function () {
this.Array = array;
},
get activeWindow() services.get("windowWatcher").activeWindow,
+ dactyl: {
+ __noSuchMethod__: function (meth, args) {
+ let win = util.activeWindow;
+ if(win && win.dactyl)
+ return win.dactyl[meth].apply(win.dactyl, args);
+ return null;
+ }
+ },
+
callInMainThread: function (callback, self) {
let mainThread = services.get("threadManager").mainThread;
- if (!services.get("threadManager").isMainThread)
- mainThread.dispatch({ run: callback.call(self) }, mainThread.DISPATCH_NORMAL);
- else
+ if (services.get("threadManager").isMainThread)
callback.call(self);
+ else
+ mainThread.dispatch(Runnable(self, callback), mainThread.DISPATCH_NORMAL);
+ },
+
+ /**
+ * Calls a function asynchronously on a new thread.
+ *
+ * @param {nsIThread} thread The thread to call the function on. If no
+ * thread is specified a new one is created.
+ * @optional
+ * @param {Object} self The 'this' object used when executing the
+ * function.
+ * @param {function} func The function to execute.
+ *
+ */
+ callAsync: function (thread, self, func) {
+ thread = thread || services.get("threadManager").newThread(0);
+ thread.dispatch(Runnable(self, func, Array.slice(arguments, 3)), thread.DISPATCH_NORMAL);
+ },
+
+ /**
+ * Calls a function synchronously on a new thread.
+ *
+ * NOTE: Be sure to call GUI related methods like alert() or dump()
+ * ONLY in the main thread.
+ *
+ * @param {nsIThread} thread The thread to call the function on. If no
+ * thread is specified a new one is created.
+ * @optional
+ * @param {function} func The function to execute.
+ */
+ callInThread: function (thread, func) {
+ thread = thread || services.get("threadManager").newThread(0);
+ thread.dispatch(Runnable(null, func, Array.slice(arguments, 2)), thread.DISPATCH_SYNC);
},
/**
@@ -88,7 +134,7 @@ const Util = Module("util", {
clipboardHelper.copyString(str);
if (verbose)
- dactyl.echo("Yanked " + str, commandline.FORCE_SINGLELINE);
+ util.dactyl.echomsg("Yanked " + str);
},
/**
@@ -112,7 +158,10 @@ const Util = Module("util", {
* @param {string} pattern The pattern to deglob.
* @returns [string] The resulting strings.
*/
- debrace: function deglobBrace(pattern) {
+ debrace: function debrace(pattern) {
+ if (pattern.indexOf("{") == -1)
+ return [pattern];
+
function split(pattern, re, fn, dequote) {
let end = 0, match, res = [];
while (match = re.exec(pattern)) {
@@ -132,7 +181,7 @@ const Util = Module("util", {
}, "{}");
function rec(acc) {
if (acc.length == patterns.length)
- res.push(util.Array.zip(substrings, acc).join(""));
+ res.push(array(substrings).zip(acc).flatten().join(""));
else
for (let [, pattern] in Iterator(patterns[acc.length]))
rec(acc.concat(pattern));
@@ -203,7 +252,7 @@ const Util = Module("util", {
*/
evaluateXPath: function (expression, doc, elem, asIterator) {
if (!doc)
- doc = content.document;
+ doc = util.activeWindow.content.document;
if (!elem)
elem = doc;
if (isarray(expression))
@@ -246,20 +295,6 @@ const Util = Module("util", {
return dest;
},
- /**
- * Returns the selection controller for the given window.
- *
- * @param {Window} window
- * @returns {nsISelectionController}
- */
- selectionController: function (win)
- win.QueryInterface(Ci.nsIInterfaceRequestor)
- .getInterface(Ci.nsIWebNavigation)
- .QueryInterface(Ci.nsIDocShell)
- .QueryInterface(Ci.nsIInterfaceRequestor)
- .getInterface(Ci.nsISelectionDisplay)
- .QueryInterface(Ci.nsISelectionController),
-
/**
* Converts bytes to a pretty printed data size string.
*
@@ -326,7 +361,7 @@ const Util = Module("util", {
return xmlhttp;
}
catch (e) {
- dactyl.log("Error opening " + String.quote(url) + ": " + e, 1);
+ util.dactyl.log("Error opening " + String.quote(url) + ": " + e, 1);
return null;
}
},
@@ -396,6 +431,8 @@ const Util = Module("util", {
*/
memoize: memoize,
+ newThread: function () services.get("threadManager").newThread(0),
+
/**
* Converts a URI string into a URI object.
*
@@ -471,13 +508,11 @@ const Util = Module("util", {
let keys = [];
try { // window.content often does not want to be queried with "var i in object"
- let hasValue = !("__iterator__" in object);
- /*
- if (modules.isPrototypeOf(object)) {
+ let hasValue = !("__iterator__" in object || isinstance(object, ["Generator", "Iterator"]));
+ if (object.dactyl && object.modules && object.modules.modules == object.modules) {
object = Iterator(object);
hasValue = false;
}
- */
for (let i in object) {
let value = ]]>;
try {
@@ -604,6 +639,28 @@ const Util = Module("util", {
elem.scrollIntoView();
},
+ /**
+ * Returns the selection controller for the given window.
+ *
+ * @param {Window} window
+ * @returns {nsISelectionController}
+ */
+ selectionController: function (win)
+ win.QueryInterface(Ci.nsIInterfaceRequestor)
+ .getInterface(Ci.nsIWebNavigation)
+ .QueryInterface(Ci.nsIDocShell)
+ .QueryInterface(Ci.nsIInterfaceRequestor)
+ .getInterface(Ci.nsISelectionDisplay)
+ .QueryInterface(Ci.nsISelectionController),
+
+ /**
+ * Suspend execution for at least 'delay' milliseconds. Functions by
+ * yielding execution to the next item in the main event queue, and
+ * so may lead to unexpected call graphs, and long delays if another
+ * handler yields execution while waiting.
+ *
+ * @param {number} delay The time period for which to sleep in milliseconds.
+ */
sleep: function (delay) {
let mainThread = services.get("threadManager").mainThread;
@@ -613,6 +670,44 @@ const Util = Module("util", {
return true;
},
+ highlightFilter: function highlightFilter(str, filter, highlight) {
+ return this.highlightSubstrings(str, (function () {
+ if (filter.length == 0)
+ return;
+ let lcstr = String.toLowerCase(str);
+ let lcfilter = filter.toLowerCase();
+ let start = 0;
+ while ((start = lcstr.indexOf(lcfilter, start)) > -1) {
+ yield [start, filter.length];
+ start += filter.length;
+ }
+ })(), highlight || template.filter);
+ },
+
+ /**
+ * Behaves like String.split, except that when 'limit' is reached,
+ * the trailing element contains the entire trailing portion of the
+ * string.
+ *
+ * util.split("a, b, c, d, e", /, /, 3) -> ["a", "b", "c, d, e"]
+ * @param {string} str The string to split.
+ * @param {RegExp|string} re The regular expression on which to split the string.
+ * @param {number} limit The maximum number of elements to return.
+ * @returns {[string]}
+ */
+ split: function (str, re, limit) {
+ if (!re.global)
+ re = RegExp(re.source || re, "g");
+ let match, start = 0, res = [];
+ while ((match = re.exec(str)) && --limit && match[0].length) {
+ res.push(str.substring(start, match.index));
+ start = match.index + match[0].length;
+ }
+ if (limit)
+ res.push(str.substring(start));
+ return res;
+ },
+
/**
* Split a string on literal occurrences of a marker.
*
@@ -670,7 +765,7 @@ const Util = Module("util", {
if (node.length() != 1) {
let domnode = doc.createDocumentFragment();
for each (let child in node)
- domnode.appendChild(arguments.callee(child, doc, nodes));
+ domnode.appendChild(xmlToDom(child, doc, nodes));
return domnode;
}
switch (node.nodeKind()) {
@@ -681,7 +776,7 @@ const Util = Module("util", {
for each (let attr in node.@*)
domnode.setAttributeNS(attr.name() == "highlight" ? NS.uri : attr.namespace(), attr.name(), String(attr));
for each (let child in node.*)
- domnode.appendChild(arguments.callee(child, doc, nodes));
+ domnode.appendChild(xmlToDom(child, doc, nodes));
if (nodes && node.@key)
nodes[node.@key] = domnode;
return domnode;
@@ -697,8 +792,9 @@ const Util = Module("util", {
* Math utility methods.
* @singleton
*/
+const GlobalMath = Math;
var Math = {
- __proto__: window.Math,
+ __proto__: GlobalMath,
/**
* Returns the specified value constrained to the range min -
@@ -712,4 +808,8 @@ var Math = {
constrain: function constrain(value, min, max) Math.min(Math.max(min, value), max)
};
-// vim: set fdm=marker sw=4 ts=4 et:
+// catch(e){dump(e.fileName+":"+e.lineNumber+": "+e+"\n");}
+
+endmodule();
+
+// vim: set fdm=marker sw=4 ts=4 et ft=javascript:
diff --git a/pentadactyl/Makefile b/pentadactyl/Makefile
index 81f4685f..71d2f47f 100644
--- a/pentadactyl/Makefile
+++ b/pentadactyl/Makefile
@@ -1,6 +1,6 @@
#### configuration
-VERSION = 2.3a1pre
+VERSION = 1.0pre
NAME = pentadactyl
include ../common/Makefile
diff --git a/pentadactyl/TODO b/pentadactyl/TODO
index a609c847..433cab04 100644
--- a/pentadactyl/TODO
+++ b/pentadactyl/TODO
@@ -41,11 +41,10 @@ BUGS:
- The MOW shouldn't close when executing hints and ;F isn't working.
FEATURES:
+9 Support multiple bookmarks, -keyword, -tags in :delbmarks
8 Document Textarea, Caret and Visual modes.
8 Replace config.name tests in dactyl with more specific feature
tests or overridable APIs where at all feasible.
-8 change the extension ID to pentadactyl@vimperator.org rather than
- pentadactyl@mozdev.org
8 finish :help TODOs
8 fix local options
8 adaptive timeout for auto-completions, :set completions can be updated more often than
diff --git a/pentadactyl/chrome.manifest b/pentadactyl/chrome.manifest
index 153d6654..63e863c7 100644
--- a/pentadactyl/chrome.manifest
+++ b/pentadactyl/chrome.manifest
@@ -9,7 +9,7 @@ resource dactyl ../common/modules/
skin dactyl classic/1.0 ../common/skin/
override chrome://dactyl/content/dactyl.dtd chrome://pentadactyl/content/dactyl.dtd
-override chrome://dactyl/content/config.js chrome://pentadactyl/content/config.js
+override chrome://dactyl/content/config.js chrome://pentadactyl/content/config.js
overlay chrome://browser/content/browser.xul chrome://dactyl/content/dactyl.xul
overlay chrome://browser/content/browser.xul chrome://pentadactyl/content/pentadactyl.xul
diff --git a/pentadactyl/content/about.html b/pentadactyl/content/about.html
index 820879b0..50b333c3 100644
--- a/pentadactyl/content/about.html
+++ b/pentadactyl/content/about.html
@@ -16,11 +16,9 @@
version ###VERSION###
-by Martin Stubenschrott et al.
+by Kris Maglione et al.
Pentadactyl is open source and freely distributable
-Sponsor Pentadactyl development!
{xml}; - }, - - genericTable: function genericTable(items, format) { - completion.listCompleter(function (context) { - context.filterFunc = null; - if (format) - context.format = format; - context.completions = items; - }); - }, + icon: function (item, text) <> + {item.icon ?
| jump | title | URI | {val.URI.spec} | ) } -
|---|---|---|---|
| --- {title} --- |
|---|
| {item.description} |
version ###VERSION###
-by Martin Stubenschrott et al.
+by Kris Maglione et al.
Pentadactyl is open source and freely distributable
-Sponsor Pentadactyl development!type :help sponsor<Enter> for information
-
type :q<Enter> to exit
type :help<Enter> or <F1> for on-line help
type :help version-2.1<Enter> for version info
diff --git a/pentadactyl/content/config.js b/pentadactyl/content/config.js
index 64bebd44..b727bbf3 100644
--- a/pentadactyl/content/config.js
+++ b/pentadactyl/content/config.js
@@ -6,10 +6,6 @@
// given in the LICENSE.txt file included with this file.
const Config = Module("config", ConfigBase, {
- init: function () {
- },
-
- /*** required options, no checks done if they really exist, so be careful ***/
name: "Pentadactyl",
hostApplication: "Firefox",
@@ -122,12 +118,13 @@ const Config = Module("config", ConfigBase, {
},
scripts: [
- "browser.js",
- "bookmarks.js",
- "history.js",
- "quickmarks.js",
- "sanitizer.js",
- "tabs.js"
+ "browser",
+ "bookmarkcache",
+ "bookmarks",
+ "history",
+ "quickmarks",
+ "sanitizer",
+ "tabs"
],
get tempFile() {
@@ -299,6 +296,7 @@ const Config = Module("config", ConfigBase, {
"": modes.NORMAL | modes.INSERT,
"": modes.NORMAL | modes.INSERT
};
+ config.modes.forEach(function (mode) { modes.addMode.apply(this, mode); });
},
options: function () {
options.add(["online"],
diff --git a/pentadactyl/install.rdf b/pentadactyl/install.rdf
index e8523b45..e5c747c5 100644
--- a/pentadactyl/install.rdf
+++ b/pentadactyl/install.rdf
@@ -1,13 +1,13 @@
+ xmlns:em="http://www.mozilla.org/2004/em-rdf#">
pentadactyl@dactyl.googlecode.com
Pentadactyl
@VERSION@
Make Firefox behave like Vim
Kris Maglione
- http://pentadactyl.sf.net/
+ http://dactyl.sf.net/
chrome://pentadactyl/skin/icon.png
chrome://dactyl/content/preferences.xul
@@ -19,7 +19,7 @@
{ec8030f7-c20a-464f-9b0e-13a3a9e97384}
3.5
- 4.0
+ 4.0b5pre