From: Tom Adams Date: Wed, 26 Aug 2009 08:47:46 +0000 (+0100) Subject: Merge branch 'experimental' into bf2 X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=254e4a473fc96b6418c348fcfdf0a49c30b2a035;hp=8cfc268b053c0b5a8afc3f6d85c1e31518a6644c;p=uzbl-mobile Merge branch 'experimental' into bf2 Conflicts: examples/config/uzbl/config --- diff --git a/Makefile b/Makefile index fbc85a1..78ff400 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ LDFLAGS!=echo `pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -p all: uzbl uzblctrl -PREFIX?=$(DESTDIR)/usr +PREFIX?=$(DESTDIR)/usr/local # When compiling unit tests, compile uzbl as a library first tests: uzbl.o @@ -22,7 +22,7 @@ test-dev: uzbl XDG_DATA_HOME=./examples/data XDG_CONFIG_HOME=./examples/config ./uzbl --uri http://www.uzbl.org --verbose test-share: uzbl - XDG_DATA_HOME=/usr/share/uzbl/examples/data XDG_CONFIG_HOME=/usr/share/uzbl/examples/config ./uzbl --uri http://www.uzbl.org --verbose + XDG_DATA_HOME=${PREFIX}/share/uzbl/examples/data XDG_CONFIG_HOME=${PREFIX}/share/uzbl/examples/config ./uzbl --uri http://www.uzbl.org --verbose clean: diff --git a/examples/config/uzbl/config b/examples/config/uzbl/config index 04e482b..efc4780 100644 --- a/examples/config/uzbl/config +++ b/examples/config/uzbl/config @@ -4,15 +4,14 @@ # keyboard behavior in this sample config is sort of vimstyle # Handlers -set history_handler = spawn $XDG_DATA_HOME/uzbl/scripts/history.sh set download_handler = spawn $XDG_DATA_HOME/uzbl/scripts/download.sh set cookie_handler = spawn $XDG_DATA_HOME/uzbl/scripts/cookies.py #set new_window = sh 'echo uri "$8" > $4' # open in same window set new_window = sh 'uzbl -u $8' # equivalent to the default behaviour set scheme_handler = spawn $XDG_DATA_HOME/uzbl/scripts/scheme.py -set load_start_handler = set status_message = wait +set load_start_handler = chain 'set keycmd = ' 'set status_message = wait' set load_commit_handler = set status_message = recv -set load_finish_handler = set status_message = done +set load_finish_handler = chain 'set status_message = done' 'spawn $XDG_DATA_HOME/uzbl/scripts/history.sh' diff --git a/examples/data/uzbl/scripts/history.sh b/examples/data/uzbl/scripts/history.sh index d726f9c..7c83aa6 100755 --- a/examples/data/uzbl/scripts/history.sh +++ b/examples/data/uzbl/scripts/history.sh @@ -1,6 +1,5 @@ #!/bin/sh -#TODO: strip 'http://' part file=${XDG_DATA_HOME:-$HOME/.local/share}/uzbl/history [ -d `dirname $file` ] || exit 1 -echo "$8 $6 $7" >> $file +echo `date +'%Y-%m-%d %H:%M:%S'`" $6 $7" >> $file diff --git a/uzbl.c b/uzbl.c index d0b2a64..1bb5ee2 100644 --- a/uzbl.c +++ b/uzbl.c @@ -137,7 +137,6 @@ const struct var_name_to_ptr_t { { "load_finish_handler", PTR_V_STR(uzbl.behave.load_finish_handler, 1, NULL)}, { "load_start_handler", PTR_V_STR(uzbl.behave.load_start_handler, 1, NULL)}, { "load_commit_handler", PTR_V_STR(uzbl.behave.load_commit_handler, 1, NULL)}, - { "history_handler", PTR_V_STR(uzbl.behave.history_handler, 1, NULL)}, { "download_handler", PTR_V_STR(uzbl.behave.download_handler, 1, NULL)}, { "cookie_handler", PTR_V_STR(uzbl.behave.cookie_handler, 1, cmd_cookie_handler)}, { "new_window", PTR_V_STR(uzbl.behave.new_window, 1, NULL)}, @@ -772,7 +771,6 @@ load_start_cb (WebKitWebView* page, WebKitWebFrame* frame, gpointer data) { (void) frame; (void) data; uzbl.gui.sbar.load_progress = 0; - clear_keycmd(); // don't need old commands to remain on new page? if (uzbl.behave.load_start_handler) run_handler(uzbl.behave.load_start_handler, ""); } @@ -799,19 +797,6 @@ destroy_cb (GtkWidget* widget, gpointer data) { gtk_main_quit (); } -void -log_history_cb () { - if (uzbl.behave.history_handler) { - time_t rawtime; - struct tm * timeinfo; - char date [80]; - time ( &rawtime ); - timeinfo = localtime ( &rawtime ); - strftime (date, 80, "\"%Y-%m-%d %H:%M:%S\"", timeinfo); - run_handler(uzbl.behave.history_handler, date); - } -} - /* VIEW funcs (little webkit wrappers) */ #define VIEWFUNC(name) void view_##name(WebKitWebView *page, GArray *argv, GString *result){(void)argv; (void)result; webkit_web_view_##name(page);} @@ -2369,7 +2354,6 @@ create_browser () { g_signal_connect (G_OBJECT (g->web_view), "load-progress-changed", G_CALLBACK (progress_change_cb), g->web_view); g_signal_connect (G_OBJECT (g->web_view), "load-committed", G_CALLBACK (load_commit_cb), g->web_view); g_signal_connect (G_OBJECT (g->web_view), "load-started", G_CALLBACK (load_start_cb), g->web_view); - g_signal_connect (G_OBJECT (g->web_view), "load-finished", G_CALLBACK (log_history_cb), g->web_view); g_signal_connect (G_OBJECT (g->web_view), "load-finished", G_CALLBACK (load_finish_cb), g->web_view); g_signal_connect (G_OBJECT (g->web_view), "hovering-over-link", G_CALLBACK (link_hover_cb), g->web_view); g_signal_connect (G_OBJECT (g->web_view), "navigation-policy-decision-requested", G_CALLBACK (navigation_decision_cb), g->web_view); @@ -2933,7 +2917,9 @@ main (int argc, char* argv[]) { gboolean verbose_override = uzbl.state.verbose; settings_init (); - set_insert_mode(FALSE); + + if (!uzbl.behave.always_insert_mode) + set_insert_mode(FALSE); if (!uzbl.behave.show_status) gtk_widget_hide(uzbl.gui.mainbar); diff --git a/uzbl.h b/uzbl.h index 780aebf..810076d 100644 --- a/uzbl.h +++ b/uzbl.h @@ -93,7 +93,6 @@ typedef struct { gchar* title_format_short; gchar* title_format_long; gchar* status_background; - gchar* history_handler; gchar* fifo_dir; gchar* socket_dir; gchar* download_handler; @@ -270,9 +269,6 @@ void destroy_cb (GtkWidget* widget, gpointer data); void -log_history_cb (); - -void commands_hash(void); void