Merge branch 'master' of github.com:uvaes/dotfiles

Conflicts:
	.uzbl/bookmarks
	.uzbl/config

3 files changed, 61 insertions, 1 deletions

diff --git a/.uzbl/config b/.uzbl/config
index 5de155e..01d22ca 100644
--- a/.uzbl/config
+++ b/.uzbl/config
@@ -449,6 +449,9 @@ sync_spawn_exec @scripts_dir/load_cookies.sh @data_home/uzbl/session-cookies.txt
 # Set the "home" page.
 set uri = uzbl.org/doesitwork/@COMMIT
 
+# Custom binds
+@bind o = sh 'uri=`$HOME/dotfiles/.uzbl/scripts/load_url_from_surfraw.sh` && echo "uri $uri" > "$UZBL_FIFO"'
+
 @on_event DOWNLOAD_COMPLETE spawn @scripts_dir/downloadviewer.sh %s
 @on_event LOAD_COMMIT spawn @scripts_dir/adblock.py
 # vim: set fdm=syntax:
diff --git a/.uzbl/scripts/load_url_from_surfraw.sh b/.uzbl/scripts/load_url_from_surfraw.sh
new file mode 100755
index 0000000..641ca3c
--- /dev/null
+++ b/.uzbl/scripts/load_url_from_surfraw.sh
@@ -0,0 +1,57 @@
+#!/bin/bash
+
+# Default search engine. If we really are at a loss, use this
+DEFAULT_SEARCH=google
+
+# The location of the surfraw bookmark file
+BOOKMARKS="$HOME/.surfraw.bookmarks"
+
+# Colors for dmenu
+COLORS=" -nb #303030 -nf khaki -sb #CCFFAA -sf #303030"
+
+# Prompt for dmenu
+PROMPT="Open"
+
+# Use surfraw to search for the words
+function search()
+{
+    # Does surfraw know what to do with it?
+    url=`surfraw -print $@`
+
+    # If not, then use the default search engine
+    if [ $? -ne 0 ]
+    then
+        url=`surfraw -print $DEFAULT_SEARCH $@`
+    fi
+
+    echo $url
+}
+
+# We assume that this is a URL
+function goto()
+{
+    case "$1" in
+        *:*) echo $1 ;;
+        *) echo "http://$1" ;;
+    esac
+}
+
+# Use dmenu to navigate through possible choices
+function present_menu()
+{
+    elvi=`surfraw -elvi | cut -f 1 | tail --lines=+2`
+    if [ -r "$BOOKMARKS" ]
+    then
+        bookmarks=" `cut -f 1 -d ' ' "$BOOKMARKS" 2>/dev/null`"
+    else
+        bookmarks=""
+    fi
+
+    echo "${elvi}${bookmarks}" | tr ' ' '\n' | sort | dmenu -p "$PROMPT" -i $COLORS
+}
+
+present_menu | \
+    ( read car cdr
+test -z "$car" && exit 1
+( test -z "$cdr" && echo $car | fgrep -c '.
+:' > /dev/null && goto $car ) || search "$car $cdr" )
diff --git a/.uzbl/style.css b/.uzbl/style.css
index a5fe457..bf769c8 100644
--- a/.uzbl/style.css
+++ b/.uzbl/style.css
@@ -14,7 +14,7 @@
     text-transform:     uppercase;
 
     -webkit-transform:  translate(-3px,-1px);
-    opacity:            0.8;
+    opacity:            1.0;
     -webkit-border-radius: 6px !important;
   /* Play around with this, pretty fun things to do :) */
   /* -webkit-transform: scale(1) rotate(0deg) translate(-6px,-5px) !important; */