1 files changed, 18 insertions, 17 deletions
diff --git a/examples/data/scripts/load_url_from_history.sh b/examples/data/scripts/load_url_from_history.sh
index 62e02ac..1f540c9 100755
--- a/examples/data/scripts/load_url_from_history.sh
+++ b/examples/data/scripts/load_url_from_history.sh
@@ -1,24 +1,25 @@
 #!/bin/sh
 
-history_file=${XDG_DATA_HOME:-$HOME/.local/share}/uzbl/history
-[ -r "$history_file" ] || exit 1
+DMENU_SCHEME="history"
+DMENU_OPTIONS="xmms vertical resize"
+
+. $UZBL_UTIL_DIR/dmenu.sh
+. $UZBL_UTIL_DIR/uzbl-args.sh
+. $UZBL_UTIL_DIR/uzbl-dir.sh
+
+[ -r "$UZBL_HISTORY_FILE" ] || exit 1
 
 # choose from all entries, sorted and uniqued
-# goto=`awk '{print $3}' $history_file | sort -u | dmenu -i`
-COLORS=" -nb #303030 -nf khaki -sb #CCFFAA -sf #303030"
-if dmenu --help 2>&1 | grep -q '\[-rs\] \[-ni\] \[-nl\] \[-xs\]';
-then
-        DMENU="dmenu -i -xs -rs -l 10" # vertical patch
-        # choose an item in reverse order, showing also the date and page titles
-        # pick the last field from the first 3 fields. this way you can pick a url (prefixed with date & time) or type just a new url.
-        goto=`tac $history_file | $DMENU $COLORS | cut -d ' ' -f -3  | awk '{print $NF}'`
+# goto=$(awk '{print $3}' $history_file | sort -u | dmenu -i)
+if [ -z "$DMENU_HAS_VERTICAL" ]; then
+    current=$(tail -n 1 $UZBL_HISTORY_FILE | awk '{print $3}');
+    goto=$((echo $current; awk '{print $3}' $UZBL_HISTORY_FILE | grep -v "^$current\$" \
+      | sort -u) | $DMENU)
 else
-        DMENU="dmenu -i"
-	# choose from all entries (no date or title), the first one being current url, and after that all others, sorted and uniqued, in ascending order
-	current=`tail -n 1 $history_file | awk '{print $3}'`;
-  goto=`(echo $current; awk '{print $3}' $history_file | grep -v "^$current\$" \
-      | sort -u) | $DMENU $COLORS`
+    # choose an item in reverse order, showing also the date and page titles
+    # pick the last field from the first 3 fields. this way you can pick a url (prefixed with date & time) or type just a new url.
+    goto=$(tac $UZBL_HISTORY_FILE | $DMENU | cut -d ' ' -f -3  | awk '{print $NF}')
 fi
 
-[ -n "$goto" ] && echo "uri $goto" > $4
-#[ -n "$goto" ] && echo "uri $goto" | socat - unix-connect:$5
+#[ -n "$goto" ] && echo "uri $goto" > $UZBL_FIFO
+[ -n "$goto" ] && echo "uri $goto" | socat - unix-connect:$UZBL_SOCKET