]> git.pld-linux.org Git - packages/uzbl.git/blame - uzbl-dmenu.patch
- merged DEVEL (updated for refs/tags/2010.02.02)
[packages/uzbl.git] / uzbl-dmenu.patch
CommitLineData
eda40ec5 1diff --git a/examples/data/scripts/load_url_from_bookmarks.sh b/examples/data/scripts/load_url_from_bookmarks.sh
9fd5245a 2index 1e9f9e7..ca49c2b 100755
eda40ec5 3--- a/examples/data/scripts/load_url_from_bookmarks.sh
4+++ b/examples/data/scripts/load_url_from_bookmarks.sh
aa71a044 5@@ -5,16 +5,10 @@
6 file=${XDG_DATA_HOME:-$HOME/.local/share}/uzbl/bookmarks
7 [ -r "$file" ] || exit
8 COLORS=" -nb #303030 -nf khaki -sb #CCFFAA -sf #303030"
9-if dmenu --help 2>&1 | grep -q '\[-rs\] \[-ni\] \[-nl\] \[-xs\]'
10-then
11- DMENU="dmenu -i -xs -rs -l 10" # vertical patch
12- # show tags as well
13- goto=`$DMENU $COLORS < $file | awk '{print $1}'`
14-else
15- DMENU="dmenu -i"
16- # because they are all after each other, just show the url, not their tags.
17- goto=`awk '{print $1}' $file | $DMENU $COLORS`
18-fi
19+
20+DMENU="dmenu -i -l 10" # vertical patch
21+# show tags as well
22+goto=`$DMENU $COLORS < $file | awk '{print $1}'`
23
24 #[ -n "$goto" ] && echo "uri $goto" > $4
9fd5245a 25 [ -n "$goto" ] && echo "uri $goto" | socat - unix-connect:$5
eda40ec5 26diff --git a/examples/data/scripts/load_url_from_history.sh b/examples/data/scripts/load_url_from_history.sh
9fd5245a 27index 62e02ac..756c962 100755
eda40ec5 28--- a/examples/data/scripts/load_url_from_history.sh
29+++ b/examples/data/scripts/load_url_from_history.sh
aa71a044 30@@ -6,19 +6,10 @@ history_file=${XDG_DATA_HOME:-$HOME/.local/share}/uzbl/history
31 # choose from all entries, sorted and uniqued
32 # goto=`awk '{print $3}' $history_file | sort -u | dmenu -i`
33 COLORS=" -nb #303030 -nf khaki -sb #CCFFAA -sf #303030"
34-if dmenu --help 2>&1 | grep -q '\[-rs\] \[-ni\] \[-nl\] \[-xs\]';
35-then
36- DMENU="dmenu -i -xs -rs -l 10" # vertical patch
37- # choose an item in reverse order, showing also the date and page titles
38- # 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.
39- goto=`tac $history_file | $DMENU $COLORS | cut -d ' ' -f -3 | awk '{print $NF}'`
40-else
41- DMENU="dmenu -i"
42- # 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
43- current=`tail -n 1 $history_file | awk '{print $3}'`;
44- goto=`(echo $current; awk '{print $3}' $history_file | grep -v "^$current\$" \
45- | sort -u) | $DMENU $COLORS`
46-fi
47+DMENU="dmenu -i -l 10" # vertical patch
48+# choose an item in reverse order, showing also the date and page titles
49+# 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.
50+goto=`tac $history_file | $DMENU $COLORS | cut -d ' ' -f -3 | awk '{print $NF}'`
51
52 [ -n "$goto" ] && echo "uri $goto" > $4
9fd5245a 53 #[ -n "$goto" ] && echo "uri $goto" | socat - unix-connect:$5
eda40ec5 54--- Dieterbe-uzbl-4994115/examples/data/scripts/instance-select-wmii.sh~ 2009-12-22 18:07:54.000000000 +0100
55+++ Dieterbe-uzbl-4994115/examples/data/scripts/instance-select-wmii.sh 2010-01-04 08:43:45.000000000 +0100
ba70becd 56@@ -13,12 +13,7 @@
57
58 COLORS=" -nb #303030 -nf khaki -sb #CCFFAA -sf #303030"
59
60-if dmenu --help 2>&1 | grep -q '\[-rs\] \[-ni\] \[-nl\] \[-xs\]'
61-then
62- DMENU="dmenu -i -xs -rs -l 10" # vertical patch
63-else
64- DMENU="dmenu -i"
65-fi
66+DMENU="dmenu -i -l 10" # vertical patch
67
68 if [ "$1" == 'list' ]
69 then
This page took 0.040527 seconds and 4 git commands to generate.