change directory structure to follow the more standard package hierarchy

Makefile

@@ -6,14 +6,16 @@ VERSION       = 0.5.2pre
 OS            = $(shell uname -s)
 BUILD_DATE    = $(shell date "+%Y/%m/%d %H:%M:%S")
 
-JAR_FILES     = ${shell find chrome/content -type f 		\
+JAR_FILES     = ${shell find content skin	\
-					-a ! -path '*CVS*' 	\
+			-type f			\
-					-a \( -path '*.js' 	\
+			-a ! -path '*CVS*'	\
-				     -o  -path '*.css' 	\
+			-a \(			\
-				     -o  -path '*.xul' 	\
+				-path '*.js'	\
-				     -o  -path '*.rdf' 	\
+			     -o -path '*.css'	\
-				     -o  -path '*.png' 	\
+			     -o -path '*.xul'	\
-				   \) } chrome.manifest
+			     -o -path '*.png'	\
+			   \)			\
+		}
 JAR_DIRS      = $(foreach f,${JAR_FILES},$(dir $f))
 JAR           = chrome/vimperator.jar
 
@@ -148,6 +150,7 @@ ${BUILD_JAR_SUBDIRS}:
 
 ${JAR}: ${BUILD_JAR_SUBDIRS} ${JAR_FILES}
 	@echo "Building JAR..."
+	${Q}mkdir -p $(dir ${JAR}) #FIXME
 	${Q}for f in ${JAR_FILES} ; do \
 		${SED} -e "s,###VERSION###,${VERSION},g" \
 		       -e "s,###DATE###,${BUILD_DATE},g" \

chrome.manifest

@@ -1,3 +1,3 @@
-# vimperators chrome registration file
+content	vimperator jar:chrome/vimperator.jar!/content/
-content	vimperator	jar:chrome/vimperator.jar!/chrome/content/vimperator/
+skin vimperator classic/1.0 jar:chrome/vimperator.jar!/skin/
 overlay chrome://browser/content/browser.xul chrome://vimperator/content/vimperator.xul

chrome/content/vimperator/contents.rdf

@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <RDF:Seq RDF:about="urn:mozilla:package:root">
-    <RDF:li RDF:resource="urn:mozilla:package:vimperator"/>
-  </RDF:Seq>
-
-  <!--<RDF:Seq RDF:about="urn:mozilla:overlays">-->
-  <!--<RDF:li RDF:resource="chrome://browser/content/browser.xul"/>-->
-  <!--</RDF:Seq>-->
-
-  <RDF:Seq RDF:about="chrome://browser/content/browser.xul">
-    <RDF:li>chrome://vimperator/content/vimperator.xul</RDF:li>
-  </RDF:Seq>
-
-  <RDF:Description RDF:about="urn:mozilla:package:vimperator"
-        chrome:displayName="Vimperator"
-        chrome:author="Martin Stubenschrott"
-        chrome:name="vimperator"
-        chrome:extension="true"
-        chrome:description="Make Firefox behave like Vim">
-  </RDF:Description>
-</RDF:RDF>

content/help.css

@@ -0,0 +1,117 @@
+div.main {
+    font-family: -moz-fixed;
+    white-space: -moz-pre-wrap;
+    width: 800px;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+h1 {
+    text-align: center;
+}
+
+p.tagline {
+    text-align: center;
+    font-weight: bold;
+}
+
+table.vimperator {
+    border-width: 1px;
+    border-style: dotted;
+    border-color: gray;
+    margin-bottom: 2em; /* FIXME: just a quick hack until we have proper pages */
+}
+table.vimperator td {
+    border: none;
+    padding: 3px;
+}
+tr.separator {
+    height: 10px;
+}
+hr {
+    height: 1px;
+    background-color: white;
+    border-style: none;
+    margin-top: 0;
+    margin-bottom: 0;
+}
+td.taglist {
+    text-align: right;
+    vertical-align: top;
+    border-spacing: 13px 10px;
+}
+td.taglist td {
+    width: 100px;
+    padding: 3px 0px;
+}
+tr.taglist code, td.usage code {
+    margin: 0px 2px;
+}
+td.usage code {
+    white-space: nowrap;
+}
+td.taglist code {
+    margin-left: 2em;
+}
+code.tag {
+    font-weight: bold;
+    color: rgb(255, 0, 255); /* magenta */
+}
+tr.description {
+    margin-bottom: 4px;
+}
+table.commands {
+    background-color: rgb(250, 240, 230);
+}
+table.mappings {
+    background-color: rgb(230, 240, 250);
+}
+table.options {
+    background-color: rgb(240, 250, 230);
+}
+
+fieldset.paypal {
+    border: none;
+}
+
+.argument {
+    color: #6A97D4;
+}
+
+.command {
+    font-weight: bold;
+    color: #632610;
+}
+
+.mapping {
+    font-weight: bold;
+    color: #102663;
+}
+
+.option {
+    font-weight: bold;
+    color: #106326;
+}
+
+.code {
+    color: #108826;
+}
+
+.shorthelp {
+    font-weight: bold;
+}
+
+.version {
+    position: absolute;
+    top: 10px;
+    right: 2%;
+    color: #C0C0C0;
+    text-align: right;
+}
+
+.warning {
+    font-weight: bold;
+    color: red;
+}
+
+/* vim: set fdm=marker sw=4 ts=4 et: */

content/help.js

@@ -208,7 +208,7 @@ vimperator.help = function(section, easter) //{{{
         '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"\n  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\n' +
         '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">\n<head>\n<title>Vimperator help</title>\n' +
         // XXX: stylesheet broken here? Have to add it in the vimperator.xul file
-        '<link rel="stylesheet" href="chrome://vimperator/content/default.css" type="text/css"/>\n' +
+        '<link rel="stylesheet" href="chrome://vimperator/content/help.css" type="text/css"/>\n' +
         '</head>\n<body>\n<div class="main">\n' +
         '<span class="version">version ' + vimperator.version + '</span>\n' +
         header +

content/modes.js

@@ -0,0 +1,184 @@
+/***** BEGIN LICENSE BLOCK ***** {{{
+Version: MPL 1.1/GPL 2.0/LGPL 2.1
+
+The contents of this file are subject to the Mozilla Public License Version
+1.1 (the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+http://www.mozilla.org/MPL/
+
+Software distributed under the License is distributed on an "AS IS" basis,
+WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+for the specific language governing rights and limitations under the
+License.
+
+(c) 2006-2007: Martin Stubenschrott <stubenschrott@gmx.net>
+
+Alternatively, the contents of this file may be used under the terms of
+either the GNU General Public License Version 2 or later (the "GPL"), or
+the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+in which case the provisions of the GPL or the LGPL are applicable instead
+of those above. If you wish to allow use of your version of this file only
+under the terms of either the GPL or the LGPL, and not to allow others to
+use your version of this file under the terms of the MPL, indicate your
+decision by deleting the provisions above and replace them with the notice
+and other provisions required by the GPL or the LGPL. If you do not delete
+the provisions above, a recipient may use your version of this file under
+the terms of any one of the MPL, the GPL or the LGPL.
+}}} ***** END LICENSE BLOCK *****/
+
+vimperator.modes = (function()
+{
+    var main = 1;     // NORMAL
+    var extended = 0; // NONE
+
+    var passNextKey = false;
+    var passAllKeys = false;
+
+    function getModeMessage()
+    {
+        if (passNextKey && !passAllKeys)
+            return "PASS THROUGH (next)";
+        else if (passAllKeys && !passNextKey)
+            return "PASS THROUGH";
+
+        var ext = "";
+        switch (extended)
+        {
+            case vimperator.modes.QUICK_HINT:
+                ext = " (quick)"; break;
+            case vimperator.modes.EXTENDED_HINT:
+                ext = " (extended)"; break;
+            case vimperator.modes.ALWAYS_HINT:
+                ext = " (always)"; break;
+            case vimperator.modes.MENU: // TODO: desirable?
+                ext = " (menu)"; break;
+        }
+
+        switch (main)
+        {
+            case vimperator.modes.HINTS:
+                return "HINTS" + ext;
+            default:
+                return null;
+        }
+    }
+
+    function handleModeChange(oldmode, newmode)
+    {
+        vimperator.log("switching from mode " + oldmode + " to mode " + newmode, 7);
+
+        switch (oldmode)
+        {
+            case vimperator.modes.HINTS:
+                // XXX: for now this does not work, but later it should be here
+                // vimperator.hints.disableHahMode();
+                break;
+        }
+
+        if (newmode == vimperator.modes.NORMAL)
+        {
+            var value = Options.getFirefoxPref("accessibility.browsewithcaret", false);
+            if (value)
+                Options.setFirefoxPref("accessibility.browsewithcaret", false);
+
+            vimperator.statusline.updateUrl();
+            vimperator.focusContent();
+        }
+    }
+
+    return {
+        // main modes, only one should ever be active
+        NONE:             0,
+        NORMAL:           1 << 0,
+        HINTS:            1 << 1,
+        COMMAND_LINE:     1 << 2,
+        // extended modes, can include multiple modes, and even main modes
+        EX:               1 << 10,
+        INPUT_MULTILINE:  1 << 11,
+        OUTPUT_MULTILINE: 1 << 12,
+        SEARCH_FORWARD:   1 << 13,
+        SEARCH_BACKWARD:  1 << 14,
+        QUICK_HINT:       1 << 15,
+        EXTENDED_HINT:    1 << 16,
+        ALWAYS_HINT:      1 << 17,
+        MENU:             1 << 18, // a popupmenu is active
+
+        reset: function(silent)
+        {
+            this.set(vimperator.modes.NORMAL, vimperator.modes.NONE, silent);
+        },
+
+        show: function()
+        {
+            if (!vimperator.options["showmode"])
+                return;
+
+            // never show mode messages if we are in command line mode
+            if (main == vimperator.modes.COMMAND_LINE)
+                return;
+
+            var msg = getModeMessage();
+            if (msg)
+                vimperator.commandline.echo("-- " + getModeMessage() + " --");
+            else
+                vimperator.commandline.echo("");
+        },
+
+        // helper function to set both modes in one go
+        set: function(main_mode, extended_mode, silent)
+        {
+            // if a main mode is set, the extended is always cleared
+            if (typeof main_mode === "number")
+            {
+                if (main_mode != main)
+                    handleModeChange(main, main_mode);
+
+                main = main_mode;
+                if (!extended_mode)
+                    extended = vimperator.modes.NONE;
+
+            }
+            if (typeof extended_mode === "number")
+                extended = extended_mode;
+
+            if (!silent)
+                this.show();
+        },
+
+        // add/remove always work on the extended mode only
+        add: function(mode)
+        {
+            extended |= mode;
+            this.show();
+        },
+        remove: function(mode)
+        {
+            extended = (extended | mode) ^ mode;
+            this.show();
+        },
+
+        get passNextKey() { return passNextKey; },
+        set passNextKey(value) { passNextKey = value; this.show(); },
+
+        get passAllKeys() { return passAllKeys; },
+        set passAllKeys(value) { passAllKeys = value; this.show(); },
+
+        get main()      { return main; },
+        set main(value) {
+            if (value != main)
+                handleModeChange(main, value);
+
+            main = value;
+            // setting the main mode always resets any extended mode
+            extended = vimperator.modes.NONE;
+            this.show();
+        },
+
+        get extended()      { return extended; },
+        set extended(value) {
+            extended = value; this.show();
+        }
+    }
+})();
+
+// vim: set fdm=marker sw=4 ts=4 et:

content/test.js

@@ -0,0 +1,13 @@
+var TestCase = mozlab.mozunit.TestCase;
+var assert = mozlab.mozunit.assertions;
+
+var tc = new TestCase('testcase description here');
+
+tc.tests = {
+    'First test is successful': function() {
+        var vimperator = new Vimperator();
+        assert.isDefined(vimperator);
+        assert.isTrue(true);
+    }
+}
+tc.run()

content/vimperator.xul

@@ -29,9 +29,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
 }}} ***** END LICENSE BLOCK ***** -->
 
 <?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
-
+<?xml-stylesheet href="chrome://vimperator/skin/vimperator.css" type="text/css"?>
-<!-- The stylesheet which is used for the :help command -->
-<?xml-stylesheet href="chrome://vimperator/content/default.css" type="text/css"?>
 
 <overlay id="vimperator"
     xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"

skin/vimperator.css

@@ -1,128 +1,3 @@
-/*
- * Help file {{{
- */
-
-div.main {
-    font-family: -moz-fixed;
-    white-space: -moz-pre-wrap;
-    width: 800px;
-    margin-left: auto;
-    margin-right: auto;
-}
-
-h1 {
-    text-align: center;
-}
-
-p.tagline {
-    text-align: center;
-    font-weight: bold;
-}
-
-table.vimperator {
-    border-width: 1px;
-    border-style: dotted;
-    border-color: gray;
-    margin-bottom: 2em; /* FIXME: just a quick hack until we have proper pages */
-}
-table.vimperator td {
-    border: none;
-    padding: 3px;
-}
-tr.separator {
-    height: 10px;
-}
-hr {
-    height: 1px;
-    background-color: white;
-    border-style: none;
-    margin-top: 0;
-    margin-bottom: 0;
-}
-td.taglist {
-    text-align: right;
-    vertical-align: top;
-    border-spacing: 13px 10px;
-}
-td.taglist td {
-    width: 100px;
-    padding: 3px 0px;
-}
-tr.taglist code, td.usage code {
-    margin: 0px 2px;
-}
-td.usage code {
-    white-space: nowrap;
-}
-td.taglist code {
-    margin-left: 2em;
-}
-code.tag {
-    font-weight: bold;
-    color: rgb(255, 0, 255); /* magenta */
-}
-tr.description {
-    margin-bottom: 4px;
-}
-table.commands {
-    background-color: rgb(250, 240, 230);
-}
-table.mappings {
-    background-color: rgb(230, 240, 250);
-}
-table.options {
-    background-color: rgb(240, 250, 230);
-}
-
-fieldset.paypal {
-    border: none;
-}
-
-.argument {
-    color: #6A97D4;
-}
-
-.command {
-    font-weight: bold;
-    color: #632610;
-}
-
-.mapping {
-    font-weight: bold;
-    color: #102663;
-}
-
-.option {
-    font-weight: bold;
-    color: #106326;
-}
-
-.code {
-    color: #108826;
-}
-
-.shorthelp {
-    font-weight: bold;
-}
-
-.version {
-    position: absolute;
-    top: 10px;
-    right: 2%;
-    color: #C0C0C0;
-    text-align: right;
-}
-
-.warning {
-    font-weight: bold;
-    color: red;
-}
-
-/* }}}
- * XUL {{{
- * TODO: move to the standard location: chrome/skin/vimperator.css...if I can
- * ever convince MS :( -- djk
- */
 #vimperator-container  {
     font-family: monospace;
 }
@@ -214,4 +89,5 @@ fieldset.paypal {
 #vimperator-multiline-output {
     overflow: hidden;
 }
+
 /* vim: set fdm=marker sw=4 ts=4 et: */