Add "Invert focus" option for Ctrl-click on Bookmarks/Links

ithinc · ithinc · commit dea1541eeca7 · 2014-03-16T13:28:01.000+08:00
diff --git a/chrome/content/preferences.xul b/chrome/content/preferences.xul
@@ -310,7 +310,7 @@
 
       <preference id="middleClickLinks" name="extensions.tabutils.middleClickLinks" type="int"/>
       <preference id="rightClickLinks" name="extensions.tabutils.rightClickLinks" type="int" suggest="1"/>
-      <preference id="ctrlClickLinks" name="extensions.tabutils.ctrlClickLinks" type="int" suggest="1"/>
+      <preference id="ctrlClickLinks" name="extensions.tabutils.ctrlClickLinks" type="int" suggest="2"/>
       <preference id="shiftClickLinks" name="extensions.tabutils.shiftClickLinks" type="int" suggest="1"/>
 
       <preference id="leftClickTab" name="extensions.tabutils.leftClickTab" type="int" suggest="7"/>
@@ -385,6 +385,7 @@
                     <menupopup>
                       <menuitem value="0" label="&doDefault.label;"/>
                       <menuitem value="1" label="&openInCurrent.label;" tooltiptext="&invertCtrl.tooltip;"/>
+                      <menuitem value="2" label="&invertFocus.label;" tooltiptext="&invertFocus.tooltip;"/>
                     </menupopup>
                   </menulist>
                   <spacer/>
@@ -418,6 +419,7 @@
                     <menupopup>
                       <menuitem value="0" label="&doDefault.label;"/>
                       <menuitem value="1" label="&openInCurrent.label;" tooltiptext="&invertCtrl.tooltip;"/>
+                      <menuitem value="2" label="&invertFocus.label;" tooltiptext="&invertFocus.tooltip;"/>
                     </menupopup>
                   </menulist>
                   <spacer/>
diff --git a/chrome/content/utilityOverlay.js b/chrome/content/utilityOverlay.js
@@ -87,11 +87,11 @@
     [/"window"/, 'shift && TU_getPref("extensions.tabutils.shiftClick" + prefName, 0) ? "current" : $&'],
     [/(?=if \((ctrl|meta))/, function(s, s1) (function() {
       if (openInTab &&
-          ($1 && TU_getPref("extensions.tabutils.ctrlClick" + prefName, 1) ||
+          ($1 && TU_getPref("extensions.tabutils.ctrlClick" + prefName) & 0x01 ||
           middle && middleUsesTabs && TU_getPref("extensions.tabutils.middleClick" + prefName, 0) & 1))
         return "current";
     }).toString().replace(/^.*{|}$/g, "").replace("$1", s1)],
-    [/if \(shift|shift \?/, function(s) s.replace('shift', '$& ^ (middle && TU_getPref("extensions.tabutils.middleClick" + prefName, 0) & 2) > 0')]
+    [/shift(?= \?)/, '$& ^ (TU_getPref("extensions.tabutils." + (middle ? "middleClick" : "ctrlClick") + prefName) & 0x02) > 0']
   );
 
   TU_hookCode("openLinkIn",
