merge holizz' scheme handler

[uzbl-mobile] / uzbl.h

diff --git a/uzbl.h b/uzbl.h
index b0a0171..780aebf 100644 (file)
--- a/uzbl.h
+++ b/uzbl.h
@@ -11,23 +11,6 @@
  *
  */
 
-enum {
-  /* statusbar symbols */
-  SYM_TITLE, SYM_URI, SYM_NAME,
-  SYM_LOADPRGS, SYM_LOADPRGSBAR,
-  SYM_KEYCMD, SYM_MODE, SYM_MSG,
-  SYM_SELECTED_URI,
-};
-
-const struct {
-    gchar *symbol_name;
-    guint symbol_token;
-} symbols[] = {
-    {"KEYCMD",               SYM_KEYCMD},
-
-    {NULL,                   0}
-}, *symp = symbols;
-
 /* status bar elements */
 typedef struct {
     gint           load_progress;
@@ -116,6 +99,12 @@ typedef struct {
     gchar*   download_handler;
     gchar*   cookie_handler;
     gchar*   new_window;
+    gchar*   default_font_family;
+    gchar*   monospace_font_family;
+    gchar*   sans_serif_font_family;
+    gchar*   serif_font_family;
+    gchar*   fantasy_font_family;
+    gchar*   cursive_font_family;
     gchar*   scheme_handler;
     gboolean always_insert_mode;
     gboolean show_status;
@@ -146,11 +135,8 @@ typedef struct {
     guint    caret_browsing;
     guint    mode;
     gchar*   base_url;
-    gchar*   html_endmarker;
     gchar*   insert_indicator;
     gchar*   cmd_indicator;
-    GString* html_buffer;
-    guint    html_timeout;
     gboolean print_version;
 
     /* command list: name -> Command  */
@@ -221,7 +207,7 @@ char *
 str_replace (const char* search, const char* replace, const char* string);
 
 GArray*
-read_file_by_line (gchar *path);
+read_file_by_line (const gchar *path);
 
 gchar*
 parseenv (char* string);
@@ -236,7 +222,7 @@ sigfunc *
 setup_signal(int signe, sigfunc *shandler);
 
 gboolean
-set_var_value(gchar *name, gchar *val);
+set_var_value(const gchar *name, gchar *val);
 
 void
 print(WebKitWebView *page, GArray *argv, GString *result);
@@ -250,7 +236,7 @@ new_window_cb (WebKitWebView *web_view, WebKitWebFrame *frame, WebKitNetworkRequ
 gboolean
 mime_policy_cb(WebKitWebView *web_view, WebKitWebFrame *frame, WebKitNetworkRequest *request, gchar *mime_type,  WebKitWebPolicyDecision *policy_decision, gpointer user_data);
 
-WebKitWebView*
+/*@null@*/ WebKitWebView*
 create_web_view_cb (WebKitWebView  *web_view, WebKitWebFrame *frame, gpointer user_data);
 
 gboolean
@@ -342,6 +328,9 @@ char*
 build_progressbar_ascii(int percent);
 
 void
+talk_to_socket(WebKitWebView *web_view, GArray *argv, GString *result);
+
+void
 spawn(WebKitWebView *web_view, GArray *argv, GString *result);
 
 void
@@ -359,13 +348,13 @@ parse_command(const char *cmd, const char *param, GString *result);
 void
 parse_cmd_line(const char *ctl_line, GString *result);
 
-gchar*
+/*@null@*/ gchar*
 build_stream_name(int type, const gchar *dir);
 
 gboolean
 control_fifo(GIOChannel *gio, GIOCondition condition);
 
-gchar*
+/*@null@*/ gchar*
 init_fifo(gchar *dir);
 
 gboolean
@@ -374,7 +363,7 @@ control_stdin(GIOChannel *gio, GIOCondition condition);
 void
 create_stdin();
 
-gchar*
+/*@null@*/ gchar*
 init_socket(gchar *dir);
 
 gboolean
@@ -396,7 +385,7 @@ void
 exec_paramcmd(const Action* act, const guint i);
 
 void
-initialize ();
+initialize (int argc, char *argv[]);
 
 void
 create_browser ();
@@ -416,11 +405,11 @@ run_handler (const gchar *act, const gchar *args);
 void
 add_binding (const gchar *key, const gchar *act);
 
-gchar*
+/*@null@*/ gchar*
 get_xdg_var (XDG_Var xdg);
 
-gchar*
-find_xdg_file (int xdg_type, char* filename);
+/*@null@*/ gchar*
+find_xdg_file (int xdg_type, const char* filename);
 
 void
 settings_init ();
@@ -463,12 +452,6 @@ void
 act_dump_config();
 
 void
-render_html();
-
-void
-set_timeout(int seconds);
-
-void
 dump_var_hash(gpointer k, gpointer v, gpointer ud);
 
 void
@@ -478,7 +461,10 @@ void
 dump_config();
 
 void
-retreive_geometry();
+retrieve_geometry();
+
+void
+update_gui(WebKitWebView *page, GArray *argv, GString *result);
 
 gboolean
 configure_event_cb(GtkWidget* window, GdkEventConfigure* event);
@@ -529,6 +515,24 @@ void
 cmd_font_size();
 
 void
+cmd_default_font_family();
+
+void
+cmd_monospace_font_family();
+
+void
+cmd_sans_serif_font_family();
+
+void
+cmd_serif_font_family();
+
+void
+cmd_cursive_font_family();
+
+void
+cmd_fantasy_font_family();
+
+void
 cmd_zoom_level();
 
 void