diff options
author | Barrucadu <mike@barrucadu.co.uk> | 2009-05-01 15:04:44 +0100 |
---|---|---|
committer | Barrucadu <mike@barrucadu.co.uk> | 2009-05-01 15:04:44 +0100 |
commit | 8ba87ad7653bff70bf44106dc1e3fe1d3e99d9f0 (patch) | |
tree | a67741a863ab26e9a20d0e7ecfc3f2c8294a171b /uzbl.c | |
parent | bfbdd0db25d73be8009219ea679c89a9300dc22a (diff) |
Moved structs/function primitives to uzbl.h file, so we no longer need the growing collection of function primitives near the top of uzbl.c.
Also tidied up a bit of the code a little.
Diffstat (limited to 'uzbl.c')
-rw-r--r-- | uzbl.c | 71 |
1 files changed, 19 insertions, 52 deletions
@@ -35,33 +35,34 @@ #include <gtk/gtk.h> #include <gdk/gdkx.h> #include <gdk/gdkkeysyms.h> +#include <sys/socket.h> +#include <sys/stat.h> +#include <sys/types.h> +#include <sys/un.h> #include <webkit/webkit.h> #include <pthread.h> #include <stdio.h> #include <string.h> -#include <sys/stat.h> -#include <sys/types.h> #include <unistd.h> #include <stdlib.h> #include <errno.h> #include <string.h> -#include <sys/types.h> #include <fcntl.h> -#include <sys/socket.h> -#include <sys/un.h> + +#include "uzbl.h" /* housekeeping / internal variables */ -static GtkWidget* main_window; -static GtkWidget* mainbar; -static GtkWidget* mainbar_label; +static GtkWidget* main_window; +static GtkWidget* mainbar; +static GtkWidget* mainbar_label; static WebKitWebView* web_view; -static gchar* main_title; -static gchar selected_url[500] = "\0"; -static gint load_progress; -static Window xwin = 0; -static char fifo_path[64]; -static char socket_path[108]; -static GString *keycmd; +static gchar* main_title; +static gchar selected_url[500] = "\0"; +static gint load_progress; +static Window xwin = 0; +static char fifo_path[64]; +static char socket_path[108]; +static GString* keycmd; /* state variables (initial values coming from command line arguments but may be changed later) */ static gchar* uri = NULL; @@ -82,15 +83,10 @@ static gchar* modkey = NULL; static guint modmask = 0; /* settings from config: group bindings, key -> action */ -static GHashTable *bindings; +static GHashTable* bindings; /* command list: name -> Command */ -static GHashTable *commands; - -typedef struct { - char *name; - char *param; -} Action; +static GHashTable* commands; /* commandline arguments (set initial values for the state variables) */ static GOptionEntry entries[] = @@ -107,35 +103,6 @@ typedef void (*Command)(WebKitWebView*, const char *); static char *XDG_CONFIG_HOME_default[256]; static char *XDG_CONFIG_DIRS_default = "/etc/xdg"; -static void -update_title(void); - -static void -load_uri ( WebKitWebView * web_view, const gchar * uri); - -static void -new_window_load_uri (const gchar * uri); - -static void -close_uzbl (WebKitWebView *page, const char *param); - -static gboolean -run_command(const char *command, const char *args); - -static void -spawn(WebKitWebView *web_view, const char *param); - -static void -free_action(gpointer action); - -static Action* -new_action(const gchar *name, const gchar *param); - -static void -set_insert_mode(WebKitWebView *page, const gchar *param); - - - /* --- CALLBACKS --- */ static gboolean @@ -728,7 +695,7 @@ settings_init () { modkey = g_key_file_get_value (config, "behavior", "modkey", NULL); status_top = g_key_file_get_boolean (config, "behavior", "status_top", NULL); if (! fifo_dir) - fifo_dir = g_key_file_get_value (config, "behavior", "fifodir", NULL); + fifo_dir = g_key_file_get_value (config, "behavior", "fifo_dir", NULL); if (! socket_dir) socket_dir = g_key_file_get_value (config, "behavior", "socket_dir", NULL); keys = g_key_file_get_keys (config, "bindings", NULL, NULL); |