diff options
author | Sylvester Johansson <scj@archlinux.us> | 2009-06-01 14:07:26 +0200 |
---|---|---|
committer | Sylvester Johansson <scj@archlinux.us> | 2009-06-01 14:07:26 +0200 |
commit | aa03a11176e42cc21bca894e0141bf90fc80959b (patch) | |
tree | 83835d393a4ecc60d0072e96f51f38c2bdce224f /uzbl.h | |
parent | afce27422a221c718958a06a1e7f804f0a59003d (diff) | |
parent | fe60a9f75d740d555631ce2506ea78abffb69c19 (diff) |
Merge commit 'dieterbe/experimental'
Diffstat (limited to 'uzbl.h')
-rw-r--r-- | uzbl.h | 30 |
1 files changed, 21 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; @@ -248,6 +242,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); @@ -306,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 @@ -328,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* @@ -419,6 +425,12 @@ static void set_var(WebKitWebView *page, GArray *argv); static void +<<<<<<< HEAD:uzbl.h +======= +act_bind(WebKitWebView *page, GArray *argv); + +static void +>>>>>>> dieterbe/experimental:uzbl.h act_dump_config(); static void |