Move global variables into structs, first round

based on robm's modified and cleaned up patch

1 files changed, 42 insertions, 0 deletions

diff --git a/uzbl.h b/uzbl.h
index 529fae5..a0af6ea 100644
--- a/uzbl.h
+++ b/uzbl.h
@@ -1,3 +1,45 @@
+/* status bar elements */
+typedef struct {
+    gint           load_progress;
+} StatusBar;
+
+/* gui elements */
+typedef struct {
+    GtkWidget*     main_window;
+    GtkWidget*     mainbar;
+    GtkWidget*     mainbar_label;
+    GtkScrollbar*  scbar_v;   // Horizontal and Vertical Scrollbar
+    GtkScrollbar*  scbar_h;   // (These are still hidden)
+    GtkAdjustment* bar_v; // Information about document length
+    GtkAdjustment* bar_h; // and scrolling position
+    WebKitWebView* web_view;
+    gchar*         main_title;
+
+    StatusBar sbar;
+} GUI;
+
+/* external communication*/
+typedef struct {
+    char           fifo_path[64];
+    char           socket_path[108];
+} Communication;
+
+/* internal state */
+typedef struct {
+    gchar    *uri;
+    gchar    *config_file;
+    gchar    *instance_name;
+    gchar    config_file_path[500];
+} State;
+
+/* main uzbl data structure */
+typedef struct {
+    GUI     gui;
+    Communication comm;
+    State   state;
+    int     xwin;
+} Uzbl;
+
 typedef struct {
     char* name;
     char* param;