Merge branch 'experimental' of git://github.com/Dieterbe/uzbl into experimental

3 files changed, 28 insertions, 17 deletions

diff --git a/examples/configs/sampleconfig b/examples/configs/sampleconfig
index f6e8688..0f2fa5f 100644
--- a/examples/configs/sampleconfig
+++ b/examples/configs/sampleconfig
@@ -11,8 +11,8 @@
 # from insert mode by combining them with the modkey
 
 [behavior]
-history_handler = /bin/bash /usr/share/uzbl/examples/scripts/history.sh
-download_handler = /bin/bash /usr/share/uzbl/examples/scripts/download.sh
+history_handler = /usr/share/uzbl/examples/scripts/history.sh
+download_handler = /usr/share/uzbl/examples/scripts/download.sh
 fifo_dir = /tmp
 socket_dir = /tmp
 always_insert_mode = 0
@@ -21,21 +21,27 @@ show_status = 1
 status_top = 0
 
 [bindings]
+j = scroll_down
+k = scroll_up
+h = scroll_left
+l = scroll_right
 b = back
 m = forward
 s = stop
 r = refresh
 R = reload
-h = uri http://www.uzbl.org
+gh = uri http://www.uzbl.org
 f = follow_link_here
 F = follow_link_new_tab
 w = follow_link_new_window
 + = zoom_in
 - = zoom_out
 t = toggle_status
-k = exit
-B = spawn /bin/bash /usr/share/uzbl/examples/scripts/insert_bookmark.sh
-u = spawn /bin/bash /usr/share/uzbl/examples/scripts/load_url_from_history.sh
-U = spawn /bin/bash /usr/share/uzbl/examples/scripts/load_url_from_bookmarks.sh
+ZZ = exit
+i = insert_mode
+B = spawn /usr/share/uzbl/examples/scripts/insert_bookmark.sh
+u = spawn /usr/share/uzbl/examples/scripts/load_url_from_history.sh
+U = spawn /usr/share/uzbl/examples/scripts/load_url_from_bookmarks.sh
+
 
 [network]
diff --git a/examples/configs/sampleconfig-dev b/examples/configs/sampleconfig-dev
index 61ccec9..2d2c5f6 100644
--- a/examples/configs/sampleconfig-dev
+++ b/examples/configs/sampleconfig-dev
@@ -11,8 +11,8 @@
 # from insert mode by combining them with the modkey
 
 [behavior]
-history_handler = /bin/bash ./examples/scripts/history.sh
-download_handler = /bin/bash ./examples/scripts/download.sh
+history_handler = ./examples/scripts/history.sh
+download_handler = ./examples/scripts/download.sh
 fifo_dir = /tmp
 socket_dir = /tmp
 always_insert_mode = 0
@@ -21,27 +21,32 @@ show_status = 1
 status_top = 0
 
 [bindings]
+j = scroll_down
+k = scroll_up
+h = scroll_left
+l = scroll_right
 b = back
 m = forward
 s = stop
 r = refresh
 R = reload
-h = uri http://www.uzbl.org
+gh = uri http://www.uzbl.org
 f = follow_link_here
 F = follow_link_new_tab
 w = follow_link_new_window
 + = zoom_in
 - = zoom_out
 t = toggle_status
-k = exit
-B = spawn /bin/bash ./examples/scripts/insert_bookmark.sh
-u = spawn /bin/bash ./examples/scripts/load_url_from_history.sh
-U = spawn /bin/bash ./examples/scripts/load_url_from_bookmarks.sh
+ZZ = exit
+i = insert_mode
+B = spawn ./examples/scripts/insert_bookmark.sh
+u = spawn ./examples/scripts/load_url_from_history.sh
+U = spawn ./examples/scripts/load_url_from_bookmarks.sh
 
 [network]
-proxy_server = 
+proxy_server = http://192.168.1.10:8118
 #values 0-3
-http_debug = 0
+http_debug = 1
 user-agent = uzbl
 max_conns = 
 max_conns_per_host = 
diff --git a/examples/scripts/insert_bookmark.sh b/examples/scripts/insert_bookmark.sh
index be17c05..5d76c35 100755
--- a/examples/scripts/insert_bookmark.sh
+++ b/examples/scripts/insert_bookmark.sh
@@ -10,7 +10,7 @@ fi
 
 which zenity &>/dev/null || exit 2
 
-entry=`zenity --entry --text="Add bookmark. add tags at the end, separated by commas" --entry-text="$5"`
+entry=`zenity --entry --text="Add bookmark. add tags at the end, separated by commas" --entry-text="$6"`
 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" >> $file