Merge remote-tracking branch 'mathstuf/dev/improve-follow' into experimental

2 files changed, 42 insertions, 6 deletions

diff --git a/examples/data/scripts/follow.js b/examples/data/scripts/follow.js
index b7b0d82..782b1d1 100644
--- a/examples/data/scripts/follow.js
+++ b/examples/data/scripts/follow.js
@@ -16,7 +16,16 @@ uzbldivid = 'uzbl_link_hints';
 uzbl.follow = function() {
     // Export
     charset   = arguments[0];
-    newwindow = arguments[2];
+    if (arguments[2] == 'click') {
+        newwindow = false;
+        returnuri = false;
+    } else if (arguments[2] == 'newwindow') {
+        newwindow = true;
+        returnuri = false;
+    } else if (arguments[2] == 'returnuri') {
+        newwindow = false;
+        returnuri = true;
+    }
 
     var keypress = arguments[1];
     return arguments.callee.followLinks(keypress);
@@ -169,9 +178,13 @@ uzbl.follow.reDrawHints = function(elems, chars) {
     elements.forEach(function(el, i) {
         var label = labels[i];
         var pos   = positions[i];
-        var doc   = uzbl.follow.getDocument(el);
-        var h = uzbl.follow.generateHint(doc, el, label, pos[0], pos[1]);
-        doc.hintdiv.appendChild(h);
+        try {
+            var doc   = uzbl.follow.getDocument(el);
+            var h = uzbl.follow.generateHint(doc, el, label, pos[0], pos[1]);
+            doc.hintdiv.appendChild(h);
+        } catch (err) {
+            // Unable to attach label -> shrug it off and continue
+        }
     });
 }
 
@@ -222,7 +235,7 @@ uzbl.follow.followLinks = function(follow) {
     //var desc        = '*[title], img[alt], applet[alt], area[alt], input[alt]';
     //var image       = 'img, input[type=image]';
 
-    if(newwindow)
+    if(newwindow || returnuri)
         var res = this.query(uri);
     else
         var res = this.query(followable);
@@ -237,6 +250,11 @@ uzbl.follow.followLinks = function(follow) {
         // clear all of our hints
         this.clearHints();
 
+        if (returnuri) {
+            var uri = el.src || el.href;
+            return "XXXRETURNED_URIXXX" + uri
+        }
+
         if (newwindow) {
             // we're opening a new window using the URL attached to this element
             var uri = el.src || el.href;
diff --git a/examples/data/scripts/follow.sh b/examples/data/scripts/follow.sh
index 014793e..f08bd29 100755
--- a/examples/data/scripts/follow.sh
+++ b/examples/data/scripts/follow.sh
@@ -1,7 +1,13 @@
 #!/bin/sh
 # This scripts acts on the return value of followLinks in follow.js 
 
-case "$1" in
+result=$1
+shift
+
+uriaction=$1
+shift
+
+case "$result" in
     XXXEMIT_FORM_ACTIVEXXX)
         # a form element was selected
         printf 'event FORM_ACTIVE\nevent KEYCMD_CLEAR\n' > "$UZBL_FIFO"
@@ -10,4 +16,16 @@ case "$1" in
         # a link was selected, reset uzbl's input mode
         printf 'set mode=\nevent KEYCMD_CLEAR\n' > "$UZBL_FIFO"
         ;;
+    XXXRETURNED_URIXXX*)
+        uri=${result#XXXRETURNED_URIXXX}
+
+        case "$uriaction" in
+            set)
+                printf 'uri '"$uri"'\n' > "$UZBL_FIFO"
+                ;;
+            clipboard)
+                printf "$uri" | xclip
+                ;;
+        esac
+        printf 'set mode=\nevent KEYCMD_CLEAR\n' > "$UZBL_FIFO"
 esac