diff options
author | uranther <jwheaton@purdue.edu> | 2009-06-01 13:44:45 -0400 |
---|---|---|
committer | uranther <jwheaton@purdue.edu> | 2009-06-01 13:44:45 -0400 |
commit | 63a00498cb90e8a05ad950601dd55eb3ca361dbb (patch) | |
tree | dc54ec929372b7bb225b5730d3469609440b97fe /uzbl.h | |
parent | 0683d83a8058b36a4f351022afa8faddbae506ad (diff) | |
parent | 22f1e1bd7d2393b526f88929b6a980b142d92856 (diff) |
merge with Dieterbe/experimental
Diffstat (limited to 'uzbl.h')
-rw-r--r-- | uzbl.h | 41 |
1 files changed, 32 insertions, 9 deletions
@@ -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; @@ -172,6 +166,8 @@ typedef struct { guint mode; gchar* base_url; gchar* html_endmarker; + gchar* insert_indicator; + gchar* cmd_indicator; GString* html_buffer; guint html_timeout; @@ -247,6 +243,9 @@ 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); @@ -305,6 +304,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 @@ -327,9 +338,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* @@ -418,11 +426,26 @@ 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 |