aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--README9
-rw-r--r--TODO3
-rw-r--r--examples/configs/sampleconfig10
-rw-r--r--examples/configs/sampleconfig-dev10
-rw-r--r--uzbl.c3
5 files changed, 18 insertions, 17 deletions
diff --git a/README b/README
index 31f307a..6c1b23f 100644
--- a/README
+++ b/README
@@ -106,18 +106,17 @@ $2 uzbl-pid
$3 uzbl-x-window-id
$4 uzbl_fifo-filename
$5 uzbl_socket-filename
+$6 current page url
+$7 current page title
.. [ script specific ] (optional)
The script specific arguments are this:
* history:
- $6 page url
- $7 page title
$8 date of visit (Y-m-d H:i:s localtime)
* add bookmark:
- $6 page url
- $7 page title
+ none
* download:
- $6 url
+ $8 url of item to download
KNOWN BUGS
- Segfaults when using zoom commands (happens when max zoom already reached?).
diff --git a/TODO b/TODO
index 80440a3..e22e5f5 100644
--- a/TODO
+++ b/TODO
@@ -6,7 +6,6 @@ ASAP
* when launching new instance, don't just try 'uzbl' and then './uzbl', rather launch a new uzbl in the same way the current uzbl instance was started. (same command, same arguments, except --uri)
* where to put proxy config? webkit support? depend on libsoup?
* compare libsoup to curl backend. there are probably performance differences
-* check configured commands if they end on .sh so users don't need to prepend /bin/<shell>
* implement a more advanced dmenu alike that behaves like FF's awesomebar and where you can search in url + window title
* recognize -h with GOption?
* implement a vimperator-like link following scheme. but let user pick his favorite characters to construct the "link identifiers" with.
@@ -39,6 +38,8 @@ ASAP
* default value for fifo_dir, socket_dir so we don't need to if(fifo_dir). it will always be set to something?
* change User-agent to contain uzbl + build date or something. + why is there "Mozilla" in the string
* backspace key to pop characters from (multichar) command
+* optional logging of http requests, responses with ip/hostname and port. -> how to implement? handler? stdout? (through a socket so you know what corresponds to what?)
+* bench/optimize fifo vs socket performance. measure delays. minimize forks. does glib use a shell? how does it detect the shebang line?
SOMEDAY:
check if we can make the settings loading less hard coded. eg( keep a list of all settings, and for each one, try to load it)
diff --git a/examples/configs/sampleconfig b/examples/configs/sampleconfig
index 2f9df6f..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
@@ -39,9 +39,9 @@ w = follow_link_new_window
t = toggle_status
ZZ = exit
i = insert_mode
-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
+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 9fcc906..7cbf8b4 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
@@ -39,8 +39,8 @@ w = follow_link_new_window
t = toggle_status
ZZ = exit
i = insert_mode
-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
+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]
diff --git a/uzbl.c b/uzbl.c
index ed4859a..63f0a2a 100644
--- a/uzbl.c
+++ b/uzbl.c
@@ -256,7 +256,7 @@ log_history_cb () {
timeinfo = localtime ( &rawtime );
strftime (date, 80, "%Y-%m-%d %H:%M:%S", timeinfo);
GString* args = g_string_new ("");
- g_string_printf (args, "'%s' '%s' '%s'", uri, "TODO:page title here", date);
+ g_string_printf (args, "'%s'", date);
run_command(history_handler, args->str);
g_string_free (args, TRUE);
}
@@ -395,6 +395,7 @@ run_command(const char *command, const char *args) {
GString* to_execute = g_string_new ("");
gboolean result;
g_string_printf (to_execute, "%s '%s' '%i' '%i' '%s' '%s'", command, config_file, (int) getpid() , (int) xwin, fifo_path, socket_path);
+ g_string_append_printf (to_execute, " '%s' '%s'", uri, "TODO title here");
if(args) {
g_string_append_printf (to_execute, " %s", args);
}