X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=uzbl.h;h=b99a89c71ef17a7c0c296a219d3dadfec75daee7;hb=b67187957c0759946df602c3ca3123975b86f157;hp=7c4e5b4a22cfe784f7527d9848403177d58b77a1;hpb=165dc493fdd02fee35ca266264367f2cd1db9599;p=uzbl-mobile diff --git a/uzbl.h b/uzbl.h index 7c4e5b4..b99a89c 100644 --- a/uzbl.h +++ b/uzbl.h @@ -11,60 +11,21 @@ * */ -enum { - /* statusbar symbols */ - SYM_TITLE, SYM_URI, SYM_NAME, - SYM_LOADPRGS, SYM_LOADPRGSBAR, - SYM_KEYCMD, SYM_MODE, SYM_MSG, - SYM_SELECTED_URI, - /* useragent symbols */ - SYM_WK_MAJ, SYM_WK_MIN, SYM_WK_MIC, - SYM_SYSNAME, SYM_NODENAME, - SYM_KERNREL, SYM_KERNVER, - SYM_ARCHSYS, SYM_ARCHUZBL, - SYM_DOMAINNAME, SYM_COMMIT -}; - -const struct { - gchar *symbol_name; - guint symbol_token; -} symbols[] = { - {"NAME", SYM_NAME}, - {"URI", SYM_URI}, - {"TITLE", SYM_TITLE}, - {"SELECTED_URI", SYM_SELECTED_URI}, - {"KEYCMD", SYM_KEYCMD}, - {"MODE", SYM_MODE}, - {"MSG", SYM_MSG}, - {"LOAD_PROGRESS", SYM_LOADPRGS}, - {"LOAD_PROGRESSBAR", SYM_LOADPRGSBAR}, - - {"WEBKIT_MAJOR", SYM_WK_MAJ}, - {"WEBKIT_MINOR", SYM_WK_MIN}, - {"WEBKIT_MICRO", SYM_WK_MIC}, - {"SYSNAME", SYM_SYSNAME}, - {"NODENAME", SYM_NODENAME}, - {"KERNREL", SYM_KERNREL}, - {"KERNVER", SYM_KERNVER}, - {"ARCH_SYSTEM", SYM_ARCHSYS}, - {"ARCH_UZBL", SYM_ARCHUZBL}, - {"DOMAINNAME", SYM_DOMAINNAME}, - {"COMMIT", SYM_COMMIT}, - {NULL, 0} -}, *symp = symbols; - /* status bar elements */ typedef struct { gint load_progress; gchar *msg; gchar *progress_s, *progress_u; int progress_w; + gchar *progress_bar; + gchar *mode_indicator; } StatusBar; /* gui elements */ typedef struct { GtkWidget* main_window; + gchar* geometry; GtkPlug* plug; GtkWidget* scrolled_win; GtkWidget* vbox; @@ -93,6 +54,7 @@ typedef struct { gchar *socket_path; /* stores (key)"variable name" -> (value)"pointer to this var*/ GHashTable *proto_var; + gchar *sync_stdout; } Communication; @@ -105,9 +67,8 @@ typedef struct { char *instance_name; gchar *selected_url; gchar *executable_path; - GString* keycmd; + gchar* keycmd; gchar* searchtx; - struct utsname unameinfo; /* system info */ gboolean verbose; } State; @@ -138,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; gboolean always_insert_mode; gboolean show_status; gboolean insert_mode; @@ -185,6 +152,15 @@ typedef struct { JSClassRef classref; } Javascript; +/* static information */ +typedef struct { + int webkit_major; + int webkit_minor; + int webkit_micro; + gchar *arch; + gchar *commit; +} Info; + /* main uzbl data structure */ typedef struct { GUI gui; @@ -193,9 +169,9 @@ typedef struct { Behaviour behave; Communication comm; Javascript js; + Info info; Window xwin; - GScanner *scan; /* group bindings: key -> action */ GHashTable* bindings; @@ -226,12 +202,6 @@ XDG_Var XDG[] = }; /* Functions */ -gchar * -expand_template(const char *template, gboolean escape_markup); - -void -setup_scanner(); - char * itos(int val); @@ -239,7 +209,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); @@ -254,7 +224,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); @@ -265,7 +235,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 @@ -314,6 +284,18 @@ bool file_exists (const char * filename); void +set_keycmd(); + +void +set_mode_indicator(); + +void +update_indicator(); + +void +set_insert_mode(gboolean mode); + +void toggle_insert_mode(WebKitWebView *page, GArray *argv, GString *result); void @@ -341,6 +323,12 @@ gboolean run_command(const gchar *command, const guint npre, const gchar **args, const gboolean sync, char **output_stdout); +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); @@ -359,13 +347,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 +362,7 @@ control_stdin(GIOChannel *gio, GIOCondition condition); void create_stdin(); -gchar* +/*@null@*/ gchar* init_socket(gchar *dir); gboolean @@ -395,7 +383,10 @@ run_keycmd(const gboolean key_ret); void exec_paramcmd(const Action* act, const guint i); -GtkWidget* +void +initialize (int argc, char *argv[]); + +void create_browser (); GtkWidget* @@ -413,11 +404,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 (); @@ -474,6 +465,15 @@ dump_key_hash(gpointer k, gpointer v, gpointer ud); void dump_config(); +void +retrieve_geometry(); + +void +update_gui(WebKitWebView *page, GArray *argv, GString *result); + +gboolean +configure_event_cb(GtkWidget* window, GdkEventConfigure* event); + typedef void (*Command)(WebKitWebView*, GArray *argv, GString *result); typedef struct { Command function; @@ -520,6 +520,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 @@ -576,4 +594,7 @@ cmd_inject_html(); void cmd_caret_browsing(); +void +cmd_set_geometry(); + /* vi: set et ts=4: */