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

Fix about:pentadactyl by registering the component manually. Et cetera.

Browse Source
This commit is contained in:
Kris Maglione
2011-01-03 17:06:28 -05:00
parent e8c5664c8f
commit 30ec5fc393
9 changed files with 98 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
common/bootstrap.js vendored
View File

@@ -88,28 +88,16 @@ FactoryProxy.prototype = {
QueryInterface: XPCOMUtils.generateQI(Ci.nsIFactory), QueryInterface: XPCOMUtils.generateQI(Ci.nsIFactory),
register: function () { register: function () {
dump("dactyl: bootstrap: register: " + this.classID + " " + this.contractID + "\n"); dump("dactyl: bootstrap: register: " + this.classID + " " + this.contractID + "\n");
manager.registerFactory(this.classID,
String(this.classID), JSMLoader.registerFactory(this);
this.contractID,
this);
},
unregister: function () {
dump("dactyl: bootstrap: unregister: " + this.classID + " " + this.contractID + "\n");
manager.unregisterFactory(this.classID, this);
}, },
get module() { get module() {
try {
dump("dactyl: bootstrap: create module: " + this.contractID + "\n"); dump("dactyl: bootstrap: create module: " + this.contractID + "\n");
Object.defineProperty(this, "module", { value: {}, enumerable: true }); Object.defineProperty(this, "module", { value: {}, enumerable: true });
JSMLoader.load(this.url, this.module); JSMLoader.load(this.url, this.module);
JSMLoader.registerGlobal(this.url, this.module.global); JSMLoader.registerGlobal(this.url, this.module.global);
return this.module; return this.module;
}
catch (e) {
delete this.module;
reportError(e);
throw e;
}
}, },
createInstance: function (iids) { createInstance: function (iids) {
return let (factory = this.module.NSGetFactory(this.classID)) return let (factory = this.module.NSGetFactory(this.classID))
@@ -194,9 +182,6 @@ function shutdown(data, reason) {
services.observer.notifyObservers(null, "dactyl-cleanup", null); services.observer.notifyObservers(null, "dactyl-cleanup", null);
services.observer.notifyObservers(null, "dactyl-cleanup-modules", null); services.observer.notifyObservers(null, "dactyl-cleanup-modules", null);
for (let factory in values(components))
// TODO: Categories;
factory.unregister();
} }
} }

56
common/components/protocols.js
View File

@@ -30,15 +30,14 @@ Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
var ioService = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService); var ioService = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
var systemPrincipal = Cc["@mozilla.org/systemprincipal;1"].getService(Ci.nsIPrincipal); var systemPrincipal = Cc["@mozilla.org/systemprincipal;1"].getService(Ci.nsIPrincipal);
function dataURL(type, data) "data:" + (type || "application/xml;encoding=UTF-8") + "," + escape(data);
function makeChannel(url, orig) { function makeChannel(url, orig) {
try { try {
if (url == null) if (url == null)
return fakeChannel(orig); return fakeChannel(orig);
if (typeof url === "function") if (typeof url === "function")
url = dataURL.apply(null, url()); return let ([type, data] = url()) StringChannel(data, type, orig);
let uri = ioService.newURI(url, null, null);
let channel = ioService.newChannelFromURI(uri); let channel = ioService.newChannel(url, null, null);
channel.contentCharset = "UTF-8"; channel.contentCharset = "UTF-8";
channel.owner = systemPrincipal; channel.owner = systemPrincipal;
channel.originalURI = orig; channel.originalURI = orig;
@@ -52,10 +51,11 @@ function makeChannel(url, orig) {
function fakeChannel(orig) makeChannel("chrome://dactyl/content/does/not/exist", orig); function fakeChannel(orig) makeChannel("chrome://dactyl/content/does/not/exist", orig);
function redirect(to, orig, time) { function redirect(to, orig, time) {
let html = <html><head><meta http-equiv="Refresh" content={(time || 0) + ";" + to}/></head></html>.toXMLString(); let html = <html><head><meta http-equiv="Refresh" content={(time || 0) + ";" + to}/></head></html>.toXMLString();
return makeChannel(dataURL('text/html', html), ioService.newURI(to, null, null)); return StringChannel(html, "text/html", ioService.newURI(to, null, null));
} }
function Factory(clas) ({ function Factory(clas) ({
__proto__: clas.prototype,
createInstance: function (outer, iid) { createInstance: function (outer, iid) {
if (outer != null) if (outer != null)
throw Components.results.NS_ERROR_NO_AGGREGATION; throw Components.results.NS_ERROR_NO_AGGREGATION;
@@ -108,7 +108,12 @@ function Dactyl() {
this.pages = {}; this.pages = {};
Cu.import("resource://dactyl/base.jsm"); Cu.import("resource://dactyl/base.jsm");
require(global, "config");
require(global, "services");
require(global, "util"); require(global, "util");
// Doesn't belong here:
AboutHandler.prototype.register();
} }
Dactyl.prototype = { Dactyl.prototype = {
contractID: "@mozilla.org/network/protocol;1?name=dactyl", contractID: "@mozilla.org/network/protocol;1?name=dactyl",
@@ -180,14 +185,47 @@ Dactyl.prototype = {
} }
}; };
function StringChannel(data, contentType, uri) {
let channel = services.StreamChannel(uri);
channel.contentStream = services.StringStream(data);
channel.contentType = contentType;
channel.contentCharset = "UTF-8";
channel.owner = systemPrincipal;
if (uri)
channel.originalURI = uri;
return channel;
}
function XMLChannel(uri, contentType) {
this.sourceChannel = services.io.newChannelFromURI(uri);
this.pipe = services.Pipe(true, true, 0, 0, null);
this.channel = services.StreamChannel(uri);
this.channel.contentStream = this.pipe.outputStream;
this.channel.contentType = contentType;
this.channel.contentCharset = "UTF-8";
this.channel.owner = systemPrincipal;
}
XMLChannel.prototype = {
QueryInterface: XPCOMUtils.generateQI([Ci.nsIRequestObserver]),
};
function AboutHandler() {} function AboutHandler() {}
AboutHandler.prototype = { AboutHandler.prototype = {
register: function () {
try {
JSMLoader.registerFactory(Factory(AboutHandler));
}
catch (e) {
util.reportError(e);
}
},
classDescription: "About " + Dactyl.prototype.appName + " Page", get classDescription() "About " + config.appName + " Page",
classID: Components.ID("81495d80-89ee-4c36-a88d-ea7c4e5ac63f"), classID: Components.ID("81495d80-89ee-4c36-a88d-ea7c4e5ac63f"),
contractID: "@mozilla.org/network/protocol/about;1?what=" + Dactyl.prototype.name, get contractID() "@mozilla.org/network/protocol/about;1?what=" + config.name,
QueryInterface: XPCOMUtils.generateQI([Ci.nsIAboutModule]), QueryInterface: XPCOMUtils.generateQI([Ci.nsIAboutModule]),
@@ -218,9 +256,9 @@ Shim.prototype = {
}; };
if (XPCOMUtils.generateNSGetFactory) if (XPCOMUtils.generateNSGetFactory)
var NSGetFactory = XPCOMUtils.generateNSGetFactory([AboutHandler, ChromeData, Dactyl, Shim]); var NSGetFactory = XPCOMUtils.generateNSGetFactory([ChromeData, Dactyl, Shim]);
else else
var NSGetModule = XPCOMUtils.generateNSGetModule([AboutHandler, ChromeData, Dactyl, Shim]); var NSGetModule = XPCOMUtils.generateNSGetModule([ChromeData, Dactyl, Shim]);
var EXPORTED_SYMBOLS = ["NSGetFactory", "global"]; var EXPORTED_SYMBOLS = ["NSGetFactory", "global"];
} catch (e) { reportError(e) } } catch (e) { reportError(e) }

8
common/content/buffer.js
View File

@@ -176,7 +176,7 @@ var Buffer = Module("buffer", {
if (!(uri || doc.location)) if (!(uri || doc.location))
return; return;
uri = uri || doc.documentURIObject; uri = uri || util.newURI(doc.location.href);
let args = { let args = {
url: { toString: function () uri.spec, valueOf: function () uri }, url: { toString: function () uri.spec, valueOf: function () uri },
title: doc.title title: doc.title
@@ -225,7 +225,7 @@ var Buffer = Module("buffer", {
else { else {
// code which should happen for all (also background) newly loaded tabs goes here: // code which should happen for all (also background) newly loaded tabs goes here:
if (doc != config.browser.contentDocument) if (doc != config.browser.contentDocument)
dactyl.echomsg({ domains: [doc.location.host], message: "Background tab loaded: " + (doc.title || doc.location.href) }, 3); dactyl.echomsg({ domains: [util.getHost(doc.location)], message: "Background tab loaded: " + (doc.title || doc.location.href) }, 3);
this._triggerLoadAutocmd("PageLoad", doc); this._triggerLoadAutocmd("PageLoad", doc);
} }
@@ -1012,7 +1012,7 @@ var Buffer = Module("buffer", {
return true; return true;
}; };
let url = isString(doc) ? util.newURI(doc) : doc.documentURIObject; let url = isString(doc) ? util.newURI(doc) : util.newURI(doc.location.href);
if (!isString(doc)) if (!isString(doc))
return io.withTempFiles(function (temp) { return io.withTempFiles(function (temp) {
@@ -1358,7 +1358,7 @@ var Buffer = Module("buffer", {
dactyl.assert(args.bang || !file.exists(), "E13: File exists (add ! to override)"); dactyl.assert(args.bang || !file.exists(), "E13: File exists (add ! to override)");
chosenData = { file: file, uri: doc.documentURIObject }; chosenData = { file: file, uri: util.newURI(doc.location.href) };
} }
// if browser.download.useDownloadDir = false then the "Save As" // if browser.download.useDownloadDir = false then the "Save As"

2
common/content/dactyl.js
View File

@@ -536,7 +536,7 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
* @private * @private
*/ */
initDocument: function initDocument(doc) { initDocument: function initDocument(doc) {
if (doc.documentURIObject.scheme === "dactyl") { if (doc.location.protocol === "dactyl:") {
dactyl.initHelp(); dactyl.initHelp();
config.styleHelp(); config.styleHelp();
} }

13
common/modules/base.jsm
View File

@@ -7,7 +7,9 @@
if (!JSMLoader) if (!JSMLoader)
var JSMLoader = { var JSMLoader = {
builtin: Components.utils.Sandbox(this), builtin: Components.utils.Sandbox(this),
factories: [],
globals: {}, globals: {},
manager: Components.manager.QueryInterface(Components.interfaces.nsIComponentRegistrar),
stale: {}, stale: {},
load: function load(url, target) { load: function load(url, target) {
if (this.stale[url]) { if (this.stale[url]) {
@@ -32,6 +34,10 @@ if (!JSMLoader)
} }
Components.utils.import(url, target); Components.utils.import(url, target);
}, },
cleanup: function unregister() {
for each (let factory in this.factories.splice(0))
this.manager.unregisterFactory(factory.classID, factory);
},
purge: function purge() { purge: function purge() {
for (let [url, global] in Iterator(this.globals)) for (let [url, global] in Iterator(this.globals))
this.stale[url] = true; this.stale[url] = true;
@@ -39,6 +45,13 @@ if (!JSMLoader)
registerGlobal: function registerGlobal(uri, obj) { registerGlobal: function registerGlobal(uri, obj) {
if (Cu.getGlobalForObject) if (Cu.getGlobalForObject)
this.globals[uri.replace(/.* -> /, "")] = Cu.getGlobalForObject(obj); this.globals[uri.replace(/.* -> /, "")] = Cu.getGlobalForObject(obj);
},
registerFactory: function registerFactory(factory) {
this.manager.registerFactory(factory.classID,
String(factory.classID),
factory.contractID,
factory);
this.factories.push(factory);
} }
}; };

2
common/modules/overlay.jsm
View File

@@ -26,6 +26,8 @@ var ModuleBase = Class("ModuleBase", {
var Overlay = Module("Overlay", { var Overlay = Module("Overlay", {
init: function () { init: function () {
services["dactyl:"]; // Hack. Force module initialization.
util.overlayWindow(config.overlayChrome, function (window) ({ util.overlayWindow(config.overlayChrome, function (window) ({
init: function (document) { init: function (document) {
/** /**

26
common/modules/services.jsm
View File

@@ -40,8 +40,8 @@ var Services = Module("Services", {
this.add("favicon", "@mozilla.org/browser/favicon-service;1", Ci.nsIFaviconService); this.add("favicon", "@mozilla.org/browser/favicon-service;1", Ci.nsIFaviconService);
this.add("focus", "@mozilla.org/focus-manager;1", Ci.nsIFocusManager); this.add("focus", "@mozilla.org/focus-manager;1", Ci.nsIFocusManager);
this.add("fuel", "@mozilla.org/fuel/application;1", Ci.extIApplication); this.add("fuel", "@mozilla.org/fuel/application;1", Ci.extIApplication);
this.add("history", "@mozilla.org/browser/global-history;2", [Ci.nsIBrowserHistory, Ci.nsIGlobalHistory3, this.add("history", "@mozilla.org/browser/global-history;2",
Ci.nsINavHistoryService, Ci.nsPIPlacesDatabase]); [Ci.nsIBrowserHistory, Ci.nsIGlobalHistory3, Ci.nsINavHistoryService, Ci.nsPIPlacesDatabase]);
this.add("io", "@mozilla.org/network/io-service;1", Ci.nsIIOService); this.add("io", "@mozilla.org/network/io-service;1", Ci.nsIIOService);
this.add("json", "@mozilla.org/dom/json;1", Ci.nsIJSON, "createInstance"); this.add("json", "@mozilla.org/dom/json;1", Ci.nsIJSON, "createInstance");
this.add("livemark", "@mozilla.org/browser/livemark-service;2", Ci.nsILivemarkService); this.add("livemark", "@mozilla.org/browser/livemark-service;2", Ci.nsILivemarkService);
@@ -69,15 +69,20 @@ var Services = Module("Services", {
this.addClass("Find", "@mozilla.org/embedcomp/rangefind;1", Ci.nsIFind); this.addClass("Find", "@mozilla.org/embedcomp/rangefind;1", Ci.nsIFind);
this.addClass("HtmlConverter","@mozilla.org/widget/htmlformatconverter;1", Ci.nsIFormatConverter); this.addClass("HtmlConverter","@mozilla.org/widget/htmlformatconverter;1", Ci.nsIFormatConverter);
this.addClass("HtmlEncoder", "@mozilla.org/layout/htmlCopyEncoder;1", Ci.nsIDocumentEncoder); this.addClass("HtmlEncoder", "@mozilla.org/layout/htmlCopyEncoder;1", Ci.nsIDocumentEncoder);
this.addClass("StreamChannel","@mozilla.org/network/input-stream-channel;1",
[Ci.nsIChannel, Ci.nsIInputStreamChannel, Ci.nsIRequest], "setURI");
this.addClass("Persist", "@mozilla.org/embedding/browser/nsWebBrowserPersist;1", Ci.nsIWebBrowserPersist); this.addClass("Persist", "@mozilla.org/embedding/browser/nsWebBrowserPersist;1", Ci.nsIWebBrowserPersist);
this.addClass("Pipe", "@mozilla.org/pipe;1", Ci.nsIPipe, "init");
this.addClass("Process", "@mozilla.org/process/util;1", Ci.nsIProcess, "init"); this.addClass("Process", "@mozilla.org/process/util;1", Ci.nsIProcess, "init");
this.addClass("String", "@mozilla.org/supports-string;1", Ci.nsISupportsString, "data"); this.addClass("String", "@mozilla.org/supports-string;1", Ci.nsISupportsString, "data");
this.addClass("StringStream", "@mozilla.org/io/string-input-stream;1", Ci.nsIStringInputStream, "data");
this.addClass("Timer", "@mozilla.org/timer;1", Ci.nsITimer, "initWithCallback"); this.addClass("Timer", "@mozilla.org/timer;1", Ci.nsITimer, "initWithCallback");
this.addClass("StreamCopier", "@mozilla.org/network/async-stream-copier;1",Ci.nsIAsyncStreamCopier, "init");
this.addClass("Xmlhttp", "@mozilla.org/xmlextras/xmlhttprequest;1", Ci.nsIXMLHttpRequest); this.addClass("Xmlhttp", "@mozilla.org/xmlextras/xmlhttprequest;1", Ci.nsIXMLHttpRequest);
this.addClass("ZipReader", "@mozilla.org/libjar/zip-reader;1", Ci.nsIZipReader, "open"); this.addClass("ZipReader", "@mozilla.org/libjar/zip-reader;1", Ci.nsIZipReader, "open");
this.addClass("ZipWriter", "@mozilla.org/zipwriter;1", Ci.nsIZipWriter); this.addClass("ZipWriter", "@mozilla.org/zipwriter;1", Ci.nsIZipWriter);
if (!this.extensionManager) if (!Ci.nsIExtensionManager || !this.extensionManager)
Components.utils.import("resource://gre/modules/AddonManager.jsm"); Components.utils.import("resource://gre/modules/AddonManager.jsm");
else else
global.AddonManager = { global.AddonManager = {
@@ -162,15 +167,24 @@ var Services = Module("Services", {
if (!ifaces) if (!ifaces)
return res.wrappedJSObject; return res.wrappedJSObject;
Array.concat(ifaces).forEach(function (iface) res.QueryInterface(iface)); Array.concat(ifaces).forEach(function (iface) res.QueryInterface(iface));
if (init && args.length) if (init && args.length) {
if (callable(res[init])) try {
var isCallable = callable(res[init]);
}
catch (e) {} // Ugh.
if (isCallable)
res[init].apply(res, args); res[init].apply(res, args);
else else
res[init] = args[0]; res[init] = args[0];
}
return res; return res;
} }
catch (e) { catch (e) {
dump("dactyl: Service creation failed for '" + classes + "': " + e + "\n"); if (typeof util !== "undefined")
util.reportError(e);
else
dump("dactyl: Service creation failed for '" + classes + "': " + e + "\n" + (e.stack || Error(e).stack));
return null; return null;
} }
}, },

4
common/modules/util.jsm
View File

@@ -478,7 +478,7 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
stackLines: function (stack) { stackLines: function (stack) {
let lines = []; let lines = [];
let match, re = /([^]*?)(@.*?)(?:\n|$)/g; let match, re = /([^]*?)(@[^@\n]*)(?:\n|$)/g;
while (match = re.exec(stack)) while (match = re.exec(stack))
lines.push(match[1].replace(/\n/g, "\\n").substr(0, 80) + match[2]); lines.push(match[1].replace(/\n/g, "\\n").substr(0, 80) + match[2]);
return lines; return lines;
@@ -930,6 +930,8 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
util.trapErrors(module.cleanup, module); util.trapErrors(module.cleanup, module);
} }
JSMLoader.cleanup();
services.observer.addObserver(this, "dactyl-rehash", true); services.observer.addObserver(this, "dactyl-rehash", true);
}, },
"dactyl-rehash": function () { "dactyl-rehash": function () {

2
pentadactyl/chrome.manifest
View File

@@ -21,6 +21,4 @@ component {9c8f2530-51c8-4d41-b356-319e0b155c44} components/protocols.
contract @mozilla.org/network/protocol;1?name=dactyl {9c8f2530-51c8-4d41-b356-319e0b155c44} contract @mozilla.org/network/protocol;1?name=dactyl {9c8f2530-51c8-4d41-b356-319e0b155c44}
component {f4506a17-5b4d-4cd9-92d4-2eb4630dc388} components/protocols.js component {f4506a17-5b4d-4cd9-92d4-2eb4630dc388} components/protocols.js
contract @dactyl.googlecode.com/base/xpc-interface-shim {f4506a17-5b4d-4cd9-92d4-2eb4630dc388} contract @dactyl.googlecode.com/base/xpc-interface-shim {f4506a17-5b4d-4cd9-92d4-2eb4630dc388}
component {81495d80-89ee-4c36-a88d-ea7c4e5ac63f} components/protocols.js
contract @mozilla.org/network/protocol/about;1?what=pentadactyl {81495d80-89ee-4c36-a88d-ea7c4e5ac63f}