X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=uzbl.h;h=1a2251362a84474be82572c0fd7a06fedf91bbe5;hb=e91f5b5d31aea3436ec0edffb7aab322f189420e;hp=e556f171cc79a886edf2fcaa2b8dc16ad9061007;hpb=4293a258255849854670ce12de428581904a1a24;p=uzbl-mobile

diff --git a/uzbl.h b/uzbl.h
index e556f17..1a22513 100644
--- a/uzbl.h
+++ b/uzbl.h
@@ -1,4 +1,5 @@
-/* 
+/* -*- c-basic-offset: 4; -*- 
+
  * See LICENSE for license details
  *
  * Changelog:
@@ -7,16 +8,17 @@
  * (c) 2009 by Robert Manea
  *     - introduced struct concept
  *     - statusbar template
- *     
+ *
  */
 
-#define STATUS_DEFAULT "<span background=\"darkblue\" foreground=\"white\"> MODE </span> <span background=\"red\" foreground=\"white\">KEYCMD</span> (LOAD_PROGRESS%)  <b>TITLE</b>  - Uzbl browser"
+#define NOSPLIT ((void*)1)
 
 enum {
   /* statusbar symbols */
-  SYM_TITLE, SYM_URI, SYM_NAME, 
+  SYM_TITLE, SYM_URI, SYM_NAME,
   SYM_LOADPRGS, SYM_LOADPRGSBAR,
   SYM_KEYCMD, SYM_MODE, SYM_MSG,
+  SYM_SELECTED_URI,
   /* useragent symbols */
   SYM_WK_MAJ, SYM_WK_MIN, SYM_WK_MIC,
   SYM_SYSNAME, SYM_NODENAME,
@@ -27,11 +29,12 @@ enum {
 
 const struct {
     gchar *symbol_name;
-    gulong symbol_token;
+    guint symbol_token;
 } symbols[] = {
     {"NAME",                 SYM_NAME},
     {"URI",                  SYM_URI},
     {"TITLE",                SYM_TITLE},
+    {"SELECTED_URI",         SYM_SELECTED_URI},
     {"KEYCMD",               SYM_KEYCMD},
     {"MODE",                 SYM_MODE},
     {"MSG",                  SYM_MSG},
@@ -56,6 +59,8 @@ const struct {
 typedef struct {
     gint           load_progress;
     gchar          *msg;
+    gchar          *progress_s, *progress_u;
+    int            progress_w;
 } StatusBar;
 
 
@@ -73,6 +78,10 @@ typedef struct {
     WebKitWebView* web_view;
     gchar*         main_title;
 
+    /* WebInspector */
+    GtkWidget *inspector_window;
+    WebKitWebInspector *inspector;
+
     StatusBar sbar;
 } GUI;
 
@@ -84,11 +93,7 @@ typedef struct {
     gchar          *socket_path;
     /* stores (key)"variable name" -> (value)"pointer to this var*/
     GHashTable     *proto_var;
-    /* command parsing regexes */
-    GRegex         *set_regex;
-    GRegex         *cmd_regex;
-    GRegex         *get_regex; 
-    GRegex         *bind_regex; 
+    gchar          *sync_stdout;
 } Communication;
 
 
@@ -97,12 +102,12 @@ typedef struct {
     gchar    *uri;
     gchar    *config_file;
     char    *instance_name;
-    gchar    config_file_path[500];
-    gchar    selected_url[500];
-    char     executable_path[500];
+    gchar    *selected_url;
+    gchar    *executable_path;
     GString* keycmd;
-    gchar    searchtx[500];
+    gchar*   searchtx;
     struct utsname unameinfo; /* system info */
+    gboolean verbose;
 } State;
 
 
@@ -120,7 +125,11 @@ typedef struct {
 /* behaviour */
 typedef struct {
     gchar*   load_finish_handler;
+    gchar*   load_start_handler;
+    gchar*   load_commit_handler;
     gchar*   status_format;
+    gchar*   title_format_short;
+    gchar*   title_format_long;
     gchar*   status_background;
     gchar*   history_handler;
     gchar*   fifo_dir;
@@ -135,6 +144,31 @@ typedef struct {
     gchar*   modkey;
     guint    modmask;
     guint    http_debug;
+    gchar*   shell_cmd;
+    /* WebKitWebSettings exports */
+    guint    font_size;
+    guint    monospace_size;
+    guint    minimum_font_size;
+    guint    disable_plugins;
+    guint    disable_scripts;
+    guint    autoload_img;    
+    guint    autoshrink_img;  
+    guint    enable_spellcheck;
+    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;
@@ -164,6 +198,22 @@ typedef struct {
 
 typedef void sigfunc(int);
 
+/* XDG Stuff */
+
+typedef struct {
+    gchar* environmental;
+    gchar* default_value;
+} XDG_Var;
+
+XDG_Var XDG[] = 
+{
+    { "XDG_CONFIG_HOME", "~/.config" },
+    { "XDG_DATA_HOME",   "~/.local/share" },
+    { "XDG_CACHE_HOME",  "~/.cache" },
+    { "XDG_CONFIG_DIRS", "/etc/xdg" },
+    { "XDG_DATA_DIRS",   "/usr/local/share/:/usr/share/" },
+};
+
 /* Functions */
 static void
 setup_scanner();
@@ -171,6 +221,15 @@ setup_scanner();
 char *
 itos(int val);
 
+static char *
+str_replace (const char* search, const char* replace, const char* string);
+
+static GArray*
+read_file_by_line (gchar *path);
+
+static
+gchar* parseenv (char* string);
+
 static void
 clean_up(void);
 
@@ -181,8 +240,17 @@ static sigfunc *
 setup_signal(int signe, sigfunc *shandler);
 
 static gboolean
+set_var_value(gchar *name, gchar *val);
+
+static void
+print(WebKitWebView *page, GArray *argv);
+
+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);
 
@@ -190,7 +258,7 @@ static gboolean
 download_cb (WebKitWebView *web_view, GObject *download, gpointer user_data);
 
 static void
-toggle_status_cb (WebKitWebView* page, const char *param);
+toggle_status_cb (WebKitWebView* page, GArray *argv);
 
 static void
 link_hover_cb (WebKitWebView* page, const gchar* title, const gchar* link, gpointer data);
@@ -205,6 +273,9 @@ static void
 load_commit_cb (WebKitWebView* page, WebKitWebFrame* frame, gpointer data);
 
 static void
+load_start_cb (WebKitWebView* page, WebKitWebFrame* frame, gpointer data);
+
+static void
 load_finish_cb (WebKitWebView* page, WebKitWebFrame* frame, gpointer data);
 
 static void
@@ -225,44 +296,54 @@ new_action(const gchar *name, const gchar *param);
 static bool
 file_exists (const char * filename);
 
-void
-set_insert_mode(WebKitWebView *page, const gchar *param);
+static void
+toggle_insert_mode(WebKitWebView *page, GArray *argv);
 
 static void
-load_uri (WebKitWebView * web_view, const gchar *param);
+load_uri (WebKitWebView * web_view, GArray *argv);
 
 static void
 new_window_load_uri (const gchar * uri);
 
 static void
-close_uzbl (WebKitWebView *page, const char *param);
+chain (WebKitWebView *page, GArray *argv);
 
-static gboolean
-run_command_async(const char *command, const char *args);
+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
-run_command_sync(const char *command, const char *args, char **stdout);
+run_command(const gchar *command, const guint npre,
+            const gchar **args, const gboolean sync, char **stdout);
 
 static void
-spawn(WebKitWebView *web_view, const char *param);
+spawn(WebKitWebView *web_view, GArray *argv);
 
 static void
-parse_command(const char *cmd, const char *param);
+spawn_sh(WebKitWebView *web_view, GArray *argv);
 
 static void
-runcmd(WebKitWebView *page, const char *param);
+spawn_sync(WebKitWebView *web_view, GArray *argv);
 
 static void
-parse_cmd_line(const char *ctl_line);
+spawn_sh_sync(WebKitWebView *web_view, GArray *argv);
 
-static gchar*
-build_stream_name(int type, const gchar *dir);
+static void
+parse_command(const char *cmd, const char *param);
 
-static gboolean
-var_is(const char *x, const char *y);
+static void
+parse_cmd_line(const char *ctl_line);
 
 static gchar*
-set_useragent(gchar *val);
+build_stream_name(int type, const gchar *dir);
 
 static gboolean
 control_fifo(GIOChannel *gio, GIOCondition condition);
@@ -279,14 +360,20 @@ create_stdin();
 static gchar*
 init_socket(gchar *dir);
 
-static void
+static gboolean
 control_socket(GIOChannel *chan);
 
 static void
 update_title (void);
- 
+
 static gboolean
-key_press_cb (WebKitWebView* page, GdkEventKey* event);
+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 ();
@@ -298,21 +385,153 @@ static
 GtkWidget* create_window ();
 
 static void
+run_handler (const gchar *act, const gchar *args);
+
+static void
 add_binding (const gchar *key, const gchar *act);
 
+static gchar*
+get_xdg_var (XDG_Var xdg);
+
+static gchar*
+find_xdg_file (int xdg_type, char* filename);
+
 static void
 settings_init ();
 
 static void
-search_text (WebKitWebView *page, const char *param);
+search_text (WebKitWebView *page, GArray *argv, const gboolean forward);
+
+static void
+search_forward_text (WebKitWebView *page, GArray *argv);
+
+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
-run_js (WebKitWebView * web_view, const gchar *param);
+run_external_js (WebKitWebView * web_view, GArray *argv);
 
 static void handle_cookies (SoupSession *session,
-							SoupMessage *msg,
-							gpointer     user_data);
+                            SoupMessage *msg,
+                            gpointer     user_data);
 static void
 save_cookies (SoupMessage *msg,
-			  gpointer     user_data);
+                gpointer     user_data);
+
+static void
+set_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
+cmd_load_uri();
+
+static void
+cmd_set_status();
+
+static void
+set_proxy_url();
+
+static void
+cmd_cookie_handler();
+
+static void
+move_statusbar();
+
+static void
+cmd_always_insert_mode();
+
+static void
+cmd_http_debug();
+
+static void
+cmd_max_conns();
+
+static void
+cmd_max_conns_host();
+
+static void
+cmd_font_size();
+
+static void
+cmd_disable_plugins();
+
+static void
+cmd_disable_scripts();
+
+static void
+cmd_minimum_font_size();
+
+static void
+cmd_fifo_dir();
+
+static void
+cmd_socket_dir();
+
+static void
+cmd_modkey();
+
+static void
+cmd_useragent() ;
+
+static void
+cmd_autoload_img();
+
+static void
+cmd_autoshrink_img();
+
+static void
+cmd_enable_spellcheck();
+
+static void
+cmd_enable_private();
+
+static void
+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: */