From a147fd153338f3a25dc726a7448ca10941d867c6 Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Wed, 29 Apr 2009 20:25:53 +0200 Subject: fix for broken external keybinds --- uzbl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uzbl.c b/uzbl.c index 0829d0e..074d27a 100644 --- a/uzbl.c +++ b/uzbl.c @@ -446,7 +446,7 @@ key_press_cb (WebKitWebView* page, GdkEventKey* event) //EXTERNAL BINDINGS if((act = g_hash_table_lookup(external_bindings, event->string)) != NULL) if (!insert_mode || (event->state == modmask)) { - parse_command (act); + run_command (act, NULL); result = TRUE; } -- cgit v1.2.3 From 37230770db02ed3605277dbcf2513f7b9681b635 Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Wed, 29 Apr 2009 20:40:54 +0200 Subject: patch from anydot, somewhat edited to apply on newer code. original @ http://pastebin.ca/1406151 --- uzbl.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/uzbl.c b/uzbl.c index 074d27a..401e628 100644 --- a/uzbl.c +++ b/uzbl.c @@ -326,8 +326,9 @@ parse_command(const char *cmd) { Command *c = NULL; char buffer[512]; strcpy (buffer, cmd); - char * command_name = strtok (buffer, " "); - gchar * command_param = strtok (NULL, " ,"); + char * saveptr; + char * command_name = strtok_r (buffer, " ", &saveptr); + gchar * command_param = strtok_r (NULL, " ,", &saveptr); if((c = g_hash_table_lookup(commands, command_name)) != NULL){ if (c->func_2_params != NULL) { @@ -508,6 +509,7 @@ settings_init () { gboolean res = FALSE; gchar** keysi = NULL; gchar** keyse = NULL; + char *saveptr; if (! config_file) { const char* XDG_CONFIG_HOME = getenv ("XDG_CONFIG_HOME"); @@ -532,7 +534,7 @@ settings_init () { char buffer[512]; strcpy (buffer, XDG_CONFIG_DIRS); - const gchar* dir = strtok (buffer, ":"); + const gchar* dir = (char *) strtok_r (buffer, ":", &saveptr); while (dir && ! file_exists (conf)) { strcpy (conf, dir); strcat (conf, "/uzbl/config"); @@ -540,7 +542,7 @@ settings_init () { printf ("Config file %s found.\n", conf); config_file = &conf[0]; } - dir = strtok (NULL, ":"); + dir = (char * ) strtok_r (NULL, ":", &saveptr); } } } -- cgit v1.2.3 From 4169c2405dd5e7dc96d4ed2f607d571459c8c742 Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Wed, 29 Apr 2009 20:51:32 +0200 Subject: todo updates --- TODO | 1 + 1 file changed, 1 insertion(+) diff --git a/TODO b/TODO index 40a5ded..64033dd 100644 --- a/TODO +++ b/TODO @@ -30,6 +30,7 @@ ASAP * add to bottom /* vi: set et ts=4: */ * ideal uri editor: awesome mode like FF, some keyb shortcuts (erase search string, go to end/begin of string,..), history (if you patch dmenu to be in vertical mode and you order correctly, that's it), support copy paste * get rid of the home page concept. allow user to make keybinds to go to one or more "homepages". a home page is nothing special. +* blinking cursor when not in insert mode is confusing. i suggest dimming it's color if possible SOMEDAY: -- cgit v1.2.3