X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=uzbl.c;h=c224f09f2206c525d493a5e55542704e85ab28c0;hb=55d7422467ff3460f40ef2cf05ac27e5446b5a73;hp=ca8b40f34f5a6299996c0498114106341b6c264b;hpb=9474bb8edd588e458dff418e5aaec44cc735f851;p=uzbl-mobile diff --git a/uzbl.c b/uzbl.c index ca8b40f..c224f09 100644 --- a/uzbl.c +++ b/uzbl.c @@ -29,10 +29,11 @@ */ -#define LENGTH(x) (sizeof x / sizeof x[0]) +#define LENGTH(x) (sizeof x / sizeof x[0]) #include #include +#include #include #include #include @@ -42,87 +43,114 @@ #include #include +/* housekeeping / internal variables */ static GtkWidget* main_window; static GtkWidget* mainbar; +static GtkWidget* mainbar_label; static WebKitWebView* web_view; static gchar* main_title; static gchar selected_url[500]; +static gint load_progress; +static Window xwin = 0; +static char fifopath[64]; + +/* state variables (initial values coming from command line arguments but may be changed later) */ +static gchar* uri = NULL; +static gchar* config_file = NULL; +static gboolean verbose = FALSE; -/* Behaviour variables */ -static gchar* history_file = NULL; +/* settings from config: group behaviour */ +static gchar* history_handler = NULL; static gchar* fifodir = NULL; static gchar* download_handler = NULL; -static gboolean always_insert_mode = 0; +static gboolean always_insert_mode = FALSE; +static gboolean show_status = FALSE; +static gboolean insert_mode = FALSE; +static gboolean status_top = FALSE; static gchar* modkey = NULL; +static guint modmask = 0; -static char fifopath[64]; -static gint load_progress; -static guint status_context_id; -static Window xwin = 0; -static gchar* uri = NULL; +typedef struct { + const char *binding; + const char *action; +} Binding; -static gboolean verbose = FALSE; +/* settings from config: group bindings_internal */ +static Binding internal_bindings[256]; +static int num_internal_bindings = 0; +/* settings from config: group bindings_external */ +static Binding external_bindings[256]; +static int num_external_bindings = 0; + +/* commandline arguments (set initial values for the state variables) */ 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 }, + { "config", 'c', 0, G_OPTION_ARG_STRING, &config_file, "Config file", NULL }, + { NULL, 0, 0, 0, NULL, NULL, NULL } }; +/* for internal list of commands */ typedef struct { const char *command; void (*func_1_param)(WebKitWebView*); - void (*func_2_params)(WebKitWebView*, char *); + void (*func_2_params)(WebKitWebView*, const gchar *); } 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); +static gboolean +run_command(const char *command, const char *args); + /* --- CALLBACKS --- */ static void -go_back_cb (GtkWidget* widget, gpointer data) { +go_back_cb (WebKitWebView* page) { + (void) page; webkit_web_view_go_back (web_view); } static void -go_forward_cb (GtkWidget* widget, gpointer data) { +go_forward_cb (WebKitWebView* page) { + (void) page; webkit_web_view_go_forward (web_view); } +static void +toggle_status_cb (WebKitWebView* page) { + (void) page; + if (show_status) { + gtk_widget_hide(mainbar); + } else { + gtk_widget_show(mainbar); + } + show_status = !show_status; + update_title (GTK_WINDOW (main_window)); +} static void link_hover_cb (WebKitWebView* page, const gchar* title, const gchar* link, gpointer data) { - /* underflow is allowed */ - //gtk_statusbar_pop (main_statusbar, status_context_id); - //if (link) - // gtk_statusbar_push (main_statusbar, status_context_id, link); - //TODO implementation roadmap pending.. - + (void) page; + (void) title; + (void) data; //ADD HOVER URL TO WINDOW TITLE selected_url[0] = '\0'; if (link) { - strcpy (selected_url, link); + strcpy (selected_url, link); } update_title (GTK_WINDOW (main_window)); - } static void title_change_cb (WebKitWebView* web_view, WebKitWebFrame* web_frame, const gchar* title, gpointer data) { + (void) web_view; + (void) web_frame; + (void) data; if (main_title) g_free (main_title); main_title = g_strdup (title); @@ -131,62 +159,91 @@ title_change_cb (WebKitWebView* web_view, WebKitWebFrame* web_frame, const gchar static void progress_change_cb (WebKitWebView* page, gint progress, gpointer data) { + (void) page; + (void) data; load_progress = progress; update_title (GTK_WINDOW (main_window)); } static void load_commit_cb (WebKitWebView* page, WebKitWebFrame* frame, gpointer data) { - const gchar* uri = webkit_web_frame_get_uri(frame); + (void) page; + (void) data; + strcpy (uri, webkit_web_frame_get_uri (frame)); } static void destroy_cb (GtkWidget* widget, gpointer data) { + (void) widget; + (void) data; gtk_main_quit (); } static void log_history_cb () { - FILE * output_file = fopen (history_file, "a"); - if (output_file == NULL) { - 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); - - fprintf (output_file, "%s %s\n", buffer, uri); - fclose (output_file); - } + if (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); + GString* args = g_string_new (""); + g_string_printf (args, "'%s' '%s' '%s'", uri, "TODO:page title here", date); + run_command(history_handler, args->str); + } } /* -- 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 }, + { "toggle_status", &toggle_status_cb, NULL } //{ "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 - Command *c_tmp; +static bool +file_exists (const char * filename) +{ + FILE *file = fopen (filename, "r"); + if (file) { + fclose (file); + return true; + } + return false; +} + +// make sure to put '' around args, so that if there is whitespace we can still keep arguments together. +static gboolean +run_command(const char *command, const char *args) { + //command [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, "/tmp/uzbl_25165827", args); + result = g_spawn_command_line_async (to_execute->str, NULL); + printf("Called %s. Result: %s\n", to_execute->str, (result ? "FALSE" : "TRUE" )); + return result; +} + +static void +parse_command(const char *cmd) { + unsigned int i; + Command *c = NULL; + char buffer[200]; + strcpy(buffer,cmd); + char * command_name = strtok (buffer, " "); + char * command_param = strtok (NULL, " ,"); + + Command *c_tmp = NULL; for (i = 0; i < LENGTH (commands); i++) { c_tmp = &commands[i]; if (strncmp (command_name, c_tmp->command, strlen (c_tmp->command)) == 0) { @@ -211,7 +268,7 @@ parse_command(const char *command) { c->func_1_param (web_view); } } else { - fprintf (stderr, "command \"%s\" not understood. ignoring.\n", command); + fprintf (stderr, "command \"%s\" not understood. ignoring.\n", cmd); } } @@ -247,8 +304,7 @@ static void } return NULL; -} - +} static void setup_threading () { @@ -258,46 +314,74 @@ setup_threading () { static void update_title (GtkWindow* window) { - GString* string = g_string_new (main_title); - g_string_append (string, " - Uzbl browser"); + GString* string_long = g_string_new (""); + GString* string_short = g_string_new (""); + if (!always_insert_mode) + g_string_append (string_long, (insert_mode ? "[I] " : "[C] ")); + g_string_append (string_long, main_title); + g_string_append (string_short, main_title); + g_string_append (string_long, " - Uzbl browser"); + g_string_append (string_short, " - Uzbl browser"); if (load_progress < 100) - g_string_append_printf (string, " (%d%%)", load_progress); + g_string_append_printf (string_long, " (%d%%)", load_progress); if (selected_url[0]!=0) { - g_string_append_printf (string, " -> (%s)", selected_url); + g_string_append_printf (string_long, " -> (%s)", selected_url); + } + + gchar* title_long = g_string_free (string_long, FALSE); + gchar* title_short = g_string_free (string_short, FALSE); + + if (show_status) { + gtk_window_set_title (window, title_short); + gtk_label_set_text(GTK_LABEL(mainbar_label), title_long); + } else { + gtk_window_set_title (window, title_long); } - gchar* title = g_string_free (string, FALSE); - gtk_window_set_title (window, title); - g_free (title); + g_free (title_long); + g_free (title_short); } -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) { + (void) page; 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; + //TURN OFF/ON INSERT MODE + if (!always_insert_mode && ((insert_mode && (event->keyval == GDK_Escape)) || (!insert_mode && (event->string[0] == 'i')))) { + insert_mode = !insert_mode; + update_title (GTK_WINDOW (main_window)); + return TRUE; + } + + //INTERNAL BINDINGS 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; + if (strcmp(event->string, internal_bindings[i].binding) == 0) { + if (!insert_mode || (event->state == modmask)) { + parse_command (internal_bindings[i].action); + result = TRUE; + } + } + } + + //EXTERNAL BINDINGS + for (i = 0; i < num_external_bindings; i++) { + if (strcmp(event->string, external_bindings[i].binding) == 0) { + if (!insert_mode || (event->state == modmask)) { + run_command(external_bindings[i].action, NULL); + result = TRUE; + } } } + if (!result) + result = (insert_mode ? FALSE : TRUE); + return result; } @@ -322,9 +406,10 @@ create_browser () { static GtkWidget* create_mainbar () { mainbar = gtk_hbox_new (FALSE, 0); - - //status_context_id = gtk_statusbar_get_context_id (main_statusbar, "Link Hover"); - + mainbar_label = gtk_label_new (""); + gtk_misc_set_alignment (GTK_MISC(mainbar_label), 0, 0); + gtk_misc_set_padding (GTK_MISC(mainbar_label), 2, 2); + gtk_box_pack_start (GTK_BOX (mainbar), mainbar_label, TRUE, TRUE, 0); return mainbar; } @@ -352,66 +437,116 @@ add_binding (char *binding, char *action, bool internal) { 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"); + GKeyFile* config; + gboolean res = FALSE; + gchar** keysi = NULL; + gchar** keyse = NULL; + + if (! config_file) { + const char* xdg = getenv ("XDG_CONFIG_HOME"); + char conf[256]; + if (xdg) { + printf("XDG_CONFIG_DIR: %s\n", xdg); + strcpy (conf, xdg); + strcat (conf, "/uzbl"); + if (file_exists (conf)) { + printf ("Config file %s found.\n", conf); + config_file = &conf[0]; + } + } + } + + if (config_file) { + config = g_key_file_new (); + res = g_key_file_load_from_file (config, config_file, G_KEY_FILE_NONE, NULL); + if(res) { + printf ("Config %s loaded\n", config_file); + } else { + fprintf (stderr, "Config %s loading failed\n", config_file); + } } else { - fprintf (stderr, "Config loading failed\n"); //TODO: exit codes with gtk? + printf ("No configuration.\n"); } - history_file = g_key_file_get_value (config, "behavior", "history_file", NULL); - if (history_file) { - printf ("History file: %s\n", history_file); + if (res) { + history_handler = g_key_file_get_value (config, "behavior", "history_handler", NULL); + download_handler = g_key_file_get_value (config, "behavior", "download_handler", NULL); + always_insert_mode = g_key_file_get_boolean (config, "behavior", "always_insert_mode", NULL); + show_status = g_key_file_get_boolean (config, "behavior", "show_status", NULL); + modkey = g_key_file_get_value (config, "behavior", "modkey", NULL); + keysi = g_key_file_get_keys (config, "bindings_internal", NULL, NULL); + keyse = g_key_file_get_keys (config, "bindings_external", NULL, NULL); + status_top = g_key_file_get_boolean (config, "behavior", "status_top", NULL); + if (! fifodir) + fifodir = g_key_file_get_value (config, "behavior", "fifodir", NULL); + } + + if (history_handler) { + printf ("History handler: %s\n", history_handler); } else { - printf ("History logging disabled\n"); + printf ("History handler disabled\n"); } - download_handler = g_key_file_get_value (config, "behavior", "download_handler", NULL); if (download_handler) { printf ("Download manager: %s\n", download_handler); } 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", fifodir); } 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", always_insert_mode); - } else { - printf ("Always insert mode disabled/\n"); - } + printf ("Always insert mode: %s\n", (always_insert_mode ? "TRUE" : "FALSE")); + + printf ("Show status: %s\n", (show_status ? "TRUE" : "FALSE")); + + printf ("Status top: %s\n", (status_top ? "TRUE" : "FALSE")); - modkey = g_key_file_get_value (config, "behavior", "modkey", NULL); if (modkey) { - printf ("Mod key: %s\n", modkey); + printf ("Modkey: %s\n", modkey); } else { - printf ("Mod key disabled/\n"); + printf ("Modkey disabled\n"); + modkey = ""; + } + //POSSIBLE MODKEY VALUES (COMBINATIONS CAN BE USED) + gchar* modkeyup = g_utf8_strup(modkey, -1); + if (g_strrstr(modkeyup,"SHIFT") != NULL) modmask |= GDK_SHIFT_MASK; //the Shift key. + if (g_strrstr(modkeyup,"LOCK") != NULL) modmask |= GDK_LOCK_MASK; //a Lock key (depending on the modifier mapping of the X server this may either be CapsLock or ShiftLock). + if (g_strrstr(modkeyup,"CONTROL") != NULL) modmask |= GDK_CONTROL_MASK; //the Control key. + if (g_strrstr(modkeyup,"MOD1") != NULL) modmask |= GDK_MOD1_MASK; //the fourth modifier key (it depends on the modifier mapping of the X server which key is interpreted as this modifier, but normally it is the Alt key). + if (g_strrstr(modkeyup,"MOD2") != NULL) modmask |= GDK_MOD2_MASK; //the fifth modifier key (it depends on the modifier mapping of the X server which key is interpreted as this modifier). + if (g_strrstr(modkeyup,"MOD3") != NULL) modmask |= GDK_MOD3_MASK; //the sixth modifier key (it depends on the modifier mapping of the X server which key is interpreted as this modifier). + if (g_strrstr(modkeyup,"MOD4") != NULL) modmask |= GDK_MOD4_MASK; //the seventh modifier key (it depends on the modifier mapping of the X server which key is interpreted as this modifier). + if (g_strrstr(modkeyup,"MOD5") != NULL) modmask |= GDK_MOD5_MASK; //the eighth modifier key (it depends on the modifier mapping of the X server which key is interpreted as this modifier). + if (g_strrstr(modkeyup,"BUTTON1") != NULL) modmask |= GDK_BUTTON1_MASK; //the first mouse button. + if (g_strrstr(modkeyup,"BUTTON2") != NULL) modmask |= GDK_BUTTON2_MASK; //the second mouse button. + if (g_strrstr(modkeyup,"BUTTON3") != NULL) modmask |= GDK_BUTTON3_MASK; //the third mouse button. + if (g_strrstr(modkeyup,"BUTTON4") != NULL) modmask |= GDK_BUTTON4_MASK; //the fourth mouse button. + if (g_strrstr(modkeyup,"BUTTON5") != NULL) modmask |= GDK_BUTTON5_MASK; //the fifth mouse button. + if (g_strrstr(modkeyup,"SUPER") != NULL) modmask |= GDK_SUPER_MASK; //the Super modifier. Since 2.10 + if (g_strrstr(modkeyup,"HYPER") != NULL) modmask |= GDK_HYPER_MASK; //the Hyper modifier. Since 2.10 + if (g_strrstr(modkeyup,"META") != NULL) modmask |= GDK_META_MASK; //the Meta modifier. Since 2.10 */ + free (modkeyup); + + if (keysi) { + 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); + } + } + if (keyse) { + int i = 0; + 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); + } } - - 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 @@ -420,20 +555,25 @@ main (int argc, char* argv[]) { if (!g_thread_supported ()) g_thread_init (NULL); + GError *error = NULL; + GOptionContext* context = g_option_context_new ("- some stuff here maybe someday"); + g_option_context_add_main_entries (context, entries, NULL); + g_option_context_add_group (context, gtk_get_option_group (TRUE)); + g_option_context_parse (context, &argc, &argv, &error); + settings_init (); + if (always_insert_mode) + insert_mode = TRUE; GtkWidget* vbox = gtk_vbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (vbox), create_mainbar (), FALSE, TRUE, 0); + if (status_top) + gtk_box_pack_start (GTK_BOX (vbox), create_mainbar (), FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (vbox), create_browser (), TRUE, TRUE, 0); + if (!status_top) + gtk_box_pack_start (GTK_BOX (vbox), create_mainbar (), FALSE, TRUE, 0); main_window = create_window (); gtk_container_add (GTK_CONTAINER (main_window), vbox); - GError *error = NULL; - - GOptionContext* context = g_option_context_new ("- some stuff here maybe someday"); - g_option_context_add_main_entries (context, entries, NULL); - 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); @@ -443,6 +583,9 @@ main (int argc, char* argv[]) { printf("window_id %i\n",(int) xwin); printf("pid %i\n", getpid ()); + if (!show_status) + gtk_widget_hide(mainbar); + setup_threading (); gtk_main ();