diff options
| -rw-r--r-- | AUTHORS | 6 | ||||
| -rw-r--r-- | README | 15 | ||||
| -rw-r--r-- | TODO | 2 | ||||
| -rw-r--r-- | config | 17 | ||||
| -rw-r--r-- | sampleconfig | 8 | ||||
| -rw-r--r-- | uzbl.c | 271 |
6 files changed, 240 insertions, 79 deletions
@@ -1,2 +1,8 @@ Original code taken from webkit example application whis is copyrighted 2006, 2007 Apple Inc and 2007 Alp Toker <alp@atoker.com> enhancements to form uzbl made by Dieter Plaetinck. + +Michael Walker (Barrucadu) <mike@barrucadu.co.uk> - Original threaded FIFO interface. Command adding methods. + +Zane Ashby (HashBox) <http://demonastery.org> - Rewrote FIFO interface. Fixed various bugs. + +(sentientswitch) - Cleaned up code. Added some commands. @@ -57,9 +57,20 @@ So, assume each entry is about 80 chars, you visit 100 pages per day (?), and yo (50 * 1000 * 1000 ) / ( 80 * 100 ) = 6250 days or 17 years. There is code to run a benchmark in the 'extra' dir. For results & interpretation, see http://dieter.plaetinck.be/poor_mans_dmenu_benchmark - - +CONTROL: +- FIFO opened in /tmp/uzbl_pid +- See config file for commands +- Press ESC to toggle the command entry. +- Press enter after typing a command to use it. NOTE: - My c skills are very rusty, it will take me a while to get back up to speed - For more thoughts & ideas see http://bbs.archlinux.org/viewtopic.php?id=67463 +- I push the code most times I save any changes, regardless of whether it actually compiles or not. Thus, the code here should be regarded as highly experimental. + +KNOWN BUGS +- Segfault occurs on shutdown, almost definitely FIFO related (I'm not seeing this bug now, but the warning was here when I forked the code and I haven't touched the FIFO bit) +- Segfaults when using zoom commands (happens when max zoom already reached?). +- Something in the FIFO code causes CPU usage to jump. +- Segfaults when loading aliases from config file (currently aliases are defined in the code as a 'work-around'). +- Segfaults when setting the xwin variable
\ No newline at end of file @@ -1,4 +1,6 @@ * implement all the ideas from README +* Support for arguments to commands (argc/argv-like structure?). +* Support for binding keyboard shortcuts in config file. * where to put proxy config? webkit support? * do not store the 'http://' part in the history file * improve commandline arguments @@ -0,0 +1,17 @@ +# example uzbl config. in a real config, we should obey the xdg spec +[behavior] +history_file = /tmp/uzbl.history + +[alias] +b = back +f = forward +z+ = zoom in +z- = zoom out +r = refresh +s = stop + +[bindings_internal] + +[bindings_external] + +[network] diff --git a/sampleconfig b/sampleconfig index 3817e02..0c4f521 100644 --- a/sampleconfig +++ b/sampleconfig @@ -1,3 +1,4 @@ + # example uzbl config. in a real config, we should obey the xdg spec # all keys in the behavior group are optional. if not set, the corresponding behavior is disabed. @@ -35,5 +36,12 @@ zoom_out = - ./extra/load_url_from_history.sh = u ./extra/load_url_from_bookmarks.sh = U +[alias] +b = back +f = forward +z+ = zoom in +z- = zoom out +r = refresh +s = stop [network] @@ -47,8 +47,15 @@ static GtkWidget* uri_entry; static GtkWidget* mainbar; static WebKitWebView* web_view; static gchar* main_title; -static gchar* history_file; -static gchar* fifodir = NULL; +static gchar selected_url[500]; + +/* Behaviour variables */ +static gchar* history_file = NULL; +static gchar* fifodir = NULL; +static gchar* download_handler = NULL; +static gchar* always_insert_mode = NULL; +static gchar* modkey = NULL; + static char fifopath[64]; static gint load_progress; static guint status_context_id; @@ -59,25 +66,34 @@ static gboolean verbose = FALSE; static GOptionEntry entries[] = { - { "uri", 'u', 0, G_OPTION_ARG_STRING, &uri, "Uri to load", NULL }, - { "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose, "Be verbose", NULL }, - { NULL } + { "uri", 'u', 0, G_OPTION_ARG_STRING, &uri, "Uri to load", NULL }, + { "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose, "Be verbose", NULL }, + { NULL } }; typedef struct { - const char *command; - void (*func_1_param)(WebKitWebView*); - void (*func_2_params)(WebKitWebView*, char *); + const char *command; + void (*func_1_param)(WebKitWebView*); + void (*func_2_params)(WebKitWebView*, char *); } Command; +typedef struct +{ + const char *binding; + const char *action; +} Binding; + +static Binding internal_bindings[256]; +static Binding external_bindings[256]; +static int num_internal_bindings = 0; +static int num_external_bindings = 0; static void update_title (GtkWindow* window); /* --- CALLBACKS --- */ - static void go_back_cb (GtkWidget* widget, gpointer data) { webkit_web_view_go_back (web_view); @@ -96,6 +112,14 @@ link_hover_cb (WebKitWebView* page, const gchar* title, const gchar* link, gpoin //if (link) // gtk_statusbar_push (main_statusbar, status_context_id, link); //TODO implementation roadmap pending.. + + //ADD HOVER URL TO WINDOW TITLE + selected_url[0] = '\0'; + if (link) { + strcpy (selected_url, link); + } + update_title (GTK_WINDOW (main_window)); + } static void @@ -133,48 +157,47 @@ activate_uri_entry_cb (GtkWidget* entry, gpointer data) { static void log_history_cb () { - FILE * output_file = fopen(history_file, "a"); + FILE * output_file = fopen (history_file, "a"); if (output_file == NULL) { - fprintf(stderr, "Cannot open %s for logging\n", history_file); + fprintf (stderr, "Cannot open %s for logging\n", history_file); } else { time_t rawtime; struct tm * timeinfo; char buffer [80]; time ( &rawtime ); timeinfo = localtime ( &rawtime ); - strftime (buffer,80,"%Y-%m-%d %H:%M:%S",timeinfo); + strftime (buffer, 80, "%Y-%m-%d %H:%M:%S", timeinfo); - fprintf(output_file, "%s %s\n",buffer, uri); - fclose(output_file); + fprintf (output_file, "%s %s\n", buffer, uri); + fclose (output_file); } } - /* -- command to callback/function map for things we cannot attach to any signals */ // TODO: reload, home, quit static Command commands[] = { - { "back", &go_back_cb, NULL }, - { "forward", &go_forward_cb, NULL }, - { "refresh", &webkit_web_view_reload, NULL }, //Buggy - { "stop", &webkit_web_view_stop_loading, NULL }, - { "zoom_in", &webkit_web_view_zoom_in, NULL }, //Can crash (when max zoom reached?). - { "zoom_out", &webkit_web_view_zoom_out, NULL } , - { "uri", NULL, &webkit_web_view_load_uri } + { "back", &go_back_cb, NULL }, + { "forward", &go_forward_cb, NULL }, + { "refresh", &webkit_web_view_reload, NULL }, //Buggy + { "stop", &webkit_web_view_stop_loading, NULL }, + { "zoom_in", &webkit_web_view_zoom_in, NULL }, //Can crash (when max zoom reached?). + { "zoom_out", &webkit_web_view_zoom_out, NULL } , + { "uri", NULL, &webkit_web_view_load_uri } //{ "get uri", &webkit_web_view_get_uri}, }; /* -- CORE FUNCTIONS -- */ - + static void parse_command(const char *command) { int i; Command *c; - char * command_name = strtok (command," "); - char * command_param = strtok (NULL, " ,"); //dunno how this works, but it seems to work + char * command_name = strtok (command, " "); + char * command_param = strtok (NULL, " ,"); //dunno how this works, but it seems to work Command *c_tmp; - for (i = 0; i < LENGTH(commands); i++) { + for (i = 0; i < LENGTH (commands); i++) { c_tmp = &commands[i]; if (strncmp (command_name, c_tmp->command, strlen (c_tmp->command)) == 0) { c = c_tmp; @@ -182,80 +205,111 @@ parse_command(const char *command) { } if (c != NULL) { if (c->func_2_params != NULL) { - if(command_param != NULL) { - printf("command executing: \"%s %s\"\n", command_name, command_param); + if (command_param != NULL) { + printf ("command executing: \"%s %s\"\n", command_name, command_param); c->func_2_params (web_view, command_param); } else { - if(c->func_1_param != NULL) { - printf("command executing: \"%s\"\n", command_name); + if (c->func_1_param != NULL) { + printf ("command executing: \"%s\"\n", command_name); c->func_1_param (web_view); } else { - fprintf(stderr, "command needs a parameter. \"%s\" is not complete\n", command_name); + fprintf (stderr, "command needs a parameter. \"%s\" is not complete\n", command_name); } } - } else if(c->func_1_param != NULL) { - printf("command executing: \"%s\"\n", command_name); + } else if (c->func_1_param != NULL) { + printf ("command executing: \"%s\"\n", command_name); c->func_1_param (web_view); } } else { - fprintf(stderr, "command \"%s\" not understood. ignoring.\n", command); + fprintf (stderr, "command \"%s\" not understood. ignoring.\n", command); } } - + static void *control_fifo() { - if (fifodir) { - sprintf (fifopath, "%s/uzbl_%d", fifodir, (int) xwin); - } else { - sprintf (fifopath, "/tmp/uzbl_%d", (int) xwin); + if (fifodir) { + sprintf (fifopath, "%s/uzbl_%d", fifodir, (int) xwin); + } else { + sprintf (fifopath, "/tmp/uzbl_%d", (int) xwin); } - - if (mkfifo (fifopath, 0666) == -1) { - printf ("Possible error creating fifo\n"); + + if (mkfifo (fifopath, 0666) == -1) { + printf ("Possible error creating fifo\n"); } - - printf ("ontrol fifo opened in %s\n", fifopath); - + + printf ("Control fifo opened in %s\n", fifopath); + while (true) { - FILE *fifo = fopen(fifopath, "r"); + FILE *fifo = fopen (fifopath, "r"); if (!fifo) { - printf("Could not open %s for reading\n", fifopath); + printf ("Could not open %s for reading\n", fifopath); return NULL; - } + } char buffer[256]; memset (buffer, 0, sizeof (buffer)); while (!feof (fifo) && fgets (buffer, sizeof (buffer), fifo)) { if (strcmp (buffer, "\n")) { buffer[strlen (buffer) - 1] = '\0'; // Remove newline - parse_command (buffer); - } - } - } + parse_command (buffer); + } + } + } return NULL; } - - + + static void setup_threading () { - pthread_t control_thread; - pthread_create(&control_thread, NULL, control_fifo, NULL); + pthread_t control_thread; + pthread_create(&control_thread, NULL, control_fifo, NULL); } - - - static void update_title (GtkWindow* window) { GString* string = g_string_new (main_title); g_string_append (string, " - Uzbl browser"); if (load_progress < 100) g_string_append_printf (string, " (%d%%)", load_progress); + + if (selected_url[0]!=0) { + g_string_append_printf (string, " -> (%s)", selected_url); + } + gchar* title = g_string_free (string, FALSE); gtk_window_set_title (window, title); g_free (title); } + +static void +MsgBox (const char *s) { + GtkWidget* dialog = gtk_message_dialog_new (main_window, + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_CLOSE, + "%s", s); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); +} + +static gboolean +key_press_cb (WebKitWebView* page, GdkEventKey* event) +{ + int i; + gboolean result=FALSE; //TRUE to stop other handlers from being invoked for the event. FALSE to propagate the event further. + if (event->type != GDK_KEY_PRESS) + return result; + + for (i = 0; i < num_internal_bindings; i++) { + if (event->string[0] == internal_bindings[i].binding[0]) { + parse_command (internal_bindings[i].action); + result = FALSE; + } + } + + return(result); +} static GtkWidget* create_browser () { @@ -270,17 +324,18 @@ create_browser () { g_signal_connect (G_OBJECT (web_view), "load-committed", G_CALLBACK (load_commit_cb), web_view); g_signal_connect (G_OBJECT (web_view), "load-committed", G_CALLBACK (log_history_cb), web_view); g_signal_connect (G_OBJECT (web_view), "hovering-over-link", G_CALLBACK (link_hover_cb), web_view); + g_signal_connect (G_OBJECT (web_view), "key-press-event", G_CALLBACK (key_press_cb), web_view); return scrolled_window; } static GtkWidget* create_mainbar () { - mainbar = gtk_hbox_new(FALSE, 0); - uri_entry = gtk_entry_new(); - gtk_entry_set_width_chars(GTK_ENTRY(uri_entry), 40); - gtk_entry_set_text(GTK_ENTRY(uri_entry), "http://"); - gtk_box_pack_start (GTK_BOX (mainbar), uri_entry, FALSE,TRUE , 0); + mainbar = gtk_hbox_new (FALSE, 0); + uri_entry = gtk_entry_new (); + gtk_entry_set_width_chars (GTK_ENTRY(uri_entry), 40); + gtk_entry_set_text (GTK_ENTRY(uri_entry), "http://"); + gtk_box_pack_start (GTK_BOX (mainbar), uri_entry, TRUE,TRUE , 0); gtk_signal_connect_object (GTK_OBJECT (uri_entry), "activate", GTK_SIGNAL_FUNC (activate_uri_entry_cb), GTK_OBJECT (uri_entry)); //status_context_id = gtk_statusbar_get_context_id (main_statusbar, "Link Hover"); @@ -298,31 +353,94 @@ GtkWidget* create_window () { return window; } -int main (int argc, char* argv[]) { - gtk_init (&argc, &argv); - if (!g_thread_supported ()) - g_thread_init (NULL); +static void +add_binding (char *binding, char *action, bool internal) { + Binding bind = {binding, action}; + if (internal) { + internal_bindings[num_internal_bindings] = bind; + num_internal_bindings ++; + } else { + external_bindings[num_external_bindings] = bind; + num_external_bindings ++; + } +} +static void +settings_init () { GKeyFile* config = g_key_file_new (); gboolean res = g_key_file_load_from_file (config, "./sampleconfig", G_KEY_FILE_NONE, NULL); //TODO: pass config file as argument - if(res) { - printf("config loaded\n"); + if (res) { + printf ("Config loaded\n"); } else { - fprintf(stderr,"config loading failed\n"); //TODO: exit codes with gtk? + fprintf (stderr, "Config loading failed\n"); //TODO: exit codes with gtk? } + history_file = g_key_file_get_value (config, "behavior", "history_file", NULL); - if(history_file) { - printf("history file: %s\n",history_file); + if (history_file) { + printf ("History file: %s\n", history_file); + } else { + printf ("History logging disabled\n"); + } + + download_handler = g_key_file_get_value (config, "behavior", "download_handler", NULL); + if (download_handler) { + printf ("Download manager: %s\n", history_file); + } else { + printf ("Download manager disabled\n"); + } + + if (! fifodir) + fifodir = g_key_file_get_value (config, "behavior", "fifodir", NULL); + if (fifodir) { + printf ("Fifo directory: %s\n", history_file); + } else { + printf ("Fifo directory: /tmp\n"); + } + + always_insert_mode = g_key_file_get_value (config, "behavior", "always_insert_mode", NULL); + if (always_insert_mode) { + printf ("Always insert mode: %s\n", history_file); + } else { + printf ("Always insert mode disabled/\n"); + } + + modkey = g_key_file_get_value (config, "behavior", "modkey", NULL); + if (modkey) { + printf ("Mod key: %s\n", history_file); } else { - printf("history logging disabled\n"); + printf ("Mod key disabled/\n"); } + gchar **keysi = g_key_file_get_keys (config, "bindings_internal", NULL, NULL); + int i = 0; + for (i = 0; keysi[i]; i++) + { + gchar *binding = g_key_file_get_string(config, "bindings_internal", keysi[i], NULL); + printf("Action: %s, Binding: %s (internal)\n", g_strdup (keysi[i]), binding); + add_binding (binding, g_strdup (keysi[i]), true); + } + + gchar **keyse = g_key_file_get_keys (config, "bindings_external", NULL, NULL); + for (i = 0; keyse[i]; i++) + { + gchar *binding = g_key_file_get_string(config, "bindings_external", keyse[i], NULL); + printf("Action: %s, Binding: %s (external)\n", g_strdup (keyse[i]), binding); + add_binding (binding, g_strdup (keyse[i]), false); + } +} + +int +main (int argc, char* argv[]) { + gtk_init (&argc, &argv); + if (!g_thread_supported ()) + g_thread_init (NULL); + + settings_init (); + GtkWidget* vbox = gtk_vbox_new (FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), create_mainbar (), FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (vbox), create_browser (), TRUE, TRUE, 0); - - main_window = create_window (); gtk_container_add (GTK_CONTAINER (main_window), vbox); GError *error = NULL; @@ -332,7 +450,6 @@ int main (int argc, char* argv[]) { g_option_context_add_group (context, gtk_get_option_group (TRUE)); g_option_context_parse (context, &argc, &argv, &error); - webkit_web_view_load_uri (web_view, uri); gtk_widget_grab_focus (GTK_WIDGET (web_view)); |