From c66701339fe5a375b0d609ae1b9b731ac2430ca3 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Thu, 23 Dec 2010 19:52:32 -0500
Subject: [PATCH 01/35] Steps towards bootstrapped addon.

--HG--
branch : bootstrapped
---
 common/content/commandline.js |  68 ++++++++++++++++++++++
 common/content/configbase.js  |   2 +
 common/content/dactyl.xul     | 106 +---------------------------------
 common/content/events.js      |  15 +++++
 common/content/statusline.js  |  39 +++++++++++++
 common/modules/util.jsm       |  94 ++++++++++++++++++++----------
 6 files changed, 189 insertions(+), 135 deletions(-)

diff --git a/common/content/commandline.js b/common/content/commandline.js
index 3386d9ee..6fed9f70 100644
--- a/common/content/commandline.js
+++ b/common/content/commandline.js
@@ -10,6 +10,74 @@
 
 const CommandWidgets = Class("CommandWidgets", {
     init: function () {
+        let _commandline = "if (window.dactyl) return dactyl.modules.commandline";
+        let _status = "dactyl-statusline-field-";
+
+        util.overlayWindow(window, {
+            append: <e4x xmlns={XUL} xmlns:dactyl={NS}>
+                <window id={document.documentElement.id}>
+                    <popupset>
+                        <menupopup id="dactyl-contextmenu"
+                                   onpopupshowing="return (event.target != this || dactyl.modules.commandline.onContext(event));">
+                            <menuitem id="dactyl-context-copylink"
+                                      label="Copy Link Location" dactyl:group="link"
+                                      oncommand="goDoCommand('cmd_copyLink');"/>
+                            <menuitem id="dactyl-context-copy"
+                                      label="Copy" dactyl:group="selection"
+                                      command="cmd_copy"/>
+                            <menuitem id="dactyl-context-selectall"
+                                      label="Select All"
+                                      command="cmd_selectAll"/>
+                        </menupopup>
+                    </popupset>
+                </window>
+
+                <vbox id={config.commandContainer}>
+
+                    <vbox class="dactyl-container" hidden="false" collapsed="true">
+                        <iframe id="dactyl-multiline-output" src="chrome://dactyl/content/buffer.xhtml"
+                                flex="1" hidden="false" collapsed="false"
+                                contextmenu="dactyl-contextmenu"
+                                onclick={_commandline + ".onMultilineOutputEvent(event)"}/>
+                    </vbox>
+
+                    <vbox class="dactyl-container" hidden="false" collapsed="true">
+                        <iframe class="dactyl-completions" id="dactyl-completions-dactyl-commandline" src="chrome://dactyl/content/buffer.xhtml"
+                                contextmenu="dactyl-contextmenu"
+                                flex="1" hidden="false" collapsed="false"
+                                onclick={_commandline + ".onMultilineOutputEvent(event)"}/>
+                    </vbox>
+
+                    <vbox id={"dactyl-completions-" + _status + "commandline-container"} class="dactyl-container" hidden="false" collapsed="true" insertbefore="addon-bar,status-bar">
+                        <iframe class="dactyl-completions" id={"dactyl-completions-" + _status + "commandline"} src="chrome://dactyl/content/buffer.xhtml"
+                                contextmenu="dactyl-contextmenu"
+                                flex="1" hidden="false" collapsed="false"
+                                onclick={_commandline + ".onMultilineOutputEvent(event)"}/>
+                    </vbox>
+
+                    <stack orient="horizontal" align="stretch" class="dactyl-container" id="dactyl-container" dactyl:highlight="CmdLine CmdCmdLine">
+                        <textbox class="plain" id="dactyl-strut"   flex="1" crop="end" collapsed="true"/>
+                        <textbox class="plain" id="dactyl-mode"    flex="1" crop="end"/>
+                        <textbox class="plain" id="dactyl-message" flex="1" readonly="true"/>
+
+                        <hbox id="dactyl-commandline" hidden="false" class="dactyl-container" dactyl:highlight="Normal CmdNormal" collapsed="true">
+                            <label   id="dactyl-commandline-prompt"  class="dactyl-commandline-prompt  plain" flex="0" crop="end" value="" collapsed="true"/>
+                            <textbox id="dactyl-commandline-command" class="dactyl-commandline-command plain" flex="1" type="input" timeout="100"
+                                     oninput={_commandline + ".onEvent(event);"} onkeyup={_commandline + ".onEvent(event);"}
+                                     onfocus={_commandline + ".onEvent(event);"} onblur={_commandline + ".onEvent(event);"}/>
+                        </hbox>
+                    </stack>
+
+                    <vbox class="dactyl-container" hidden="false" collapsed="false" dactyl:highlight="CmdLine">
+                        <textbox id="dactyl-multiline-input" class="plain" flex="1" rows="1" hidden="false" collapsed="true" multiline="true"
+                                 dactyl:highlight="Normal"
+                                 onkeypress={_commandline + ".onMultilineInputEvent(event);"} oninput={_commandline + ".onMultilineInputEvent(event);"}
+                                 onblur={_commandline + ".onMultilineInputEvent(event);"}/>
+                    </vbox>
+                </vbox>
+            </e4x>.*
+        });
+
         this.elements = {};
         this.addElement({
             name: "container",
diff --git a/common/content/configbase.js b/common/content/configbase.js
index fa3de669..459cfda0 100644
--- a/common/content/configbase.js
+++ b/common/content/configbase.js
@@ -57,6 +57,8 @@ const ConfigBase = Class(ModuleBase, {
 
     get browserModes() [modes.NORMAL],
 
+    commandContainer: "browser-bottombox",
+
     /**
      * @property {Object} Application specific defaults for option values. The
      *     property names must be the options' canonical names, and the values
diff --git a/common/content/dactyl.xul b/common/content/dactyl.xul
index 73123038..d800941f 100644
--- a/common/content/dactyl.xul
+++ b/common/content/dactyl.xul
@@ -18,113 +18,9 @@
 ]>
 
 <overlay id="dactyl"
-    xmlns:dactyl="http://vimperator.org/namespaces/liberator"
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns:nc="http://home.netscape.com/NC-rdf#"
-    xmlns:html="http://www.w3.org/1999/xhtml"
-    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <script type="application/x-javascript;version=1.8" src="&dactyl.content;dactyl-overlay.js"/>
-
-    <window id="&dactyl.mainWindow;">
-
-        <popupset>
-            <menupopup id="dactyl-contextmenu"
-                       onpopupshowing="return (event.target != this || dactyl.modules.commandline.onContext(event));">
-                <menuitem id="dactyl-context-copylink"
-                          label="Copy Link Location" dactyl:group="link"
-                          oncommand="goDoCommand('cmd_copyLink');"/>
-                <menuitem id="dactyl-context-copy"
-                          label="Copy" dactyl:group="selection"
-                          command="cmd_copy"/>
-                <menuitem id="dactyl-context-selectall"
-                          label="Select All"
-                          command="cmd_selectAll"/>
-            </menupopup>
-        </popupset>
-
-        <!--this notifies us also of focus events in the XUL
-            from: http://developer.mozilla.org/en/docs/XUL_Tutorial:Updating_Commands !-->
-        <!-- I don't think we really need this. ––Kris -->
-        <commandset id="onPentadactylFocus" commandupdater="true" events="focus"
-                    oncommandupdate="&events;.onFocusChange(event);"/>
-        <commandset id="onPentadactylSelect" commandupdater="true" events="select"
-                    oncommandupdate="&events;.onSelectionChange(event);"/>
-    </window>
-
-    <vbox id="&dactyl.commandContainer;">
-
-        <vbox class="dactyl-container" hidden="false" collapsed="true">
-            <iframe id="dactyl-multiline-output" src="chrome://dactyl/content/buffer.xhtml"
-                    flex="1" hidden="false" collapsed="false"
-                    contextmenu="dactyl-contextmenu"
-                    onclick="&commandline;.onMultilineOutputEvent(event)"/>
-        </vbox>
-
-        <vbox class="dactyl-container" hidden="false" collapsed="true">
-            <iframe class="dactyl-completions" id="dactyl-completions-dactyl-commandline" src="chrome://dactyl/content/buffer.xhtml"
-                    contextmenu="dactyl-contextmenu"
-                    flex="1" hidden="false" collapsed="false"
-                    onclick="&commandline;.onMultilineOutputEvent(event)"/>
-        </vbox>
-
-        <vbox id="dactyl-completions-&status;commandline-container" class="dactyl-container" hidden="false" collapsed="true" insertbefore="addon-bar,status-bar">
-            <iframe class="dactyl-completions" id="dactyl-completions-&status;commandline" src="chrome://dactyl/content/buffer.xhtml"
-                    contextmenu="dactyl-contextmenu"
-                    flex="1" hidden="false" collapsed="false"
-                    onclick="&commandline;.onMultilineOutputEvent(event)"/>
-        </vbox>
-
-        <stack orient="horizontal" align="stretch" class="dactyl-container" id="dactyl-container" dactyl:highlight="CmdLine CmdCmdLine">
-            <textbox class="plain" id="dactyl-strut"   flex="1" crop="end" collapsed="true"/>
-            <textbox class="plain" id="dactyl-mode"    flex="1" crop="end"/>
-            <textbox class="plain" id="dactyl-message" flex="1" readonly="true"/>
-
-            <hbox id="dactyl-commandline" hidden="false" class="dactyl-container" dactyl:highlight="Normal CmdNormal" collapsed="true">
-                <label   id="dactyl-commandline-prompt"  class="dactyl-commandline-prompt  plain" flex="0" crop="end" value="" collapsed="true"/>
-                <textbox id="dactyl-commandline-command" class="dactyl-commandline-command plain" flex="1" type="input" timeout="100"
-                         oninput="&commandline;.onEvent(event);" onkeyup="&commandline;.onEvent(event);"
-                         onfocus="&commandline;.onEvent(event);" onblur="&commandline;.onEvent(event);"/>
-            </hbox>
-        </stack>
-
-        <vbox class="dactyl-container" hidden="false" collapsed="false" dactyl:highlight="CmdLine">
-            <textbox id="dactyl-multiline-input" class="plain" flex="1" rows="1" hidden="false" collapsed="true" multiline="true"
-                     dactyl:highlight="Normal"
-                     onkeypress="&commandline;.onMultilineInputEvent(event);" oninput="&commandline;.onMultilineInputEvent(event);"
-                     onblur="&commandline;.onMultilineInputEvent(event);"/>
-        </vbox>
-    </vbox>
-
-    <statusbar id="status-bar" dactyl:highlight="StatusLine StatusNormal">
-        <hbox insertbefore="&dactyl.statusBefore;" insertafter="&dactyl.statusAfter;"
-              style="background: inherit;" id="&status;container" flex="1" hidden="false" align="center">
-            <stack orient="horizontal" align="stretch"      flex="1" class="dactyl-container" dactyl:highlight="CmdLine StatusCmdLine">
-                <hbox class="dactyl-container" dactyl:highlight="CmdLine StatusCmdLine">
-                    <label class="plain" id="&status;mode"          crop="end" collapsed="true"/>
-                    <stack flex="1" class="dactyl-container" dactyl:highlight="CmdLine StatusCmdLine">
-                        <textbox class="plain" id="&status;url"     crop="end" flex="1" readonly="true"/>
-                        <textbox class="plain" id="&status;message" crop="end" flex="1" readonly="true" dactyl:highlight="Normal StatusNormal"/>
-                    </stack>
-                </hbox>
-
-                <hbox id="&status;commandline" hidden="false" class="dactyl-container" dactyl:highlight="Normal StatusNormal" collapsed="true">
-                    <label id="&status;commandline-prompt"    class="dactyl-commandline-prompt  plain" flex="0" crop="end" value="" collapsed="true"/>
-                    <textbox id="&status;commandline-command" class="dactyl-commandline-command plain" flex="1" type="text" timeout="100"
-                             oninput="&commandline;.onEvent(event);" onkeyup="&commandline;.onEvent(event);"
-                             onfocus="&commandline;.onEvent(event);" onblur="&commandline;.onEvent(event);"/>
-                </hbox>
-            </stack>
-            <label class="plain" id="&status;inputbuffer"    flex="0"/>
-            <label class="plain" id="&status;progress"       flex="0"/>
-            <label class="plain" id="&status;tabcount"       flex="0"/>
-            <label class="plain" id="&status;bufferposition" flex="0"/>
-            <label class="plain" id="&status;zoomlevel"      flex="0"/>
-        </hbox>
-        <!-- just hide them since other elements expect them -->
-        <statusbarpanel id="statusbar-display"       hidden="true"/>
-        <statusbarpanel id="statusbar-progresspanel" hidden="true"/>
-    </statusbar>
 </overlay>
 
 <!-- vim: set fdm=marker sw=4 ts=4 et: -->
diff --git a/common/content/events.js b/common/content/events.js
index 05d095a0..f217037c 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -13,6 +13,21 @@
  */
 const Events = Module("events", {
     init: function () {
+        let _events = "if (window.dactyl &and; dactyl.modules.loaded.events) return dactyl.modules.events"
+        util.overlayWindow(window, {
+            append: <e4x xmlns={XUL}>
+                <window id={document.documentElement.id}>
+                    <!--this notifies us also of focus events in the XUL
+                        from: http://developer.mozilla.org/en/docs/XUL_Tutorial:Updating_Commands !-->
+                    <!-- I don't think we really need this. ––Kris -->
+                    <commandset id="onPentadactylFocus" commandupdater="true" events="focus"
+                                oncommandupdate="{_events}.onFocusChange(event);"/>
+                    <commandset id="onPentadactylSelect" commandupdater="true" events="select"
+                                oncommandupdate="{_events}.onSelectionChange(event);"/>
+                </window>
+            </e4x>.*
+        });
+
         this._fullscreen = window.fullScreen;
         this._lastFocus = null;
         this._currentMacro = "";
diff --git a/common/content/statusline.js b/common/content/statusline.js
index 7914744c..acd906ed 100644
--- a/common/content/statusline.js
+++ b/common/content/statusline.js
@@ -10,6 +10,45 @@
 
 const StatusLine = Module("statusline", {
     init: function () {
+
+        let _commandline = "if (window.dactyl) return dactyl.modules.commandline";
+        let _status = "dactyl-statusline-field-";
+
+        util.overlayWindow(window, {
+            append: <e4x xmlns={XUL} xmlns:dactyl={NS}>
+                <statusbar id="status-bar" dactyl:highlight="StatusLine StatusNormal">
+                    <!-- insertbefore="dactyl.statusBefore;" insertafter="dactyl.statusAfter;" -->
+                    <hbox
+                          style="background: inherit;" id={_status + "container"} flex="1" hidden="false" align="center">
+                        <stack orient="horizontal" align="stretch"      flex="1" class="dactyl-container" dactyl:highlight="CmdLine StatusCmdLine">
+                            <hbox class="dactyl-container" dactyl:highlight="CmdLine StatusCmdLine">
+                                <label class="plain" id={_status + "mode"}          crop="end" collapsed="true"/>
+                                <stack flex="1" class="dactyl-container" dactyl:highlight="CmdLine StatusCmdLine">
+                                    <textbox class="plain" id={_status + "url"}     crop="end" flex="1" readonly="true"/>
+                                    <textbox class="plain" id={_status + "message"} crop="end" flex="1" readonly="true" dactyl:highlight="Normal StatusNormal"/>
+                                </stack>
+                            </hbox>
+
+                            <hbox id={_status + "commandline"} hidden="false" class="dactyl-container" dactyl:highlight="Normal StatusNormal" collapsed="true">
+                                <label id={_status + "commandline-prompt"}    class="dactyl-commandline-prompt  plain" flex="0" crop="end" value="" collapsed="true"/>
+                                <textbox id={_status + "commandline-command"} class="dactyl-commandline-command plain" flex="1" type="text" timeout="100"
+                                         oninput={_commandline + ".onEvent(event);"} onkeyup={_commandline + ".onEvent(event);"}
+                                         onfocus={_commandline + ".onEvent(event);"} onblur={_commandline + ".onEvent(event);"}/>
+                            </hbox>
+                        </stack>
+                        <label class="plain" id={_status + "inputbuffer"}    flex="0"/>
+                        <label class="plain" id={_status + "progress"}       flex="0"/>
+                        <label class="plain" id={_status + "tabcount"}       flex="0"/>
+                        <label class="plain" id={_status + "bufferposition"} flex="0"/>
+                        <label class="plain" id={_status + "zoomlevel"}      flex="0"/>
+                    </hbox>
+                    <!-- just hide them since other elements expect them -->
+                    <statusbarpanel id="statusbar-display"       hidden="true"/>
+                    <statusbarpanel id="statusbar-progresspanel" hidden="true"/>
+                </statusbar>
+            </e4x>.*
+        });
+
         this._statusLine = document.getElementById("status-bar");
         this.statusBar = document.getElementById("addon-bar") || this._statusLine;
         this.statusBar.collapsed = true; // it is later restored unless the user sets laststatus=0
diff --git a/common/modules/util.jsm b/common/modules/util.jsm
index 3d9f7c61..76bc6c3a 100644
--- a/common/modules/util.jsm
+++ b/common/modules/util.jsm
@@ -896,45 +896,79 @@ const Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
         return color ? string : [s for each (s in string)].join("");
     },
 
+    _loadOverlays: function _loadOverlays(window) {
+        if (!window.dactylOverlays)
+            window.dactylOverlays = [];
+
+        for each (let obj in util.overlays[window.document.documentURI] || []) {
+            if (window.dactylOverlays.indexOf(obj) >= 0)
+                continue;
+            window.dactylOverlays.push(obj);
+            this._loadOverlay(window, obj(window));
+        }
+    },
+    _loadOverlay: function _loadOverlay(window, obj) {
+        function overlay(key, fn) {
+            if (obj[key]) {
+                let iterator = Iterator(obj[key]);
+                if (!isObject(obj[key]))
+                    iterator = ([elem.@id, elem.*, elem.@*::*] for each (elem in obj[key]));
+
+                for (let [elem, xml, attr] in iterator) {
+                    if (elem = window.document.getElementById(elem)) {
+                        fn(elem, util.xmlToDom(xml, window.document));
+                        for each (let attr in attr || [])
+                            elem.setAttributeNS(attr.namespace(), attr.localName(), attr);
+                    }
+                }
+            }
+        }
+
+        overlay("before", function (elem, dom) elem.parentNode.insertBefore(dom, elem));
+        overlay("after", function (elem, dom) elem.parentNode.insertBefore(dom, elem.nextSibling));
+        overlay("append", function (elem, dom) elem.appendChild(dom));
+        overlay("prepend", function (elem, dom) elem.insertBefore(dom, elem.firstChild));
+        if (obj.init)
+            obj.init(window, window.dactylDOMLoaded);
+
+        if (obj.load)
+            if (window.document.dactylLoaded)
+                obj.load(window, window.document.dactylLoaded);
+        else
+            window.document.addEventListener("load", wrapCallback(function load(event) {
+                if (event.originalTarget === event.target) {
+                    window.document.removeEventListener("load", load.wrapper, true);
+                    window.document.dactylLoaded = event;
+                    obj.load(window, event);
+                }
+            }), true);
+    },
+
     observe: {
         "toplevel-window-ready": function (window, data) {
             window.addEventListener("DOMContentLoaded", wrapCallback(function listener(event) {
-                window.removeEventListener("DOMContentLoaded", listener.wrapper, true);
-
-                if (event.originalTarget !== window.document)
-                    return;
-
-                let obj = util.overlays[window.document.documentURI];
-                if (obj) {
-                    obj = obj(window);
-
-                    function overlay(key, fn) {
-                        for (let [elem, xml] in Iterator(obj[key] || {}))
-                            if (elem = window.document.getElementById(elem))
-                                fn(elem, util.xmlToDom(xml, window.document));
-                    }
-
-                    overlay("before", function (elem, dom) elem.parentNode.insertBefore(dom, elem));
-                    overlay("after", function (elem, dom) elem.parentNode.insertBefore(dom, elem.nextSibling));
-                    overlay("append", function (elem, dom) elem.appendChild(dom));
-                    overlay("prepend", function (elem, dom) elem.insertBefore(dom, elem.firstChild));
-                    if (obj.init)
-                        obj.init(window, event);
-
-                    if (obj.load)
-                        window.document.addEventListener("load", function (event) {
-                            if (event.originalTarget === event.target)
-                                obj.load(window, event);
-                        }, true);
+                if (event.originalTarget === window.document) {
+                    window.removeEventListener("DOMContentLoaded", listener.wrapper, true);
+                    window.document.dactylDOMLoaded = event;
+                    util._loadOverlays(window);
                 }
             }), true)
         }
     },
 
     overlayWindow: function (url, fn) {
-        Array.concat(url).forEach(function (url) {
-            this.overlays[url] = fn;
-        }, this);
+        if (url instanceof Ci.nsIDOMWindow)
+            util._loadOverlay(url, fn);
+        else {
+            Array.concat(url).forEach(function (url) {
+                if (!this.overlays[url])
+                    this.overlays[url] = [];
+                this.overlays[url].push(fn);
+            }, this);
+            for (let win in services.windowMediator.getEnumerator(null))
+                if (win.dactylDOMLoaded)
+                    this._loadOverlays(win);
+        }
     },
 
     /**

From 909a6583386203d54d4222c5c552a52303b8e2fb Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Thu, 23 Dec 2010 20:25:09 -0500
Subject: [PATCH 02/35] Some minor improvements to the previous changeset.

--HG--
branch : bootstrapped
---
 common/content/dactyl.xul    |  5 +--
 common/content/statusline.js | 75 ++++++++++++++++++------------------
 common/modules/util.jsm      |  2 +-
 3 files changed, 39 insertions(+), 43 deletions(-)

diff --git a/common/content/dactyl.xul b/common/content/dactyl.xul
index d800941f..20fc35f8 100644
--- a/common/content/dactyl.xul
+++ b/common/content/dactyl.xul
@@ -9,12 +9,9 @@
   -->
 
 <?xml-stylesheet href="chrome://dactyl/skin/dactyl.css" type="text/css"?>
+
 <!DOCTYPE overlay SYSTEM "dactyl.dtd" [
-    <!ENTITY and "&amp;&amp;">
     <!ENTITY dactyl.content "chrome://dactyl/content/">
-    <!ENTITY commandline "if (window.dactyl) return dactyl.modules.commandline">
-    <!ENTITY events "if (window.dactyl &and; dactyl.modules.loaded.events) return dactyl.modules.events">
-    <!ENTITY status "dactyl-statusline-field-">
 ]>
 
 <overlay id="dactyl"
diff --git a/common/content/statusline.js b/common/content/statusline.js
index acd906ed..0d1a2f9d 100644
--- a/common/content/statusline.js
+++ b/common/content/statusline.js
@@ -12,52 +12,51 @@ const StatusLine = Module("statusline", {
     init: function () {
 
         let _commandline = "if (window.dactyl) return dactyl.modules.commandline";
-        let _status = "dactyl-statusline-field-";
+        let append = <e4x xmlns={XUL} xmlns:dactyl={NS}>
+            <statusbar id="status-bar" dactyl:highlight="StatusLine StatusNormal">
+                <!-- insertbefore="dactyl.statusBefore;" insertafter="dactyl.statusAfter;" -->
+                <hbox
+                      style="background: inherit;" key="container" flex="1" hidden="false" align="center">
+                    <stack orient="horizontal" align="stretch"      flex="1" class="dactyl-container" dactyl:highlight="CmdLine StatusCmdLine">
+                        <hbox class="dactyl-container" dactyl:highlight="CmdLine StatusCmdLine">
+                            <label class="plain" key="mode"          crop="end" collapsed="true"/>
+                            <stack flex="1" class="dactyl-container" dactyl:highlight="CmdLine StatusCmdLine">
+                                <textbox class="plain" key="url"     crop="end" flex="1" readonly="true"/>
+                                <textbox class="plain" key="message" crop="end" flex="1" readonly="true" dactyl:highlight="Normal StatusNormal"/>
+                            </stack>
+                        </hbox>
+
+                        <hbox key="commandline" hidden="false" class="dactyl-container" dactyl:highlight="Normal StatusNormal" collapsed="true">
+                            <label key="commandline-prompt"    class="dactyl-commandline-prompt  plain" flex="0" crop="end" value="" collapsed="true"/>
+                            <textbox key="commandline-command" class="dactyl-commandline-command plain" flex="1" type="text" timeout="100"
+                                     oninput={_commandline + ".onEvent(event);"} onkeyup={_commandline + ".onEvent(event);"}
+                                     onfocus={_commandline + ".onEvent(event);"} onblur={_commandline + ".onEvent(event);"}/>
+                        </hbox>
+                    </stack>
+                    <label class="plain" key="inputbuffer"    flex="0"/>
+                    <label class="plain" key="progress"       flex="0"/>
+                    <label class="plain" key="tabcount"       flex="0"/>
+                    <label class="plain" key="bufferposition" flex="0"/>
+                    <label class="plain" key="zoomlevel"      flex="0"/>
+                </hbox>
+                <!-- just hide them since other elements expect them -->
+                <statusbarpanel id="statusbar-display"       hidden="true"/>
+                <statusbarpanel id="statusbar-progresspanel" hidden="true"/>
+            </statusbar>
+        </e4x>;
+
+        for each (let attr in append..@key)
+            attr.parent().@id = "dactyl-statusline-field-" + attr;
 
         util.overlayWindow(window, {
-            append: <e4x xmlns={XUL} xmlns:dactyl={NS}>
-                <statusbar id="status-bar" dactyl:highlight="StatusLine StatusNormal">
-                    <!-- insertbefore="dactyl.statusBefore;" insertafter="dactyl.statusAfter;" -->
-                    <hbox
-                          style="background: inherit;" id={_status + "container"} flex="1" hidden="false" align="center">
-                        <stack orient="horizontal" align="stretch"      flex="1" class="dactyl-container" dactyl:highlight="CmdLine StatusCmdLine">
-                            <hbox class="dactyl-container" dactyl:highlight="CmdLine StatusCmdLine">
-                                <label class="plain" id={_status + "mode"}          crop="end" collapsed="true"/>
-                                <stack flex="1" class="dactyl-container" dactyl:highlight="CmdLine StatusCmdLine">
-                                    <textbox class="plain" id={_status + "url"}     crop="end" flex="1" readonly="true"/>
-                                    <textbox class="plain" id={_status + "message"} crop="end" flex="1" readonly="true" dactyl:highlight="Normal StatusNormal"/>
-                                </stack>
-                            </hbox>
-
-                            <hbox id={_status + "commandline"} hidden="false" class="dactyl-container" dactyl:highlight="Normal StatusNormal" collapsed="true">
-                                <label id={_status + "commandline-prompt"}    class="dactyl-commandline-prompt  plain" flex="0" crop="end" value="" collapsed="true"/>
-                                <textbox id={_status + "commandline-command"} class="dactyl-commandline-command plain" flex="1" type="text" timeout="100"
-                                         oninput={_commandline + ".onEvent(event);"} onkeyup={_commandline + ".onEvent(event);"}
-                                         onfocus={_commandline + ".onEvent(event);"} onblur={_commandline + ".onEvent(event);"}/>
-                            </hbox>
-                        </stack>
-                        <label class="plain" id={_status + "inputbuffer"}    flex="0"/>
-                        <label class="plain" id={_status + "progress"}       flex="0"/>
-                        <label class="plain" id={_status + "tabcount"}       flex="0"/>
-                        <label class="plain" id={_status + "bufferposition"} flex="0"/>
-                        <label class="plain" id={_status + "zoomlevel"}      flex="0"/>
-                    </hbox>
-                    <!-- just hide them since other elements expect them -->
-                    <statusbarpanel id="statusbar-display"       hidden="true"/>
-                    <statusbarpanel id="statusbar-progresspanel" hidden="true"/>
-                </statusbar>
-            </e4x>.*
+            objects: this.widgets = { get status() this.container },
+            append: append.*
         });
 
         this._statusLine = document.getElementById("status-bar");
         this.statusBar = document.getElementById("addon-bar") || this._statusLine;
         this.statusBar.collapsed = true; // it is later restored unless the user sets laststatus=0
 
-        // our status bar fields
-        this.widgets = array(["container", "url", "inputbuffer", "progress", "tabcount", "bufferposition", "zoomlevel"]
-                    .map(function (field) [field, document.getElementById("dactyl-statusline-field-" + field)]))
-                    .toObject();
-        this.widgets.status = this.widgets.container;
 
         if (this.statusBar.localName == "toolbar") {
             styles.system.add("addon-bar", config.styleableChrome, <css><![CDATA[
diff --git a/common/modules/util.jsm b/common/modules/util.jsm
index 76bc6c3a..37d5954b 100644
--- a/common/modules/util.jsm
+++ b/common/modules/util.jsm
@@ -916,7 +916,7 @@ const Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
 
                 for (let [elem, xml, attr] in iterator) {
                     if (elem = window.document.getElementById(elem)) {
-                        fn(elem, util.xmlToDom(xml, window.document));
+                        fn(elem, util.xmlToDom(xml, window.document, obj.objects));
                         for each (let attr in attr || [])
                             elem.setAttributeNS(attr.namespace(), attr.localName(), attr);
                     }

From c396c279c4a54cfddcaeb83e1d7173cc5ceb85c6 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Thu, 23 Dec 2010 22:35:49 -0500
Subject: [PATCH 03/35] More bootstrap work.

--HG--
branch : bootstrapped
---
 common/content/commandline.js |  2 +-
 common/content/events.js      |  8 +++----
 common/content/statusline.js  |  6 ++---
 common/modules/styles.jsm     | 10 ++++++++
 common/modules/util.jsm       | 45 +++++++++++++++++++++++++----------
 5 files changed, 51 insertions(+), 20 deletions(-)

diff --git a/common/content/commandline.js b/common/content/commandline.js
index 6fed9f70..c916dd30 100644
--- a/common/content/commandline.js
+++ b/common/content/commandline.js
@@ -75,7 +75,7 @@ const CommandWidgets = Class("CommandWidgets", {
                                  onblur={_commandline + ".onMultilineInputEvent(event);"}/>
                     </vbox>
                 </vbox>
-            </e4x>.*
+            </e4x>.elements()
         });
 
         this.elements = {};
diff --git a/common/content/events.js b/common/content/events.js
index f217037c..4f4ee341 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -13,7 +13,7 @@
  */
 const Events = Module("events", {
     init: function () {
-        let _events = "if (window.dactyl &and; dactyl.modules.loaded.events) return dactyl.modules.events"
+        let _events = "if (window.dactyl && dactyl.modules.loaded.events) return dactyl.modules.events"
         util.overlayWindow(window, {
             append: <e4x xmlns={XUL}>
                 <window id={document.documentElement.id}>
@@ -21,11 +21,11 @@ const Events = Module("events", {
                         from: http://developer.mozilla.org/en/docs/XUL_Tutorial:Updating_Commands !-->
                     <!-- I don't think we really need this. ––Kris -->
                     <commandset id="onPentadactylFocus" commandupdater="true" events="focus"
-                                oncommandupdate="{_events}.onFocusChange(event);"/>
+                                oncommandupdate={_events + ".onFocusChange(event);"}/>
                     <commandset id="onPentadactylSelect" commandupdater="true" events="select"
-                                oncommandupdate="{_events}.onSelectionChange(event);"/>
+                                oncommandupdate={_events + ".onSelectionChange(event);"}/>
                 </window>
-            </e4x>.*
+            </e4x>.elements()
         });
 
         this._fullscreen = window.fullScreen;
diff --git a/common/content/statusline.js b/common/content/statusline.js
index 0d1a2f9d..44dc84b9 100644
--- a/common/content/statusline.js
+++ b/common/content/statusline.js
@@ -12,7 +12,7 @@ const StatusLine = Module("statusline", {
     init: function () {
 
         let _commandline = "if (window.dactyl) return dactyl.modules.commandline";
-        let append = <e4x xmlns={XUL} xmlns:dactyl={NS}>
+        let prepend = <e4x xmlns={XUL} xmlns:dactyl={NS}>
             <statusbar id="status-bar" dactyl:highlight="StatusLine StatusNormal">
                 <!-- insertbefore="dactyl.statusBefore;" insertafter="dactyl.statusAfter;" -->
                 <hbox
@@ -45,12 +45,12 @@ const StatusLine = Module("statusline", {
             </statusbar>
         </e4x>;
 
-        for each (let attr in append..@key)
+        for each (let attr in prepend..@key)
             attr.parent().@id = "dactyl-statusline-field-" + attr;
 
         util.overlayWindow(window, {
             objects: this.widgets = { get status() this.container },
-            append: append.*
+            prepend: prepend.elements()
         });
 
         this._statusLine = document.getElementById("status-bar");
diff --git a/common/modules/styles.jsm b/common/modules/styles.jsm
index aebf4401..c23a7c65 100644
--- a/common/modules/styles.jsm
+++ b/common/modules/styles.jsm
@@ -79,6 +79,11 @@ const Hive = Class("Hive", {
         this.names = {};
     },
 
+    cleanup: function cleanup() {
+        for (let sheet in values(this.sheets))
+            sheet.enabled = false;
+    },
+
     __iterator__: function () Iterator(this.sheets),
 
     get sites() array(this.sheets).map(function (s) s.sites).flatten().uniq().array,
@@ -214,6 +219,11 @@ const Styles = Module("Styles", {
         this.system = Hive();
     },
 
+    cleanup: function cleanup() {
+        for each (let hive in [this.user, this.system])
+            hive.cleanup();
+    },
+
     __iterator__: function () Iterator(this.user.sheets.concat(this.system.sheets)),
 
     _proxy: function (name, args)
diff --git a/common/modules/util.jsm b/common/modules/util.jsm
index 37d5954b..0d52730a 100644
--- a/common/modules/util.jsm
+++ b/common/modules/util.jsm
@@ -54,6 +54,13 @@ const Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
         this.overlays = {};
     },
 
+    cleanup: function cleanup() {
+        for (let win in iter(services.windowMediator.getEnumerator(null)))
+            for (let elem in values(win.document.dactylOverlayElements))
+                if (elem.get() && elem.get().parentNode)
+                    elem.get().parentNode.removeChild(elem.get());
+    },
+
     // FIXME: Only works for Pentadactyl
     get activeWindow() services.windowMediator.getMostRecentWindow("navigator:browser"),
     dactyl: update(function dactyl(obj) {
@@ -90,12 +97,13 @@ const Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
         let observers = obj.observe;
         function register(meth) {
             services.observer[meth](obj, "quit-application", true);
+            services.observer[meth](obj, "dactyl-unload", true);
             for (let target in keys(observers))
                 services.observer[meth](obj, target, true);
         }
         Class.replaceProperty(obj, "observe",
             function (subject, target, data) {
-                if (target == "quit-application")
+                if (target == "quit-application" || target == "dactyl-unload")
                     register("removeObserver");
                 if (observers[target])
                     observers[target].call(obj, subject, data);
@@ -908,6 +916,10 @@ const Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
         }
     },
     _loadOverlay: function _loadOverlay(window, obj) {
+        let doc = window.document;
+        if (!doc.dactylOverlayElements)
+            doc.dactylOverlayElements = [];
+
         function overlay(key, fn) {
             if (obj[key]) {
                 let iterator = Iterator(obj[key]);
@@ -915,9 +927,12 @@ const Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
                     iterator = ([elem.@id, elem.*, elem.@*::*] for each (elem in obj[key]));
 
                 for (let [elem, xml, attr] in iterator) {
-                    if (elem = window.document.getElementById(elem)) {
-                        fn(elem, util.xmlToDom(xml, window.document, obj.objects));
-                        for each (let attr in attr || [])
+                    if (elem = doc.getElementById(elem)) {
+                        let node = util.xmlToDom(xml, doc, obj.objects);
+                        for (let n in array.iterValues(node.childNodes))
+                            doc.dactylOverlayElements.push(Cu.getWeakReference(n));
+                        fn(elem, node);
+                        for each (let attr in attr || []) // FIXME: Cleanup...
                             elem.setAttributeNS(attr.namespace(), attr.localName(), attr);
                     }
                 }
@@ -929,22 +944,27 @@ const Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
         overlay("append", function (elem, dom) elem.appendChild(dom));
         overlay("prepend", function (elem, dom) elem.insertBefore(dom, elem.firstChild));
         if (obj.init)
-            obj.init(window, window.dactylDOMLoaded);
+            obj.init(window, window.document.dactylDOMLoaded);
 
         if (obj.load)
-            if (window.document.dactylLoaded)
-                obj.load(window, window.document.dactylLoaded);
+            if (doc.dactylLoaded)
+                obj.load(window, doc.dactylLoaded);
         else
-            window.document.addEventListener("load", wrapCallback(function load(event) {
+            doc.addEventListener("load", wrapCallback(function load(event) {
                 if (event.originalTarget === event.target) {
-                    window.document.removeEventListener("load", load.wrapper, true);
-                    window.document.dactylLoaded = event;
+                    doc.removeEventListener("load", load.wrapper, true);
+                    doc.dactylLoaded = event;
                     obj.load(window, event);
                 }
             }), true);
     },
 
     observe: {
+        "dactyl-cleanup": function () {
+            for (let module in values(defineModule.modules))
+                if (module.cleanup)
+                    module.cleanup();
+        },
         "toplevel-window-ready": function (window, data) {
             window.addEventListener("DOMContentLoaded", wrapCallback(function listener(event) {
                 if (event.originalTarget === window.document) {
@@ -965,8 +985,9 @@ const Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
                     this.overlays[url] = [];
                 this.overlays[url].push(fn);
             }, this);
-            for (let win in services.windowMediator.getEnumerator(null))
-                if (win.dactylDOMLoaded)
+
+            for (let win in iter(services.windowMediator.getEnumerator(null)))
+                if (win.document.dactylDOMLoaded)
                     this._loadOverlays(win);
         }
     },

From 33e16f3183bd40d8d847f6abdc0876be49c3b9b1 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Thu, 23 Dec 2010 23:27:33 -0500
Subject: [PATCH 04/35] Bootstrap cleanup work.

--HG--
branch : bootstrapped
---
 common/content/commandline.js    | 14 ++++++++------
 common/content/configbase.js     |  1 +
 common/content/dactyl.js         | 27 ++++++++++++++++++++++++++-
 common/content/dactyl.xul        |  2 --
 common/content/options.js        |  8 ++++++++
 common/content/tabs.js           | 19 ++++++++++++++-----
 common/modules/base.jsm          |  2 ++
 common/modules/bookmarkcache.jsm |  4 ++++
 common/modules/prefs.jsm         |  4 ++++
 common/modules/util.jsm          | 19 ++++++++++++++++---
 common/skin/dactyl.css           | 12 ++++++------
 11 files changed, 89 insertions(+), 23 deletions(-)

diff --git a/common/content/commandline.js b/common/content/commandline.js
index c916dd30..a1d7f0b2 100644
--- a/common/content/commandline.js
+++ b/common/content/commandline.js
@@ -152,6 +152,14 @@ const CommandWidgets = Class("CommandWidgets", {
                 return this.commandbar;
             }
         });
+
+        let fontSize = util.computedStyle(document.getElementById(config.mainWindowId)).fontSize;
+        styles.registerSheet("chrome://dactyl/skin/dactyl.css");
+        styles.system.add("font-size", "chrome://dactyl/content/buffer.xhtml",
+                          "body { font-size: " + fontSize + "; }");
+    },
+    cleanup: function cleanup() {
+        styles.unregisterSheet("chrome://dactyl/skin/dactyl.css");
     },
     addElement: function (obj) {
         const self = this;
@@ -1810,12 +1818,6 @@ const CommandLine = Module("commandline", {
                     host && (!item.domains || !item.domains.some(function (d) util.isSubdomain(d, host))));
             }
         });
-    },
-    styles: function () {
-        let fontSize = util.computedStyle(document.getElementById(config.mainWindowId)).fontSize;
-        styles.registerSheet("chrome://dactyl/skin/dactyl.css");
-        styles.system.add("font-size", "chrome://dactyl/content/buffer.xhtml",
-                          "body { font-size: " + fontSize + "; }");
     }
 });
 
diff --git a/common/content/configbase.js b/common/content/configbase.js
index 459cfda0..0c27691e 100644
--- a/common/content/configbase.js
+++ b/common/content/configbase.js
@@ -65,6 +65,7 @@ const ConfigBase = Class(ModuleBase, {
      *     must be strings as entered via :set.
      */
     defaults: { guioptions: "rb" },
+    cleanups: {},
 
     /**
      * @property {[["string", "string", "function"]]} An array of
diff --git a/common/content/dactyl.js b/common/content/dactyl.js
index dbebe862..0ed9f543 100644
--- a/common/content/dactyl.js
+++ b/common/content/dactyl.js
@@ -19,7 +19,7 @@ const EVAL_ERROR = "__dactyl_eval_error";
 const EVAL_RESULT = "__dactyl_eval_result";
 const EVAL_STRING = "__dactyl_eval_string";
 
-const Dactyl = Module("dactyl", {
+const Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
     init: function () {
         window.dactyl = this;
         // cheap attempt at compatibility
@@ -30,6 +30,7 @@ const Dactyl = Module("dactyl", {
         this.indices = {};
         this.modules = modules;
         this.observers = {};
+        util.addObserver(this);
 
         this.commands["dactyl.help"] = function (event) {
             let elem = event.originalTarget;
@@ -37,6 +38,18 @@ const Dactyl = Module("dactyl", {
         };
     },
 
+    observe: {
+        "dactyl-cleanup": function () {
+            for (let [, mod] in iter(array(values(modules)).reverse()))
+                if (mod instanceof ModuleBase) {
+                    if ("cleanup" in mod)
+                        mod.cleanup();
+                    if ("destroy" in mod)
+                        mod.destroy();
+                }
+        }
+    },
+
     /** @property {string} The name of the current user profile. */
     profileName: Class.memoize(function () {
         // NOTE: services.profile.selectedProfile.name doesn't return
@@ -52,6 +65,12 @@ const Dactyl = Module("dactyl", {
         return "unknown";
     }),
 
+    cleanup: function () {
+        delete window.dactyl;
+        delete window.modules;
+        delete window.liberator;
+    },
+
     destroy: function () {
         autocommands.trigger("LeavePre", {});
         storage.saveAll();
@@ -1315,6 +1334,12 @@ const Dactyl = Module("dactyl", {
         options.add(["guioptions", "go"],
             "Show or hide certain GUI elements like the menu or toolbar",
             "charlist", config.defaults.guioptions || "", {
+
+                // FIXME: cleanup
+                cleanupValue: config.cleanups.guioptions ||
+                    "r" + [k for ([k, v] in iter(groups[1].opts))
+                           if (!document.getElementById(v[1][0]).collapsed)].join(""),
+
                 completer: function (context)
                     array(groups).map(function (g) [[k, v[0]] for ([k, v] in Iterator(g.opts))]).flatten(),
                 setter: function (value) {
diff --git a/common/content/dactyl.xul b/common/content/dactyl.xul
index 20fc35f8..5d6d6b62 100644
--- a/common/content/dactyl.xul
+++ b/common/content/dactyl.xul
@@ -8,8 +8,6 @@
  given in the LICENSE.txt file included with this file.
   -->
 
-<?xml-stylesheet href="chrome://dactyl/skin/dactyl.css" type="text/css"?>
-
 <!DOCTYPE overlay SYSTEM "dactyl.dtd" [
     <!ENTITY dactyl.content "chrome://dactyl/content/">
 ]>
diff --git a/common/content/options.js b/common/content/options.js
index 843c413c..34ce63bf 100644
--- a/common/content/options.js
+++ b/common/content/options.js
@@ -281,6 +281,8 @@ const Option = Class("Option", {
      */
     description: "",
 
+    cleanupValue: null,
+
     /**
      * @property {function(CompletionContext, Args)} This option's completer.
      * @see CompletionContext
@@ -637,6 +639,12 @@ const Options = Module("options", {
         }, window);
     },
 
+    cleanup: function cleanup() {
+        for (let opt in this)
+            if (opt.cleanupValue != null)
+                opt.value = opt.parse(opt.cleanupValue);
+    },
+
     /** @property {Iterator(Option)} @private */
     __iterator__: function ()
         values(this._options.sort(function (a, b) String.localeCompare(a.name, b.name))),
diff --git a/common/content/tabs.js b/common/content/tabs.js
index db906ff0..df717760 100644
--- a/common/content/tabs.js
+++ b/common/content/tabs.js
@@ -36,6 +36,15 @@ const Tabs = Module("tabs", {
         };
     },
 
+    cleanup: function cleanup() {
+        for (let [i, tab] in Iterator(this.allTabs)) {
+            function node(clas) document.getAnonymousElementByAttribute(tab, "class", clas);
+            for (let elem in values(["dactyl-tab-icon-number", "dactyl-tab-number"].map(node)))
+                if (elem)
+                    elem.parentNode.parentNode.removeChild(elem.parentNode);
+        }
+    },
+
     _updateTabCount: function () {
         if (dactyl.has("Gecko2"))
             for (let [i, tab] in Iterator(this.visibleTabs)) {
@@ -43,15 +52,15 @@ const Tabs = Module("tabs", {
                 if (!node("dactyl-tab-number")) {
                     let nodes = {};
                     let dom = util.xmlToDom(<xul xmlns:xul={XUL} xmlns:html={XHTML}
-                        ><xul:hbox highlight="tab-number"><xul:label key="icon" align="center" highlight="TabIconNumber" class="dactyl-tab-number"/></xul:hbox
-                        ><xul:hbox highlight="tab-number"><html:div key="label" highlight="TabNumber"/></xul:hbox
+                        ><xul:hbox highlight="tab-number"><xul:label key="icon" align="center" highlight="TabIconNumber" class="dactyl-tab-icon-number"/></xul:hbox
+                        ><xul:hbox highlight="tab-number"><html:div key="label" highlight="TabNumber" class="dactyl-tab-number"/></xul:hbox
                     ></xul>.*, document, nodes);
                     let img = node("tab-icon-image");
                     img.parentNode.appendChild(dom);
-                    tab.__defineGetter__("ordinal", function () Number(nodes.icon.value));
-                    tab.__defineSetter__("ordinal", function (i) nodes.icon.value = nodes.label.textContent = i);
+                    tab.__defineGetter__("dactylOrdinal", function () Number(nodes.icon.value));
+                    tab.__defineSetter__("dactylOrdinal", function (i) nodes.icon.value = nodes.label.textContent = i);
                 }
-                tab.ordinal = i + 1;
+                tab.dactylOrdinal = i + 1;
             }
         statusline.updateTabCount(true);
     },
diff --git a/common/modules/base.jsm b/common/modules/base.jsm
index 19529316..e2abf9d4 100644
--- a/common/modules/base.jsm
+++ b/common/modules/base.jsm
@@ -98,6 +98,7 @@ let loaded = {};
 let currentModule;
 function defineModule(name, params) {
     let module = Cu.getGlobalForObject ? Cu.getGlobalForObject(params) : params.__parent__;
+    defineModule.globals.push(module);
     module.NAME = name;
     module.EXPORTED_SYMBOLS = params.exports || [];
     defineModule.loadLog.push("defineModule " + name);
@@ -114,6 +115,7 @@ function defineModule(name, params) {
     currentModule = module;
 }
 
+defineModule.globals = [];
 defineModule.loadLog = [];
 Object.defineProperty(defineModule.loadLog, "push", {
     value: function (val) { defineModule.dump(val + "\n"); this[this.length] = val; }
diff --git a/common/modules/bookmarkcache.jsm b/common/modules/bookmarkcache.jsm
index e3d972b6..e230a077 100644
--- a/common/modules/bookmarkcache.jsm
+++ b/common/modules/bookmarkcache.jsm
@@ -42,6 +42,10 @@ const BookmarkCache = Module("BookmarkCache", XPCOM(Ci.nsINavBookmarkObserver),
         services.bookmarks.addObserver(this, false);
     },
 
+    cleanup: function cleanup() {
+        services.bookmarks.removeObserver(this);
+    },
+
     __iterator__: function () (val for ([, val] in Iterator(bookmarkcache.bookmarks))),
 
     get bookmarks() Class.replaceProperty(this, "bookmarks", this.load()),
diff --git a/common/modules/prefs.jsm b/common/modules/prefs.jsm
index d5c935e3..63ebac52 100644
--- a/common/modules/prefs.jsm
+++ b/common/modules/prefs.jsm
@@ -28,6 +28,10 @@ const Prefs = Module("prefs", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference
         this.restore();
     },
 
+    cleanup: function cleanup() {
+        this._branch.removeObserver("", this);
+    },
+
     observe: {
         "nsPref:changed": function (subject, data) {
             let observers = this._observers[data];
diff --git a/common/modules/util.jsm b/common/modules/util.jsm
index 0d52730a..b2193827 100644
--- a/common/modules/util.jsm
+++ b/common/modules/util.jsm
@@ -961,9 +961,21 @@ const Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
 
     observe: {
         "dactyl-cleanup": function () {
-            for (let module in values(defineModule.modules))
-                if (module.cleanup)
-                    module.cleanup();
+            // Let window cleanup functions run synchronously before we
+            // destroy modules.
+            util.timeout(function () {
+                for (let module in values(defineModule.modules))
+                    if (module.cleanup)
+                        module.cleanup();
+
+                let getOwnPropertyNames = Object.getOwnPropertyNames;
+                for each (let global in defineModule.globals.reverse())
+                    for each (let k in getOwnPropertyNames(global))
+                        try {
+                            delete global[k];
+                        }
+                        catch (e) {}
+            });
         },
         "toplevel-window-ready": function (window, data) {
             window.addEventListener("DOMContentLoaded", wrapCallback(function listener(event) {
@@ -1141,6 +1153,7 @@ const Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
         }
         catch (e) {
             this.dump(e);
+            try { util.dump(e.stack) } catch (e) {}
         }
     },
 
diff --git a/common/skin/dactyl.css b/common/skin/dactyl.css
index 62c92ca1..ae35761b 100644
--- a/common/skin/dactyl.css
+++ b/common/skin/dactyl.css
@@ -89,8 +89,8 @@ window[dactyl|highlight~=Bell] > * {
 }
 
 [dactyl|highlight~=CmdLine] {
-    background: inherit;
-    color: inherit;
+    background: inherit !important;
+    color: inherit !important;
 }
 [dactyl|highlight~=CmdLine],
 [dactyl|highlight~=CmdLine] > [dactyl|highlight~=CmdLine] {
@@ -123,8 +123,8 @@ statusbarpanel {
 }
 
 #dactyl-statusline-field-url {
-    background-color: inherit;
-    color: inherit;
+    background-color: inherit !important;
+    color: inherit !important;
 }
 
 /* no longer at the window's bottom right corner */
@@ -141,8 +141,8 @@ statusbarpanel {
     padding: 0px;
 }
 .dactyl-commandline-command {
-    background-color: inherit;
-    color: inherit;
+    background-color: inherit !important;
+    color: inherit !important;
     margin: 0px;
 }
 .dactyl-commandline-command html|*:focus {

From baecb996c3e53dcda69dd44e8893df55e72a9be9 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Fri, 24 Dec 2010 09:21:14 -0500
Subject: [PATCH 05/35] More bootstrap work.

--HG--
branch : bootstrapped
---
 .hgignore                                |   1 +
 common/Makefile                          |   2 +-
 common/bootstrap.js                      | 169 +++++++++++++++++++++++
 common/components/commandline-handler.js |   1 +
 common/components/protocols.js           |  22 +--
 common/content/completion.js             |   4 +-
 common/content/dactyl.js                 |   1 -
 common/content/modes.js                  |   1 -
 common/modules/base.jsm                  |   6 +-
 common/modules/services.jsm              |  18 +--
 pentadactyl/bootstrap.js                 |   1 +
 pentadactyl/install.rdf                  |   3 +-
 12 files changed, 204 insertions(+), 25 deletions(-)
 create mode 100755 common/bootstrap.js
 create mode 120000 pentadactyl/bootstrap.js

diff --git a/.hgignore b/.hgignore
index e55fa075..9cb94cb8 100644
--- a/.hgignore
+++ b/.hgignore
@@ -13,6 +13,7 @@ syntax: glob
 */contrib/vim/*.vba
 */bak/*
 downloads/*
+.git/*
 
 *.py[co]
 
diff --git a/common/Makefile b/common/Makefile
index 827164c0..470ddb33 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -25,7 +25,7 @@ CHROME	      = chrome/
 JAR           = $(CHROME)$(NAME).jar
 
 XPI_BASES     = $(JAR_BASES) $(TOP)/..
-XPI_FILES     = install.rdf TODO AUTHORS Donors NEWS LICENSE.txt
+XPI_FILES     = bootstrap.js install.rdf TODO AUTHORS Donors NEWS LICENSE.txt
 XPI_DIRS      = modules components chrome defaults
 XPI_TEXTS     = js jsm $(JAR_TEXTS)
 XPI_BINS      = $(JAR_BINS)
diff --git a/common/bootstrap.js b/common/bootstrap.js
new file mode 100755
index 00000000..7fb41e91
--- /dev/null
+++ b/common/bootstrap.js
@@ -0,0 +1,169 @@
+// https://wiki.mozilla.org/Extension_Manager:Bootstrapped_Extensions
+
+const NAME = "bootstrap";
+const global = this;
+
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+const Cu = Components.utils;
+const Cr = Components.results;
+
+Cu.import("resource://gre/modules/AddonManager.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+
+const io = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
+const resourceProto = io.getProtocolHandler("resource")
+                        .QueryInterface(Ci.nsIResProtocolHandler);
+const categoryManager = Cc["@mozilla.org/categorymanager;1"].getService(Ci.nsICategoryManager);
+const manager = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
+
+function httpGet(url) {
+    let xmlhttp = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"].createInstance(Ci.nsIXMLHttpRequest);
+    xmlhttp.open("GET", url, false);
+    xmlhttp.send(null);
+    return xmlhttp;
+}
+
+function writeFile(file, buf) {
+    let fstream = Cc["@mozilla.org/network/file-output-stream;1"].createInstance(Ci.nsIFileOutputStream);
+    let stream = Cc["@mozilla.org/intl/converter-output-stream;1"].createInstance(Ci.nsIConverterOutputStream);
+
+    fstream.init(file, 0x02 | 0x08 | 0x20, parseInt("0644", 8), 0);
+    stream.init(fstream, "UTF-8", 0, "?");
+    stream.writeString(buf);
+    stream.close();
+    fstream.close();
+}
+
+let initialized = false;
+let addon = null;
+let basePath = null;
+
+function startup(data, reason) {
+    dump("dactyl: bootstrap: startup\n");
+    basePath = data.installPath;
+
+    if (!initialized) {
+        initialized = true;
+
+        dump("dactyl: bootstrap: init" + " " + data.id + "\n");
+
+        AddonManager.getAddonByID(data.id, function (res) {
+            try {
+                addon = res;
+                init();
+            }
+            catch (e) {
+                dump("dactyl: bootstrap: " + e + "\n");
+                Cu.reportError(e);
+            }
+        });
+
+    }
+}
+
+function FactoryProxy(url, classID) {
+    this.url = url;
+    this.classID = Components.ID(classID);
+}
+FactoryProxy.prototype = {
+    QueryInterface: XPCOMUtils.generateQI(Ci.nsIFactory),
+    init: function () {
+        manager.registerFactory(this.classID,
+                                String(this.classID),
+                                this.contractID,
+                                this);
+    },
+    get module() {
+        Class.replaceProperty(this, "module", {});
+        Cu.import(this.url, this.module);
+        return this.module;
+    },
+    createInstance: function ()
+        let (factory = this.module.NSGetFactory(this.classID))
+            factory.createInstance.apply(factory, arguments)
+}
+
+function init() {
+    dump("dactyl: bootstrap: init: " + addon + "\n");
+
+    let manifestURI = addon.getResourceURI("chrome.manifest");
+    let manifest = httpGet(manifestURI.spec)
+            .responseText
+            .replace(/^\s*|\s*$|#.*/g, "")
+            .replace(/^\s*\n/gm, "");
+
+    function url(path) addon.getResourceURI(path).spec;
+
+    let result = [];
+    let components = {};
+
+    for each (let line in manifest.split("\n")) {
+        let fields = line.split(/\s+/);
+        switch(fields[0]) {
+        case "content":
+            fields[2] = url(fields[2]);
+        default:
+            result.push(fields);
+            break;
+
+        case "locale":
+        case "skin":
+            fields[3] = url(fields[3]);
+            result.push(fields);
+            break;
+
+        case "category":
+            categoryManager.addCategoryEntry(fields[1], fields[2], fields[3], false, true);
+            break;
+        case "component":
+            components[fields[1]] = new FactoryProxy(url(fields[2]), fields[1]);
+            break;
+        case "contract":
+            components[fields[2]].contractID = fields[1];
+            components[fields[2]].init();
+            break;
+
+        case "resource":
+            resourceProto.setSubstitution(fields[1], addon.getResourceURI(fields[2]));
+        }
+    }
+
+    Cu.import("resource://dactyl/base.jsm");
+    require(global, "prefs");
+    require(global, "services");
+
+    services.subscriptLoader.loadSubScript(
+        url("defaults/preferences/dactyl.js"),
+        {
+            pref: function pref(name, val) {
+                if (prefs.get(name, null) == null)
+                    prefs.set(name, val);
+            }
+        });
+
+    if (manifestURI instanceof Ci.nsIFileURL)
+        manager.autoRegister(file.QueryInterface(Ci.nsIFileURL).file);
+    else {
+        var file = basePath.parent;
+        file.append(addon.id + ".manifest");
+
+        writeFile(file, result.map(function (line) line.join(" ")).join("\n"));
+        manager.autoRegister(file);
+        //file.remove(false);
+    }
+}
+
+function reasonToString(reason) {
+    for each (let name in ["disable", "downgrade", "enable",
+                           "install", "shutdown", "startup",
+                           "uninstall", "upgrade"])
+        if (reason == global["ADDON_" + name.toUpperCase()] ||
+            reason == global["APP_" + name.toUpperCase()])
+            return name;
+}
+
+function install(data, reason) { dump("dactyl: bootstrap: install\n") }
+function shutdown(data, reason) { dump("dactyl: bootstrap: shutdown\n") }
+function uninstall(data, reason) { dump("dactyl: bootstrap: uninstall\n") }
+
diff --git a/common/components/commandline-handler.js b/common/components/commandline-handler.js
index fa60f73c..3083af0f 100644
--- a/common/components/commandline-handler.js
+++ b/common/components/commandline-handler.js
@@ -48,5 +48,6 @@ if (XPCOMUtils.generateNSGetFactory)
     const NSGetFactory = XPCOMUtils.generateNSGetFactory([CommandLineHandler]);
 else
     const NSGetModule = XPCOMUtils.generateNSGetModule([CommandLineHandler]);
+var EXPORTED_SYMBOLS = ["NSGetFactory"];
 
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/common/components/protocols.js b/common/components/protocols.js
index 0bedf607..8b8069a5 100644
--- a/common/components/protocols.js
+++ b/common/components/protocols.js
@@ -12,13 +12,15 @@
  * By Kris Maglione, ideas from Ed Anuff's nsChromeExtensionHandler.
  */
 
-const Ci = Components.interfaces, Cc = Components.classes;
+const NAME = "protocols";
+const global = this;
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+const Cu = Components.utils;
 
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 
 const ioService = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
-const prefs = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefService)
-                    .getBranch("extensions.dactyl.");
 const systemPrincipal = Cc["@mozilla.org/systemprincipal;1"].getService(Ci.nsIPrincipal);
 
 function dataURL(type, data) "data:" + (type || "application/xml;encoding=UTF-8") + "," + escape(data);
@@ -97,10 +99,15 @@ function Dactyl() {
     this.OVERLAY_MAP = {};
 
     this.pages = {};
-    for each (let pref in ["appName", "fileExt", "host", "hostbin", "idName", "name"])
-        this[pref] = prefs.getComplexValue(pref, Ci.nsISupportsString).data;
 
-    this.addonID = this.name + "@dactyl.googlecode.com";
+    Cu.import("resource://dactyl/base.jsm");
+    require(global, "prefs");
+
+    ["appName", "fileExt", "host", "hostbin", "idName", "name", "version"].forEach(function (pref)
+        this.__defineGetter__(pref, function () prefs.get("extensions.dactyl." + pref, "dactyl")),
+        this);
+
+    memoize(this, "addonID", function () this.name + "@dactyl.googlecode.com");
 }
 Dactyl.prototype = {
     contractID:       "@mozilla.org/network/protocol;1?name=dactyl",
@@ -109,8 +116,6 @@ Dactyl.prototype = {
     QueryInterface:   XPCOMUtils.generateQI([Ci.nsIProtocolHandler]),
     _xpcom_factory:   Factory(Dactyl),
 
-    get version() prefs.getComplexValue("version", Ci.nsISupportsString).data,
-
     init: function (obj) {
         for each (let prop in ["HELP_TAGS", "FILE_MAP", "OVERLAY_MAP"]) {
             this[prop] = this[prop].constructor();
@@ -202,5 +207,6 @@ if (XPCOMUtils.generateNSGetFactory)
     const NSGetFactory = XPCOMUtils.generateNSGetFactory([AboutHandler, ChromeData, Dactyl, Shim]);
 else
     const NSGetModule = XPCOMUtils.generateNSGetModule([AboutHandler, ChromeData, Dactyl, Shim]);
+var EXPORTED_SYMBOLS = ["NSGetFactory"];
 
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/common/content/completion.js b/common/content/completion.js
index 5c5d72e9..c58c604f 100644
--- a/common/content/completion.js
+++ b/common/content/completion.js
@@ -530,9 +530,9 @@ const CompletionContext = Class("CompletionContext", {
                 // of the given string which also matches the current
                 // item's text.
                 let len = substring.length;
-                let i = 0, m, n = len;
+                let i = 0, n = len;
                 while (n) {
-                    m = Math.floor(n / 2);
+                    let m = Math.floor(n / 2);
                     let keep = compare(fixCase(item.text), substring.substring(0, i + m));
                     if (!keep)
                         len = i + m - 1;
diff --git a/common/content/dactyl.js b/common/content/dactyl.js
index d7b46415..422fb9ad 100644
--- a/common/content/dactyl.js
+++ b/common/content/dactyl.js
@@ -391,7 +391,6 @@ const Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase),
 
     focus: function focus(elem, flags) {
         flags = flags || services.focus.FLAG_BYMOUSE;
-        util.dumpStack();
         try {
             if (elem instanceof Document)
                 elem = elem.defaultView;
diff --git a/common/content/modes.js b/common/content/modes.js
index 715d4b0e..c59e85b6 100644
--- a/common/content/modes.js
+++ b/common/content/modes.js
@@ -286,7 +286,6 @@ const Modes = Module("modes", {
     },
 
     push: function push(mainMode, extendedMode, params) {
-        util.dumpStack();
         this.set(mainMode, extendedMode, params, { push: this.topOfStack });
     },
 
diff --git a/common/modules/base.jsm b/common/modules/base.jsm
index e2abf9d4..bd382c1d 100644
--- a/common/modules/base.jsm
+++ b/common/modules/base.jsm
@@ -126,7 +126,7 @@ defineModule.dump = function dump_() {
             msg = util.objectToString(msg);
         return msg;
     }).join(", ");
-    let name = loaded.services ? services["dactyl:"].name : "dactyl";
+    let name = loaded.services && loaded.prefs && services["dactyl:"] ? services["dactyl:"].name : "dactyl";
     dump(String.replace(msg, /\n?$/, "\n")
                .replace(/^./gm, name + ": $&"));
 }
@@ -179,8 +179,8 @@ defineModule("base", {
         "call", "callable", "ctypes", "curry", "debuggerProperties", "defineModule",
         "deprecated", "endModule", "forEach", "isArray", "isGenerator",
         "isinstance", "isObject", "isString", "isSubclass", "iter", "iterAll",
-        "keys", "memoize", "octal", "properties", "set", "update", "values",
-        "withCallerGlobal"
+        "keys", "memoize", "octal", "properties", "require", "set", "update",
+        "values", "withCallerGlobal"
     ],
     use: ["services", "util"]
 });
diff --git a/common/modules/services.jsm b/common/modules/services.jsm
index 7be520f6..38212cf8 100644
--- a/common/modules/services.jsm
+++ b/common/modules/services.jsm
@@ -8,8 +8,7 @@ try {
 
 Components.utils.import("resource://dactyl/base.jsm");
 defineModule("services", {
-    exports: ["Services", "services"],
-    use: ["util"]
+    exports: ["AddonManager", "Services", "services"]
 });
 
 /**
@@ -72,6 +71,9 @@ const Services = Module("Services", {
         this.addClass("Xmlhttp",      "@mozilla.org/xmlextras/xmlhttprequest;1",   Ci.nsIXMLHttpRequest);
         this.addClass("ZipReader",    "@mozilla.org/libjar/zip-reader;1",          Ci.nsIZipReader, "open");
         this.addClass("ZipWriter",    "@mozilla.org/zipwriter;1",                  Ci.nsIZipWriter);
+
+        if (!this.extensionManager)
+            Components.utils.import("resource://gre/modules/AddonManager.jsm");
     },
 
     _create: function (classes, ifaces, meth, init, args) {
@@ -85,7 +87,7 @@ const Services = Module("Services", {
             return res;
         }
         catch (e) {
-            util.dump("Service creation failed for '" + classes + "': " + e + "\n");
+            dump("dactyl: Service creation failed for '" + classes + "': " + e + "\n");
             return null;
         }
     },
@@ -105,8 +107,12 @@ const Services = Module("Services", {
         if (name in this && ifaces && !this.__lookupGetter__(name) && !(this[name] instanceof Ci.nsISupports))
             throw TypeError();
         this.__defineGetter__(name, function () {
+            let res = self._create(class_, ifaces, meth);
+            if (!res)
+                return null;
+
             delete this[name];
-            return this[name] = self._create(class_, ifaces, meth);
+            return this[name] = res;
         });
     },
 
@@ -140,10 +146,6 @@ const Services = Module("Services", {
     get: function (name) this[name],
 }, {
 }, {
-    init: function (dactyl, modules) {
-        if (!modules.AddonManager && !this.get("extensionManager"))
-            Components.utils.import("resource://gre/modules/AddonManager.jsm", modules);
-    },
     javascript: function (dactyl, modules) {
         modules.JavaScript.setCompleter(this.get, [function () [[k, v] for ([k, v] in Iterator(services)) if (v instanceof Ci.nsISupports)]]);
         modules.JavaScript.setCompleter(this.create, [function () [[c, ""] for (c in services.classes)]]);
diff --git a/pentadactyl/bootstrap.js b/pentadactyl/bootstrap.js
new file mode 120000
index 00000000..ff1024d5
--- /dev/null
+++ b/pentadactyl/bootstrap.js
@@ -0,0 +1 @@
+../common/bootstrap.js
\ No newline at end of file
diff --git a/pentadactyl/install.rdf b/pentadactyl/install.rdf
index ce5e76b4..7e7429b7 100644
--- a/pentadactyl/install.rdf
+++ b/pentadactyl/install.rdf
@@ -8,7 +8,8 @@
         em:description="Firefox for Vim and Links addicts"
         em:homepageURL="http://dactyl.sourceforge.net/pentadactyl"
         em:iconURL="chrome://pentadactyl/skin/icon.png"
-        em:optionsURL="chrome://dactyl/content/preferences.xul">
+        em:optionsURL="chrome://dactyl/content/preferences.xul"
+        em:bootstrap="true">
 
         <em:creator>Kris Maglione, Doug Kearns</em:creator>
         <em:developer>Štěpán Němec</em:developer>

From 794d711802eb980e7879efa23f99406403754e8e Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Fri, 24 Dec 2010 11:39:03 -0500
Subject: [PATCH 06/35] More bootstrap work. Now loadable without restart.

--HG--
branch : bootstrapped
rename : common/content/modules.js => common/modules/overlay.jsm
---
 common/bootstrap.js                 |   6 +-
 common/content/dactyl-overlay.js    |  91 ----------
 common/content/dactyl.xul           |  21 ---
 common/content/modules.js           | 157 -----------------
 common/modules/base.jsm             |   2 +
 common/modules/overlay.jsm          | 259 ++++++++++++++++++++++++++++
 common/modules/sanitizer.jsm        |   4 +-
 common/modules/util.jsm             |  18 +-
 pentadactyl/chrome.manifest         |   3 -
 pentadactyl/content/config.js       |  46 +++++
 pentadactyl/content/pentadactyl.xul |  58 -------
 11 files changed, 328 insertions(+), 337 deletions(-)
 delete mode 100644 common/content/dactyl-overlay.js
 delete mode 100644 common/content/dactyl.xul
 delete mode 100644 common/content/modules.js
 create mode 100644 common/modules/overlay.jsm
 delete mode 100644 pentadactyl/content/pentadactyl.xul

diff --git a/common/bootstrap.js b/common/bootstrap.js
index 7fb41e91..39bf9e73 100755
--- a/common/bootstrap.js
+++ b/common/bootstrap.js
@@ -143,15 +143,17 @@ function init() {
         });
 
     if (manifestURI instanceof Ci.nsIFileURL)
-        manager.autoRegister(file.QueryInterface(Ci.nsIFileURL).file);
+        manager.autoRegister(manifestURI.QueryInterface(Ci.nsIFileURL).file);
     else {
         var file = basePath.parent;
         file.append(addon.id + ".manifest");
 
         writeFile(file, result.map(function (line) line.join(" ")).join("\n"));
         manager.autoRegister(file);
-        //file.remove(false);
+        file.remove(false);
     }
+
+    require(global, "overlay");
 }
 
 function reasonToString(reason) {
diff --git a/common/content/dactyl-overlay.js b/common/content/dactyl-overlay.js
deleted file mode 100644
index a0a51da6..00000000
--- a/common/content/dactyl-overlay.js
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright (c) 2008-2010 Kris Maglione <maglione.k at Gmail>
-//
-// This work is licensed for reuse under an MIT license. Details are
-// given in the LICENSE.txt file included with this file.
-"use strict";
-
-(function () {
-    function newContext(proto) {
-        let sandbox = Components.utils.Sandbox(window, { sandboxPrototype: proto || modules, wantXrays: false });
-        // Hack:
-        sandbox.Object = jsmodules.Object;
-        sandbox.Math = jsmodules.Math;
-        sandbox.__proto__ = proto || modules;
-        return sandbox;
-    }
-    const jsmodules = {};
-    const modules = {
-        __proto__: jsmodules,
-        get content() this.config.browser.contentWindow || window.content,
-        jsmodules: jsmodules,
-        newContext: newContext,
-        window: window
-    };
-    modules.modules = modules;
-
-    const BASE = "chrome://dactyl/content/";
-    const loader = Components.classes["@mozilla.org/moz/jssubscript-loader;1"]
-                             .getService(Components.interfaces.mozIJSSubScriptLoader);
-
-    modules.load = function load(script) {
-        for (let [i, base] in Iterator(prefix)) {
-            try {
-                loader.loadSubScript(base + script + ".js", modules, "UTF-8");
-                return;
-            }
-            catch (e) {
-                if (typeof e !== "string") {
-                    dump("dactyl: Trying: " + (base + script + ".js") + ": " + e + "\n" + e.stack + "\n");
-                    Components.utils.reportError(e);
-                }
-            }
-        }
-        try {
-            Components.utils.import("resource://dactyl/" + script + ".jsm", jsmodules);
-        }
-        catch (e) {
-            dump("dactyl: Loading script " + script + ": " + e.result + " " + e + "\n");
-            dump(Error().stack + "\n");
-            Components.utils.reportError(e);
-        }
-    };
-
-    let prefix = [BASE];
-
-    modules.load("util");
-    modules.load("services");
-    prefix.unshift("chrome://" + modules.services["dactyl:"].name + "/content/");
-
-    ["base",
-     "modules",
-     "prefs",
-     "storage",
-     "javascript",
-     "dactyl",
-     "modes",
-     "abbreviations",
-     "autocommands",
-     "buffer",
-     "commandline",
-     "commands",
-     "completion",
-     "configbase",
-     "config",
-     "editor",
-     "events",
-     "finder",
-     "highlight",
-     "hints",
-     "io",
-     "mappings",
-     "marks",
-     "options",
-     "statusline",
-     "styles",
-     "template"
-     ].forEach(modules.load);
-
-    modules.Config.prototype.scripts.forEach(modules.load);
-})();
-
-// vim: set fdm=marker sw=4 ts=4 et:
diff --git a/common/content/dactyl.xul b/common/content/dactyl.xul
deleted file mode 100644
index 5d6d6b62..00000000
--- a/common/content/dactyl.xul
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@vimperator.org>
- Copyright (c) 2007-2009 by Kris Maglione <maglione.k at Gmail>
-
- This work is licensed for reuse under an MIT license. Details are
- given in the LICENSE.txt file included with this file.
-  -->
-
-<!DOCTYPE overlay SYSTEM "dactyl.dtd" [
-    <!ENTITY dactyl.content "chrome://dactyl/content/">
-]>
-
-<overlay id="dactyl"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-    <script type="application/x-javascript;version=1.8" src="&dactyl.content;dactyl-overlay.js"/>
-</overlay>
-
-<!-- vim: set fdm=marker sw=4 ts=4 et: -->
diff --git a/common/content/modules.js b/common/content/modules.js
deleted file mode 100644
index a1ed1640..00000000
--- a/common/content/modules.js
+++ /dev/null
@@ -1,157 +0,0 @@
-// Copyright (c) 2009-2010 by Kris Maglione <maglione.k@gmail.com>
-//
-// This work is licensed for reuse under an MIT license. Details are
-// given in the LICENSE.txt file included with this file.
-"use strict";
-
-/**
- * @class ModuleBase
- * The base class for all modules.
- */
-const ModuleBase = Class("ModuleBase", {
-    /**
-     * @property {[string]} A list of module prerequisites which
-     * must be initialized before this module is loaded.
-     */
-    requires: [],
-
-    toString: function () "[module " + this.constructor.className + "]"
-});
-
-/**
- * @constructor Module
- *
- * Constructs a new ModuleBase class and makes arrangements for its
- * initialization. Arguments marked as optional must be either
- * entirely elided, or they must have the exact type specified.
- * Loading semantics are as follows:
- *
- *  - A module is guaranteed not to be initialized before any of its
- *    prerequisites as listed in its {@see ModuleBase#requires} member.
- *  - A module is considered initialized once it's been instantiated,
- *    its {@see Class#init} method has been called, and its
- *    instance has been installed into the top-level {@see modules}
- *    object.
- *  - Once the module has been initialized, its module-dependent
- *    initialization functions will be called as described hereafter.
- * @param {string} name The module's name as it will appear in the
- *     top-level {@see modules} object.
- * @param {ModuleBase} base The base class for this module.
- *     @optional
- * @param {Object} prototype The prototype for instances of this
- *     object. The object itself is copied and not used as a prototype
- *     directly.
- * @param {Object} classProperties The class properties for the new
- *     module constructor.
- *     @optional
- * @param {Object} moduleInit The module initialization functions
- *     for the new module. Each function is called as soon as the named module
- *     has been initialized, but after the module itself. The constructors are
- *     guaranteed to be called in the same order that the dependent modules
- *     were initialized.
- *     @optional
- *
- * @returns {function} The constructor for the resulting module.
- */
-function Module(name) {
-    let args = Array.slice(arguments);
-
-    var base = ModuleBase;
-    if (callable(args[1]))
-        base = args.splice(1, 1)[0];
-    let [, prototype, classProperties, moduleInit] = args;
-    const module = Class(name, base, prototype, classProperties);
-
-    module.INIT = moduleInit || {};
-    module.prototype.INIT = module.INIT;
-    module.requires = prototype.requires || [];
-    Module.list.push(module);
-    Module.constructors[name] = module;
-    return module;
-}
-Module.list = [];
-Module.constructors = {};
-
-window.addEventListener("load", function onLoad() {
-    window.removeEventListener("load", onLoad, false);
-
-    Module.list.forEach(function (module) {
-        modules.__defineGetter__(module.className, function () {
-            delete modules[module.className];
-            return load(module.className, null, Components.stack.caller);
-        });
-    });
-
-    const start = Date.now();
-    const deferredInit = { load: [] };
-    const seen = set();
-    const loaded = set(["init"]);
-    modules.loaded = loaded;
-
-    function init(module) {
-        function init(func, mod)
-            function () defineModule.time(module.className || module.constructor.className, mod,
-                                          func, module,
-                                          dactyl, modules, window);
-
-        set.add(loaded, module.constructor.className);
-        for (let [mod, func] in Iterator(module.INIT)) {
-            if (mod in loaded)
-                init(func, mod)();
-            else {
-                deferredInit[mod] = deferredInit[mod] || [];
-                deferredInit[mod].push(init(func, mod));
-            }
-        }
-    }
-    defineModule.modules.map(init);
-
-    function load(module, prereq, frame) {
-        if (isString(module)) {
-            if (!Module.constructors.hasOwnProperty(module))
-                modules.load(module);
-            module = Module.constructors[module];
-        }
-
-        try {
-            if (module.className in loaded)
-                return;
-            if (module.className in seen)
-                throw Error("Module dependency loop.");
-            set.add(seen, module.className);
-
-            for (let dep in values(module.requires))
-                load(Module.constructors[dep], module.className);
-
-            defineModule.loadLog.push("Load" + (isString(prereq) ? " " + prereq + " dependency: " : ": ") + module.className);
-            if (frame && frame.filename)
-                defineModule.loadLog.push(" from: " + frame.filename + ":" + frame.lineNumber);
-
-            delete modules[module.className];
-            modules[module.className] = defineModule.time(module.className, "init", module);
-
-            init(modules[module.className]);
-            for (let [, fn] in iter(deferredInit[module.className] || []))
-                fn();
-        }
-        catch (e) {
-            util.dump("Loading " + (module && module.className) + ": " + e + "\n" + (e.stack || ""));
-        }
-        return modules[module.className];
-    }
-
-    Module.list.forEach(load);
-    deferredInit["load"].forEach(call);
-    modules.times = update({}, defineModule.times);
-
-    util.dump("Loaded in " + (Date.now() - start) + "ms");
-}, false);
-
-window.addEventListener("unload", function onUnload() {
-    window.removeEventListener("unload", onUnload, false);
-    for (let [, mod] in iter(modules))
-        if (mod instanceof ModuleBase && "destroy" in mod)
-            mod.destroy();
-}, false);
-
-// vim: set fdm=marker sw=4 ts=4 et:
diff --git a/common/modules/base.jsm b/common/modules/base.jsm
index bd382c1d..56e37a45 100644
--- a/common/modules/base.jsm
+++ b/common/modules/base.jsm
@@ -152,8 +152,10 @@ defineModule.time = function time(major, minor, func, self) {
 
 function endModule() {
     defineModule.loadLog.push("endModule " + currentModule.NAME);
+
     for (let [, mod] in Iterator(use[currentModule.NAME] || []))
         require(mod, currentModule.NAME, "use");
+
     loaded[currentModule.NAME] = 1;
 }
 
diff --git a/common/modules/overlay.jsm b/common/modules/overlay.jsm
new file mode 100644
index 00000000..8036968d
--- /dev/null
+++ b/common/modules/overlay.jsm
@@ -0,0 +1,259 @@
+// Copyright (c) 2009-2010 by Kris Maglione <maglione.k@gmail.com>
+//
+// This work is licensed for reuse under an MIT license. Details are
+// given in the LICENSE.txt file included with this file.
+"use strict";
+
+Components.utils.import("resource://dactyl/base.jsm");
+defineModule("overlay", {
+    exports: ["ModuleBase"],
+    require: ["sanitizer", "services", "template", "util"],
+});
+
+/**
+ * @class ModuleBase
+ * The base class for all modules.
+ */
+const ModuleBase = Class("ModuleBase", {
+    /**
+     * @property {[string]} A list of module prerequisites which
+     * must be initialized before this module is loaded.
+     */
+    requires: [],
+
+    toString: function () "[module " + this.constructor.className + "]"
+});
+
+util.overlayWindow("chrome://browser/content/browser.xul", function (window) ({
+    init: function (document) {
+        /**
+         * @constructor Module
+         *
+         * Constructs a new ModuleBase class and makes arrangements for its
+         * initialization. Arguments marked as optional must be either
+         * entirely elided, or they must have the exact type specified.
+         * Loading semantics are as follows:
+         *
+         *  - A module is guaranteed not to be initialized before any of its
+         *    prerequisites as listed in its {@see ModuleBase#requires} member.
+         *  - A module is considered initialized once it's been instantiated,
+         *    its {@see Class#init} method has been called, and its
+         *    instance has been installed into the top-level {@see modules}
+         *    object.
+         *  - Once the module has been initialized, its module-dependent
+         *    initialization functions will be called as described hereafter.
+         * @param {string} name The module's name as it will appear in the
+         *     top-level {@see modules} object.
+         * @param {ModuleBase} base The base class for this module.
+         *     @optional
+         * @param {Object} prototype The prototype for instances of this
+         *     object. The object itself is copied and not used as a prototype
+         *     directly.
+         * @param {Object} classProperties The class properties for the new
+         *     module constructor.
+         *     @optional
+         * @param {Object} moduleInit The module initialization functions
+         *     for the new module. Each function is called as soon as the named module
+         *     has been initialized, but after the module itself. The constructors are
+         *     guaranteed to be called in the same order that the dependent modules
+         *     were initialized.
+         *     @optional
+         *
+         * @returns {function} The constructor for the resulting module.
+         */
+        function Module(name) {
+            let args = Array.slice(arguments);
+
+            var base = ModuleBase;
+            if (callable(args[1]))
+                base = args.splice(1, 1)[0];
+            let [, prototype, classProperties, moduleInit] = args;
+            const module = Class(name, base, prototype, classProperties);
+
+            module.INIT = moduleInit || {};
+            module.prototype.INIT = module.INIT;
+            module.requires = prototype.requires || [];
+            Module.list.push(module);
+            Module.constructors[name] = module;
+            return module;
+        }
+        Module.list = [];
+        Module.constructors = {};
+
+        const create = window.Object.create || function (proto) {
+            let res = window.Object();
+            object.__proto__ = proto;
+            return object;
+        }
+
+        const jsmodules = {};
+        const modules = update(create(jsmodules), {
+
+            jsmodules: jsmodules,
+
+            get content() this.config.browser.contentWindow || window.content,
+
+            window: window,
+
+            Module: Module,
+
+            load: function load(script) {
+                for (let [i, base] in Iterator(prefix)) {
+                    try {
+                        services.subscriptLoader.loadSubScript(base + script + ".js", modules, "UTF-8");
+                        return;
+                    }
+                    catch (e) {
+                        if (typeof e !== "string") {
+                            util.dump("Trying: " + (base + script + ".js") + ":");
+                            util.reportError(e);
+                        }
+                    }
+                }
+                try {
+                    Cu.import("resource://dactyl/" + script + ".jsm", jsmodules);
+                }
+                catch (e) {
+                    util.dump("Loading script " + script + ":");
+                    util.reportError(e);
+                }
+            },
+
+            newContext: function newContext(proto) {
+                let sandbox = Components.utils.Sandbox(window, { sandboxPrototype: proto || modules, wantXrays: false });
+                // Hack:
+                sandbox.Object = jsmodules.Object;
+                sandbox.Math = jsmodules.Math;
+                sandbox.__proto__ = proto || modules;
+                return sandbox;
+            }
+        });
+        modules.modules = modules;
+        window.dactyl = { modules: modules };
+
+        const BASE = "chrome://dactyl/content/";
+
+        let prefix = [BASE];
+
+        modules.load("util");
+        modules.load("services");
+        prefix.unshift("chrome://" + modules.services["dactyl:"].name + "/content/");
+
+        ["base",
+         "overlay",
+         "prefs",
+         "storage",
+         "javascript",
+         "dactyl",
+         "modes",
+         "abbreviations",
+         "autocommands",
+         "buffer",
+         "commandline",
+         "commands",
+         "completion",
+         "configbase",
+         "config",
+         "editor",
+         "events",
+         "finder",
+         "highlight",
+         "hints",
+         "io",
+         "mappings",
+         "marks",
+         "options",
+         "statusline",
+         "styles",
+         "template"
+         ].forEach(modules.load);
+
+        modules.Config.prototype.scripts.forEach(modules.load);
+    },
+    load: function (document) {
+        var { modules, Module } = window.dactyl.modules;
+        delete window.dactyl;
+
+        Module.list.forEach(function (module) {
+            modules.__defineGetter__(module.className, function () {
+                delete modules[module.className];
+                return load(module.className, null, Components.stack.caller);
+            });
+        });
+
+        const start = Date.now();
+        const deferredInit = { load: [] };
+        const seen = set();
+        const loaded = set(["init"]);
+        modules.loaded = loaded;
+
+        function init(module) {
+            function init(func, mod)
+                function () defineModule.time(module.className || module.constructor.className, mod,
+                                              func, module,
+                                              modules.dactyl, modules, window);
+
+            set.add(loaded, module.constructor.className);
+            for (let [mod, func] in Iterator(module.INIT)) {
+                if (mod in loaded)
+                    init(func, mod)();
+                else {
+                    deferredInit[mod] = deferredInit[mod] || [];
+                    deferredInit[mod].push(init(func, mod));
+                }
+            }
+        }
+        defineModule.modules.map(init);
+
+        function load(module, prereq, frame) {
+            if (isString(module)) {
+                if (!Module.constructors.hasOwnProperty(module))
+                    modules.load(module);
+                module = Module.constructors[module];
+            }
+
+            try {
+                if (module.className in loaded)
+                    return;
+                if (module.className in seen)
+                    throw Error("Module dependency loop.");
+                set.add(seen, module.className);
+
+                for (let dep in values(module.requires))
+                    load(Module.constructors[dep], module.className);
+
+                defineModule.loadLog.push("Load" + (isString(prereq) ? " " + prereq + " dependency: " : ": ") + module.className);
+                if (frame && frame.filename)
+                    defineModule.loadLog.push(" from: " + frame.filename + ":" + frame.lineNumber);
+
+                delete modules[module.className];
+                modules[module.className] = defineModule.time(module.className, "init", module);
+
+                init(modules[module.className]);
+                for (let [, fn] in iter(deferredInit[module.className] || []))
+                    fn();
+            }
+            catch (e) {
+                util.dump("Loading " + (module && module.className) + ":");
+                util.reportError(e);
+            }
+            return modules[module.className];
+        }
+
+        Module.list.forEach(load);
+        deferredInit["load"].forEach(call);
+        modules.times = update({}, defineModule.times);
+
+        util.dump("Loaded in " + (Date.now() - start) + "ms");
+
+        modules.events.addSessionListener(window, "unload", function onUnload() {
+            window.removeEventListener("unload", onUnload, false);
+            for (let [, mod] in iter(modules))
+                if (mod instanceof ModuleBase && "destroy" in mod)
+                    mod.destroy();
+        }, false);
+    }
+}));
+
+
+// vim: set fdm=marker sw=4 ts=4 et:
diff --git a/common/modules/sanitizer.jsm b/common/modules/sanitizer.jsm
index 6bcfd7ee..13274585 100644
--- a/common/modules/sanitizer.jsm
+++ b/common/modules/sanitizer.jsm
@@ -12,6 +12,8 @@
 // FIXME:
 //   - finish 1.9.0 support if we're going to support sanitizing in Melodactyl
 
+try {
+
 Components.utils.import("resource://dactyl/base.jsm");
 defineModule("sanitizer", {
     exports: ["Range", "Sanitizer", "sanitizer"],
@@ -641,6 +643,6 @@ const Sanitizer = Module("sanitizer", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakR
 
 endModule();
 
-// catch(e){dump(e.fileName+":"+e.lineNumber+": "+e+"\n" + e.stack);}
+} catch(e){dump(e.fileName+":"+e.lineNumber+": "+e+"\n" + e.stack);}
 
 // vim: set fdm=marker sw=4 ts=4 et ft=javascript:
diff --git a/common/modules/util.jsm b/common/modules/util.jsm
index b2193827..d265c677 100644
--- a/common/modules/util.jsm
+++ b/common/modules/util.jsm
@@ -908,6 +908,8 @@ const Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
         if (!window.dactylOverlays)
             window.dactylOverlays = [];
 
+        util.dump("load overlays", window.document.documentURI);
+
         for each (let obj in util.overlays[window.document.documentURI] || []) {
             if (window.dactylOverlays.indexOf(obj) >= 0)
                 continue;
@@ -979,6 +981,7 @@ const Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
         },
         "toplevel-window-ready": function (window, data) {
             window.addEventListener("DOMContentLoaded", wrapCallback(function listener(event) {
+                window.dactylDOMLoaded = false;
                 if (event.originalTarget === window.document) {
                     window.removeEventListener("DOMContentLoaded", listener.wrapper, true);
                     window.document.dactylDOMLoaded = event;
@@ -998,9 +1001,13 @@ const Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
                 this.overlays[url].push(fn);
             }, this);
 
-            for (let win in iter(services.windowMediator.getEnumerator(null)))
-                if (win.document.dactylDOMLoaded)
+            for (let win in iter(services.windowMediator.getEnumerator(null))) {
+                util.dump("checkOverlay", win.document.dactylDOMLoaded, win.document.location.href);
+                if (win.document.dactylDOMLoaded || win.dactylDOMLoaded !== false)
                     this._loadOverlays(win);
+                else
+                    this.observe(win, "toplevel-window-ready");
+            }
         }
     },
 
@@ -1152,8 +1159,11 @@ const Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
             this.dump("");
         }
         catch (e) {
-            this.dump(e);
-            try { util.dump(e.stack) } catch (e) {}
+            try {
+                this.dump(String(error));
+                this.dump(error.stack)
+            }
+            catch (e) { dump(e + "\n"); }
         }
     },
 
diff --git a/pentadactyl/chrome.manifest b/pentadactyl/chrome.manifest
index 5b2b12e9..85a3f764 100644
--- a/pentadactyl/chrome.manifest
+++ b/pentadactyl/chrome.manifest
@@ -10,9 +10,6 @@ skin     dactyl classic/1.0 ../common/skin/
 
 override chrome://dactyl/content/dactyl.dtd  chrome://pentadactyl/content/dactyl.dtd
 
-overlay  chrome://browser/content/browser.xul chrome://dactyl/content/dactyl.xul
-overlay  chrome://browser/content/browser.xul chrome://pentadactyl/content/pentadactyl.xul
-
 component {16dc34f7-6d22-4aa4-a67f-2921fb5dcb69} components/commandline-handler.js
 contract  @mozilla.org/commandlinehandler/general-startup;1?type=pentadactyl {16dc34f7-6d22-4aa4-a67f-2921fb5dcb69}
 category  command-line-handler m-pentadactyl @mozilla.org/commandlinehandler/general-startup;1?type=pentadactyl
diff --git a/pentadactyl/content/config.js b/pentadactyl/content/config.js
index e298ffb4..7df70bd2 100644
--- a/pentadactyl/content/config.js
+++ b/pentadactyl/content/config.js
@@ -7,6 +7,52 @@
 "use strict";
 
 const Config = Module("config", ConfigBase, {
+    init: function init() {
+        init.superapply(this, arguments);
+
+        util.overlayWindow(window, {
+            append: <e4x xmlns={XUL} xmlns:dactyl={NS}>
+                <menupopup id="viewSidebarMenu">
+                    <menuitem observes="pentadactyl-viewAddonsSidebar" label="Add-ons" accesskey="A"/>
+                    <menuitem observes="pentadactyl-viewConsoleSidebar" label="Console" accesskey="C"/>
+                    <menuitem observes="pentadactyl-viewDownloadsSidebar" label="Downloads" accesskey="D"/>
+                    <menuitem observes="pentadactyl-viewPreferencesSidebar" label="Preferences" accesskey="P"/>
+                </menupopup>
+
+                <broadcasterset id="mainBroadcasterSet">
+                    <broadcaster id="pentadactyl-viewAddonsSidebar"
+                        autoCheck="false"
+                        type="checkbox"
+                        group="sidebar"
+                        sidebarurl="chrome://mozapps/content/extensions/extensions.xul"
+                        sidebartitle="Add-ons"
+                        oncommand="toggleSidebar('pentadactyl-viewAddonsSidebar');"/>
+                    <broadcaster id="pentadactyl-viewConsoleSidebar"
+                        autoCheck="false"
+                        type="checkbox"
+                        group="sidebar"
+                        sidebarurl="chrome://global/content/console.xul"
+                        sidebartitle="Console"
+                        oncommand="toggleSidebar('pentadactyl-viewConsoleSidebar');"/>
+                    <broadcaster id="pentadactyl-viewDownloadsSidebar"
+                        autoCheck="false"
+                        type="checkbox"
+                        group="sidebar"
+                        sidebarurl="chrome://mozapps/content/downloads/downloads.xul"
+                        sidebartitle="Downloads"
+                        oncommand="toggleSidebar('pentadactyl-viewDownloadsSidebar');"/>
+                    <broadcaster id="pentadactyl-viewPreferencesSidebar"
+                        autoCheck="false"
+                        type="checkbox"
+                        group="sidebar"
+                        sidebarurl="about:config"
+                        sidebartitle="Preferences"
+                        oncommand="toggleSidebar('pentadactyl-viewPreferencesSidebar');"/>
+                </broadcasterset>
+            </e4x>.elements()
+        });
+    },
+
     get visualbellWindow() getBrowser().mPanelContainer,
     styleableChrome: ["chrome://browser/content/browser.xul"],
 
diff --git a/pentadactyl/content/pentadactyl.xul b/pentadactyl/content/pentadactyl.xul
deleted file mode 100644
index 719b0e20..00000000
--- a/pentadactyl/content/pentadactyl.xul
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ***** BEGIN LICENSE BLOCK ***** {{{
- Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@vimperator.org>
-
- This work is licensed for reuse under an MIT license. Details are
- given in the LICENSE.txt file included with this file.
-}}} ***** END LICENSE BLOCK ***** -->
-
-<!-- <?xml-stylesheet href="chrome://browser/skin/" type="text/css"?> -->
-
-<overlay id="pentadactyl"
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns:nc="http://home.netscape.com/NC-rdf#"
-    xmlns:html="http://www.w3.org/1999/xhtml"
-    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-    <menupopup id="viewSidebarMenu">
-        <menuitem observes="pentadactyl-viewAddonsSidebar" label="Add-ons" accesskey="A"/>
-        <menuitem observes="pentadactyl-viewConsoleSidebar" label="Console" accesskey="C"/>
-        <menuitem observes="pentadactyl-viewDownloadsSidebar" label="Downloads" accesskey="D"/>
-        <menuitem observes="pentadactyl-viewPreferencesSidebar" label="Preferences" accesskey="P"/>
-    </menupopup>
-
-    <broadcasterset id="mainBroadcasterSet">
-        <broadcaster id="pentadactyl-viewAddonsSidebar"
-            autoCheck="false"
-            type="checkbox"
-            group="sidebar"
-            sidebarurl="chrome://mozapps/content/extensions/extensions.xul"
-            sidebartitle="Add-ons"
-            oncommand="toggleSidebar('pentadactyl-viewAddonsSidebar');"/>
-        <broadcaster id="pentadactyl-viewConsoleSidebar"
-            autoCheck="false"
-            type="checkbox"
-            group="sidebar"
-            sidebarurl="chrome://global/content/console.xul"
-            sidebartitle="Console"
-            oncommand="toggleSidebar('pentadactyl-viewConsoleSidebar');"/>
-        <broadcaster id="pentadactyl-viewDownloadsSidebar"
-            autoCheck="false"
-            type="checkbox"
-            group="sidebar"
-            sidebarurl="chrome://mozapps/content/downloads/downloads.xul"
-            sidebartitle="Downloads"
-            oncommand="toggleSidebar('pentadactyl-viewDownloadsSidebar');"/>
-        <broadcaster id="pentadactyl-viewPreferencesSidebar"
-            autoCheck="false"
-            type="checkbox"
-            group="sidebar"
-            sidebarurl="about:config"
-            sidebartitle="Preferences"
-            oncommand="toggleSidebar('pentadactyl-viewPreferencesSidebar');"/>
-    </broadcasterset>
-
-</overlay>
-
-<!-- vim: set fdm=marker sw=4 ts=4 et: -->

From 0d8f23fea514e8c08b6aa71833754bb7dc1d4813 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Fri, 24 Dec 2010 12:39:04 -0500
Subject: [PATCH 07/35] Fix MOW styling. Enable running cleanup code on
 bootstrapped disable. Re-enabling still does not work.

--HG--
branch : bootstrapped
---
 common/bootstrap.js           | 19 +++++++++++++++----
 common/content/commandline.js |  4 +++-
 common/modules/util.jsm       | 29 ++++++++++++-----------------
 3 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/common/bootstrap.js b/common/bootstrap.js
index 39bf9e73..1138197c 100755
--- a/common/bootstrap.js
+++ b/common/bootstrap.js
@@ -38,6 +38,7 @@ function writeFile(file, buf) {
 let initialized = false;
 let addon = null;
 let basePath = null;
+let components = {};
 
 function startup(data, reason) {
     dump("dactyl: bootstrap: startup\n");
@@ -68,12 +69,16 @@ function FactoryProxy(url, classID) {
 }
 FactoryProxy.prototype = {
     QueryInterface: XPCOMUtils.generateQI(Ci.nsIFactory),
-    init: function () {
+    register: function () {
         manager.registerFactory(this.classID,
                                 String(this.classID),
                                 this.contractID,
                                 this);
     },
+    unregister: function () {
+        manager.unregisterFactory(this.classID,
+                                  this);
+    },
     get module() {
         Class.replaceProperty(this, "module", {});
         Cu.import(this.url, this.module);
@@ -96,7 +101,6 @@ function init() {
     function url(path) addon.getResourceURI(path).spec;
 
     let result = [];
-    let components = {};
 
     for each (let line in manifest.split("\n")) {
         let fields = line.split(/\s+/);
@@ -121,7 +125,7 @@ function init() {
             break;
         case "contract":
             components[fields[2]].contractID = fields[1];
-            components[fields[2]].init();
+            components[fields[2]].register();
             break;
 
         case "resource":
@@ -156,6 +160,14 @@ function init() {
     require(global, "overlay");
 }
 
+function shutdown(data, reason) {
+    dump("dactyl: bootstrap: shutdown\n");
+    for (let factory in values(components))
+        // TODO: Categories;
+        factory.unregister();
+    services.observer.notifyObservers(null, "dactyl-cleanup", null);
+}
+
 function reasonToString(reason) {
     for each (let name in ["disable", "downgrade", "enable",
                            "install", "shutdown", "startup",
@@ -166,6 +178,5 @@ function reasonToString(reason) {
 }
 
 function install(data, reason) { dump("dactyl: bootstrap: install\n") }
-function shutdown(data, reason) { dump("dactyl: bootstrap: shutdown\n") }
 function uninstall(data, reason) { dump("dactyl: bootstrap: uninstall\n") }
 
diff --git a/common/content/commandline.js b/common/content/commandline.js
index a1d7f0b2..03ba6ecb 100644
--- a/common/content/commandline.js
+++ b/common/content/commandline.js
@@ -242,7 +242,9 @@ const CommandWidgets = Class("CommandWidgets", {
     multilineOutput: Class.memoize(function () {
         let elem = document.getElementById("dactyl-multiline-output");
         elem.contentWindow.addEventListener("unload", function (event) { event.preventDefault(); }, true);
-        elem.contentDocument.body.id = "dactyl-multiline-output-content";
+        elem.contentWindow.addEventListener("load", function (event) {
+            elem.contentDocument.body.id = "dactyl-multiline-output-content";
+        }, false);
         ["copy", "copylink", "selectall"].forEach(function (tail) {
             // some host apps use "hostPrefixContext-copy" ids
             let xpath = "//xul:menuitem[contains(@id, '" + "ontext-" + tail + "') and not(starts-with(@id, 'dactyl-'))]";
diff --git a/common/modules/util.jsm b/common/modules/util.jsm
index d265c677..d06bb0b7 100644
--- a/common/modules/util.jsm
+++ b/common/modules/util.jsm
@@ -946,19 +946,18 @@ const Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
         overlay("append", function (elem, dom) elem.appendChild(dom));
         overlay("prepend", function (elem, dom) elem.insertBefore(dom, elem.firstChild));
         if (obj.init)
-            obj.init(window, window.document.dactylDOMLoaded);
+            obj.init(window);
 
         if (obj.load)
-            if (doc.dactylLoaded)
-                obj.load(window, doc.dactylLoaded);
-        else
-            doc.addEventListener("load", wrapCallback(function load(event) {
-                if (event.originalTarget === event.target) {
-                    doc.removeEventListener("load", load.wrapper, true);
-                    doc.dactylLoaded = event;
-                    obj.load(window, event);
-                }
-            }), true);
+            if (doc.readyState === "complete")
+                obj.load(window);
+            else
+                doc.addEventListener("load", wrapCallback(function load(event) {
+                    if (event.originalTarget === event.target) {
+                        doc.removeEventListener("load", load.wrapper, true);
+                        obj.load(window, event);
+                    }
+                }), true);
     },
 
     observe: {
@@ -981,10 +980,8 @@ const Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
         },
         "toplevel-window-ready": function (window, data) {
             window.addEventListener("DOMContentLoaded", wrapCallback(function listener(event) {
-                window.dactylDOMLoaded = false;
                 if (event.originalTarget === window.document) {
                     window.removeEventListener("DOMContentLoaded", listener.wrapper, true);
-                    window.document.dactylDOMLoaded = event;
                     util._loadOverlays(window);
                 }
             }), true)
@@ -1001,13 +998,11 @@ const Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
                 this.overlays[url].push(fn);
             }, this);
 
-            for (let win in iter(services.windowMediator.getEnumerator(null))) {
-                util.dump("checkOverlay", win.document.dactylDOMLoaded, win.document.location.href);
-                if (win.document.dactylDOMLoaded || win.dactylDOMLoaded !== false)
+            for (let win in iter(services.windowMediator.getEnumerator(null)))
+                if (["interactive", "complete"].indexOf(win.document.readyState) >= 0)
                     this._loadOverlays(win);
                 else
                     this.observe(win, "toplevel-window-ready");
-            }
         }
     },
 

From 2f081bd80518a4c0dc38948c657ab7360ce0383a Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Fri, 24 Dec 2010 15:51:02 -0500
Subject: [PATCH 08/35] [bootstrap] Changes toward proper reinitialization
 after disabling.

--HG--
branch : bootstrapped
---
 common/bootstrap.js           |  21 +-
 common/content/commandline.js |   5 +-
 common/content/dactyl.js      |  27 +--
 common/modules/overlay.jsm    | 431 +++++++++++++++++-----------------
 common/modules/services.jsm   |   1 +
 common/modules/util.jsm       |  20 +-
 common/skin/dactyl.css        |   2 +-
 7 files changed, 269 insertions(+), 238 deletions(-)

diff --git a/common/bootstrap.js b/common/bootstrap.js
index 1138197c..1d64596b 100755
--- a/common/bootstrap.js
+++ b/common/bootstrap.js
@@ -10,12 +10,13 @@ const Cr = Components.results;
 
 Cu.import("resource://gre/modules/AddonManager.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
 
-const io = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
-const resourceProto = io.getProtocolHandler("resource")
-                        .QueryInterface(Ci.nsIResProtocolHandler);
+const resourceProto = Services.io.getProtocolHandler("resource")
+                              .QueryInterface(Ci.nsIResProtocolHandler);
 const categoryManager = Cc["@mozilla.org/categorymanager;1"].getService(Ci.nsICategoryManager);
 const manager = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
+const storage = Cc["@mozilla.org/fuel/application;1"].getService(Ci.fuelIApplication);
 
 function httpGet(url) {
     let xmlhttp = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"].createInstance(Ci.nsIXMLHttpRequest);
@@ -70,23 +71,27 @@ function FactoryProxy(url, classID) {
 FactoryProxy.prototype = {
     QueryInterface: XPCOMUtils.generateQI(Ci.nsIFactory),
     register: function () {
+        dump("dactyl: bootstrap: register: " + this.classID + " " + this.contractID + "\n");
         manager.registerFactory(this.classID,
                                 String(this.classID),
                                 this.contractID,
                                 this);
     },
     unregister: function () {
+        dump("dactyl: bootstrap: unregister: " + this.classID + " " + this.contractID + "\n");
         manager.unregisterFactory(this.classID,
                                   this);
     },
     get module() {
-        Class.replaceProperty(this, "module", {});
+        Object.defineProperty(this, "module", { value: {}, enumerable: true });
         Cu.import(this.url, this.module);
         return this.module;
     },
-    createInstance: function ()
-        let (factory = this.module.NSGetFactory(this.classID))
+    createInstance: function (iids) {
+        dump("dactyl: bootstrap: createInstance: " + this.classID + " " + this.contractID + " " + iids + "\n");
+        return let (factory = this.module.NSGetFactory(this.classID))
             factory.createInstance.apply(factory, arguments)
+    }
 }
 
 function init() {
@@ -133,6 +138,10 @@ function init() {
         }
     }
 
+    Cc["@dactyl.googlecode.com/base/xpc-interface-shim"].createInstance()
+
+    Services.obs.notifyObservers(null, "dactyl-rehash", null);
+
     Cu.import("resource://dactyl/base.jsm");
     require(global, "prefs");
     require(global, "services");
diff --git a/common/content/commandline.js b/common/content/commandline.js
index 03ba6ecb..e4ca3534 100644
--- a/common/content/commandline.js
+++ b/common/content/commandline.js
@@ -136,7 +136,7 @@ const CommandWidgets = Class("CommandWidgets", {
                 if (this.command && !options.get("guioptions").has("M"))
                     return this.statusbar;
                 let statusElem = this.statusbar.message;
-                if (value && statusElem.editor.rootElement.scrollWidth > statusElem.scrollWidth)
+                if (value && statusElem.inputField.editor.rootElement.scrollWidth > statusElem.scrollWidth)
                     return this.commandbar;
                 return this.activeGroup.mode;
             }
@@ -164,9 +164,12 @@ const CommandWidgets = Class("CommandWidgets", {
     addElement: function (obj) {
         const self = this;
         this.elements[obj.name] = obj;
+
         function get(id) obj.getElement ? obj.getElement(id) : document.getElementById(id);
+
         this.active.__defineGetter__(obj.name, function () self.activeGroup[obj.name][obj.name]);
         this.activeGroup.__defineGetter__(obj.name, function () self.getGroup(obj.name));
+
         memoize(this.statusbar, obj.name, function () get("dactyl-statusline-field-" + (obj.id || obj.name)));
         memoize(this.commandbar, obj.name, function () get("dactyl-" + (obj.id || obj.name)));
 
diff --git a/common/content/dactyl.js b/common/content/dactyl.js
index 422fb9ad..b5e04249 100644
--- a/common/content/dactyl.js
+++ b/common/content/dactyl.js
@@ -38,6 +38,19 @@ const Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase),
         };
     },
 
+    cleanup: function () {
+        delete window.dactyl;
+        delete window.liberator;
+    },
+
+    destroy: function () {
+        autocommands.trigger("LeavePre", {});
+        storage.saveAll();
+        dactyl.triggerObserver("shutdown", null);
+        util.dump("All dactyl modules destroyed\n");
+        autocommands.trigger("Leave", {});
+    },
+
     observe: {
         "dactyl-cleanup": function () {
             for (let [, mod] in iter(array(values(modules)).reverse()))
@@ -65,20 +78,6 @@ const Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase),
         return "unknown";
     }),
 
-    cleanup: function () {
-        delete window.dactyl;
-        delete window.modules;
-        delete window.liberator;
-    },
-
-    destroy: function () {
-        autocommands.trigger("LeavePre", {});
-        storage.saveAll();
-        dactyl.triggerObserver("shutdown", null);
-        util.dump("All dactyl modules destroyed\n");
-        autocommands.trigger("Leave", {});
-    },
-
     /**
      * @property {number} The current main mode.
      * @see modes#mainModes
diff --git a/common/modules/overlay.jsm b/common/modules/overlay.jsm
index 8036968d..15e9d73e 100644
--- a/common/modules/overlay.jsm
+++ b/common/modules/overlay.jsm
@@ -24,236 +24,239 @@ const ModuleBase = Class("ModuleBase", {
     toString: function () "[module " + this.constructor.className + "]"
 });
 
-util.overlayWindow("chrome://browser/content/browser.xul", function (window) ({
-    init: function (document) {
-        /**
-         * @constructor Module
-         *
-         * Constructs a new ModuleBase class and makes arrangements for its
-         * initialization. Arguments marked as optional must be either
-         * entirely elided, or they must have the exact type specified.
-         * Loading semantics are as follows:
-         *
-         *  - A module is guaranteed not to be initialized before any of its
-         *    prerequisites as listed in its {@see ModuleBase#requires} member.
-         *  - A module is considered initialized once it's been instantiated,
-         *    its {@see Class#init} method has been called, and its
-         *    instance has been installed into the top-level {@see modules}
-         *    object.
-         *  - Once the module has been initialized, its module-dependent
-         *    initialization functions will be called as described hereafter.
-         * @param {string} name The module's name as it will appear in the
-         *     top-level {@see modules} object.
-         * @param {ModuleBase} base The base class for this module.
-         *     @optional
-         * @param {Object} prototype The prototype for instances of this
-         *     object. The object itself is copied and not used as a prototype
-         *     directly.
-         * @param {Object} classProperties The class properties for the new
-         *     module constructor.
-         *     @optional
-         * @param {Object} moduleInit The module initialization functions
-         *     for the new module. Each function is called as soon as the named module
-         *     has been initialized, but after the module itself. The constructors are
-         *     guaranteed to be called in the same order that the dependent modules
-         *     were initialized.
-         *     @optional
-         *
-         * @returns {function} The constructor for the resulting module.
-         */
-        function Module(name) {
-            let args = Array.slice(arguments);
+const Overlay = Module("Overlay", {
+    init: function () {
+        util.overlayWindow("chrome://browser/content/browser.xul", function (window) ({
+            init: function (document) {
+                /**
+                 * @constructor Module
+                 *
+                 * Constructs a new ModuleBase class and makes arrangements for its
+                 * initialization. Arguments marked as optional must be either
+                 * entirely elided, or they must have the exact type specified.
+                 * Loading semantics are as follows:
+                 *
+                 *  - A module is guaranteed not to be initialized before any of its
+                 *    prerequisites as listed in its {@see ModuleBase#requires} member.
+                 *  - A module is considered initialized once it's been instantiated,
+                 *    its {@see Class#init} method has been called, and its
+                 *    instance has been installed into the top-level {@see modules}
+                 *    object.
+                 *  - Once the module has been initialized, its module-dependent
+                 *    initialization functions will be called as described hereafter.
+                 * @param {string} name The module's name as it will appear in the
+                 *     top-level {@see modules} object.
+                 * @param {ModuleBase} base The base class for this module.
+                 *     @optional
+                 * @param {Object} prototype The prototype for instances of this
+                 *     object. The object itself is copied and not used as a prototype
+                 *     directly.
+                 * @param {Object} classProperties The class properties for the new
+                 *     module constructor.
+                 *     @optional
+                 * @param {Object} moduleInit The module initialization functions
+                 *     for the new module. Each function is called as soon as the named module
+                 *     has been initialized, but after the module itself. The constructors are
+                 *     guaranteed to be called in the same order that the dependent modules
+                 *     were initialized.
+                 *     @optional
+                 *
+                 * @returns {function} The constructor for the resulting module.
+                 */
+                function Module(name) {
+                    let args = Array.slice(arguments);
 
-            var base = ModuleBase;
-            if (callable(args[1]))
-                base = args.splice(1, 1)[0];
-            let [, prototype, classProperties, moduleInit] = args;
-            const module = Class(name, base, prototype, classProperties);
+                    var base = ModuleBase;
+                    if (callable(args[1]))
+                        base = args.splice(1, 1)[0];
+                    let [, prototype, classProperties, moduleInit] = args;
+                    const module = Class(name, base, prototype, classProperties);
 
-            module.INIT = moduleInit || {};
-            module.prototype.INIT = module.INIT;
-            module.requires = prototype.requires || [];
-            Module.list.push(module);
-            Module.constructors[name] = module;
-            return module;
-        }
-        Module.list = [];
-        Module.constructors = {};
+                    module.INIT = moduleInit || {};
+                    module.prototype.INIT = module.INIT;
+                    module.requires = prototype.requires || [];
+                    Module.list.push(module);
+                    Module.constructors[name] = module;
+                    return module;
+                }
+                Module.list = [];
+                Module.constructors = {};
 
-        const create = window.Object.create || function (proto) {
-            let res = window.Object();
-            object.__proto__ = proto;
-            return object;
-        }
+                const create = window.Object.create || function (proto) {
+                    let res = window.Object();
+                    object.__proto__ = proto;
+                    return object;
+                }
 
-        const jsmodules = {};
-        const modules = update(create(jsmodules), {
+                const jsmodules = {};
+                const modules = update(create(jsmodules), {
 
-            jsmodules: jsmodules,
+                    jsmodules: jsmodules,
 
-            get content() this.config.browser.contentWindow || window.content,
+                    get content() this.config.browser.contentWindow || window.content,
 
-            window: window,
+                    window: window,
 
-            Module: Module,
+                    Module: Module,
 
-            load: function load(script) {
-                for (let [i, base] in Iterator(prefix)) {
-                    try {
-                        services.subscriptLoader.loadSubScript(base + script + ".js", modules, "UTF-8");
-                        return;
-                    }
-                    catch (e) {
-                        if (typeof e !== "string") {
-                            util.dump("Trying: " + (base + script + ".js") + ":");
+                    load: function load(script) {
+                        for (let [i, base] in Iterator(prefix)) {
+                            try {
+                                services.subscriptLoader.loadSubScript(base + script + ".js", modules, "UTF-8");
+                                return;
+                            }
+                            catch (e) {
+                                if (typeof e !== "string") {
+                                    util.dump("Trying: " + (base + script + ".js") + ":");
+                                    util.reportError(e);
+                                }
+                            }
+                        }
+                        try {
+                            Cu.import("resource://dactyl/" + script + ".jsm", jsmodules);
+                        }
+                        catch (e) {
+                            util.dump("Loading script " + script + ":");
                             util.reportError(e);
                         }
+                    },
+
+                    newContext: function newContext(proto) {
+                        let sandbox = Components.utils.Sandbox(window, { sandboxPrototype: proto || modules, wantXrays: false });
+                        // Hack:
+                        sandbox.Object = jsmodules.Object;
+                        sandbox.Math = jsmodules.Math;
+                        sandbox.__proto__ = proto || modules;
+                        return sandbox;
+                    }
+                });
+                modules.modules = modules;
+                window.dactyl = { modules: modules };
+
+                const BASE = "chrome://dactyl/content/";
+
+                let prefix = [BASE];
+
+                modules.load("util");
+                modules.load("services");
+                prefix.unshift("chrome://" + modules.services["dactyl:"].name + "/content/");
+
+                ["base",
+                 "overlay",
+                 "prefs",
+                 "storage",
+                 "javascript",
+                 "dactyl",
+                 "modes",
+                 "abbreviations",
+                 "autocommands",
+                 "buffer",
+                 "commandline",
+                 "commands",
+                 "completion",
+                 "configbase",
+                 "config",
+                 "editor",
+                 "events",
+                 "finder",
+                 "highlight",
+                 "hints",
+                 "io",
+                 "mappings",
+                 "marks",
+                 "options",
+                 "statusline",
+                 "styles",
+                 "template"
+                 ].forEach(modules.load);
+
+                modules.Config.prototype.scripts.forEach(modules.load);
+            },
+            load: function (document) {
+                var { modules, Module } = window.dactyl.modules;
+                delete window.dactyl;
+
+                Module.list.forEach(function (module) {
+                    modules.__defineGetter__(module.className, function () {
+                        delete modules[module.className];
+                        return load(module.className, null, Components.stack.caller);
+                    });
+                });
+
+                const start = Date.now();
+                const deferredInit = { load: [] };
+                const seen = set();
+                const loaded = set(["init"]);
+                modules.loaded = loaded;
+
+                function init(module) {
+                    function init(func, mod)
+                        function () defineModule.time(module.className || module.constructor.className, mod,
+                                                      func, module,
+                                                      modules.dactyl, modules, window);
+
+                    set.add(loaded, module.constructor.className);
+                    for (let [mod, func] in Iterator(module.INIT)) {
+                        if (mod in loaded)
+                            init(func, mod)();
+                        else {
+                            deferredInit[mod] = deferredInit[mod] || [];
+                            deferredInit[mod].push(init(func, mod));
+                        }
                     }
                 }
-                try {
-                    Cu.import("resource://dactyl/" + script + ".jsm", jsmodules);
+                defineModule.modules.map(init);
+
+                function load(module, prereq, frame) {
+                    if (isString(module)) {
+                        if (!Module.constructors.hasOwnProperty(module))
+                            modules.load(module);
+                        module = Module.constructors[module];
+                    }
+
+                    try {
+                        if (module.className in loaded)
+                            return;
+                        if (module.className in seen)
+                            throw Error("Module dependency loop.");
+                        set.add(seen, module.className);
+
+                        for (let dep in values(module.requires))
+                            load(Module.constructors[dep], module.className);
+
+                        defineModule.loadLog.push("Load" + (isString(prereq) ? " " + prereq + " dependency: " : ": ") + module.className);
+                        if (frame && frame.filename)
+                            defineModule.loadLog.push(" from: " + frame.filename + ":" + frame.lineNumber);
+
+                        delete modules[module.className];
+                        modules[module.className] = defineModule.time(module.className, "init", module);
+
+                        init(modules[module.className]);
+                        for (let [, fn] in iter(deferredInit[module.className] || []))
+                            fn();
+                    }
+                    catch (e) {
+                        util.dump("Loading " + (module && module.className) + ":");
+                        util.reportError(e);
+                    }
+                    return modules[module.className];
                 }
-                catch (e) {
-                    util.dump("Loading script " + script + ":");
-                    util.reportError(e);
-                }
-            },
 
-            newContext: function newContext(proto) {
-                let sandbox = Components.utils.Sandbox(window, { sandboxPrototype: proto || modules, wantXrays: false });
-                // Hack:
-                sandbox.Object = jsmodules.Object;
-                sandbox.Math = jsmodules.Math;
-                sandbox.__proto__ = proto || modules;
-                return sandbox;
+                Module.list.forEach(load);
+                deferredInit["load"].forEach(call);
+                modules.times = update({}, defineModule.times);
+
+                util.dump("Loaded in " + (Date.now() - start) + "ms");
+
+                modules.events.addSessionListener(window, "unload", function onUnload() {
+                    window.removeEventListener("unload", onUnload, false);
+                    for (let [, mod] in iter(modules))
+                        if (mod instanceof ModuleBase && "destroy" in mod)
+                            mod.destroy();
+                }, false);
             }
-        });
-        modules.modules = modules;
-        window.dactyl = { modules: modules };
-
-        const BASE = "chrome://dactyl/content/";
-
-        let prefix = [BASE];
-
-        modules.load("util");
-        modules.load("services");
-        prefix.unshift("chrome://" + modules.services["dactyl:"].name + "/content/");
-
-        ["base",
-         "overlay",
-         "prefs",
-         "storage",
-         "javascript",
-         "dactyl",
-         "modes",
-         "abbreviations",
-         "autocommands",
-         "buffer",
-         "commandline",
-         "commands",
-         "completion",
-         "configbase",
-         "config",
-         "editor",
-         "events",
-         "finder",
-         "highlight",
-         "hints",
-         "io",
-         "mappings",
-         "marks",
-         "options",
-         "statusline",
-         "styles",
-         "template"
-         ].forEach(modules.load);
-
-        modules.Config.prototype.scripts.forEach(modules.load);
-    },
-    load: function (document) {
-        var { modules, Module } = window.dactyl.modules;
-        delete window.dactyl;
-
-        Module.list.forEach(function (module) {
-            modules.__defineGetter__(module.className, function () {
-                delete modules[module.className];
-                return load(module.className, null, Components.stack.caller);
-            });
-        });
-
-        const start = Date.now();
-        const deferredInit = { load: [] };
-        const seen = set();
-        const loaded = set(["init"]);
-        modules.loaded = loaded;
-
-        function init(module) {
-            function init(func, mod)
-                function () defineModule.time(module.className || module.constructor.className, mod,
-                                              func, module,
-                                              modules.dactyl, modules, window);
-
-            set.add(loaded, module.constructor.className);
-            for (let [mod, func] in Iterator(module.INIT)) {
-                if (mod in loaded)
-                    init(func, mod)();
-                else {
-                    deferredInit[mod] = deferredInit[mod] || [];
-                    deferredInit[mod].push(init(func, mod));
-                }
-            }
-        }
-        defineModule.modules.map(init);
-
-        function load(module, prereq, frame) {
-            if (isString(module)) {
-                if (!Module.constructors.hasOwnProperty(module))
-                    modules.load(module);
-                module = Module.constructors[module];
-            }
-
-            try {
-                if (module.className in loaded)
-                    return;
-                if (module.className in seen)
-                    throw Error("Module dependency loop.");
-                set.add(seen, module.className);
-
-                for (let dep in values(module.requires))
-                    load(Module.constructors[dep], module.className);
-
-                defineModule.loadLog.push("Load" + (isString(prereq) ? " " + prereq + " dependency: " : ": ") + module.className);
-                if (frame && frame.filename)
-                    defineModule.loadLog.push(" from: " + frame.filename + ":" + frame.lineNumber);
-
-                delete modules[module.className];
-                modules[module.className] = defineModule.time(module.className, "init", module);
-
-                init(modules[module.className]);
-                for (let [, fn] in iter(deferredInit[module.className] || []))
-                    fn();
-            }
-            catch (e) {
-                util.dump("Loading " + (module && module.className) + ":");
-                util.reportError(e);
-            }
-            return modules[module.className];
-        }
-
-        Module.list.forEach(load);
-        deferredInit["load"].forEach(call);
-        modules.times = update({}, defineModule.times);
-
-        util.dump("Loaded in " + (Date.now() - start) + "ms");
-
-        modules.events.addSessionListener(window, "unload", function onUnload() {
-            window.removeEventListener("unload", onUnload, false);
-            for (let [, mod] in iter(modules))
-                if (mod instanceof ModuleBase && "destroy" in mod)
-                    mod.destroy();
-        }, false);
+        }));
     }
-}));
-
+});
 
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/common/modules/services.jsm b/common/modules/services.jsm
index 38212cf8..d8cad7e0 100644
--- a/common/modules/services.jsm
+++ b/common/modules/services.jsm
@@ -75,6 +75,7 @@ const Services = Module("Services", {
         if (!this.extensionManager)
             Components.utils.import("resource://gre/modules/AddonManager.jsm");
     },
+    reinit: function () {},
 
     _create: function (classes, ifaces, meth, init, args) {
         try {
diff --git a/common/modules/util.jsm b/common/modules/util.jsm
index d06bb0b7..be16ed9e 100644
--- a/common/modules/util.jsm
+++ b/common/modules/util.jsm
@@ -55,10 +55,13 @@ const Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
     },
 
     cleanup: function cleanup() {
-        for (let win in iter(services.windowMediator.getEnumerator(null)))
-            for (let elem in values(win.document.dactylOverlayElements))
+        for (let win in iter(services.windowMediator.getEnumerator(null))) {
+            for (let elem in values(win.document.dactylOverlayElements || []))
                 if (elem.get() && elem.get().parentNode)
                     elem.get().parentNode.removeChild(elem.get());
+            delete win.document.dactylOverlayElements;
+            delete win.document.dactylOverlays;
+        }
     },
 
     // FIXME: Only works for Pentadactyl
@@ -962,6 +965,7 @@ const Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
 
     observe: {
         "dactyl-cleanup": function () {
+            util.dump("dactyl: util: observe: dactyl-cleanup");
             // Let window cleanup functions run synchronously before we
             // destroy modules.
             util.timeout(function () {
@@ -969,6 +973,9 @@ const Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
                     if (module.cleanup)
                         module.cleanup();
 
+                services.observer.addObserver(this, "dactyl-rehash", true);
+
+                /*
                 let getOwnPropertyNames = Object.getOwnPropertyNames;
                 for each (let global in defineModule.globals.reverse())
                     for each (let k in getOwnPropertyNames(global))
@@ -976,8 +983,17 @@ const Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
                             delete global[k];
                         }
                         catch (e) {}
+                */
             });
         },
+        "dactyl-rehash": function () {
+            util.dump("dactyl: util: observe: dactyl-rehash");
+            for (let module in values(defineModule.modules))
+                if (module.reinit)
+                    module.reinit();
+                else
+                    module.init();
+        },
         "toplevel-window-ready": function (window, data) {
             window.addEventListener("DOMContentLoaded", wrapCallback(function listener(event) {
                 if (event.originalTarget === window.document) {
diff --git a/common/skin/dactyl.css b/common/skin/dactyl.css
index ae35761b..200c3500 100644
--- a/common/skin/dactyl.css
+++ b/common/skin/dactyl.css
@@ -1,6 +1,6 @@
 @namespace dactyl url("http://vimperator.org/namespaces/liberator");
 @namespace html url("http://www.w3.org/1999/xhtml");
-@namespace xul uri("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* Applied to all content */
 [dactyl|activeframe] {

From d3d60548f13ea9061f87ec203a7dfb3e8332b8cd Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Fri, 24 Dec 2010 18:32:22 -0500
Subject: [PATCH 09/35] Fix some cleanup issues.

--HG--
branch : bootstrapped
---
 common/bootstrap.js           |   2 +-
 common/content/buffer.js      |  54 +++++++++------
 common/content/commandline.js |  29 ++++++--
 common/content/dactyl.js      |   4 +-
 common/content/statusline.js  |  39 +++++------
 common/modules/storage.jsm    |  64 ++++++++++--------
 common/modules/util.jsm       | 120 +++++++++++++++++-----------------
 common/skin/dactyl.css        |   2 +-
 8 files changed, 176 insertions(+), 138 deletions(-)

diff --git a/common/bootstrap.js b/common/bootstrap.js
index 1d64596b..21514102 100755
--- a/common/bootstrap.js
+++ b/common/bootstrap.js
@@ -171,10 +171,10 @@ function init() {
 
 function shutdown(data, reason) {
     dump("dactyl: bootstrap: shutdown\n");
+    services.observer.notifyObservers(null, "dactyl-cleanup", null);
     for (let factory in values(components))
         // TODO: Categories;
         factory.unregister();
-    services.observer.notifyObservers(null, "dactyl-cleanup", null);
 }
 
 function reasonToString(reason) {
diff --git a/common/content/buffer.js b/common/content/buffer.js
index 456062e8..04dc93ed 100644
--- a/common/content/buffer.js
+++ b/common/content/buffer.js
@@ -147,6 +147,40 @@ const Buffer = Module("buffer", {
             let elem = event.originalTarget;
             buffer.viewSource([elem.getAttribute("href"), Number(elem.getAttribute("line"))])
         };
+
+        this.replaceProgressListener(this.progressListener);
+    },
+
+    cleanup: function () {
+        for (let prop in properties(this.progressListener))
+            if (!this.progressListener.__lookupGetter__(prop) &&
+                !callable(this.progressListener[prop]))
+                this.origProgressListener[prop] = this.progressListener[prop]
+
+        this.replaceProgressListener(this.origProgressListener);
+    },
+
+    replaceProgressListener: function (newListener) {
+        // I hate this whole hack. --Kris
+        let obj = window.XULBrowserWindow, getter;
+        for (let prop in properties(obj))
+            if ((getter = obj.__lookupGetter__(prop)) && !obj.__lookupSetter__(prop)) {
+                newListener.__defineGetter__(prop, getter);
+                delete obj[prop];
+            }
+
+        this.origProgressListener = window.XULBrowserWindow;
+        try {
+            config.browser.removeProgressListener(window.XULBrowserWindow);
+        }
+        catch (e) {} // Why? --djk
+
+        config.browser.addProgressListener(newListener, Ci.nsIWebProgress.NOTIFY_ALL);
+        window.XULBrowserWindow = newListener;
+        window.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIWebNavigation)
+              .QueryInterface(Ci.nsIDocShellTreeItem).treeOwner
+              .QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIXULWindow)
+              .XULBrowserWindow = newListener;
     },
 
     destroy: function () {
@@ -1502,26 +1536,6 @@ const Buffer = Module("buffer", {
         };
     },
     events: function () {
-        try {
-            config.browser.removeProgressListener(window.XULBrowserWindow);
-        }
-        catch (e) {} // Why? --djk
-
-        // I hate this whole hack. --Kris
-        let obj = window.XULBrowserWindow, getter;
-        for (let p in properties(obj))
-            if ((getter = obj.__lookupGetter__(p)) && !obj.__lookupSetter__(p)) {
-                this.progressListener.__defineGetter__(p, getter);
-                delete obj[p];
-            }
-
-        config.browser.addProgressListener(this.progressListener, Ci.nsIWebProgress.NOTIFY_ALL);
-        window.XULBrowserWindow = this.progressListener;
-        window.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIWebNavigation)
-              .QueryInterface(Ci.nsIDocShellTreeItem).treeOwner
-              .QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIXULWindow)
-              .XULBrowserWindow = this.progressListener;
-
         events.addSessionListener(config.browser, "DOMContentLoaded", this.closure.onDOMContentLoaded, true);
         events.addSessionListener(config.browser, "load", this.closure.onPageLoad, true);
         events.addSessionListener(config.browser, "scroll", this.closure._updateBufferPosition, false);
diff --git a/common/content/commandline.js b/common/content/commandline.js
index e4ca3534..3454f0e0 100644
--- a/common/content/commandline.js
+++ b/common/content/commandline.js
@@ -135,9 +135,25 @@ const CommandWidgets = Class("CommandWidgets", {
             getGroup: function (value) {
                 if (this.command && !options.get("guioptions").has("M"))
                     return this.statusbar;
+
                 let statusElem = this.statusbar.message;
-                if (value && statusElem.inputField.editor.rootElement.scrollWidth > statusElem.scrollWidth)
-                    return this.commandbar;
+                if (!statusElem.editor) {
+                    util.dump(commandline == window.dactyl.modules.commandline,
+                              window.dactyl.modules.commandline.widgets == this,
+                              commandline.widgets == this);
+                    util.dumpStack();
+
+                    for (let i=0, e = statusElem; e; e = e.parentNode)
+                        util.dump(i++, e == statusline._statusLine.firstChild,
+                                  e == statusline.widgets.container,
+                                  e);
+                    util.dump(statusElem == statusline.widgets.message);
+                    util.dump(statusline._statusLine.firstChild == statusline.widgets.container);
+                }
+                else {
+                    if (value && statusElem.editor.rootElement.scrollWidth > statusElem.scrollWidth)
+                        return this.commandbar;
+                }
                 return this.activeGroup.mode;
             }
         });
@@ -165,13 +181,13 @@ const CommandWidgets = Class("CommandWidgets", {
         const self = this;
         this.elements[obj.name] = obj;
 
-        function get(id) obj.getElement ? obj.getElement(id) : document.getElementById(id);
+        function get(prefix, map, id) (obj.getElement || util.identity)(map[id] || document.getElementById(prefix + id));
 
         this.active.__defineGetter__(obj.name, function () self.activeGroup[obj.name][obj.name]);
         this.activeGroup.__defineGetter__(obj.name, function () self.getGroup(obj.name));
 
-        memoize(this.statusbar, obj.name, function () get("dactyl-statusline-field-" + (obj.id || obj.name)));
-        memoize(this.commandbar, obj.name, function () get("dactyl-" + (obj.id || obj.name)));
+        memoize(this.statusbar, obj.name, function () get("dactyl-statusline-field-", statusline.widgets, (obj.id || obj.name)));
+        memoize(this.commandbar, obj.name, function () get("dactyl-", {}, (obj.id || obj.name)));
 
         if (!(obj.noValue || obj.getValue))
             Object.defineProperty(this, obj.name, Modes.boundProperty({
@@ -259,8 +275,7 @@ const CommandWidgets = Class("CommandWidgets", {
     multilineInput: Class.memoize(function () document.getElementById("dactyl-multiline-input")),
     mowContainer: Class.memoize(function () this.multilineOutput.parentNode)
 }, {
-    getEditor: function (id) {
-        let elem = document.getElementById(id);
+    getEditor: function (elem) {
         elem.inputField.QueryInterface(Ci.nsIDOMNSEditableElement);
         return elem;
     }
diff --git a/common/content/dactyl.js b/common/content/dactyl.js
index b5e04249..eaeaa7fc 100644
--- a/common/content/dactyl.js
+++ b/common/content/dactyl.js
@@ -53,13 +53,15 @@ const Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase),
 
     observe: {
         "dactyl-cleanup": function () {
-            for (let [, mod] in iter(array(values(modules)).reverse()))
+            for (let name in values(Object.getOwnPropertyNames(modules).reverse())) {
+                let mod = modules[name];
                 if (mod instanceof ModuleBase) {
                     if ("cleanup" in mod)
                         mod.cleanup();
                     if ("destroy" in mod)
                         mod.destroy();
                 }
+            }
         }
     },
 
diff --git a/common/content/statusline.js b/common/content/statusline.js
index 44dc84b9..22541a22 100644
--- a/common/content/statusline.js
+++ b/common/content/statusline.js
@@ -10,6 +10,19 @@
 
 const StatusLine = Module("statusline", {
     init: function () {
+        this._statusLine = document.getElementById("status-bar");
+        this.statusBar = document.getElementById("addon-bar") || this._statusLine;
+        this.statusBar.collapsed = true; // it is later restored unless the user sets laststatus=0
+
+        if (this.statusBar.localName == "toolbar") {
+            styles.system.add("addon-bar", config.styleableChrome, <css><![CDATA[
+                #status-bar { margin-top: 0 !important; }
+                #addon-bar { padding: 0 !important; min-height: 18px !important; }
+                #addon-bar > statusbar { -moz-box-flex: 1 }
+                #addon-bar > #addonbar-closebutton { visibility: collapse; }
+                #addon-bar > xul|toolbarspring { visibility: collapse; }
+            ]]></css>);
+        }
 
         let _commandline = "if (window.dactyl) return dactyl.modules.commandline";
         let prepend = <e4x xmlns={XUL} xmlns:dactyl={NS}>
@@ -21,8 +34,8 @@ const StatusLine = Module("statusline", {
                         <hbox class="dactyl-container" dactyl:highlight="CmdLine StatusCmdLine">
                             <label class="plain" key="mode"          crop="end" collapsed="true"/>
                             <stack flex="1" class="dactyl-container" dactyl:highlight="CmdLine StatusCmdLine">
-                                <textbox class="plain" key="url"     crop="end" flex="1" readonly="true"/>
-                                <textbox class="plain" key="message" crop="end" flex="1" readonly="true" dactyl:highlight="Normal StatusNormal"/>
+                                <textbox key="url"     crop="end" flex="1" readonly="true" class="plain dactyl-status-field-url"/>
+                                <textbox key="message" crop="end" flex="1" readonly="true" class="plain" dactyl:highlight="Normal StatusNormal"/>
                             </stack>
                         </hbox>
 
@@ -45,31 +58,11 @@ const StatusLine = Module("statusline", {
             </statusbar>
         </e4x>;
 
-        for each (let attr in prepend..@key)
-            attr.parent().@id = "dactyl-statusline-field-" + attr;
-
+        util.dump("statusbar: load overlay");
         util.overlayWindow(window, {
             objects: this.widgets = { get status() this.container },
             prepend: prepend.elements()
         });
-
-        this._statusLine = document.getElementById("status-bar");
-        this.statusBar = document.getElementById("addon-bar") || this._statusLine;
-        this.statusBar.collapsed = true; // it is later restored unless the user sets laststatus=0
-
-
-        if (this.statusBar.localName == "toolbar") {
-            styles.system.add("addon-bar", config.styleableChrome, <css><![CDATA[
-                #status-bar { margin-top: 0 !important; }
-                #addon-bar { padding: 0 !important; min-height: 18px !important; }
-                #addon-bar > statusbar { -moz-box-flex: 1 }
-                #addon-bar > #addonbar-closebutton { visibility: collapse; }
-                #addon-bar > xul|toolbarspring { visibility: collapse; }
-            ]]></css>);
-            let parent = this.widgets.status.parentNode;
-            parent.removeChild(this.widgets.status);
-            parent.insertBefore(this.widgets.status, parent.firstChild);
-        }
     },
 
     get visible() !this.statusBar.collapsed && !this.statusBar.hidden,
diff --git a/common/modules/storage.jsm b/common/modules/storage.jsm
index 730e3dde..6e06377b 100644
--- a/common/modules/storage.jsm
+++ b/common/modules/storage.jsm
@@ -142,25 +142,39 @@ const ObjectStore = Class("ObjectStore", StoreBase, {
     __iterator__: function () Iterator(this._object),
 });
 
-var keys = {};
-var observers = {};
-
 const Storage = Module("Storage", {
     alwaysReload: {},
 
+    init: function () {
+        this.cleanup();
+    },
+
+    cleanup: function () {
+        for (let key in keys(this.keys))
+            delete this[key];
+        for (let ary in values(this.observers))
+            for (let obj in values(ary))
+                if (obj.ref && obj.ref.get())
+                    delete obj.ref.get().dactylStorageRefs;
+
+        this.keys = {};
+        this.observers = {};
+    },
+
     newObject: function newObject(key, constructor, params) {
         if (params == null || !isObject(params))
             throw Error("Invalid argument type");
 
-        if (!(key in keys) || params.reload || this.alwaysReload[key]) {
+        if (!(key in this.keys) || params.reload || this.alwaysReload[key]) {
             if (key in this && !(params.reload || this.alwaysReload[key]))
                 throw Error();
             let load = function () loadData(key, params.store, params.type || myObject);
-            keys[key] = new constructor(key, params.store, load, params);
-            keys[key].timer = new Timer(1000, 10000, function () storage.save(key));
-            this.__defineGetter__(key, function () keys[key]);
+
+            this.keys[key] = new constructor(key, params.store, load, params);
+            this.keys[key].timer = new Timer(1000, 10000, function () storage.save(key));
+            this.__defineGetter__(key, function () this.keys[key]);
         }
-        return keys[key];
+        return this.keys[key];
     },
 
     newMap: function newMap(key, options) {
@@ -182,38 +196,36 @@ const Storage = Module("Storage", {
             callbackRef = { get: function () callback };
         }
         this.removeDeadObservers();
-        if (!(key in observers))
-            observers[key] = [];
-        if (!observers[key].some(function (o) o.callback.get() == callback))
-            observers[key].push({ ref: ref && Cu.getWeakReference(ref), callback: callbackRef });
+        if (!(key in this.observers))
+            this.observers[key] = [];
+        if (!this.observers[key].some(function (o) o.callback.get() == callback))
+            this.observers[key].push({ ref: ref && Cu.getWeakReference(ref), callback: callbackRef });
     },
 
     removeObserver: function (key, callback) {
         this.removeDeadObservers();
-        if (!(key in observers))
+        if (!(key in this.observers))
             return;
-        observers[key] = observers[key].filter(function (elem) elem.callback.get() != callback);
-        if (observers[key].length == 0)
+        this.observers[key] = this.observers[key].filter(function (elem) elem.callback.get() != callback);
+        if (this.observers[key].length == 0)
             delete obsevers[key];
     },
 
     removeDeadObservers: function () {
-        for (let [key, ary] in Iterator(observers)) {
-            observers[key] = ary = ary.filter(function (o) o.callback.get() && (!o.ref || o.ref.get() && o.ref.get().dactylStorageRefs));
+        for (let [key, ary] in Iterator(this.observers)) {
+            this.observers[key] = ary = ary.filter(function (o) o.callback.get() && (!o.ref || o.ref.get() && o.ref.get().dactylStorageRefs));
             if (!ary.length)
-                delete observers[key];
+                delete this.observers[key];
         }
     },
 
-    get observers() observers,
-
     fireEvent: function fireEvent(key, event, arg) {
         this.removeDeadObservers();
-        if (key in observers)
+        if (key in this.observers)
             // Safe, since we have our own Array object here.
-            for each (let observer in observers[key])
+            for each (let observer in this.observers[key])
                 observer.callback.get()(key, event, arg);
-        if (key in keys)
+        if (key in this.keys)
             this[key].timer.tell();
     },
 
@@ -223,11 +235,11 @@ const Storage = Module("Storage", {
     },
 
     save: function save(key) {
-        saveData(keys[key]);
+        saveData(this.keys[key]);
     },
 
     saveAll: function storeAll() {
-        for each (let obj in keys)
+        for each (let obj in this.keys)
             saveData(obj);
     },
 
@@ -237,7 +249,7 @@ const Storage = Module("Storage", {
         if (val && !this._privateMode)
             this.saveAll();
         if (!val && this._privateMode)
-            for (let key in keys)
+            for (let key in this.keys)
                 this.load(key);
         return this._privateMode = Boolean(val);
     }
diff --git a/common/modules/util.jsm b/common/modules/util.jsm
index be16ed9e..4acf60b7 100644
--- a/common/modules/util.jsm
+++ b/common/modules/util.jsm
@@ -57,8 +57,8 @@ const Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
     cleanup: function cleanup() {
         for (let win in iter(services.windowMediator.getEnumerator(null))) {
             for (let elem in values(win.document.dactylOverlayElements || []))
-                if (elem.get() && elem.get().parentNode)
-                    elem.get().parentNode.removeChild(elem.get());
+                if (elem.parentNode)
+                    elem.parentNode.removeChild(elem);
             delete win.document.dactylOverlayElements;
             delete win.document.dactylOverlays;
         }
@@ -849,7 +849,7 @@ const Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
                 let tag = "<" + [namespaced(elem)].concat(
                     [namespaced(a) + "=" +  template.highlight(a.value, true)
                      for ([i, a] in array.iterItems(elem.attributes))]).join(" ");
-                return tag + (hasChildren ? "/>" : ">...</" + namespaced(elem) + ">");
+                return tag + (!hasChildren ? "/>" : ">...</" + namespaced(elem) + ">");
             }
             catch (e) {
                 return {}.toString.call(elem);
@@ -907,62 +907,6 @@ const Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
         return color ? string : [s for each (s in string)].join("");
     },
 
-    _loadOverlays: function _loadOverlays(window) {
-        if (!window.dactylOverlays)
-            window.dactylOverlays = [];
-
-        util.dump("load overlays", window.document.documentURI);
-
-        for each (let obj in util.overlays[window.document.documentURI] || []) {
-            if (window.dactylOverlays.indexOf(obj) >= 0)
-                continue;
-            window.dactylOverlays.push(obj);
-            this._loadOverlay(window, obj(window));
-        }
-    },
-    _loadOverlay: function _loadOverlay(window, obj) {
-        let doc = window.document;
-        if (!doc.dactylOverlayElements)
-            doc.dactylOverlayElements = [];
-
-        function overlay(key, fn) {
-            if (obj[key]) {
-                let iterator = Iterator(obj[key]);
-                if (!isObject(obj[key]))
-                    iterator = ([elem.@id, elem.*, elem.@*::*] for each (elem in obj[key]));
-
-                for (let [elem, xml, attr] in iterator) {
-                    if (elem = doc.getElementById(elem)) {
-                        let node = util.xmlToDom(xml, doc, obj.objects);
-                        for (let n in array.iterValues(node.childNodes))
-                            doc.dactylOverlayElements.push(Cu.getWeakReference(n));
-                        fn(elem, node);
-                        for each (let attr in attr || []) // FIXME: Cleanup...
-                            elem.setAttributeNS(attr.namespace(), attr.localName(), attr);
-                    }
-                }
-            }
-        }
-
-        overlay("before", function (elem, dom) elem.parentNode.insertBefore(dom, elem));
-        overlay("after", function (elem, dom) elem.parentNode.insertBefore(dom, elem.nextSibling));
-        overlay("append", function (elem, dom) elem.appendChild(dom));
-        overlay("prepend", function (elem, dom) elem.insertBefore(dom, elem.firstChild));
-        if (obj.init)
-            obj.init(window);
-
-        if (obj.load)
-            if (doc.readyState === "complete")
-                obj.load(window);
-            else
-                doc.addEventListener("load", wrapCallback(function load(event) {
-                    if (event.originalTarget === event.target) {
-                        doc.removeEventListener("load", load.wrapper, true);
-                        obj.load(window, event);
-                    }
-                }), true);
-    },
-
     observe: {
         "dactyl-cleanup": function () {
             util.dump("dactyl: util: observe: dactyl-cleanup");
@@ -1004,6 +948,64 @@ const Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
         }
     },
 
+    _loadOverlays: function _loadOverlays(window) {
+        if (!window.dactylOverlays)
+            window.dactylOverlays = [];
+
+        util.dump("load overlays", window.document.documentURI);
+
+        for each (let obj in util.overlays[window.document.documentURI] || []) {
+            if (window.dactylOverlays.indexOf(obj) >= 0)
+                continue;
+            window.dactylOverlays.push(obj);
+            this._loadOverlay(window, obj(window));
+        }
+    },
+    _loadOverlay: function _loadOverlay(window, obj) {
+        let doc = window.document;
+        if (!doc.dactylOverlayElements)
+            doc.dactylOverlayElements = [];
+
+        util.dump("load overlay", doc.documentURI, String(obj).substr(0, 60));
+
+        function overlay(key, fn) {
+            if (obj[key]) {
+                let iterator = Iterator(obj[key]);
+                if (!isObject(obj[key]))
+                    iterator = ([elem.@id, elem.elements(), elem.@*::*.(function::name() != "id")] for each (elem in obj[key]));
+
+                for (let [elem, xml, attr] in iterator) {
+                    if (elem = doc.getElementById(elem)) {
+                        let node = util.xmlToDom(xml, doc, obj.objects);
+                        for (let n in array.iterValues(node.childNodes))
+                            doc.dactylOverlayElements.push(n);
+                        fn(elem, node);
+                        for each (let attr in attr || []) // FIXME: Cleanup...
+                            elem.setAttributeNS(attr.namespace(), attr.localName(), attr);
+                    }
+                }
+            }
+        }
+
+        overlay("before", function (elem, dom) elem.parentNode.insertBefore(dom, elem));
+        overlay("after", function (elem, dom) elem.parentNode.insertBefore(dom, elem.nextSibling));
+        overlay("append", function (elem, dom) elem.appendChild(dom));
+        overlay("prepend", function (elem, dom) elem.insertBefore(dom, elem.firstChild));
+        if (obj.init)
+            obj.init(window);
+
+        if (obj.load)
+            if (doc.readyState === "complete")
+                obj.load(window);
+            else
+                doc.addEventListener("load", wrapCallback(function load(event) {
+                    if (event.originalTarget === event.target) {
+                        doc.removeEventListener("load", load.wrapper, true);
+                        obj.load(window, event);
+                    }
+                }), true);
+    },
+
     overlayWindow: function (url, fn) {
         if (url instanceof Ci.nsIDOMWindow)
             util._loadOverlay(url, fn);
diff --git a/common/skin/dactyl.css b/common/skin/dactyl.css
index 200c3500..f145dacd 100644
--- a/common/skin/dactyl.css
+++ b/common/skin/dactyl.css
@@ -122,7 +122,7 @@ statusbarpanel {
     background: transparent;
 }
 
-#dactyl-statusline-field-url {
+.dactyl-status-field-url {
     background-color: inherit !important;
     color: inherit !important;
 }

From adeb5f7dd2626bbfa205634e4ec42fb77f541c4d Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Fri, 24 Dec 2010 19:03:47 -0500
Subject: [PATCH 10/35] [bootstrap] Fix command line handling.

--HG--
branch : bootstrapped
---
 common/bootstrap.js      | 40 +++++++++++++++++++++++++---------------
 common/content/dactyl.js |  2 ++
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/common/bootstrap.js b/common/bootstrap.js
index 21514102..eaa62362 100755
--- a/common/bootstrap.js
+++ b/common/bootstrap.js
@@ -40,6 +40,7 @@ let initialized = false;
 let addon = null;
 let basePath = null;
 let components = {};
+let getURI = null;
 
 function startup(data, reason) {
     dump("dactyl: bootstrap: startup\n");
@@ -50,17 +51,24 @@ function startup(data, reason) {
 
         dump("dactyl: bootstrap: init" + " " + data.id + "\n");
 
-        AddonManager.getAddonByID(data.id, function (res) {
-            try {
-                addon = res;
-                init();
-            }
-            catch (e) {
-                dump("dactyl: bootstrap: " + e + "\n");
-                Cu.reportError(e);
-            }
-        });
+        addon = data;
 
+        if (basePath.isDirectory())
+            getURI = function getURI(path) {
+                let file = basePath.clone().QueryInterface(Ci.nsILocalFile);
+                file.appendRelativePath(path);
+                return (Services.io || services.io).newFileURI(file);
+            }
+        else
+            getURI = function getURI(path)
+                Services.io.newURI("jar:" + Services.io.newFileURI(file).spec + "!" + path);
+        try {
+            init();
+        }
+        catch (e) {
+            dump("dactyl: bootstrap: " + e + "\n" + e.stack);
+            Cu.reportError(e);
+        }
     }
 }
 
@@ -95,15 +103,15 @@ FactoryProxy.prototype = {
 }
 
 function init() {
-    dump("dactyl: bootstrap: init: " + addon + "\n");
+    dump("dactyl: bootstrap: init\n");
 
-    let manifestURI = addon.getResourceURI("chrome.manifest");
+    let manifestURI = getURI("chrome.manifest");
     let manifest = httpGet(manifestURI.spec)
             .responseText
             .replace(/^\s*|\s*$|#.*/g, "")
             .replace(/^\s*\n/gm, "");
 
-    function url(path) addon.getResourceURI(path).spec;
+    function url(path) getURI(path).spec;
 
     let result = [];
 
@@ -134,7 +142,7 @@ function init() {
             break;
 
         case "resource":
-            resourceProto.setSubstitution(fields[1], addon.getResourceURI(fields[2]));
+            resourceProto.setSubstitution(fields[1], getURI(fields[2]));
         }
     }
 
@@ -155,13 +163,15 @@ function init() {
             }
         });
 
+    let manifestText = result.map(function (line) line.join(" ")).join("\n");
+
     if (manifestURI instanceof Ci.nsIFileURL)
         manager.autoRegister(manifestURI.QueryInterface(Ci.nsIFileURL).file);
     else {
         var file = basePath.parent;
         file.append(addon.id + ".manifest");
 
-        writeFile(file, result.map(function (line) line.join(" ")).join("\n"));
+        writeFile(file, manifestText);
         manager.autoRegister(file);
         file.remove(false);
     }
diff --git a/common/content/dactyl.js b/common/content/dactyl.js
index eaeaa7fc..3afd5310 100644
--- a/common/content/dactyl.js
+++ b/common/content/dactyl.js
@@ -62,6 +62,8 @@ const Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase),
                         mod.destroy();
                 }
             }
+            for (let name in values(Object.getOwnPropertyNames(modules).reverse()))
+                delete modules[name];
         }
     },
 

From d0b5a5b209ecf9c1c33592bc7797d10785a26d4e Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Fri, 24 Dec 2010 20:37:39 -0500
Subject: [PATCH 11/35] [bootstrap] Minor fixes.

--HG--
branch : bootstrapped
---
 common/content/commands.js | 30 ++++++++++++++++++------------
 common/content/io.js       | 29 +++++++++++++++--------------
 common/modules/overlay.jsm |  2 +-
 common/modules/util.jsm    |  4 +++-
 4 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/common/content/commands.js b/common/content/commands.js
index f79584c7..c508757d 100644
--- a/common/content/commands.js
+++ b/common/content/commands.js
@@ -80,7 +80,7 @@ update(CommandOption, {
      *     E.g. "foo,bar"
      * @final
      */
-    LIST: ArgType("list", function (arg) arg && arg.split(/\s*,\s*/))
+    LIST: ArgType("list", function (arg, quoted) Option.splitList(quoted))
 });
 
 /**
@@ -748,7 +748,10 @@ const Commands = Module("commands", {
      */
     parseArgs: function (str, params) {
         try {
-            function getNextArg(str) {
+            function getNextArg(str, _keepQuotes) {
+                if (arguments.length < 2)
+                    _keepQuotes = keepQuotes;
+
                 if (str.substr(0, 2) === "<<" && hereDoc) {
                     let arg = /^<<(\S*)/.exec(str)[1];
                     let count = arg.length + 2;
@@ -756,7 +759,7 @@ const Commands = Module("commands", {
                         return [count, "", ""];
                     return [count, io.readHeredoc(arg), ""];
                 }
-                let [count, arg, quote] = Commands.parseArg(str, null, keepQuotes);
+                let [count, arg, quote] = Commands.parseArg(str, null, _keepQuotes);
                 if (quote == "\\" && !complete)
                     return [, , , "Trailing \\"];
                 if (quote && !complete)
@@ -782,7 +785,7 @@ const Commands = Module("commands", {
             var invalid = false;
             // FIXME: best way to specify these requirements?
             var onlyArgumentsRemaining = allowUnknownOptions || options.length == 0; // after a -- has been found
-            var arg = null;
+            var arg = null, quoted = null;
             var count = 0; // the length of the argument
             var i = 0;
             var completeOpts;
@@ -845,12 +848,14 @@ const Commands = Module("commands", {
                         for (let [, optname] in Iterator(opt.names)) {
                             if (sub.indexOf(optname) == 0) {
                                 invalid = false;
+                                quoted = null;
                                 arg = null;
                                 quote = null;
                                 count = 0;
                                 let sep = sub[optname.length];
                                 if (sep == "=" || /\s/.test(sep) && opt.type != CommandOption.NOARG) {
-                                    [count, arg, quote, error] = getNextArg(sub.substr(optname.length + 1));
+                                    [count, quoted, quote, error] = getNextArg(sub.substr(optname.length + 1), true);
+                                    arg = Option.dequote(quoted);
                                     dactyl.assert(!error, error);
 
                                     // if we add the argument to an option after a space, it MUST not be empty
@@ -879,7 +884,7 @@ const Commands = Module("commands", {
                                     if (!complete || arg != null) {
                                         if (opt.type) {
                                             let orig = arg;
-                                            arg = opt.type.parse(arg);
+                                            arg = opt.type.parse(arg, quoted);
 
                                             if (complete && isArray(arg)) {
                                                 args.completeFilter = arg[arg.length - 1];
@@ -896,7 +901,7 @@ const Commands = Module("commands", {
 
                                         // we have a validator function
                                         if (typeof opt.validator == "function") {
-                                            if (opt.validator.call(this, arg) == false) {
+                                            if (opt.validator.call(this, arg, quoted) == false) {
                                                 fail("Invalid argument for option: " + optname);
                                                 if (complete) // Always true.
                                                     complete.highlight(args.completeStart, count - 1, "SPELLCHECK");
@@ -904,11 +909,12 @@ const Commands = Module("commands", {
                                         }
                                     }
 
-                                    // option allowed multiple times
-                                    if (opt.multiple)
-                                        args[opt.names[0]] = (args[opt.names[0]] || []).concat(arg);
-                                    else
-                                        args[opt.names[0]] = opt.type == CommandOption.NOARG || arg;
+                                    if (arg != null || opt.type == CommandOption.NOARG)
+                                        // option allowed multiple times
+                                        if (opt.multiple)
+                                            args[opt.names[0]] = (args[opt.names[0]] || []).concat(arg);
+                                        else
+                                            args[opt.names[0]] = opt.type == CommandOption.NOARG || arg;
 
                                     i += optname.length + count;
                                     if (i == str.length)
diff --git a/common/content/io.js b/common/content/io.js
index 5cd87618..29731ead 100644
--- a/common/content/io.js
+++ b/common/content/io.js
@@ -13,20 +13,21 @@ plugins.contexts = {};
 function Script(file) {
     let self = set.has(plugins, file.path) && plugins[file.path];
     if (self) {
-        if (self.onUnload)
+        if (set.has(self, "onUnload"))
             self.onUnload();
     }
     else {
-        self = { __proto__: plugins };
-        plugins[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 = update({ __proto__: plugins }, {
+            NAME: file.leafName.replace(/\..*/, "").replace(/-([a-z])/g, function (m, n1) n1.toUpperCase()),
+            PATH: file.path,
+            CONTEXT: self
+        });
+        Class.replaceProperty(plugins, file.path, self);
 
         // This belongs elsewhere
         if (io.getRuntimeDirectories("plugins").some(
                 function (dir) dir.contains(file, false)))
-            plugins[self.NAME] = self;
+            Class.replaceProperty(plugins, self.NAME, self);
     }
     plugins.contexts[file.path] = self;
     return self;
@@ -67,6 +68,13 @@ const IO = Module("io", {
         services.downloadManager.addListener(this.downloadListener);
     },
 
+    destroy: function () {
+        services.downloadManager.removeListener(this.downloadListener);
+        for (let [, plugin] in Iterator(plugins.contexts))
+            if (plugin.onUnload)
+                plugin.onUnload();
+    },
+
     // TODO: there seems to be no way, short of a new component, to change
     // the process's CWD - see https://bugzilla.mozilla.org/show_bug.cgi?id=280953
     /**
@@ -111,13 +119,6 @@ const IO = Module("io", {
         return this.cwd;
     },
 
-    destroy: function () {
-        services.downloadManager.removeListener(this.downloadListener);
-        for (let [, plugin] in Iterator(plugins.contexts))
-            if (plugin.onUnload)
-                plugin.onUnload();
-    },
-
     /**
      * @property {function} File class.
      * @final
diff --git a/common/modules/overlay.jsm b/common/modules/overlay.jsm
index 15e9d73e..c7217174 100644
--- a/common/modules/overlay.jsm
+++ b/common/modules/overlay.jsm
@@ -7,7 +7,7 @@
 Components.utils.import("resource://dactyl/base.jsm");
 defineModule("overlay", {
     exports: ["ModuleBase"],
-    require: ["sanitizer", "services", "template", "util"],
+    require: ["highlight", "sanitizer", "services", "template", "util"],
 });
 
 /**
diff --git a/common/modules/util.jsm b/common/modules/util.jsm
index 4acf60b7..6d5f0ff1 100644
--- a/common/modules/util.jsm
+++ b/common/modules/util.jsm
@@ -932,11 +932,13 @@ const Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
         },
         "dactyl-rehash": function () {
             util.dump("dactyl: util: observe: dactyl-rehash");
-            for (let module in values(defineModule.modules))
+            for (let module in values(defineModule.modules)) {
+                util.dump("dactyl: util: init(" + module + ")");
                 if (module.reinit)
                     module.reinit();
                 else
                     module.init();
+            }
         },
         "toplevel-window-ready": function (window, data) {
             window.addEventListener("DOMContentLoaded", wrapCallback(function listener(event) {

From 84da91587a911eb30e1440b77057d1fd32c3eee1 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Sat, 25 Dec 2010 05:31:52 -0500
Subject: [PATCH 12/35] [bootstrapped] Minor changes.

--HG--
branch : bootstrapped
---
 common/bootstrap.js           | 18 ++++++++++--------
 common/content/commandline.js | 19 ++-----------------
 common/modules/util.jsm       |  4 ++--
 3 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/common/bootstrap.js b/common/bootstrap.js
index eaa62362..011edd14 100755
--- a/common/bootstrap.js
+++ b/common/bootstrap.js
@@ -43,7 +43,7 @@ let components = {};
 let getURI = null;
 
 function startup(data, reason) {
-    dump("dactyl: bootstrap: startup\n");
+    dump("dactyl: bootstrap: startup " + reasonToString(reason) + "\n");
     basePath = data.installPath;
 
     if (!initialized) {
@@ -180,11 +180,13 @@ function init() {
 }
 
 function shutdown(data, reason) {
-    dump("dactyl: bootstrap: shutdown\n");
-    services.observer.notifyObservers(null, "dactyl-cleanup", null);
-    for (let factory in values(components))
-        // TODO: Categories;
-        factory.unregister();
+    dump("dactyl: bootstrap: shutdown " + reasonToString(reason) + "\n");
+    if (reason != APP_SHUTDOWN) {
+        services.observer.notifyObservers(null, "dactyl-cleanup", null);
+        for (let factory in values(components))
+            // TODO: Categories;
+            factory.unregister();
+    }
 }
 
 function reasonToString(reason) {
@@ -196,6 +198,6 @@ function reasonToString(reason) {
             return name;
 }
 
-function install(data, reason) { dump("dactyl: bootstrap: install\n") }
-function uninstall(data, reason) { dump("dactyl: bootstrap: uninstall\n") }
+function install(data, reason) { dump("dactyl: bootstrap: install " + reasonToString(reason) + "\n") }
+function uninstall(data, reason) { dump("dactyl: bootstrap: uninstall " + reasonToString(reason) + "\n") }
 
diff --git a/common/content/commandline.js b/common/content/commandline.js
index 3454f0e0..65452b92 100644
--- a/common/content/commandline.js
+++ b/common/content/commandline.js
@@ -137,23 +137,8 @@ const CommandWidgets = Class("CommandWidgets", {
                     return this.statusbar;
 
                 let statusElem = this.statusbar.message;
-                if (!statusElem.editor) {
-                    util.dump(commandline == window.dactyl.modules.commandline,
-                              window.dactyl.modules.commandline.widgets == this,
-                              commandline.widgets == this);
-                    util.dumpStack();
-
-                    for (let i=0, e = statusElem; e; e = e.parentNode)
-                        util.dump(i++, e == statusline._statusLine.firstChild,
-                                  e == statusline.widgets.container,
-                                  e);
-                    util.dump(statusElem == statusline.widgets.message);
-                    util.dump(statusline._statusLine.firstChild == statusline.widgets.container);
-                }
-                else {
-                    if (value && statusElem.editor.rootElement.scrollWidth > statusElem.scrollWidth)
-                        return this.commandbar;
-                }
+                if (value && statusElem.editor.rootElement.scrollWidth > statusElem.scrollWidth)
+                    return this.commandbar;
                 return this.activeGroup.mode;
             }
         });
diff --git a/common/modules/util.jsm b/common/modules/util.jsm
index 6e152bd8..1073d8bc 100644
--- a/common/modules/util.jsm
+++ b/common/modules/util.jsm
@@ -292,10 +292,10 @@ const Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
             ([^]*?) // 1
             (?:
                 (<\[) | // 2
-                (< (.*?) >) | // 3 4
+                (< ((?:[a-z]-)?[a-z-]*?) >) | // 3 4
                 (\]>) // 5
             )
-        ]]>, "gy");
+        ]]>, "giy");
         while (match = re.exec(macro)) {
             let [, prefix, open, full, macro, close] = match;
             end += match[0].length;

From d23595aa0256cbf26f4b9c796d05d1e5e746e5f3 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Sat, 25 Dec 2010 05:59:56 -0500
Subject: [PATCH 13/35] [bootstrapped] Fix some CSS issues after restartless
 reload.

--HG--
branch : bootstrapped
---
 common/content/commandline.js |  8 ++++----
 common/content/configbase.js  | 12 ++++++------
 common/content/statusline.js  | 19 +++++++++----------
 3 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/common/content/commandline.js b/common/content/commandline.js
index 65452b92..eb414c9f 100644
--- a/common/content/commandline.js
+++ b/common/content/commandline.js
@@ -55,12 +55,12 @@ const CommandWidgets = Class("CommandWidgets", {
                                 onclick={_commandline + ".onMultilineOutputEvent(event)"}/>
                     </vbox>
 
-                    <stack orient="horizontal" align="stretch" class="dactyl-container" id="dactyl-container" dactyl:highlight="CmdLine CmdCmdLine">
+                    <stack orient="horizontal" align="stretch" class="dactyl-container" id="dactyl-container" highlight="CmdLine CmdCmdLine">
                         <textbox class="plain" id="dactyl-strut"   flex="1" crop="end" collapsed="true"/>
                         <textbox class="plain" id="dactyl-mode"    flex="1" crop="end"/>
                         <textbox class="plain" id="dactyl-message" flex="1" readonly="true"/>
 
-                        <hbox id="dactyl-commandline" hidden="false" class="dactyl-container" dactyl:highlight="Normal CmdNormal" collapsed="true">
+                        <hbox id="dactyl-commandline" hidden="false" class="dactyl-container" highlight="Normal CmdNormal" collapsed="true">
                             <label   id="dactyl-commandline-prompt"  class="dactyl-commandline-prompt  plain" flex="0" crop="end" value="" collapsed="true"/>
                             <textbox id="dactyl-commandline-command" class="dactyl-commandline-command plain" flex="1" type="input" timeout="100"
                                      oninput={_commandline + ".onEvent(event);"} onkeyup={_commandline + ".onEvent(event);"}
@@ -68,9 +68,9 @@ const CommandWidgets = Class("CommandWidgets", {
                         </hbox>
                     </stack>
 
-                    <vbox class="dactyl-container" hidden="false" collapsed="false" dactyl:highlight="CmdLine">
+                    <vbox class="dactyl-container" hidden="false" collapsed="false" highlight="CmdLine">
                         <textbox id="dactyl-multiline-input" class="plain" flex="1" rows="1" hidden="false" collapsed="true" multiline="true"
-                                 dactyl:highlight="Normal"
+                                 highlight="Normal"
                                  onkeypress={_commandline + ".onMultilineInputEvent(event);"} oninput={_commandline + ".onMultilineInputEvent(event);"}
                                  onblur={_commandline + ".onMultilineInputEvent(event);"}/>
                     </vbox>
diff --git a/common/content/configbase.js b/common/content/configbase.js
index a6a09386..63ff9c75 100644
--- a/common/content/configbase.js
+++ b/common/content/configbase.js
@@ -177,8 +177,8 @@ const ConfigBase = Class(ModuleBase, {
         CmdQuestion;[dactyl|highlight]   &#x0d; StatusQuestion;[dactyl|highlight]
         CmdWarningMsg;[dactyl|highlight] &#x0d; StatusWarningMsg;[dactyl|highlight]
 
-        !Normal           color: black   !important; background: white   !important; font-weight: normal !important;
-        !StatusNormal     color: inherit !important; background: inherit !important;
+        Normal            color: black   !important; background: white   !important; font-weight: normal !important;
+        StatusNormal      color: inherit !important; background: inherit !important;
         ErrorMsg          color: white   !important; background: red     !important; font-weight: bold !important;
         InfoMsg           color: black   !important; background: white   !important;
         StatusInfoMsg     color: inherit !important; background: inherit !important;
@@ -188,7 +188,7 @@ const ConfigBase = Class(ModuleBase, {
         MoreMsg           color: green   !important; background: white   !important;
         StatusMoreMsg                                background: inherit !important;
         Message           white-space: pre-wrap !important; min-width: 100%; width: 100%; padding-left: 4em; text-indent: -4em; display: block;
-        !Message String   white-space: pre-wrap;
+        Message String    white-space: pre-wrap;
         NonText           color: blue; background: transparent !important;
         *Preview          color: gray;
         Question          color: green   !important; background: white   !important; font-weight: bold !important;
@@ -196,7 +196,7 @@ const ConfigBase = Class(ModuleBase, {
         WarningMsg        color: red     !important; background: white   !important;
         StatusWarningMsg  color: red     !important; background: inherit !important;
 
-        !CmdLine;>*       font-family: monospace !important; padding: 1px !important;
+        CmdLine;>*        font-family: monospace !important; padding: 1px !important;
         CmdPrompt;.dactyl-commandline-prompt
         CmdInput;.dactyl-commandline-command
         CmdOutput         white-space: pre;
@@ -245,8 +245,8 @@ const ConfigBase = Class(ModuleBase, {
         Usage>LineInfo              position: absolute; left: 100%; padding: 1ex; margin: -1ex -1em; background: rgba(255, 255, 255, .8); border-radius: 1ex;
         Usage:not(:hover)>LineInfo  opacity: 0; left: 0; width: 1px; height: 1px; overflow: hidden;
 
-        !StatusLine         font-weight: bold; font-family: monospace; -moz-appearance: none !important; border: 0px !important; min-height: 18px !important;
-        !StatusLineNormal   color: white !important; background: black   !important;
+        StatusLine          font-weight: bold; font-family: monospace; -moz-appearance: none !important; border: 0px !important; min-height: 18px !important;
+        StatusLineNormal    color: white !important; background: black   !important;
         StatusLineBroken    color: black !important; background: #FFa0a0 !important /* light-red */
         StatusLineSecure    color: black !important; background: #a0a0FF !important /* light-blue */
         StatusLineExtended  color: black !important; background: #a0FFa0 !important /* light-green */
diff --git a/common/content/statusline.js b/common/content/statusline.js
index 22541a22..2bf6f14c 100644
--- a/common/content/statusline.js
+++ b/common/content/statusline.js
@@ -26,20 +26,19 @@ const StatusLine = Module("statusline", {
 
         let _commandline = "if (window.dactyl) return dactyl.modules.commandline";
         let prepend = <e4x xmlns={XUL} xmlns:dactyl={NS}>
-            <statusbar id="status-bar" dactyl:highlight="StatusLine StatusNormal">
+            <statusbar id="status-bar" highlight="StatusLine StatusNormal">
                 <!-- insertbefore="dactyl.statusBefore;" insertafter="dactyl.statusAfter;" -->
-                <hbox
-                      style="background: inherit;" key="container" flex="1" hidden="false" align="center">
-                    <stack orient="horizontal" align="stretch"      flex="1" class="dactyl-container" dactyl:highlight="CmdLine StatusCmdLine">
-                        <hbox class="dactyl-container" dactyl:highlight="CmdLine StatusCmdLine">
-                            <label class="plain" key="mode"          crop="end" collapsed="true"/>
-                            <stack flex="1" class="dactyl-container" dactyl:highlight="CmdLine StatusCmdLine">
-                                <textbox key="url"     crop="end" flex="1" readonly="true" class="plain dactyl-status-field-url"/>
-                                <textbox key="message" crop="end" flex="1" readonly="true" class="plain" dactyl:highlight="Normal StatusNormal"/>
+                <hbox style="background: inherit;" key="container"  flex="1" hidden="false" align="center">
+                    <stack orient="horizontal" align="stretch"      flex="1" class="dactyl-container" highlight="CmdLine StatusCmdLine">
+                        <hbox                                                class="dactyl-container" highlight="CmdLine StatusCmdLine">
+                            <label key="mode"          crop="end"            class="plain" collapsed="true"/>
+                            <stack flex="1"                                  class="dactyl-container" highlight="CmdLine StatusCmdLine">
+                                <textbox key="url"     crop="end"   flex="1" class="plain dactyl-status-field-url" readonly="true"/>
+                                <textbox key="message" crop="end"   flex="1" class="plain"            highlight="Normal StatusNormal" readonly="true"/>
                             </stack>
                         </hbox>
 
-                        <hbox key="commandline" hidden="false" class="dactyl-container" dactyl:highlight="Normal StatusNormal" collapsed="true">
+                        <hbox key="commandline" hidden="false" class="dactyl-container" highlight="Normal StatusNormal" collapsed="true">
                             <label key="commandline-prompt"    class="dactyl-commandline-prompt  plain" flex="0" crop="end" value="" collapsed="true"/>
                             <textbox key="commandline-command" class="dactyl-commandline-command plain" flex="1" type="text" timeout="100"
                                      oninput={_commandline + ".onEvent(event);"} onkeyup={_commandline + ".onEvent(event);"}

From 89ec0f4d4f38cedc13e09306e5d01744866ea881 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Sat, 25 Dec 2010 06:33:58 -0500
Subject: [PATCH 14/35] [bootstrap] Fix more reinitialization issues.

--HG--
branch : bootstrapped
---
 common/content/commandline.js | 17 ++++++++++++-----
 common/modules/util.jsm       | 19 ++++++-------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/common/content/commandline.js b/common/content/commandline.js
index eb414c9f..3498ca1b 100644
--- a/common/content/commandline.js
+++ b/common/content/commandline.js
@@ -244,11 +244,18 @@ const CommandWidgets = Class("CommandWidgets", {
     completionList: Class.memoize(function () document.getElementById("dactyl-completions")),
     completionContainer: Class.memoize(function () this.completionList.parentNode),
     multilineOutput: Class.memoize(function () {
-        let elem = document.getElementById("dactyl-multiline-output");
+        this.__defineGetter__("multilineOutput", function () {
+            let elem = document.getElementById("dactyl-multiline-output");
+            while (elem.contentDocument.documentURI != elem.getAttribute("src") ||
+                   ["viewable", "complete"].indexOf(elem.contentDocument.readyState) < 0)
+                util.threadYield();
+            return elem;
+        });
+
+        let elem = this.multilineOutput;
         elem.contentWindow.addEventListener("unload", function (event) { event.preventDefault(); }, true);
-        elem.contentWindow.addEventListener("load", function (event) {
-            elem.contentDocument.body.id = "dactyl-multiline-output-content";
-        }, false);
+        elem.contentDocument.body.id = "dactyl-multiline-output-content";
+
         ["copy", "copylink", "selectall"].forEach(function (tail) {
             // some host apps use "hostPrefixContext-copy" ids
             let xpath = "//xul:menuitem[contains(@id, '" + "ontext-" + tail + "') and not(starts-with(@id, 'dactyl-'))]";
@@ -525,7 +532,7 @@ const CommandLine = Module("commandline", {
         set: function (value) { this.widgets.multilineInput.collapsed = !value; }
     }),
     multilineOutputVisible: Modes.boundProperty({
-        set: function (value) { this.widgets.mowContainer.collapsed = !value; }
+        set: function (value) { (this.widgets.mowContainer || {}).collapsed = !value; }
     }),
 
     /**
diff --git a/common/modules/util.jsm b/common/modules/util.jsm
index 1073d8bc..8a5c6471 100644
--- a/common/modules/util.jsm
+++ b/common/modules/util.jsm
@@ -97,16 +97,17 @@ const Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
      * @param {object} obj
      */
     addObserver: function (obj) {
-        let observers = obj.observe;
+        let observers = obj._observe || obj.observe;
+        obj._observe = observers;
         function register(meth) {
             services.observer[meth](obj, "quit-application", true);
-            services.observer[meth](obj, "dactyl-unload", true);
+            services.observer[meth](obj, "dactyl-cleanup", true);
             for (let target in keys(observers))
                 services.observer[meth](obj, target, true);
         }
         Class.replaceProperty(obj, "observe",
             function (subject, target, data) {
-                if (target == "quit-application" || target == "dactyl-unload")
+                if (target == "quit-application" || target == "dactyl-cleanup")
                     register("removeObserver");
                 if (observers[target])
                     observers[target].call(obj, subject, data);
@@ -918,19 +919,11 @@ const Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
                         module.cleanup();
 
                 services.observer.addObserver(this, "dactyl-rehash", true);
-
-                /*
-                let getOwnPropertyNames = Object.getOwnPropertyNames;
-                for each (let global in defineModule.globals.reverse())
-                    for each (let k in getOwnPropertyNames(global))
-                        try {
-                            delete global[k];
-                        }
-                        catch (e) {}
-                */
             });
         },
         "dactyl-rehash": function () {
+            services.observer.removeObserver(this, "dactyl-rehash");
+
             util.dump("dactyl: util: observe: dactyl-rehash");
             for (let module in values(defineModule.modules)) {
                 util.dump("dactyl: util: init(" + module + ")");

From a759ab36060b54914b0ae6dbcb308fb8d1874206 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Sat, 25 Dec 2010 08:54:33 -0500
Subject: [PATCH 15/35] [bootstrap] Add code to manually reload stale cached
 modules on rehash.

--HG--
branch : bootstrapped
---
 common/bootstrap.js                      | 18 ++++---
 common/components/commandline-handler.js | 12 ++---
 common/components/protocols.js           | 18 +++----
 common/modules/base.jsm                  | 67 +++++++++++++++++++-----
 common/modules/bookmarkcache.jsm         |  8 +--
 common/modules/highlight.jsm             |  8 +--
 common/modules/overlay.jsm               |  4 +-
 common/modules/prefs.jsm                 |  2 +-
 common/modules/sanitizer.jsm             |  6 +--
 common/modules/services.jsm              |  2 +-
 common/modules/storage.jsm               | 14 ++---
 common/modules/styles.jsm                |  8 +--
 common/modules/template.jsm              |  2 +-
 common/modules/util.jsm                  | 31 ++++++-----
 14 files changed, 122 insertions(+), 78 deletions(-)

diff --git a/common/bootstrap.js b/common/bootstrap.js
index 011edd14..68954ad9 100755
--- a/common/bootstrap.js
+++ b/common/bootstrap.js
@@ -16,7 +16,7 @@ const resourceProto = Services.io.getProtocolHandler("resource")
                               .QueryInterface(Ci.nsIResProtocolHandler);
 const categoryManager = Cc["@mozilla.org/categorymanager;1"].getService(Ci.nsICategoryManager);
 const manager = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
-const storage = Cc["@mozilla.org/fuel/application;1"].getService(Ci.fuelIApplication);
+const storage = Cc["@mozilla.org/fuel/application;1"].getService(Ci.fuelIApplication).storage;
 
 function httpGet(url) {
     let xmlhttp = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"].createInstance(Ci.nsIXMLHttpRequest);
@@ -41,6 +41,7 @@ let addon = null;
 let basePath = null;
 let components = {};
 let getURI = null;
+var JSMLoader = storage.get("dactyl.JSMLoader", { get load() Cu.import });
 
 function startup(data, reason) {
     dump("dactyl: bootstrap: startup " + reasonToString(reason) + "\n");
@@ -87,12 +88,12 @@ FactoryProxy.prototype = {
     },
     unregister: function () {
         dump("dactyl: bootstrap: unregister: " + this.classID + " " + this.contractID + "\n");
-        manager.unregisterFactory(this.classID,
-                                  this);
+        manager.unregisterFactory(this.classID, this);
     },
     get module() {
         Object.defineProperty(this, "module", { value: {}, enumerable: true });
-        Cu.import(this.url, this.module);
+        JSMLoader.load(this.url, this.module);
+        JSMLoader.registerGlobal(this.url, this.module.NSGetFactory);
         return this.module;
     },
     createInstance: function (iids) {
@@ -138,7 +139,6 @@ function init() {
             break;
         case "contract":
             components[fields[2]].contractID = fields[1];
-            components[fields[2]].register();
             break;
 
         case "resource":
@@ -146,11 +146,13 @@ function init() {
         }
     }
 
-    Cc["@dactyl.googlecode.com/base/xpc-interface-shim"].createInstance()
-
     Services.obs.notifyObservers(null, "dactyl-rehash", null);
 
-    Cu.import("resource://dactyl/base.jsm");
+    JSMLoader.load("resource://dactyl/base.jsm", global);
+
+    for each (let component in components)
+        component.register();
+
     require(global, "prefs");
     require(global, "services");
 
diff --git a/common/components/commandline-handler.js b/common/components/commandline-handler.js
index 3083af0f..cee31646 100644
--- a/common/components/commandline-handler.js
+++ b/common/components/commandline-handler.js
@@ -4,14 +4,14 @@
 // given in the LICENSE.txt file included with this file.
 "use strict";
 
-const Ci = Components.interfaces, Cc = Components.classes;
+var Ci = Components.interfaces, Cc = Components.classes;
 
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 
-const prefs = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefService)
+var prefs = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefService)
     .getBranch("extensions.dactyl.");
-const appName = prefs.getComplexValue("appName", Ci.nsISupportsString).data;
-const name = prefs.getComplexValue("name", Ci.nsISupportsString).data;
+var appName = prefs.getComplexValue("appName", Ci.nsISupportsString).data;
+var name = prefs.getComplexValue("name", Ci.nsISupportsString).data;
 
 function CommandLineHandler() {
     this.wrappedJSObject = this;
@@ -45,9 +45,9 @@ CommandLineHandler.prototype = {
 };
 
 if (XPCOMUtils.generateNSGetFactory)
-    const NSGetFactory = XPCOMUtils.generateNSGetFactory([CommandLineHandler]);
+    var NSGetFactory = XPCOMUtils.generateNSGetFactory([CommandLineHandler]);
 else
-    const NSGetModule = XPCOMUtils.generateNSGetModule([CommandLineHandler]);
+    var NSGetModule = XPCOMUtils.generateNSGetModule([CommandLineHandler]);
 var EXPORTED_SYMBOLS = ["NSGetFactory"];
 
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/common/components/protocols.js b/common/components/protocols.js
index 8b8069a5..ba89090b 100644
--- a/common/components/protocols.js
+++ b/common/components/protocols.js
@@ -12,16 +12,16 @@
  * By Kris Maglione, ideas from Ed Anuff's nsChromeExtensionHandler.
  */
 
-const NAME = "protocols";
-const global = this;
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cu = Components.utils;
+var NAME = "protocols";
+var global = this;
+var Cc = Components.classes;
+var Ci = Components.interfaces;
+var Cu = Components.utils;
 
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 
-const ioService = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
-const systemPrincipal = Cc["@mozilla.org/systemprincipal;1"].getService(Ci.nsIPrincipal);
+var ioService = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
+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) {
@@ -204,9 +204,9 @@ Shim.prototype = {
 };
 
 if (XPCOMUtils.generateNSGetFactory)
-    const NSGetFactory = XPCOMUtils.generateNSGetFactory([AboutHandler, ChromeData, Dactyl, Shim]);
+    var NSGetFactory = XPCOMUtils.generateNSGetFactory([AboutHandler, ChromeData, Dactyl, Shim]);
 else
-    const NSGetModule = XPCOMUtils.generateNSGetModule([AboutHandler, ChromeData, Dactyl, Shim]);
+    var NSGetModule = XPCOMUtils.generateNSGetModule([AboutHandler, ChromeData, Dactyl, Shim]);
 var EXPORTED_SYMBOLS = ["NSGetFactory"];
 
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/common/modules/base.jsm b/common/modules/base.jsm
index 7d393be2..6f3a27db 100644
--- a/common/modules/base.jsm
+++ b/common/modules/base.jsm
@@ -4,10 +4,49 @@
 // given in the LICENSE.txt file included with this file.
 "use strict";
 
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cr = Components.results;
-const Cu = Components.utils;
+if (!JSMLoader)
+    var JSMLoader = {
+        builtin: Components.utils.Sandbox(this),
+        globals: {},
+        stale: {},
+        load: function load(url, target) {
+            dump("dactyl: load: " + url + "\n");
+            if (this.stale[url]) {
+                delete this.stale[url];
+                dump("dactyl: load stale\n");
+
+                let global = this.globals[url];
+                for each (let prop in Object.getOwnPropertyNames(global))
+                    try {
+                        if (!set.has(this.builtin, prop) && global[prop] != this && global[prop] != set)
+                            delete global[prop]
+                    }
+                    catch (e) {}
+
+                Components.classes["@mozilla.org/moz/jssubscript-loader;1"]
+                          .getService(Components.interfaces.mozIJSSubScriptLoader)
+                          .loadSubScript(url, this.globals[url]);
+                dump("dactyl: load reloaded: " + url + "\n");
+            }
+            Components.utils.import(url, target);
+        },
+        purge: function purge() {
+            for (let [url, global] in Iterator(this.globals))
+                this.stale[url] = true;
+        },
+        registerGlobal: function registerGlobal(uri, obj) {
+            if (Cu.getGlobalForObject)
+                this.globals[uri] = Cu.getGlobalForObject(obj);
+        }
+    };
+
+var Cc = Components.classes;
+var Ci = Components.interfaces;
+var Cr = Components.results;
+var Cu = Components.utils;
+
+Cc["@mozilla.org/fuel/application;1"].getService(Ci.fuelIApplication)
+    .storage.set("dactyl.JSMLoader", JSMLoader);
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 try {
@@ -98,7 +137,8 @@ let loaded = {};
 let currentModule;
 function defineModule(name, params) {
     let module = Cu.getGlobalForObject ? Cu.getGlobalForObject(params) : params.__parent__;
-    defineModule.globals.push(module);
+    JSMLoader.registerGlobal(Components.stack.caller.filename, module);
+
     module.NAME = name;
     module.EXPORTED_SYMBOLS = params.exports || [];
     defineModule.loadLog.push("defineModule " + name);
@@ -115,7 +155,6 @@ function defineModule(name, params) {
     currentModule = module;
 }
 
-defineModule.globals = [];
 defineModule.loadLog = [];
 Object.defineProperty(defineModule.loadLog, "push", {
     value: function (val) { defineModule.dump(val + "\n"); this[this.length] = val; }
@@ -162,7 +201,7 @@ function endModule() {
 function require(obj, name, from) {
     try {
         defineModule.loadLog.push((from || "require") + ": loading " + name + " into " + obj.NAME);
-        Cu.import("resource://dactyl/" + name + ".jsm", obj);
+        JSMLoader.load("resource://dactyl/" + name + ".jsm", obj);
     }
     catch (e) {
         defineModule.dump("loading " + String.quote("resource://dactyl/" + name + ".jsm") + "\n");
@@ -176,7 +215,7 @@ function require(obj, name, from) {
 defineModule("base", {
     // sed -n 's/^(const|function) ([a-zA-Z0-9_]+).*/	"\2",/p' base.jsm | sort | fmt
     exports: [
-        "ErrorBase", "Cc", "Ci", "Class", "Cr", "Cu", "Module", "Object", "Runnable",
+        "ErrorBase", "Cc", "Ci", "Class", "Cr", "Cu", "Module", "JSMLoader", "Object", "Runnable",
         "Struct", "StructBase", "Timer", "UTF8", "XPCOM", "XPCOMUtils", "array",
         "call", "callable", "ctypes", "curry", "debuggerProperties", "defineModule",
         "deprecated", "endModule", "forEach", "isArray", "isGenerator",
@@ -478,7 +517,7 @@ function isSubclass(targ, src) {
  * @param {object|string|[object|string]} src The types to check targ against.
  * @returns {boolean}
  */
-const isinstance_types = {
+var isinstance_types = {
     boolean: Boolean,
     string: String,
     function: Function,
@@ -513,7 +552,7 @@ function isObject(obj) typeof obj === "object" && obj != null || obj instanceof
  * any window, frame, namespace, or execution context, which
  * is not the case when using (obj instanceof Array).
  */
-const isArray =
+var isArray =
     Array.isArray
         // This is bloody stupid.
         ? function isArray(val) Array.isArray(val) || val && val.constructor && val.constructor.name === "Array"
@@ -617,7 +656,7 @@ sandbox.__proto__ = this;
  * is prepended to its arguments.
  */
 // Hack to get around lack of access to caller in strict mode.
-const withCallerGlobal = Cu.evalInSandbox(<![CDATA[
+var withCallerGlobal = Cu.evalInSandbox(<![CDATA[
     (function withCallerGlobal(fn)
         function withCallerGlobal_wrapped()
             fn.apply(this,
@@ -860,7 +899,7 @@ function XPCOM(interfaces, superClass) {
 /**
  * An abstract base class for classes that wish to inherit from Error.
  */
-const ErrorBase = Class("ErrorBase", Error, {
+var ErrorBase = Class("ErrorBase", Error, {
     level: 2,
     init: function (message, level) {
         level = level || 0;
@@ -980,7 +1019,7 @@ let StructBase = Class("StructBase", Array, {
     }
 });
 
-const Timer = Class("Timer", {
+var Timer = Class("Timer", {
     init: function (minInterval, maxInterval, callback) {
         this._timer = services.Timer();
         this.callback = callback;
@@ -1056,7 +1095,7 @@ function octal(decimal) parseInt(decimal, 8);
 /**
  * Array utility methods.
  */
-const array = Class("array", Array, {
+var array = Class("array", Array, {
     init: function (ary) {
         if (isinstance(ary, ["Iterator", "Generator"]) || "__iterator__" in ary)
             ary = [k for (k in ary)];
diff --git a/common/modules/bookmarkcache.jsm b/common/modules/bookmarkcache.jsm
index e230a077..faa37313 100644
--- a/common/modules/bookmarkcache.jsm
+++ b/common/modules/bookmarkcache.jsm
@@ -10,8 +10,8 @@ defineModule("bookmarkcache", {
     require: ["services", "storage", "util"]
 });
 
-const Bookmark = Struct("url", "title", "icon", "post", "keyword", "tags", "id");
-const Keyword = Struct("keyword", "title", "icon", "url");
+var Bookmark = Struct("url", "title", "icon", "post", "keyword", "tags", "id");
+var Keyword = Struct("keyword", "title", "icon", "url");
 Bookmark.defaultValue("icon", function () BookmarkCache.getFavicon(this.url));
 Bookmark.setter = function (key, func) this.prototype.__defineSetter__(key, func);
 Bookmark.prototype.__defineGetter__("extra", function () [
@@ -33,9 +33,9 @@ Bookmark.setter("tags", function (val) {
         services.tagging.tagURI(this.uri, val);
 });
 
-const name = "bookmark-cache";
+var name = "bookmark-cache";
 
-const BookmarkCache = Module("BookmarkCache", XPCOM(Ci.nsINavBookmarkObserver), {
+var BookmarkCache = Module("BookmarkCache", XPCOM(Ci.nsINavBookmarkObserver), {
     POST: "bookmarkProperties/POSTData",
 
     init: function init() {
diff --git a/common/modules/highlight.jsm b/common/modules/highlight.jsm
index ebd15571..fd8d0709 100644
--- a/common/modules/highlight.jsm
+++ b/common/modules/highlight.jsm
@@ -11,9 +11,9 @@ defineModule("highlight", {
     use: ["template", "util"]
 });
 
-const Highlight = Struct("class", "selector", "sites",
-                         "default", "value", "agent",
-                         "base", "baseClass", "style");
+var Highlight = Struct("class", "selector", "sites",
+                       "default", "value", "agent",
+                       "base", "baseClass", "style");
 Highlight.liveProperty = function (name, prop) {
     let i = this.prototype.members[name];
     this.prototype.__defineGetter__(name, function () this[i]);
@@ -52,7 +52,7 @@ Highlight.prototype.toString = function ()
  *
  * @author Kris Maglione <maglione.k@gmail.com>
  */
-const Highlights = Module("Highlight", {
+var Highlights = Module("Highlight", {
     init: function () {
         this.highlight = {};
         this.loaded = {};
diff --git a/common/modules/overlay.jsm b/common/modules/overlay.jsm
index c7217174..37aaf98d 100644
--- a/common/modules/overlay.jsm
+++ b/common/modules/overlay.jsm
@@ -14,7 +14,7 @@ defineModule("overlay", {
  * @class ModuleBase
  * The base class for all modules.
  */
-const ModuleBase = Class("ModuleBase", {
+var ModuleBase = Class("ModuleBase", {
     /**
      * @property {[string]} A list of module prerequisites which
      * must be initialized before this module is loaded.
@@ -24,7 +24,7 @@ const ModuleBase = Class("ModuleBase", {
     toString: function () "[module " + this.constructor.className + "]"
 });
 
-const Overlay = Module("Overlay", {
+var Overlay = Module("Overlay", {
     init: function () {
         util.overlayWindow("chrome://browser/content/browser.xul", function (window) ({
             init: function (document) {
diff --git a/common/modules/prefs.jsm b/common/modules/prefs.jsm
index 63ebac52..c948dca9 100644
--- a/common/modules/prefs.jsm
+++ b/common/modules/prefs.jsm
@@ -13,7 +13,7 @@ defineModule("prefs", {
     use: ["template"]
 });
 
-const Prefs = Module("prefs", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]), {
+var Prefs = Module("prefs", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]), {
     SAVED: "extensions.dactyl.saved.",
     RESTORE: "extensions.dactyl.restore.",
 
diff --git a/common/modules/sanitizer.jsm b/common/modules/sanitizer.jsm
index 13274585..f9141d2c 100644
--- a/common/modules/sanitizer.jsm
+++ b/common/modules/sanitizer.jsm
@@ -24,7 +24,7 @@ let tmp = {};
 services.subscriptLoader.loadSubScript("chrome://browser/content/sanitize.js", tmp);
 tmp.Sanitizer.prototype.__proto__ = Class.prototype;
 
-const Range = Struct("min", "max");
+var Range = Struct("min", "max");
 Range.prototype.contains = function (date)
     date == null || (this.min == null || date >= this.min) && (this.max == null || date <= this.max);
 Range.prototype.__defineGetter__("isEternity", function () this.max == null && this.min == null);
@@ -33,7 +33,7 @@ Range.prototype.__defineGetter__("native", function ()
     this.isEternity ? null : [range.min || 0, range.max == null ? Number.MAX_VALUE : range.max]);
 
 
-const Item = Class("Item", {
+var Item = Class("Item", {
     init: function (name) {
         this.name = name;
     },
@@ -55,7 +55,7 @@ const Item = Class("Item", {
     SHUTDOWN_BRANCH: "privacy.clearOnShutdown."
 });
 
-const Sanitizer = Module("sanitizer", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference], tmp.Sanitizer), {
+var Sanitizer = Module("sanitizer", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference], tmp.Sanitizer), {
     sessionStart: Date.now() * 1000,
 
     init: function () {
diff --git a/common/modules/services.jsm b/common/modules/services.jsm
index d8cad7e0..da3faf17 100644
--- a/common/modules/services.jsm
+++ b/common/modules/services.jsm
@@ -14,7 +14,7 @@ defineModule("services", {
 /**
  * A lazily-instantiated XPCOM class and service cache.
  */
-const Services = Module("Services", {
+var Services = Module("Services", {
     init: function () {
         this.classes = {};
         this.services = {};
diff --git a/common/modules/storage.jsm b/common/modules/storage.jsm
index 6e06377b..bb18bf0e 100644
--- a/common/modules/storage.jsm
+++ b/common/modules/storage.jsm
@@ -7,14 +7,14 @@
 if (this.XPCSafeJSObjectWrapper == null)
     this.XPCSafeJSObjectWrapper = XPCNativeWrapper;
 
-const myObject = Object;
+var myObject = Object;
 Components.utils.import("resource://dactyl/base.jsm");
 defineModule("storage", {
     exports: ["File", "storage"],
     require: ["services", "util"]
 });
 
-const win32 = /^win(32|nt)$/i.test(services.runtime.OS);
+var win32 = /^win(32|nt)$/i.test(services.runtime.OS);
 
 function loadData(name, store, type) {
     try {
@@ -33,7 +33,7 @@ function saveData(obj) {
         storage.infoPath.child(obj.name).write(obj.serial);
 }
 
-const StoreBase = Class("StoreBase", {
+var StoreBase = Class("StoreBase", {
     OPTIONS: ["privateData", "replacer"],
 
     fireEvent: function (event, arg) { storage.fireEvent(this.name, event, arg); },
@@ -61,7 +61,7 @@ const StoreBase = Class("StoreBase", {
     save: function () { saveData(this); },
 });
 
-const ArrayStore = Class("ArrayStore", StoreBase, {
+var ArrayStore = Class("ArrayStore", StoreBase, {
     _constructor: Array,
 
     get length() this._object.length,
@@ -107,7 +107,7 @@ const ArrayStore = Class("ArrayStore", StoreBase, {
     __iterator__: function () Iterator(this._object),
 });
 
-const ObjectStore = Class("ObjectStore", StoreBase, {
+var ObjectStore = Class("ObjectStore", StoreBase, {
     _constructor: myObject,
 
     clear: function () {
@@ -142,7 +142,7 @@ const ObjectStore = Class("ObjectStore", StoreBase, {
     __iterator__: function () Iterator(this._object),
 });
 
-const Storage = Module("Storage", {
+var Storage = Module("Storage", {
     alwaysReload: {},
 
     init: function () {
@@ -269,7 +269,7 @@ const Storage = Module("Storage", {
  * @param {boolean} checkPWD Whether to allow expansion relative to the
  *          current directory. @default true
  */
-const File = Class("File", {
+var File = Class("File", {
     init: function (path, checkPWD) {
         let file = services.File();
 
diff --git a/common/modules/styles.jsm b/common/modules/styles.jsm
index 1049b899..bb4f0f03 100644
--- a/common/modules/styles.jsm
+++ b/common/modules/styles.jsm
@@ -12,11 +12,11 @@ defineModule("styles", {
 });
 
 function cssUri(css) "chrome-data:text/css," + encodeURI(css);
-const namespace = "@namespace html " + XHTML.uri.quote() + ";\n" +
+var namespace = "@namespace html " + XHTML.uri.quote() + ";\n" +
                   "@namespace xul " + XUL.uri.quote() + ";\n" +
                   "@namespace dactyl " + NS.uri.quote() + ";\n";
 
-const Sheet = Struct("name", "id", "sites", "css", "hive", "agent");
+var Sheet = Struct("name", "id", "sites", "css", "hive", "agent");
 Sheet.liveProperty = function (name) {
     let i = this.prototype.members[name];
     this.prototype.__defineGetter__(name, function () this[i]);
@@ -73,7 +73,7 @@ update(Sheet.prototype, {
     }
 });
 
-const Hive = Class("Hive", {
+var Hive = Class("Hive", {
     init: function () {
         this.sheets = [];
         this.names = {};
@@ -212,7 +212,7 @@ const Hive = Class("Hive", {
  *
  * @author Kris Maglione <maglione.k@gmail.com>
  */
-const Styles = Module("Styles", {
+var Styles = Module("Styles", {
     init: function () {
         this._id = 0;
         this.user = Hive();
diff --git a/common/modules/template.jsm b/common/modules/template.jsm
index 4bcfeee3..0a4652fc 100644
--- a/common/modules/template.jsm
+++ b/common/modules/template.jsm
@@ -13,7 +13,7 @@ defineModule("template", {
 
 default xml namespace = XHTML;
 
-const Template = Module("Template", {
+var Template = Module("Template", {
     add: function add(a, b) a + b,
     join: function join(c) function (a, b) a + c + b,
 
diff --git a/common/modules/util.jsm b/common/modules/util.jsm
index 88f2de29..26e56e7a 100644
--- a/common/modules/util.jsm
+++ b/common/modules/util.jsm
@@ -15,10 +15,10 @@ defineModule("util", {
     use: ["highlight", "storage", "template"]
 });
 
-const XBL = Namespace("xbl", "http://www.mozilla.org/xbl");
-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");
+var XBL = Namespace("xbl", "http://www.mozilla.org/xbl");
+var XHTML = Namespace("html", "http://www.w3.org/1999/xhtml");
+var XUL = Namespace("xul", "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+var NS = Namespace("dactyl", "http://vimperator.org/namespaces/liberator");
 default xml namespace = XHTML;
 
 memoize(this, "Commands", function () {
@@ -28,7 +28,7 @@ memoize(this, "Commands", function () {
     return obj.Commands;
 });
 
-const FailedAssertion = Class("FailedAssertion", ErrorBase);
+var FailedAssertion = Class("FailedAssertion", ErrorBase);
 
 function wrapCallback(fn)
     fn.wrapper = function wrappedCallback () {
@@ -41,7 +41,7 @@ function wrapCallback(fn)
         }
     }
 
-const Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]), {
+var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]), {
     init: function () {
         this.Array = array;
 
@@ -920,13 +920,16 @@ const Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
             services.observer.removeObserver(this, "dactyl-rehash");
 
             util.dump("dactyl: util: observe: dactyl-rehash");
-            for (let module in values(defineModule.modules)) {
-                util.dump("dactyl: util: init(" + module + ")");
-                if (module.reinit)
-                    module.reinit();
-                else
-                    module.init();
-            }
+            if (true)
+                JSMLoader.purge();
+            else
+                for (let module in values(defineModule.modules)) {
+                    util.dump("dactyl: util: init(" + module + ")");
+                    if (module.reinit)
+                        module.reinit();
+                    else
+                        module.init();
+                }
         },
         "toplevel-window-ready": function (window, data) {
             window.addEventListener("DOMContentLoaded", wrapCallback(function listener(event) {
@@ -1427,7 +1430,7 @@ const Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
  * Math utility methods.
  * @singleton
  */
-const GlobalMath = Math;
+var GlobalMath = Math;
 var Math = update(Object.create(GlobalMath), {
     /**
      * Returns the specified *value* constrained to the range *min* - *max*.

From 8da718d47b7823678621527af304475709439bc6 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Sat, 25 Dec 2010 09:46:07 -0500
Subject: [PATCH 16/35] [bootstrap] Add a :rehash (temporarily undocumented)
 command.

--HG--
branch : bootstrapped
---
 common/bootstrap.js           |  2 ++
 common/content/commandline.js |  4 ++++
 common/content/dactyl.js      |  7 +++++--
 common/modules/services.jsm   |  1 +
 common/modules/util.jsm       | 12 +++++++++++-
 5 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/common/bootstrap.js b/common/bootstrap.js
index 68954ad9..a3f2ac97 100755
--- a/common/bootstrap.js
+++ b/common/bootstrap.js
@@ -41,6 +41,7 @@ let addon = null;
 let basePath = null;
 let components = {};
 let getURI = null;
+storage.set("dactyl.bootstrap", this);
 var JSMLoader = storage.get("dactyl.JSMLoader", { get load() Cu.import });
 
 function startup(data, reason) {
@@ -53,6 +54,7 @@ function startup(data, reason) {
         dump("dactyl: bootstrap: init" + " " + data.id + "\n");
 
         addon = data;
+        AddonManager.getAddonByID(addon.id, function (a) { addon = a });
 
         if (basePath.isDirectory())
             getURI = function getURI(path) {
diff --git a/common/content/commandline.js b/common/content/commandline.js
index 3498ca1b..eb79c3ef 100644
--- a/common/content/commandline.js
+++ b/common/content/commandline.js
@@ -255,6 +255,8 @@ const CommandWidgets = Class("CommandWidgets", {
         let elem = this.multilineOutput;
         elem.contentWindow.addEventListener("unload", function (event) { event.preventDefault(); }, true);
         elem.contentDocument.body.id = "dactyl-multiline-output-content";
+        elem.__defineGetter__("atEnd", function ()
+            !Buffer.isScrollable(elem.contentDocument.documentElement, 1));
 
         ["copy", "copylink", "selectall"].forEach(function (tail) {
             // some host apps use "hostPrefixContext-copy" ids
@@ -617,6 +619,8 @@ const CommandLine = Module("commandline", {
             this.widgets.message = null;
         if (modes.main != modes.COMMAND_LINE)
             this.widgets.command = null;
+        if ((modes.extended & modes.OUTPUT_MULTILINE) && this.widgets.multilineOutput.atEnd)
+            modes.pop();
         if (modes.extended != modes.OUTPUT_MULTILINE)
             this.multilineOutputVisible = false;
     },
diff --git a/common/content/dactyl.js b/common/content/dactyl.js
index 3afd5310..3d1fae24 100644
--- a/common/content/dactyl.js
+++ b/common/content/dactyl.js
@@ -1865,10 +1865,13 @@ const Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase),
                 bang: true
             });
 
+        commands.add(["reh[ash]"],
+            "Reload the " + config.appName + " add-on",
+            function () { util.rehash(); });
+
         commands.add(["res[tart]"],
             "Force " + config.appName + " to restart",
-            function () { dactyl.restart(); },
-            { argCount: "0" });
+            function () { dactyl.restart(); });
 
         var toolbox = document.getElementById("navigator-toolbox");
         if (toolbox) {
diff --git a/common/modules/services.jsm b/common/modules/services.jsm
index da3faf17..d9d4ad91 100644
--- a/common/modules/services.jsm
+++ b/common/modules/services.jsm
@@ -36,6 +36,7 @@ var Services = Module("Services", {
         this.add("extensionManager",    "@mozilla.org/extensions/manager;1",                Ci.nsIExtensionManager);
         this.add("favicon",             "@mozilla.org/browser/favicon-service;1",           Ci.nsIFaviconService);
         this.add("focus",               "@mozilla.org/focus-manager;1",                     Ci.nsIFocusManager);
+        this.add("fuel",                "@mozilla.org/fuel/application;1",                  Ci.fuelIApplication);
         this.add("history",             "@mozilla.org/browser/global-history;2",            [Ci.nsIBrowserHistory, Ci.nsIGlobalHistory3,
                                                                                              Ci.nsINavHistoryService, Ci.nsPIPlacesDatabase]);
         this.add("io",                  "@mozilla.org/network/io-service;1",                Ci.nsIIOService);
diff --git a/common/modules/util.jsm b/common/modules/util.jsm
index 26e56e7a..82bb0009 100644
--- a/common/modules/util.jsm
+++ b/common/modules/util.jsm
@@ -59,6 +59,8 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
         }
     },
 
+    get addon() services.fuel.storage.get("dactyl.bootstrap", null).addon,
+
     // FIXME: Only works for Pentadactyl
     get activeWindow() services.windowMediator.getMostRecentWindow("navigator:browser"),
     dactyl: update(function dactyl(obj) {
@@ -920,7 +922,7 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
             services.observer.removeObserver(this, "dactyl-rehash");
 
             util.dump("dactyl: util: observe: dactyl-rehash");
-            if (true)
+            if (this.rehashing)
                 JSMLoader.purge();
             else
                 for (let module in values(defineModule.modules)) {
@@ -1144,6 +1146,14 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
         getSource: function regexp_getSource(re) re.source.replace(/\\(.)/g, function (m0, m1) m1 === "/" ? "/" : m0)
     }),
 
+    rehash: function () {
+        this.rehashing = true;
+        this.addon.userDisabled = true;
+        this.timeout(function () {
+            this.addon.userDisabled = false;
+        });
+    },
+
     maxErrors: 15,
     errors: Class.memoize(function () []),
     reportError: function (error) {

From 203f8799daec3c37059f163b36f29a2a3347200f Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Sat, 25 Dec 2010 13:13:10 -0500
Subject: [PATCH 17/35] [bootstrap] Fix stupid bug.

--HG--
branch : bootstrapped
---
 common/bootstrap.js                      |  2 +-
 common/components/commandline-handler.js |  7 +++++--
 common/components/protocols.js           |  2 +-
 common/content/dactyl.js                 | 18 ++++++++++--------
 common/modules/base.jsm                  |  6 +++---
 5 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/common/bootstrap.js b/common/bootstrap.js
index a3f2ac97..a438a7ff 100755
--- a/common/bootstrap.js
+++ b/common/bootstrap.js
@@ -95,7 +95,7 @@ FactoryProxy.prototype = {
     get module() {
         Object.defineProperty(this, "module", { value: {}, enumerable: true });
         JSMLoader.load(this.url, this.module);
-        JSMLoader.registerGlobal(this.url, this.module.NSGetFactory);
+        JSMLoader.registerGlobal(this.url, this.module.global);
         return this.module;
     },
     createInstance: function (iids) {
diff --git a/common/components/commandline-handler.js b/common/components/commandline-handler.js
index cee31646..6998b34d 100644
--- a/common/components/commandline-handler.js
+++ b/common/components/commandline-handler.js
@@ -4,7 +4,10 @@
 // given in the LICENSE.txt file included with this file.
 "use strict";
 
-var Ci = Components.interfaces, Cc = Components.classes;
+var global = this;
+var Cc = Components.classes;
+var Ci = Components.interfaces;
+var Cu = Components.utils;
 
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 
@@ -48,6 +51,6 @@ if (XPCOMUtils.generateNSGetFactory)
     var NSGetFactory = XPCOMUtils.generateNSGetFactory([CommandLineHandler]);
 else
     var NSGetModule = XPCOMUtils.generateNSGetModule([CommandLineHandler]);
-var EXPORTED_SYMBOLS = ["NSGetFactory"];
+var EXPORTED_SYMBOLS = ["NSGetFactory", "global"];
 
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/common/components/protocols.js b/common/components/protocols.js
index ba89090b..621403e4 100644
--- a/common/components/protocols.js
+++ b/common/components/protocols.js
@@ -207,6 +207,6 @@ if (XPCOMUtils.generateNSGetFactory)
     var NSGetFactory = XPCOMUtils.generateNSGetFactory([AboutHandler, ChromeData, Dactyl, Shim]);
 else
     var NSGetModule = XPCOMUtils.generateNSGetModule([AboutHandler, ChromeData, Dactyl, Shim]);
-var EXPORTED_SYMBOLS = ["NSGetFactory"];
+var EXPORTED_SYMBOLS = ["NSGetFactory", "global"];
 
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/common/content/dactyl.js b/common/content/dactyl.js
index 3d1fae24..09d2aec5 100644
--- a/common/content/dactyl.js
+++ b/common/content/dactyl.js
@@ -2096,14 +2096,16 @@ const Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase),
         if (!services.commandLineHandler)
             services.add("commandLineHandler", "@mozilla.org/commandlinehandler/general-startup;1?type=" + config.name);
 
-        let commandline = services.commandLineHandler.optionValue;
-        if (commandline) {
-            let args = dactyl.parseCommandLine(commandline);
-            dactyl.commandLineOptions.rcFile = args["+u"];
-            dactyl.commandLineOptions.noPlugins = "++noplugin" in args;
-            dactyl.commandLineOptions.postCommands = args["+c"];
-            dactyl.commandLineOptions.preCommands = args["++cmd"];
-            util.dump("Processing command-line option: " + commandline);
+        if (services.commandlinehandler) {
+            let commandline = services.commandLineHandler.optionValue;
+            if (commandline) {
+                let args = dactyl.parseCommandLine(commandline);
+                dactyl.commandLineOptions.rcFile = args["+u"];
+                dactyl.commandLineOptions.noPlugins = "++noplugin" in args;
+                dactyl.commandLineOptions.postCommands = args["+c"];
+                dactyl.commandLineOptions.preCommands = args["++cmd"];
+                util.dump("Processing command-line option: " + commandline);
+            }
         }
 
         dactyl.log("Command-line options: " + util.objectToString(dactyl.commandLineOptions), 3);
diff --git a/common/modules/base.jsm b/common/modules/base.jsm
index 6f3a27db..bc2c186c 100644
--- a/common/modules/base.jsm
+++ b/common/modules/base.jsm
@@ -18,8 +18,8 @@ if (!JSMLoader)
                 let global = this.globals[url];
                 for each (let prop in Object.getOwnPropertyNames(global))
                     try {
-                        if (!set.has(this.builtin, prop) && global[prop] != this && global[prop] != set)
-                            delete global[prop]
+                        if (!set.has(this.builtin, prop) && [this, set].indexOf(global[prop]) < 0)
+                            delete global[prop];
                     }
                     catch (e) {}
 
@@ -36,7 +36,7 @@ if (!JSMLoader)
         },
         registerGlobal: function registerGlobal(uri, obj) {
             if (Cu.getGlobalForObject)
-                this.globals[uri] = Cu.getGlobalForObject(obj);
+                this.globals[uri.replace(/.* -> /, "")] = Cu.getGlobalForObject(obj);
         }
     };
 

From 1653ff509d1fa5dccc07088ca25a7b8b66059539 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Sat, 25 Dec 2010 15:54:37 -0500
Subject: [PATCH 18/35] Fix some subtle rehashing bugs.

--HG--
branch : bootstrapped
---
 common/content/abbreviations.js |  4 +--
 common/content/autocommands.js  |  4 +--
 common/content/bookmarks.js     |  4 +--
 common/content/browser.js       |  2 +-
 common/content/buffer.js        |  4 +--
 common/content/commandline.js   |  6 ++--
 common/content/commands.js      | 10 +++----
 common/content/completion.js    |  4 +--
 common/content/configbase.js    |  2 +-
 common/content/dactyl.js        | 23 +++++++++------
 common/content/editor.js        |  2 +-
 common/content/events.js        |  2 +-
 common/content/finder.js        |  4 +--
 common/content/hints.js         |  2 +-
 common/content/history.js       |  2 +-
 common/content/io.js            |  2 +-
 common/content/javascript.js    |  2 +-
 common/content/mappings.js      |  4 +--
 common/content/marks.js         |  2 +-
 common/content/modes.js         |  2 +-
 common/content/options.js       |  4 +--
 common/content/quickmarks.js    |  2 +-
 common/content/statusline.js    |  2 +-
 common/content/tabs.js          |  2 +-
 common/modules/base.jsm         | 21 ++++++++------
 common/modules/util.jsm         | 50 ++++++++++++++++++++++-----------
 26 files changed, 97 insertions(+), 71 deletions(-)

diff --git a/common/content/abbreviations.js b/common/content/abbreviations.js
index 09097e0a..1b3f76a3 100644
--- a/common/content/abbreviations.js
+++ b/common/content/abbreviations.js
@@ -8,7 +8,7 @@
 
 /** @scope modules */
 
-const Abbreviation = Class("Abbreviation", {
+var Abbreviation = Class("Abbreviation", {
     init: function (modes, lhs, rhs) {
         this.modes = modes.sort();
         this.lhs = lhs;
@@ -41,7 +41,7 @@ const Abbreviation = Class("Abbreviation", {
     }
 });
 
-const Abbreviations = Module("abbreviations", {
+var Abbreviations = Module("abbreviations", {
     init: function () {
         this.abbrevs = {};
 
diff --git a/common/content/autocommands.js b/common/content/autocommands.js
index 66a66f73..802b1ecd 100644
--- a/common/content/autocommands.js
+++ b/common/content/autocommands.js
@@ -8,12 +8,12 @@
 
 /** @scope modules */
 
-const AutoCommand = Struct("event", "pattern", "command");
+var AutoCommand = Struct("event", "pattern", "command");
 
 /**
  * @instance autocommands
  */
-const AutoCommands = Module("autocommands", {
+var AutoCommands = Module("autocommands", {
     init: function () {
         this._store = [];
     },
diff --git a/common/content/bookmarks.js b/common/content/bookmarks.js
index 440a65eb..b6643e87 100644
--- a/common/content/bookmarks.js
+++ b/common/content/bookmarks.js
@@ -6,10 +6,10 @@
 // given in the LICENSE.txt file included with this file.
 "use strict";
 
-const DEFAULT_FAVICON = "chrome://mozapps/skin/places/defaultFavicon.png";
+var DEFAULT_FAVICON = "chrome://mozapps/skin/places/defaultFavicon.png";
 
 // also includes methods for dealing with keywords and search engines
-const Bookmarks = Module("bookmarks", {
+var Bookmarks = Module("bookmarks", {
     init: function () {
         storage.addObserver("bookmark-cache", function (key, event, arg) {
             if (["add", "change", "remove"].indexOf(event) >= 0)
diff --git a/common/content/browser.js b/common/content/browser.js
index 7bc25097..6ceef9bf 100644
--- a/common/content/browser.js
+++ b/common/content/browser.js
@@ -11,7 +11,7 @@
 /**
  * @instance browser
  */
-const Browser = Module("browser", {
+var Browser = Module("browser", {
 }, {
     climbUrlPath: function (count) {
         let url = util.newURI(buffer.URL);
diff --git a/common/content/buffer.js b/common/content/buffer.js
index 04dc93ed..5c2f0c97 100644
--- a/common/content/buffer.js
+++ b/common/content/buffer.js
@@ -8,7 +8,7 @@
 
 /** @scope modules */
 
-const Point = Struct("x", "y");
+var Point = Struct("x", "y");
 
 /**
  * A class to manage the primary web content buffer. The name comes
@@ -16,7 +16,7 @@ const Point = Struct("x", "y");
  * files.
  * @instance buffer
  */
-const Buffer = Module("buffer", {
+var Buffer = Module("buffer", {
     init: function () {
         this.evaluateXPath = util.evaluateXPath;
         this.pageInfo = {};
diff --git a/common/content/commandline.js b/common/content/commandline.js
index 762edde8..6dd3e67d 100644
--- a/common/content/commandline.js
+++ b/common/content/commandline.js
@@ -8,7 +8,7 @@
 
 /** @scope modules */
 
-const CommandWidgets = Class("CommandWidgets", {
+var CommandWidgets = Class("CommandWidgets", {
     init: function () {
         let _commandline = "if (window.dactyl) return dactyl.modules.commandline";
         let _status = "dactyl-statusline-field-";
@@ -281,7 +281,7 @@ const CommandWidgets = Class("CommandWidgets", {
  * It consists of a prompt and command field be sure to only create objects of
  * this class when the chrome is ready.
  */
-const CommandLine = Module("commandline", {
+var CommandLine = Module("commandline", {
     init: function () {
         const self = this;
 
@@ -1847,7 +1847,7 @@ const CommandLine = Module("commandline", {
  *     must be in its own container element, whose height it will update as
  *     necessary.
  */
-const ItemList = Class("ItemList", {
+var ItemList = Class("ItemList", {
     init: function (id) {
         this._completionElements = [];
 
diff --git a/common/content/commands.js b/common/content/commands.js
index c508757d..b650f464 100644
--- a/common/content/commands.js
+++ b/common/content/commands.js
@@ -35,12 +35,12 @@
  * @property {string} description A description of the option
  */
 
-const CommandOption = Struct("names", "type", "validator", "completer", "multiple", "description", "default");
+var CommandOption = Struct("names", "type", "validator", "completer", "multiple", "description", "default");
 CommandOption.defaultValue("description", function () "");
 CommandOption.defaultValue("type", function () CommandOption.NOARG);
 CommandOption.defaultValue("multiple", function () false);
 
-const ArgType = Struct("description", "parse");
+var ArgType = Struct("description", "parse");
 update(CommandOption, {
     /**
      * @property {object} The option argument is unspecified. Any argument
@@ -108,7 +108,7 @@ update(CommandOption, {
  * @optional
  * @private
  */
-const Command = Class("Command", {
+var Command = Class("Command", {
     init: function (specs, description, action, extraInfo) {
         specs = Array.concat(specs); // XXX
         let parsedSpecs = Command.parseSpecs(specs);
@@ -377,7 +377,7 @@ const Command = Class("Command", {
 });
 
 // Prototype.
-const ex = {
+var ex = {
     _args: function (cmd, args) {
         args = Array.slice(args);
 
@@ -427,7 +427,7 @@ const ex = {
 /**
  * @instance commands
  */
-const Commands = Module("commands", {
+var Commands = Module("commands", {
     init: function () {
         this._exCommands = [];
         this._exMap = {};
diff --git a/common/content/completion.js b/common/content/completion.js
index c58c604f..cc9d6bf1 100644
--- a/common/content/completion.js
+++ b/common/content/completion.js
@@ -26,7 +26,7 @@
  * @author Kris Maglione <maglione.k@gmail.com>
  * @constructor
  */
-const CompletionContext = Class("CompletionContext", {
+var CompletionContext = Class("CompletionContext", {
     init: function (editor, name, offset) {
         if (!name)
             name = "";
@@ -825,7 +825,7 @@ const CompletionContext = Class("CompletionContext", {
 /**
  * @instance completion
  */
-const Completion = Module("completion", {
+var Completion = Module("completion", {
     init: function () {
     },
 
diff --git a/common/content/configbase.js b/common/content/configbase.js
index 63ff9c75..6fb48960 100644
--- a/common/content/configbase.js
+++ b/common/content/configbase.js
@@ -6,7 +6,7 @@
 // given in the LICENSE.txt file included with this file.
 "use strict";
 
-const ConfigBase = Class(ModuleBase, {
+var ConfigBase = Class(ModuleBase, {
     /**
      * Called on dactyl startup to allow for any arbitrary application-specific
      * initialization code. Must call superclass's init function.
diff --git a/common/content/dactyl.js b/common/content/dactyl.js
index 09d2aec5..6a877b46 100644
--- a/common/content/dactyl.js
+++ b/common/content/dactyl.js
@@ -12,14 +12,14 @@ default xml namespace = XHTML;
 XML.ignoreWhitespace = false;
 XML.prettyPrinting = false;
 
-const plugins = { __proto__: modules };
-const userContext = newContext(modules);
+var plugins = { __proto__: modules };
+var userContext = newContext(modules);
 
-const EVAL_ERROR = "__dactyl_eval_error";
-const EVAL_RESULT = "__dactyl_eval_result";
-const EVAL_STRING = "__dactyl_eval_string";
+var EVAL_ERROR = "__dactyl_eval_error";
+var EVAL_RESULT = "__dactyl_eval_result";
+var EVAL_STRING = "__dactyl_eval_string";
 
-const Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
+var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
     init: function () {
         window.dactyl = this;
         // cheap attempt at compatibility
@@ -53,8 +53,10 @@ const Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase),
 
     observe: {
         "dactyl-cleanup": function () {
+            let modules = dactyl.modules;
+
             for (let name in values(Object.getOwnPropertyNames(modules).reverse())) {
-                let mod = modules[name];
+                let mod = Object.getOwnPropertyDescriptor(modules, name).value;
                 if (mod instanceof ModuleBase) {
                     if ("cleanup" in mod)
                         mod.cleanup();
@@ -63,7 +65,10 @@ const Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase),
                 }
             }
             for (let name in values(Object.getOwnPropertyNames(modules).reverse()))
-                delete modules[name];
+                try {
+                    delete modules[name];
+                }
+                catch (e) {}
         }
     },
 
@@ -1434,7 +1439,7 @@ const Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase),
             function () { dactyl.quit(true); });
     },
 
-    commands: function () {
+    commands: function (_dactyl, _modules, _window) {
         commands.add(["addo[ns]"],
             "Manage available Extensions and Themes",
             function () {
diff --git a/common/content/editor.js b/common/content/editor.js
index 5945f4fb..b6730218 100644
--- a/common/content/editor.js
+++ b/common/content/editor.js
@@ -10,7 +10,7 @@
 // http://developer.mozilla.org/en/docs/Editor_Embedding_Guide
 
 /** @instance editor */
-const Editor = Module("editor", {
+var Editor = Module("editor", {
     get isCaret() modes.getStack(1).main == modes.CARET,
     get isTextEdit() modes.getStack(1).main == modes.TEXT_EDIT,
 
diff --git a/common/content/events.js b/common/content/events.js
index f1f7dfb0..1a7627e8 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -11,7 +11,7 @@
 /**
  * @instance events
  */
-const Events = Module("events", {
+var Events = Module("events", {
     init: function () {
         let _events = "if (window.dactyl && dactyl.modules.loaded.events) return dactyl.modules.events"
         util.overlayWindow(window, {
diff --git a/common/content/finder.js b/common/content/finder.js
index 91a671da..26c093e2 100644
--- a/common/content/finder.js
+++ b/common/content/finder.js
@@ -7,7 +7,7 @@
 /** @scope modules */
 
 /** @instance rangefinder */
-const RangeFinder = Module("rangefinder", {
+var RangeFinder = Module("rangefinder", {
     init: function () {
         this.lastFindPattern = "";
     },
@@ -251,7 +251,7 @@ const RangeFinder = Module("rangefinder", {
  * documents, and represents a major detriment to productivity where
  * large amounts of data are concerned (e.g., for API documents).
  */
-const RangeFind = Class("RangeFind", {
+var RangeFind = Class("RangeFind", {
     init: function (matchCase, backward, elementPath, regexp) {
         this.window = Cu.getWeakReference(window);
         this.baseDocument = Cu.getWeakReference(content.document);
diff --git a/common/content/hints.js b/common/content/hints.js
index 61140e30..2785b09d 100644
--- a/common/content/hints.js
+++ b/common/content/hints.js
@@ -9,7 +9,7 @@
 /** @scope modules */
 /** @instance hints */
 
-const Hints = Module("hints", {
+var Hints = Module("hints", {
     init: function init() {
         const self = this;
 
diff --git a/common/content/history.js b/common/content/history.js
index 1d8e791c..1e648fd6 100644
--- a/common/content/history.js
+++ b/common/content/history.js
@@ -6,7 +6,7 @@
 // given in the LICENSE.txt file included with this file.
 "use strict";
 
-const History = Module("history", {
+var History = Module("history", {
     get format() bookmarks.format,
 
     get service() services.history,
diff --git a/common/content/io.js b/common/content/io.js
index 29731ead..0f923b28 100644
--- a/common/content/io.js
+++ b/common/content/io.js
@@ -38,7 +38,7 @@ function Script(file) {
  * Provides a basic interface to common system I/O operations.
  * @instance io
  */
-const IO = Module("io", {
+var IO = Module("io", {
     init: function () {
         this._processDir = services.directory.get("CurWorkD", Ci.nsIFile);
         this._cwd = this._processDir.path;
diff --git a/common/content/javascript.js b/common/content/javascript.js
index b29989bd..9325aa91 100644
--- a/common/content/javascript.js
+++ b/common/content/javascript.js
@@ -6,7 +6,7 @@
 
 // TODO: Clean this up.
 
-const JavaScript = Module("javascript", {
+var JavaScript = Module("javascript", {
     init: function () {
         this._stack = [];
         this._functions = [];
diff --git a/common/content/mappings.js b/common/content/mappings.js
index d9281d88..d3a2a25d 100644
--- a/common/content/mappings.js
+++ b/common/content/mappings.js
@@ -29,7 +29,7 @@
  * @optional
  * @private
  */
-const Map = Class("Map", {
+var Map = Class("Map", {
     init: function (modes, keys, description, action, extraInfo) {
         modes = Array.concat(modes).map(function (m) isObject(m) ? m.mask : m);
         if (!modes.every(util.identity))
@@ -127,7 +127,7 @@ const Map = Class("Map", {
 /**
  * @instance mappings
  */
-const Mappings = Module("mappings", {
+var Mappings = Module("mappings", {
     init: function () {
         this._main = []; // default mappings
         this._user = []; // user created mappings
diff --git a/common/content/marks.js b/common/content/marks.js
index c1a515b7..93e5221c 100644
--- a/common/content/marks.js
+++ b/common/content/marks.js
@@ -10,7 +10,7 @@
  * @scope modules
  * @instance marks
  */
-const Marks = Module("marks", {
+var Marks = Module("marks", {
     init: function init() {
         function replacer(key, val) val instanceof Ci.nsISupports ? null : val;
         this._localMarks = storage.newMap("local-marks", { privateData: true, replacer: replacer, store: true });
diff --git a/common/content/modes.js b/common/content/modes.js
index c59e85b6..6c1ef6b1 100644
--- a/common/content/modes.js
+++ b/common/content/modes.js
@@ -8,7 +8,7 @@
 
 /** @scope modules */
 
-const Modes = Module("modes", {
+var Modes = Module("modes", {
     init: function () {
         this.modeChars = {};
         this._main = 1;     // NORMAL
diff --git a/common/content/options.js b/common/content/options.js
index 58e529b1..08d7599f 100644
--- a/common/content/options.js
+++ b/common/content/options.js
@@ -34,7 +34,7 @@ let ValueError = Class("ValueError", ErrorBase);
  * @optional
  * @private
  */
-const Option = Class("Option", {
+var Option = Class("Option", {
     init: function (names, description, type, defaultValue, extraInfo) {
         this.name = names[0];
         this.names = names;
@@ -620,7 +620,7 @@ const Option = Class("Option", {
 /**
  * @instance options
  */
-const Options = Module("options", {
+var Options = Module("options", {
     init: function () {
         this.needInit = [];
         this._options = [];
diff --git a/common/content/quickmarks.js b/common/content/quickmarks.js
index d41a6719..47ca77f0 100644
--- a/common/content/quickmarks.js
+++ b/common/content/quickmarks.js
@@ -11,7 +11,7 @@
 /**
 * @instance quickmarks
 */
-const QuickMarks = Module("quickmarks", {
+var QuickMarks = Module("quickmarks", {
     init: function () {
         this._qmarks = storage.newMap("quickmarks", { store: true });
         storage.addObserver("quickmarks", function () {
diff --git a/common/content/statusline.js b/common/content/statusline.js
index 2bf6f14c..6d3cb454 100644
--- a/common/content/statusline.js
+++ b/common/content/statusline.js
@@ -8,7 +8,7 @@
 
 /** @scope modules */
 
-const StatusLine = Module("statusline", {
+var StatusLine = Module("statusline", {
     init: function () {
         this._statusLine = document.getElementById("status-bar");
         this.statusBar = document.getElementById("addon-bar") || this._statusLine;
diff --git a/common/content/tabs.js b/common/content/tabs.js
index 5337abc9..f7a6ad5f 100644
--- a/common/content/tabs.js
+++ b/common/content/tabs.js
@@ -13,7 +13,7 @@
 /**
  * @instance tabs
  */
-const Tabs = Module("tabs", {
+var Tabs = Module("tabs", {
     init: function () {
         this._alternates = [config.tabbrowser.mCurrentTab, null];
 
diff --git a/common/modules/base.jsm b/common/modules/base.jsm
index bc2c186c..1a23ff67 100644
--- a/common/modules/base.jsm
+++ b/common/modules/base.jsm
@@ -13,19 +13,19 @@ if (!JSMLoader)
             dump("dactyl: load: " + url + "\n");
             if (this.stale[url]) {
                 delete this.stale[url];
-                dump("dactyl: load stale\n");
-
                 let global = this.globals[url];
+
                 for each (let prop in Object.getOwnPropertyNames(global))
                     try {
-                        if (!set.has(this.builtin, prop) && [this, set].indexOf(global[prop]) < 0)
+                        if (!set.has(this.builtin, prop) &&
+                            [this, set].indexOf(Object.getOwnPropertyDescriptor(global, prop).value) < 0)
                             delete global[prop];
                     }
                     catch (e) {}
 
                 Components.classes["@mozilla.org/moz/jssubscript-loader;1"]
                           .getService(Components.interfaces.mozIJSSubScriptLoader)
-                          .loadSubScript(url, this.globals[url]);
+                          .loadSubScript(url, global);
                 dump("dactyl: load reloaded: " + url + "\n");
             }
             Components.utils.import(url, target);
@@ -859,10 +859,12 @@ Class.prototype = {
      */
     timeout: function (callback, timeout) {
         const self = this;
-        let notify = { notify: function notify(timer) { try { callback.apply(self); } catch (e) { util.reportError(e); } } };
-        let timer = services.Timer();
-        timer.initWithCallback(notify, timeout || 0, timer.TYPE_ONE_SHOT);
-        return timer;
+        function notify(timer) {
+            if (util.rehashing && !isinstance(Cu.getGlobalForObject(callback), ["BackstagePass"]))
+                return;
+            util.trapErrors(callback, self);
+        }
+        return services.Timer(notify, timeout || 0, services.Timer.TYPE_ONE_SHOT);;
     }
 };
 memoize(Class.prototype, "closure", function () {
@@ -1030,6 +1032,9 @@ var Timer = Class("Timer", {
     },
 
     notify: function (timer) {
+        if (util.rehashing)
+            return;
+
         this._timer.cancel();
         this.latest = 0;
         // minInterval is the time between the completion of the command and the next firing
diff --git a/common/modules/util.jsm b/common/modules/util.jsm
index 82bb0009..cbe9496e 100644
--- a/common/modules/util.jsm
+++ b/common/modules/util.jsm
@@ -23,7 +23,7 @@ default xml namespace = XHTML;
 
 memoize(this, "Commands", function () {
     // FIXME
-    let obj = {};
+    let obj = { Module: Class };
     services.subscriptLoader.loadSubScript("chrome://dactyl/content/commands.js", obj);
     return obj.Commands;
 });
@@ -70,7 +70,7 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
             __noSuchMethod__: function (meth, args) {
                 let win = util.activeWindow;
                 var dactyl = global && global.dactyl || win && win.dactyl;
-                if (!win)
+                if (!dactyl)
                     return null;
 
                 let prop = dactyl[meth];
@@ -96,20 +96,29 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
     addObserver: function (obj) {
         let observers = obj._observe || obj.observe;
         obj._observe = observers;
+
         function register(meth) {
-            services.observer[meth](obj, "quit-application", true);
-            services.observer[meth](obj, "dactyl-cleanup", true);
-            for (let target in keys(observers))
-                services.observer[meth](obj, target, true);
+            for (let target in set(["dactyl-cleanup", "quit-application"].concat(Object.keys(observers))))
+                try {
+                    services.observer[meth](obj, target, true);
+                }
+                catch (e) {}
         }
+
         Class.replaceProperty(obj, "observe",
             function (subject, target, data) {
-                if (target == "quit-application" || target == "dactyl-cleanup")
-                    register("removeObserver");
-                if (observers[target])
-                    observers[target].call(obj, subject, data);
+                try {
+                    if (target == "quit-application" || target == "dactyl-cleanup")
+                        register("removeObserver");
+                    if (observers[target])
+                        observers[target].call(obj, subject, data);
+                }
+                catch (e) {
+                    util.reportError(e);
+                }
             });
-        obj.observe.unRegister = function () register("removeObserver");
+
+        obj.observe.unregister = function () register("removeObserver");
         register("addObserver");
     },
 
@@ -459,6 +468,14 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
      */
     dump: defineModule.dump,
 
+    stackLines: function (stack) {
+        let lines = [];
+        let match, re = /([^]*?)(@.*?)(?:\n|$)/g;
+        while (match = re.exec(stack))
+            lines.push(match[1].replace(/\n/g, "\\n").substr(0, 80) + match[2]);
+        return lines;
+    },
+
     /**
      * Dumps a stack trace to the console.
      *
@@ -466,9 +483,8 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
      * @param {number} frames The number of frames to print.
      */
     dumpStack: function dumpStack(msg, frames) {
-        let stack = Error().stack.replace(/(?:.*\n){2}/, "");
-        if (frames != null)
-            [stack] = stack.match(RegExp("(?:.*\n){0," + frames + "}"));
+        let stack = util.stackLines(Error().stack);
+        stack = stack.slice(2, 2 + (frames || 0)).join("\n");
         util.dump((arguments.length == 0 ? "Stack" : msg) + "\n" + stack + "\n");
     },
 
@@ -913,7 +929,7 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
             util.timeout(function () {
                 for (let module in values(defineModule.modules))
                     if (module.cleanup)
-                        module.cleanup();
+                        util.trapErrors(module.cleanup, module);
 
                 services.observer.addObserver(this, "dactyl-rehash", true);
             });
@@ -1163,7 +1179,7 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
         try {
             let obj = update({}, error, {
                 toString: function () String(error),
-                stack: <>{String.replace(error.stack || Error().stack, /^/mg, "\t")}</>
+                stack: <>{util.stackLines(String(error.stack || Error().stack)).join("\n").replace(/^/mg, "\t")}</>
             });
 
             this.errors.push([new Date, obj + "\n" + obj.stack]);
@@ -1177,7 +1193,7 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
         catch (e) {
             try {
                 this.dump(String(error));
-                this.dump(error.stack)
+                this.dump(util.stackLines(error.stack).join("\n"))
             }
             catch (e) { dump(e + "\n"); }
         }

From 26bd1c10753bd6505bad806e172ae310b4641a1e Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Sat, 25 Dec 2010 18:41:32 -0500
Subject: [PATCH 19/35] [bootstrap] Purge stale modules on upgrade as well as
 explicit rehash.

--HG--
branch : bootstrapped
---
 common/bootstrap.js           |  3 +++
 common/content/commandline.js |  4 ++--
 common/content/events.js      |  9 +++++----
 common/modules/overlay.jsm    |  4 ++--
 common/modules/util.jsm       |  7 +++++--
 pentadactyl/content/config.js | 10 +++++-----
 6 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/common/bootstrap.js b/common/bootstrap.js
index a438a7ff..8baab0ea 100755
--- a/common/bootstrap.js
+++ b/common/bootstrap.js
@@ -186,6 +186,9 @@ function init() {
 function shutdown(data, reason) {
     dump("dactyl: bootstrap: shutdown " + reasonToString(reason) + "\n");
     if (reason != APP_SHUTDOWN) {
+        if ([ADDON_UPGRADE, ADDON_DOWNGRADE, ADDON_UNINSTALL].indexOf(reason) >= 0)
+            services.observer.notifyObservers(null, "dactyl-purge", null);
+
         services.observer.notifyObservers(null, "dactyl-cleanup", null);
         for (let factory in values(components))
             // TODO: Categories;
diff --git a/common/content/commandline.js b/common/content/commandline.js
index cc7d2895..ca8479c8 100644
--- a/common/content/commandline.js
+++ b/common/content/commandline.js
@@ -1249,9 +1249,9 @@ var CommandLine = Module("commandline", {
         availableHeight -= extra || 0;
 
         doc.body.style.minWidth = this.widgets.commandbar.commandline.scrollWidth + "px";
-        this.widgets.mowContainer.height = Math.min(doc.height, availableHeight) + "px";
+        this.widgets.mowContainer.height = Math.min(doc.body.clientHeight, availableHeight) + "px";
         this.timeout(function ()
-            this.widgets.mowContainer.height = Math.min(doc.height, availableHeight) + "px",
+            this.widgets.mowContainer.height = Math.min(doc.body.clientHeight, availableHeight) + "px",
             0);
 
         doc.body.style.minWidth = "";
diff --git a/common/content/events.js b/common/content/events.js
index 04ea77e8..93e40459 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -13,7 +13,6 @@
  */
 var Events = Module("events", {
     init: function () {
-        let _events = "if (window.dactyl && dactyl.modules.loaded.events) return dactyl.modules.events"
         util.overlayWindow(window, {
             append: <e4x xmlns={XUL}>
                 <window id={document.documentElement.id}>
@@ -21,9 +20,9 @@ var Events = Module("events", {
                         from: http://developer.mozilla.org/en/docs/XUL_Tutorial:Updating_Commands !-->
                     <!-- I don't think we really need this. ––Kris -->
                     <commandset id="onPentadactylFocus" commandupdater="true" events="focus"
-                                oncommandupdate={_events + ".onFocusChange(event);"}/>
+                                oncommandupdate="dactyl.modules.events.onFocusChange(event);"/>
                     <commandset id="onPentadactylSelect" commandupdater="true" events="select"
-                                oncommandupdate={_events + ".onSelectionChange(event);"}/>
+                                oncommandupdate="dactyl.modules.events.onSelectionChange(event);"/>
                 </window>
             </e4x>.elements()
         });
@@ -121,7 +120,8 @@ var Events = Module("events", {
      */
     wrapListener: function wrapListener(method, self) {
         self = self || this;
-        return function wrappedListener(event) {
+        method.wrapped = wrappedListener;
+        function wrappedListener(event) {
             try {
                 method.apply(self, arguments);
             }
@@ -133,6 +133,7 @@ var Events = Module("events", {
                     dactyl.echoerr("Processing " + event.type + " event: " + (e.echoerr || e));
             }
         };
+        return wrappedListener;
     },
 
     /**
diff --git a/common/modules/overlay.jsm b/common/modules/overlay.jsm
index 37aaf98d..4d528b28 100644
--- a/common/modules/overlay.jsm
+++ b/common/modules/overlay.jsm
@@ -249,10 +249,10 @@ var Overlay = Module("Overlay", {
                 util.dump("Loaded in " + (Date.now() - start) + "ms");
 
                 modules.events.addSessionListener(window, "unload", function onUnload() {
-                    window.removeEventListener("unload", onUnload, false);
+                    window.removeEventListener("unload", onUnload.wrapped, false);
                     for (let [, mod] in iter(modules))
                         if (mod instanceof ModuleBase && "destroy" in mod)
-                            mod.destroy();
+                            util.trapErrors(mod.destroy, mod);
                 }, false);
             }
         }));
diff --git a/common/modules/util.jsm b/common/modules/util.jsm
index cbe9496e..9ad5343f 100644
--- a/common/modules/util.jsm
+++ b/common/modules/util.jsm
@@ -949,6 +949,9 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
                         module.init();
                 }
         },
+        "dactyl-purge": function () {
+            this.rehashing = true;
+        },
         "toplevel-window-ready": function (window, data) {
             window.addEventListener("DOMContentLoaded", wrapCallback(function listener(event) {
                 if (event.originalTarget === window.document) {
@@ -1163,9 +1166,9 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
     }),
 
     rehash: function () {
-        this.rehashing = true;
-        this.addon.userDisabled = true;
         this.timeout(function () {
+            this.rehashing = true;
+            this.addon.userDisabled = true;
             this.addon.userDisabled = false;
         });
     },
diff --git a/pentadactyl/content/config.js b/pentadactyl/content/config.js
index 7df70bd2..2ab87d56 100644
--- a/pentadactyl/content/config.js
+++ b/pentadactyl/content/config.js
@@ -26,28 +26,28 @@ const Config = Module("config", ConfigBase, {
                         group="sidebar"
                         sidebarurl="chrome://mozapps/content/extensions/extensions.xul"
                         sidebartitle="Add-ons"
-                        oncommand="toggleSidebar('pentadactyl-viewAddonsSidebar');"/>
+                        oncommand="toggleSidebar(this.id);"/>
                     <broadcaster id="pentadactyl-viewConsoleSidebar"
                         autoCheck="false"
                         type="checkbox"
                         group="sidebar"
                         sidebarurl="chrome://global/content/console.xul"
                         sidebartitle="Console"
-                        oncommand="toggleSidebar('pentadactyl-viewConsoleSidebar');"/>
+                        oncommand="toggleSidebar(this.id);"/>
                     <broadcaster id="pentadactyl-viewDownloadsSidebar"
                         autoCheck="false"
                         type="checkbox"
                         group="sidebar"
                         sidebarurl="chrome://mozapps/content/downloads/downloads.xul"
                         sidebartitle="Downloads"
-                        oncommand="toggleSidebar('pentadactyl-viewDownloadsSidebar');"/>
+                        oncommand="toggleSidebar(this.id);"/>
                     <broadcaster id="pentadactyl-viewPreferencesSidebar"
                         autoCheck="false"
                         type="checkbox"
                         group="sidebar"
                         sidebarurl="about:config"
                         sidebartitle="Preferences"
-                        oncommand="toggleSidebar('pentadactyl-viewPreferencesSidebar');"/>
+                        oncommand="toggleSidebar(this.id);"/>
                 </broadcasterset>
             </e4x>.elements()
         });
@@ -223,7 +223,7 @@ const Config = Module("config", ConfigBase, {
             },
             { argCount: "0" });
 
-        commands.add(["sideb[ar]", "sb[ar]", "sbope[n]"],
+        commands.add(["sideb[ar]", "sb[ar]", "sbop[en]"],
             "Open the sidebar window",
             function (args) {
                 function compare(a, b) util.compareIgnoreCase(a, b) == 0

From 0bd52109100cbc2af811bd2ce859e3253b1e1942 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Mon, 27 Dec 2010 00:20:39 -0500
Subject: [PATCH 20/35] [bootstrap] Fix for Gecko<2.

--HG--
branch : bootstrapped
---
 common/components/protocols.js | 15 ++++++++++++++-
 common/modules/overlay.jsm     | 18 +++++++++++-------
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/common/components/protocols.js b/common/components/protocols.js
index 621403e4..6b4f9c7f 100644
--- a/common/components/protocols.js
+++ b/common/components/protocols.js
@@ -113,7 +113,7 @@ Dactyl.prototype = {
     contractID:       "@mozilla.org/network/protocol;1?name=dactyl",
     classID:          Components.ID("{9c8f2530-51c8-4d41-b356-319e0b155c44}"),
     classDescription: "Dactyl utility protocol",
-    QueryInterface:   XPCOMUtils.generateQI([Ci.nsIProtocolHandler]),
+    QueryInterface:   XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsIProtocolHandler]),
     _xpcom_factory:   Factory(Dactyl),
 
     init: function (obj) {
@@ -163,6 +163,19 @@ Dactyl.prototype = {
         }
         catch (e) {}
         return fakeChannel(uri);
+    },
+
+    // FIXME: Belongs elsewhere
+    _xpcom_categories: [{
+        category: "profile-after-change",
+        entry: "m-dactyl"
+    }],
+
+    observe: function (subject, topic, data) {
+        if (topic === "profile-after-change") {
+            Cu.import("resource://dactyl/base.jsm");
+            require(global, "overlay");
+        }
     }
 };
 
diff --git a/common/modules/overlay.jsm b/common/modules/overlay.jsm
index 4d528b28..cbf9a750 100644
--- a/common/modules/overlay.jsm
+++ b/common/modules/overlay.jsm
@@ -82,11 +82,17 @@ var Overlay = Module("Overlay", {
                 Module.list = [];
                 Module.constructors = {};
 
-                const create = window.Object.create || function (proto) {
-                    let res = window.Object();
-                    object.__proto__ = proto;
-                    return object;
-                }
+                const BASE = "chrome://dactyl/content/";
+
+                const create = window.Object.create || (function () {
+                    window.__dactyl_eval_string = "(function (proto) ({ __proto__: proto }))";
+                    services.subscriptLoader.loadSubScript(BASE + "eval.js", window);
+
+                    let res = window.__dactyl_eval_result;
+                    delete window.__dactyl_eval_string;
+                    delete window.__dactyl_eval_result;
+                    return res;
+                })();
 
                 const jsmodules = {};
                 const modules = update(create(jsmodules), {
@@ -133,8 +139,6 @@ var Overlay = Module("Overlay", {
                 modules.modules = modules;
                 window.dactyl = { modules: modules };
 
-                const BASE = "chrome://dactyl/content/";
-
                 let prefix = [BASE];
 
                 modules.load("util");

From 163539ab29b918536e55c66f220876b705383405 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Mon, 27 Dec 2010 01:49:10 -0500
Subject: [PATCH 21/35] Fix error trapping in events.feedkeys.

--HG--
branch : bootstrapped
---
 common/content/dactyl.js |  4 ++++
 common/content/events.js | 16 ++++++++--------
 common/modules/util.jsm  | 12 +++++++-----
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/common/content/dactyl.js b/common/content/dactyl.js
index 36ce66f7..b1628e9a 100644
--- a/common/content/dactyl.js
+++ b/common/content/dactyl.js
@@ -410,6 +410,8 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
             util.dump(elem);
             util.reportError(e);
         }
+        if (services.focus.focusedWindow == null)
+            util.dumpStack("focusedWindow == null");
     },
 
     /**
@@ -455,6 +457,8 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
 
         if (elem && elem != dactyl.focusedElement)
             dactyl.focus(elem);
+        if (services.focus.focusedWindow == null)
+            util.dumpStack("focusedWindow == null");
      },
 
     /** @property {Element} The currently focused element. */
diff --git a/common/content/events.js b/common/content/events.js
index b3aaf6c0..bb6cb901 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -255,15 +255,15 @@ var Events = Module("events", {
      * @returns {boolean}
      */
     feedkeys: function (keys, noremap, quiet, mode) {
-
-        let wasFeeding = this.feedingKeys;
-        this.feedingKeys = true;
-        this.duringFeed = this.duringFeed || [];
-        let wasQuiet = commandline.quiet;
-        if (quiet)
-            commandline.quiet = quiet;
-
         try {
+            var wasFeeding = this.feedingKeys;
+            this.feedingKeys = true;
+            this.duringFeed = this.duringFeed || [];
+
+            var wasQuiet = commandline.quiet;
+            if (quiet)
+                commandline.quiet = quiet;
+
             util.threadYield(1, true);
 
             for (let [, evt_obj] in Iterator(events.fromString(keys))) {
diff --git a/common/modules/util.jsm b/common/modules/util.jsm
index 8c79e8cd..518c2f44 100644
--- a/common/modules/util.jsm
+++ b/common/modules/util.jsm
@@ -355,13 +355,15 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
         while (!(node instanceof Ci.nsIDOMElement) && node.parentNode)
             node = node.parentNode;
         try {
-            return node.ownerDocument.defaultView.getComputedStyle(node, null);
+            var res = node.ownerDocument.defaultView.getComputedStyle(node, null);
         }
-        catch (e) {
-            util.reportError(e);
-            util.dump(String(node));
+        catch (e) {}
+        if (res == null) {
+            util.dumpStack("Computed style is null: " + node);
+            Cu.reportError(Error("Computed style is null: " + node));
             return {};
         }
+        return res;
     },
 
     /**
@@ -484,7 +486,7 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
      */
     dumpStack: function dumpStack(msg, frames) {
         let stack = util.stackLines(Error().stack);
-        stack = stack.slice(2, 2 + (frames || 0)).join("\n");
+        stack = stack.slice(2, 2 + (frames || stack.length)).join("\n");
         util.dump((arguments.length == 0 ? "Stack" : msg) + "\n" + stack + "\n");
     },
 

From 7459dfc2c7db9194b6ad67f5551867b114eaaf9b Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Mon, 27 Dec 2010 09:22:20 -0500
Subject: [PATCH 22/35] [bootstrap] Fix bug in :map -silent.

--HG--
branch : bootstrapped
---
 common/content/commandline.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/common/content/commandline.js b/common/content/commandline.js
index ca8479c8..322a5e7a 100644
--- a/common/content/commandline.js
+++ b/common/content/commandline.js
@@ -487,7 +487,7 @@ var CommandLine = Module("commandline", {
     set quiet(val) {
         this._quiet = val;
         ["commandbar", "statusbar"].forEach(function (nodeSet) {
-            Array.forEach(this.widgets[nodeSet].commandline.childNodes, function (node) {
+            Array.forEach(this.widgets[nodeSet].commandline.children, function (node) {
                 node.style.opacity = this._quiet || this._silent ? "0" : "";
             }, this);
         }, this);
@@ -907,11 +907,10 @@ var CommandLine = Module("commandline", {
             let command = this.command;
 
             if (event.type == "blur") {
-                // prevent losing focus, there should be a better way, but it just didn't work otherwise
                 this.timeout(function () {
                     if (this.commandVisible && event.originalTarget == this.widgets.active.command.inputField)
                         dactyl.focus(this.widgets.active.command.inputField);
-                }, 0);
+                });
             }
             else if (event.type == "focus") {
                 if (!this.commandVisible && event.target == this.widgets.active.command.inputField) {

From eed4ddb74b7c0edaab31561a7cce4d7e4745c615 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Mon, 27 Dec 2010 09:28:40 -0500
Subject: [PATCH 23/35] Check <pre/> and <code/> elements in ;F.

--HG--
branch : bootstrapped
---
 common/content/commandline.js | 18 ++++++++++--------
 common/content/dactyl.js      | 16 ++++++++++++----
 common/content/hints.js       |  2 +-
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/common/content/commandline.js b/common/content/commandline.js
index 322a5e7a..6a07fd50 100644
--- a/common/content/commandline.js
+++ b/common/content/commandline.js
@@ -10,7 +10,6 @@
 
 var CommandWidgets = Class("CommandWidgets", {
     init: function () {
-        let _commandline = "if (window.dactyl) return dactyl.modules.commandline";
         let _status = "dactyl-statusline-field-";
 
         util.overlayWindow(window, {
@@ -38,21 +37,21 @@ var CommandWidgets = Class("CommandWidgets", {
                         <iframe id="dactyl-multiline-output" src="chrome://dactyl/content/buffer.xhtml"
                                 flex="1" hidden="false" collapsed="false"
                                 contextmenu="dactyl-contextmenu"
-                                onclick={_commandline + ".onMultilineOutputEvent(event)"}/>
+                                onclick="dactyl.modules.commandline.onMultilineOutputEvent(event)"/>
                     </vbox>
 
                     <vbox class="dactyl-container" hidden="false" collapsed="true">
                         <iframe class="dactyl-completions" id="dactyl-completions-dactyl-commandline" src="chrome://dactyl/content/buffer.xhtml"
                                 contextmenu="dactyl-contextmenu"
                                 flex="1" hidden="false" collapsed="false"
-                                onclick={_commandline + ".onMultilineOutputEvent(event)"}/>
+                                onclick="dactyl.modules.commandline.onMultilineOutputEvent(event)"/>
                     </vbox>
 
                     <vbox id={"dactyl-completions-" + _status + "commandline-container"} class="dactyl-container" hidden="false" collapsed="true" insertbefore="addon-bar,status-bar">
                         <iframe class="dactyl-completions" id={"dactyl-completions-" + _status + "commandline"} src="chrome://dactyl/content/buffer.xhtml"
                                 contextmenu="dactyl-contextmenu"
                                 flex="1" hidden="false" collapsed="false"
-                                onclick={_commandline + ".onMultilineOutputEvent(event)"}/>
+                                onclick="dactyl.modules.commandline.onMultilineOutputEvent(event)"/>
                     </vbox>
 
                     <stack orient="horizontal" align="stretch" class="dactyl-container" id="dactyl-container" highlight="CmdLine CmdCmdLine">
@@ -63,16 +62,19 @@ var CommandWidgets = Class("CommandWidgets", {
                         <hbox id="dactyl-commandline" hidden="false" class="dactyl-container" highlight="Normal CmdNormal" collapsed="true">
                             <label   id="dactyl-commandline-prompt"  class="dactyl-commandline-prompt  plain" flex="0" crop="end" value="" collapsed="true"/>
                             <textbox id="dactyl-commandline-command" class="dactyl-commandline-command plain" flex="1" type="input" timeout="100"
-                                     oninput={_commandline + ".onEvent(event);"} onkeyup={_commandline + ".onEvent(event);"}
-                                     onfocus={_commandline + ".onEvent(event);"} onblur={_commandline + ".onEvent(event);"}/>
+                                     oninput="dactyl.modules.commandline.onEvent(event);"
+                                     onkeyup="dactyl.modules.commandline.onEvent(event);"
+                                     onfocus="dactyl.modules.commandline.onEvent(event);"
+                                     onblur="dactyl.modules.commandline.onEvent(event);"/>
                         </hbox>
                     </stack>
 
                     <vbox class="dactyl-container" hidden="false" collapsed="false" highlight="CmdLine">
                         <textbox id="dactyl-multiline-input" class="plain" flex="1" rows="1" hidden="false" collapsed="true" multiline="true"
                                  highlight="Normal"
-                                 onkeypress={_commandline + ".onMultilineInputEvent(event);"} oninput={_commandline + ".onMultilineInputEvent(event);"}
-                                 onblur={_commandline + ".onMultilineInputEvent(event);"}/>
+                                 onkeypress="dactyl.modules.commandline.onMultilineInputEvent(event);"
+                                 oninput="dactyl.modules.commandline.onMultilineInputEvent(event);"
+                                 onblur="dactyl.modules.commandline.onMultilineInputEvent(event);"/>
                     </vbox>
                 </vbox>
             </e4x>.elements()
diff --git a/common/content/dactyl.js b/common/content/dactyl.js
index b1628e9a..5569e104 100644
--- a/common/content/dactyl.js
+++ b/common/content/dactyl.js
@@ -398,20 +398,19 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
     },
 
     focus: function focus(elem, flags) {
+        util.dump("focus(" + (elem instanceof Element ? util.objectToString(elem) : elem) + ")");
         flags = flags || services.focus.FLAG_BYMOUSE;
         try {
             if (elem instanceof Document)
                 elem = elem.defaultView;
             if (elem instanceof Window)
-                services.focus.focusedWindow = elem;
+                elem.focus();
             else
                 services.focus.setFocus(elem, flags);
         } catch (e) {
             util.dump(elem);
             util.reportError(e);
         }
-        if (services.focus.focusedWindow == null)
-            util.dumpStack("focusedWindow == null");
     },
 
     /**
@@ -421,7 +420,10 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
      *     element.
      */
     focusContent: function focusContent(clearFocusedElement) {
-        if (window != services.windowWatcher.activeWindow)
+        util.dump("focusContent(" + clearFocusedElement + ") " +
+                  (window == services.focus.activeWindow));
+
+        if (window != services.focus.activeWindow)
             return;
 
         let win = document.commandDispatcher.focusedWindow;
@@ -443,10 +445,16 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
         catch (e) {}
 
         if (clearFocusedElement) {
+            util.dump("blur(" + (dactyl.focusedElement instanceof Element ? util.objectToString(dactyl.focusedElement)
+                                                                          : dactyl.focusedElement) +
+                      ")");
             if (dactyl.focusedElement)
                 dactyl.focusedElement.blur();
             if (win && Editor.getEditor(win)) {
+                util.dump("blur(" + win + ")");
                 win.blur();
+                if (win.frameElement)
+                    util.dump("blur(" + util.objectToString(win.frameElement) + ")");
                 if (win.frameElement)
                     win.frameElement.blur();
             }
diff --git a/common/content/hints.js b/common/content/hints.js
index 2785b09d..f71d07b7 100644
--- a/common/content/hints.js
+++ b/common/content/hints.js
@@ -1129,7 +1129,7 @@ var Hints = Module("hints", {
             "XPath strings of hintable elements for extended hint modes",
             "regexpmap", "[iI]:" + xpath(["img"]) +
                         ",[OTivVWy]:" + xpath(["{a,area}[@href]", "{img,iframe}[@src]"]) +
-                        ",[F]:" + xpath(["div", "span", "p", "body", "html"]) +
+                        ",[F]:" + xpath(["body", "code", "div", "html", "p", "pre", "span"]) +
                         ",[S]:" + xpath(["input[not(@type='hidden')]", "textarea", "button", "select"]),
             { validator: Option.validateXPath });
 

From a7b8cac7de017592078bc0d2ad1ab7aeb859a7df Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Mon, 27 Dec 2010 10:35:11 -0500
Subject: [PATCH 24/35] Use options.list() for displaying option values.

--HG--
branch : bootstrapped
---
 common/content/options.js   | 46 ++++++++++++++++++-------------------
 common/modules/template.jsm |  6 +++--
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/common/content/options.js b/common/content/options.js
index 0b462af7..a5ff6c68 100644
--- a/common/content/options.js
+++ b/common/content/options.js
@@ -720,26 +720,25 @@ var Options = Module("options", {
      * Lists all options in *scope* or only those with changed values if
      * *onlyNonDefault* is specified.
      *
-     * @param {boolean} onlyNonDefault Limit the list to prefs with a
-     *     non-default value.
+     * @param {function(Option)} filter Limit the list
      * @param {number} scope Only list options in this scope (see
      *     {@link Option#scope}).
      */
-    list: function (onlyNonDefault, scope) {
+    list: function (filter, scope) {
         if (!scope)
             scope = Option.SCOPE_BOTH;
 
         function opts(opt) {
             for (let opt in Iterator(options)) {
                 let option = {
+                    __proto__: opt,
                     isDefault: opt.isDefault,
-                    name:      opt.name,
                     default:   opt.stringDefaultValue,
                     pre:       "\u00a0\u00a0", // Unicode nonbreaking space.
-                    value:     <></>
+                    value:     <></>,
                 };
 
-                if (onlyNonDefault && option.isDefault)
+                if (filter && !filter(opt))
                     continue;
                 if (!(opt.scope & scope))
                     continue;
@@ -757,7 +756,7 @@ var Options = Module("options", {
             }
         };
 
-        commandline.commandOutput(template.options("Options", opts()));
+        commandline.commandOutput(template.options("Options", opts(), options["verbose"] > 0));
     },
 
     /**
@@ -870,6 +869,17 @@ var Options = Module("options", {
             if (!args.length)
                 args[0] = "";
 
+            let list = [];
+            function flushList() {
+                let names = set(list.map(function (opt) opt.option ? opt.option.name : ""));
+                if (list.length)
+                    if (list.some(function (opt) opt.all))
+                        options.list(function (opt) !(list[0].onlyNonDefault && opt.isDefault) , list[0].scope);
+                    else
+                        options.list(function (opt) set.has(names, opt.name), list[0].scope);
+                list = [];
+            }
+
             for (let [, arg] in args) {
                 if (bang) {
                     let onlyNonDefault = false;
@@ -931,6 +941,7 @@ var Options = Module("options", {
 
                 // reset a variable to its default value
                 if (opt.reset) {
+                    flushList();
                     if (opt.all) {
                         for (let option in options)
                             option.reset();
@@ -940,25 +951,11 @@ var Options = Module("options", {
                     }
                 }
                 // read access
-                else if (opt.get) {
-                    if (opt.all)
-                        options.list(opt.onlyNonDefault, opt.scope);
-                    else {
-                        XML.prettyPrinting = false;
-                        XML.ignoreWhitespace = false;
-                        if (option.type == "boolean")
-                            var msg = (opt.optionValue ? "  " : "no") + option.name;
-                        else
-                            msg = "  " + option.name + "=" + opt.option.stringify(opt.optionValue);
-
-                        if (options["verbose"] > 0 && option.setFrom)
-                            msg = <>{msg}<br/>        Last set from {template.sourceLink(option.setFrom)}</>;
-
-                        dactyl.echo(<span highlight="CmdOutput Message">{msg}</span>);
-                    }
-                }
+                else if (opt.get)
+                    list.push(opt);
                 // write access
                 else {
+                    flushList();
                     if (opt.option.type === "boolean") {
                         dactyl.assert(!opt.valueGiven, "E474: Invalid argument: " + arg);
                         opt.values = !opt.unsetBoolean;
@@ -977,6 +974,7 @@ var Options = Module("options", {
                     option.setFrom = commands.getCaller(null);
                 }
             }
+            flushList();
         }
 
         function setCompleter(context, args, modifiers) {
diff --git a/common/modules/template.jsm b/common/modules/template.jsm
index 0a4652fc..7e4454eb 100644
--- a/common/modules/template.jsm
+++ b/common/modules/template.jsm
@@ -235,7 +235,7 @@ var Template = Module("Template", {
         })(), template[help ? "HelpLink" : "helpLink"]);
     },
 
-    options: function options(title, opts) {
+    options: function options(title, opts, verbose) {
         XML.ignoreWhitespace = false; XML.prettyPrinting = false;
         // <e4x>
         return <table>
@@ -249,7 +249,9 @@ var Template = Module("Template", {
                             <div highlight="Message"
                             ><span style={opt.isDefault ? "" : "font-weight: bold"}>{opt.pre}{opt.name}</span><span>{opt.value}</span>{
                                 opt.isDefault || opt.default == null ? "" : <span class="extra-info"> (default: {opt.default})</span>
-                            }</div>
+                            }</div>{
+                                verbose && opt.setFrom ? <div highlight="Message">       Last set from {template.sourceLink(opt.setFrom)}</div> : <></>
+                            }
                         </td>
                     </tr>)
                 }

From e93f7455f20118f9d36a86ae27e563099f6ea0c8 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Mon, 27 Dec 2010 11:10:50 -0500
Subject: [PATCH 25/35] Fix focus bug. Closes issue #212.

--HG--
branch : bootstrapped
---
 common/content/buffer.xhtml   | 2 +-
 common/content/commandline.js | 2 ++
 common/content/dactyl.js      | 9 +--------
 common/content/modes.js       | 5 ++---
 common/modules/util.jsm       | 2 +-
 5 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/common/content/buffer.xhtml b/common/content/buffer.xhtml
index 089b1563..6e05b7ee 100644
--- a/common/content/buffer.xhtml
+++ b/common/content/buffer.xhtml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml" id="dactyl-buffer">
   <head>
       <title/>
   </head>
diff --git a/common/content/commandline.js b/common/content/commandline.js
index 6a07fd50..6799408c 100644
--- a/common/content/commandline.js
+++ b/common/content/commandline.js
@@ -256,6 +256,7 @@ var CommandWidgets = Class("CommandWidgets", {
 
         let elem = this.multilineOutput;
         elem.contentWindow.addEventListener("unload", function (event) { event.preventDefault(); }, true);
+        elem.contentDocument.documentElement.id = "dactyl-multiline-output-top";
         elem.contentDocument.body.id = "dactyl-multiline-output-content";
         elem.__defineGetter__("atEnd", function ()
             !Buffer.isScrollable(elem.contentDocument.documentElement, 1));
@@ -1858,6 +1859,7 @@ var ItemList = Class("ItemList", {
         this._win = iframe.contentWindow;
         this._container = iframe.parentNode;
 
+        this._doc.documentElement.id = id + "-top";
         this._doc.body.id = id + "-content";
         this._doc.body.className = iframe.className + "-content";
         this._doc.body.appendChild(this._doc.createTextNode(""));
diff --git a/common/content/dactyl.js b/common/content/dactyl.js
index 5569e104..01fcd24a 100644
--- a/common/content/dactyl.js
+++ b/common/content/dactyl.js
@@ -398,13 +398,12 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
     },
 
     focus: function focus(elem, flags) {
-        util.dump("focus(" + (elem instanceof Element ? util.objectToString(elem) : elem) + ")");
         flags = flags || services.focus.FLAG_BYMOUSE;
         try {
             if (elem instanceof Document)
                 elem = elem.defaultView;
             if (elem instanceof Window)
-                elem.focus();
+                services.focus.focusedWindow = elem;
             else
                 services.focus.setFocus(elem, flags);
         } catch (e) {
@@ -445,13 +444,9 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
         catch (e) {}
 
         if (clearFocusedElement) {
-            util.dump("blur(" + (dactyl.focusedElement instanceof Element ? util.objectToString(dactyl.focusedElement)
-                                                                          : dactyl.focusedElement) +
-                      ")");
             if (dactyl.focusedElement)
                 dactyl.focusedElement.blur();
             if (win && Editor.getEditor(win)) {
-                util.dump("blur(" + win + ")");
                 win.blur();
                 if (win.frameElement)
                     util.dump("blur(" + util.objectToString(win.frameElement) + ")");
@@ -465,8 +460,6 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
 
         if (elem && elem != dactyl.focusedElement)
             dactyl.focus(elem);
-        if (services.focus.focusedWindow == null)
-            util.dumpStack("focusedWindow == null");
      },
 
     /** @property {Element} The currently focused element. */
diff --git a/common/content/modes.js b/common/content/modes.js
index 8f3f0ca1..f51fd648 100644
--- a/common/content/modes.js
+++ b/common/content/modes.js
@@ -51,8 +51,7 @@ var Modes = Module("modes", {
             }
         });
 
-        this.addMode("COMMAND_LINE", { char: "c", input: true,
-            display: function () modes.extended & modes.OUTPUT_MULTILINE ? null : this.disp });
+        this.addMode("COMMAND_LINE", { char: "c", input: true });
 
         this.addMode("CARET", {}, {
             get pref()    prefs.get("accessibility.browsewithcaret"),
@@ -82,7 +81,7 @@ var Modes = Module("modes", {
             postExecute: function (map) { if (modes.main == modes.QUOTE && map.name === "<C-v>") modes.pop() },
             onEvent: function () { if (modes.main == modes.QUOTE) modes.pop() }
         });
-        this.addMode("OUTPUT_MULTILINE");
+        this.addMode("OUTPUT_MULTILINE", { ownsFocus: true });
 
         // this._extended modes, can include multiple modes, and even main modes
         this.addMode("EX", true);
diff --git a/common/modules/util.jsm b/common/modules/util.jsm
index 518c2f44..bf1a6add 100644
--- a/common/modules/util.jsm
+++ b/common/modules/util.jsm
@@ -486,7 +486,7 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
      */
     dumpStack: function dumpStack(msg, frames) {
         let stack = util.stackLines(Error().stack);
-        stack = stack.slice(2, 2 + (frames || stack.length)).join("\n");
+        stack = stack.slice(2, 2 + (frames || stack.length)).join("\n").replace(/^/gm, "    ");
         util.dump((arguments.length == 0 ? "Stack" : msg) + "\n" + stack + "\n");
     },
 

From ff52485ca5a5659aca42f421b16f50b912af4499 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Mon, 27 Dec 2010 12:04:03 -0500
Subject: [PATCH 26/35] Possibly stem aforementioned focus bug.

--HG--
branch : bootstrapped
---
 common/content/commandline.js | 4 +++-
 common/content/dactyl.js      | 3 ---
 common/content/modes.js       | 2 +-
 common/modules/base.jsm       | 2 ++
 common/modules/styles.jsm     | 8 +++++++-
 common/modules/util.jsm       | 4 +++-
 6 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/common/content/commandline.js b/common/content/commandline.js
index 6799408c..a8e58e23 100644
--- a/common/content/commandline.js
+++ b/common/content/commandline.js
@@ -623,8 +623,10 @@ var CommandLine = Module("commandline", {
             this.widgets.message = null;
         if (modes.main != modes.COMMAND_LINE)
             this.widgets.command = null;
-        if (modes.main == modes.OUTPUT_MULTILINE && this.widgets.multilineOutput.atEnd)
+        if (modes.main == modes.OUTPUT_MULTILINE && this.widgets.multilineOutput.atEnd) {
+            dactyl.focusContent();
             modes.pop();
+        }
         if (modes.main != modes.OUTPUT_MULTILINE)
             this.multilineOutputVisible = false;
     },
diff --git a/common/content/dactyl.js b/common/content/dactyl.js
index 01fcd24a..06756fad 100644
--- a/common/content/dactyl.js
+++ b/common/content/dactyl.js
@@ -419,9 +419,6 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
      *     element.
      */
     focusContent: function focusContent(clearFocusedElement) {
-        util.dump("focusContent(" + clearFocusedElement + ") " +
-                  (window == services.focus.activeWindow));
-
         if (window != services.focus.activeWindow)
             return;
 
diff --git a/common/content/modes.js b/common/content/modes.js
index f51fd648..7cfcf97d 100644
--- a/common/content/modes.js
+++ b/common/content/modes.js
@@ -81,7 +81,7 @@ var Modes = Module("modes", {
             postExecute: function (map) { if (modes.main == modes.QUOTE && map.name === "<C-v>") modes.pop() },
             onEvent: function () { if (modes.main == modes.QUOTE) modes.pop() }
         });
-        this.addMode("OUTPUT_MULTILINE", { ownsFocus: true });
+        this.addMode("OUTPUT_MULTILINE");
 
         // this._extended modes, can include multiple modes, and even main modes
         this.addMode("EX", true);
diff --git a/common/modules/base.jsm b/common/modules/base.jsm
index 0d37df49..76b99af4 100644
--- a/common/modules/base.jsm
+++ b/common/modules/base.jsm
@@ -992,6 +992,8 @@ let StructBase = Class("StructBase", Array, {
 
     clone: function clone() this.constructor.apply(null, this.slice()),
 
+    closure: Class.Property(Object.getOwnPropertyDescriptor(Class.prototype, "closure")),
+
     toString: function () Class.prototype.toString.apply(this, arguments),
 
     // Iterator over our named members
diff --git a/common/modules/styles.jsm b/common/modules/styles.jsm
index bb4f0f03..01d3b7c3 100644
--- a/common/modules/styles.jsm
+++ b/common/modules/styles.jsm
@@ -56,6 +56,12 @@ update(Sheet.prototype, {
         }
     },
 
+    match: function (uri) {
+        if (isString(uri))
+            uri = util.newURI(uri);
+        return this.sites.some(function (site) Styles.matchFilter(site, uri));
+    },
+
     get fullCSS() {
         let filter = this.sites;
         let css = this.css;
@@ -476,7 +482,7 @@ var Styles = Module("Styles", {
                 let uris = util.visibleURIs(window.content);
                 context.compare = modules.CompletionContext.Sort.number;
                 context.generate = function () styles.user.sheets;
-                context.keys.active = function (sheet) sheet.sites.some(function (site) uris.some(Styles.matchFilter(site))),
+                context.keys.active = function (sheet) uris.some(sheet.closure.match);
                 context.keys.description = function (sheet) <>{sheet.formatSites(uris)}: {sheet.css.replace("\n", "\\n")}</>
                 if (cmd.filter)
                     context.filters.push(function ({ item }) cmd.filter(item));
diff --git a/common/modules/util.jsm b/common/modules/util.jsm
index bf1a6add..5eb226a2 100644
--- a/common/modules/util.jsm
+++ b/common/modules/util.jsm
@@ -930,8 +930,10 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
             // destroy modules.
             util.timeout(function () {
                 for (let module in values(defineModule.modules))
-                    if (module.cleanup)
+                    if (module.cleanup) {
+                        util.dump("cleanup: " + module.constructor.className);
                         util.trapErrors(module.cleanup, module);
+                    }
 
                 services.observer.addObserver(this, "dactyl-rehash", true);
             });

From 0b853aba4ecfb5f8ec481599cd21da95a0c30332 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Mon, 27 Dec 2010 12:39:49 -0500
Subject: [PATCH 27/35] Fix cleanup of styles during :rehash.

--HG--
branch : bootstrapped
---
 common/bootstrap.js     |  1 +
 common/modules/util.jsm | 25 +++++++++++--------------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/common/bootstrap.js b/common/bootstrap.js
index 8baab0ea..89a63dec 100755
--- a/common/bootstrap.js
+++ b/common/bootstrap.js
@@ -190,6 +190,7 @@ function shutdown(data, reason) {
             services.observer.notifyObservers(null, "dactyl-purge", null);
 
         services.observer.notifyObservers(null, "dactyl-cleanup", null);
+        services.observer.notifyObservers(null, "dactyl-cleanup-modules", null);
         for (let factory in values(components))
             // TODO: Categories;
             factory.unregister();
diff --git a/common/modules/util.jsm b/common/modules/util.jsm
index 5eb226a2..c588df6d 100644
--- a/common/modules/util.jsm
+++ b/common/modules/util.jsm
@@ -98,7 +98,7 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
         obj._observe = observers;
 
         function register(meth) {
-            for (let target in set(["dactyl-cleanup", "quit-application"].concat(Object.keys(observers))))
+            for (let target in set(["dactyl-cleanup-modules", "quit-application"].concat(Object.keys(observers))))
                 try {
                     services.observer[meth](obj, target, true);
                 }
@@ -108,7 +108,7 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
         Class.replaceProperty(obj, "observe",
             function (subject, target, data) {
                 try {
-                    if (target == "quit-application" || target == "dactyl-cleanup")
+                    if (target == "quit-application" || target == "dactyl-cleanup-modules")
                         register("removeObserver");
                     if (observers[target])
                         observers[target].call(obj, subject, data);
@@ -924,19 +924,16 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
     },
 
     observe: {
-        "dactyl-cleanup": function () {
-            util.dump("dactyl: util: observe: dactyl-cleanup");
-            // Let window cleanup functions run synchronously before we
-            // destroy modules.
-            util.timeout(function () {
-                for (let module in values(defineModule.modules))
-                    if (module.cleanup) {
-                        util.dump("cleanup: " + module.constructor.className);
-                        util.trapErrors(module.cleanup, module);
-                    }
+        "dactyl-cleanup-modules": function () {
+            util.dump("dactyl: util: observe: dactyl-cleanup-modules");
 
-                services.observer.addObserver(this, "dactyl-rehash", true);
-            });
+            for (let module in values(defineModule.modules))
+                if (module.cleanup) {
+                    util.dump("cleanup: " + module.constructor.className);
+                    util.trapErrors(module.cleanup, module);
+                }
+
+            services.observer.addObserver(this, "dactyl-rehash", true);
         },
         "dactyl-rehash": function () {
             services.observer.removeObserver(this, "dactyl-rehash");

From 7b4e64f0bf1c2f2bff413d530bb56cb36b6f1885 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Tue, 28 Dec 2010 09:10:01 -0500
Subject: [PATCH 28/35] Fix parsing of non-decimal option values. Closes issue
 #215.

--HG--
branch : bootstrapped
---
 common/content/options.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/content/options.js b/common/content/options.js
index a5ff6c68..33001b3e 100644
--- a/common/content/options.js
+++ b/common/content/options.js
@@ -427,7 +427,8 @@ var Option = Class("Option", {
     },
 
     parse: {
-        number:     function (value) Number(Option.dequote(value)),
+        number:     function (value) let (val = Option.dequote(value))
+                            Option.validIf(Number(val) % 1 == 0, "Integer value required") && parseInt(val),
 
         boolean:    function (value) Option.dequote(value) == "true" || value == true ? true : false,
 
@@ -500,10 +501,9 @@ var Option = Class("Option", {
             if (invert)
                 values = values[(values.indexOf(String(this.value)) + 1) % values.length]
 
-            dactyl.assert(!isNaN(values) && Number(values) == parseInt(values),
-                          "E521: Number required after := " + this.name + "=" + values);
-
             let value = parseInt(values);
+            dactyl.assert(Number(values) % 1 == 0,
+                          "E521: Number required after =: " + this.name + "=" + values);
 
             switch (operator) {
             case "+":
@@ -773,7 +773,7 @@ var Options = Module("options", {
         let matches, prefix, postfix;
 
         [matches, prefix, ret.name, postfix, ret.valueGiven, ret.operator, ret.value] =
-        args.match(/^\s*(no|inv)?([a-z_.-]*?)([?&!])?\s*(([-+^]?)=(.*))?\s*$/) || [];
+        args.match(/^\s*(no|inv)?([^=]+?)([?&!])?\s*(([-+^]?)=(.*))?\s*$/) || [];
 
         ret.args = args;
         ret.onlyNonDefault = false; // used for :set to print non-default options
@@ -892,7 +892,7 @@ var Options = Module("options", {
                     }
                     else {
                         var [matches, name, postfix, valueGiven, operator, value] =
-                            arg.match(/^\s*?([a-zA-Z0-9\.\-_{}]+?)([?&!])?\s*(([-+^]?)=(.*))?\s*$/);
+                            arg.match(/^\s*?([^=]+?)([?&!])?\s*(([-+^]?)=(.*))?\s*$/);
                         reset = (postfix == "&");
                         invertBoolean = (postfix == "!");
                     }
@@ -918,7 +918,7 @@ var Options = Module("options", {
                             value = true;
                         else if (value == "false")
                             value = false;
-                        else if (!isNaN(value) && parseInt(value) === Number(value))
+                        else if (Number(value) % 1 == 0)
                             value = parseInt(value);
                         else
                             value = Option.dequote(value);

From 83aa5e4857586cca5fb59cbf18e9d1350900bd10 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Tue, 28 Dec 2010 09:25:53 -0500
Subject: [PATCH 29/35] Accept command line arguments in :rehash. Document
 :rehash, add :exttoggle, :extrehash.

--HG--
branch : bootstrapped
---
 common/content/dactyl.js         | 73 +++++++++++++++++++++++++-------
 common/locale/en-US/browsing.xml | 22 ++++++++++
 common/locale/en-US/gui.xml      | 25 ++++++++++-
 common/modules/services.jsm      |  2 +-
 common/modules/util.jsm          |  6 ++-
 pentadactyl/NEWS                 |  2 +-
 6 files changed, 111 insertions(+), 19 deletions(-)

diff --git a/common/content/dactyl.js b/common/content/dactyl.js
index 06756fad..04b4e38d 100644
--- a/common/content/dactyl.js
+++ b/common/content/dactyl.js
@@ -162,7 +162,7 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
                     template.usage(results, params.format));
             },
             {
-                argCount: "*",
+                argCount: "0",
                 completer: function (context, args) {
                     context.keys.text = util.identity;
                     context.keys.description = function () seen[this.text] + " matching items";
@@ -1176,14 +1176,8 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
      * @see Commands#parseArgs
      */
     parseCommandLine: function (cmdline) {
-        const options = [
-            [["+u"], CommandOption.STRING],
-            [["++noplugin"], CommandOption.NOARG],
-            [["++cmd"], CommandOption.STRING, null, null, true],
-            [["+c"], CommandOption.STRING, null, null, true]
-        ].map(CommandOption.fromArray, CommandOption);
         try {
-            return commands.parseArgs(cmdline, { options: options, argCount: "*" });
+            return commands.get("rehash").parseArgs(cmdline);
         }
         catch (e) {
             dactyl.reportError(e, true);
@@ -1688,15 +1682,32 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
                 filter: function ({ item }) !item.userDisabled,
                 perm: "disable"
             },
+            {
+                name: "extr[ehash]",
+                description: "Reload an extension",
+                action: function (addon) {
+                    dactyl.assert(dactyl.has("Gecko2"), "This command is not useful in this version of " + config.host);
+                    util.timeout(function () {
+                        addon.userDisabled = true;
+                        addon.userDisabled = false;
+                    });
+                },
+                filter: function ({ item }) !item.userDisabled,
+                perm: "disable"
+            },
+            {
+                name: "extt[oggle]",
+                description: "Toggle an extension's enabled status",
+                action: function (addon) addon.userDisabled = !addon.userDisabled
+            },
             {
                 name: "extu[pdate]",
                 description: "Update an extension",
                 actions: updateAddons,
-                filter: function ({ item }) !item.userDisabled,
                 perm: "upgrade"
             }
         ].forEach(function (command) {
-            let perm = AddonManager["PERM_CAN_" + command.perm.toUpperCase()];
+            let perm = command.perm && AddonManager["PERM_CAN_" + command.perm.toUpperCase()];
             function ok(addon) !perm || addon.permissions & perm;
             commands.add([command.name],
                 command.description,
@@ -1877,7 +1888,31 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
 
         commands.add(["reh[ash]"],
             "Reload the " + config.appName + " add-on",
-            function () { util.rehash(); });
+            function (args) { util.rehash(args); },
+            {
+                argCount: "0",
+                options: [
+                    {
+                        names: ["+u"],
+                        description: "The initialization file to execute at startup",
+                        type: CommandOption.STRING
+                    },
+                    {
+                        names: ["++noplugin"],
+                        description: "Do not automatically load plugins"
+                    },
+                    {
+                        names: ["++cmd"],
+                        description: "Ex commands to execute prior to initialization",
+                        multiple: true
+                    },
+                    {
+                        names: ["+c"],
+                        description: "Ex commands to execute after initialization",
+                        multiple: true
+                    }
+                ]
+            });
 
         commands.add(["res[tart]"],
             "Force " + config.appName + " to restart",
@@ -2106,10 +2141,15 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
         if (!services.commandLineHandler)
             services.add("commandLineHandler", "@mozilla.org/commandlinehandler/general-startup;1?type=" + config.name);
 
-        if (services.commandLineHandler) {
-            let commandline = services.commandLineHandler.optionValue;
-            if (commandline) {
-                let args = dactyl.parseCommandLine(commandline);
+        try {
+            if (services.fuel)
+                var args = services.fuel.storage.get("dactyl.commandlineArgs", null);
+            if (!args) {
+                let commandline = services.commandLineHandler.optionValue;
+                if (commandline)
+                    args = dactyl.parseCommandLine(commandline);
+            }
+            if (args) {
                 dactyl.commandLineOptions.rcFile = args["+u"];
                 dactyl.commandLineOptions.noPlugins = "++noplugin" in args;
                 dactyl.commandLineOptions.postCommands = args["+c"];
@@ -2117,6 +2157,9 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
                 util.dump("Processing command-line option: " + commandline);
             }
         }
+        catch (e) {
+            dactyl.echoerr("Parsing command line options: " + e);
+        }
 
         dactyl.log("Command-line options: " + util.objectToString(dactyl.commandLineOptions), 3);
 
diff --git a/common/locale/en-US/browsing.xml b/common/locale/en-US/browsing.xml
index 2fa669ff..3fc85879 100644
--- a/common/locale/en-US/browsing.xml
+++ b/common/locale/en-US/browsing.xml
@@ -358,6 +358,28 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to
     </description>
 </item>
 
+<item>
+    <tags>:reh :rehash</tags>
+    <spec>:reh<oa>ash</oa> <oa>arg</oa> …</spec>
+    <description>
+        <p>
+            Reload the &dactyl.appName; add-on, including all code, plugins,
+            and configuration. For users running directly from the development
+            repository, this is a good way to update to the latest version or
+            to test your changes.
+        </p>
+        <p>
+            Any arguments supplied are parsed as command line arguments as
+            specified in <t>startup-options</t>.
+        </p>
+        <warning>
+            Not all plugins are designed to cleanly un-apply during a rehash.
+            While official plugins are safe, beware of possibility instability
+            if you rehash while running third-party plugins.
+        </warning>
+    </description>
+</item>
+
 <item>
     <tags>:re :reload</tags>
     <spec>:re<oa>load</oa><oa>!</oa></spec>
diff --git a/common/locale/en-US/gui.xml b/common/locale/en-US/gui.xml
index 0db9b588..25c34fb6 100644
--- a/common/locale/en-US/gui.xml
+++ b/common/locale/en-US/gui.xml
@@ -153,10 +153,33 @@
     </description>
 </item>
 
+<item>
+    <tags>:extr :extrehash</tags>
+    <spec>:extr<oa>ehash</oa> <a>extension</a></spec>
+    <spec>:extr<oa>ehash</oa></spec>
+    <description>
+        <p>
+            Toggle an extension's enabled status twice. This is useful for rebooting
+            a restartless extension.
+        </p>
+    </description>
+</item>
+
+<item>
+    <tags>:extt :exttoggle</tags>
+    <spec>:extt<oa>oggle</oa> <a>extension</a></spec>
+    <spec>:extt<oa>oggle</oa></spec>
+    <description>
+        <p>
+            Toggle an extension's enabled status.
+        </p>
+    </description>
+</item>
+
 <item>
     <tags>:extu :extupdate</tags>
     <spec>:extu<oa>pdate</oa> <a>extension</a></spec>
-    <spec>:extu<oa>pdate</oa>!</spec>
+    <spec>:extu<oa>pdate</oa><oa>!</oa></spec>
     <description>
         <p>
             Update an extension. When <oa>!</oa> is given, update all
diff --git a/common/modules/services.jsm b/common/modules/services.jsm
index d9d4ad91..8c30b004 100644
--- a/common/modules/services.jsm
+++ b/common/modules/services.jsm
@@ -36,7 +36,7 @@ var Services = Module("Services", {
         this.add("extensionManager",    "@mozilla.org/extensions/manager;1",                Ci.nsIExtensionManager);
         this.add("favicon",             "@mozilla.org/browser/favicon-service;1",           Ci.nsIFaviconService);
         this.add("focus",               "@mozilla.org/focus-manager;1",                     Ci.nsIFocusManager);
-        this.add("fuel",                "@mozilla.org/fuel/application;1",                  Ci.fuelIApplication);
+        this.add("fuel",                "@mozilla.org/fuel/application;1",                  Ci.extIApplication);
         this.add("history",             "@mozilla.org/browser/global-history;2",            [Ci.nsIBrowserHistory, Ci.nsIGlobalHistory3,
                                                                                              Ci.nsINavHistoryService, Ci.nsPIPlacesDatabase]);
         this.add("io",                  "@mozilla.org/network/io-service;1",                Ci.nsIIOService);
diff --git a/common/modules/util.jsm b/common/modules/util.jsm
index c588df6d..a5547713 100644
--- a/common/modules/util.jsm
+++ b/common/modules/util.jsm
@@ -1187,7 +1187,9 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
         getSource: function regexp_getSource(re) re.source.replace(/\\(.)/g, function (m0, m1) m1 === "/" ? "/" : m0)
     }),
 
-    rehash: function () {
+    rehash: function (args) {
+        if (services.fuel)
+            services.fuel.storage.set("dactyl.commandlineArgs", args);
         this.timeout(function () {
             this.rehashing = true;
             this.addon.userDisabled = true;
@@ -1443,6 +1445,8 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
      */
     xmlToDom: function xmlToDom(node, doc, nodes) {
         XML.prettyPrinting = false;
+        if (typeof node === "string") // Sandboxes can't currently pass us XML objects.
+            node = XML(node);
         if (node.length() != 1) {
             let domnode = doc.createDocumentFragment();
             for each (let child in node)
diff --git a/pentadactyl/NEWS b/pentadactyl/NEWS
index 6d42bd9b..1bc353fa 100644
--- a/pentadactyl/NEWS
+++ b/pentadactyl/NEWS
@@ -64,7 +64,7 @@
       * :extadd now supports remote URLs as well as local files on Firefox 4.
       * Added :if/:elseif/:else/:endif conditionals.
       - Added -keyword, -tags, -title to :delbmarks.
-      - Added :extupdate command.
+      - Added :extrehash, :exttoggle, :extupdate, and :rehash commands.
       - Added :feedkeys command.
       - Added -sort option to :history.
       - Added several new options, including -javascript, to :abbrev and :map.

From 9655d741b8ff9e2644482811a9d0d0e86fddd581 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Tue, 28 Dec 2010 14:33:57 -0500
Subject: [PATCH 30/35] Add real mappings for most HINT mode keys. Lazily
 expand leader, and keep in sync with 'mapleader'.

--HG--
branch : bootstrapped
---
 common/content/buffer.js      |   9 +-
 common/content/commandline.js |   3 -
 common/content/dactyl.js      |   4 +-
 common/content/events.js      |  47 +++++---
 common/content/hints.js       | 210 ++++++++++++++++++----------------
 common/content/mappings.js    |  22 +++-
 common/modules/services.jsm   |   1 +
 common/modules/util.jsm       |   2 +-
 8 files changed, 166 insertions(+), 132 deletions(-)

diff --git a/common/content/buffer.js b/common/content/buffer.js
index 0e3f54f2..f5e0725b 100644
--- a/common/content/buffer.js
+++ b/common/content/buffer.js
@@ -1021,11 +1021,10 @@ var Buffer = Module("buffer", {
                 this.callback(file);
             else {
                 this.file = io.createTempFile();
-                var webBrowserPersist = Cc["@mozilla.org/embedding/browser/nsWebBrowserPersist;1"]
-                        .createInstance(Ci.nsIWebBrowserPersist);
-                webBrowserPersist.persistFlags = webBrowserPersist.PERSIST_FLAGS_REPLACE_EXISTING_FILES;
-                webBrowserPersist.progressListener = this;
-                webBrowserPersist.saveURI(uri, null, null, null, null, this.file);
+                var persist = services.Persist();
+                persist.persistFlags = persist.PERSIST_FLAGS_REPLACE_EXISTING_FILES;
+                persist.progressListener = this;
+                persist.saveURI(uri, null, null, null, null, this.file);
             }
             return null;
         },
diff --git a/common/content/commandline.js b/common/content/commandline.js
index a8e58e23..ceaab95d 100644
--- a/common/content/commandline.js
+++ b/common/content/commandline.js
@@ -757,9 +757,6 @@ var CommandLine = Module("commandline", {
      *          the MOW.
      */
     echo: function echo(str, highlightGroup, flags) {
-        if (String(str) == "undefined")
-            util.dumpStack();
-
         // dactyl.echo uses different order of flags as it omits the highlight group, change commandline.echo argument order? --mst
         if (this._silent)
             return;
diff --git a/common/content/dactyl.js b/common/content/dactyl.js
index 04b4e38d..4a29001f 100644
--- a/common/content/dactyl.js
+++ b/common/content/dactyl.js
@@ -2131,12 +2131,12 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
 
         dactyl.log("All modules loaded", 3);
 
-        AddonManager.getAddonByID(services["dactyl:"].addonID, function (addon) {
+        AddonManager.getAddonByID(services["dactyl:"].addonID, this.wrapCallback(function (addon) {
             // @DATE@ token replaced by the Makefile
             // TODO: Find it automatically
             prefs.set("extensions.dactyl.version", addon.version);
             dactyl.version = addon.version + " (created: @DATE@)";
-        });
+        }));
 
         if (!services.commandLineHandler)
             services.add("commandLineHandler", "@mozilla.org/commandlinehandler/general-startup;1?type=" + config.name);
diff --git a/common/content/events.js b/common/content/events.js
index bb6cb901..02944678 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -47,19 +47,29 @@ var Events = Module("events", {
         this._keyTable = {
             add: ["Plus", "Add"],
             back_space: ["BS"],
+            count: ["count"],
             delete: ["Del"],
             escape: ["Esc", "Escape"],
             insert: ["Insert", "Ins"],
+            leader: ["Leader"],
             left_shift: ["LT", "<"],
+            nop: ["Nop"],
             return: ["Return", "CR", "Enter"],
             right_shift: [">"],
             space: ["Space", " "],
             subtract: ["Minus", "Subtract"]
         };
 
+        this._pseudoKeys = set(["count", "leader", "nop"]);
+
+        this._key_key = {};
         this._code_key = {};
         this._key_code = {};
 
+        for (let list in values(this._keyTable))
+            for (let v in values(list))
+                this._key_key[v.toLowerCase()] = v;
+
         for (let [k, v] in Iterator(KeyEvent)) {
             k = k.substr(7).toLowerCase();
             let names = [k.replace(/(^|_)(.)/g, function (m, n1, n2) n2.toUpperCase())
@@ -67,8 +77,10 @@ var Events = Module("events", {
             if (k in this._keyTable)
                 names = this._keyTable[k];
             this._code_key[v] = names[0];
-            for (let [, name] in Iterator(names))
+            for (let [, name] in Iterator(names)) {
+                this._key_key[name.toLowerCase()] = name;
                 this._key_code[name.toLowerCase()] = v;
+            }
         }
 
         // HACK: as Gecko does not include an event for <, we must add this in manually.
@@ -436,7 +448,7 @@ var Events = Module("events", {
                     keyname = String.fromCharCode(parseInt(keyname.substr(1), 16));
 
                 if (keyname && (unknownOk || keyname.length == 1 || /mouse$/.test(keyname) ||
-                                this._key_code[keyname] || keyname == "nop")) {
+                                this._key_code[keyname] || set.has(this._pseudoKeys, keyname))) {
                     evt_obj.ctrlKey  = /C-/.test(modifier);
                     evt_obj.altKey   = /A-/.test(modifier);
                     evt_obj.shiftKey = /S-/.test(modifier);
@@ -451,8 +463,8 @@ var Events = Module("events", {
 
                         evt_obj.charCode = keyname.charCodeAt(0);
                     }
-                    else if (keyname == "nop") {
-                        evt_obj.dactylString = "<Nop>";
+                    else if (set.has(this._pseudoKeys)) {
+                        evt_obj.dactylString = "<" + this._key_key[keyname] + ">";
                     }
                     else if (/mouse$/.test(keyname)) { // mouse events
                         evt_obj.type = (/2-/.test(modifier) ? "dblclick" : "click");
@@ -576,7 +588,7 @@ var Events = Module("events", {
                 }
             }
             if (key == null)
-                key = event.dactylKeyname;
+                key = this._key_key[event.dactylKeyname] || event.dactylKeyname;
             if (key == null)
                 return null;
         }
@@ -1070,9 +1082,9 @@ var Events = Module("events", {
             const self = this;
 
             let key = events.toString(event);
-            let [, countStr, candidateCommand] = /^((?:[1-9][0-9]*)?)(.*)/.exec(this.buffer + key);
+            let [, countStr, command] = /^((?:[1-9][0-9]*)?)(.*)/.exec(this.buffer + key);
 
-            let map = mappings[event.noremap ? "getDefault" : "get"](this.main, candidateCommand);
+            let map = mappings[event.noremap ? "getDefault" : "get"](this.main, command);
 
             function execute(map) {
                 if (self.preExecute)
@@ -1083,7 +1095,7 @@ var Events = Module("events", {
                 return res;
             }
 
-            let candidates = mappings.getCandidates(this.main, candidateCommand);
+            let candidates = mappings.getCandidates(this.main, command);
             if (candidates.length == 0 && !map) {
                 map = this.pendingMap;
                 this.pendingMap = null;
@@ -1092,7 +1104,7 @@ var Events = Module("events", {
             }
 
             // counts must be at the start of a complete mapping (10j -> go 10 lines down)
-            if (countStr && !candidateCommand) {
+            if (countStr && !command) {
                 // no count for insert mode mappings
                 if (!this.main.count)
                     return this.append(event);
@@ -1102,9 +1114,9 @@ var Events = Module("events", {
                     this.append(event);
             }
             else if (this.pendingArgMap) {
-                let map = this.pendingArgMap;
+                let [map, command] = this.pendingArgMap;
                 if (!Events.isEscape(key))
-                    execute(map, null, this.count, key);
+                    execute(map, null, this.count, key, command);
                 return true;
             }
             else if (map && !event.skipmap && candidates.length == 0) {
@@ -1118,27 +1130,28 @@ var Events = Module("events", {
 
                 if (map.arg) {
                     this.append(event);
-                    this.pendingArgMap = map;
+                    this.pendingArgMap = [map, command];
                 }
                 else if (this.pendingMotionMap) {
+                    let [map, command] = this.pendingMotionMap;
                     if (!Events.isEscape(key))
-                        execute(this.pendingMotionMap, candidateCommand, this.motionCount || this.count, null);
+                        execute(map, command, this.motionCount || this.count, null, command);
                     return true;
                 }
                 else if (map.motion) {
                     this.buffer = "";
-                    this.pendingMotionMap = map;
+                    this.pendingMotionMap = [map, command];
                 }
                 else {
                     if (modes.replaying && !this.waitForPageLoad())
                         return true;
 
-                    return !execute(map, null, this.count) || !map.route
+                    return !execute(map, null, this.count, null, command) || !map.route
                 }
             }
-            else if (mappings.getCandidates(this.main, candidateCommand).length > 0 && !event.skipmap) {
+            else if (mappings.getCandidates(this.main, command).length > 0 && !event.skipmap) {
                 this.append(event);
-                this.pendingMap = map;
+                this.pendingMap = [map, command];
             }
             else {
                 this.append(event);
diff --git a/common/content/hints.js b/common/content/hints.js
index f71d07b7..b2e97bd5 100644
--- a/common/content/hints.js
+++ b/common/content/hints.js
@@ -74,6 +74,15 @@ var Hints = Module("hints", {
             Buffer.isScrollable(elem, 0, true) || Buffer.isScrollable(elem, 0, false);
     },
 
+    /**
+     * Clear any timeout which might be active after pressing a number
+     */
+    clearTimeout: function () {
+        if (this._activeTimeout)
+            this._activeTimeout.cancel();
+        this._activeTimeout = null;
+    },
+
     /**
      * Reset hints, so that they can be cleanly used again.
      */
@@ -92,10 +101,7 @@ var Hints = Module("hints", {
         this._pageHints = [];
         this._validHints = [];
         this._docs = [];
-
-        if (this._activeTimeout)
-            this._activeTimeout.cancel();
-        this._activeTimeout = null;
+        this.clearTimeout();
     },
     __reset: function __reset() {
         if (!this._usedTabKey)
@@ -582,11 +588,7 @@ var Hints = Module("hints", {
     _onInput: function _onInput(event) {
         this.prevInput = "text";
 
-        // clear any timeout which might be active after pressing a number
-        if (this._activeTimeout) {
-            this._activeTimeout.cancel();
-            this._activeTimeout = null;
-        }
+        this.clearTimeout();
 
         this._hintNumber = 0;
         this._hintString = commandline.command;
@@ -896,104 +898,38 @@ var Hints = Module("hints", {
      */
     onEvent: function onEvent(event) {
         let key = events.toString(event);
-        let followFirst = false;
 
-        // clear any timeout which might be active after pressing a number
-        if (this._activeTimeout) {
-            this._activeTimeout.cancel();
-            this._activeTimeout = null;
-        }
+        this.clearTimeout();
 
-        switch (key) {
-        case "<Return>":
-            followFirst = true;
-            break;
+        if (!this.escNumbers && this.isHintKey(key)) {
+            this.prevInput = "number";
 
-        case "<Tab>":
-        case "<S-Tab>":
-            this._usedTabKey = true;
-            if (this._hintNumber == 0)
-                this._hintNumber = 1;
-
-            let oldId = this._hintNumber;
-            if (key == "<Tab>") {
-                if (++this._hintNumber > this._validHints.length)
-                    this._hintNumber = 1;
-            }
-            else {
-                if (--this._hintNumber < 1)
-                    this._hintNumber = this._validHints.length;
-            }
-            this._showActiveHint(this._hintNumber, oldId);
-            this._updateStatusline();
-            return false;
-
-        case "<BS>":
-            if (this.prevInput !== "number")
-                return true;
-
-            if (this._hintNumber > 0 && !this._usedTabKey) {
-                this._hintNumber = Math.floor(this._hintNumber / this.hintKeys.length);
-                if (this._hintNumber == 0)
-                    this.prevInput = "text";
-            }
-            else {
-                this._usedTabKey = false;
+            let oldHintNumber = this._hintNumber;
+            if (this._usedTabKey) {
                 this._hintNumber = 0;
-                dactyl.beep();
+                this._usedTabKey = false;
+            }
+            this._hintNumber = this._hintNumber * this.hintKeys.length +
+                this.hintKeys.indexOf(key);
+
+            this._updateStatusline();
+
+            if (!this._canUpdate)
                 return;
-            }
-            break;
 
-       case options["mapleader"]:
-           hints.escNumbers = !hints.escNumbers;
-           if (hints.escNumbers && this._usedTabKey)
-               this._hintNumber = 0;
-
-           this._updateStatusline();
-           return false;
-
-        default:
-            if (!this.escNumbers && this.isHintKey(key)) {
-                this.prevInput = "number";
-
-                let oldHintNumber = this._hintNumber;
-                if (this._usedTabKey) {
-                    this._hintNumber = 0;
-                    this._usedTabKey = false;
-                }
-                this._hintNumber = this._hintNumber * this.hintKeys.length +
-                    this.hintKeys.indexOf(key);
-
-                this._updateStatusline();
-
-                if (!this._canUpdate)
-                    return;
-
-                if (this._docs.length == 0) {
-                    this._generate();
-                    this._showHints();
-                }
-                this._showActiveHint(this._hintNumber, oldHintNumber || 1);
-
-                dactyl.assert(this._hintNumber != 0);
-
-                this._checkUnique();
-                return false;
-            }
-            return true;
-        }
-
-        this._updateStatusline();
-
-        if (this._canUpdate) {
-            if (this._docs.length == 0 && this._hintString.length > 0)
+            if (this._docs.length == 0) {
                 this._generate();
+                this._showHints();
+            }
+            this._showActiveHint(this._hintNumber, oldHintNumber || 1);
 
-            this._showHints();
-            this._processHints(followFirst);
+            dactyl.assert(this._hintNumber != 0);
+
+            this._checkUnique();
+            return false;
         }
-        return false;
+
+        return !Events.isEscape(key);
     }
     //}}}
 }, {
@@ -1118,6 +1054,84 @@ var Hints = Module("hints", {
             "Start an extended hint mode and stay there until <Esc> is pressed",
             function (count) { hints.open("g;", { continue: true, count: count }); },
             { count: true });
+
+        function update(followFirst) {
+            hints.clearTimeout();
+            hints._updateStatusline();
+
+            if (hints._canUpdate) {
+                if (hints._docs.length == 0 && hints._hintString.length > 0)
+                    hints._generate();
+
+                hints._showHints();
+                hints._processHints(followFirst);
+            }
+        }
+
+        mappings.add(modes.HINTS, ["<Return>"],
+            "Follow the selected hint",
+            function () { update(true) });
+
+        function tab(previous) {
+            hints.clearTimeout();
+            this._usedTabKey = true;
+            if (this._hintNumber == 0)
+                this._hintNumber = 1;
+
+            let oldId = this._hintNumber;
+            if (!previous) {
+                if (++this._hintNumber > this._validHints.length)
+                    this._hintNumber = 1;
+            }
+            else {
+                if (--this._hintNumber < 1)
+                    this._hintNumber = this._validHints.length;
+            }
+
+            this._showActiveHint(this._hintNumber, oldId);
+            this._updateStatusline();
+        }
+
+        mappings.add(modes.HINTS, ["<Tab>"],
+            "Focus the next matching hint",
+            function () { tab.call(hints, false) });
+
+        mappings.add(modes.HINTS, ["<S-Tab>"],
+            "Focus the previous matching hint",
+            function () { tab.call(hints, true) });
+
+        mappings.add(modes.HINTS, ["<BS>", "<C-h>"],
+            "Delete the previous character",
+            function () {
+                hints.clearTimeout();
+                if (hints.prevInput !== "number")
+                    return true;
+
+                if (hints._hintNumber > 0 && !hints._usedTabKey) {
+                    hints._hintNumber = Math.floor(hints._hintNumber / hints.hintKeys.length);
+                    if (hints._hintNumber == 0)
+                        hints.prevInput = "text";
+                    update(false);
+                }
+                else {
+                    hints._usedTabKey = false;
+                    hints._hintNumber = 0;
+                    dactyl.beep();
+                }
+                return false;
+            },
+            { route: true });
+
+        mappings.add(modes.HINTS, ["<Leader>"],
+            "Toggle hint filtering",
+            function () {
+                hints.clearTimeout();
+                hints.escNumbers = !hints.escNumbers;
+                if (hints.escNumbers && hints._usedTabKey)
+                    hints._hintNumber = 0;
+
+                hints._updateStatusline();
+            });
     },
     options: function () {
         const DEFAULT_HINTTAGS =
diff --git a/common/content/mappings.js b/common/content/mappings.js
index d3a2a25d..a84bbf92 100644
--- a/common/content/mappings.js
+++ b/common/content/mappings.js
@@ -90,7 +90,9 @@ var Map = Class("Map", {
      * @param {string} name The name to query.
      * @returns {boolean}
      */
-    hasName: function (name) this.names.indexOf(name) >= 0,
+    hasName: function (name) this.keys.indexOf(name) >= 0,
+
+    keys: Class.memoize(function () this.names.map(mappings._expandLeader)),
 
     /**
      * Execute the action for this mapping.
@@ -102,7 +104,7 @@ var Map = Class("Map", {
      * @param {string} argument The normal argument if accepted by this
      *     mapping. E.g. "a" for "ma"
      */
-    execute: function (motion, count, argument) {
+    execute: function (motion, count, argument, command) {
         let args = [];
 
         if (this.motion)
@@ -111,6 +113,7 @@ var Map = Class("Map", {
             args.push(count);
         if (this.arg)
             args.push(argument);
+        args.push(command);
 
         let self = this;
         function repeat() self.action.apply(self, args);
@@ -153,10 +156,9 @@ var Mappings = Module("mappings", {
     _getMap: function (mode, cmd, stack) {
         let maps = stack[mode] || [];
 
-        for (let [, map] in Iterator(maps)) {
+        for (let [, map] in Iterator(maps))
             if (map.hasName(cmd))
                 return map;
-        }
 
         return null;
     },
@@ -233,7 +235,6 @@ var Mappings = Module("mappings", {
      * @optional
      */
     addUserMap: function (modes, keys, description, action, extra) {
-        keys = keys.map(this._expandLeader);
         extra = extra || {};
         extra.user = true;
         let map = Map(modes, keys, description, action, extra);
@@ -631,7 +632,16 @@ var Mappings = Module("mappings", {
     options: function () {
         options.add(["mapleader", "ml"],
             "Define the replacement keys for the <Leader> pseudo-key",
-            "string", "\\");
+            "string", "\\", {
+                setter: function (value) {
+                    if (this.hasChanged)
+                        for (let hive in values([mappings._user, mappings._main]))
+                            for (let mode in values(hive))
+                                for (let map in values(mode))
+                                    delete map.keys;
+                    return value;
+                }
+            });
     }
 });
 
diff --git a/common/modules/services.jsm b/common/modules/services.jsm
index 8c30b004..c29ecb95 100644
--- a/common/modules/services.jsm
+++ b/common/modules/services.jsm
@@ -66,6 +66,7 @@ var Services = Module("Services", {
         this.addClass("Find",         "@mozilla.org/embedcomp/rangefind;1",        Ci.nsIFind);
         this.addClass("HtmlConverter","@mozilla.org/widget/htmlformatconverter;1", Ci.nsIFormatConverter);
         this.addClass("HtmlEncoder",  "@mozilla.org/layout/htmlCopyEncoder;1",     Ci.nsIDocumentEncoder);
+        this.addClass("Persist",      "@mozilla.org/embedding/browser/nsWebBrowserPersist;1", Ci.nsIWebBrowserPersist);
         this.addClass("Process",      "@mozilla.org/process/util;1",               Ci.nsIProcess, "init");
         this.addClass("String",       "@mozilla.org/supports-string;1",            Ci.nsISupportsString);
         this.addClass("Timer",        "@mozilla.org/timer;1",                      Ci.nsITimer, "initWithCallback");
diff --git a/common/modules/util.jsm b/common/modules/util.jsm
index a5547713..cb8c65b6 100644
--- a/common/modules/util.jsm
+++ b/common/modules/util.jsm
@@ -486,7 +486,7 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
      */
     dumpStack: function dumpStack(msg, frames) {
         let stack = util.stackLines(Error().stack);
-        stack = stack.slice(2, 2 + (frames || stack.length)).join("\n").replace(/^/gm, "    ");
+        stack = stack.slice(1, 1 + (frames || stack.length)).join("\n").replace(/^/gm, "    ");
         util.dump((arguments.length == 0 ? "Stack" : msg) + "\n" + stack + "\n");
     },
 

From aec00dd4be75df1b0b6562e4bd851abfe66aae37 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Tue, 28 Dec 2010 14:58:58 -0500
Subject: [PATCH 31/35] Fix bug in last commit.

--HG--
branch : bootstrapped
---
 common/content/events.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/content/events.js b/common/content/events.js
index 02944678..666df991 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -1097,7 +1097,7 @@ var Events = Module("events", {
 
             let candidates = mappings.getCandidates(this.main, command);
             if (candidates.length == 0 && !map) {
-                map = this.pendingMap;
+                [map, command] = this.pendingMap || [];
                 this.pendingMap = null;
                 if (map && map.arg)
                     this.pendingArgMap = map;

From 53f9181b09717805e0732d28f14985d5f9300d2b Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Tue, 28 Dec 2010 15:19:07 -0500
Subject: [PATCH 32/35] [bootstrap] Fix highlighting the statusline and visual
 bell after rehash.

--HG--
branch : bootstrapped
---
 common/content/dactyl.js     | 33 +++++++++++++++++++++------------
 common/content/options.js    |  2 +-
 common/content/statusline.js |  2 +-
 common/modules/util.jsm      | 12 ++++++------
 4 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/common/content/dactyl.js b/common/content/dactyl.js
index 4a29001f..26ec0c30 100644
--- a/common/content/dactyl.js
+++ b/common/content/dactyl.js
@@ -192,21 +192,30 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
      */
     beep: function () {
         if (options["visualbell"]) {
-            let bell  = document.getElementById("dactyl-bell");
-            let strut = document.getElementById("dactyl-bell-strut");
-            if (!bell) {
-                bell = document.documentElement.insertBefore(
-                    util.xmlToDom(<hbox xmlns={XUL} style="display: none" highlight="Bell" id="dactyl-bell"/>, document),
-                    document.documentElement.firstChild);
-                strut = document.documentElement.appendChild(
-                    util.xmlToDom(<hbox xmlns={XUL} style="display: none" highlight="Bell" id="dactyl-bell-strut"/>, document));
+            let elems = {
+                bell: document.getElementById("dactyl-bell"),
+                strut: document.getElementById("dactyl-bell-strut")
             }
+            if (!elems.bell)
+                util.overlayWindow(window, {
+                    objects: elems,
+                    prepend: <>
+                        <window id={document.documentElement.id} xmlns={XUL}>
+                            <hbox style="display: none" highlight="Bell" id="dactyl-bell" key="bell"/>
+                        </window>
+                    </>,
+                    append: <>
+                        <window id={document.documentElement.id} xmlns={XUL}>
+                            <hbox style="display: none" highlight="Bell" id="dactyl-bell-strut" key="strut"/>
+                        </window>
+                    </>
+                }, elems);
 
-            bell.style.height = window.innerHeight + "px";
-            strut.style.marginBottom = -window.innerHeight + "px";
-            strut.style.display = bell.style.display = "";
+            elems.bell.style.height = window.innerHeight + "px";
+            elems.strut.style.marginBottom = -window.innerHeight + "px";
+            elems.strut.style.display = elems.bell.style.display = "";
 
-            util.timeout(function () { strut.style.display = bell.style.display = "none"; }, 20);
+            util.timeout(function () { elems.strut.style.display = elems.bell.style.display = "none"; }, 20);
         }
         else {
             let soundService = Cc["@mozilla.org/sound;1"].getService(Ci.nsISound);
diff --git a/common/content/options.js b/common/content/options.js
index 33001b3e..69aca5e9 100644
--- a/common/content/options.js
+++ b/common/content/options.js
@@ -82,7 +82,7 @@ var Option = Class("Option", {
     get isDefault() this.stringValue === this.stringDefaultValue,
 
     /** @property {value} The option's global value. @see #scope */
-    get globalValue() options.store.get(this.name, {}).value,
+    get globalValue() { try { return options.store.get(this.name, {}).value } catch (e) { util.reportError(e); throw e; } },
     set globalValue(val) { options.store.set(this.name, { value: val, time: Date.now() }); },
 
     /**
diff --git a/common/content/statusline.js b/common/content/statusline.js
index 6d3cb454..baeb4f49 100644
--- a/common/content/statusline.js
+++ b/common/content/statusline.js
@@ -26,7 +26,7 @@ var StatusLine = Module("statusline", {
 
         let _commandline = "if (window.dactyl) return dactyl.modules.commandline";
         let prepend = <e4x xmlns={XUL} xmlns:dactyl={NS}>
-            <statusbar id="status-bar" highlight="StatusLine StatusNormal">
+            <statusbar id="status-bar" highlight="StatusLine StatusLineNormal">
                 <!-- insertbefore="dactyl.statusBefore;" insertafter="dactyl.statusAfter;" -->
                 <hbox style="background: inherit;" key="container"  flex="1" hidden="false" align="center">
                     <stack orient="horizontal" align="stretch"      flex="1" class="dactyl-container" highlight="CmdLine StatusCmdLine">
diff --git a/common/modules/util.jsm b/common/modules/util.jsm
index cb8c65b6..156158ee 100644
--- a/common/modules/util.jsm
+++ b/common/modules/util.jsm
@@ -996,7 +996,10 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
                             doc.dactylOverlayElements.push(n);
                         fn(elem, node);
                         for each (let attr in attr || []) // FIXME: Cleanup...
-                            elem.setAttributeNS(attr.namespace(), attr.localName(), attr);
+                            if (attr.name() != "highlight")
+                                elem.setAttributeNS(attr.namespace(), attr.localName(), String(attr));
+                            else
+                                highlight.highlightNode(elem, String(attr));
                     }
                 }
             }
@@ -1461,11 +1464,8 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
             for each (let attr in node.@*::*)
                 if (attr.name() != "highlight")
                     domnode.setAttributeNS(attr.namespace(), attr.localName(), String(attr));
-                else {
-                    domnode.setAttributeNS(NS.uri, "highlight", String(attr));
-                    for each (let h in String.split(attr, " "))
-                        highlight.loaded[h] = true;
-                }
+                else
+                    highlight.highlightNode(domnode, String(attr));
 
             for each (let child in node.*::*)
                 domnode.appendChild(xmlToDom(child, doc, nodes));

From cc9ef60b63215353a0cde0245d398e826a8c289e Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Tue, 28 Dec 2010 16:42:55 -0500
Subject: [PATCH 33/35] Hopefully deal with our lost focus issues once and for
 all.

Update issue 131
Status: Started
This should hopefully take care of this issue.

Update issue 212
Status: Started
This should hopefully take care of this issue.

--HG--
branch : bootstrapped
---
 common/content/commandline.js |  4 +---
 common/content/events.js      | 10 ++++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/common/content/commandline.js b/common/content/commandline.js
index ceaab95d..3cf54785 100644
--- a/common/content/commandline.js
+++ b/common/content/commandline.js
@@ -623,10 +623,8 @@ var CommandLine = Module("commandline", {
             this.widgets.message = null;
         if (modes.main != modes.COMMAND_LINE)
             this.widgets.command = null;
-        if (modes.main == modes.OUTPUT_MULTILINE && this.widgets.multilineOutput.atEnd) {
-            dactyl.focusContent();
+        if (modes.main == modes.OUTPUT_MULTILINE && this.widgets.multilineOutput.atEnd)
             modes.pop();
-        }
         if (modes.main != modes.OUTPUT_MULTILINE)
             this.multilineOutputVisible = false;
     },
diff --git a/common/content/events.js b/common/content/events.js
index 666df991..0c3b5a7a 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -93,6 +93,7 @@ var Events = Module("events", {
         this._activeMenubar = false;
         this.addSessionListener(window, "DOMMenuBarActive", this.onDOMMenuBarActive, true);
         this.addSessionListener(window, "DOMMenuBarInactive", this.onDOMMenuBarInactive, true);
+        this.addSessionListener(window, "blur", this.onBlur, true);
         this.addSessionListener(window, "focus", this.onFocus, true);
         this.addSessionListener(window, "keydown", this.onKeyUpOrDown, true);
         this.addSessionListener(window, "keypress", this.onKeyPress, true);
@@ -724,6 +725,15 @@ var Events = Module("events", {
         }
     },
 
+    onBlur: function onFocus(event) {
+        if (event.originalTarget instanceof Window && services.focus.activeWindow == null)
+            // Deals with circumstances where, after the main window
+            // blurs while a collapsed frame has focus, re-activating
+            // the main window does not restore focus and we lose key
+            // input.
+            services.focus.clearFocus(window);
+    },
+
     // TODO: Merge with onFocusChange
     onFocus: function onFocus(event) {
         let elem = event.originalTarget;

From e804d51448a16e22d44afada50f28afdc588047d Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Tue, 28 Dec 2010 17:20:28 -0500
Subject: [PATCH 34/35] Fix activating scrollable elements via ;F.

--HG--
branch : bootstrapped
---
 common/content/buffer.js  |  7 ++++++-
 common/modules/styles.jsm | 28 +++++++++-------------------
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/common/content/buffer.js b/common/content/buffer.js
index f5e0725b..bd468b65 100644
--- a/common/content/buffer.js
+++ b/common/content/buffer.js
@@ -539,7 +539,12 @@ var Buffer = Module("buffer", {
             buffer.lastInputField = elem;
         }
         else {
-            dactyl.focus(elem);
+            if (isinstance(elem, [HTMLInputElement, XULTextBoxElement]))
+                var flags = services.focus.FLAG_BYMOUSE;
+            else
+                flags = services.focus.FLAG_SHOWRING;
+            dactyl.focus(elem, flags);
+
             if (elem instanceof Window) {
                 let sel = elem.getSelection();
                 if (sel && !sel.rangeCount)
diff --git a/common/modules/styles.jsm b/common/modules/styles.jsm
index 01d3b7c3..b31df65a 100644
--- a/common/modules/styles.jsm
+++ b/common/modules/styles.jsm
@@ -363,31 +363,21 @@ var Styles = Module("Styles", {
     commands: function (dactyl, modules, window) {
         const commands = modules.commands;
 
-        const queue = [];
-        const timer = Timer(10, 10, function () {
-            let args = queue.shift()
-            let [filter, css] = args;
-            if ("-append" in args) {
-                let sheet = styles.user.get(args["-name"]);
-                if (sheet) {
-                    filter = sheet.sites.concat(filter).join(",");
-                    css = sheet.css + " " + css;
-
-                }
-            }
-            styles.user.add(args["-name"], filter, css, args["-agent"]);
-
-            if (queue.length)
-                timer.tell();
-        });
         commands.add(["sty[le]"],
             "Add or list user styles",
             function (args) {
                 let [filter, css] = args;
 
                 if (css) {
-                    queue.push(args);
-                    timer.tell(args);
+                    if ("-append" in args) {
+                        let sheet = styles.user.get(args["-name"]);
+                        if (sheet) {
+                            filter = sheet.sites.concat(filter).join(",");
+                            css = sheet.css + " " + css;
+
+                        }
+                    }
+                    styles.user.add(args["-name"], filter, css, args["-agent"]);
                 }
                 else {
                     let list = styles.user.sheets.slice()

From 8abe4fd921540a6a668f46d1c5bbb04b26de8e58 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Tue, 28 Dec 2010 17:27:44 -0500
Subject: [PATCH 35/35] Change the order of nodeset filter application in hint
 generation.

--HG--
branch : bootstrapped
---
 common/content/hints.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/common/content/hints.js b/common/content/hints.js
index b2e97bd5..0bdd1d83 100644
--- a/common/content/hints.js
+++ b/common/content/hints.js
@@ -304,14 +304,12 @@ var Hints = Module("hints", {
 
             let mode = this._hintMode;
             let res = util.evaluateXPath(mode.xpath, doc, null, true);
-            if (mode.filter)
-                res = let (orig = res) (e for (e in orig) if (mode.filter(e)));
 
             let start = this._pageHints.length;
             for (let elem in res) {
                 let hint = { elem: elem, showText: false };
 
-                if (!isVisible(elem))
+                if (!isVisible(elem) || mode.filter && !mode.filter(elem))
                     continue;
 
                 if (elem.hasAttributeNS(NS, "hint"))