X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=uzbl.h;h=67fbbb54d95cda5533df35dc5ebf25442a1d6646;hb=087bca445cd96d69a5fe9aa56b7ba88e9f9f7de6;hp=5c6706827470a4df98423a02166b118c1d085fc2;hpb=948b48e7e52068678404181b25d8957c8d4274c8;p=uzbl-mobile
diff --git a/uzbl.h b/uzbl.h
index 5c67068..67fbbb5 100644
--- a/uzbl.h
+++ b/uzbl.h
@@ -11,9 +11,6 @@
*
*/
-#define STATUS_DEFAULT " MODE KEYCMD (LOAD_PROGRESS%) TITLE - Uzbl browser"
-#define TITLE_LONG_DEFAULT "KEYCMD MODE TITLE - Uzbl browser > SELECTED_URI"
-#define TITLE_SHORT_DEFAULT "TITLE - Uzbl browser "
#define NOSPLIT ((void*)1)
enum {
@@ -62,6 +59,8 @@ const struct {
typedef struct {
gint load_progress;
gchar *msg;
+ gchar *progress_s, *progress_u;
+ int progress_w;
} StatusBar;
@@ -78,6 +77,11 @@ typedef struct {
GtkAdjustment* bar_h; // and scrolling position
WebKitWebView* web_view;
gchar* main_title;
+ gchar* icon;
+
+ /* WebInspector */
+ GtkWidget *inspector_window;
+ WebKitWebInspector *inspector;
StatusBar sbar;
} GUI;
@@ -90,13 +94,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 *act_regex;
- GRegex *keycmd_regex;
- GRegex *get_regex;
- GRegex *bind_regex;
- gchar **sync_stdout;
+ gchar *sync_stdout;
} Communication;
@@ -105,12 +103,10 @@ 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;
- gchar* searchold;
struct utsname unameinfo; /* system info */
gboolean verbose;
} State;
@@ -149,9 +145,32 @@ typedef struct {
gchar* modkey;
guint modmask;
guint http_debug;
- guint default_font_size;
- guint minimum_font_size;
gchar* shell_cmd;
+ /* WebKitWebSettings exports */
+ guint font_size;
+ guint monospace_size;
+ guint minimum_font_size;
+ gfloat zoom_level;
+ 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;
@@ -211,7 +230,7 @@ static GArray*
read_file_by_line (gchar *path);
static
-gchar* parseenv (const char* string);
+gchar* parseenv (char* string);
static void
clean_up(void);
@@ -223,8 +242,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);
@@ -232,6 +260,9 @@ static gboolean
download_cb (WebKitWebView *web_view, GObject *download, gpointer user_data);
static void
+toggle_zoom_type (WebKitWebView* page, GArray *argv);
+
+static void
toggle_status_cb (WebKitWebView* page, GArray *argv);
static void
@@ -280,11 +311,23 @@ 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
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);
@@ -293,10 +336,13 @@ static void
spawn_sh(WebKitWebView *web_view, GArray *argv);
static void
-parse_command(const char *cmd, const char *param);
+spawn_sync(WebKitWebView *web_view, GArray *argv);
static void
-runcmd(WebKitWebView *page, GArray *argv);
+spawn_sh_sync(WebKitWebView *web_view, GArray *argv);
+
+static void
+parse_command(const char *cmd, const char *param);
static void
parse_cmd_line(const char *ctl_line);
@@ -304,9 +350,6 @@ parse_cmd_line(const char *ctl_line);
static gchar*
build_stream_name(int type, const gchar *dir);
-static gchar*
-set_useragent(gchar *val);
-
static gboolean
control_fifo(GIOChannel *gio, GIOCondition condition);
@@ -334,6 +377,9 @@ 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 ();
@@ -368,17 +414,45 @@ 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_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
@@ -391,6 +465,12 @@ static void
set_proxy_url();
static void
+set_icon();
+
+static void
+cmd_cookie_handler();
+
+static void
move_statusbar();
static void
@@ -405,8 +485,19 @@ cmd_max_conns();
static void
cmd_max_conns_host();
+/* exported WebKitWebSettings properties */
+
+static void
+cmd_font_size();
+
static void
-cmd_default_font_size();
+cmd_zoom_level();
+
+static void
+cmd_disable_plugins();
+
+static void
+cmd_disable_scripts();
static void
cmd_minimum_font_size();
@@ -423,8 +514,37 @@ 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: */