summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Lohmann <20h@r-36.net>2013-05-21 21:30:00 +0200
committerChristoph Lohmann <20h@r-36.net>2013-05-21 21:30:00 +0200
commitc234737bea41e605310a7372adf8af8036cf2212 (patch)
tree840aaba3013eaa87e85c6fa4c54b5ccf95eb0e36
parent4f45ae9307050397dbeb18ea00121aa82c867685 (diff)
downloadsurf-c234737bea41e605310a7372adf8af8036cf2212.tar.gz
surf-c234737bea41e605310a7372adf8af8036cf2212.tar.bz2
surf-c234737bea41e605310a7372adf8af8036cf2212.zip
Adding a common way to enable and disable features.
-rw-r--r--surf.123
-rw-r--r--surf.c22
2 files changed, 44 insertions, 1 deletions
diff --git a/surf.1 b/surf.1
index 5a0ff3f..3b38143 100644
--- a/surf.1
+++ b/surf.1
@@ -3,7 +3,7 @@
surf \- simple webkit-based browser
.SH SYNOPSIS
.B surf
-.RB [-bgiknpsvx]
+.RB [-bBgGiIkKnNpPsSvx]
.RB [-c\ cookiefile]
.RB [-e\ xid]
.RB [-r\ scriptfile]
@@ -20,6 +20,9 @@ one can point surf to another URI by setting its XProperties.
.B \-b
Disable Scrollbars
.TP
+.B \-B
+Enable Scrollbars
+.TP
.B \-c cookiefile
Specify the
.I cookiefile
@@ -32,18 +35,33 @@ Reparents to window specified by
.B \-g
Disable giving the geolocation to websites.
.TP
+.B \-G
+Enable giving the geolocation to websites.
+.TP
.B \-i
Disable Images
.TP
+.B \-I
+Enable Images
+.TP
.B \-k
+Disable kiosk mode (disable key strokes and right click)
+.TP
+.B \-K
Enable kiosk mode (disable key strokes and right click)
.TP
.B \-n
Disable the Web Inspector (Developer Tools).
.TP
+.B \-N
+Enable the Web Inspector (Developer Tools).
+.TP
.B \-p
Disable Plugins
.TP
+.B \-P
+Enable Plugins
+.TP
.B \-r scriptfile
Specify the user
.I scriptfile.
@@ -51,6 +69,9 @@ Specify the user
.B \-s
Disable Javascript
.TP
+.B \-S
+Enable Javascript
+.TP
.B \-t stylefile
Specify the user
.I stylefile.
diff --git a/surf.c b/surf.c
index da84e1c..53dda18 100644
--- a/surf.c
+++ b/surf.c
@@ -2,6 +2,7 @@
*
* To understand surf, start reading main().
*/
+
#include <signal.h>
#include <X11/X.h>
#include <X11/Xatom.h>
@@ -1289,6 +1290,9 @@ main(int argc, char *argv[]) {
case 'b':
enablescrollbars = 0;
break;
+ case 'B':
+ enablescrollbars = 1;
+ break;
case 'c':
cookiefile = EARGF(usage());
break;
@@ -1298,24 +1302,42 @@ main(int argc, char *argv[]) {
case 'g':
allowgeolocation = 0;
break;
+ case 'G':
+ allowgeolocation = 1;
+ break;
case 'i':
loadimages = 0;
break;
+ case 'I':
+ loadimages = 1;
+ break;
case 'k':
+ kioskmode = 0;
+ break;
+ case 'K':
kioskmode = 1;
break;
case 'n':
enableinspector = 0;
break;
+ case 'N':
+ enableinspector = 1;
+ break;
case 'p':
enableplugins = 0;
break;
+ case 'P':
+ enableplugins = 1;
+ break;
case 'r':
scriptfile = EARGF(usage());
break;
case 's':
enablescripts = 0;
break;
+ case 'S':
+ enablescripts = 1;
+ break;
case 't':
stylefile = EARGF(usage());
break;