From 827415529f71575c9423cb120083ec874b139ac7 Mon Sep 17 00:00:00 2001 From: Simon Lipp Date: Sun, 13 Dec 2009 16:18:38 +0100 Subject: Add a print_events option --- README | 1 + 1 file changed, 1 insertion(+) (limited to 'README') diff --git a/README b/README index 0d6ed04..12bd998 100644 --- a/README +++ b/README @@ -206,6 +206,7 @@ Besides the builtin variables you can also define your own ones and use them in - `scheme_handler`: handler to execute for each URI navigated to - the navigation request will be ignored if handler prints "USED\n" - `fifo_dir`: location to store fifo's - `socket_dir`: location to store sockets + - `print_events`: show events on stdout - `http_debug`: http debug mode (value 0-3) - `shell_cmd`: alias which will be expanded to use shell commands (eg sh -c) - `proxy_url`: http traffic socks proxy (eg: http://:) -- cgit v1.2.3 From fd1fce360b8ef484f48f5786081834628ba67a7d Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Fri, 1 Jan 2010 23:01:21 +0100 Subject: bring readme up to date for latest new options and stuff --- README | 6 ++++-- uzbl-browser | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'README') diff --git a/README b/README index 12bd998..f46d552 100644 --- a/README +++ b/README @@ -529,12 +529,14 @@ Basically all events have this format: ### COMMAND LINE ARGUMENTS - uzbl [ uri ] + uzbl-core [OPTION...] [ 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) + -n, --name=NAME Name of the current instance (defaults to Xorg window id or random for GtkSocket mode) -c, --config=FILE Path to config file or '-' for stdin -s, --socket=SOCKET Socket ID + --connect-socket=CSOCKET Connect to server socket + -p, --print-events Whether to print events to stdout -g, --geometry=GEOMETRY Set window geometry (format: WIDTHxHEIGHT+-X+-Y or maximized) -V, --version Print the version and exit --display=DISPLAY X display to use diff --git a/uzbl-browser b/uzbl-browser index 57c5087..d9b9752 100755 --- a/uzbl-browser +++ b/uzbl-browser @@ -63,4 +63,4 @@ DAEMON_PID=${DAEMON_SOCKET}.pid uzbl-event-manager -va start #fi -uzbl-core "$@" --connect-socket $DAEMON_SOCKET +uzbl-core "$@" --connect-socket $DAEMON_SOCKET -- cgit v1.2.3 From c8fb24d1069aa776bccdf3141adb9d3c3f6e8101 Mon Sep 17 00:00:00 2001 From: Simon Lipp Date: Sat, 2 Jan 2010 00:32:19 +0100 Subject: add a scrollbars_visible option --- README | 1 + src/callbacks.c | 13 +++++++++++++ src/callbacks.h | 3 +++ src/uzbl-core.c | 1 + src/uzbl-core.h | 1 + 5 files changed, 19 insertions(+) (limited to 'README') diff --git a/README b/README index 217e6bf..45a3465 100644 --- a/README +++ b/README @@ -235,6 +235,7 @@ Besides the builtin variables you can also define your own ones and use them in - `fantasy_font_family` = "Pterra" - `serif_font_family` = serif (example "DejaVu Serif") - `sans_serif_font_family` = sans (example "DejaVu Sans") + - `scrollbars_visible`: set to 1 to have GTK scrollbars if the document doesn't fit into the window (defaults to 0) * Constants (not dumpable or writeable): diff --git a/src/callbacks.c b/src/callbacks.c index dab92c1..9130f5f 100644 --- a/src/callbacks.c +++ b/src/callbacks.c @@ -270,6 +270,19 @@ cmd_useragent() { } } +void +cmd_scrollbars_visibility() { + if(uzbl.gui.scrollbars_visible) { + uzbl.gui.bar_h = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (uzbl.gui.scrolled_win)); + uzbl.gui.bar_v = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (uzbl.gui.scrolled_win)); + } + else { + uzbl.gui.bar_v = gtk_range_get_adjustment (GTK_RANGE (uzbl.gui.scbar_v)); + uzbl.gui.bar_h = gtk_range_get_adjustment (GTK_RANGE (uzbl.gui.scbar_h)); + } + gtk_widget_set_scroll_adjustments (GTK_WIDGET (uzbl.gui.web_view), uzbl.gui.bar_h, uzbl.gui.bar_v); +} + /* requires webkit >=1.1.14 */ void cmd_view_source() { diff --git a/src/callbacks.h b/src/callbacks.h index 3f318f2..882ffa4 100644 --- a/src/callbacks.h +++ b/src/callbacks.h @@ -112,6 +112,9 @@ cmd_set_geometry(); void cmd_view_source(); +void +cmd_scrollbars_visibility(); + void cmd_load_start(); diff --git a/src/uzbl-core.c b/src/uzbl-core.c index 0acd0c5..ce1c77d 100644 --- a/src/uzbl-core.c +++ b/src/uzbl-core.c @@ -138,6 +138,7 @@ const struct var_name_to_ptr_t { { "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)}, + { "scrollbars_visible", PTR_V_INT(uzbl.gui.scrollbars_visible, 1, cmd_scrollbars_visibility)}, /* constants (not dumpable or writeable) */ { "WEBKIT_MAJOR", PTR_C_INT(uzbl.info.webkit_major, NULL)}, diff --git a/src/uzbl-core.h b/src/uzbl-core.h index df9eb1a..70a383c 100644 --- a/src/uzbl-core.h +++ b/src/uzbl-core.h @@ -54,6 +54,7 @@ typedef struct { GtkScrollbar* scbar_h; // (These are still hidden) GtkAdjustment* bar_v; // Information about document length GtkAdjustment* bar_h; // and scrolling position + int scrollbars_visible; WebKitWebView* web_view; gchar* main_title; gchar* icon; -- cgit v1.2.3