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

1 files changed, 18 insertions, 8 deletions

diff --git a/examples/config/uzbl/config b/examples/config/uzbl/config
index e5b3c6a..4b04d7a 100644
--- a/examples/config/uzbl/config
+++ b/examples/config/uzbl/config
@@ -13,6 +13,8 @@ set toggle_modes   = request TOGGLE_MODES
 set on_event       = request ON_EVENT
 # request PROGRESS_CONFIG <key> = <value>
 set progress       = request PROGRESS_CONFIG
+# request MODMAP From To
+set modmap         = request MODMAP
 
 set set_mode       = set mode =
 set set_status     = set status_message =
@@ -26,7 +28,7 @@ set scripts_dir    = $XDG_DATA_HOME/uzbl:/usr/local/share/uzbl/examples/data/uzb
 
 set download_handler   = spawn @scripts_dir/download.sh
 set cookie_handler     = talk_to_socket $XDG_CACHE_HOME/uzbl/cookie_daemon_socket
-set scheme_handler     = spawn @scripts_dir/scheme.py
+set scheme_handler     = sync_spawn @scripts_dir/scheme.py
 
 # New window handler options
 #set new_window        = sh 'echo uri "$8" > $4' # open in same window
@@ -42,8 +44,8 @@ set new_window         = sh 'uzbl-browser -u $8' # equivalent to the default beh
 @on_event   LOAD_FINISH    @set_status <span foreground="gold">done</span>
 @on_event   LOAD_FINISH    spawn @scripts_dir/history.sh
 
-# Generate a FORM_ACTIVE event if an editable 
-# element on the loaded site has initial focus 
+# Generate a FORM_ACTIVE event if an editable
+# element on the loaded site has initial focus
 @on_event   LOAD_FINISH    js if(document.activeElement.type == 'text') {Uzbl.run("event FORM_ACTIVE");}
 
 # Switch to insert mode if a (editable) html form is clicked
@@ -98,6 +100,14 @@ set fifo_dir          = /tmp
 set socket_dir        = /tmp
 
 
+# === Binding modmaps ========================================================
+
+#modmap from           to
+@modmap Control        Ctrl
+@modmap ISO_Left_Tab   Shift-Tab
+@modmap space          Space
+
+
 # === Keyboard bindings ======================================================
 
 # With this command you can enter in any command at runtime when prefixed with
@@ -133,7 +143,8 @@ set socket_dir        = /tmp
 @bind    gg _      = uri http://www.google.com/search?q=%s
 # Enclose the executable in quotes if it has spaces.  Any additional parameters you use will
 # appear AFTER the default parameters
-#@bind    B         = spawn @scripts_dir/insert_bookmark.sh
+# use a script to insert bookmarks. or use the EM/keycmd technique a bit further down
+@bind    B         = spawn @scripts_dir/insert_bookmark.sh
 @bind    U         = spawn @scripts_dir/load_url_from_history.sh
 @bind    u         = spawn @scripts_dir/load_url_from_bookmarks.sh
 # with the sample yank script, you can yank one of the arguments into clipboard/selection
@@ -159,7 +170,7 @@ set socket_dir        = /tmp
 @bind    XS        = sh 'echo "js alert (\\"This is sent by the shell via a fifo\\")" > "$4"'
 
 @bind    !dump     = sh "echo dump_config > $4"
-@bind    !reload   = sh 'cat $1 > $4'
+@bind    !reload   = sh "sed '/^# === Post-load misc commands/,$d' $1 > $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
 set formfiller = spawn @scripts_dir/formfiller
@@ -188,9 +199,8 @@ set formfiller = spawn @scripts_dir/formfiller
 @bind o<uri:>_ = uri %s
 @bind O<uri:"\@uri">_ = uri %s
 
-# Prints tab separated "uri title keyword tags" to the bookmarks file.
-# TODO: Improve bookmarks script to handle this format & include date in bookmark format.
-@bind <Ctrl>b<name:>_<tags:>_ = sh 'echo -e "$6	$7	%s	%s" >> $XDG_DATA_HOME/uzbl/bookmarks'
+# multi-stage binding way to write bookmarks to file from inside uzbl.
+@bind <Ctrl>b<tags:>_ = sh 'echo -e "$6 %s" >> $XDG_DATA_HOME/uzbl/bookmarks'
 
 # Multi-stage bindings with blank prompts (similar behaviour to emacs M-c M-s bindings?)
 @bind <Ctrl>a<:><Ctrl>q = exit