diff options
Diffstat (limited to 'uzbl.c')
-rw-r--r-- | uzbl.c | 168 |
1 files changed, 122 insertions, 46 deletions
@@ -47,8 +47,14 @@ static GtkWidget* uri_entry; static GtkWidget* mainbar; static WebKitWebView* web_view; static gchar* main_title; -static gchar* history_file; -static gchar* fifodir = NULL; + +/* 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; @@ -72,13 +78,22 @@ typedef struct const gboolean param_optional; } 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); @@ -150,7 +165,6 @@ log_history_cb () { } } - /* -- command to callback/function map for things we cannot attach to any signals */ // TODO: reload, home, quit static Command commands[] = @@ -166,7 +180,7 @@ static Command commands[] = }; /* -- CORE FUNCTIONS -- */ - + static void parse_command(const char *command) { int i = 0; @@ -189,7 +203,7 @@ parse_command(const char *command) { if (c->param_allow) { if(command_param != NULL) { printf("command executing: \"%s %s\"\n", command_name, command_param); - func (web_view, command_param); + //func (web_view, command_param); } else { if(c->param_optional) { printf("command executing: \"%s\"\n", command_name); @@ -206,42 +220,42 @@ parse_command(const char *command) { fprintf(stderr, "command \"%s\" not understood. ignoring.\n", command); } } - + static void *control_fifo() { if (fifodir) { - sprintf (fifopath, "%s/uzbl_%d", fifodir, (int) xwin); + sprintf (fifopath, "%s/uzbl_%d", fifodir, (int) xwin); } else { - sprintf (fifopath, "/tmp/uzbl_%d", (int) xwin); - } - + sprintf (fifopath, "/tmp/uzbl_%d", (int) xwin); + } + if (mkfifo (fifopath, 0666) == -1) { - printf ("Possible error creating fifo\n"); + printf ("Possible error creating fifo\n"); + } + + printf ("Control fifo opened in %s\n", fifopath); + + while (true) { + FILE *fifo = fopen(fifopath, "r"); + if (!fifo) { + printf("Could not open %s for reading\n", fifopath); + return NULL; } - - printf ("ontrol fifo opened in %s\n", fifopath); - - while (true) { - FILE *fifo = fopen(fifopath, "r"); - if (!fifo) { - 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); - } - } + 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); } + } + } - return NULL; + return NULL; } - - + + static void setup_threading () { pthread_t control_thread; @@ -285,7 +299,7 @@ create_mainbar () { 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); + 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"); @@ -303,31 +317,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"); + 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 ("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; @@ -337,7 +414,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)); |