aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Paweł Zuzelski <pawelz@pld-linux.org>2010-02-03 12:32:43 +0100
committerGravatar Paweł Zuzelski <pawelz@pld-linux.org>2010-02-03 12:32:43 +0100
commit281ad1fc48a8892f3c367fb19b4b7ff7d6190800 (patch)
tree4f71526d5e5dbfce65cd9a1c72a689564100f5bb
parent690e20f9f3a844346b041935511942f1ca905de9 (diff)
parentf15512e073ccad89e2b352147d9b69a87cad7319 (diff)
Merge remote branch 'Dieterbe/experimental' into experimental
-rw-r--r--examples/config/config2
-rw-r--r--examples/data/scripts/follow.js2
-rw-r--r--src/config.h13
3 files changed, 9 insertions, 8 deletions
diff --git a/examples/config/config b/examples/config/config
index b30ff45..4c63fe7 100644
--- a/examples/config/config
+++ b/examples/config/config
@@ -314,7 +314,7 @@ set follow_hint_keys = 0123456789
#set follow_hint_keys = qwerty
#set follow_hint_keys = asdfghjkl;
#set follow_hint_keys = thsnd-rcgmvwb/;789aefijkopquxyz234
-@cbind fl* = script @scripts_dir/follow.js '%s @{follow_hint_keys}'
+@cbind fl* = script @scripts_dir/follow.js '@follow_hint_keys %s'
# --- Form filler binds ---
# this script allows you to configure (per domain) values to fill in form
diff --git a/examples/data/scripts/follow.js b/examples/data/scripts/follow.js
index afb327f..a42447c 100644
--- a/examples/data/scripts/follow.js
+++ b/examples/data/scripts/follow.js
@@ -1,5 +1,5 @@
/* This is the basic linkfollowing script.
- * Its pretty stable, only using numbers to navigate.
+ * Its pretty stable, and you configure which keys to use for hinting
*
* TODO: Some pages mess around a lot with the zIndex which
* lets some hints in the background.
diff --git a/src/config.h b/src/config.h
index e9b9a8e..7c4bae5 100644
--- a/src/config.h
+++ b/src/config.h
@@ -1,10 +1,11 @@
const struct {
/*@null@*/ char *command;
} default_config[] = {
-{ "set status_format = <span background=\"red\" foreground=\"white\">\\@[\\@keycmd]\\@</span> <b>\\@[\\@TITLE]\\@</b> - Uzbl browser"},
-{ "set title_format_long = \\@keycmd \\@TITLE - Uzbl browser <\\@NAME> > \\@SELECTED_URI"},
-{ "set title_format_short = \\@TITLE - Uzbl browser <\\@NAME>"},
-{ "set max_conns = 100"}, /* WebkitGTK default: 10 */
-{ "set max_conns_host = 6"}, /* WebkitGTK default: 2 */
-{ NULL }
+{ "set status_format = <b>\\@[\\@TITLE]\\@</b> - \\@[\\@uri]\\@ - <span foreground=\"#bbb\">\\@NAME</span>" },
+{ "set show_status = 1" },
+{ "set title_format_long = \\@keycmd \\@TITLE - Uzbl browser <\\@NAME> > \\@SELECTED_URI" },
+{ "set title_format_short = \\@TITLE - Uzbl browser <\\@NAME>" },
+{ "set max_conns = 100" }, /* WebkitGTK default: 10 */
+{ "set max_conns_host = 6" }, /* WebkitGTK default: 2 */
+{ NULL }
};