40 files changed, 84 insertions, 79 deletions

diff --git a/common/content/bookmarks.js b/common/content/bookmarks.js
index 5a1f297e..2f4700dc 100644
--- a/common/content/bookmarks.js
+++ b/common/content/bookmarks.js
@@ -117,24 +117,20 @@ const Bookmarks = Module("bookmarks", {
     // also ensures that each search engine has a Dactyl-friendly alias
     getSearchEngines: function getSearchEngines() {
         let searchEngines = [];
+        let aliases = {};
         for (let [, engine] in Iterator(services.get("browserSearch").getVisibleEngines({}))) {
             let alias = engine.alias;
-            if (!alias || !/^[a-z0-9_-]+$/.test(alias))
+            if (!alias || !/^[a-z_-]+$/.test(alias))
                 alias = engine.name.replace(/^\W*([a-zA-Z_-]+).*/, "$1").toLowerCase();
             if (!alias)
                 alias = "search"; // for search engines which we can't find a suitable alias
 
-            // make sure we can use search engines which would have the same alias (add numbers at the end)
-            let newAlias = alias;
-            for (let j = 1; j <= 10; j++) { // <=10 is intentional
-                if (!searchEngines.some(function (item) item[0] == newAlias))
-                    break;
-
-                newAlias = alias + j;
-            }
-            // only write when it changed, writes are really slow
-            if (engine.alias != newAlias)
-                engine.alias = newAlias;
+            if (set.has(aliases, alias))
+                alias += ++aliases[alias];
+            else
+                aliases[alias] = 0;
+            if (engine.alias != alias)
+                engine.alias = alias;
 
             searchEngines.push([engine.alias, engine.description, engine.iconURI && engine.iconURI.spec]);
         }
diff --git a/common/content/completion.js b/common/content/completion.js
index a741302c..26846834 100644
--- a/common/content/completion.js
+++ b/common/content/completion.js
@@ -316,7 +316,7 @@ const CompletionContext = Class("CompletionContext", {
     get message() this._message || (this.waitingForTab ? "Waiting for <Tab>" : null),
     set message(val) this._message = val,
 
-    get proto() {
+    get itemPrototype() {
         let res = {};
         function result(quote) {
             yield ["result", quote ? function () quote[0] + quote[1](this.text) + quote[2]
@@ -444,9 +444,9 @@ const CompletionContext = Class("CompletionContext", {
 
         try {
             // Item prototypes
-            let proto = this.proto;
+            let proto = this.itemPrototype;
             if (!this.cache.constructed)
-                this.cache.constructed = items.map(function (item) Object.create(proto, { item: { value: item, enumerable: true } }));
+                this.cache.constructed = items.map(function (item) ({ __proto__: proto, item: item }));
 
             // Filters
             let filtered = this.filterFunc(this.cache.constructed);
diff --git a/common/content/dactyl.xul b/common/content/dactyl.xul
index 683b9561..1e95af9a 100644
--- a/common/content/dactyl.xul
+++ b/common/content/dactyl.xul
@@ -53,9 +53,8 @@
                     oncommandupdate="&events;.onSelectionChange(event);"/>
     </window>
 
-    <vbox id="browser-bottombox">
-        <!-- As of Firefox 3.1pre, iframe.height changes do not seem to have immediate effect,
-             therefore we need to put them into a <vbox> for which that works just fine -->
+    <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"
diff --git a/common/content/javascript.js b/common/content/javascript.js
index 5c1b3e73..ae7c2658 100644
--- a/common/content/javascript.js
+++ b/common/content/javascript.js
@@ -610,10 +610,10 @@ const JavaScript = Module("javascript", {
         "ROCSSPrimitiveValue", "RangeError", "ReferenceError", "RegExp",
         "StopIteration", "String", "SyntaxError", "TypeError", "URIError",
         "Uint16Array", "Uint32Array", "Uint8Array", "XML",
-        "XMLHttpProgressEvent", "XMLList", "XMLSerializer", "XULControllers",
-        "decodeURI", "decodeURIComponent", "encodeURI", "encodeURIComponent",
-        "eval", "isFinite", "isNaN", "isXMLName", "parseFloat", "parseInt",
-        "undefined", "uneval"
+        "XMLHttpProgressEvent", "XMLList", "XMLSerializer", "XPCNativeWrapper",
+        "XPCSafeJSWrapper", "XULControllers", "decodeURI", "decodeURIComponent",
+        "encodeURI", "encodeURIComponent", "eval", "isFinite", "isNaN",
+        "isXMLName", "parseFloat", "parseInt", "undefined", "uneval"
     ].concat([k.substr(6) for (k in keys(Ci)) if (/^nsIDOM/.test(k))])
      .concat([k.substr(3) for (k in keys(Ci)) if (/^nsI/.test(k))])
      .filter(function (k) k in window))),
diff --git a/common/modules/base.jsm b/common/modules/base.jsm
index 5a2f6627..3a0fb683 100644
--- a/common/modules/base.jsm
+++ b/common/modules/base.jsm
@@ -572,7 +572,8 @@ function update(target) {
             if (typeof desc.value == "function" && Object.getPrototypeOf(target)) {
                 let func = desc.value;
                 desc.value.superapply = function (self, args)
-                    Object.getPrototypeOf(target)[k].apply(self, args);
+                    let (meth = Object.getPrototypeOf(target)[k])
+                        meth && meth.apply(self, args);
                 desc.value.supercall = function (self)
                     func.superapply(self, Array.slice(arguments, 1));
             }
diff --git a/xulmus/AUTHORS b/melodactyl/AUTHORS
index 4c5be983..4c5be983 100644
--- a/xulmus/AUTHORS
+++ b/melodactyl/AUTHORS
diff --git a/melodactyl/Makefile b/melodactyl/Makefile
new file mode 100644
index 00000000..3ac51eb2
--- /dev/null
+++ b/melodactyl/Makefile
@@ -0,0 +1,11 @@
+#### configuration
+
+NAME          = melodactyl
+
+FIREFOX      ?= songbird
+HOSTAPP      ?= $(SONGBIRD)
+PROFILEPATHS ?= "$$HOME/.songbird" \
+		"$$HOME/Library/Songbird" \
+		"$$APPDATA/Songbird"
+
+include ../common/Makefile
diff --git a/xulmus/NEWS b/melodactyl/NEWS
index a50e9b8e..a50e9b8e 100755
--- a/xulmus/NEWS
+++ b/melodactyl/NEWS
diff --git a/xulmus/TODO b/melodactyl/TODO
index e175284f..e175284f 100644
--- a/xulmus/TODO
+++ b/melodactyl/TODO
diff --git a/melodactyl/chrome.manifest b/melodactyl/chrome.manifest
new file mode 100644
index 00000000..b39e9180
--- /dev/null
+++ b/melodactyl/chrome.manifest
@@ -0,0 +1,37 @@
+# Songbird
+content  melodactyl               content/
+skin     melodactyl classic/1.0   skin/
+locale   melodactyl     en-US     locale/en-US/
+locale   dactyl  en-US     ../common/locale/en-US/
+
+content  dactyl             ../common/content/
+resource dactyl             ../common/modules/
+skin     dactyl classic/1.0 ../common/skin/
+
+override chrome://dactyl/content/dactyl.dtd chrome://melodactyl/content/dactyl.dtd
+override chrome://dactyl/content/config.js	  chrome://melodactyl/content/config.js
+
+overlay  chrome://songbird/content/xul/layoutBaseOverlay.xul chrome://melodactyl/content/melodactyl.xul
+overlay  chrome://songbird/content/xul/layoutBaseOverlay.xul chrome://dactyl/content/dactyl.xul
+
+#component {16dc34f7-6d22-4aa4-a67f-2921fb5dcb69} components/commandline-handler.js
+#contract  @mozilla.org/commandlinehandler/general-startup;1?type=melodactyl {16dc34f7-6d22-4aa4-a67f-2921fb5dcb69}
+#category  command-line-handler m-melodactyl @mozilla.org/commandlinehandler/general-startup;1?type=melodactyl
+#
+#component {c1b67a07-18f7-4e13-b361-2edcc35a5a0d}	   components/protocols.js
+#contract  @mozilla.org/network/protocol;1?name=chrome-data {c1b67a07-18f7-4e13-b361-2edcc35a5a0d}
+#component {9c8f2530-51c8-4d41-b356-319e0b155c44}	   components/protocols.js
+#contract  @mozilla.org/network/protocol;1?name=dactyl {9c8f2530-51c8-4d41-b356-319e0b155c44}
+#component {f4506a17-5b4d-4cd9-92d4-2eb4630dc388}           components/protocols.js
+#contract  @dactyl.googlecode.com/base/xpc-interface-shim   {f4506a17-5b4d-4cd9-92d4-2eb4630dc388}
+#component {81495d80-89ee-4c36-a88d-ea7c4e5ac63f}	   components/protocols.js
+#contract  @mozilla.org/network/protocol/about;1?what=melodactyl {81495d80-89ee-4c36-a88d-ea7c4e5ac63f}
+
+#overlay  chrome://songbird/content/xul/layoutWithBrowserOverlay.xul chrome://xulmus/content/xulmus.xul
+#overlay  chrome://songbird/content/xul/layoutWithBrowserOverlay.xul chrome://dactyl/content/dactyl.xul
+
+#overlay  chrome://songbird/content/xul/layoutWithoutBrowserOverlay.xul chrome://xulmus/content/xulmus.xul
+#overlay  chrome://songbird/content/xul/layoutWithoutBrowserOverlay.xul chrome://dactyl/content/dactyl.xul
+
+#overlay windowtype:Songbird:Main chrome://dactyl/content/dactyl.xul
+#overlay windowtype:Songbird:Main chrome://xulmus/content/xulmus.xul
diff --git a/melodactyl/components/commandline-handler.js b/melodactyl/components/commandline-handler.js
new file mode 120000
index 00000000..aa8427b9
--- /dev/null
+++ b/melodactyl/components/commandline-handler.js
@@ -0,0 +1 @@
+../../common/components/commandline-handler.js
\ No newline at end of file
diff --git a/xulmus/components/protocols.js b/melodactyl/components/protocols.js
index 7c25b746..7c25b746 120000
--- a/xulmus/components/protocols.js
+++ b/melodactyl/components/protocols.js
diff --git a/xulmus/content/config.js b/melodactyl/content/config.js
index 1dedb03b..7a8eb274 100644
--- a/xulmus/content/config.js
+++ b/melodactyl/content/config.js
@@ -44,7 +44,7 @@ const Config = Module("config", ConfigBase, {
     // focusContent() focuses this widget gSongbirdWindowController takes care of the focus.
     get visualbellWindow() document.getElementById(this.mainWindowId),
 
-    styleableChrome: ["chrome://gonzo/content/xul/mainplayer.xul"],
+    styleableChrome: ["chrome://purplerain/content/xul/mainplayer.xul"],
 
     autocommands: {
         BookmarkAdd: "Triggered after a page is bookmarked",
diff --git a/xulmus/content/dactyl.dtd b/melodactyl/content/dactyl.dtd
index 3339fd05..5372cf5f 100644
--- a/xulmus/content/dactyl.dtd
+++ b/melodactyl/content/dactyl.dtd
@@ -3,6 +3,7 @@
 %dactylBranding;
 
 <!ENTITY dactyl.mainWindow "mainplayer">
+<!ENTITY dactyl.commandContainer "&dactyl.mainWindow;">
 <!ENTITY dactyl.name "xulmus">
 <!ENTITY dactyl.appName "Xulmus">
 <!ENTITY dactyl.idName "XULMUS">
diff --git a/xulmus/content/library.js b/melodactyl/content/library.js
index bd626461..bd626461 100644
--- a/xulmus/content/library.js
+++ b/melodactyl/content/library.js
diff --git a/xulmus/content/logo.png b/melodactyl/content/logo.png
index e907ad05..e907ad05 100644
--- a/xulmus/content/logo.png
+++ b/melodactyl/content/logo.png
diff --git a/xulmus/content/xulmus.xul b/melodactyl/content/melodactyl.xul
index c2065005..c2065005 100644
--- a/xulmus/content/xulmus.xul
+++ b/melodactyl/content/melodactyl.xul
diff --git a/xulmus/content/player.js b/melodactyl/content/player.js
index 1d223fde..1d223fde 100644
--- a/xulmus/content/player.js
+++ b/melodactyl/content/player.js
diff --git a/xulmus/content/xulmus.svg b/melodactyl/content/xulmus.svg
index 55cf152b..55cf152b 100644
--- a/xulmus/content/xulmus.svg
+++ b/melodactyl/content/xulmus.svg
diff --git a/xulmus/contrib/vim/Makefile b/melodactyl/contrib/vim/Makefile
index cbbbe046..cbbbe046 100644
--- a/xulmus/contrib/vim/Makefile
+++ b/melodactyl/contrib/vim/Makefile
diff --git a/xulmus/contrib/vim/ftdetect/xulmus.vim b/melodactyl/contrib/vim/ftdetect/melodactyl.vim
index 12a00079..12a00079 100644
--- a/xulmus/contrib/vim/ftdetect/xulmus.vim
+++ b/melodactyl/contrib/vim/ftdetect/melodactyl.vim
diff --git a/xulmus/contrib/vim/mkvimball.txt b/melodactyl/contrib/vim/mkvimball.txt
index 3b0b3ed3..3b0b3ed3 100644
--- a/xulmus/contrib/vim/mkvimball.txt
+++ b/melodactyl/contrib/vim/mkvimball.txt
diff --git a/xulmus/contrib/vim/syntax/xulmus.vim b/melodactyl/contrib/vim/syntax/melodactyl.vim
index 5f3bba1f..5f3bba1f 100644
--- a/xulmus/contrib/vim/syntax/xulmus.vim
+++ b/melodactyl/contrib/vim/syntax/melodactyl.vim
diff --git a/melodactyl/defaults/preferences/dactyl.js b/melodactyl/defaults/preferences/dactyl.js
new file mode 100644
index 00000000..30601bfa
--- /dev/null
+++ b/melodactyl/defaults/preferences/dactyl.js
@@ -0,0 +1,4 @@
+pref("extensions.dactyl.name", "melodactyl");
+pref("extensions.dactyl.appName", "Melodactyl");
+pref("extensions.dactyl.idName", "MELODACTYL");
+pref("extensions.dactyl.host", "Songbird");
diff --git a/xulmus/install.rdf b/melodactyl/install.rdf
index 549c818b..ac3a7361 100644
--- a/xulmus/install.rdf
+++ b/melodactyl/install.rdf
@@ -3,20 +3,20 @@
     xmlns:em="http://www.mozilla.org/2004/em-rdf#"
     xmlns:songbird="http://www.songbirdnest.com/2007/addon-metadata-rdf#">
     <Description about="urn:mozilla:install-manifest">
-        <em:id>xulmus@vimperator.org</em:id>
+        <em:id>melodactyl@dactyl.googlecode.com</em:id>
         <em:type>2</em:type>
-        <em:name>Xulmus</em:name>
-        <em:version>0.2a1pre</em:version>
-        <em:description>Makes Songbird behave like Vim and CMus.</em:description>
+        <em:name>Melodactyl</em:name>
+        <em:version>0.1a1pre</em:version>
+        <em:description>Songbird for Vim and CMus junkies.</em:description>
         <em:creator>Prathyush Thota</em:creator>
-        <em:homepageURL>http://vimperator.org</em:homepageURL>
-        <em:iconURL>chrome://xulmus/skin/icon.png</em:iconURL>
+        <em:homepageURL>http://dactyl.sourceforge.net/</em:homepageURL>
+        <em:iconURL>chrome://melodactyl/skin/icon.png</em:iconURL>
         <em:optionsURL>chrome://dactyl/content/preferences.xul</em:optionsURL>
         <em:targetApplication>
             <Description>
                 <em:id>songbird@songbirdnest.com</em:id>
-                <em:minVersion>0.8.0pre</em:minVersion>
-                <em:maxVersion>1.4.0</em:maxVersion>
+                <em:minVersion>1.8.0</em:minVersion>
+                <em:maxVersion>1.9.0</em:maxVersion>
             </Description>
         </em:targetApplication>
     </Description>
diff --git a/xulmus/locale/en-US/all.xml b/melodactyl/locale/en-US/all.xml
index c94a1a9c..c94a1a9c 100644
--- a/xulmus/locale/en-US/all.xml
+++ b/melodactyl/locale/en-US/all.xml
diff --git a/xulmus/locale/en-US/autocommands.xml b/melodactyl/locale/en-US/autocommands.xml
index d7f4366e..d7f4366e 100644
--- a/xulmus/locale/en-US/autocommands.xml
+++ b/melodactyl/locale/en-US/autocommands.xml
diff --git a/xulmus/locale/en-US/browsing.xml b/melodactyl/locale/en-US/browsing.xml
index b97a400a..b97a400a 100644
--- a/xulmus/locale/en-US/browsing.xml
+++ b/melodactyl/locale/en-US/browsing.xml
diff --git a/xulmus/locale/en-US/dactyl.dtd b/melodactyl/locale/en-US/dactyl.dtd
index d2bc54b8..d2bc54b8 100644
--- a/xulmus/locale/en-US/dactyl.dtd
+++ b/melodactyl/locale/en-US/dactyl.dtd
diff --git a/xulmus/locale/en-US/gui.xml b/melodactyl/locale/en-US/gui.xml
index 8acfbf51..8acfbf51 100644
--- a/xulmus/locale/en-US/gui.xml
+++ b/melodactyl/locale/en-US/gui.xml
diff --git a/xulmus/locale/en-US/intro.xml b/melodactyl/locale/en-US/intro.xml
index b4f51187..b4f51187 100644
--- a/xulmus/locale/en-US/intro.xml
+++ b/melodactyl/locale/en-US/intro.xml
diff --git a/xulmus/locale/en-US/player.xml b/melodactyl/locale/en-US/player.xml
index 4342a897..4342a897 100644
--- a/xulmus/locale/en-US/player.xml
+++ b/melodactyl/locale/en-US/player.xml
diff --git a/xulmus/locale/en-US/tabs.xml b/melodactyl/locale/en-US/tabs.xml
index 677d0e65..677d0e65 100644
--- a/xulmus/locale/en-US/tabs.xml
+++ b/melodactyl/locale/en-US/tabs.xml
diff --git a/xulmus/skin/icon.png b/melodactyl/skin/icon.png
index 3d16d3fc..3d16d3fc 100644
--- a/xulmus/skin/icon.png
+++ b/melodactyl/skin/icon.png
diff --git a/pentadactyl/content/dactyl.dtd b/pentadactyl/content/dactyl.dtd
index 91bf6a0c..d9589e51 100644
--- a/pentadactyl/content/dactyl.dtd
+++ b/pentadactyl/content/dactyl.dtd
@@ -3,6 +3,7 @@
 %dactylBranding;
 
 <!ENTITY dactyl.mainWindow "main-window">
+<!ENTITY dactyl.commandContainer "browser-bottom-box">
 <!ENTITY dactyl.name "pentadactyl">
 <!ENTITY dactyl.version "1.0">
 <!ENTITY dactyl.idName "PENTADACTYL">
diff --git a/teledactyl/content/dactyl.dtd b/teledactyl/content/dactyl.dtd
index afcfd48c..8dd53616 100644
--- a/teledactyl/content/dactyl.dtd
+++ b/teledactyl/content/dactyl.dtd
@@ -3,6 +3,7 @@
 %dactylBranding;
 
 <!ENTITY dactyl.mainWindow "messengerWindow">
+<!ENTITY dactyl.commandContainer "&dactyl.mainWindow;">
 <!ENTITY dactyl.name "teledactyl">
 <!ENTITY dactyl.idName "TELEDACTYL">
 <!ENTITY dactyl.appName "Teledactyl">
diff --git a/xulmus/Makefile b/xulmus/Makefile
deleted file mode 100644
index fac1f1b6..00000000
--- a/xulmus/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#### configuration
-
-NAME          = xulmus
-
-include ../common/Makefile
diff --git a/xulmus/chrome.manifest b/xulmus/chrome.manifest
deleted file mode 100644
index 00463dd8..00000000
--- a/xulmus/chrome.manifest
+++ /dev/null
@@ -1,37 +0,0 @@
-# Songbird
-content  xulmus               content/
-skin     xulmus classic/1.0   skin/
-locale   xulmus     en-US     locale/en-US/
-locale   dactyl  en-US     ../common/locale/en-US/
-
-content  dactyl             ../common/content/
-resource dactyl             ../common/modules/
-skin     dactyl classic/1.0 ../common/skin/
-
-override chrome://dactyl/content/dactyl.dtd chrome://xulmus/content/dactyl.dtd
-override chrome://dactyl/content/config.js	  chrome://xulmus/content/config.js
-
-overlay  chrome://songbird/content/xul/layoutBaseOverlay.xul chrome://xulmus/content/xulmus.xul
-overlay  chrome://songbird/content/xul/layoutBaseOverlay.xul chrome://dactyl/content/dactyl.xul
-
-component {16dc34f7-6d22-4aa4-a67f-2921fb5dcb69} components/commandline-handler.js
-contract  @mozilla.org/commandlinehandler/general-startup;1?type=xulmus {16dc34f7-6d22-4aa4-a67f-2921fb5dcb69}
-category  command-line-handler m-xulmus @mozilla.org/commandlinehandler/general-startup;1?type=xulmus
-
-component {c1b67a07-18f7-4e13-b361-2edcc35a5a0d}	   components/protocols.js
-contract  @mozilla.org/network/protocol;1?name=chrome-data {c1b67a07-18f7-4e13-b361-2edcc35a5a0d}
-component {9c8f2530-51c8-4d41-b356-319e0b155c44}	   components/protocols.js
-contract  @mozilla.org/network/protocol;1?name=dactyl {9c8f2530-51c8-4d41-b356-319e0b155c44}
-component {f4506a17-5b4d-4cd9-92d4-2eb4630dc388}           components/protocols.js
-contract  @dactyl.googlecode.com/base/xpc-interface-shim   {f4506a17-5b4d-4cd9-92d4-2eb4630dc388}
-component {81495d80-89ee-4c36-a88d-ea7c4e5ac63f}	   components/protocols.js
-contract  @mozilla.org/network/protocol/about;1?what=xulmus {81495d80-89ee-4c36-a88d-ea7c4e5ac63f}
-
-#overlay  chrome://songbird/content/xul/layoutWithBrowserOverlay.xul chrome://xulmus/content/xulmus.xul
-#overlay  chrome://songbird/content/xul/layoutWithBrowserOverlay.xul chrome://dactyl/content/dactyl.xul
-
-#overlay  chrome://songbird/content/xul/layoutWithoutBrowserOverlay.xul chrome://xulmus/content/xulmus.xul
-#overlay  chrome://songbird/content/xul/layoutWithoutBrowserOverlay.xul chrome://dactyl/content/dactyl.xul
-
-#overlay windowtype:Songbird:Main chrome://dactyl/content/dactyl.xul
-#overlay windowtype:Songbird:Main chrome://xulmus/content/xulmus.xul
diff --git a/xulmus/components/commandline-handler.js b/xulmus/components/commandline-handler.js
deleted file mode 100644
index aa8427b9..00000000
--- a/xulmus/components/commandline-handler.js
+++ /dev/null
@@ -1 +0,0 @@
-../../common/components/commandline-handler.js
\ No newline at end of file
diff --git a/xulmus/defaults/preferences/dactyl.js b/xulmus/defaults/preferences/dactyl.js
deleted file mode 100644
index d00d5906..00000000
--- a/xulmus/defaults/preferences/dactyl.js
+++ /dev/null
@@ -1,4 +0,0 @@
-pref("extensions.dactyl.name", "xulmus");
-pref("extensions.dactyl.appName", "Xulmus");
-pref("extensions.dactyl.idName", "XULMUS");
-pref("extensions.dactyl.host", "Songbird");