X-Git-Url: https://git.danieliu.xyz/?p=surf.git;a=blobdiff_plain;f=surf.c;h=fcaa506639d4f2de07212c60d67ab7caafedd898;hp=81ba9a57b605e94fc706bd434150e7ada1400efc;hb=0d1e670ac3e6a5ea02ff1c6a6e64263b425aef9c;hpb=954a7181970f61acd54ce82cdff4195e72530db1

diff --git a/surf.c b/surf.c
index 81ba9a5..fcaa506 100644
--- a/surf.c
+++ b/surf.c
@@ -31,19 +31,21 @@
 
 #define LENGTH(x)               (sizeof(x) / sizeof(x[0]))
 #define CLEANMASK(mask)         (mask & (MODKEY|GDK_SHIFT_MASK))
+#define SETB(p, s)              [p] = { { .b = s }, }
+#define SETI(p, s)              [p] = { { .i = s }, }
+#define SETV(p, s)              [p] = { { .v = s }, }
+#define SETF(p, s)              [p] = { { .f = s }, }
+#define FSETB(p, s)             [p] = { { .b = s }, 1 }
+#define FSETI(p, s)             [p] = { { .i = s }, 1 }
+#define FSETV(p, s)             [p] = { { .v = s }, 1 }
+#define FSETF(p, s)             [p] = { { .f = s }, 1 }
+#define CSETB(p, s)             [p] = (Parameter){ { .b = s }, 1 }
+#define CSETI(p, s)             [p] = (Parameter){ { .i = s }, 1 }
+#define CSETV(p, s)             [p] = (Parameter){ { .v = s }, 1 }
+#define CSETF(p, s)             [p] = (Parameter){ { .f = s }, 1 }
 
 enum { AtomFind, AtomGo, AtomUri, AtomLast };
 
-enum {
-	CaretBrowsing,
-	FrameFlattening,
-	Geolocation,
-	JavaScript,
-	LoadImages,
-	Plugins,
-	ScrollBars,
-};
-
 enum {
 	OnDoc   = WEBKIT_HIT_TEST_RESULT_CONTEXT_DOCUMENT,
 	OnLink  = WEBKIT_HIT_TEST_RESULT_CONTEXT_LINK,
@@ -55,23 +57,58 @@ enum {
 	OnAny   = OnDoc | OnLink | OnImg | OnMedia | OnEdit | OnBar | OnSel,
 };
 
+typedef enum {
+	AcceleratedCanvas,
+	CaretBrowsing,
+	Certificate,
+	CookiePolicies,
+	DiskCache,
+	DNSPrefetch,
+	FontSize,
+	FrameFlattening,
+	Geolocation,
+	HideBackground,
+	Inspector,
+	JavaScript,
+	KioskMode,
+	LoadImages,
+	MediaManualPlay,
+	Plugins,
+	PreferredLanguages,
+	RunInFullscreen,
+	ScrollBars,
+	ShowIndicators,
+	SiteQuirks,
+	SpellChecking,
+	SpellLanguages,
+	StrictTLS,
+	Style,
+	ZoomLevel,
+	ParameterLast,
+} ParamName;
+
 typedef union {
-	gboolean b;
-	gint i;
+	int b;
+	int i;
+	float f;
 	const void *v;
 } Arg;
 
+typedef struct {
+	Arg val;
+	int force;
+} Parameter;
+
 typedef struct Client {
 	GtkWidget *win;
 	WebKitWebView *view;
 	WebKitWebInspector *inspector;
 	WebKitFindController *finder;
 	WebKitHitTestResult *mousepos;
-	GTlsCertificateFlags tlsflags;
+	GTlsCertificateFlags tlserr;
 	Window xid;
-	gint progress;
-	gboolean fullscreen;
-	const char *title, *targeturi;
+	int progress, fullscreen, https, insecure;
+	const char *title, *overtitle, *targeturi;
 	const char *needle;
 	struct Client *next;
 } Client;
@@ -92,23 +129,31 @@ typedef struct {
 	unsigned int stopevent;
 } Button;
 
+typedef struct {
+	const char *uri;
+	Parameter config[ParameterLast];
+	regex_t re;
+} UriParameters;
+
 typedef struct {
 	char *regex;
-	char *style;
+	char *file;
 	regex_t re;
-} SiteStyle;
+} SiteSpecific;
 
 /* Surf */
 static void usage(void);
 static void die(const char *errstr, ...);
 static void setup(void);
 static void sigchld(int unused);
+static void sighup(int unused);
 static char *buildfile(const char *path);
 static char *buildpath(const char *path);
+static const char *getuserhomedir(const char *user);
+static const char *getcurrentuserhomedir(void);
 static Client *newclient(Client *c);
-static void addaccelgroup(Client *c);
 static void loaduri(Client *c, const Arg *a);
-static char *geturi(Client *c);
+static const char *geturi(Client *c);
 static void setatom(Client *c, int a, const char *v);
 static const char *getatom(Client *c, int a);
 static void updatetitle(Client *c);
@@ -116,24 +161,27 @@ static void gettogglestats(Client *c);
 static void getpagestats(Client *c);
 static WebKitCookieAcceptPolicy cookiepolicy_get(void);
 static char cookiepolicy_set(const WebKitCookieAcceptPolicy p);
-static const gchar *getstyle(const char *uri);
-static void setstyle(Client *c, const char *stylefile);
+static void seturiparameters(Client *c, const char *uri);
+static void setparameter(Client *c, int refresh, ParamName p, const Arg *a);
+static const char *getcert(const char *uri);
+static void setcert(Client *c, const char *file);
+static const char *getstyle(const char *uri);
+static void setstyle(Client *c, const char *file);
 static void runscript(Client *c);
 static void evalscript(Client *c, const char *jsstr, ...);
 static void updatewinid(Client *c);
-static void handleplumb(Client *c, const gchar *uri);
-static void newwindow(Client *c, const Arg *arg, gboolean noembed);
+static void handleplumb(Client *c, const char *uri);
+static void newwindow(Client *c, const Arg *a, int noembed);
 static void spawn(Client *c, const Arg *a);
 static void destroyclient(Client *c);
 static void cleanup(void);
 
 /* GTK/WebKit */
 static WebKitWebView *newview(Client *c, WebKitWebView *rv);
+static void initwebextensions(WebKitWebContext *wc, Client *c);
 static GtkWidget *createview(WebKitWebView *v, WebKitNavigationAction *a,
-		Client *c);
-static gboolean buttonreleased(GtkWidget *w, GdkEventKey *e, Client *c);
-static gboolean keypress(GtkAccelGroup *group, GObject *obj, guint key,
-                         GdkModifierType mods, Client *c);
+                             Client *c);
+static gboolean buttonreleased(GtkWidget *w, GdkEvent *e, Client *c);
 static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event,
                                 gpointer d);
 static gboolean winevent(GtkWidget *w, GdkEvent *e, Client *c);
@@ -143,16 +191,18 @@ static void loadchanged(WebKitWebView *v, WebKitLoadEvent e, Client *c);
 static void progresschanged(WebKitWebView *v, GParamSpec *ps, Client *c);
 static void titlechanged(WebKitWebView *view, GParamSpec *ps, Client *c);
 static void mousetargetchanged(WebKitWebView *v, WebKitHitTestResult *h,
-		guint modifiers, Client *c);
+                               guint modifiers, Client *c);
 static gboolean permissionrequested(WebKitWebView *v,
-		WebKitPermissionRequest *r, Client *c);
+                                    WebKitPermissionRequest *r, Client *c);
 static gboolean decidepolicy(WebKitWebView *v, WebKitPolicyDecision *d,
-    WebKitPolicyDecisionType dt, Client *c);
+                             WebKitPolicyDecisionType dt, Client *c);
 static void decidenavigation(WebKitPolicyDecision *d, Client *c);
 static void decidenewwindow(WebKitPolicyDecision *d, Client *c);
 static void decideresource(WebKitPolicyDecision *d, Client *c);
+static void insecurecontent(WebKitWebView *v, WebKitInsecureContentEvent e,
+                            Client *c);
 static void downloadstarted(WebKitWebContext *wc, WebKitDownload *d,
-		Client *c);
+                            Client *c);
 static void responsereceived(WebKitDownload *d, GParamSpec *ps, Client *c);
 static void download(Client *c, WebKitURIResponse *r);
 static void closeview(WebKitWebView *v, Client *c);
@@ -160,18 +210,16 @@ static void destroywin(GtkWidget* w, Client *c);
 
 /* Hotkeys */
 static void pasteuri(GtkClipboard *clipboard, const char *text, gpointer d);
-static void reload(Client *c, const Arg *arg);
+static void reload(Client *c, const Arg *a);
 static void print(Client *c, const Arg *a);
 static void clipboard(Client *c, const Arg *a);
 static void zoom(Client *c, const Arg *a);
-static void scroll_v(Client *c, const Arg *a);
-static void scroll_h(Client *c, const Arg *a);
+static void scroll(Client *c, const Arg *a);
 static void navigate(Client *c, const Arg *a);
-static void stop(Client *c, const Arg *arg);
+static void stop(Client *c, const Arg *a);
 static void toggle(Client *c, const Arg *a);
 static void togglefullscreen(Client *c, const Arg *a);
-static void togglecookiepolicy(Client *c, const Arg *arg);
-static void togglestyle(Client *c, const Arg *arg);
+static void togglecookiepolicy(Client *c, const Arg *a);
 static void toggleinspector(Client *c, const Arg *a);
 static void find(Client *c, const Arg *a);
 
@@ -181,16 +229,18 @@ static void clicknewwindow(Client *c, const Arg *a, WebKitHitTestResult *h);
 static void clickexternplayer(Client *c, const Arg *a, WebKitHitTestResult *h);
 
 static char winid[64];
-static char togglestats[10];
+static char togglestats[11];
 static char pagestats[2];
 static Atom atoms[AtomLast];
 static Window embed;
-static gboolean showxid = FALSE;
+static int showxid;
 static int cookiepolicy;
 static Display *dpy;
 static Client *clients;
+static GdkDevice *gdkkb;
 static char *stylefile;
 static const char *useragent;
+static Parameter *curconfig;
 char *argv0;
 
 /* configuration, allows nested code to access above variables */
@@ -199,8 +249,8 @@ char *argv0;
 void
 usage(void)
 {
-	die("usage: %s [-bBdDfFgGiIkKmMnNpPsSvx] [-a cookiepolicies ] "
-	    "[-c cookiefile] [-e xid] [-r scriptfile] [-t stylefile] "
+	die("usage: %s [-bBdDfFgGiIkKmMnNpPsStTvx] [-a cookiepolicies ] "
+	    "[-c cookiefile] [-C stylefile] [-e xid] [-r scriptfile] "
 	    "[-u useragent] [-z zoomlevel] [uri]\n", basename(argv0));
 }
 
@@ -212,47 +262,87 @@ die(const char *errstr, ...)
 	va_start(ap, errstr);
 	vfprintf(stderr, errstr, ap);
 	va_end(ap);
-	exit(EXIT_FAILURE);
+	exit(1);
 }
 
 void
 setup(void)
 {
-	int i;
+	GdkDisplay *gdpy;
+	int i, j;
 
 	/* clean up any zombies immediately */
 	sigchld(0);
-	gtk_init(NULL, NULL);
+	if (signal(SIGHUP, sighup) == SIG_ERR)
+		die("Can't install SIGHUP handler");
 
-	dpy = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
+	if (!(dpy = XOpenDisplay(NULL)))
+		die("Can't open default display");
 
 	/* atoms */
 	atoms[AtomFind] = XInternAtom(dpy, "_SURF_FIND", False);
 	atoms[AtomGo] = XInternAtom(dpy, "_SURF_GO", False);
 	atoms[AtomUri] = XInternAtom(dpy, "_SURF_URI", False);
 
+	gtk_init(NULL, NULL);
+
+	gdpy = gdk_display_get_default();
+
+	curconfig = defconfig;
+
 	/* dirs and files */
 	cookiefile = buildfile(cookiefile);
 	scriptfile = buildfile(scriptfile);
 	cachedir   = buildpath(cachedir);
+	certdir    = buildpath(certdir);
 
-	if (stylefile == NULL) {
+	gdkkb = gdk_seat_get_keyboard(gdk_display_get_default_seat(gdpy));
+
+	for (i = 0; i < LENGTH(certs); ++i) {
+		if (!regcomp(&(certs[i].re), certs[i].regex, REG_EXTENDED)) {
+			certs[i].file = g_strconcat(certdir, "/", certs[i].file,
+			                            NULL);
+		} else {
+			fprintf(stderr, "Could not compile regex: %s\n",
+			        certs[i].regex);
+			certs[i].regex = NULL;
+		}
+	}
+
+	if (!stylefile) {
 		styledir = buildpath(styledir);
-		for (i = 0; i < LENGTH(styles); i++) {
-			if (regcomp(&(styles[i].re), styles[i].regex,
+		for (i = 0; i < LENGTH(styles); ++i) {
+			if (!regcomp(&(styles[i].re), styles[i].regex,
 			    REG_EXTENDED)) {
-				fprintf(stderr,
-				        "Could not compile regex: %s\n",
+				styles[i].file = g_strconcat(styledir, "/",
+				                    styles[i].file, NULL);
+			} else {
+				fprintf(stderr, "Could not compile regex: %s\n",
 				        styles[i].regex);
 				styles[i].regex = NULL;
 			}
-			styles[i].style = g_strconcat(styledir, "/",
-			    styles[i].style, NULL);
 		}
 		g_free(styledir);
 	} else {
 		stylefile = buildfile(stylefile);
 	}
+
+	for (i = 0; i < LENGTH(uriparams); ++i) {
+		if (!regcomp(&(uriparams[i].re), uriparams[i].uri,
+		    REG_EXTENDED)) {
+			/* copy default parameters if they are not already set
+			 * or if they are forced */
+			for (j = 0; j < ParameterLast; ++j) {
+				if (!uriparams[i].config[j].force ||
+				    defconfig[j].force)
+					uriparams[i].config[j] = defconfig[j];
+			}
+		} else {
+			fprintf(stderr, "Could not compile regex: %s\n",
+			        uriparams[i].uri);
+			uriparams[i].uri = NULL;
+		}
+	}
 }
 
 void
@@ -260,7 +350,18 @@ sigchld(int unused)
 {
 	if (signal(SIGCHLD, sigchld) == SIG_ERR)
 		die("Can't install SIGCHLD handler");
-	while (0 < waitpid(-1, NULL, WNOHANG));
+	while (waitpid(-1, NULL, WNOHANG) > 0)
+		;
+}
+
+void
+sighup(int unused)
+{
+	Arg a = { .b = 0 };
+	Client *c;
+
+	for (c = clients; c; c = c->next)
+		reload(c, &a);
 }
 
 char *
@@ -288,29 +389,59 @@ buildfile(const char *path)
 	return fpath;
 }
 
+static const char*
+getuserhomedir(const char *user)
+{
+	struct passwd *pw = getpwnam(user);
+
+	if (!pw)
+		die("Can't get user %s login information.\n", user);
+
+	return pw->pw_dir;
+}
+
+static const char*
+getcurrentuserhomedir(void)
+{
+	const char *homedir;
+	const char *user;
+	struct passwd *pw;
+
+	homedir = getenv("HOME");
+	if (homedir)
+		return homedir;
+
+	user = getenv("USER");
+	if (user)
+		return getuserhomedir(user);
+
+	pw = getpwuid(getuid());
+	if (!pw)
+		die("Can't get current user home directory\n");
+
+	return pw->pw_dir;
+}
+
 char *
 buildpath(const char *path)
 {
-	struct passwd *pw;
 	char *apath, *name, *p, *fpath;
+	const char *homedir;
 
 	if (path[0] == '~') {
 		if (path[1] == '/' || path[1] == '\0') {
 			p = (char *)&path[1];
-			pw = getpwuid(getuid());
+			homedir = getcurrentuserhomedir();
 		} else {
 			if ((p = strchr(path, '/')))
 				name = g_strndup(&path[1], --p - path);
 			else
 				name = g_strdup(&path[1]);
 
-			if (!(pw = getpwnam(name))) {
-				die("Can't get user %s home directory: %s.\n",
-				    name, path);
-			}
+			homedir = getuserhomedir(name);
 			g_free(name);
 		}
-		apath = g_build_filename(pw->pw_dir, p, NULL);
+		apath = g_build_filename(homedir, p, NULL);
 	} else {
 		apath = g_strdup(path);
 	}
@@ -333,44 +464,29 @@ newclient(Client *rc)
 	if (!(c = calloc(1, sizeof(Client))))
 		die("Cannot malloc!\n");
 
-	c->title = NULL;
-	c->progress = 100;
-
 	c->next = clients;
 	clients = c;
 
+	c->progress = 100;
 	c->view = newview(c, rc ? rc->view : NULL);
-	c->tlsflags = G_TLS_CERTIFICATE_VALIDATE_ALL + 1;
 
 	return c;
 }
 
-void
-addaccelgroup(Client *c)
-{
-	int i;
-	GtkAccelGroup *group = gtk_accel_group_new();
-	GClosure *closure;
-
-	for (i = 0; i < LENGTH(keys); i++) {
-		closure = g_cclosure_new(G_CALLBACK(keypress), c, NULL);
-		gtk_accel_group_connect(group, keys[i].keyval, keys[i].mod, 0,
-		                        closure);
-	}
-	gtk_window_add_accel_group(GTK_WINDOW(c->win), group);
-}
-
 void
 loaduri(Client *c, const Arg *a)
 {
 	struct stat st;
 	char *url, *path;
-	const char *uri = (char *)a->v;
+	const char *uri = a->v;
 
 	if (g_strcmp0(uri, "") == 0)
 		return;
 
-	if (g_strrstr(uri, "://") || g_str_has_prefix(uri, "about:")) {
+	if (g_str_has_prefix(uri, "http://")  ||
+	    g_str_has_prefix(uri, "https://") ||
+	    g_str_has_prefix(uri, "file://")  ||
+	    g_str_has_prefix(uri, "about:")) {
 		url = g_strdup(uri);
 	} else if (!stat(uri, &st) && (path = realpath(uri, NULL))) {
 		url = g_strdup_printf("file://%s", path);
@@ -385,19 +501,18 @@ loaduri(Client *c, const Arg *a)
 		reload(c, a);
 	} else {
 		webkit_web_view_load_uri(c->view, url);
-		c->title = geturi(c);
 		updatetitle(c);
 	}
 
 	g_free(url);
 }
 
-char *
+const char *
 geturi(Client *c)
 {
-	char *uri;
+	const char *uri;
 
-	if (!(uri = (char *)webkit_web_view_get_uri(c->view)))
+	if (!(uri = webkit_web_view_get_uri(c->view)))
 		uri = "about:blank";
 	return uri;
 }
@@ -407,8 +522,8 @@ setatom(Client *c, int a, const char *v)
 {
 	XSync(dpy, False);
 	XChangeProperty(dpy, c->xid,
-			atoms[a], XA_STRING, 8, PropModeReplace,
-			(unsigned char *)v, strlen(v) + 1);
+	                atoms[a], XA_STRING, 8, PropModeReplace,
+	                (unsigned char *)v, strlen(v) + 1);
 }
 
 const char *
@@ -420,11 +535,10 @@ getatom(Client *c, int a)
 	unsigned long ldummy;
 	unsigned char *p = NULL;
 
-	XGetWindowProperty(dpy, c->xid,
-			   atoms[a], 0L, BUFSIZ, False, XA_STRING,
-			   &adummy, &idummy, &ldummy, &ldummy, &p);
+	XGetWindowProperty(dpy, c->xid, atoms[a], 0L, BUFSIZ, False, XA_STRING,
+	                   &adummy, &idummy, &ldummy, &ldummy, &p);
 	if (p)
-		strncpy(buf, (char *)p, LENGTH(buf)-1);
+		strncpy(buf, (char *)p, LENGTH(buf) - 1);
 	else
 		buf[0] = '\0';
 	XFree(p);
@@ -436,26 +550,24 @@ void
 updatetitle(Client *c)
 {
 	char *title;
+	const char *name = c->overtitle ? c->overtitle :
+	                   c->title ? c->title : "";
 
-	if (showindicators) {
+	if (curconfig[ShowIndicators].val.b) {
 		gettogglestats(c);
 		getpagestats(c);
 
-		if (c->progress != 100) {
+		if (c->progress != 100)
 			title = g_strdup_printf("[%i%%] %s:%s | %s",
-			    c->progress, togglestats, pagestats,
-			    c->targeturi ? c->targeturi : c->title);
-		} else {
+			        c->progress, togglestats, pagestats, name);
+		else
 			title = g_strdup_printf("%s:%s | %s",
-			    togglestats, pagestats,
-			    c->targeturi ? c->targeturi : c->title);
-		}
+			        togglestats, pagestats, name);
 
 		gtk_window_set_title(GTK_WINDOW(c->win), title);
 		g_free(title);
 	} else {
-		gtk_window_set_title(GTK_WINDOW(c->win), c->title ?
-		    c->title : "");
+		gtk_window_set_title(GTK_WINDOW(c->win), name);
 	}
 }
 
@@ -463,81 +575,248 @@ void
 gettogglestats(Client *c)
 {
 	togglestats[0] = cookiepolicy_set(cookiepolicy_get());
-	togglestats[1] = enablecaretbrowsing ? 'C' : 'c';
-	togglestats[2] = allowgeolocation ? 'G' : 'g';
-	togglestats[3] = enablecache ? 'D' : 'd';
-	togglestats[4] = loadimages ? 'I' : 'i';
-	togglestats[5] = enablescripts ? 'S': 's';
-	togglestats[6] = enableplugins ? 'V' : 'v';
-	togglestats[7] = enablestyle ? 'M' : 'm';
-	togglestats[8] = enableframeflattening ? 'F' : 'f';
-	togglestats[9] = '\0';
+	togglestats[1] = curconfig[CaretBrowsing].val.b ?   'C' : 'c';
+	togglestats[2] = curconfig[Geolocation].val.b ?     'G' : 'g';
+	togglestats[3] = curconfig[DiskCache].val.b ?       'D' : 'd';
+	togglestats[4] = curconfig[LoadImages].val.b ?      'I' : 'i';
+	togglestats[5] = curconfig[JavaScript].val.b ?      'S' : 's';
+	togglestats[6] = curconfig[Plugins].val.b ?         'V' : 'v';
+	togglestats[7] = curconfig[Style].val.b ?           'M' : 'm';
+	togglestats[8] = curconfig[FrameFlattening].val.b ? 'F' : 'f';
+	togglestats[9] = curconfig[StrictTLS].val.b ?       'T' : 't';
+	togglestats[10] = '\0';
 }
 
 void
 getpagestats(Client *c)
 {
-	pagestats[0] = c->tlsflags > G_TLS_CERTIFICATE_VALIDATE_ALL ? '-' :
-	    c->tlsflags > 0 ? 'U' : 'T';
+	if (c->https)
+		pagestats[0] = (c->tlserr || c->insecure) ?  'U' : 'T';
+	else
+		pagestats[0] = '-';
 	pagestats[1] = '\0';
 }
 
 WebKitCookieAcceptPolicy
 cookiepolicy_get(void)
 {
-	switch (cookiepolicies[cookiepolicy]) {
+	switch (((char *)curconfig[CookiePolicies].val.v)[cookiepolicy]) {
 	case 'a':
 		return WEBKIT_COOKIE_POLICY_ACCEPT_NEVER;
 	case '@':
 		return WEBKIT_COOKIE_POLICY_ACCEPT_NO_THIRD_PARTY;
+	default: /* fallthrough */
 	case 'A':
-	default:
-		break;
+		return WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS;
 	}
-
-	return WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS;
 }
 
 char
-cookiepolicy_set(const WebKitCookieAcceptPolicy ep)
+cookiepolicy_set(const WebKitCookieAcceptPolicy p)
 {
-	switch (ep) {
+	switch (p) {
 	case WEBKIT_COOKIE_POLICY_ACCEPT_NEVER:
 		return 'a';
 	case WEBKIT_COOKIE_POLICY_ACCEPT_NO_THIRD_PARTY:
 		return '@';
+	default: /* fallthrough */
 	case WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS:
-	default:
+		return 'A';
+	}
+}
+
+void
+seturiparameters(Client *c, const char *uri)
+{
+	int i;
+
+	for (i = 0; i < LENGTH(uriparams); ++i) {
+		if (uriparams[i].uri &&
+		    !regexec(&(uriparams[i].re), uri, 0, NULL, 0)) {
+			curconfig = uriparams[i].config;
+			break;
+		}
+	}
+
+	for (i = 0; i < ParameterLast; ++i)
+		setparameter(c, 0, i, &curconfig[i].val);
+}
+
+void
+setparameter(Client *c, int refresh, ParamName p, const Arg *a)
+{
+	GdkRGBA bgcolor = { 0 };
+	WebKitSettings *s = webkit_web_view_get_settings(c->view);
+
+	switch (p) {
+	case AcceleratedCanvas:
+		webkit_settings_set_enable_accelerated_2d_canvas(s, a->b);
+		break;
+	case CaretBrowsing:
+		webkit_settings_set_enable_caret_browsing(s, a->b);
+		refresh = 0;
+		break;
+	case Certificate:
+		if (a->b)
+			setcert(c, geturi(c));
+		return; /* do not update */
+	case CookiePolicies:
+		webkit_cookie_manager_set_accept_policy(
+		    webkit_web_context_get_cookie_manager(
+		    webkit_web_view_get_context(c->view)),
+		    cookiepolicy_get());
+		refresh = 0;
+		break;
+	case DiskCache:
+		webkit_web_context_set_cache_model(
+		    webkit_web_view_get_context(c->view), a->b ?
+		    WEBKIT_CACHE_MODEL_WEB_BROWSER :
+		    WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER);
+		return; /* do not update */
+	case DNSPrefetch:
+		webkit_settings_set_enable_dns_prefetching(s, a->b);
+		return; /* do not update */
+	case FontSize:
+		webkit_settings_set_default_font_size(s, a->i);
+		return; /* do not update */
+	case FrameFlattening:
+		webkit_settings_set_enable_frame_flattening(s, a->b);
+		break;
+	case Geolocation:
+		refresh = 0;
+		break;
+	case HideBackground:
+		if (a->b)
+			webkit_web_view_set_background_color(c->view, &bgcolor);
+		return; /* do not update */
+	case Inspector:
+		webkit_settings_set_enable_developer_extras(s, a->b);
+		return; /* do not update */
+	case JavaScript:
+		webkit_settings_set_enable_javascript(s, a->b);
+		break;
+	case KioskMode:
+		return; /* do nothing */
+	case LoadImages:
+		webkit_settings_set_auto_load_images(s, a->b);
+		break;
+	case MediaManualPlay:
+		webkit_settings_set_media_playback_requires_user_gesture(s, a->b);
+		break;
+	case Plugins:
+		webkit_settings_set_enable_plugins(s, a->b);
+		break;
+	case PreferredLanguages:
+		return; /* do nothing */
+	case RunInFullscreen:
+		return; /* do nothing */
+	case ScrollBars:
+		/* Disabled until we write some WebKitWebExtension for
+		 * manipulating the DOM directly.
+		enablescrollbars = !enablescrollbars;
+		evalscript(c, "document.documentElement.style.overflow = '%s'",
+		    enablescrollbars ? "auto" : "hidden");
+		*/
+		return; /* do not update */
+	case ShowIndicators:
+		break;
+	case SiteQuirks:
+		webkit_settings_set_enable_site_specific_quirks(s, a->b);
+		break;
+	case SpellChecking:
+		webkit_web_context_set_spell_checking_enabled(
+		    webkit_web_view_get_context(c->view), a->b);
+		return; /* do not update */
+	case SpellLanguages:
+		return; /* do nothing */
+	case StrictTLS:
+		webkit_web_context_set_tls_errors_policy(
+		    webkit_web_view_get_context(c->view), a->b ?
+		    WEBKIT_TLS_ERRORS_POLICY_FAIL :
+		    WEBKIT_TLS_ERRORS_POLICY_IGNORE);
+		break;
+	case Style:
+		if (a->b)
+			setstyle(c, getstyle(geturi(c)));
+		else
+			webkit_user_content_manager_remove_all_style_sheets(
+			    webkit_web_view_get_user_content_manager(c->view));
+		refresh = 0;
 		break;
+	case ZoomLevel:
+		webkit_web_view_set_zoom_level(c->view, a->f);
+		return; /* do not update */
+	default:
+		return; /* do nothing */
 	}
 
-	return 'A';
+	updatetitle(c);
+	if (refresh)
+		reload(c, a);
 }
 
-const gchar *
+const char *
+getcert(const char *uri)
+{
+	int i;
+
+	for (i = 0; i < LENGTH(certs); ++i) {
+		if (certs[i].regex &&
+		    !regexec(&(certs[i].re), uri, 0, NULL, 0))
+			return certs[i].file;
+	}
+
+	return NULL;
+}
+
+void
+setcert(Client *c, const char *uri)
+{
+	const char *file = getcert(uri);
+	char *host;
+	GTlsCertificate *cert;
+
+	if (!file)
+		return;
+
+	if (!(cert = g_tls_certificate_new_from_file(file, NULL))) {
+		fprintf(stderr, "Could not read certificate file: %s\n", file);
+		return;
+	}
+
+	uri = strstr(uri, "://") + sizeof("://") - 1;
+	host = strndup(uri, strstr(uri, "/") - uri);
+
+	webkit_web_context_allow_tls_certificate_for_host(
+	    webkit_web_view_get_context(c->view), cert, host);
+
+	free(host);
+}
+
+const char *
 getstyle(const char *uri)
 {
 	int i;
 
-	if (stylefile != NULL)
+	if (stylefile)
 		return stylefile;
 
-	for (i = 0; i < LENGTH(styles); i++) {
-		if (styles[i].regex && !regexec(&(styles[i].re), uri, 0,
-		    NULL, 0))
-			return styles[i].style;
+	for (i = 0; i < LENGTH(styles); ++i) {
+		if (styles[i].regex &&
+		    !regexec(&(styles[i].re), uri, 0, NULL, 0))
+			return styles[i].file;
 	}
 
 	return "";
 }
 
 void
-setstyle(Client *c, const char *stylefile)
+setstyle(Client *c, const char *file)
 {
 	gchar *style;
 
-	if (!g_file_get_contents(stylefile, &style, NULL, NULL)) {
-		fprintf(stderr, "Could not read style file: %s\n", stylefile);
+	if (!g_file_get_contents(file, &style, NULL, NULL)) {
+		fprintf(stderr, "Could not read style file: %s\n", file);
 		return;
 	}
 
@@ -583,12 +862,10 @@ updatewinid(Client *c)
 }
 
 void
-handleplumb(Client *c, const gchar *uri)
+handleplumb(Client *c, const char *uri)
 {
-	Arg arg;
-
-	arg = (Arg)PLUMB(uri);
-	spawn(c, &arg);
+	Arg a = (Arg)PLUMB(uri);
+	spawn(c, &a);
 }
 
 void
@@ -596,39 +873,40 @@ newwindow(Client *c, const Arg *a, int noembed)
 {
 	int i = 0;
 	char tmp[64];
-	const char *cmd[26], *uri;
+	const char *cmd[28], *uri;
 	const Arg arg = { .v = cmd };
 
 	cmd[i++] = argv0;
 	cmd[i++] = "-a";
-	cmd[i++] = cookiepolicies;
-	cmd[i++] = enablescrollbars ? "-B" : "-b";
+	cmd[i++] = curconfig[CookiePolicies].val.v;
+	cmd[i++] = curconfig[ScrollBars].val.b ? "-B" : "-b";
 	if (cookiefile && g_strcmp0(cookiefile, "")) {
 		cmd[i++] = "-c";
 		cmd[i++] = cookiefile;
 	}
-	cmd[i++] = enablecache ? "-D" : "-d";
+	if (stylefile && g_strcmp0(stylefile, "")) {
+		cmd[i++] = "-C";
+		cmd[i++] = stylefile;
+	}
+	cmd[i++] = curconfig[DiskCache].val.b ? "-D" : "-d";
 	if (embed && !noembed) {
 		cmd[i++] = "-e";
 		snprintf(tmp, LENGTH(tmp), "%lu", embed);
 		cmd[i++] = tmp;
 	}
-	cmd[i++] = runinfullscreen ? "-F" : "-f";
-	cmd[i++] = allowgeolocation ? "-G" : "-g";
-	cmd[i++] = loadimages ? "-I" : "-i";
-	cmd[i++] = kioskmode ? "-K" : "-k";
-	cmd[i++] = enablestyle ? "-M" : "-m";
-	cmd[i++] = enableinspector ? "-N" : "-n";
-	cmd[i++] = enableplugins ? "-P" : "-p";
+	cmd[i++] = curconfig[RunInFullscreen].val.b ? "-F" : "-f" ;
+	cmd[i++] = curconfig[Geolocation].val.b ?     "-G" : "-g" ;
+	cmd[i++] = curconfig[LoadImages].val.b ?      "-I" : "-i" ;
+	cmd[i++] = curconfig[KioskMode].val.b ?       "-K" : "-k" ;
+	cmd[i++] = curconfig[Style].val.b ?           "-M" : "-m" ;
+	cmd[i++] = curconfig[Inspector].val.b ?       "-N" : "-n" ;
+	cmd[i++] = curconfig[Plugins].val.b ?         "-P" : "-p" ;
 	if (scriptfile && g_strcmp0(scriptfile, "")) {
 		cmd[i++] = "-r";
 		cmd[i++] = scriptfile;
 	}
-	cmd[i++] = enablescripts ? "-S" : "-s";
-	if (stylefile && g_strcmp0(stylefile, "")) {
-		cmd[i++] = "-t";
-		cmd[i++] = stylefile;
-	}
+	cmd[i++] = curconfig[JavaScript].val.b ? "-S" : "-s";
+	cmd[i++] = curconfig[StrictTLS].val.b ? "-T" : "-t";
 	if (fulluseragent && g_strcmp0(fulluseragent, "")) {
 		cmd[i++] = "-u";
 		cmd[i++] = fulluseragent;
@@ -645,16 +923,16 @@ newwindow(Client *c, const Arg *a, int noembed)
 }
 
 void
-spawn(Client *c, const Arg *arg)
+spawn(Client *c, const Arg *a)
 {
 	if (fork() == 0) {
 		if (dpy)
 			close(ConnectionNumber(dpy));
 		setsid();
-		execvp(((char **)arg->v)[0], (char **)arg->v);
-		fprintf(stderr, "surf: execvp %s", ((char **)arg->v)[0]);
+		execvp(((char **)a->v)[0], (char **)a->v);
+		fprintf(stderr, "%s: execvp %s", argv0, ((char **)a->v)[0]);
 		perror(" failed");
-		exit(0);
+		exit(1);
 	}
 }
 
@@ -686,6 +964,7 @@ cleanup(void)
 	g_free(scriptfile);
 	g_free(stylefile);
 	g_free(cachedir);
+	XCloseDisplay(dpy);
 }
 
 WebKitWebView *
@@ -702,19 +981,22 @@ newview(Client *c, WebKitWebView *rv)
 		    webkit_web_view_new_with_related_view(rv));
 	} else {
 		settings = webkit_settings_new_with_settings(
-		    "auto-load-images", loadimages,
-		    "default-font-size", defaultfontsize,
-		    "enable-caret-browsing", enablecaretbrowsing,
-		    "enable-developer-extras", enableinspector,
-		    "enable-dns-prefetching", enablednsprefetching,
-		    "enable-frame-flattening", enableframeflattening,
-		    "enable-html5-database", enablecache,
-		    "enable-html5-local-storage", enablecache,
-		    "enable-javascript", enablescripts,
-		    "enable-plugins", enableplugins,
-		    NULL);
-		/* Have a look at http://webkitgtk.org/reference/webkit2gtk/stable/WebKitSettings.html
-		 * for more interesting settings */
+		   "auto-load-images", curconfig[LoadImages].val.b,
+		   "default-font-size", curconfig[FontSize].val.i,
+		   "enable-caret-browsing", curconfig[CaretBrowsing].val.b,
+		   "enable-developer-extras", curconfig[Inspector].val.b,
+		   "enable-dns-prefetching", curconfig[DNSPrefetch].val.b,
+		   "enable-frame-flattening", curconfig[FrameFlattening].val.b,
+		   "enable-html5-database", curconfig[DiskCache].val.b,
+		   "enable-html5-local-storage", curconfig[DiskCache].val.b,
+		   "enable-javascript", curconfig[JavaScript].val.b,
+		   "enable-plugins", curconfig[Plugins].val.b,
+		   "enable-accelerated-2d-canvas", curconfig[AcceleratedCanvas].val.b,
+		   "enable-site-specific-quirks", curconfig[SiteQuirks].val.b,
+		   "media-playback-requires-user-gesture", curconfig[MediaManualPlay].val.b,
+		   NULL);
+/* For mor interesting settings, have a look at
+ * http://webkitgtk.org/reference/webkit2gtk/stable/WebKitSettings.html */
 
 		if (strcmp(fulluseragent, "")) {
 			webkit_settings_set_user_agent(settings, fulluseragent);
@@ -727,21 +1009,23 @@ newview(Client *c, WebKitWebView *rv)
 		contentmanager = webkit_user_content_manager_new();
 
 		context = webkit_web_context_new_with_website_data_manager(
-		    webkit_website_data_manager_new(
-		    "base-cache-directory", cachedir,
-		    "base-data-directory", cachedir,
-		    NULL));
+		          webkit_website_data_manager_new(
+		          "base-cache-directory", cachedir,
+		          "base-data-directory", cachedir,
+		          NULL));
 
-		/* rendering process model, can be a shared unique one or one for each
-		 * view */
+		/* rendering process model, can be a shared unique one
+		 * or one for each view */
 		webkit_web_context_set_process_model(context,
 		    WEBKIT_PROCESS_MODEL_MULTIPLE_SECONDARY_PROCESSES);
-		/* ssl */
-		webkit_web_context_set_tls_errors_policy(context, strictssl ?
-		    WEBKIT_TLS_ERRORS_POLICY_FAIL : WEBKIT_TLS_ERRORS_POLICY_IGNORE);
+		/* TLS */
+		webkit_web_context_set_tls_errors_policy(context,
+		    curconfig[StrictTLS].val.b ? WEBKIT_TLS_ERRORS_POLICY_FAIL :
+		    WEBKIT_TLS_ERRORS_POLICY_IGNORE);
 		/* disk cache */
-		webkit_web_context_set_cache_model(context, enablecache ?
-		    WEBKIT_CACHE_MODEL_WEB_BROWSER : WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER);
+		webkit_web_context_set_cache_model(context,
+		    curconfig[DiskCache].val.b ? WEBKIT_CACHE_MODEL_WEB_BROWSER :
+		    WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER);
 
 		/* Currently only works with text file to be compatible with curl */
 		webkit_cookie_manager_set_persistent_storage(
@@ -751,9 +1035,18 @@ newview(Client *c, WebKitWebView *rv)
 		webkit_cookie_manager_set_accept_policy(
 		    webkit_web_context_get_cookie_manager(context),
 		    cookiepolicy_get());
+		/* languages */
+		webkit_web_context_set_preferred_languages(context,
+		    curconfig[PreferredLanguages].val.v);
+		webkit_web_context_set_spell_checking_languages(context,
+		    curconfig[SpellLanguages].val.v);
+		webkit_web_context_set_spell_checking_enabled(context,
+		    curconfig[SpellChecking].val.b);
 
 		g_signal_connect(G_OBJECT(context), "download-started",
-		    G_CALLBACK(downloadstarted), c);
+		                 G_CALLBACK(downloadstarted), c);
+		g_signal_connect(G_OBJECT(context), "initialize-web-extensions",
+		                 G_CALLBACK(initwebextensions), c);
 
 		v = g_object_new(WEBKIT_TYPE_WEB_VIEW,
 		    "settings", settings,
@@ -762,38 +1055,38 @@ newview(Client *c, WebKitWebView *rv)
 		    NULL);
 	}
 
-	g_signal_connect(G_OBJECT(v),
-	                 "notify::title",
+	g_signal_connect(G_OBJECT(v), "notify::estimated-load-progress",
+			 G_CALLBACK(progresschanged), c);
+	g_signal_connect(G_OBJECT(v), "notify::title",
 			 G_CALLBACK(titlechanged), c);
-	g_signal_connect(G_OBJECT(v),
-	                 "mouse-target-changed",
+	g_signal_connect(G_OBJECT(v), "button-release-event",
+			 G_CALLBACK(buttonreleased), c);
+	g_signal_connect(G_OBJECT(v), "close",
+			G_CALLBACK(closeview), c);
+	g_signal_connect(G_OBJECT(v), "create",
+			 G_CALLBACK(createview), c);
+	g_signal_connect(G_OBJECT(v), "decide-policy",
+			 G_CALLBACK(decidepolicy), c);
+	g_signal_connect(G_OBJECT(v), "insecure-content-detected",
+			 G_CALLBACK(insecurecontent), c);
+	g_signal_connect(G_OBJECT(v), "load-changed",
+			 G_CALLBACK(loadchanged), c);
+	g_signal_connect(G_OBJECT(v), "mouse-target-changed",
 			 G_CALLBACK(mousetargetchanged), c);
-	g_signal_connect(G_OBJECT(v),
-	                 "permission-request",
+	g_signal_connect(G_OBJECT(v), "permission-request",
 			 G_CALLBACK(permissionrequested), c);
-	g_signal_connect(G_OBJECT(v),
-	                 "create",
-			 G_CALLBACK(createview), c);
 	g_signal_connect(G_OBJECT(v), "ready-to-show",
 			 G_CALLBACK(showview), c);
-	g_signal_connect(G_OBJECT(v),
-	                 "decide-policy",
-			 G_CALLBACK(decidepolicy), c);
-	g_signal_connect(G_OBJECT(v),
-	                 "load-changed",
-			 G_CALLBACK(loadchanged), c);
-	g_signal_connect(G_OBJECT(v),
-	                 "notify::estimated-load-progress",
-			 G_CALLBACK(progresschanged), c);
-	g_signal_connect(G_OBJECT(v),
-	                 "button-release-event",
-			 G_CALLBACK(buttonreleased), c);
-	g_signal_connect(G_OBJECT(v), "close",
-			G_CALLBACK(closeview), c);
 
 	return v;
 }
 
+void
+initwebextensions(WebKitWebContext *wc, Client *c)
+{
+	webkit_web_context_set_web_extensions_directory(wc, WEBEXTDIR);
+}
+
 GtkWidget *
 createview(WebKitWebView *v, WebKitNavigationAction *a, Client *c)
 {
@@ -806,10 +1099,8 @@ createview(WebKitWebView *v, WebKitNavigationAction *a, Client *c)
 		 * by user gesture, so inverse the logic here
 		 */
 /* instead of this, compare destination uri to mouse-over uri for validating window */
-		if (webkit_navigation_action_is_user_gesture(a)) {
+		if (webkit_navigation_action_is_user_gesture(a))
 			return NULL;
-			break;
-		}
 	case WEBKIT_NAVIGATION_TYPE_LINK_CLICKED: /* fallthrough */
 	case WEBKIT_NAVIGATION_TYPE_FORM_SUBMITTED: /* fallthrough */
 	case WEBKIT_NAVIGATION_TYPE_BACK_FORWARD: /* fallthrough */
@@ -819,25 +1110,23 @@ createview(WebKitWebView *v, WebKitNavigationAction *a, Client *c)
 		break;
 	default:
 		return NULL;
-		break;
 	}
 
 	return GTK_WIDGET(n->view);
 }
 
 gboolean
-buttonreleased(GtkWidget *w, GdkEventKey *e, Client *c)
+buttonreleased(GtkWidget *w, GdkEvent *e, Client *c)
 {
 	WebKitHitTestResultContext element;
-	GdkEventButton *eb = (GdkEventButton*)e;
 	int i;
 
 	element = webkit_hit_test_result_get_context(c->mousepos);
 
 	for (i = 0; i < LENGTH(buttons); ++i) {
 		if (element & buttons[i].target &&
-		    eb->button == buttons[i].button &&
-		    CLEANMASK(eb->state) == CLEANMASK(buttons[i].mask) &&
+		    e->button.button == buttons[i].button &&
+		    CLEANMASK(e->button.state) == CLEANMASK(buttons[i].mask) &&
 		    buttons[i].func) {
 			buttons[i].func(c, &buttons[i].arg, c->mousepos);
 			return buttons[i].stopevent;
@@ -847,34 +1136,12 @@ buttonreleased(GtkWidget *w, GdkEventKey *e, Client *c)
 	return FALSE;
 }
 
-gboolean
-keypress(GtkAccelGroup *group, GObject *obj, guint key, GdkModifierType mods,
-         Client *c)
-{
-	guint i;
-	gboolean processed = FALSE;
-
-	mods = CLEANMASK(mods);
-	key = gdk_keyval_to_lower(key);
-	updatewinid(c);
-	for (i = 0; i < LENGTH(keys); i++) {
-		if (key == keys[i].keyval
-		    && mods == keys[i].mod
-		    && keys[i].func) {
-			keys[i].func(c, &(keys[i].arg));
-			processed = TRUE;
-		}
-	}
-
-	return processed;
-}
-
 GdkFilterReturn
 processx(GdkXEvent *e, GdkEvent *event, gpointer d)
 {
 	Client *c = (Client *)d;
 	XPropertyEvent *ev;
-	Arg arg;
+	Arg a;
 
 	if (((XEvent *)e)->type == PropertyNotify) {
 		ev = &((XEvent *)e)->xproperty;
@@ -884,8 +1151,8 @@ processx(GdkXEvent *e, GdkEvent *event, gpointer d)
 
 				return GDK_FILTER_REMOVE;
 			} else if (ev->atom == atoms[AtomGo]) {
-				arg.v = getatom(c, AtomGo);
-				loaduri(c, &arg);
+				a.v = getatom(c, AtomGo);
+				loaduri(c, &a);
 
 				return GDK_FILTER_REMOVE;
 			}
@@ -897,80 +1164,89 @@ processx(GdkXEvent *e, GdkEvent *event, gpointer d)
 gboolean
 winevent(GtkWidget *w, GdkEvent *e, Client *c)
 {
+	int i;
+
 	switch (e->type) {
+	case GDK_ENTER_NOTIFY:
+		c->overtitle = c->targeturi;
+		updatetitle(c);
+		break;
+	case GDK_KEY_PRESS:
+		if (!curconfig[KioskMode].val.b) {
+			for (i = 0; i < LENGTH(keys); ++i) {
+				if (gdk_keyval_to_lower(e->key.keyval) ==
+				    keys[i].keyval &&
+				    CLEANMASK(e->key.state) == keys[i].mod &&
+				    keys[i].func) {
+					updatewinid(c);
+					keys[i].func(c, &(keys[i].arg));
+					return TRUE;
+				}
+			}
+		}
 	case GDK_LEAVE_NOTIFY:
-		c->targeturi = NULL;
+		c->overtitle = NULL;
 		updatetitle(c);
 		break;
-	case GDK_WINDOW_STATE: /* fallthrough */
+	case GDK_WINDOW_STATE:
 		if (e->window_state.changed_mask ==
-		    GDK_WINDOW_STATE_FULLSCREEN) {
+		    GDK_WINDOW_STATE_FULLSCREEN)
 			c->fullscreen = e->window_state.new_window_state &
-			    GDK_WINDOW_STATE_FULLSCREEN;
-			break;
-		}
+			                GDK_WINDOW_STATE_FULLSCREEN;
+		break;
 	default:
-		return FALSE;
+		break;
 	}
 
-	return TRUE;
+	return FALSE;
 }
 
 void
 showview(WebKitWebView *v, Client *c)
 {
-	GdkGeometry hints = { 1, 1 };
 	GdkRGBA bgcolor = { 0 };
 	GdkWindow *gwin;
 
-	c->win = createwindow(c);
-
-	if (enableinspector)
-		c->inspector = webkit_web_view_get_inspector(c->view);
-
 	c->finder = webkit_web_view_get_find_controller(c->view);
+	c->inspector = webkit_web_view_get_inspector(c->view);
 
-	if (!kioskmode)
-		addaccelgroup(c);
+	c->win = createwindow(c);
 
-	/* Arranging */
 	gtk_container_add(GTK_CONTAINER(c->win), GTK_WIDGET(c->view));
-
-	/* Setup */
+	gtk_widget_show_all(c->win);
 	gtk_widget_grab_focus(GTK_WIDGET(c->view));
-	gtk_widget_show(GTK_WIDGET(c->view));
-	gtk_widget_show(c->win);
+
 	gwin = gtk_widget_get_window(GTK_WIDGET(c->win));
 	c->xid = gdk_x11_window_get_xid(gwin);
-	gtk_window_set_geometry_hints(GTK_WINDOW(c->win), NULL, &hints,
-				      GDK_HINT_MIN_SIZE);
-	gdk_window_set_events(gwin, GDK_ALL_EVENTS_MASK);
-	gdk_window_add_filter(gwin, processx, c);
+	updatewinid(c);
+	if (showxid) {
+		gdk_display_sync(gtk_widget_get_display(c->win));
+		puts(winid);
+	}
+
+	if (curconfig[HideBackground].val.b)
+		webkit_web_view_set_background_color(c->view, &bgcolor);
 
-	if (zoomlevel != 1.0)
-		webkit_web_view_set_zoom_level(c->view, zoomlevel);
+	if (!curconfig[KioskMode].val.b) {
+		gdk_window_set_events(gwin, GDK_ALL_EVENTS_MASK);
+		gdk_window_add_filter(gwin, processx, c);
+	}
 
-	if (runinfullscreen)
+	if (curconfig[RunInFullscreen].val.b)
 		togglefullscreen(c, NULL);
 
+	if (curconfig[ZoomLevel].val.f != 1.0)
+		webkit_web_view_set_zoom_level(c->view,
+		                               curconfig[ZoomLevel].val.f);
+
 	setatom(c, AtomFind, "");
 	setatom(c, AtomUri, "about:blank");
-	if (hidebackground)
-		webkit_web_view_set_background_color(c->view, &bgcolor);
-
-	if (showxid) {
-		gdk_display_sync(gtk_widget_get_display(c->win));
-		printf("%lu\n", c->xid);
-		fflush(NULL);
-                if (fclose(stdout) != 0) {
-			die("Error closing stdout");
-                }
-	}
 }
 
 GtkWidget *
 createwindow(Client *c)
 {
+	char *wmstr;
 	GtkWidget *w;
 
 	if (embed) {
@@ -978,29 +1254,28 @@ createwindow(Client *c)
 	} else {
 		w = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 
-		/* TA:  20091214:  Despite what the GNOME docs say, the ICCCM
-		 * is always correct, so we should still call this function.
-		 * But when doing so, we *must* differentiate between a
-		 * WM_CLASS and a resource on the window.  By convention, the
-		 * window class (WM_CLASS) is capped, while the resource is in
-		 * lowercase.   Both these values come as a pair.
-		 */
-		gtk_window_set_wmclass(GTK_WINDOW(w), "surf", "Surf");
+		wmstr = g_path_get_basename(argv0);
+		gtk_window_set_wmclass(GTK_WINDOW(w), wmstr, "Surf");
+		g_free(wmstr);
 
-		/* TA:  20091214:  And set the role here as well -- so that
-		 * sessions can pick this up.
-		 */
-		gtk_window_set_role(GTK_WINDOW(w), "Surf");
+		wmstr = g_strdup_printf("%s[%lu]", "Surf",
+		        webkit_web_view_get_page_id(c->view));
+		gtk_window_set_role(GTK_WINDOW(w), wmstr);
+		g_free(wmstr);
 
-		gtk_window_set_default_size(GTK_WINDOW(w), 800, 600);
+		gtk_window_set_default_size(GTK_WINDOW(w), winsize[0], winsize[1]);
 	}
 
 	g_signal_connect(G_OBJECT(w), "destroy",
-	    G_CALLBACK(destroywin), c);
+	                 G_CALLBACK(destroywin), c);
+	g_signal_connect(G_OBJECT(w), "enter-notify-event",
+	                 G_CALLBACK(winevent), c);
+	g_signal_connect(G_OBJECT(w), "key-press-event",
+	                 G_CALLBACK(winevent), c);
 	g_signal_connect(G_OBJECT(w), "leave-notify-event",
-	    G_CALLBACK(winevent), c);
+	                 G_CALLBACK(winevent), c);
 	g_signal_connect(G_OBJECT(w), "window-state-event",
-	    G_CALLBACK(winevent), c);
+	                 G_CALLBACK(winevent), c);
 
 	return w;
 }
@@ -1008,21 +1283,24 @@ createwindow(Client *c)
 void
 loadchanged(WebKitWebView *v, WebKitLoadEvent e, Client *c)
 {
+	const char *title = geturi(c);
+
 	switch (e) {
 	case WEBKIT_LOAD_STARTED:
-		c->tlsflags = G_TLS_CERTIFICATE_VALIDATE_ALL + 1;
+		curconfig = defconfig;
+		setatom(c, AtomUri, title);
+		c->title = title;
+		c->https = c->insecure = 0;
+		seturiparameters(c, geturi(c));
 		break;
 	case WEBKIT_LOAD_REDIRECTED:
-		setatom(c, AtomUri, geturi(c));
+		setatom(c, AtomUri, title);
+		c->title = title;
+		seturiparameters(c, geturi(c));
 		break;
 	case WEBKIT_LOAD_COMMITTED:
-		if (!webkit_web_view_get_tls_info(c->view, NULL, &(c->tlsflags)))
-			c->tlsflags = G_TLS_CERTIFICATE_VALIDATE_ALL + 1;
-
-		setatom(c, AtomUri, geturi(c));
-
-		if (enablestyle)
-			setstyle(c, getstyle(geturi(c)));
+		c->https = webkit_web_view_get_tls_info(c->view, NULL,
+		                                        &c->tlserr);
 		break;
 	case WEBKIT_LOAD_FINISHED:
 		/* Disabled until we write some WebKitWebExtension for
@@ -1040,7 +1318,7 @@ void
 progresschanged(WebKitWebView *v, GParamSpec *ps, Client *c)
 {
 	c->progress = webkit_web_view_get_estimated_load_progress(c->view) *
-	    100;
+	              100;
 	updatetitle(c);
 }
 
@@ -1055,13 +1333,11 @@ void
 mousetargetchanged(WebKitWebView *v, WebKitHitTestResult *h, guint modifiers,
     Client *c)
 {
-	WebKitHitTestResultContext hc;
+	WebKitHitTestResultContext hc = webkit_hit_test_result_get_context(h);
 
 	/* Keep the hit test to know where is the pointer on the next click */
 	c->mousepos = h;
 
-	hc = webkit_hit_test_result_get_context(h);
-
 	if (hc & OnLink)
 		c->targeturi = webkit_hit_test_result_get_link_uri(h);
 	else if (hc & OnImg)
@@ -1070,6 +1346,8 @@ mousetargetchanged(WebKitWebView *v, WebKitHitTestResult *h, guint modifiers,
 		c->targeturi = webkit_hit_test_result_get_media_uri(h);
 	else
 		c->targeturi = NULL;
+
+	c->overtitle = c->targeturi;
 	updatetitle(c);
 }
 
@@ -1077,7 +1355,7 @@ gboolean
 permissionrequested(WebKitWebView *v, WebKitPermissionRequest *r, Client *c)
 {
 	if (WEBKIT_IS_GEOLOCATION_PERMISSION_REQUEST(r)) {
-		if (allowgeolocation)
+		if (curconfig[Geolocation].val.b)
 			webkit_permission_request_allow(r);
 		else
 			webkit_permission_request_deny(r);
@@ -1111,9 +1389,8 @@ decidepolicy(WebKitWebView *v, WebKitPolicyDecision *d,
 void
 decidenavigation(WebKitPolicyDecision *d, Client *c)
 {
-	WebKitNavigationAction *a;
-
-	a = webkit_navigation_policy_decision_get_navigation_action(
+	WebKitNavigationAction *a =
+	    webkit_navigation_policy_decision_get_navigation_action(
 	    WEBKIT_NAVIGATION_POLICY_DECISION(d));
 
 	switch (webkit_navigation_action_get_navigation_type(a)) {
@@ -1121,7 +1398,7 @@ decidenavigation(WebKitPolicyDecision *d, Client *c)
 	case WEBKIT_NAVIGATION_TYPE_FORM_SUBMITTED: /* fallthrough */
 	case WEBKIT_NAVIGATION_TYPE_BACK_FORWARD: /* fallthrough */
 	case WEBKIT_NAVIGATION_TYPE_RELOAD: /* fallthrough */
-	case WEBKIT_NAVIGATION_TYPE_FORM_RESUBMITTED:
+	case WEBKIT_NAVIGATION_TYPE_FORM_RESUBMITTED: /* fallthrough */
 	case WEBKIT_NAVIGATION_TYPE_OTHER: /* fallthrough */
 	default:
 		/* Do not navigate to links with a "_blank" target (popup) */
@@ -1141,12 +1418,12 @@ decidenavigation(WebKitPolicyDecision *d, Client *c)
 void
 decidenewwindow(WebKitPolicyDecision *d, Client *c)
 {
-	WebKitNavigationAction *a;
 	Arg arg;
-
-	a = webkit_navigation_policy_decision_get_navigation_action(
+	WebKitNavigationAction *a =
+	    webkit_navigation_policy_decision_get_navigation_action(
 	    WEBKIT_NAVIGATION_POLICY_DECISION(d));
 
+
 	switch (webkit_navigation_action_get_navigation_type(a)) {
 	case WEBKIT_NAVIGATION_TYPE_LINK_CLICKED: /* fallthrough */
 	case WEBKIT_NAVIGATION_TYPE_FORM_SUBMITTED: /* fallthrough */
@@ -1157,7 +1434,7 @@ decidenewwindow(WebKitPolicyDecision *d, Client *c)
 /* If the value of “mouse-button” is not 0, then the navigation was triggered by a mouse event.
  * test for link clicked but no button ? */
 		arg.v = webkit_uri_request_get_uri(
-		    webkit_navigation_action_get_request(a));
+		        webkit_navigation_action_get_request(a));
 		newwindow(c, &arg, 0);
 		break;
 	case WEBKIT_NAVIGATION_TYPE_OTHER: /* fallthrough */
@@ -1171,18 +1448,16 @@ decidenewwindow(WebKitPolicyDecision *d, Client *c)
 void
 decideresource(WebKitPolicyDecision *d, Client *c)
 {
-	const gchar *uri;
 	int i, isascii = 1;
 	WebKitResponsePolicyDecision *r = WEBKIT_RESPONSE_POLICY_DECISION(d);
-	WebKitURIResponse *res;
+	WebKitURIResponse *res =
+	    webkit_response_policy_decision_get_response(r);
+	const gchar *uri = webkit_uri_response_get_uri(res);
 
-	res = webkit_response_policy_decision_get_response(r);
-	uri = webkit_uri_response_get_uri(res);
-
-	if (g_str_has_suffix(uri, "/favicon.ico"))
-		webkit_uri_request_set_uri(
-		    webkit_response_policy_decision_get_request(r),
-		    "about:blank");
+	if (g_str_has_suffix(uri, "/favicon.ico")) {
+		webkit_policy_decision_ignore(d);
+		return;
+	}
 
 	if (!g_str_has_prefix(uri, "http://")
 	    && !g_str_has_prefix(uri, "https://")
@@ -1200,6 +1475,7 @@ decideresource(WebKitPolicyDecision *d, Client *c)
 		if (isascii) {
 			handleplumb(c, uri);
 			webkit_policy_decision_ignore(d);
+			return;
 		}
 	}
 
@@ -1211,11 +1487,17 @@ decideresource(WebKitPolicyDecision *d, Client *c)
 	}
 }
 
+void
+insecurecontent(WebKitWebView *v, WebKitInsecureContentEvent e, Client *c)
+{
+	c->insecure = 1;
+}
+
 void
 downloadstarted(WebKitWebContext *wc, WebKitDownload *d, Client *c)
 {
 	g_signal_connect(G_OBJECT(d), "notify::response",
-	    G_CALLBACK(responsereceived), c);
+	                 G_CALLBACK(responsereceived), c);
 }
 
 void
@@ -1228,9 +1510,7 @@ responsereceived(WebKitDownload *d, GParamSpec *ps, Client *c)
 void
 download(Client *c, WebKitURIResponse *r)
 {
-	Arg a;
-
-	a = (Arg)DOWNLOAD(webkit_uri_response_get_uri(r), geturi(c));
+	Arg a = (Arg)DOWNLOAD(webkit_uri_response_get_uri(r), geturi(c));
 	spawn(c, &a);
 }
 
@@ -1244,23 +1524,22 @@ void
 destroywin(GtkWidget* w, Client *c)
 {
 	destroyclient(c);
-	if (clients == NULL)
+	if (!clients)
 		gtk_main_quit();
 }
 
 void
 pasteuri(GtkClipboard *clipboard, const char *text, gpointer d)
 {
-	Arg arg = {.v = text };
-	if (text != NULL)
-		loaduri((Client *) d, &arg);
+	Arg a = {.v = text };
+	if (text)
+		loaduri((Client *) d, &a);
 }
 
 void
-reload(Client *c, const Arg *arg)
+reload(Client *c, const Arg *a)
 {
-	gboolean nocache = *(gboolean *)arg;
-	if (nocache)
+	if (a->b)
 		webkit_web_view_reload_bypass_cache(c->view);
 	else
 		webkit_web_view_reload(c->view);
@@ -1270,7 +1549,7 @@ void
 print(Client *c, const Arg *a)
 {
 	webkit_print_operation_run_dialog(webkit_print_operation_new(c->view),
-	    GTK_WINDOW(c->win));
+	                                  GTK_WINDOW(c->win));
 }
 
 void
@@ -1291,27 +1570,49 @@ void
 zoom(Client *c, const Arg *a)
 {
 	if (a->i > 0)
-		webkit_web_view_set_zoom_level(c->view, zoomlevel + 0.1);
+		webkit_web_view_set_zoom_level(c->view,
+		                               curconfig[ZoomLevel].val.f + 0.1);
 	else if (a->i < 0)
-		webkit_web_view_set_zoom_level(c->view, zoomlevel - 0.1);
+		webkit_web_view_set_zoom_level(c->view,
+		                               curconfig[ZoomLevel].val.f - 0.1);
 	else
 		webkit_web_view_set_zoom_level(c->view, 1.0);
 
-	zoomlevel = webkit_web_view_get_zoom_level(c->view);
+	curconfig[ZoomLevel].val.f = webkit_web_view_get_zoom_level(c->view);
 }
 
 void
-scroll_v(Client *c, const Arg *a)
+scroll(Client *c, const Arg *a)
 {
-	evalscript(c, "window.scrollBy(0, %d * (window.innerHeight / 100))",
-	    a->i);
-}
+	GdkEvent *ev = gdk_event_new(GDK_KEY_PRESS);
 
-void
-scroll_h(Client *c, const Arg *a)
-{
-	evalscript(c, "window.scrollBy(%d * (window.innerWidth / 100), 0)",
-	    a->i);
+	gdk_event_set_device(ev, gdkkb);
+	ev->key.window = gtk_widget_get_window(GTK_WIDGET(c->win));
+	ev->key.state = GDK_CONTROL_MASK;
+	ev->key.time = GDK_CURRENT_TIME;
+
+	switch (a->i) {
+	case 'd':
+		ev->key.keyval = GDK_KEY_Down;
+		break;
+	case 'D':
+		ev->key.keyval = GDK_KEY_Page_Down;
+		break;
+	case 'l':
+		ev->key.keyval = GDK_KEY_Left;
+		break;
+	case 'r':
+		ev->key.keyval = GDK_KEY_Right;
+		break;
+	case 'U':
+		ev->key.keyval = GDK_KEY_Page_Up;
+		break;
+	case 'u':
+		ev->key.keyval = GDK_KEY_Up;
+		break;
+	}
+
+	gdk_event_put(ev);
 }
 
 void
@@ -1324,7 +1625,7 @@ navigate(Client *c, const Arg *a)
 }
 
 void
-stop(Client *c, const Arg *arg)
+stop(Client *c, const Arg *a)
 {
 	webkit_web_view_stop_loading(c->view);
 }
@@ -1332,51 +1633,8 @@ stop(Client *c, const Arg *arg)
 void
 toggle(Client *c, const Arg *a)
 {
-	WebKitSettings *s;
-
-	s = webkit_web_view_get_settings(c->view);
-
-	switch ((unsigned int)a->i) {
-	case CaretBrowsing:
-		enablecaretbrowsing = !enablecaretbrowsing;
-		webkit_settings_set_enable_caret_browsing(s,
-		    enablecaretbrowsing);
-		updatetitle(c);
-		return; /* do not reload */
-		break;
-	case FrameFlattening:
-		enableframeflattening = !enableframeflattening;
-		webkit_settings_set_enable_frame_flattening(s,
-		    enableframeflattening);
-		break;
-	case Geolocation:
-		allowgeolocation = !allowgeolocation;
-		break;
-	case JavaScript:
-		enablescripts = !enablescripts;
-		webkit_settings_set_enable_javascript(s, enablescripts);
-		break;
-	case LoadImages:
-		loadimages = !loadimages;
-		webkit_settings_set_auto_load_images(s, loadimages);
-		break;
-	case Plugins:
-		enableplugins = !enableplugins;
-		webkit_settings_set_enable_plugins(s, enableplugins);
-		break;
-	case ScrollBars:
-		/* Disabled until we write some WebKitWebExtension for
-		 * manipulating the DOM directly.
-		enablescrollbars = !enablescrollbars;
-		evalscript(c, "document.documentElement.style.overflow = '%s'",
-		    enablescrollbars ? "auto" : "hidden");
-		*/
-		return; /* do not reload */
-		break;
-	default:
-		break;
-	}
-	reload(c, a);
+	curconfig[a->i].val.b ^= 1;
+	setparameter(c, 1, (ParamName)a->i, &curconfig[a->i].val);
 }
 
 void
@@ -1390,38 +1648,21 @@ togglefullscreen(Client *c, const Arg *a)
 }
 
 void
-togglecookiepolicy(Client *c, const Arg *arg)
+togglecookiepolicy(Client *c, const Arg *a)
 {
 	++cookiepolicy;
-	cookiepolicy %= strlen(cookiepolicies);
+	cookiepolicy %= strlen(curconfig[CookiePolicies].val.v);
 
-	webkit_cookie_manager_set_accept_policy(
-	    webkit_web_context_get_cookie_manager(
-	    webkit_web_view_get_context(c->view)),
-	    cookiepolicy_get());
-
-	updatetitle(c);
-	/* Do not reload. */
-}
-
-void
-togglestyle(Client *c, const Arg *arg)
-{
-	enablestyle = !enablestyle;
-	setstyle(c, enablestyle ? getstyle(geturi(c)) : "");
-
-	updatetitle(c);
+	setparameter(c, 0, CookiePolicies, NULL);
 }
 
 void
 toggleinspector(Client *c, const Arg *a)
 {
-	if (enableinspector) {
-		if (webkit_web_inspector_is_attached(c->inspector))
-			webkit_web_inspector_close(c->inspector);
-		else
-			webkit_web_inspector_show(c->inspector);
-	}
+	if (webkit_web_inspector_is_attached(c->inspector))
+		webkit_web_inspector_close(c->inspector);
+	else if (curconfig[Inspector].val.b)
+		webkit_web_inspector_show(c->inspector);
 }
 
 void
@@ -1439,9 +1680,11 @@ find(Client *c, const Arg *a)
 		f = webkit_find_controller_get_search_text(c->finder);
 
 		if (g_strcmp0(f, s) == 0) /* reset search */
-			webkit_find_controller_search(c->finder, "", findopts, G_MAXUINT);
+			webkit_find_controller_search(c->finder, "", findopts,
+			                              G_MAXUINT);
 
-		webkit_find_controller_search(c->finder, s, findopts, G_MAXUINT);
+		webkit_find_controller_search(c->finder, s, findopts,
+		                              G_MAXUINT);
 
 		if (strcmp(s, "") == 0)
 			webkit_find_controller_search_finish(c->finder);
@@ -1468,10 +1711,8 @@ clickexternplayer(Client *c, const Arg *a, WebKitHitTestResult *h)
 {
 	Arg arg;
 
-	if (webkit_hit_test_result_get_context(h) & OnMedia) {
-		arg = (Arg)VIDEOPLAY(webkit_hit_test_result_get_media_uri(h));
-		spawn(c, &arg);
-	}
+	arg = (Arg)VIDEOPLAY(webkit_hit_test_result_get_media_uri(h));
+	spawn(c, &arg);
 }
 
 int
@@ -1485,108 +1726,115 @@ main(int argc, char *argv[])
 	/* command line args */
 	ARGBEGIN {
 	case 'a':
-		cookiepolicies = EARGF(usage());
+		defconfig CSETV(CookiePolicies, EARGF(usage()));
 		break;
 	case 'b':
-		enablescrollbars = 0;
+		defconfig CSETB(ScrollBars, 0);
 		break;
 	case 'B':
-		enablescrollbars = 1;
+		defconfig CSETB(ScrollBars, 1);
 		break;
 	case 'c':
 		cookiefile = EARGF(usage());
 		break;
+	case 'C':
+		stylefile = EARGF(usage());
+		break;
 	case 'd':
-		enablecache = 0;
+		defconfig CSETB(DiskCache, 0);
 		break;
 	case 'D':
-		enablecache = 1;
+		defconfig CSETB(DiskCache, 1);
 		break;
 	case 'e':
 		embed = strtol(EARGF(usage()), NULL, 0);
 		break;
 	case 'f':
-		runinfullscreen = 0;
+		defconfig CSETB(RunInFullscreen, 0);
 		break;
 	case 'F':
-		runinfullscreen = 1;
+		defconfig CSETB(RunInFullscreen, 1);
 		break;
 	case 'g':
-		allowgeolocation = 0;
+		defconfig CSETB(Geolocation, 0);
 		break;
 	case 'G':
-		allowgeolocation = 1;
+		defconfig CSETB(Geolocation, 1);
 		break;
 	case 'i':
-		loadimages = 0;
+		defconfig CSETB(LoadImages, 0);
 		break;
 	case 'I':
-		loadimages = 1;
+		defconfig CSETB(LoadImages, 1);
 		break;
 	case 'k':
-		kioskmode = 0;
+		defconfig CSETB(KioskMode, 0);
 		break;
 	case 'K':
-		kioskmode = 1;
+		defconfig CSETB(KioskMode, 1);
 		break;
 	case 'm':
-		enablestyle = 0;
+		defconfig CSETB(Style, 0);
 		break;
 	case 'M':
-		enablestyle = 1;
+		defconfig CSETB(Style, 1);
 		break;
 	case 'n':
-		enableinspector = 0;
+		defconfig CSETB(Inspector, 0);
 		break;
 	case 'N':
-		enableinspector = 1;
+		defconfig CSETB(Inspector, 1);
 		break;
 	case 'p':
-		enableplugins = 0;
+		defconfig CSETB(Plugins, 0);
 		break;
 	case 'P':
-		enableplugins = 1;
+		defconfig CSETB(Plugins, 1);
 		break;
 	case 'r':
 		scriptfile = EARGF(usage());
 		break;
 	case 's':
-		enablescripts = 0;
+		defconfig CSETB(JavaScript, 0);
 		break;
 	case 'S':
-		enablescripts = 1;
+		defconfig CSETB(JavaScript, 1);
 		break;
 	case 't':
-		stylefile = EARGF(usage());
+		defconfig CSETB(StrictTLS, 0);
+		break;
+	case 'T':
+		defconfig CSETB(StrictTLS, 1);
 		break;
 	case 'u':
-		useragent = EARGF(usage());
+		fulluseragent = EARGF(usage());
 		break;
 	case 'v':
-		die("surf-"VERSION", ©2009-2015 surf engineers, "
+		die("surf-"VERSION", ©2009-2017 surf engineers, "
 		    "see LICENSE for details\n");
 	case 'x':
-		showxid = TRUE;
+		showxid = 1;
 		break;
 	case 'z':
-		zoomlevel = strtof(EARGF(usage()), NULL);
+		defconfig CSETF(ZoomLevel, strtof(EARGF(usage()), NULL));
 		break;
 	default:
 		usage();
 	} ARGEND;
 	if (argc > 0)
 		arg.v = argv[0];
+	else
+		arg.v = "about:blank";
 
 	setup();
 	c = newclient(NULL);
 	showview(NULL, c);
-	if (arg.v)
-		loaduri(clients, &arg);
-	else
-		updatetitle(c);
+
+	loaduri(c, &arg);
+	updatetitle(c);
 
 	gtk_main();
 	cleanup();
 
-	return EXIT_SUCCESS;
+	return 0;
 }