From: Helmut Grohne Date: Wed, 29 Jul 2009 20:14:26 +0000 (+0200) Subject: Merge branch 'helmut' into helmutexp X-Git-Url: https://vcs.maemo.org/git/?a=commitdiff_plain;h=7bd6fa298bbe8d31bfb7a683fe531c2c562b55db;hp=f5423bfe2855f4aeccfcf38dad6840160ebe96ad;p=uzbl-mobile Merge branch 'helmut' into helmutexp Conflicts: uzbl.c --- diff --git a/AUTHORS b/AUTHORS index cf2635b..e40a90f 100644 --- a/AUTHORS +++ b/AUTHORS @@ -36,6 +36,8 @@ Contributors: Moritz Lenz - small doc fix Sergey Shepelev (temoto) - doc patch Tassilo Horn (tsdh) - $VISUAL patch + Laurence Withers (lwithers) - talk_to_socket + Andraž 'ruskie' Levstik - font_family patch Originaly based on http://trac.webkit.org/browser/trunk/WebKitTools/GtkLauncher/main.c Which is copyrighted: diff --git a/README b/README index f1f483f..00d8db9 100644 --- a/README +++ b/README @@ -141,6 +141,8 @@ The following commands are recognized: * `sync_sh ` - these are synchronous variants of `spawn` and `sh`, which means uzbl will wait for them to return - you should only need to use these manually if you want to use a chain command in a handler that wants output from the command it runs +* `talk_to_socket ` + - lets uzbl talk to a socketfile * `exit` * `search ` * `search_reverse ` @@ -222,6 +224,13 @@ Some variables have callback functions which will get called after setting the v - default_encoding: iso-8859-1 by default - enforce_96_dpi: 1 by default - caret_browsing + - default_font_family = sans-serif + - monospace_font_family = monospace (example "Aerial Mono" ) + - cursive_font_family = sans + - fantasy_font_family = "Pterra" + - serif_font_family = serif (example "DejaVu Serif") + - sans_serif_font_family = sans (example "DejaVu Sans") + * Constants (not dumpable or writeable): - WEBKIT_MAJOR: set at compile time @@ -402,10 +411,10 @@ Copying the Uzbl object and creating public functions should be taken with care ### COMMAND LINE ARGUMENTS uzbl [ uri ] - -u, --uri=URI alternative way to load uri on start. (equivalent to 'set uri = URI') + -u, --uri=URI Uri to load at startup (equivalent to 'uzbl ' or 'set uri = URI' after uzbl has launched) -v, --verbose Whether to print all messages or just errors. -n, --name=NAME Name of the current instance (defaults to Xorg window id) - -c, --config=FILE Config file (or `-` to use stdin) + -c, --config=FILE Path to config file or '-' for stdin -s, --socket=SOCKET Socket ID -g, --geometry=GEOMETRY Set window geometry (format: WIDTHxHEIGHT+-X+-Y) -V, --version Print the version and exit @@ -415,6 +424,5 @@ Copying the Uzbl object and creating public functions should be taken with care - ### BUGS Please report new issues @ uzbl.org/bugs diff --git a/docs/FAQ b/docs/FAQ index 43eaaaf..f8e6e8a 100644 --- a/docs/FAQ +++ b/docs/FAQ @@ -53,7 +53,7 @@ have lots of keybinding possibilities. We stick to "one page per uzbl instance" because that's a simple, clean and flexible method. We believe "multiple instances management" is something that must be handled outside of uzbl by a separate/different program. Here are some solutions: - * Many window managers can (and should) handle this by default. Xmonads tabbed layout, Wmii's stacked layout, flubox tabs and so on. + * Many window managers can (and should) handle this by default. Xmonads tabbed layout, Wmii's stacked layout, fluxbox or kwin tabs and so on. * Uzbl supports acting as a GtkPlug to plug into GtkSockets (Xembed) so you can embed uzbl instances in other Gtk applications. This allows several implementatinos, a popular one is [uzbl_tabbed.py](http://www.uzbl.org/wiki/uzbl_tabbed) * If you want highest customizablity, you need the 3rd option: diff --git a/examples/data/uzbl/scripts/uzbl_tabbed.py b/examples/data/uzbl/scripts/uzbl_tabbed.py index bf5ee97..9de6fba 100755 --- a/examples/data/uzbl/scripts/uzbl_tabbed.py +++ b/examples/data/uzbl/scripts/uzbl_tabbed.py @@ -34,6 +34,9 @@ # Contributor(s): # mxey # uzbl_config path now honors XDG_CONFIG_HOME if it exists. +# +# Romain Bignon +# Fix for session restoration code. # Configuration: @@ -280,18 +283,6 @@ def readconfig(uzbl_config, config): config[key] = os.path.expandvars(config[key]) -def rmkdir(path): - '''Recursively make directories. - I.e. `mkdir -p /some/nonexistant/path/`''' - - path, sep = os.path.realpath(path), os.path.sep - dirs = path.split(sep) - for i in range(2,len(dirs)+1): - dir = os.path.join(sep,sep.join(dirs[:i])) - if not os.path.exists(dir): - os.mkdir(dir) - - def counter(): '''To infinity and beyond!''' @@ -301,6 +292,14 @@ def counter(): yield i +def escape(s): + '''Replaces html markup in tab titles that screw around with pango.''' + + for (split, glue) in [('&','&'), ('<', '<'), ('>', '>')]: + s = s.replace(split, glue) + return s + + def gen_endmarker(): '''Generates a random md5 for socket message-termination endmarkers.''' @@ -544,7 +543,8 @@ class UzblTabbed: else: basedir = os.path.dirname(self.fifo_socket) if not os.path.exists(basedir): - rmkdir(basedir) + os.makedirs(basedir) + os.mkfifo(self.fifo_socket) print "Listening on %s" % self.fifo_socket @@ -984,7 +984,8 @@ class UzblTabbed: (tabc, textc) = style if tab_titles: - pango += tab_format % (tabc, index, textc, tabtitle) + pango += tab_format % (tabc, index, textc,\ + escape(tabtitle)) else: pango += tab_format % (tabc, textc, index) @@ -1020,8 +1021,7 @@ class UzblTabbed: if not os.path.isfile(session_file): dirname = os.path.dirname(session_file) if not os.path.isdir(dirname): - # Recursive mkdir not rmdir. - rmkdir(dirname) + os.makedirs(dirname) sessionstr = '\n'.join(self._tabsuris) h = open(session_file, 'w') @@ -1064,7 +1064,7 @@ if __name__ == "__main__": uzbl.new_tab(line, False) if not len(urls): - self.new_tab() + uzbl.new_tab() else: uzbl.new_tab() diff --git a/tests/test-expand.c b/tests/test-expand.c index 07e3fea..2299227 100644 --- a/tests/test-expand.c +++ b/tests/test-expand.c @@ -111,7 +111,7 @@ test_ARCH_UZBL (void) { void test_COMMIT (void) { - g_assert_cmpstr(expand("@COMMIT", 0), ==, COMMIT); + g_assert_cmpstr(expand("@COMMIT", 0), ==, uzbl.info.commit); } void @@ -154,7 +154,7 @@ test_cmd_useragent_full (void) { g_string_append(expected, " ["); g_string_append(expected, ARCH); g_string_append(expected, "]) (Commit "); - g_string_append(expected, COMMIT); + g_string_append(expected, uzbl.info.commit); g_string_append(expected, ")"); set_var_value("useragent", "Uzbl (Webkit @WEBKIT_MAJOR.@WEBKIT_MINOR.@WEBKIT_MICRO) (@(uname -s)@ @(uname -n)@ @(uname -r)@ @(uname -v)@ @(uname -m)@ [@ARCH_UZBL]) (Commit @COMMIT)"); diff --git a/uzbl.c b/uzbl.c index e08d0c0..0852acb 100644 --- a/uzbl.c +++ b/uzbl.c @@ -53,6 +53,9 @@ #include #include #include +#include +#include +#include #include #include "uzbl.h" #include "config.h" @@ -64,13 +67,13 @@ const GOptionEntry entries[] = { { "uri", 'u', 0, G_OPTION_ARG_STRING, &uzbl.state.uri, - "Uri to load at startup (equivalent to 'set uri = URI')", "URI" }, + "Uri to load at startup (equivalent to 'uzbl ' or 'set uri = URI' after uzbl has launched)", "URI" }, { "verbose", 'v', 0, G_OPTION_ARG_NONE, &uzbl.state.verbose, "Whether to print all messages or just errors.", NULL }, { "name", 'n', 0, G_OPTION_ARG_STRING, &uzbl.state.instance_name, "Name of the current instance (defaults to Xorg window id)", "NAME" }, { "config", 'c', 0, G_OPTION_ARG_STRING, &uzbl.state.config_file, - "Config file (this is pretty much equivalent to uzbl < FILE )", "FILE" }, + "Path to config file or '-' for stdin", "FILE" }, { "socket", 's', 0, G_OPTION_ARG_INT, &uzbl.state.socket_id, "Socket ID", "SOCKET" }, { "geometry", 'g', 0, G_OPTION_ARG_STRING, &uzbl.gui.geometry, @@ -109,81 +112,87 @@ const struct var_name_to_ptr_t { const char *name; uzbl_cmdprop cp; } var_name_to_ptr[] = { -/* variable name pointer to variable in code dump callback function */ +/* variable name pointer to variable in code dump callback function */ /* ---------------------------------------------------------------------------------------------- */ - { "uri", PTR_V_STR(uzbl.state.uri, 1, cmd_load_uri)}, - { "verbose", PTR_V_INT(uzbl.state.verbose, 1, NULL)}, - { "mode", PTR_V_INT(uzbl.behave.mode, 0, NULL)}, - { "inject_html", PTR_V_STR(uzbl.behave.inject_html, 0, cmd_inject_html)}, - { "base_url", PTR_V_STR(uzbl.behave.base_url, 1, NULL)}, - { "html_endmarker", PTR_V_STR(uzbl.behave.html_endmarker, 1, NULL)}, - { "html_mode_timeout", PTR_V_INT(uzbl.behave.html_timeout, 1, NULL)}, - { "keycmd", PTR_V_STR(uzbl.state.keycmd, 1, set_keycmd)}, - { "status_message", PTR_V_STR(uzbl.gui.sbar.msg, 1, update_title)}, - { "show_status", PTR_V_INT(uzbl.behave.show_status, 1, cmd_set_status)}, - { "status_top", PTR_V_INT(uzbl.behave.status_top, 1, move_statusbar)}, - { "status_format", PTR_V_STR(uzbl.behave.status_format, 1, update_title)}, - { "status_pbar_done", PTR_V_STR(uzbl.gui.sbar.progress_s, 1, update_title)}, - { "status_pbar_pending", PTR_V_STR(uzbl.gui.sbar.progress_u, 1, update_title)}, - { "status_pbar_width", PTR_V_INT(uzbl.gui.sbar.progress_w, 1, update_title)}, - { "status_background", PTR_V_STR(uzbl.behave.status_background, 1, update_title)}, - { "insert_indicator", PTR_V_STR(uzbl.behave.insert_indicator, 1, update_indicator)}, - { "command_indicator", PTR_V_STR(uzbl.behave.cmd_indicator, 1, update_indicator)}, - { "title_format_long", PTR_V_STR(uzbl.behave.title_format_long, 1, update_title)}, - { "title_format_short", PTR_V_STR(uzbl.behave.title_format_short, 1, update_title)}, - { "icon", PTR_V_STR(uzbl.gui.icon, 1, set_icon)}, - { "insert_mode", PTR_V_INT(uzbl.behave.insert_mode, 1, set_mode_indicator)}, - { "always_insert_mode", PTR_V_INT(uzbl.behave.always_insert_mode, 1, cmd_always_insert_mode)}, - { "reset_command_mode", PTR_V_INT(uzbl.behave.reset_command_mode, 1, NULL)}, - { "modkey", PTR_V_STR(uzbl.behave.modkey, 1, cmd_modkey)}, - { "load_finish_handler", PTR_V_STR(uzbl.behave.load_finish_handler, 1, NULL)}, - { "load_start_handler", PTR_V_STR(uzbl.behave.load_start_handler, 1, NULL)}, - { "load_commit_handler", PTR_V_STR(uzbl.behave.load_commit_handler, 1, NULL)}, - { "history_handler", PTR_V_STR(uzbl.behave.history_handler, 1, NULL)}, - { "download_handler", PTR_V_STR(uzbl.behave.download_handler, 1, NULL)}, - { "cookie_handler", PTR_V_STR(uzbl.behave.cookie_handler, 1, cmd_cookie_handler)}, - { "new_window", PTR_V_STR(uzbl.behave.new_window, 1, cmd_new_window)}, - { "fifo_dir", PTR_V_STR(uzbl.behave.fifo_dir, 1, cmd_fifo_dir)}, - { "socket_dir", PTR_V_STR(uzbl.behave.socket_dir, 1, cmd_socket_dir)}, - { "http_debug", PTR_V_INT(uzbl.behave.http_debug, 1, cmd_http_debug)}, - { "shell_cmd", PTR_V_STR(uzbl.behave.shell_cmd, 1, NULL)}, - { "proxy_url", PTR_V_STR(uzbl.net.proxy_url, 1, set_proxy_url)}, - { "max_conns", PTR_V_INT(uzbl.net.max_conns, 1, cmd_max_conns)}, - { "max_conns_host", PTR_V_INT(uzbl.net.max_conns_host, 1, cmd_max_conns_host)}, - { "useragent", PTR_V_STR(uzbl.net.useragent, 1, cmd_useragent)}, + { "uri", PTR_V_STR(uzbl.state.uri, 1, cmd_load_uri)}, + { "verbose", PTR_V_INT(uzbl.state.verbose, 1, NULL)}, + { "mode", PTR_V_INT(uzbl.behave.mode, 0, NULL)}, + { "inject_html", PTR_V_STR(uzbl.behave.inject_html, 0, cmd_inject_html)}, + { "base_url", PTR_V_STR(uzbl.behave.base_url, 1, NULL)}, + { "html_endmarker", PTR_V_STR(uzbl.behave.html_endmarker, 1, NULL)}, + { "html_mode_timeout", PTR_V_INT(uzbl.behave.html_timeout, 1, NULL)}, + { "keycmd", PTR_V_STR(uzbl.state.keycmd, 1, set_keycmd)}, + { "status_message", PTR_V_STR(uzbl.gui.sbar.msg, 1, update_title)}, + { "show_status", PTR_V_INT(uzbl.behave.show_status, 1, cmd_set_status)}, + { "status_top", PTR_V_INT(uzbl.behave.status_top, 1, move_statusbar)}, + { "status_format", PTR_V_STR(uzbl.behave.status_format, 1, update_title)}, + { "status_pbar_done", PTR_V_STR(uzbl.gui.sbar.progress_s, 1, update_title)}, + { "status_pbar_pending", PTR_V_STR(uzbl.gui.sbar.progress_u, 1, update_title)}, + { "status_pbar_width", PTR_V_INT(uzbl.gui.sbar.progress_w, 1, update_title)}, + { "status_background", PTR_V_STR(uzbl.behave.status_background, 1, update_title)}, + { "insert_indicator", PTR_V_STR(uzbl.behave.insert_indicator, 1, update_indicator)}, + { "command_indicator", PTR_V_STR(uzbl.behave.cmd_indicator, 1, update_indicator)}, + { "title_format_long", PTR_V_STR(uzbl.behave.title_format_long, 1, update_title)}, + { "title_format_short", PTR_V_STR(uzbl.behave.title_format_short, 1, update_title)}, + { "icon", PTR_V_STR(uzbl.gui.icon, 1, set_icon)}, + { "insert_mode", PTR_V_INT(uzbl.behave.insert_mode, 1, set_mode_indicator)}, + { "always_insert_mode", PTR_V_INT(uzbl.behave.always_insert_mode, 1, cmd_always_insert_mode)}, + { "reset_command_mode", PTR_V_INT(uzbl.behave.reset_command_mode, 1, NULL)}, + { "modkey", PTR_V_STR(uzbl.behave.modkey, 1, cmd_modkey)}, + { "load_finish_handler", PTR_V_STR(uzbl.behave.load_finish_handler, 1, NULL)}, + { "load_start_handler", PTR_V_STR(uzbl.behave.load_start_handler, 1, NULL)}, + { "load_commit_handler", PTR_V_STR(uzbl.behave.load_commit_handler, 1, NULL)}, + { "history_handler", PTR_V_STR(uzbl.behave.history_handler, 1, NULL)}, + { "download_handler", PTR_V_STR(uzbl.behave.download_handler, 1, NULL)}, + { "cookie_handler", PTR_V_STR(uzbl.behave.cookie_handler, 1, cmd_cookie_handler)}, + { "new_window", PTR_V_STR(uzbl.behave.new_window, 1, cmd_new_window)}, + { "fifo_dir", PTR_V_STR(uzbl.behave.fifo_dir, 1, cmd_fifo_dir)}, + { "socket_dir", PTR_V_STR(uzbl.behave.socket_dir, 1, cmd_socket_dir)}, + { "http_debug", PTR_V_INT(uzbl.behave.http_debug, 1, cmd_http_debug)}, + { "shell_cmd", PTR_V_STR(uzbl.behave.shell_cmd, 1, NULL)}, + { "proxy_url", PTR_V_STR(uzbl.net.proxy_url, 1, set_proxy_url)}, + { "max_conns", PTR_V_INT(uzbl.net.max_conns, 1, cmd_max_conns)}, + { "max_conns_host", PTR_V_INT(uzbl.net.max_conns_host, 1, cmd_max_conns_host)}, + { "useragent", PTR_V_STR(uzbl.net.useragent, 1, cmd_useragent)}, /* exported WebKitWebSettings properties */ - { "zoom_level", PTR_V_FLOAT(uzbl.behave.zoom_level, 1, cmd_zoom_level)}, - { "font_size", PTR_V_INT(uzbl.behave.font_size, 1, cmd_font_size)}, - { "monospace_size", PTR_V_INT(uzbl.behave.monospace_size, 1, cmd_font_size)}, - { "minimum_font_size", PTR_V_INT(uzbl.behave.minimum_font_size, 1, cmd_minimum_font_size)}, - { "disable_plugins", PTR_V_INT(uzbl.behave.disable_plugins, 1, cmd_disable_plugins)}, - { "disable_scripts", PTR_V_INT(uzbl.behave.disable_scripts, 1, cmd_disable_scripts)}, - { "autoload_images", PTR_V_INT(uzbl.behave.autoload_img, 1, cmd_autoload_img)}, - { "autoshrink_images", PTR_V_INT(uzbl.behave.autoshrink_img, 1, cmd_autoshrink_img)}, - { "enable_spellcheck", PTR_V_INT(uzbl.behave.enable_spellcheck, 1, cmd_enable_spellcheck)}, - { "enable_private", PTR_V_INT(uzbl.behave.enable_private, 1, cmd_enable_private)}, - { "print_backgrounds", PTR_V_INT(uzbl.behave.print_bg, 1, cmd_print_bg)}, - { "stylesheet_uri", PTR_V_STR(uzbl.behave.style_uri, 1, cmd_style_uri)}, - { "resizable_text_areas",PTR_V_INT(uzbl.behave.resizable_txt, 1, cmd_resizable_txt)}, - { "default_encoding", PTR_V_STR(uzbl.behave.default_encoding, 1, cmd_default_encoding)}, - { "enforce_96_dpi", PTR_V_INT(uzbl.behave.enforce_96dpi, 1, cmd_enforce_96dpi)}, - { "caret_browsing", PTR_V_INT(uzbl.behave.caret_browsing, 1, cmd_caret_browsing)}, + { "zoom_level", PTR_V_FLOAT(uzbl.behave.zoom_level, 1, cmd_zoom_level)}, + { "font_size", PTR_V_INT(uzbl.behave.font_size, 1, cmd_font_size)}, + { "default_font_family", PTR_V_STR(uzbl.behave.default_font_family, 1, cmd_default_font_family)}, + { "monospace_font_family", PTR_V_STR(uzbl.behave.monospace_font_family, 1, cmd_monospace_font_family)}, + { "cursive_font_family", PTR_V_STR(uzbl.behave.cursive_font_family, 1, cmd_cursive_font_family)}, + { "sans_serif_font_family", PTR_V_STR(uzbl.behave.sans_serif_font_family, 1, cmd_sans_serif_font_family)}, + { "serif_font_family", PTR_V_STR(uzbl.behave.serif_font_family, 1, cmd_serif_font_family)}, + { "fantasy_font_family", PTR_V_STR(uzbl.behave.fantasy_font_family, 1, cmd_fantasy_font_family)}, + { "monospace_size", PTR_V_INT(uzbl.behave.monospace_size, 1, cmd_font_size)}, + { "minimum_font_size", PTR_V_INT(uzbl.behave.minimum_font_size, 1, cmd_minimum_font_size)}, + { "disable_plugins", PTR_V_INT(uzbl.behave.disable_plugins, 1, cmd_disable_plugins)}, + { "disable_scripts", PTR_V_INT(uzbl.behave.disable_scripts, 1, cmd_disable_scripts)}, + { "autoload_images", PTR_V_INT(uzbl.behave.autoload_img, 1, cmd_autoload_img)}, + { "autoshrink_images", PTR_V_INT(uzbl.behave.autoshrink_img, 1, cmd_autoshrink_img)}, + { "enable_spellcheck", PTR_V_INT(uzbl.behave.enable_spellcheck, 1, cmd_enable_spellcheck)}, + { "enable_private", PTR_V_INT(uzbl.behave.enable_private, 1, cmd_enable_private)}, + { "print_backgrounds", PTR_V_INT(uzbl.behave.print_bg, 1, cmd_print_bg)}, + { "stylesheet_uri", PTR_V_STR(uzbl.behave.style_uri, 1, cmd_style_uri)}, + { "resizable_text_areas", PTR_V_INT(uzbl.behave.resizable_txt, 1, cmd_resizable_txt)}, + { "default_encoding", PTR_V_STR(uzbl.behave.default_encoding, 1, cmd_default_encoding)}, + { "enforce_96_dpi", PTR_V_INT(uzbl.behave.enforce_96dpi, 1, cmd_enforce_96dpi)}, + { "caret_browsing", PTR_V_INT(uzbl.behave.caret_browsing, 1, cmd_caret_browsing)}, /* constants (not dumpable or writeable) */ - { "WEBKIT_MAJOR", PTR_C_INT(uzbl.info.webkit_major, NULL)}, - { "WEBKIT_MINOR", PTR_C_INT(uzbl.info.webkit_minor, NULL)}, - { "WEBKIT_MICRO", PTR_C_INT(uzbl.info.webkit_micro, NULL)}, - { "ARCH_UZBL", PTR_C_STR(uzbl.info.arch, NULL)}, - { "COMMIT", PTR_C_STR(uzbl.info.commit, NULL)}, - { "LOAD_PROGRESS", PTR_C_INT(uzbl.gui.sbar.load_progress, NULL)}, - { "LOAD_PROGRESSBAR", PTR_C_STR(uzbl.gui.sbar.progress_bar, NULL)}, - { "TITLE", PTR_C_STR(uzbl.gui.main_title, NULL)}, - { "SELECTED_URI", PTR_C_STR(uzbl.state.selected_url, NULL)}, - { "MODE", PTR_C_STR(uzbl.gui.sbar.mode_indicator, NULL)}, - { "NAME", PTR_C_STR(uzbl.state.instance_name, NULL)}, - - { NULL, {.ptr.s = NULL, .type = TYPE_INT, .dump = 0, .writeable = 0, .func = NULL}} + { "WEBKIT_MAJOR", PTR_C_INT(uzbl.info.webkit_major, NULL)}, + { "WEBKIT_MINOR", PTR_C_INT(uzbl.info.webkit_minor, NULL)}, + { "WEBKIT_MICRO", PTR_C_INT(uzbl.info.webkit_micro, NULL)}, + { "ARCH_UZBL", PTR_C_STR(uzbl.info.arch, NULL)}, + { "COMMIT", PTR_C_STR(uzbl.info.commit, NULL)}, + { "LOAD_PROGRESS", PTR_C_INT(uzbl.gui.sbar.load_progress, NULL)}, + { "LOAD_PROGRESSBAR", PTR_C_STR(uzbl.gui.sbar.progress_bar, NULL)}, + { "TITLE", PTR_C_STR(uzbl.gui.main_title, NULL)}, + { "SELECTED_URI", PTR_C_STR(uzbl.state.selected_url, NULL)}, + { "MODE", PTR_C_STR(uzbl.gui.sbar.mode_indicator, NULL)}, + { "NAME", PTR_C_STR(uzbl.state.instance_name, NULL)}, + + { NULL, {.ptr.s = NULL, .type = TYPE_INT, .dump = 0, .writeable = 0, .func = NULL}} }; @@ -811,6 +820,7 @@ struct {const char *key; CommandInfo value;} cmdlist[] = { "sync_spawn", {spawn_sync, 0} }, // needed for cookie handler { "sh", {spawn_sh, 0} }, { "sync_sh", {spawn_sh_sync, 0} }, // needed for cookie handler + { "talk_to_socket", {talk_to_socket, 0} }, { "exit", {close_uzbl, 0} }, { "search", {search_forward_text, TRUE} }, { "search_reverse", {search_reverse_text, TRUE} }, @@ -1397,6 +1407,118 @@ spawn_sh_sync(WebKitWebView *web_view, GArray *argv, GString *result) { } void +talk_to_socket(WebKitWebView *web_view, GArray *argv, GString *result) { + (void)web_view; (void)result; + + int fd, len; + struct sockaddr_un sa; + char* sockpath; + ssize_t ret; + struct pollfd pfd; + struct iovec* iov; + guint i; + + if(uzbl.comm.sync_stdout) uzbl.comm.sync_stdout = strfree(uzbl.comm.sync_stdout); + + /* This function could be optimised by storing a hash table of socket paths + and associated connected file descriptors rather than closing and + re-opening for every call. Also we could launch a script if socket connect + fails. */ + + /* First element argv[0] is path to socket. Following elements are tokens to + write to the socket. We write them as a single packet with each token + separated by an ASCII nul (\0). */ + if(argv->len < 2) { + g_printerr("talk_to_socket called with only %d args (need at least two).\n", + (int)argv->len); + return; + } + + /* copy socket path, null terminate result */ + sockpath = g_array_index(argv, char*, 0); + g_strlcpy(sa.sun_path, sockpath, sizeof(sa.sun_path)); + sa.sun_family = AF_UNIX; + + /* create socket file descriptor and connect it to path */ + fd = socket(AF_UNIX, SOCK_SEQPACKET, 0); + if(fd == -1) { + g_printerr("talk_to_socket: creating socket failed (%s)\n", strerror(errno)); + return; + } + if(connect(fd, (struct sockaddr*)&sa, sizeof(sa))) { + g_printerr("talk_to_socket: connect failed (%s)\n", strerror(errno)); + close(fd); + return; + } + + /* build request vector */ + iov = g_malloc(sizeof(struct iovec) * (argv->len - 1)); + if(!iov) { + g_printerr("talk_to_socket: unable to allocated memory for token vector\n"); + close(fd); + return; + } + for(i = 1; i < argv->len; ++i) { + iov[i - 1].iov_base = g_array_index(argv, char*, i); + iov[i - 1].iov_len = strlen(iov[i - 1].iov_base) + 1; /* string plus \0 */ + } + + /* write request */ + ret = writev(fd, iov, argv->len - 1); + g_free(iov); + if(ret == -1) { + g_printerr("talk_to_socket: write failed (%s)\n", strerror(errno)); + close(fd); + return; + } + + /* wait for a response, with a 500ms timeout */ + pfd.fd = fd; + pfd.events = POLLIN; + while(1) { + ret = poll(&pfd, 1, 500); + if(ret == 1) break; + if(ret == 0) errno = ETIMEDOUT; + if(errno == EINTR) continue; + g_printerr("talk_to_socket: poll failed while waiting for input (%s)\n", + strerror(errno)); + close(fd); + return; + } + + /* get length of response */ + if(ioctl(fd, FIONREAD, &len) == -1) { + g_printerr("talk_to_socket: cannot find daemon response length, " + "ioctl failed (%s)\n", strerror(errno)); + close(fd); + return; + } + + /* if there is a response, read it */ + if(len) { + uzbl.comm.sync_stdout = g_malloc(len + 1); + if(!uzbl.comm.sync_stdout) { + g_printerr("talk_to_socket: failed to allocate %d bytes\n", len); + close(fd); + return; + } + uzbl.comm.sync_stdout[len] = 0; /* ensure result is null terminated */ + + ret = read(fd, uzbl.comm.sync_stdout, len); + if(ret == -1) { + g_printerr("talk_to_socket: failed to read from socket (%s)\n", + strerror(errno)); + close(fd); + return; + } + } + + /* clean up */ + close(fd); + return; +} + +void parse_command(const char *cmd, const char *param, GString *result) { CommandInfo *c; @@ -1518,6 +1640,42 @@ cmd_font_size() { } void +cmd_default_font_family() { + g_object_set (G_OBJECT(view_settings()), "default-font-family", + uzbl.behave.default_font_family, NULL); +} + +void +cmd_monospace_font_family() { + g_object_set (G_OBJECT(view_settings()), "monospace-font-family", + uzbl.behave.monospace_font_family, NULL); +} + +void +cmd_sans_serif_font_family() { + g_object_set (G_OBJECT(view_settings()), "sans_serif-font-family", + uzbl.behave.sans_serif_font_family, NULL); +} + +void +cmd_serif_font_family() { + g_object_set (G_OBJECT(view_settings()), "serif-font-family", + uzbl.behave.serif_font_family, NULL); +} + +void +cmd_cursive_font_family() { + g_object_set (G_OBJECT(view_settings()), "cursive-font-family", + uzbl.behave.cursive_font_family, NULL); +} + +void +cmd_fantasy_font_family() { + g_object_set (G_OBJECT(view_settings()), "fantasy-font-family", + uzbl.behave.fantasy_font_family, NULL); +} + +void cmd_zoom_level() { webkit_web_view_set_zoom_level (uzbl.gui.web_view, uzbl.behave.zoom_level); } @@ -2168,16 +2326,11 @@ exec_paramcmd(const Action *act, const guint i) { } -GtkWidget* +void create_browser () { GUI *g = &uzbl.gui; - GtkWidget* scrolled_window = gtk_scrolled_window_new (NULL, NULL); - //main_window_ref = g_object_ref(scrolled_window); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_NEVER, GTK_POLICY_NEVER); //todo: some sort of display of position/total length. like what emacs does - g->web_view = WEBKIT_WEB_VIEW (webkit_web_view_new ()); - gtk_container_add (GTK_CONTAINER (scrolled_window), GTK_WIDGET (g->web_view)); g_signal_connect (G_OBJECT (g->web_view), "notify::title", G_CALLBACK (title_change_cb), NULL); g_signal_connect (G_OBJECT (g->web_view), "load-progress-changed", G_CALLBACK (progress_change_cb), g->web_view); @@ -2190,8 +2343,6 @@ create_browser () { g_signal_connect (G_OBJECT (g->web_view), "download-requested", G_CALLBACK (download_cb), g->web_view); g_signal_connect (G_OBJECT (g->web_view), "create-web-view", G_CALLBACK (create_web_view_cb), g->web_view); g_signal_connect (G_OBJECT (g->web_view), "mime-type-policy-decision-requested", G_CALLBACK (mime_policy_cb), g->web_view); - - return scrolled_window; } GtkWidget* @@ -2258,7 +2409,8 @@ inject_handler_args(const gchar *actname, const gchar *origargs, const gchar *ne if ((g_strcmp0(actname, "spawn") == 0) || (g_strcmp0(actname, "sh") == 0) || (g_strcmp0(actname, "sync_spawn") == 0) || - (g_strcmp0(actname, "sync_sh") == 0)) { + (g_strcmp0(actname, "sync_sh") == 0) || + (g_strcmp0(actname, "talk_to_socket") == 0)) { guint i; GString *a = g_string_new(""); gchar **spawnparts = split_quoted(origargs, FALSE); @@ -2628,7 +2780,6 @@ retreive_geometry() { * external applications need to do anyhow */ void initialize(int argc, char *argv[]) { - gtk_init (&argc, &argv); if (!g_thread_supported ()) g_thread_init (NULL); uzbl.state.executable_path = g_strdup(argv[0]); @@ -2682,7 +2833,7 @@ initialize(int argc, char *argv[]) { commands_hash (); make_var_to_name_hash(); - uzbl.gui.scrolled_win = create_browser(); + create_browser(); } #ifndef UZBL_LIBRARY @@ -2691,6 +2842,16 @@ int main (int argc, char* argv[]) { initialize(argc, argv); + gtk_init (&argc, &argv); + + uzbl.gui.scrolled_win = gtk_scrolled_window_new (NULL, NULL); + //main_window_ref = g_object_ref(scrolled_window); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (uzbl.gui.scrolled_win), + GTK_POLICY_NEVER, GTK_POLICY_NEVER); //todo: some sort of display of position/total length. like what emacs does + + gtk_container_add (GTK_CONTAINER (uzbl.gui.scrolled_win), + GTK_WIDGET (uzbl.gui.web_view)); + uzbl.gui.vbox = gtk_vbox_new (FALSE, 0); create_mainbar(); diff --git a/uzbl.h b/uzbl.h index c7f295b..2eb28df 100644 --- a/uzbl.h +++ b/uzbl.h @@ -116,6 +116,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; @@ -338,6 +344,9 @@ 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); void @@ -394,7 +403,7 @@ exec_paramcmd(const Action* act, const guint i); void initialize (int argc, char *argv[]); -GtkWidget* +void create_browser (); GtkWidget* @@ -525,6 +534,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