diff options
| author |  Mason Larobina <mason.larobina@gmail.com> | 2010-03-18 17:16:09 +0800 |
|---|---|---|
| committer | Mason Larobina <mason.larobina@gmail.com> | 2010-03-18 17:16:09 +0800 |
| commit | 0ae55776fff195faa7a85cfaa926fcf91fca37d9 (patch) | |
| tree | edb4e8cffb4078adb20ece907b2defb7ed719a03 /examples | |
| parent | 9dc9a582349c59493f3f17e955f2012eee881d3f (diff) | |
| parent | c6b056083f5b520d2b60e205791d406615bfbfce (diff) | |
Merge branch 'master' into experimental
Conflicts in examples/config/config:
FS#198 also applies to the new NEW_WINDOW handler.
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/config/config | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/examples/config/config b/examples/config/config index 9e5ee55..6c72594 100644 --- a/examples/config/config +++ b/examples/config/config @@ -48,7 +48,7 @@ set authentication_handler = sync_spawn @scripts_dir/auth.py # --- Optional dynamic event handlers ---------------------------------------- # Open link in new window -@on_event NEW_WINDOW sh 'uzbl-browser -u $8' %r +@on_event NEW_WINDOW sh 'uzbl-browser -u "$8"' %r # Open in current window #@on_event NEW_WINDOW uri %s # Open in new tab @@ -160,7 +160,9 @@ set ebind = @mode_bind global,-insert # === Global & keycmd editing binds ========================================== # Resets keycmd and returns to default mode. -@bind <Escape> = @set_mode +@on_event ESCAPE @set_mode +@bind <Escape> = event ESCAPE +@bind <Ctrl>] = event ESCAPE # Commands for editing and traversing the keycmd. @ebind <Return> = event KEYCMD_EXEC_CURRENT @@ -268,8 +270,9 @@ set preset = event PRESET_TABS @cbind ZZ = exit # Dump config to stdout @cbind !dump = sh "echo dump_config > $4" -# Reload config -@cbind !reload = sh "sed '/^# === Post-load misc commands/,$d' $1 > $4" +# Reload all variables in the config +@cbind !reload = sh "sed '/^# === Post-load misc commands/,$d' $1 | grep '^set ' > $4" + # Use socat to directly inject commands into uzbl-core and view events # raised by uzbl-core: @cbind <Ctrl><Alt>t = sh 'xterm -e "socat unix-connect:$5 -"' |