adapt to new syntax

[uzbl-mobile] / uzbl.h

diff --git a/uzbl.h b/uzbl.h
index d640492..6ab31f6 100644 (file)
--- a/uzbl.h
+++ b/uzbl.h
@@ -93,12 +93,6 @@ typedef struct {
     gchar          *socket_path;
     /* stores (key)"variable name" -> (value)"pointer to this var*/
     GHashTable     *proto_var;
-    /* command parsing regexes */
-    GRegex         *set_regex;
-    GRegex         *act_regex;
-    GRegex         *keycmd_regex;
-    GRegex         *get_regex;
-    GRegex         *bind_regex;
     gchar          *sync_stdout;
 } Communication;
 
@@ -163,8 +157,18 @@ typedef struct {
     guint    enable_private;  
     guint    print_bg;        
     gchar*   style_uri;       
-
-
+    guint    resizable_txt;  
+    gchar*   default_encoding;       
+    guint    enforce_96dpi;  
+    gchar    *inject_html;
+    guint    caret_browsing;  
+    guint    mode;  
+    gchar*   base_url;
+    gchar*   html_endmarker;
+    gchar*   insert_indicator;
+    gchar*   cmd_indicator;
+    GString* html_buffer;
+    guint    html_timeout;  
 
     /* command list: name -> Command  */
     GHashTable* commands;
@@ -236,6 +240,12 @@ static sigfunc *
 setup_signal(int signe, sigfunc *shandler);
 
 static gboolean
+set_var_value(gchar *name, gchar *val);
+
+static gboolean
+get_var_value(const gchar *name);
+
+static gboolean
 new_window_cb (WebKitWebView *web_view, WebKitWebFrame *frame, WebKitNetworkRequest *request, WebKitWebNavigationAction *navigation_action, WebKitWebPolicyDecision *policy_decision, gpointer user_data);
 
 WebKitWebView*
@@ -293,6 +303,18 @@ static void
 new_window_load_uri (const gchar * uri);
 
 static void
+chain (WebKitWebView *page, GArray *argv);
+
+static void
+keycmd (WebKitWebView *page, GArray *argv);
+
+static void
+keycmd_nl (WebKitWebView *page, GArray *argv);
+
+static void
+keycmd_bs (WebKitWebView *page, GArray *argv);
+
+static void
 close_uzbl (WebKitWebView *page, GArray *argv);
 
 static gboolean
@@ -315,9 +337,6 @@ static void
 parse_command(const char *cmd, const char *param);
 
 static void
-runcmd(WebKitWebView *page, GArray *argv);
-
-static void
 parse_cmd_line(const char *ctl_line);
 
 static gchar*
@@ -350,6 +369,9 @@ key_press_cb (GtkWidget* window, GdkEventKey* event);
 static void
 run_keycmd(const gboolean key_ret);
 
+static void
+exec_paramcmd(const Action* act, const guint i);
+
 static GtkWidget*
 create_browser ();
 
@@ -384,6 +406,9 @@ static void
 search_reverse_text (WebKitWebView *page, GArray *argv);
 
 static void
+dehilight (WebKitWebView *page, GArray *argv);
+
+static void
 run_js (WebKitWebView * web_view, GArray *argv);
 
 static void
@@ -399,6 +424,30 @@ save_cookies (SoupMessage *msg,
 static void
 set_var(WebKitWebView *page, GArray *argv);
 
+static void
+get_var(WebKitWebView *page, GArray *argv);
+
+static void
+act_bind(WebKitWebView *page, GArray *argv);
+
+static void
+act_dump_config();
+
+static void
+render_html();
+
+static void
+set_timeout(int seconds);
+
+static void
+dump_var_hash(gpointer k, gpointer v, gpointer ud);
+
+static void
+dump_key_hash(gpointer k, gpointer v, gpointer ud);
+
+static void
+dump_config();
+
 
 /* Command callbacks */
 static void
@@ -470,5 +519,19 @@ cmd_print_bg();
 static void 
 cmd_style_uri();
 
+static void 
+cmd_resizable_txt();
+
+static void 
+cmd_default_encoding();
+
+static void 
+cmd_enforce_96dpi();
+
+static void
+cmd_inject_html();
+
+static void 
+cmd_caret_browsing();
 
 /* vi: set et ts=4: */