Manually added commit 51a38.. from holizz

[uzbl-mobile] / uzbl.h

diff --git a/uzbl.h b/uzbl.h
index 287d9ef..37b76fa 100644 (file)
--- a/uzbl.h
+++ b/uzbl.h
@@ -11,8 +11,6 @@
  *
  */
 
-#define NOSPLIT ((void*)1)
-
 enum {
   /* statusbar symbols */
   SYM_TITLE, SYM_URI, SYM_NAME,
@@ -67,6 +65,7 @@ typedef struct {
 /* gui elements */
 typedef struct {
     GtkWidget*     main_window;
+    GtkPlug*       plug;
     GtkWidget*     scrolled_win;
     GtkWidget*     vbox;
     GtkWidget*     mainbar;
@@ -77,6 +76,7 @@ typedef struct {
     GtkAdjustment* bar_h; // and scrolling position
     WebKitWebView* web_view;
     gchar*         main_title;
+    gchar*         icon;
 
     /* WebInspector */
     GtkWidget *inspector_window;
@@ -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;
 
@@ -107,7 +101,8 @@ typedef struct {
 typedef struct {
     gchar    *uri;
     gchar    *config_file;
-    char    *instance_name;
+    int      socket_id;
+    char     *instance_name;
     gchar    *selected_url;
     gchar    *executable_path;
     GString* keycmd;
@@ -155,6 +150,7 @@ typedef struct {
     guint    font_size;
     guint    monospace_size;
     guint    minimum_font_size;
+    gfloat   zoom_level;
     guint    disable_plugins;
     guint    disable_scripts;
     guint    autoload_img;    
@@ -171,6 +167,8 @@ typedef struct {
     guint    mode;  
     gchar*   base_url;
     gchar*   html_endmarker;
+    gchar*   insert_indicator;
+    gchar*   cmd_indicator;
     GString* html_buffer;
     guint    html_timeout;  
 
@@ -178,6 +176,12 @@ typedef struct {
     GHashTable* commands;
 } Behaviour;
 
+/* javascript */
+typedef struct {
+    gboolean            initialized;
+    JSClassDefinition   classdef;
+    JSClassRef          classref;
+} Javascript;
 
 /* main uzbl data structure */
 typedef struct {
@@ -186,6 +190,7 @@ typedef struct {
     Network       net;
     Behaviour     behave;
     Communication comm;
+    Javascript    js;
 
     Window        xwin;
     GScanner      *scan;
@@ -246,9 +251,15 @@ setup_signal(int signe, sigfunc *shandler);
 static gboolean
 set_var_value(gchar *name, gchar *val);
 
+static void
+print(WebKitWebView *page, GArray *argv, GString *result);
+
 static gboolean
 new_window_cb (WebKitWebView *web_view, WebKitWebFrame *frame, WebKitNetworkRequest *request, WebKitWebNavigationAction *navigation_action, WebKitWebPolicyDecision *policy_decision, gpointer user_data);
 
+static gboolean
+mime_policy_cb(WebKitWebView *web_view, WebKitWebFrame *frame, WebKitNetworkRequest *request, gchar *mime_type,  WebKitWebPolicyDecision *policy_decision, gpointer user_data);
+
 WebKitWebView*
 create_web_view_cb (WebKitWebView  *web_view, WebKitWebFrame *frame, gpointer user_data);
 
@@ -256,7 +267,10 @@ static gboolean
 download_cb (WebKitWebView *web_view, GObject *download, gpointer user_data);
 
 static void
-toggle_status_cb (WebKitWebView* page, GArray *argv);
+toggle_zoom_type (WebKitWebView* page, GArray *argv, GString *result);
+
+static void
+toggle_status_cb (WebKitWebView* page, GArray *argv, GString *result);
 
 static void
 link_hover_cb (WebKitWebView* page, const gchar* title, const gchar* link, gpointer data);
@@ -295,41 +309,50 @@ static bool
 file_exists (const char * filename);
 
 static void
-toggle_insert_mode(WebKitWebView *page, GArray *argv);
+toggle_insert_mode(WebKitWebView *page, GArray *argv, GString *result);
 
 static void
-load_uri (WebKitWebView * web_view, GArray *argv);
+load_uri (WebKitWebView * web_view, GArray *argv, GString *result);
 
 static void
 new_window_load_uri (const gchar * uri);
 
 static void
-close_uzbl (WebKitWebView *page, GArray *argv);
+chain (WebKitWebView *page, GArray *argv, GString *result);
 
-static gboolean
-run_command(const gchar *command, const guint npre,
-            const gchar **args, const gboolean sync, char **stdout);
+static void
+keycmd (WebKitWebView *page, GArray *argv, GString *result);
+
+static void
+keycmd_nl (WebKitWebView *page, GArray *argv, GString *result);
 
 static void
-spawn(WebKitWebView *web_view, GArray *argv);
+keycmd_bs (WebKitWebView *page, GArray *argv, GString *result);
 
 static void
-spawn_sh(WebKitWebView *web_view, GArray *argv);
+close_uzbl (WebKitWebView *page, GArray *argv, GString *result);
+
+static gboolean
+run_command(const gchar *command, const guint npre,
+            const gchar **args, const gboolean sync, char **output_stdout);
 
 static void
-spawn_sync(WebKitWebView *web_view, GArray *argv);
+spawn(WebKitWebView *web_view, GArray *argv, GString *result);
 
 static void
-spawn_sh_sync(WebKitWebView *web_view, GArray *argv);
+spawn_sh(WebKitWebView *web_view, GArray *argv, GString *result);
 
 static void
-parse_command(const char *cmd, const char *param);
+spawn_sync(WebKitWebView *web_view, GArray *argv, GString *result);
 
 static void
-runcmd(WebKitWebView *page, GArray *argv);
+spawn_sh_sync(WebKitWebView *web_view, GArray *argv, GString *result);
 
 static void
-parse_cmd_line(const char *ctl_line);
+parse_command(const char *cmd, const char *param, GString *result);
+
+static void
+parse_cmd_line(const char *ctl_line, GString *result);
 
 static gchar*
 build_stream_name(int type, const gchar *dir);
@@ -352,6 +375,9 @@ init_socket(gchar *dir);
 static gboolean
 control_socket(GIOChannel *chan);
 
+static gboolean
+control_client_socket(GIOChannel *chan);
+
 static void
 update_title (void);
 
@@ -373,6 +399,9 @@ create_mainbar ();
 static
 GtkWidget* create_window ();
 
+static
+GtkPlug* create_plug ();
+
 static void
 run_handler (const gchar *act, const gchar *args);
 
@@ -392,19 +421,22 @@ static void
 search_text (WebKitWebView *page, GArray *argv, const gboolean forward);
 
 static void
-search_forward_text (WebKitWebView *page, GArray *argv);
+search_forward_text (WebKitWebView *page, GArray *argv, GString *result);
+
+static void
+search_reverse_text (WebKitWebView *page, GArray *argv, GString *result);
 
 static void
-search_reverse_text (WebKitWebView *page, GArray *argv);
+dehilight (WebKitWebView *page, GArray *argv, GString *result);
 
 static void
-dehilight (WebKitWebView *page, GArray *argv);
+run_js (WebKitWebView * web_view, GArray *argv, GString *result);
 
 static void
-run_js (WebKitWebView * web_view, GArray *argv);
+run_external_js (WebKitWebView * web_view, GArray *argv, GString *result);
 
 static void
-run_external_js (WebKitWebView * web_view, GArray *argv);
+eval_js(WebKitWebView * web_view, gchar *script, GString *result);
 
 static void handle_cookies (SoupSession *session,
                             SoupMessage *msg,
@@ -414,7 +446,10 @@ save_cookies (SoupMessage *msg,
                 gpointer     user_data);
 
 static void
-set_var(WebKitWebView *page, GArray *argv);
+set_var(WebKitWebView *page, GArray *argv, GString *result);
+
+static void
+act_bind(WebKitWebView *page, GArray *argv, GString *result);
 
 static void
 act_dump_config();
@@ -435,6 +470,12 @@ static void
 dump_config();
 
 
+typedef void (*Command)(WebKitWebView*, GArray *argv, GString *result);
+typedef struct {
+    Command function;
+    gboolean no_split;
+} CommandInfo;
+
 /* Command callbacks */
 static void
 cmd_load_uri();
@@ -446,6 +487,9 @@ static void
 set_proxy_url();
 
 static void
+set_icon();
+
+static void
 cmd_cookie_handler();
 
 static void
@@ -463,10 +507,15 @@ cmd_max_conns();
 static void
 cmd_max_conns_host();
 
+/* exported WebKitWebSettings properties */
+
 static void
 cmd_font_size();
 
 static void
+cmd_zoom_level();
+
+static void
 cmd_disable_plugins();
 
 static void