*
*/
-#define NOSPLIT ((void*)1)
-
enum {
/* statusbar symbols */
SYM_TITLE, SYM_URI, SYM_NAME,
/* gui elements */
typedef struct {
GtkWidget* main_window;
+ GtkPlug* plug;
GtkWidget* scrolled_win;
GtkWidget* vbox;
GtkWidget* mainbar;
GtkAdjustment* bar_h; // and scrolling position
WebKitWebView* web_view;
gchar* main_title;
+ gchar* icon;
/* WebInspector */
GtkWidget *inspector_window;
typedef struct {
gchar *uri;
gchar *config_file;
- char *instance_name;
+ int socket_id;
+ char *instance_name;
gchar *selected_url;
gchar *executable_path;
GString* keycmd;
guint font_size;
guint monospace_size;
guint minimum_font_size;
+ gfloat zoom_level;
guint disable_plugins;
guint disable_scripts;
guint autoload_img;
GHashTable* commands;
} Behaviour;
+/* javascript */
+typedef struct {
+ gboolean initialized;
+ JSClassDefinition classdef;
+ JSClassRef classref;
+} Javascript;
/* main uzbl data structure */
typedef struct {
Network net;
Behaviour behave;
Communication comm;
+ Javascript js;
Window xwin;
GScanner *scan;
set_var_value(gchar *name, gchar *val);
static void
-print(WebKitWebView *page, GArray *argv);
+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);
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);
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
-chain (WebKitWebView *page, GArray *argv);
+chain (WebKitWebView *page, GArray *argv, GString *result);
static void
-keycmd (WebKitWebView *page, GArray *argv);
+keycmd (WebKitWebView *page, GArray *argv, GString *result);
static void
-keycmd_nl (WebKitWebView *page, GArray *argv);
+keycmd_nl (WebKitWebView *page, GArray *argv, GString *result);
static void
-keycmd_bs (WebKitWebView *page, GArray *argv);
+keycmd_bs (WebKitWebView *page, GArray *argv, GString *result);
static void
-close_uzbl (WebKitWebView *page, 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 **stdout);
+ const gchar **args, const gboolean sync, char **output_stdout);
static void
-spawn(WebKitWebView *web_view, GArray *argv);
+spawn(WebKitWebView *web_view, GArray *argv, GString *result);
static void
-spawn_sh(WebKitWebView *web_view, GArray *argv);
+spawn_sh(WebKitWebView *web_view, GArray *argv, GString *result);
static void
-spawn_sync(WebKitWebView *web_view, GArray *argv);
+spawn_sync(WebKitWebView *web_view, GArray *argv, GString *result);
static void
-spawn_sh_sync(WebKitWebView *web_view, GArray *argv);
+spawn_sh_sync(WebKitWebView *web_view, GArray *argv, GString *result);
static void
-parse_command(const char *cmd, const char *param);
+parse_command(const char *cmd, const char *param, GString *result);
static void
-parse_cmd_line(const char *ctl_line);
+parse_cmd_line(const char *ctl_line, GString *result);
static gchar*
build_stream_name(int type, const gchar *dir);
static gboolean
control_socket(GIOChannel *chan);
+static gboolean
+control_client_socket(GIOChannel *chan);
+
static void
update_title (void);
static
GtkWidget* create_window ();
+static
+GtkPlug* create_plug ();
+
static void
run_handler (const gchar *act, const gchar *args);
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);
+search_reverse_text (WebKitWebView *page, GArray *argv, GString *result);
static void
-dehilight (WebKitWebView *page, GArray *argv);
+dehilight (WebKitWebView *page, GArray *argv, GString *result);
static void
-run_js (WebKitWebView * web_view, GArray *argv);
+run_js (WebKitWebView * web_view, GArray *argv, GString *result);
static void
-run_external_js (WebKitWebView * web_view, GArray *argv);
+run_external_js (WebKitWebView * web_view, GArray *argv, GString *result);
+
+static void
+eval_js(WebKitWebView * web_view, gchar *script, GString *result);
static void handle_cookies (SoupSession *session,
SoupMessage *msg,
gpointer user_data);
static void
-set_var(WebKitWebView *page, GArray *argv);
+set_var(WebKitWebView *page, GArray *argv, GString *result);
static void
-<<<<<<< HEAD:uzbl.h
-=======
-act_bind(WebKitWebView *page, GArray *argv);
+act_bind(WebKitWebView *page, GArray *argv, GString *result);
static void
->>>>>>> dieterbe/experimental:uzbl.h
act_dump_config();
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();
set_proxy_url();
static void
+set_icon();
+
+static void
cmd_cookie_handler();
static void
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