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 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 */
static Bool enablescrollbars = TRUE;

6
surf.1
View file

@ -9,6 +9,7 @@ surf \- simple webkit-based browser
.RB [-r\ scriptfile]
.RB [-t\ stylefile]
.RB [-u\ useragent]
.RB [-z\ zoomlevel]
.RB "URI"
.SH DESCRIPTION
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
.B \-x
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).
.SH USAGE
.B Escape

9
surf.c
View file

@ -819,6 +819,9 @@ newclient(void) {
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) {
c->inspector = WEBKIT_WEB_INSPECTOR(
@ -1280,7 +1283,8 @@ static void
usage(void) {
die("usage: %s [-bBfFgGiIkKnNpPsSvx]"
" [-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
@ -1382,6 +1386,9 @@ main(int argc, char *argv[]) {
case 'x':
showxid = TRUE;
break;
case 'z':
zoomlevel = strtof(EARGF(usage()), NULL);
break;
default:
usage();
} ARGEND;