Add zoom level support.

This commit is contained in:
Christoph Lohmann 2013-10-19 18:55:53 +02:00
parent 7e9a37f25f
commit 432f45a852
3 changed files with 16 additions and 2 deletions

View File

@ -13,7 +13,8 @@ static Bool showindicators = TRUE; /* Show indicators in window title */
static Bool zoomto96dpi = TRUE; /* Zoom pages to always emulate 96dpi */ static Bool zoomto96dpi = TRUE; /* Zoom pages to always emulate 96dpi */
static Bool runinfullscreen = FALSE; /* Run in fullscreen mode by default */ static Bool runinfullscreen = FALSE; /* Run in fullscreen mode by default */
static guint defaultfontsize = 12; static guint defaultfontsize = 12; /* Default font size */
static gfloat zoomlevel = 1.0; /* Default zoom level */
/* Webkit default features */ /* Webkit default features */
static Bool enablescrollbars = TRUE; static Bool enablescrollbars = TRUE;

6
surf.1
View File

@ -9,6 +9,7 @@ surf \- simple webkit-based browser
.RB [-r\ scriptfile] .RB [-r\ scriptfile]
.RB [-t\ stylefile] .RB [-t\ stylefile]
.RB [-u\ useragent] .RB [-u\ useragent]
.RB [-z\ zoomlevel]
.RB "URI" .RB "URI"
.SH DESCRIPTION .SH DESCRIPTION
surf is a simple Web browser based on WebKit/GTK+. It is able surf is a simple Web browser based on WebKit/GTK+. It is able
@ -92,6 +93,11 @@ Prints version information to standard output, then exits.
.TP .TP
.B \-x .B \-x
Prints xid to standard output. This can be used to script the browser by using Prints xid to standard output. This can be used to script the browser by using
.TP
.B \-z zoomlevel
Specify the
.I zoomlevel
which surf should use.
.BR xprop(1). .BR xprop(1).
.SH USAGE .SH USAGE
.B Escape .B Escape

9
surf.c
View File

@ -819,6 +819,9 @@ newclient(void) {
webkit_web_view_set_zoom_level(c->view, dpi/96); webkit_web_view_set_zoom_level(c->view, dpi/96);
} }
} }
/* This might conflict with _zoomto96dpi_. */
if(zoomlevel != 1.0)
webkit_web_view_set_zoom_level(c->view, zoomlevel);
if(enableinspector) { if(enableinspector) {
c->inspector = WEBKIT_WEB_INSPECTOR( c->inspector = WEBKIT_WEB_INSPECTOR(
@ -1280,7 +1283,8 @@ static void
usage(void) { usage(void) {
die("usage: %s [-bBfFgGiIkKnNpPsSvx]" die("usage: %s [-bBfFgGiIkKnNpPsSvx]"
" [-c cookiefile] [-e xid] [-r scriptfile]" " [-c cookiefile] [-e xid] [-r scriptfile]"
" [-t stylefile] [-u useragent] [uri]\n", basename(argv0)); " [-t stylefile] [-u useragent] [-z zoomlevel]"
" [uri]\n", basename(argv0));
} }
static void static void
@ -1382,6 +1386,9 @@ main(int argc, char *argv[]) {
case 'x': case 'x':
showxid = TRUE; showxid = TRUE;
break; break;
case 'z':
zoomlevel = strtof(EARGF(usage()), NULL);
break;
default: default:
usage(); usage();
} ARGEND; } ARGEND;