move globals to structs, another round.

1 files changed, 18 insertions, 0 deletions

diff --git a/uzbl.h b/uzbl.h
index 67afc2b..aaabef3 100644
--- a/uzbl.h
+++ b/uzbl.h
@@ -1,3 +1,4 @@
+
 /* statusbar symbols */
 enum { SYM_TITLE, SYM_URI, SYM_NAME, 
        SYM_LOADPRGS, SYM_LOADPRGSBAR,
@@ -21,6 +22,7 @@ typedef struct {
     gint           load_progress;
 } StatusBar;
 
+
 /* gui elements */
 typedef struct {
     GtkWidget*     main_window;
@@ -36,6 +38,7 @@ typedef struct {
     StatusBar sbar;
 } GUI;
 
+
 /* external communication*/
 enum { FIFO, SOCKET};
 typedef struct {
@@ -43,14 +46,21 @@ typedef struct {
     char           socket_path[108];
 } Communication;
 
+
 /* internal state */
 typedef struct {
     gchar    *uri;
     gchar    *config_file;
     gchar    *instance_name;
     gchar    config_file_path[500];
+    gchar    selected_url[500];
+    char     executable_path[500];
+    GString* keycmd;
+    gchar    searchtx[500];
+    struct utsname unameinfo; /* system info */
 } State;
 
+
 /* networking */
 typedef struct {
     SoupSession *soup_session;
@@ -61,6 +71,7 @@ typedef struct {
     gint max_conns_host;
 } Network;
 
+
 /* behaviour */
 typedef struct {
     gchar*   history_handler;
@@ -75,6 +86,12 @@ typedef struct {
     gchar*   modkey;
     guint    modmask;
     guint    http_debug;
+
+    /* group bindings: key -> action */
+    GHashTable* bindings;
+
+    /* command list: name -> Command  */
+    GHashTable* commands;
 } Behaviour;
 
 
@@ -90,6 +107,7 @@ typedef struct {
     GScanner      *scan;
 } Uzbl;
 
+
 typedef struct {
     char* name;
     char* param;