make the whole xdg/dev directories /configs etc more sense making. now theres just one config you can directly copy into your home and use without editing. the same config can be used while developing, the Makefile just overrides 2 xdg variables. also the scripts can be a bit simpler now

26 files changed, 37 insertions, 180 deletions

diff --git a/Makefile b/Makefile
index 2fef569..3e0647d 100644
--- a/Makefile
+++ b/Makefile
@@ -8,10 +8,14 @@ test: uzbl
 	./uzbl --uri http://www.uzbl.org --verbose
 
 test-config: uzbl
-	./uzbl --uri http://www.uzbl.org --config examples/configs/sampleconfig-dev --verbose
+	./uzbl --uri http://www.uzbl.org --verbose
+
+test-config-dev: uzbl
+	XDG_DATA_HOME=./examples/data               XDG_CONFIG_HOME=./examples/config               ./uzbl --uri http://www.uzbl.org --config $XDG_CONFIG_HOME/uzbl/sampleconfig --verbose
+
+test-config-share: uzbl
+	XDG_DATA_HOME=/usr/share/uzbl/examples/data XDG_CONFIG_HOME=/usr/share/uzbl/examples/config ./uzbl --uri http://www.uzbl.org --config $XDG_CONFIG_HOME/uzbl/sampleconfig --verbose
 
-test-config-real: uzbl
-	./uzbl --uri http://www.uzbl.org --config /usr/share/uzbl/examples/configs/sampleconfig --verbose
 	
 clean:
 	rm -f uzbl
@@ -26,7 +30,6 @@ install:
 	cp -ax docs     $(PREFIX)/share/uzbl/
 	cp -ax config.h $(PREFIX)/share/uzbl/docs/
 	cp -ax examples $(PREFIX)/share/uzbl/
-	cp -ax uzbl.png $(PREFIX)/share/uzbl/
 	install -D -m644 AUTHORS $(PREFIX)/share/uzbl/docs
 	install -D -m644 README  $(PREFIX)/share/uzbl/docs
 
diff --git a/examples/configs/cookies b/examples/config/uzbl/cookies
index 9b7374a..9b7374a 100644
--- a/examples/configs/cookies
+++ b/examples/config/uzbl/cookies
diff --git a/examples/configs/sampleconfig-dev b/examples/config/uzbl/sampleconfig
index 0aa0985..53c4086 100644
--- a/examples/configs/sampleconfig-dev
+++ b/examples/config/uzbl/sampleconfig
@@ -9,9 +9,9 @@
 
 # TODO: ability to attach misc things (spawn <foo>, script <bar>,.. to internal events)
 # Usually you want to spawn a script to handle things, but any command (such as sh) can be used
-set history_handler  = spawn ./examples/scripts/history.sh
-set download_handler = spawn ./examples/scripts/download.sh
-set cookie_handler   = spawn ./examples/scripts/cookies.py
+set history_handler  = spawn $XDG_DATA_HOME/scripts/history.sh
+set download_handler = spawn $XDG_DATA_HOME/scripts/download.sh
+set cookie_handler   = spawn $XDG_DATA_HOME/scripts/cookies.py
 
 set minimum_font_size = 6
 set font_size = 11
@@ -124,12 +124,12 @@ bind    i         = toggle_insert_mode
 bind    I         = toggle_insert_mode 0
 # Enclose the executable in quotes if it has spaces.  Any additional parameters you use will
 # appear AFTER the default parameters
-bind    B         = spawn ./examples/scripts/insert_bookmark.sh
-bind    U         = spawn ./examples/scripts/load_url_from_history.sh
-bind    u         = spawn ./examples/scripts/load_url_from_bookmarks.sh
+bind    B         = spawn $XDG_DATA_HOME/scripts/insert_bookmark.sh
+bind    U         = spawn $XDG_DATA_HOME/scripts/load_url_from_history.sh
+bind    u         = spawn $XDG_DATA_HOME/scripts/load_url_from_bookmarks.sh
 # with the sample yank script, you can yank one of the arguments into clipboard/selection
-bind    yurl      = spawn ./examples/scripts/yank.sh 6 primary
-bind    ytitle    = spawn ./examples/scripts/yank.sh 7 clipboard
+bind    yurl      = spawn $XDG_DATA_HOME/scripts/yank.sh 6 primary
+bind    ytitle    = spawn $XDG_DATA_HOME/scripts/yank.sh 7 clipboard
 # does the same as yurl but without needing a script
 bind    y2url     = sh 'echo -n $6 | xclip'
 # go the page from primary selection
@@ -148,25 +148,25 @@ bind    S         = js alert("hi");
 bind    XS        = sh 'echo "js alert (\\"This is sent by the shell via a fifo\\")" > "$4"'
 bind    dump      = sh "echo dump_config > $4"
 # this script allows you to configure (per domain) values to fill in form fields (eg login information) and to fill in these values automatically
-bind za = spawn ./examples/scripts/formfiller.sh
-bind ze = spawn ./examples/scripts/formfiller.sh edit
-bind zn = spawn ./examples/scripts/formfiller.sh new
-bind zl = spawn ./examples/scripts/formfiller.sh load
+bind za = spawn $XDG_DATA_HOME/scripts/formfiller.sh
+bind ze = spawn $XDG_DATA_HOME/scripts/formfiller.sh edit
+bind zn = spawn $XDG_DATA_HOME/scripts/formfiller.sh new
+bind zl = spawn $XDG_DATA_HOME/scripts/formfiller.sh load
 
 # other - more advanced - implementation using perl: (could not get this to run - Dieter )
-bind LL = spawn ./examples/scripts/formfiller.pl load
-bind LN = spawn ./examples/scripts/formfiller.pl new
-bind LE = spawn ./examples/scripts/formfiller.pl edit
+bind LL = spawn $XDG_DATA_HOME/scripts/formfiller.pl load
+bind LN = spawn $XDG_DATA_HOME/scripts/formfiller.pl new
+bind LE = spawn $XDG_DATA_HOME/scripts/formfiller.pl edit
 
 # we ship some javascripts to do keyboard based link hinting/following.  (webkit does not have C DOM bindings yet)
 # this is similar to how it works in vimperator (and konqueror)
 # TODO: did we resolve: "no click() event for hyperlinks so no referrer set" ?
 #hit F to toggle the Hints (now in form of link numbering)
-bind    F = script ./examples/scripts/hint.js
+bind    F = script $XDG_DATA_HOME/scripts/hint.js
 # the most stable version:
-bind    fl* = script ./examples/scripts/follow_Numbers.js %s
+bind    fl* = script $XDG_DATA_HOME/scripts/follow_Numbers.js %s
 # using strings, not polished yet:
-bind    fL* = script ./examples/scripts/follow_Numbers_Strings.js %s
+bind    fL* = script $XDG_DATA_HOME/scripts/follow_Numbers_Strings.js %s
 
 # you can use this to disable all plugins
 set disable_plugins = 0
diff --git a/examples/configs/sampleconfig b/examples/configs/sampleconfig
deleted file mode 100644
index 736b49f..0000000
--- a/examples/configs/sampleconfig
+++ /dev/null
@@ -1,125 +0,0 @@
-
-# example uzbl config. in a real config, we should obey the xdg spec
-# all settings are optional.  you can use uzbl without any config at all (but it won't do much)
-
-# keyboard behavior is vimstyle by default (all commands -> 1 key). set
-# always_insert_mode to always be in insert mode and disable going out of it.
-# if you do this, make sure you've set a modkey so you can reach the commands
-# from insert mode by combining them with the modkey
-
-# TODO: ability to attach misc things (spawn <foo>, script <bar>,.. to internal events)
-# You can use any command in place of spawn
-set history_handler  = spawn /usr/share/uzbl/examples/scripts/history.sh
-set download_handler = spawn /usr/share/uzbl/examples/scripts/download.sh
-set cookie_handler   = spawn /usr/share/uzbl/examples/scripts/cookies.py
-
-set minimum_font_size = 6
-set font_size = 11
-# monospace_size defaults to font_size, but you can alter it independently
-#set monospace_size = 10
-
-# use with bind ... = sh <shell-oneliner>
-set shell_cmd         = sh -c
-
-
-
-# Behaviour and appearance
-set show_status       = 1
-# you can optionally use this setting to override the background color of the statusbar from your GTK theme.
-set status_background = #303030
-set status_format     = <span font_family="monospace"><span background="khaki" foreground="black">MODE</span> [<span weight="bold" foreground="red">KEYCMD</span>] <span foreground="#606060"> LOAD_PROGRESSBAR </span><span foreground="#99FF66">URI</span> <span foreground="khaki">NAME</span> <span foreground="orange">MSG</span><span foreground="#606060">SELECTED_URI</span></span>
-set status_top = 0
-# define how your titlebar should look like. (short = statusbar is also shown, long = show everything you must see if statusbar is off)
-set title_format_short = TITLE - Uzbl browser <NAME>
-set title_format_long = KEYCMD MODE TITLE - Uzbl browser <NAME> > SELECTED_URI
-# set the characters to use for, and the width of the progress bar
-set status_pbar_done  = *
-set status_pbar_pending = -
-set status_pbar_width = 12
-
-set modkey = Mod1
-# reset to command mode when new page is loaded
-set reset_command_mode = 1
-# this var has precedence over reset_command_mode
-set always_insert_mode = 0
-# to start a local socks server, do : ssh -fND localhost:8118 localhost
-#set  proxy_url       = http://127.0.0.1:8118
-#values 0-3
-#set  http_debug      = 0
-#set  useragent       = uzbl (Webkit WEBKIT_MAJOR.WEBKIT_MINOR.WEBKIT_MICRO)
-# Example user agent containing everything:
-set  useragent       = Uzbl (Webkit WEBKIT_MAJOR.WEBKIT_MINOR.WEBKIT_MICRO) (SYSNAME NODENAME KERNREL KERNVER ARCH_SYSTEM [ARCH_UZBL]) (Commit COMMIT)
-#set  max_conns	      = 0
-#set  max_conns_host  = 0
-
-set fifo_dir = /tmp
-set socket_dir = /tmp
-
-# Key bindings
-bind    j         = scroll_vert 20
-bind    k         = scroll_vert -20
-bind    h         = scroll_horz -20
-bind    l         = scroll_horz 20
-bind    <<        = scroll_begin
-bind    >>        = scroll_end
-bind    b         = back
-bind    m         = forward
-bind    s         = stop
-bind    r         = reload
-bind    R         = reload_ign_cache
-bind    +         = zoom_in
-bind    -         = zoom_out
-bind    1         = sh "echo set zoom_level = 1.0 > $4"
-bind    2         = sh "echo set zoom_level = 2.0 > $4"
-bind    t         = toggle_status
-# Hilight matches. Notice the * after the slash - it makes the command incremental, i.e. gets called
-# on every character you type.  You can do `bind /_ = search %s' if you want it less interactive.
-bind    /*        = search %s
-bind    ?*        = search_reverse %s
-#jump to next
-bind    n         = search
-bind    N         = search_reverse
-bind    gh        = uri http://www.uzbl.org
-#TODO: set uri?
-bind    o _       = uri %s
-bind    :wiki _   = uri http://wiki.archlinux.org/index.php/Special:Search?search=%s&go=Go
-bind    gg _      = uri http://www.google.com/search?q=%s
-bind    i         = toggle_insert_mode
-# disable insert mode (1 to enable).  note that Esc works to disable, regardless of this setting
-bind    I         = toggle_insert_mode 0
-bind    B         = spawn /usr/share/uzbl/examples/scripts/insert_bookmark.sh
-bind    U         = spawn /usr/share/uzbl/examples/scripts/load_url_from_history.sh
-bind    u         = spawn /usr/share/uzbl/examples/scripts/load_url_from_bookmarks.sh
-# with the sample yank script, you can yank one of the arguments into clipboard/selection
-bind    yurl      = spawn /usr/share/uzbl/examples/scripts/yank.sh 6 primary
-bind    ytitle    = spawn /usr/share/uzbl/examples/scripts/yank.sh 7 clipboard
-# does the same as yurl but without needing a script
-bind    y2url     = sh "echo -n $6 | xclip"
-# go the page from primary selection
-bind    p         = sh "echo uri `xclip -selection primary -o` > $4"
-# go to the page in clipboard
-bind    P         = sh "echo uri `xclip -selection clipboard -o` > $4"
-bind    ZZ        = exit
-bind    S         = js alert("hi");
-# example showing how to use sh
-# it sends a command to the fifo, whose path is told via a positional param
-# if fifo_dir is not set, it'll echo to a file named (null) somewhere >:) remember to delete it
-# Parameters are separated by spaces and the script body must be one parameter, so enclose it in
-# quotes and escape any inner quotes using backslashes
-bind    XS        = sh 'echo "js alert (\'This is sent by the shell via a fifo\')" > "$4"'
-bind    dump      = sh "echo dump_config > $4"
-
-# we ship some javascripts to do keyboard based link hinting/following.  (webkit does not have C DOM bindings yet)
-# this is similar to how it works in vimperator (and konqueror)
-# TODO: did we resolve: "no click() event for hyperlinks so no referrer set" ?
-#hit F to toggle the Hints (now in form of link numbering)
-bind    F = script /usr/share/uzbl/examples/scripts/hint.js
-# the most stable version:
-bind    fl* = script /usr/share/uzbl/examples/scripts/follow_Numbers.js %s
-# using strings, not polished yet:
-bind    fL* = script /usr/share/uzbl/examples/scripts/follow_Numbers_Strings.js %s
-
-set icon = /usr/share/uzbl/uzbl.png
-
-# "home" page if you will
-set uri = uzbl.org
diff --git a/examples/data/bookmarks b/examples/data/uzbl/bookmarks
index 13fcd48..13fcd48 100644
--- a/examples/data/bookmarks
+++ b/examples/data/uzbl/bookmarks
diff --git a/examples/data/forms/bbs.archlinux.org b/examples/data/uzbl/forms/bbs.archlinux.org
index 73c1539..73c1539 100644
--- a/examples/data/forms/bbs.archlinux.org
+++ b/examples/data/uzbl/forms/bbs.archlinux.org
diff --git a/examples/scripts/clipboard.sh b/examples/data/uzbl/scripts/clipboard.sh
index c64b65c..c64b65c 100755
--- a/examples/scripts/clipboard.sh
+++ b/examples/data/uzbl/scripts/clipboard.sh
diff --git a/examples/scripts/cookies.py b/examples/data/uzbl/scripts/cookies.py
index 0d2a65a..3cc7eb0 100755
--- a/examples/scripts/cookies.py
+++ b/examples/data/uzbl/scripts/cookies.py
@@ -61,13 +61,6 @@ class FakeResponse:
         return FakeHeaders(self.argv)
 
 if __name__ == '__main__':
-    search = ['/usr/share/uzbl/examples/data',
-              os.environ['XDG_DATA_HOME']+'/uzbl',
-              './examples/data']
-    for dir in search:
-        if os.path.isdir(dir):
-            cookie_file = dir+'/cookies.txt'
-
     jar = cookielib.MozillaCookieJar(os.environ['XDG_DATA_HOME']+'/uzbl/cookies.txt')
     try:
         jar.load()
diff --git a/examples/scripts/cookies.sh b/examples/data/uzbl/scripts/cookies.sh
index a875482..78139d6 100755
--- a/examples/scripts/cookies.sh
+++ b/examples/data/uzbl/scripts/cookies.sh
@@ -24,15 +24,10 @@
 # http://kb.mozillazine.org/Cookies.txt
 # don't always append cookies, sometimes we need to overwrite
 
-[ -f /usr/share/uzbl/examples/configs/cookies ] && cookie_config=/usr/share/uzbl/examples/configs/cookies
-[ -f $XDG_CONFIG_HOME/uzbl/cookies            ] && cookie_config=$XDG_CONFIG_HOME/uzbl/cookies
-[ -f ./examples/configs/cookies               ] && cookie_config=./examples/configs/cookies #useful when developing
+cookie_config=$XDG_CONFIG_HOME/uzbl/cookies
 [ -z "$cookie_config" ] && exit 1
-
-[ -d /usr/share/uzbl/examples/data ] && cookie_data=/usr/share/uzbl/examples/data/cookies.txt
+[ -d "$XDG_DATA_HOME/uzbl" ] || exit 1
 [ -d $XDG_DATA_HOME/uzbl/          ] && cookie_data=$XDG_DATA_HOME/uzbl/cookies.txt
-[ -d ./examples/data/              ] && cookie_data=./examples/data/cookies.txt #useful when developing
-[ -z "$cookie_data" ] && exit 1
 
 
 notifier=
diff --git a/examples/scripts/download.sh b/examples/data/uzbl/scripts/download.sh
index d87335f..d87335f 100755
--- a/examples/scripts/download.sh
+++ b/examples/data/uzbl/scripts/download.sh
diff --git a/examples/scripts/follow_Numbers.js b/examples/data/uzbl/scripts/follow_Numbers.js
index efde4d7..efde4d7 100644
--- a/examples/scripts/follow_Numbers.js
+++ b/examples/data/uzbl/scripts/follow_Numbers.js
diff --git a/examples/scripts/follow_Numbers_Strings.js b/examples/data/uzbl/scripts/follow_Numbers_Strings.js
index 67da2f9..67da2f9 100644
--- a/examples/scripts/follow_Numbers_Strings.js
+++ b/examples/data/uzbl/scripts/follow_Numbers_Strings.js
diff --git a/examples/scripts/formfiller.pl b/examples/data/uzbl/scripts/formfiller.pl
index c590836..c590836 100755
--- a/examples/scripts/formfiller.pl
+++ b/examples/data/uzbl/scripts/formfiller.pl
diff --git a/examples/scripts/formfiller.sh b/examples/data/uzbl/scripts/formfiller.sh
index 5debcce..d54c626 100755
--- a/examples/scripts/formfiller.sh
+++ b/examples/data/uzbl/scripts/formfiller.sh
@@ -12,9 +12,7 @@
 
 # something else (or empty): if file not available: new, otherwise load.
 
-[ -d /usr/share/uzbl/examples/data/forms  ] && keydir=/usr/share/uzbl/examples/data/forms  # you will probably get permission denied errors here.
-[ -d $XDG_DATA_HOME/uzbl/forms            ] && keydir=$XDG_DATA_HOME/uzbl/forms
-[ -d ./examples/data/forms                ] && keydir=./examples/data/forms #useful when developing
+keydir=$XDG_DATA_HOME/uzbl/forms
 [ -z "$keydir" ] && exit 1
 
 #editor=gvim
diff --git a/examples/scripts/hint.js b/examples/data/uzbl/scripts/hint.js
index ec7f1e2..ec7f1e2 100644
--- a/examples/scripts/hint.js
+++ b/examples/data/uzbl/scripts/hint.js
diff --git a/examples/data/uzbl/scripts/history.sh b/examples/data/uzbl/scripts/history.sh
new file mode 100755
index 0000000..69f4034
--- /dev/null
+++ b/examples/data/uzbl/scripts/history.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+#TODO: strip 'http://' part
+echo "$8 $6 $7" >> $XDG_DATA_HOME/uzbl/history
diff --git a/examples/scripts/insert_bookmark.sh b/examples/data/uzbl/scripts/insert_bookmark.sh
index 180f4cd..b3a7011 100755
--- a/examples/scripts/insert_bookmark.sh
+++ b/examples/data/uzbl/scripts/insert_bookmark.sh
@@ -1,11 +1,8 @@
 #!/bin/bash
 # you probably want your bookmarks file in your $XDG_DATA_HOME ( eg $HOME/.local/share/uzbl/bookmarks)
 
-
-[ -f /usr/share/uzbl/examples/data/bookmarks ] && file=/usr/share/uzbl/examples/data/bookmarks  # you will probably get permission denied errors here.
-[ -f $XDG_DATA_HOME/uzbl/bookmarks           ] && file=$XDG_DATA_HOME/uzbl/bookmarks
-[ -f ./examples/data/bookmarks               ] && file=./examples/data/bookmarks #useful when developing
-[ -z "$file" ] && exit 1
+[ -d "$XDG_DATA_HOME/uzbl" ] || exit 1
+file=$XDG_DATA_HOME/uzbl/bookmarks
 
 which zenity &>/dev/null || exit 2
 
@@ -14,4 +11,4 @@ url=`awk '{print $1}' <<< $entry`
 # TODO: check if already exists, if so, and tags are different: ask if you want to replace tags
 echo "$entry" >/dev/null #for some reason we need this.. don't ask me why
 echo -e "$entry"  >> $file
-true
\ No newline at end of file
+true
diff --git a/examples/scripts/linkfollow.js b/examples/data/uzbl/scripts/linkfollow.js
index a348af9..a348af9 100644
--- a/examples/scripts/linkfollow.js
+++ b/examples/data/uzbl/scripts/linkfollow.js
diff --git a/examples/scripts/load_url_from_bookmarks.sh b/examples/data/uzbl/scripts/load_url_from_bookmarks.sh
index 1ae39ff..eb04873 100755
--- a/examples/scripts/load_url_from_bookmarks.sh
+++ b/examples/data/uzbl/scripts/load_url_from_bookmarks.sh
@@ -2,10 +2,8 @@
 
 #NOTE: it's the job of the script that inserts bookmarks to make sure there are no dupes.
 
-[ -f /usr/share/uzbl/examples/data/bookmarks ] && file=/usr/share/uzbl/examples/data/bookmarks
-[ -f $XDG_DATA_HOME/uzbl/bookmarks           ] && file=$XDG_DATA_HOME/uzbl/bookmarks
-[ -f ./examples/data/bookmarks               ] && file=./examples/data/bookmarks #useful when developing
-[ -z "$file" ] && exit 1
+file=$XDG_DATA_HOME/uzbl/bookmarks
+[ -z "$file" ] && exit 
 COLORS=" -nb #303030 -nf khaki -sb #CCFFAA -sf #303030"
 if dmenu --help 2>&1 | grep -q '\[-rs\] \[-ni\] \[-nl\] \[-xs\]'
 then
diff --git a/examples/scripts/load_url_from_history.sh b/examples/data/uzbl/scripts/load_url_from_history.sh
index 37c2afc..39ef302 100755
--- a/examples/scripts/load_url_from_history.sh
+++ b/examples/data/uzbl/scripts/load_url_from_history.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
-# you probably really want this in your $XDG_DATA_HOME (eg $HOME/.local/share/uzbl/history)
-history_file=/tmp/uzbl.history
+history_file=$XDG_DATA_HOME/uzbl/history
 
 # choose from all entries, sorted and uniqued
 # goto=`awk '{print $3}' $history_file | sort -u | dmenu -i`
diff --git a/examples/scripts/session.sh b/examples/data/uzbl/scripts/session.sh
index e2642c7..e2642c7 100755
--- a/examples/scripts/session.sh
+++ b/examples/data/uzbl/scripts/session.sh
diff --git a/examples/scripts/uzblcat b/examples/data/uzbl/scripts/uzblcat
index 82341c7..82341c7 100755
--- a/examples/scripts/uzblcat
+++ b/examples/data/uzbl/scripts/uzblcat
diff --git a/examples/scripts/yank.sh b/examples/data/uzbl/scripts/yank.sh
index ee140c7..ee140c7 100755
--- a/examples/scripts/yank.sh
+++ b/examples/data/uzbl/scripts/yank.sh
diff --git a/examples/data/style.css b/examples/data/uzbl/style.css
index de0a38b..de0a38b 100644
--- a/examples/data/style.css
+++ b/examples/data/uzbl/style.css
diff --git a/uzbl.png b/examples/data/uzbl/uzbl.png
index 773ea84..773ea84 100644
--- a/uzbl.png
+++ b/examples/data/uzbl/uzbl.png
diff --git a/examples/scripts/history.sh b/examples/scripts/history.sh
deleted file mode 100755
index 19b5218..0000000
--- a/examples/scripts/history.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-#TODO: strip 'http://' part
-# you probably really want this in your $XDG_DATA_HOME (eg $HOME/.local/share/uzbl/history)
-echo "$8 $6 $7" >> /tmp/uzbl.history