From 1f9accc3dd70612f510f6613520261626490fa8e Mon Sep 17 00:00:00 2001 From: Tom Adams Date: Sat, 27 Jun 2009 15:31:35 +0100 Subject: Remove extraneous whitespace. --- uzbl.c | 104 ++++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 52 insertions(+), 52 deletions(-) (limited to 'uzbl.c') diff --git a/uzbl.c b/uzbl.c index ed9c4be..66adc16 100644 --- a/uzbl.c +++ b/uzbl.c @@ -62,18 +62,18 @@ static Uzbl uzbl; /* commandline arguments (set initial values for the state variables) */ -static const +static const GOptionEntry entries[] = { { "uri", 'u', 0, G_OPTION_ARG_STRING, &uzbl.state.uri, "Uri to load at startup (equivalent to 'set uri = URI')", "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", '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", 'c', 0, G_OPTION_ARG_STRING, &uzbl.state.config_file, "Config file (this is pretty much equivalent to uzbl < FILE )", "FILE" }, - { "socket", 's', 0, G_OPTION_ARG_INT, &uzbl.state.socket_id, + { "socket", 's', 0, G_OPTION_ARG_INT, &uzbl.state.socket_id, "Socket ID", "SOCKET" }, { NULL, 0, 0, 0, NULL, NULL, NULL } }; @@ -208,7 +208,7 @@ get_exp_type(gchar *s) { return EXP_ERR; } -/* +/* * recurse == 1: don't expand '@(command)@' * recurse == 2: don't expand '@@' */ @@ -264,7 +264,7 @@ expand(char *s, guint recurse) { ret[vend-s] = '\0'; } break; - case EXP_JS: + case EXP_JS: s++; strcpy(str_end, ">@"); str_end[2] = '\0'; @@ -276,7 +276,7 @@ expand(char *s, guint recurse) { break; } - if(etype == EXP_SIMPLE_VAR || + if(etype == EXP_SIMPLE_VAR || etype == EXP_BRACED_VAR) { if( (c = g_hash_table_lookup(uzbl.comm.proto_var, ret)) ) { if(c->type == TYPE_STR) @@ -292,7 +292,7 @@ expand(char *s, guint recurse) { else s = vend+1; } - else if(recurse != 1 && + else if(recurse != 1 && etype == EXP_EXPR) { mycmd = expand(ret, 1); g_spawn_command_line_sync(mycmd, &cmd_stdout, NULL, NULL, &err); @@ -308,7 +308,7 @@ expand(char *s, guint recurse) { } s = vend+2; } - else if(recurse != 2 && + else if(recurse != 2 && etype == EXP_JS) { mycmd = expand(ret, 2); eval_js(uzbl.gui.web_view, mycmd, js_ret); @@ -366,9 +366,9 @@ read_file_by_line (gchar *path) { gsize len; GArray *lines = g_array_new(TRUE, FALSE, sizeof(gchar*)); int i = 0; - + chan = g_io_channel_new_file(path, "r", NULL); - + if (chan) { while (g_io_channel_read_line(chan, &readbuf, &len, NULL, NULL) == G_IO_STATUS_NORMAL) { const gchar* val = g_strdup (readbuf); @@ -376,12 +376,12 @@ read_file_by_line (gchar *path) { g_free (readbuf); i ++; } - + g_io_channel_unref (chan); } else { fprintf(stderr, "File '%s' not be read.\n", path); } - + return lines; } @@ -390,7 +390,7 @@ gchar* parseenv (char* string) { extern char** environ; gchar* tmpstr = NULL; int i = 0; - + while (environ[i] != NULL) { gchar** env = g_strsplit (environ[i], "=", 2); @@ -438,7 +438,7 @@ clean_up(void) { g_hash_table_destroy(uzbl.behave.commands); } -/* used for html_mode_timeout +/* used for html_mode_timeout * be sure to extend this function to use * more timers if needed in other places */ @@ -882,7 +882,7 @@ js_run_command (JSContextRef ctx, JSObjectRef function, JSObjectRef thisObject, (void) function; (void) thisObject; (void) exception; - + JSStringRef js_result_string; GString *result = g_string_new(""); @@ -920,7 +920,7 @@ js_init() { } -static void +static void eval_js(WebKitWebView * web_view, gchar *script, GString *result) { WebKitWebFrame *frame; JSGlobalContextRef context; @@ -931,20 +931,20 @@ eval_js(WebKitWebView * web_view, gchar *script, GString *result) { JSValueRef js_result; JSStringRef js_result_string; size_t js_result_size; - + js_init(); frame = webkit_web_view_get_main_frame(WEBKIT_WEB_VIEW(web_view)); context = webkit_web_frame_get_global_context(frame); globalobject = JSContextGetGlobalObject(context); - + /* uzbl javascript namespace */ var_name = JSStringCreateWithUTF8CString("Uzbl"); JSObjectSetProperty(context, globalobject, var_name, - JSObjectMake(context, uzbl.js.classref, NULL), + JSObjectMake(context, uzbl.js.classref, NULL), kJSClassAttributeNone, NULL); - - /* evaluate the script and get return value*/ + + /* evaluate the script and get return value*/ js_script = JSStringCreateWithUTF8CString(script); js_result = JSEvaluateScript(context, js_script, globalobject, NULL, 0, NULL); if (js_result && !JSValueIsUndefined(context, js_result)) { @@ -993,7 +993,7 @@ run_external_js (WebKitWebView * web_view, GArray *argv, GString *result) { i ++; g_free (line); } - + if (uzbl.state.verbose) printf ("External JavaScript file %s loaded\n", argv_idx(argv, 0)); @@ -1017,7 +1017,7 @@ search_text (WebKitWebView *page, GArray *argv, const gboolean forward) { uzbl.state.searchtx = g_strdup(argv_idx(argv, 0)); } } - + if (uzbl.state.searchtx) { if (uzbl.state.verbose) printf ("Searching: %s\n", uzbl.state.searchtx); @@ -1069,7 +1069,7 @@ chain (WebKitWebView *page, GArray *argv, GString *result) { (void) page; (void) result; gchar *a = NULL; gchar **parts = NULL; - guint i = 0; + guint i = 0; while ((a = argv_idx(argv, i++))) { parts = g_strsplit (a, " ", 2); parse_command(parts[0], parts[1], result); @@ -1352,7 +1352,7 @@ run_command (const gchar *command, const guint npre, const gchar **args, const gboolean sync, char **output_stdout) { //command [args] GError *err = NULL; - + GArray *a = g_array_new (TRUE, FALSE, sizeof(gchar*)); gchar *pid = itos(getpid()); gchar *xwin = itos(uzbl.xwin); @@ -1370,11 +1370,11 @@ run_command (const gchar *command, const guint npre, const gchar **args, for (i = npre; i < g_strv_length((gchar**)args); i++) sharg_append(a, args[i]); - + gboolean result; if (sync) { if (*output_stdout) *output_stdout = strfree(*output_stdout); - + result = g_spawn_sync(NULL, (gchar **)a->data, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, output_stdout, NULL, NULL, &err); } else result = g_spawn_async(NULL, (gchar **)a->data, NULL, G_SPAWN_SEARCH_PATH, @@ -1409,7 +1409,7 @@ split_quoted(const gchar* src, const gboolean unquote) { /* split on unquoted space, return array of strings; remove a layer of quotes and backslashes if unquote */ if (!src) return NULL; - + gboolean dq = FALSE; gboolean sq = FALSE; GArray *a = g_array_new (TRUE, FALSE, sizeof(gchar*)); @@ -1452,7 +1452,7 @@ spawn(WebKitWebView *web_view, GArray *argv, GString *result) { static void spawn_sync(WebKitWebView *web_view, GArray *argv, GString *result) { (void)web_view; (void)result; - + if (argv_idx(argv, 0)) run_command(argv_idx(argv, 0), 0, ((const gchar **) (argv->data + sizeof(gchar*))), TRUE, &uzbl.comm.sync_stdout); @@ -1465,7 +1465,7 @@ spawn_sh(WebKitWebView *web_view, GArray *argv, GString *result) { g_printerr ("spawn_sh: shell_cmd is not set!\n"); return; } - + guint i; gchar *spacer = g_strdup(""); g_array_insert_val(argv, 1, spacer); @@ -1486,7 +1486,7 @@ spawn_sh_sync(WebKitWebView *web_view, GArray *argv, GString *result) { g_printerr ("spawn_sh_sync: shell_cmd is not set!\n"); return; } - + guint i; gchar *spacer = g_strdup(""); g_array_insert_val(argv, 1, spacer); @@ -1494,7 +1494,7 @@ spawn_sh_sync(WebKitWebView *web_view, GArray *argv, GString *result) { for (i = 1; i < g_strv_length(cmd); i++) g_array_prepend_val(argv, cmd[i]); - + if (cmd) run_command(cmd[0], g_strv_length(cmd) + 1, (const gchar **) argv->data, TRUE, &uzbl.comm.sync_stdout); g_free (spacer); @@ -1573,7 +1573,7 @@ cmd_load_uri() { g_array_free (a, TRUE); } -static void +static void cmd_always_insert_mode() { uzbl.behave.insert_mode = uzbl.behave.always_insert_mode ? TRUE : FALSE; @@ -1615,7 +1615,7 @@ cmd_font_size() { if (uzbl.behave.font_size > 0) { g_object_set (G_OBJECT(ws), "default-font-size", uzbl.behave.font_size, NULL); } - + if (uzbl.behave.monospace_size > 0) { g_object_set (G_OBJECT(ws), "default-monospace-font-size", uzbl.behave.monospace_size, NULL); @@ -1632,7 +1632,7 @@ cmd_zoom_level() { static void cmd_disable_plugins() { - g_object_set (G_OBJECT(view_settings()), "enable-plugins", + g_object_set (G_OBJECT(view_settings()), "enable-plugins", !uzbl.behave.disable_plugins, NULL); } @@ -1679,31 +1679,31 @@ cmd_print_bg() { uzbl.behave.print_bg, NULL); } -static void +static void cmd_style_uri() { g_object_set (G_OBJECT(view_settings()), "user-stylesheet-uri", uzbl.behave.style_uri, NULL); } -static void +static void cmd_resizable_txt() { g_object_set (G_OBJECT(view_settings()), "resizable-text-areas", uzbl.behave.resizable_txt, NULL); } -static void +static void cmd_default_encoding() { g_object_set (G_OBJECT(view_settings()), "default-encoding", uzbl.behave.default_encoding, NULL); } -static void +static void cmd_enforce_96dpi() { g_object_set (G_OBJECT(view_settings()), "enforce-96-dpi", uzbl.behave.enforce_96dpi, NULL); } -static void +static void cmd_caret_browsing() { g_object_set (G_OBJECT(view_settings()), "enable-caret-browsing", uzbl.behave.caret_browsing, NULL); @@ -1748,7 +1748,7 @@ cmd_modkey() { buf = g_utf8_strup(uzbl.behave.modkey, -1); uzbl.behave.modmask = 0; - if(uzbl.behave.modkey) + if(uzbl.behave.modkey) g_free(uzbl.behave.modkey); uzbl.behave.modkey = buf; @@ -2006,7 +2006,7 @@ control_socket(GIOChannel *chan) { clientsock = accept (g_io_channel_unix_get_fd(chan), (struct sockaddr *) &remote, &t); - + if ((clientchan = g_io_channel_unix_new(clientsock))) { g_io_add_watch(clientchan, G_IO_IN|G_IO_HUP, (GIOFunc) control_client_socket, clientchan); @@ -2225,7 +2225,7 @@ run_keycmd(const gboolean key_ret) { else exec_paramcmd(act, i); /* otherwise execute the incremental */ break; } - + g_string_truncate(short_keys, short_keys->len - 1); } g_string_free (short_keys, TRUE); @@ -2378,7 +2378,7 @@ run_handler (const gchar *act, const gchar *args) { if (g_strcmp0(parts[0], "chain") == 0) { GString *newargs = g_string_new(""); gchar **chainparts = split_quoted(parts[1], FALSE); - + /* for every argument in the chain, inject the handler args and make sure the new parts are wrapped in quotes */ gchar **cp = chainparts; @@ -2386,7 +2386,7 @@ run_handler (const gchar *act, const gchar *args) { gchar *quotless = NULL; gchar **spliced_quotless = NULL; // sigh -_-; gchar **inpart = NULL; - + while (*cp) { if ((**cp == '\'') || (**cp == '\"')) { /* strip old quotes */ quot = **cp; @@ -2396,7 +2396,7 @@ run_handler (const gchar *act, const gchar *args) { spliced_quotless = g_strsplit(quotless, " ", 2); inpart = inject_handler_args(spliced_quotless[0], spliced_quotless[1], args); g_strfreev(spliced_quotless); - + g_string_append_printf(newargs, " %c%s %s%c", quot, inpart[0], inpart[1], quot); g_free(quotless); g_strfreev(inpart); @@ -2406,7 +2406,7 @@ run_handler (const gchar *act, const gchar *args) { parse_command(parts[0], &(newargs->str[1]), NULL); g_string_free(newargs, TRUE); g_strfreev(chainparts); - + } else { gchar **inparts = inject_handler_args(parts[0], parts[1], args); parse_command(inparts[0], inparts[1], NULL); @@ -2478,7 +2478,7 @@ find_xdg_file (int xdg_type, char* filename) { temporary_file = g_strconcat (temporary_string, filename, NULL); } } - + //g_free (temporary_string); - segfaults. if (file_exists (temporary_file)) { @@ -2543,7 +2543,7 @@ static void handle_cookies (SoupSession *session, SoupMessage *msg, gpointer use } if (uzbl.comm.sync_stdout) uzbl.comm.sync_stdout = strfree(uzbl.comm.sync_stdout); - + g_string_free(s, TRUE); } @@ -2700,7 +2700,7 @@ main (int argc, char* argv[]) { g_option_context_add_group (context, gtk_get_option_group (TRUE)); g_option_context_parse (context, &argc, &argv, NULL); g_option_context_free(context); - + gchar *uri_override = (uzbl.state.uri ? g_strdup(uzbl.state.uri) : NULL); gboolean verbose_override = uzbl.state.verbose; @@ -2789,7 +2789,7 @@ main (int argc, char* argv[]) { if (verbose_override > uzbl.state.verbose) uzbl.state.verbose = verbose_override; - + if (uri_override) { set_var_value("uri", uri_override); g_free(uri_override); -- cgit v1.2.3 From 6c98bc2ca042e0fbe6883fce849a4a6afa7c0f8f Mon Sep 17 00:00:00 2001 From: Tom Adams Date: Sat, 11 Jul 2009 11:31:02 +0100 Subject: Set the background on the vbox, not the main_window. --- uzbl.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'uzbl.c') diff --git a/uzbl.c b/uzbl.c index 66adc16..f6dc7b8 100644 --- a/uzbl.c +++ b/uzbl.c @@ -2120,11 +2120,11 @@ update_title (void) { if (b->status_background) { GdkColor color; gdk_color_parse (b->status_background, &color); - //labels and hboxes do not draw their own background. applying this on the window/vbox is ok as the statusbar is the only affected widget. (if not, we could also use GtkEventBox) - if (uzbl.gui.main_window) - gtk_widget_modify_bg (uzbl.gui.main_window, GTK_STATE_NORMAL, &color); - else if (uzbl.gui.plug) - gtk_widget_modify_bg ((GtkWidget * ) uzbl.gui.plug, GTK_STATE_NORMAL, &color); + //labels and hboxes do not draw their own background. applying this on the vbox is ok as the statusbar is the only affected widget. (if not, we could also use GtkEventBox) + if (uzbl.gui.main_window) + gtk_widget_modify_bg (uzbl.gui.main_window, GTK_STATE_NORMAL, &color); + else if (uzbl.gui.plug) + gtk_widget_modify_bg (GTK_WIDGET(uzbl.gui.plug), GTK_STATE_NORMAL, &color); } } else { if (b->title_format_long) { -- cgit v1.2.3 From abc86b54cf5ad69ae2a3484aa1352ca76e373f7f Mon Sep 17 00:00:00 2001 From: Tom Adams Date: Tue, 30 Jun 2009 06:23:51 +0100 Subject: Only open one new window when requested. --- uzbl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'uzbl.c') diff --git a/uzbl.c b/uzbl.c index f6dc7b8..ad0dc0e 100644 --- a/uzbl.c +++ b/uzbl.c @@ -488,8 +488,8 @@ new_window_cb (WebKitWebView *web_view, WebKitWebFrame *frame, WebKitNetworkRequ const gchar* uri = webkit_network_request_get_uri (request); if (uzbl.state.verbose) printf("New window requested -> %s \n", uri); - new_window_load_uri(uri); - return (FALSE); + webkit_web_policy_decision_use(policy_decision); + return TRUE; } static gboolean -- cgit v1.2.3 From a7eff065557599d8aa3e605be7d85d9316de2a96 Mon Sep 17 00:00:00 2001 From: Tom Adams Date: Sun, 5 Jul 2009 21:50:43 +0100 Subject: Don't g_free uzbl.gui.icon twice! --- uzbl.c | 1 - 1 file changed, 1 deletion(-) (limited to 'uzbl.c') diff --git a/uzbl.c b/uzbl.c index ad0dc0e..7cff70a 100644 --- a/uzbl.c +++ b/uzbl.c @@ -1562,7 +1562,6 @@ set_icon() { } else { g_printerr ("Icon \"%s\" not found. ignoring.\n", uzbl.gui.icon); } - g_free (uzbl.gui.icon); } static void -- cgit v1.2.3 From c3bbce42762ed8e4409ab2552e2efeee95518425 Mon Sep 17 00:00:00 2001 From: Tom Adams Date: Tue, 7 Jul 2009 11:50:45 +0100 Subject: Use first argument as URI if none provided with --uri. --- uzbl.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'uzbl.c') diff --git a/uzbl.c b/uzbl.c index 7cff70a..c82e7be 100644 --- a/uzbl.c +++ b/uzbl.c @@ -2701,6 +2701,8 @@ main (int argc, char* argv[]) { g_option_context_free(context); gchar *uri_override = (uzbl.state.uri ? g_strdup(uzbl.state.uri) : NULL); + if (argc > 1 && !uzbl.state.uri) + uri_override = g_strdup(argv[1]); gboolean verbose_override = uzbl.state.verbose; /* initialize hash table */ -- cgit v1.2.3 From 2e47a381f29a593286374ce8638914383e835993 Mon Sep 17 00:00:00 2001 From: Tom Adams Date: Wed, 8 Jul 2009 12:07:52 +0100 Subject: Add -V/--version option to print the commit and exit. --- uzbl.c | 7 +++++++ uzbl.h | 1 + 2 files changed, 8 insertions(+) (limited to 'uzbl.c') diff --git a/uzbl.c b/uzbl.c index c82e7be..a998b91 100644 --- a/uzbl.c +++ b/uzbl.c @@ -75,6 +75,8 @@ GOptionEntry entries[] = "Config file (this is pretty much equivalent to uzbl < FILE )", "FILE" }, { "socket", 's', 0, G_OPTION_ARG_INT, &uzbl.state.socket_id, "Socket ID", "SOCKET" }, + { "version", 'V', 0, G_OPTION_ARG_NONE, &uzbl.behave.print_version, + "Print the version and exit", NULL }, { NULL, 0, 0, 0, NULL, NULL, NULL } }; @@ -2700,6 +2702,11 @@ main (int argc, char* argv[]) { g_option_context_parse (context, &argc, &argv, NULL); g_option_context_free(context); + if (uzbl.behave.print_version) { + printf("Commit: %s\n", COMMIT); + exit(0); + } + gchar *uri_override = (uzbl.state.uri ? g_strdup(uzbl.state.uri) : NULL); if (argc > 1 && !uzbl.state.uri) uri_override = g_strdup(argv[1]); diff --git a/uzbl.h b/uzbl.h index eba060e..9a7ccd2 100644 --- a/uzbl.h +++ b/uzbl.h @@ -171,6 +171,7 @@ typedef struct { gchar* cmd_indicator; GString* html_buffer; guint html_timeout; + gboolean print_version; /* command list: name -> Command */ GHashTable* commands; -- cgit v1.2.3 From 14a53251bbedb94ff0d78321276d5b0de9504f9a Mon Sep 17 00:00:00 2001 From: Tom Adams Date: Sat, 11 Jul 2009 12:11:13 +0100 Subject: Added new_window handler. --- examples/config/uzbl/config | 4 ++++ uzbl.c | 20 ++++++++++++++++++++ uzbl.h | 4 ++++ 3 files changed, 28 insertions(+) (limited to 'uzbl.c') diff --git a/examples/config/uzbl/config b/examples/config/uzbl/config index a4a5f45..3c2b7bf 100644 --- a/examples/config/uzbl/config +++ b/examples/config/uzbl/config @@ -11,6 +11,10 @@ set history_handler = spawn $XDG_DATA_HOME/uzbl/scripts/history.sh set download_handler = spawn $XDG_DATA_HOME/uzbl/scripts/download.sh set cookie_handler = spawn $XDG_DATA_HOME/uzbl/scripts/cookies.py +# Control how new windows should open +#set new_window = sh 'uzbl -u $8' # equivalent to the default behaviour +#set new_window = sh 'echo uri "$8" > $4' # open in same window + # You can bind whatever things (spawn , script ,..) to some events TODO: make events system more generic set load_start_handler = set status_message = wait set load_commit_handler = set status_message = recv diff --git a/uzbl.c b/uzbl.c index a998b91..a5d78f5 100644 --- a/uzbl.c +++ b/uzbl.c @@ -129,6 +129,7 @@ const struct { { "history_handler", PTR(uzbl.behave.history_handler, STR, 1, NULL)}, { "download_handler", PTR(uzbl.behave.download_handler, STR, 1, NULL)}, { "cookie_handler", PTR(uzbl.behave.cookie_handler, STR, 1, cmd_cookie_handler)}, + { "new_window", PTR(uzbl.behave.new_window, STR, 1, cmd_new_window)}, { "fifo_dir", PTR(uzbl.behave.fifo_dir, STR, 1, cmd_fifo_dir)}, { "socket_dir", PTR(uzbl.behave.socket_dir, STR, 1, cmd_socket_dir)}, { "http_debug", PTR(uzbl.behave.http_debug, INT, 1, cmd_http_debug)}, @@ -1049,6 +1050,12 @@ dehilight (WebKitWebView *page, GArray *argv, GString *result) { static void new_window_load_uri (const gchar * uri) { + if (uzbl.behave.new_window) { + GString *s = g_string_new (""); + g_string_printf(s, "'%s'", uri); + run_handler(uzbl.behave.new_window, s->str); + return; + } GString* to_execute = g_string_new (""); g_string_append_printf (to_execute, "%s --uri '%s'", uzbl.state.executable_path, uri); int i; @@ -1723,6 +1730,19 @@ cmd_cookie_handler() { g_strfreev (split); } +static void +cmd_new_window() { + gchar **split = g_strsplit(uzbl.behave.new_window, " ", 2); + /* pitfall: doesn't handle chain actions; must the sync_ action manually */ + if ((g_strcmp0(split[0], "sh") == 0) || + (g_strcmp0(split[0], "spawn") == 0)) { + g_free (uzbl.behave.new_window); + uzbl.behave.new_window = + g_strdup_printf("%s %s", split[0], split[1]); + } + g_strfreev (split); +} + static void cmd_fifo_dir() { uzbl.behave.fifo_dir = init_fifo(uzbl.behave.fifo_dir); diff --git a/uzbl.h b/uzbl.h index 9a7ccd2..d67a84e 100644 --- a/uzbl.h +++ b/uzbl.h @@ -137,6 +137,7 @@ typedef struct { gchar* socket_dir; gchar* download_handler; gchar* cookie_handler; + gchar* new_window; gboolean always_insert_mode; gboolean show_status; gboolean insert_mode; @@ -493,6 +494,9 @@ set_icon(); static void cmd_cookie_handler(); +static void +cmd_new_window(); + static void move_statusbar(); -- cgit v1.2.3 From 8fe37c5e4751c120cbe908128bd1a457b00ba763 Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Sat, 11 Jul 2009 16:01:58 +0200 Subject: 2 small doc fixes --- README | 5 +++++ uzbl.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'uzbl.c') diff --git a/README b/README index e738a7e..6eaac42 100644 --- a/README +++ b/README @@ -303,10 +303,15 @@ Custom, userdefined scripts (`spawn foo bar`) get first the arguments as specifi -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) + -s, --socket=SOCKET Socket ID + -V, --version Print the version and exit --display=DISPLAY X display to use --help Help + + + ### BUGS known bugs: diff --git a/uzbl.c b/uzbl.c index a5d78f5..9e5c1a9 100644 --- a/uzbl.c +++ b/uzbl.c @@ -2141,7 +2141,7 @@ update_title (void) { if (b->status_background) { GdkColor color; gdk_color_parse (b->status_background, &color); - //labels and hboxes do not draw their own background. applying this on the vbox is ok as the statusbar is the only affected widget. (if not, we could also use GtkEventBox) + //labels and hboxes do not draw their own background. applying this on the vbox/main_window is ok as the statusbar is the only affected widget. (if not, we could also use GtkEventBox) if (uzbl.gui.main_window) gtk_widget_modify_bg (uzbl.gui.main_window, GTK_STATE_NORMAL, &color); else if (uzbl.gui.plug) -- cgit v1.2.3 From 0e985d44b7a2a86620c878915e480ec9ddb491bf Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Sat, 11 Jul 2009 16:18:29 +0200 Subject: document alternative way for uri setting --- README | 4 ++-- uzbl.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'uzbl.c') diff --git a/README b/README index 6eaac42..ae9932b 100644 --- a/README +++ b/README @@ -298,8 +298,8 @@ The script specific arguments are this: Custom, userdefined scripts (`spawn foo bar`) get first the arguments as specified in the config and then the above 7 are added at the end. ### COMMAND LINE ARGUMENTS - - -u, --uri=URI Uri to load (equivalent to 'set uri = URI') + uzbl [ uri ] + -u, --uri=URI alternative way to load uri on start. (equivalent to 'set uri = URI') -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) diff --git a/uzbl.c b/uzbl.c index 9e5c1a9..193d0ba 100644 --- a/uzbl.c +++ b/uzbl.c @@ -2716,7 +2716,7 @@ main (int argc, char* argv[]) { uzbl.state.selected_url = NULL; uzbl.state.searchtx = NULL; - GOptionContext* context = g_option_context_new ("- some stuff here maybe someday"); + GOptionContext* context = g_option_context_new ("[ uri ] - load a uri by default"); g_option_context_add_main_entries (context, entries, NULL); g_option_context_add_group (context, gtk_get_option_group (TRUE)); g_option_context_parse (context, &argc, &argv, NULL); -- cgit v1.2.3