From a11246711a56d763019bf6bb23a7854d5dc550ac Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Tue, 28 Sep 2010 12:02:47 -0400
Subject: [PATCH] Add *basic* context menu to the MOW.

--HG--
extra : rebase_source : c1ce793f6242b8046b3a15cdcc7cdd0d16b43af5
---
 common/content/commandline.js | 13 +++++++------
 common/content/dactyl.xul     | 32 ++++++++++++++++++++------------
 pentadactyl/TODO              |  1 -
 3 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/common/content/commandline.js b/common/content/commandline.js
index 79f9edb2..68042d7e 100644
--- a/common/content/commandline.js
+++ b/common/content/commandline.js
@@ -149,6 +149,8 @@ const CommandWidgets = Class("CommandWidgets", {
     multilineOutput: Class.memoize(function () {
         let elem = document.getElementById("dactyl-multiline-output");
         elem.contentDocument.body.id = "dactyl-multiline-output-content";
+        document.getElementById("dactyl-context-copylink").style.listStyleImage = 
+            util.computedStyle(document.getElementById("context-copylink")).listStyleImage;
         return elem;
     }),
     multilineInput: Class.memoize(function () document.getElementById("dactyl-multiline-input")),
@@ -883,23 +885,22 @@ const CommandLine = Module("commandline", {
                     return dactyl.commands[command](event);
                 else
                     openLink(dactyl.CURRENT_TAB);
-                break;
+                return false;
             case "<MiddleMouse>":
             case "<C-LeftMouse>":
             case "<C-M-LeftMouse>":
                 openLink({ where: dactyl.NEW_TAB, background: true });
-                break;
+                return false;
             case "<S-MiddleMouse>":
             case "<C-S-LeftMouse>":
             case "<C-M-S-LeftMouse>":
                 openLink({ where: dactyl.NEW_TAB, background: false });
-                break;
+                return false;
             case "<S-LeftMouse>":
                 openLink(dactyl.NEW_WINDOW);
-                break;
+                return false;
             }
-
-            return;
+            return true;
         }
 
         if (this._startHints) {
diff --git a/common/content/dactyl.xul b/common/content/dactyl.xul
index 43afd231..ddef4798 100644
--- a/common/content/dactyl.xul
+++ b/common/content/dactyl.xul
@@ -35,15 +35,22 @@
         <popupset>
             <panel id="dactyl-visualbell" dactyl:highlight="Bell"
                    noautohide="true" noautofocus="true"/>
+
+            <menupopup id="dactyl-contextmenu"
+                       onpopupshowing="return event.target != this || document.popupNode instanceof HTMLAnchorElement;">
+                <menuitem id="dactyl-context-copylink"
+                          label="Copy Link Location"
+                          oncommand="goDoCommand('cmd_copyLink');"/>
+            </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);"/>
+                    oncommandupdate="&events;.onFocusChange(event);"/>
         <commandset id="onPentadactylSelect" commandupdater="true" events="select"
-            oncommandupdate="&events;.onSelectionChange(event);"/>
+                    oncommandupdate="&events;.onSelectionChange(event);"/>
     </window>
 
     <vbox id="browser-bottombox">
@@ -51,20 +58,21 @@
              therefore we need to put them into a <vbox> for which that works just fine -->
         <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"
-                onclick="&commandline;.onMultilineOutputEvent(event)"/>
+                    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"
-                flex="1" hidden="false" collapsed="false"
-                onclick="&commandline;.onMultilineOutputEvent(event)"/>
+                    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"
-                flex="1" hidden="false" collapsed="false"
-                onclick="&commandline;.onMultilineOutputEvent(event)"/>
+                    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">
@@ -74,8 +82,8 @@
             <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);"/>
+                         oninput="&commandline;.onEvent(event);" onkeyup="&commandline;.onEvent(event);"
+                         onfocus="&commandline;.onEvent(event);" onblur="&commandline;.onEvent(event);"/>
             </hbox>
         </stack>
 
@@ -98,8 +106,8 @@
                 <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);"/>
+                             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"/>
diff --git a/pentadactyl/TODO b/pentadactyl/TODO
index 8e269be7..109df040 100644
--- a/pentadactyl/TODO
+++ b/pentadactyl/TODO
@@ -34,7 +34,6 @@ FEATURES:
 8 adaptive timeout for auto-completions, :set completions can be updated more often than
   :open foo
 8 use the storage module for autocommands
-8 support 'activate' in buffer.followLink?
 8 add support for filename special characters such as %
 8 :redir and 'verbosefile'
 8 middleclick in content == p, and if command line is open, paste there the clipboard buffer