X-Git-Url: https://git.danieliu.xyz/?p=surf.git;a=blobdiff_plain;f=surf.c;h=5a74941322a48f9fb47576534320993306a7f513;hp=3c17d1738915606e57bc60e0e7725b8cae0e89ac;hb=432f3c6b53cf47db3141a3e9b8b5aec2152f9aae;hpb=a53dc901710fc2bf487b5d98e5b6596c572d9250

diff --git a/surf.c b/surf.c
index 3c17d17..5a74941 100644
--- a/surf.c
+++ b/surf.c
@@ -29,13 +29,21 @@
 
 #include "arg.h"
 
-char *argv0;
-
 #define LENGTH(x)               (sizeof(x) / sizeof(x[0]))
 #define CLEANMASK(mask)         (mask & (MODKEY|GDK_SHIFT_MASK))
 
 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,
@@ -47,31 +55,31 @@ enum {
 	OnAny   = OnDoc | OnLink | OnImg | OnMedia | OnEdit | OnBar | OnSel,
 };
 
-typedef union Arg Arg;
-union Arg {
+typedef union {
 	gboolean b;
 	gint i;
 	const void *v;
-};
+} Arg;
 
 typedef struct Client {
 	GtkWidget *win;
-	Window xid;
 	WebKitWebView *view;
 	WebKitWebInspector *inspector;
+	WebKitFindController *finder;
 	WebKitHitTestResult *mousepos;
 	GTlsCertificateFlags tlsflags;
+	Window xid;
+	gint progress;
+	gboolean fullscreen;
 	const char *title, *targeturi;
 	const char *needle;
-	gint progress;
 	struct Client *next;
-	gboolean zoomed, fullscreen;
 } Client;
 
 typedef struct {
 	guint mod;
 	guint keyval;
-	void (*func)(Client *c, const Arg *arg);
+	void (*func)(Client *c, const Arg *a);
 	const Arg arg;
 } Key;
 
@@ -90,117 +98,168 @@ typedef struct {
 	regex_t re;
 } SiteStyle;
 
-static Display *dpy;
-static Atom atoms[AtomLast];
-static Client *clients = NULL;
-static Window embed = 0;
-static gboolean showxid = FALSE;
-static char winid[64];
-static char togglestat[9];
-static char pagestat[3];
-static GTlsDatabase *tlsdb;
-static int cookiepolicy;
-static char *stylefile = NULL;
-
-static void addaccelgroup(Client *c);
+/* Surf */
+static void usage(void);
+static void die(const char *errstr, ...);
+static void setup(void);
+static void sigchld(int unused);
 static char *buildfile(const char *path);
 static char *buildpath(const char *path);
-static gboolean buttonreleased(GtkWidget *w, GdkEventKey *e, Client *c);
-static void cleanup(void);
-static void clipboard(Client *c, const Arg *a);
-
+static Client *newclient(Client *c);
+static void addaccelgroup(Client *c);
+static void loaduri(Client *c, const Arg *a);
+static 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);
+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 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 spawn(Client *c, const Arg *a);
+static void destroyclient(Client *c);
+static void cleanup(void);
 
-static char *copystr(char **str, const char *src);
+/* GTK/WebKit */
+static WebKitWebView *newview(Client *c, WebKitWebView *rv);
 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);
+static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event,
+                                gpointer d);
+static gboolean winevent(GtkWidget *w, GdkEvent *e, Client *c);
+static void showview(WebKitWebView *v, Client *c);
+static GtkWidget *createwindow(Client *c);
+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);
+static gboolean permissionrequested(WebKitWebView *v,
+		WebKitPermissionRequest *r, Client *c);
 static gboolean decidepolicy(WebKitWebView *v, WebKitPolicyDecision *d,
     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 closeview(WebKitWebView *v, Client *c);
-static void destroyclient(Client *c);
-static void destroywin(GtkWidget* w, Client *c);
-static void die(const char *errstr, ...);
-static void evalscript(Client *c, const char *jsstr, ...);
-static void runscript(Client *c);
-static void find(Client *c, const Arg *arg);
-static void togglefullscreen(Client *c, const Arg *a);
-static gboolean permissionrequested(WebKitWebView *v,
-		WebKitPermissionRequest *r, Client *c);
-static const char *getatom(Client *c, int a);
-static void gettogglestat(Client *c);
-static void getpagestat(Client *c);
-static char *geturi(Client *c);
-static const gchar *getstyle(const char *uri);
-static void setstyle(Client *c, const char *stylefile);
-
-static void handleplumb(Client *c, const gchar *uri);
-
 static void downloadstarted(WebKitWebContext *wc, WebKitDownload *d,
 		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);
+static void destroywin(GtkWidget* w, Client *c);
 
-static void toggleinspector(Client *c, const Arg *a);
-
-static gboolean keypress(GtkAccelGroup *group, GObject *obj, guint key,
-                         GdkModifierType mods, Client *c);
-static void mousetargetchanged(WebKitWebView *v, WebKitHitTestResult *h,
-		guint modifiers, Client *c);
-static void loadchanged(WebKitWebView *v, WebKitLoadEvent e, Client *c);
-static void loaduri(Client *c, const Arg *arg);
-static void navigate(Client *c, const Arg *arg);
-static Client *newclient(Client *c);
-static WebKitWebView *newview(Client *c, WebKitWebView *rv);
-static void showview(WebKitWebView *v, Client *c);
-static void newwindow(Client *c, const Arg *arg, gboolean noembed);
-static GtkWidget *createwindow(Client *c);
+/* Hotkeys */
 static void pasteuri(GtkClipboard *clipboard, const char *text, gpointer d);
-static void print(Client *c, const Arg *a);
-static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event,
-                                gpointer d);
-static gboolean winevent(GtkWidget *w, GdkEvent *e, Client *c);
-static void progresschanged(WebKitWebView *v, GParamSpec *ps, Client *c);
-static void linkopen(Client *c, const Arg *arg);
-static void linkopenembed(Client *c, const Arg *arg);
 static void reload(Client *c, const Arg *arg);
-static void scroll_h(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 setatom(Client *c, int a, const char *v);
-static void setup(void);
-static void sigchld(int unused);
-static void spawn(Client *c, const Arg *arg);
+static void scroll_h(Client *c, const Arg *a);
+static void navigate(Client *c, const Arg *a);
 static void stop(Client *c, const Arg *arg);
-static void titlechanged(WebKitWebView *view, GParamSpec *ps, Client *c);
-static void toggle(Client *c, const Arg *arg);
+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 togglegeolocation(Client *c, const Arg *arg);
-static void togglescrollbars(Client *c, const Arg *arg);
 static void togglestyle(Client *c, const Arg *arg);
-static void updatetitle(Client *c);
-static void updatewinid(Client *c);
-static void usage(void);
-static void zoom(Client *c, const Arg *arg);
+static void toggleinspector(Client *c, const Arg *a);
+static void find(Client *c, const Arg *a);
+
+/* Buttons */
+static void clicknavigate(Client *c, const Arg *a, WebKitHitTestResult *h);
+static void clicknewwindow(Client *c, const Arg *a, WebKitHitTestResult *h);
+
+static char winid[64];
+static char togglestats[10];
+static char pagestats[2];
+static Atom atoms[AtomLast];
+static Window embed;
+static gboolean showxid = FALSE;
+static int cookiepolicy;
+static Display *dpy;
+static Client *clients;
+static char *stylefile;
+static const char *useragent;
+char *argv0;
 
 /* configuration, allows nested code to access above variables */
 #include "config.h"
 
 void
-addaccelgroup(Client *c)
+usage(void)
+{
+	die("usage: %s [-bBdDfFgGiIkKmMnNpPsSvx] [-a cookiepolicies ] "
+	    "[-c cookiefile] [-e xid] [-r scriptfile] [-t stylefile] "
+	    "[-u useragent] [-z zoomlevel] [uri]\n", basename(argv0));
+}
+
+void
+die(const char *errstr, ...)
+{
+	va_list ap;
+
+	va_start(ap, errstr);
+	vfprintf(stderr, errstr, ap);
+	va_end(ap);
+	exit(EXIT_FAILURE);
+}
+
+void
+setup(void)
 {
 	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);
+	/* clean up any zombies immediately */
+	sigchld(0);
+	gtk_init(NULL, NULL);
+
+	dpy = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
+
+	/* atoms */
+	atoms[AtomFind] = XInternAtom(dpy, "_SURF_FIND", False);
+	atoms[AtomGo] = XInternAtom(dpy, "_SURF_GO", False);
+	atoms[AtomUri] = XInternAtom(dpy, "_SURF_URI", False);
+
+	/* dirs and files */
+	cookiefile = buildfile(cookiefile);
+	scriptfile = buildfile(scriptfile);
+	cachedir   = buildpath(cachedir);
+
+	if (stylefile == NULL) {
+		styledir = buildpath(styledir);
+		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].regex);
+				styles[i].regex = NULL;
+			}
+			styles[i].style = g_strconcat(styledir, "/",
+			    styles[i].style, NULL);
+		}
+		g_free(styledir);
+	} else {
+		stylefile = buildfile(stylefile);
 	}
-	gtk_window_add_accel_group(GTK_WINDOW(c->win), group);
+}
+
+void
+sigchld(int unused)
+{
+	if (signal(SIGCHLD, sigchld) == SIG_ERR)
+		die("Can't install SIGCHLD handler");
+	while (0 < waitpid(-1, NULL, WNOHANG));
 }
 
 char *
@@ -265,385 +324,193 @@ buildpath(const char *path)
 	return fpath;
 }
 
-gboolean
-buttonreleased(GtkWidget *w, GdkEventKey *e, Client *c)
+Client *
+newclient(Client *rc)
 {
-	WebKitHitTestResultContext element;
-	GdkEventButton *eb = (GdkEventButton*)e;
-	int i;
+	Client *c;
 
-	element = webkit_hit_test_result_get_context(c->mousepos);
+	if (!(c = calloc(1, sizeof(Client))))
+		die("Cannot malloc!\n");
 
-	for (i = 0; i < LENGTH(buttons); ++i) {
-		if (element & buttons[i].target &&
-		    eb->button == buttons[i].button &&
-		    CLEANMASK(eb->state) == CLEANMASK(buttons[i].mask) &&
-		    buttons[i].func) {
-			buttons[i].func(c, &buttons[i].arg, c->mousepos);
-			return buttons[i].stopevent;
-		}
-	}
+	c->title = NULL;
+	c->progress = 100;
 
-	return FALSE;
+	c->next = clients;
+	clients = c;
+
+	c->view = newview(c, rc ? rc->view : NULL);
+	c->tlsflags = G_TLS_CERTIFICATE_VALIDATE_ALL + 1;
+
+	return c;
 }
 
 void
-cleanup(void)
+addaccelgroup(Client *c)
 {
-	while (clients)
-		destroyclient(clients);
-	g_free(cookiefile);
-	g_free(scriptfile);
-	g_free(stylefile);
-	g_free(cachedir);
+	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);
 }
 
-WebKitCookieAcceptPolicy
-cookiepolicy_get(void)
+void
+loaduri(Client *c, const Arg *a)
 {
-	switch (cookiepolicies[cookiepolicy]) {
-	case 'a':
-		return WEBKIT_COOKIE_POLICY_ACCEPT_NEVER;
-	case '@':
-		return WEBKIT_COOKIE_POLICY_ACCEPT_NO_THIRD_PARTY;
-	case 'A':
-	default:
-		break;
+	struct stat st;
+	char *url, *path;
+	const char *uri = (char *)a->v;
+
+	if (g_strcmp0(uri, "") == 0)
+		return;
+
+	if (g_strrstr(uri, "://") || 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);
+		free(path);
+	} else {
+		url = g_strdup_printf("http://%s", uri);
 	}
 
-	return WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS;
+	setatom(c, AtomUri, url);
+
+	if (strcmp(url, geturi(c)) == 0) {
+		reload(c, a);
+	} else {
+		webkit_web_view_load_uri(c->view, url);
+		c->title = geturi(c);
+		updatetitle(c);
+	}
+
+	g_free(url);
 }
 
-char
-cookiepolicy_set(const WebKitCookieAcceptPolicy ep)
+char *
+geturi(Client *c)
 {
-	switch (ep) {
-	case WEBKIT_COOKIE_POLICY_ACCEPT_NEVER:
-		return 'a';
-	case WEBKIT_COOKIE_POLICY_ACCEPT_NO_THIRD_PARTY:
-		return '@';
-	case WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS:
-	default:
-		break;
-	}
-
-	return 'A';
-}
-
-void
-evalscript(Client *c, const char *jsstr, ...)
-{
-	va_list ap;
-	gchar *script;
-
-	va_start(ap, jsstr);
-	script = g_strdup_vprintf(jsstr, ap);
-	va_end(ap);
-
-	webkit_web_view_run_javascript(c->view, script, NULL, NULL, NULL);
-	g_free(script);
-}
-
-void
-runscript(Client *c)
-{
-	gchar *script;
-	gsize l;
+	char *uri;
 
-	if (g_file_get_contents(scriptfile, &script, &l, NULL) && l)
-		evalscript(c, script);
-	g_free(script);
+	if (!(uri = (char *)webkit_web_view_get_uri(c->view)))
+		uri = "about:blank";
+	return uri;
 }
 
 void
-clipboard(Client *c, const Arg *a)
-{
-	if (a->b) { /* load clipboard uri */
-		gtk_clipboard_request_text(gtk_clipboard_get(
-		                           GDK_SELECTION_PRIMARY),
-		                           pasteuri, c);
-	} else { /* copy uri */
-		gtk_clipboard_set_text(gtk_clipboard_get(
-		                       GDK_SELECTION_PRIMARY), c->targeturi
-		                       ? c->targeturi : geturi(c), -1);
-	}
-}
-
-char *
-copystr(char **str, const char *src)
+setatom(Client *c, int a, const char *v)
 {
-	char *tmp;
-	tmp = g_strdup(src);
-
-	if (str && *str) {
-		g_free(*str);
-		*str = tmp;
-	}
-	return tmp;
+	XSync(dpy, False);
+	XChangeProperty(dpy, c->xid,
+			atoms[a], XA_STRING, 8, PropModeReplace,
+			(unsigned char *)v, strlen(v) + 1);
 }
 
-GtkWidget *
-createview(WebKitWebView *v, WebKitNavigationAction *a, Client *c)
+const char *
+getatom(Client *c, int a)
 {
-	Client *n;
-
-	switch (webkit_navigation_action_get_navigation_type(a)) {
-	case WEBKIT_NAVIGATION_TYPE_OTHER: /* fallthrough */
-		/*
-		 * popup windows of type “other” are almost always triggered
-		 * 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)) {
-			return NULL;
-			break;
-		}
-	case WEBKIT_NAVIGATION_TYPE_LINK_CLICKED: /* fallthrough */
-	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:
-		n = newclient(c);
-		break;
-	default:
-		return NULL;
-		break;
-	}
+	static char buf[BUFSIZ];
+	Atom adummy;
+	int idummy;
+	unsigned long ldummy;
+	unsigned char *p = NULL;
 
-	return GTK_WIDGET(n->view);
-}
+	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);
+	else
+		buf[0] = '\0';
+	XFree(p);
 
-gboolean
-decidepolicy(WebKitWebView *v, WebKitPolicyDecision *d,
-    WebKitPolicyDecisionType dt, Client *c)
-{
-	switch (dt) {
-	case WEBKIT_POLICY_DECISION_TYPE_NAVIGATION_ACTION:
-		decidenavigation(d, c);
-		break;
-	case WEBKIT_POLICY_DECISION_TYPE_NEW_WINDOW_ACTION:
-		decidenewwindow(d, c);
-		break;
-	case WEBKIT_POLICY_DECISION_TYPE_RESPONSE:
-		decideresource(d, c);
-		break;
-	default:
-		webkit_policy_decision_ignore(d);
-		break;
-	}
-	return TRUE;
+	return buf;
 }
 
 void
-decidenavigation(WebKitPolicyDecision *d, Client *c)
+updatetitle(Client *c)
 {
-	WebKitNavigationAction *a;
+	char *title;
 
-	a = webkit_navigation_policy_decision_get_navigation_action(
-	    WEBKIT_NAVIGATION_POLICY_DECISION(d));
+	if (showindicators) {
+		gettogglestats(c);
+		getpagestats(c);
 
-	switch (webkit_navigation_action_get_navigation_type(a)) {
-	case WEBKIT_NAVIGATION_TYPE_LINK_CLICKED: /* fallthrough */
-	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_OTHER: /* fallthrough */
-	default:
-		/* Do not navigate to links with a "_blank" target (popup) */
-		if (webkit_navigation_policy_decision_get_frame_name(
-		    WEBKIT_NAVIGATION_POLICY_DECISION(d))) {
-			webkit_policy_decision_ignore(d);
+		if (c->progress != 100) {
+			title = g_strdup_printf("[%i%%] %s:%s | %s",
+			    c->progress, togglestats, pagestats,
+			    c->targeturi ? c->targeturi : c->title);
 		} else {
-			/* Filter out navigation to different domain ? */
-			/* get action→urirequest, copy and load in new window+view
-			 * on Ctrl+Click ? */
-			webkit_policy_decision_use(d);
-		}
-		break;
-	}
-}
-
-void
-decidenewwindow(WebKitPolicyDecision *d, Client *c)
-{
-	WebKitNavigationAction *a;
-	Arg arg;
-
-	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 */
-	case WEBKIT_NAVIGATION_TYPE_BACK_FORWARD: /* fallthrough */
-	case WEBKIT_NAVIGATION_TYPE_RELOAD: /* fallthrough */
-	case WEBKIT_NAVIGATION_TYPE_FORM_RESUBMITTED:
-		/* Filter domains here */
-/* 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));
-		newwindow(c, &arg, 0);
-		break;
-	case WEBKIT_NAVIGATION_TYPE_OTHER: /* fallthrough */
-	default:
-		break;
-	}
-
-	webkit_policy_decision_ignore(d);
-}
-
-void
-decideresource(WebKitPolicyDecision *d, Client *c)
-{
-	const gchar *uri;
-	int i, isascii = 1;
-	WebKitResponsePolicyDecision *r = WEBKIT_RESPONSE_POLICY_DECISION(d);
-	WebKitURIResponse *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_prefix(uri, "http://")
-	    && !g_str_has_prefix(uri, "https://")
-	    && !g_str_has_prefix(uri, "about:")
-	    && !g_str_has_prefix(uri, "file://")
-	    && !g_str_has_prefix(uri, "data:")
-	    && !g_str_has_prefix(uri, "blob:")
-	    && strlen(uri) > 0) {
-		for (i = 0; i < strlen(uri); i++) {
-			if (!g_ascii_isprint(uri[i])) {
-				isascii = 0;
-				break;
-			}
-		}
-		if (isascii) {
-			handleplumb(c, uri);
-			webkit_policy_decision_ignore(d);
+			title = g_strdup_printf("%s:%s | %s",
+			    togglestats, pagestats,
+			    c->targeturi ? c->targeturi : c->title);
 		}
-	}
 
-	if (webkit_response_policy_decision_is_mime_type_supported(r)) {
-		webkit_policy_decision_use(d);
+		gtk_window_set_title(GTK_WINDOW(c->win), title);
+		g_free(title);
 	} else {
-		webkit_policy_decision_ignore(d);
-		download(c, res);
+		gtk_window_set_title(GTK_WINDOW(c->win), c->title ?
+		    c->title : "");
 	}
 }
 
 void
-destroyclient(Client *c)
-{
-	Client *p;
-
-	webkit_web_view_stop_loading(c->view);
-	/* Not needed, has already been called
-	gtk_widget_destroy(c->win);
-	 */
-
-	for (p = clients; p && p->next != c; p = p->next)
-		;
-	if (p)
-		p->next = c->next;
-	else
-		clients = c->next;
-	free(c);
-}
-
-void
-closeview(WebKitWebView *v, Client *c)
-{
-	gtk_widget_destroy(c->win);
-}
-
-void
-destroywin(GtkWidget* w, Client *c)
-{
-	destroyclient(c);
-	if (clients == NULL)
-		gtk_main_quit();
-}
-
-void
-die(const char *errstr, ...)
-{
-	va_list ap;
-
-	va_start(ap, errstr);
-	vfprintf(stderr, errstr, ap);
-	va_end(ap);
-	exit(EXIT_FAILURE);
-}
-
-void
-find(Client *c, const Arg *arg)
+gettogglestats(Client *c)
 {
-	const char *s;
-
-	s = getatom(c, AtomFind);
-	gboolean forward = *(gboolean *)arg;
-	webkit_web_view_search_text(c->view, s, FALSE, forward, TRUE);
+	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';
 }
 
 void
-togglefullscreen(Client *c, const Arg *a)
+getpagestats(Client *c)
 {
-	/* toggling value is handled in winevent() */
-	if (c->fullscreen)
-		gtk_window_unfullscreen(GTK_WINDOW(c->win));
-	else
-		gtk_window_fullscreen(GTK_WINDOW(c->win));
+	pagestats[0] = c->tlsflags > G_TLS_CERTIFICATE_VALIDATE_ALL ? '-' :
+	    c->tlsflags > 0 ? 'U' : 'T';
+	pagestats[1] = '\0';
 }
 
-gboolean
-permissionrequested(WebKitWebView *v, WebKitPermissionRequest *r, Client *c)
+WebKitCookieAcceptPolicy
+cookiepolicy_get(void)
 {
-	if (WEBKIT_IS_GEOLOCATION_PERMISSION_REQUEST(r)) {
-		if (allowgeolocation)
-			webkit_permission_request_allow(r);
-		else
-			webkit_permission_request_deny(r);
-		return TRUE;
+	switch (cookiepolicies[cookiepolicy]) {
+	case 'a':
+		return WEBKIT_COOKIE_POLICY_ACCEPT_NEVER;
+	case '@':
+		return WEBKIT_COOKIE_POLICY_ACCEPT_NO_THIRD_PARTY;
+	case 'A':
+	default:
+		break;
 	}
 
-	return FALSE;
-}
-
-const char *
-getatom(Client *c, int a)
-{
-	static char buf[BUFSIZ];
-	Atom adummy;
-	int idummy;
-	unsigned long ldummy;
-	unsigned char *p = NULL;
-
-	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);
-	else
-		buf[0] = '\0';
-	XFree(p);
-
-	return buf;
+	return WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS;
 }
 
-char *
-geturi(Client *c)
+char
+cookiepolicy_set(const WebKitCookieAcceptPolicy ep)
 {
-	char *uri;
+	switch (ep) {
+	case WEBKIT_COOKIE_POLICY_ACCEPT_NEVER:
+		return 'a';
+	case WEBKIT_COOKIE_POLICY_ACCEPT_NO_THIRD_PARTY:
+		return '@';
+	case WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS:
+	default:
+		break;
+	}
 
-	if (!(uri = (char *)webkit_web_view_get_uri(c->view)))
-		uri = "about:blank";
-	return uri;
+	return 'A';
 }
 
 const gchar *
@@ -684,184 +551,140 @@ setstyle(Client *c, const char *stylefile)
 }
 
 void
-handleplumb(Client *c, const gchar *uri)
-{
-	Arg arg;
-
-	arg = (Arg)PLUMB(uri);
-	spawn(c, &arg);
-}
-
-void
-downloadstarted(WebKitWebContext *wc, WebKitDownload *d, Client *c)
-{
-	g_signal_connect(G_OBJECT(d), "notify::response",
-	    G_CALLBACK(responsereceived), c);
-}
-
-void
-responsereceived(WebKitDownload *d, GParamSpec *ps, Client *c)
-{
-	download(c, webkit_download_get_response(d));
-	webkit_download_cancel(d);
-}
-
-void
-download(Client *c, WebKitURIResponse *r)
+runscript(Client *c)
 {
-	Arg a;
+	gchar *script;
+	gsize l;
 
-	a = (Arg)DOWNLOAD(webkit_uri_response_get_uri(r), geturi(c));
-	spawn(c, &a);
+	if (g_file_get_contents(scriptfile, &script, &l, NULL) && l)
+		evalscript(c, script);
+	g_free(script);
 }
 
 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);
-	}
-}
-
-gboolean
-keypress(GtkAccelGroup *group, GObject *obj, guint key, GdkModifierType mods,
-         Client *c)
+evalscript(Client *c, const char *jsstr, ...)
 {
-	guint i;
-	gboolean processed = FALSE;
+	va_list ap;
+	gchar *script;
 
-	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;
-		}
-	}
+	va_start(ap, jsstr);
+	script = g_strdup_vprintf(jsstr, ap);
+	va_end(ap);
 
-	return processed;
+	webkit_web_view_run_javascript(c->view, script, NULL, NULL, NULL);
+	g_free(script);
 }
 
 void
-mousetargetchanged(WebKitWebView *v, WebKitHitTestResult *h, guint modifiers,
-    Client *c)
-{
-	WebKitHitTestResultContext hc;
-
-	/* 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)
-		c->targeturi = webkit_hit_test_result_get_image_uri(h);
-	else if (hc & OnMedia)
-		c->targeturi = webkit_hit_test_result_get_media_uri(h);
-	else
-		c->targeturi = NULL;
-	updatetitle(c);
+updatewinid(Client *c)
+{
+	snprintf(winid, LENGTH(winid), "%lu", c->xid);
 }
 
 void
-loadchanged(WebKitWebView *v, WebKitLoadEvent e, Client *c)
+handleplumb(Client *c, const gchar *uri)
 {
-	switch (e) {
-	case WEBKIT_LOAD_STARTED:
-		c->tlsflags = G_TLS_CERTIFICATE_VALIDATE_ALL + 1;
-		break;
-	case WEBKIT_LOAD_REDIRECTED:
-		setatom(c, AtomUri, 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));
+	Arg arg;
 
-		if (enablestyle)
-			setstyle(c, getstyle(geturi(c)));
-		break;
-	case WEBKIT_LOAD_FINISHED:
-		/* Disabled until we write some WebKitWebExtension for
-		 * manipulating the DOM directly.
-		evalscript(c, "document.documentElement.style.overflow = '%s'",
-		    enablescrollbars ? "auto" : "hidden");
-		*/
-		runscript(c);
-		break;
-	}
-	updatetitle(c);
+	arg = (Arg)PLUMB(uri);
+	spawn(c, &arg);
 }
 
 void
-loaduri(Client *c, const Arg *arg)
+newwindow(Client *c, const Arg *a, int noembed)
 {
-	char *u = NULL, *rp;
-	const char *uri = (char *)arg->v;
-	Arg a = { .b = FALSE };
-	struct stat st;
-
-	if (strcmp(uri, "") == 0)
-		return;
+	int i = 0;
+	char tmp[64];
+	const char *cmd[26], *uri;
+	const Arg arg = { .v = cmd };
 
-	/* In case it's a file path. */
-	if (stat(uri, &st) == 0) {
-		rp = realpath(uri, NULL);
-		u = g_strdup_printf("file://%s", rp);
-		free(rp);
-	} else {
-		u = g_strrstr(uri, "://") ? g_strdup(uri)
-		    : g_strdup_printf("http://%s", uri);
+	cmd[i++] = argv0;
+	cmd[i++] = "-a";
+	cmd[i++] = cookiepolicies;
+	cmd[i++] = enablescrollbars ? "-B" : "-b";
+	if (cookiefile && g_strcmp0(cookiefile, "")) {
+		cmd[i++] = "-c";
+		cmd[i++] = cookiefile;
 	}
-
-	setatom(c, AtomUri, uri);
-
-	/* prevents endless loop */
-	if (strcmp(u, geturi(c)) == 0) {
-		reload(c, &a);
-	} else {
-		webkit_web_view_load_uri(c->view, u);
-		c->progress = 0;
-		c->title = copystr(&c->title, u);
-		updatetitle(c);
+	cmd[i++] = enablecache ? "-D" : "-d";
+	if (embed && !noembed) {
+		cmd[i++] = "-e";
+		snprintf(tmp, LENGTH(tmp), "%lu", embed);
+		cmd[i++] = tmp;
 	}
-	g_free(u);
+	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";
+	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;
+	}
+	if (fulluseragent && g_strcmp0(fulluseragent, "")) {
+		cmd[i++] = "-u";
+		cmd[i++] = fulluseragent;
+	}
+	if (showxid)
+		cmd[i++] = "-x";
+	/* do not keep zoom level */
+	cmd[i++] = "--";
+	if ((uri = a->v))
+		cmd[i++] = uri;
+	cmd[i] = NULL;
+
+	spawn(c, &arg);
 }
 
 void
-navigate(Client *c, const Arg *arg)
+spawn(Client *c, const Arg *arg)
 {
-	int steps = *(int *)arg;
-	webkit_web_view_go_back_or_forward(c->view, steps);
+	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]);
+		perror(" failed");
+		exit(0);
+	}
 }
 
-Client *
-newclient(Client *rc)
+void
+destroyclient(Client *c)
 {
-	Client *c;
-	gdouble dpi;
-
-	if (!(c = calloc(1, sizeof(Client))))
-		die("Cannot malloc!\n");
-
-	c->title = NULL;
-	c->progress = 100;
+	Client *p;
 
-	c->next = clients;
-	clients = c;
+	webkit_web_view_stop_loading(c->view);
+	/* Not needed, has already been called
+	gtk_widget_destroy(c->win);
+	 */
 
-	c->view = newview(c, rc ? rc->view : NULL);
-	c->tlsflags = G_TLS_CERTIFICATE_VALIDATE_ALL + 1;
+	for (p = clients; p && p->next != c; p = p->next)
+		;
+	if (p)
+		p->next = c->next;
+	else
+		clients = c->next;
+	free(c);
+}
 
-	return c;
+void
+cleanup(void)
+{
+	while (clients)
+		destroyclient(clients);
+	g_free(cookiefile);
+	g_free(scriptfile);
+	g_free(stylefile);
+	g_free(cachedir);
 }
 
 WebKitWebView *
@@ -871,7 +694,6 @@ newview(Client *c, WebKitWebView *rv)
 	WebKitSettings *settings;
 	WebKitUserContentManager *contentmanager;
 	WebKitWebContext *context;
-	char *ua;
 
 	/* Webview */
 	if (rv) {
@@ -890,12 +712,17 @@ newview(Client *c, WebKitWebView *rv)
 		    "enable-javascript", enablescripts,
 		    "enable-plugins", enableplugins,
 		    NULL);
-		if (!(ua = getenv("SURF_USERAGENT")))
-			ua = useragent;
-		webkit_settings_set_user_agent(settings, ua);
 		/* Have a look at http://webkitgtk.org/reference/webkit2gtk/stable/WebKitSettings.html
 		 * for more interesting settings */
 
+		if (strcmp(fulluseragent, "")) {
+			webkit_settings_set_user_agent(settings, fulluseragent);
+		} else if (surfuseragent) {
+			webkit_settings_set_user_agent_with_application_details(
+			    settings, "Surf", VERSION);
+		}
+		useragent = webkit_settings_get_user_agent(settings);
+
 		contentmanager = webkit_user_content_manager_new();
 
 		context = webkit_web_context_new_with_website_data_manager(
@@ -934,36 +761,158 @@ newview(Client *c, WebKitWebView *rv)
 		    NULL);
 	}
 
-	g_signal_connect(G_OBJECT(v),
-	                 "notify::title",
-			 G_CALLBACK(titlechanged), c);
-	g_signal_connect(G_OBJECT(v),
-	                 "mouse-target-changed",
-			 G_CALLBACK(mousetargetchanged), c);
-	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;
+	g_signal_connect(G_OBJECT(v),
+	                 "notify::title",
+			 G_CALLBACK(titlechanged), c);
+	g_signal_connect(G_OBJECT(v),
+	                 "mouse-target-changed",
+			 G_CALLBACK(mousetargetchanged), c);
+	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;
+}
+
+GtkWidget *
+createview(WebKitWebView *v, WebKitNavigationAction *a, Client *c)
+{
+	Client *n;
+
+	switch (webkit_navigation_action_get_navigation_type(a)) {
+	case WEBKIT_NAVIGATION_TYPE_OTHER: /* fallthrough */
+		/*
+		 * popup windows of type “other” are almost always triggered
+		 * 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)) {
+			return NULL;
+			break;
+		}
+	case WEBKIT_NAVIGATION_TYPE_LINK_CLICKED: /* fallthrough */
+	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:
+		n = newclient(c);
+		break;
+	default:
+		return NULL;
+		break;
+	}
+
+	return GTK_WIDGET(n->view);
+}
+
+gboolean
+buttonreleased(GtkWidget *w, GdkEventKey *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) &&
+		    buttons[i].func) {
+			buttons[i].func(c, &buttons[i].arg, c->mousepos);
+			return buttons[i].stopevent;
+		}
+	}
+
+	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;
+
+	if (((XEvent *)e)->type == PropertyNotify) {
+		ev = &((XEvent *)e)->xproperty;
+		if (ev->state == PropertyNewValue) {
+			if (ev->atom == atoms[AtomFind]) {
+				find(c, NULL);
+
+				return GDK_FILTER_REMOVE;
+			} else if (ev->atom == atoms[AtomGo]) {
+				arg.v = getatom(c, AtomGo);
+				loaduri(c, &arg);
+
+				return GDK_FILTER_REMOVE;
+			}
+		}
+	}
+	return GDK_FILTER_CONTINUE;
+}
+
+gboolean
+winevent(GtkWidget *w, GdkEvent *e, Client *c)
+{
+	switch (e->type) {
+	case GDK_LEAVE_NOTIFY:
+		c->targeturi = NULL;
+		updatetitle(c);
+		break;
+	case GDK_WINDOW_STATE: /* fallthrough */
+		if (e->window_state.changed_mask ==
+		    GDK_WINDOW_STATE_FULLSCREEN) {
+			c->fullscreen = e->window_state.new_window_state &
+			    GDK_WINDOW_STATE_FULLSCREEN;
+			break;
+		}
+	default:
+		return FALSE;
+	}
+
+	return TRUE;
 }
 
 void
@@ -978,6 +927,8 @@ showview(WebKitWebView *v, Client *c)
 	if (enableinspector)
 		c->inspector = webkit_web_view_get_inspector(c->view);
 
+	c->finder = webkit_web_view_get_find_controller(c->view);
+
 	if (!kioskmode)
 		addaccelgroup(c);
 
@@ -995,7 +946,6 @@ showview(WebKitWebView *v, Client *c)
 	gdk_window_set_events(gwin, GDK_ALL_EVENTS_MASK);
 	gdk_window_add_filter(gwin, processx, c);
 
-	/* This might conflict with _zoomto96dpi_. */
 	if (zoomlevel != 1.0)
 		webkit_web_view_set_zoom_level(c->view, zoomlevel);
 
@@ -1017,48 +967,6 @@ showview(WebKitWebView *v, Client *c)
 	}
 }
 
-void
-newwindow(Client *c, const Arg *arg, gboolean noembed)
-{
-	guint i = 0;
-	const char *cmd[18], *uri;
-	const Arg a = { .v = (void *)cmd };
-	char tmp[64];
-
-	cmd[i++] = argv0;
-	cmd[i++] = "-a";
-	cmd[i++] = cookiepolicies;
-	if (!enablescrollbars)
-		cmd[i++] = "-b";
-	if (embed && !noembed) {
-		cmd[i++] = "-e";
-		snprintf(tmp, LENGTH(tmp), "%u", (int)embed);
-		cmd[i++] = tmp;
-	}
-	if (!allowgeolocation)
-		cmd[i++] = "-g";
-	if (!loadimages)
-		cmd[i++] = "-i";
-	if (kioskmode)
-		cmd[i++] = "-k";
-	if (!enableplugins)
-		cmd[i++] = "-p";
-	if (!enablescripts)
-		cmd[i++] = "-s";
-	if (showxid)
-		cmd[i++] = "-x";
-	if (enablediskcache)
-		cmd[i++] = "-D";
-	cmd[i++] = "-c";
-	cmd[i++] = cookiefile;
-	cmd[i++] = "--";
-	uri = arg->v ? (char *)arg->v : c->linkhover;
-	if (uri)
-		cmd[i++] = uri;
-	cmd[i++] = NULL;
-	spawn(NULL, &a);
-}
-
 GtkWidget *
 createwindow(Client *c)
 {
@@ -1086,75 +994,265 @@ createwindow(Client *c)
 		gtk_window_set_default_size(GTK_WINDOW(w), 800, 600);
 	}
 
-	g_signal_connect(G_OBJECT(w), "destroy",
-	    G_CALLBACK(destroywin), c);
-	g_signal_connect(G_OBJECT(w), "leave-notify-event",
-	    G_CALLBACK(winevent), c);
-	g_signal_connect(G_OBJECT(w), "window-state-event",
-	    G_CALLBACK(winevent), c);
-
-	return w;
+	g_signal_connect(G_OBJECT(w), "destroy",
+	    G_CALLBACK(destroywin), c);
+	g_signal_connect(G_OBJECT(w), "leave-notify-event",
+	    G_CALLBACK(winevent), c);
+	g_signal_connect(G_OBJECT(w), "window-state-event",
+	    G_CALLBACK(winevent), c);
+
+	return w;
+}
+
+void
+loadchanged(WebKitWebView *v, WebKitLoadEvent e, Client *c)
+{
+	switch (e) {
+	case WEBKIT_LOAD_STARTED:
+		c->tlsflags = G_TLS_CERTIFICATE_VALIDATE_ALL + 1;
+		break;
+	case WEBKIT_LOAD_REDIRECTED:
+		setatom(c, AtomUri, 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)));
+		break;
+	case WEBKIT_LOAD_FINISHED:
+		/* Disabled until we write some WebKitWebExtension for
+		 * manipulating the DOM directly.
+		evalscript(c, "document.documentElement.style.overflow = '%s'",
+		    enablescrollbars ? "auto" : "hidden");
+		*/
+		runscript(c);
+		break;
+	}
+	updatetitle(c);
+}
+
+void
+progresschanged(WebKitWebView *v, GParamSpec *ps, Client *c)
+{
+	c->progress = webkit_web_view_get_estimated_load_progress(c->view) *
+	    100;
+	updatetitle(c);
+}
+
+void
+titlechanged(WebKitWebView *view, GParamSpec *ps, Client *c)
+{
+	c->title = webkit_web_view_get_title(c->view);
+	updatetitle(c);
+}
+
+void
+mousetargetchanged(WebKitWebView *v, WebKitHitTestResult *h, guint modifiers,
+    Client *c)
+{
+	WebKitHitTestResultContext hc;
+
+	/* 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)
+		c->targeturi = webkit_hit_test_result_get_image_uri(h);
+	else if (hc & OnMedia)
+		c->targeturi = webkit_hit_test_result_get_media_uri(h);
+	else
+		c->targeturi = NULL;
+	updatetitle(c);
+}
+
+gboolean
+permissionrequested(WebKitWebView *v, WebKitPermissionRequest *r, Client *c)
+{
+	if (WEBKIT_IS_GEOLOCATION_PERMISSION_REQUEST(r)) {
+		if (allowgeolocation)
+			webkit_permission_request_allow(r);
+		else
+			webkit_permission_request_deny(r);
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+gboolean
+decidepolicy(WebKitWebView *v, WebKitPolicyDecision *d,
+    WebKitPolicyDecisionType dt, Client *c)
+{
+	switch (dt) {
+	case WEBKIT_POLICY_DECISION_TYPE_NAVIGATION_ACTION:
+		decidenavigation(d, c);
+		break;
+	case WEBKIT_POLICY_DECISION_TYPE_NEW_WINDOW_ACTION:
+		decidenewwindow(d, c);
+		break;
+	case WEBKIT_POLICY_DECISION_TYPE_RESPONSE:
+		decideresource(d, c);
+		break;
+	default:
+		webkit_policy_decision_ignore(d);
+		break;
+	}
+	return TRUE;
+}
+
+void
+decidenavigation(WebKitPolicyDecision *d, Client *c)
+{
+	WebKitNavigationAction *a;
+
+	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 */
+	case WEBKIT_NAVIGATION_TYPE_BACK_FORWARD: /* fallthrough */
+	case WEBKIT_NAVIGATION_TYPE_RELOAD: /* fallthrough */
+	case WEBKIT_NAVIGATION_TYPE_FORM_RESUBMITTED:
+	case WEBKIT_NAVIGATION_TYPE_OTHER: /* fallthrough */
+	default:
+		/* Do not navigate to links with a "_blank" target (popup) */
+		if (webkit_navigation_policy_decision_get_frame_name(
+		    WEBKIT_NAVIGATION_POLICY_DECISION(d))) {
+			webkit_policy_decision_ignore(d);
+		} else {
+			/* Filter out navigation to different domain ? */
+			/* get action→urirequest, copy and load in new window+view
+			 * on Ctrl+Click ? */
+			webkit_policy_decision_use(d);
+		}
+		break;
+	}
+}
+
+void
+decidenewwindow(WebKitPolicyDecision *d, Client *c)
+{
+	WebKitNavigationAction *a;
+	Arg arg;
+
+	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 */
+	case WEBKIT_NAVIGATION_TYPE_BACK_FORWARD: /* fallthrough */
+	case WEBKIT_NAVIGATION_TYPE_RELOAD: /* fallthrough */
+	case WEBKIT_NAVIGATION_TYPE_FORM_RESUBMITTED:
+		/* Filter domains here */
+/* 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));
+		newwindow(c, &arg, 0);
+		break;
+	case WEBKIT_NAVIGATION_TYPE_OTHER: /* fallthrough */
+	default:
+		break;
+	}
+
+	webkit_policy_decision_ignore(d);
+}
+
+void
+decideresource(WebKitPolicyDecision *d, Client *c)
+{
+	const gchar *uri;
+	int i, isascii = 1;
+	WebKitResponsePolicyDecision *r = WEBKIT_RESPONSE_POLICY_DECISION(d);
+	WebKitURIResponse *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_prefix(uri, "http://")
+	    && !g_str_has_prefix(uri, "https://")
+	    && !g_str_has_prefix(uri, "about:")
+	    && !g_str_has_prefix(uri, "file://")
+	    && !g_str_has_prefix(uri, "data:")
+	    && !g_str_has_prefix(uri, "blob:")
+	    && strlen(uri) > 0) {
+		for (i = 0; i < strlen(uri); i++) {
+			if (!g_ascii_isprint(uri[i])) {
+				isascii = 0;
+				break;
+			}
+		}
+		if (isascii) {
+			handleplumb(c, uri);
+			webkit_policy_decision_ignore(d);
+		}
+	}
+
+	if (webkit_response_policy_decision_is_mime_type_supported(r)) {
+		webkit_policy_decision_use(d);
+	} else {
+		webkit_policy_decision_ignore(d);
+		download(c, res);
+	}
 }
 
 void
-pasteuri(GtkClipboard *clipboard, const char *text, gpointer d)
+downloadstarted(WebKitWebContext *wc, WebKitDownload *d, Client *c)
 {
-	Arg arg = {.v = text };
-	if (text != NULL)
-		loaduri((Client *) d, &arg);
+	g_signal_connect(G_OBJECT(d), "notify::response",
+	    G_CALLBACK(responsereceived), c);
 }
 
 void
-print(Client *c, const Arg *a)
+responsereceived(WebKitDownload *d, GParamSpec *ps, Client *c)
 {
-	webkit_print_operation_run_dialog(webkit_print_operation_new(c->view),
-	    GTK_WINDOW(c->win));
+	download(c, webkit_download_get_response(d));
+	webkit_download_cancel(d);
 }
 
-GdkFilterReturn
-processx(GdkXEvent *e, GdkEvent *event, gpointer d)
+void
+download(Client *c, WebKitURIResponse *r)
 {
-	Client *c = (Client *)d;
-	XPropertyEvent *ev;
-	Arg arg;
-
-	if (((XEvent *)e)->type == PropertyNotify) {
-		ev = &((XEvent *)e)->xproperty;
-		if (ev->state == PropertyNewValue) {
-			if (ev->atom == atoms[AtomFind]) {
-				arg.b = TRUE;
-				find(c, &arg);
-
-				return GDK_FILTER_REMOVE;
-			} else if (ev->atom == atoms[AtomGo]) {
-				arg.v = getatom(c, AtomGo);
-				loaduri(c, &arg);
+	Arg a;
 
-				return GDK_FILTER_REMOVE;
-			}
-		}
-	}
-	return GDK_FILTER_CONTINUE;
+	a = (Arg)DOWNLOAD(webkit_uri_response_get_uri(r), geturi(c));
+	spawn(c, &a);
 }
 
 void
-progresschanged(WebKitWebView *v, GParamSpec *ps, Client *c)
+closeview(WebKitWebView *v, Client *c)
 {
-	c->progress = webkit_web_view_get_estimated_load_progress(c->view) *
-	    100;
-	updatetitle(c);
+	gtk_widget_destroy(c->win);
 }
 
 void
-linkopen(Client *c, const Arg *arg)
+destroywin(GtkWidget* w, Client *c)
 {
-	newwindow(NULL, arg, 1);
+	destroyclient(c);
+	if (clients == NULL)
+		gtk_main_quit();
 }
 
 void
-linkopenembed(Client *c, const Arg *arg)
+pasteuri(GtkClipboard *clipboard, const char *text, gpointer d)
 {
-	newwindow(NULL, arg, 0);
+	Arg arg = {.v = text };
+	if (text != NULL)
+		loaduri((Client *) d, &arg);
 }
 
 void
@@ -1168,90 +1266,60 @@ reload(Client *c, const Arg *arg)
 }
 
 void
-scroll_h(Client *c, const Arg *a)
+print(Client *c, const Arg *a)
 {
-	evalscript(c, "window.scrollBy(%d * (window.innerWidth / 100), 0)",
-	    a->i);
+	webkit_print_operation_run_dialog(webkit_print_operation_new(c->view),
+	    GTK_WINDOW(c->win));
 }
 
 void
-scroll_v(Client *c, const Arg *a)
+clipboard(Client *c, const Arg *a)
 {
-	evalscript(c, "window.scrollBy(0, %d * (window.innerHeight / 100))",
-	    a->i);
+	if (a->b) { /* load clipboard uri */
+		gtk_clipboard_request_text(gtk_clipboard_get(
+		                           GDK_SELECTION_PRIMARY),
+		                           pasteuri, c);
+	} else { /* copy uri */
+		gtk_clipboard_set_text(gtk_clipboard_get(
+		                       GDK_SELECTION_PRIMARY), c->targeturi
+		                       ? c->targeturi : geturi(c), -1);
+	}
 }
 
 void
-setatom(Client *c, int a, const char *v)
+zoom(Client *c, const Arg *a)
 {
-	XSync(dpy, False);
-	XChangeProperty(dpy, c->xid,
-			atoms[a], XA_STRING, 8, PropModeReplace,
-			(unsigned char *)v, strlen(v) + 1);
+	if (a->i > 0)
+		webkit_web_view_set_zoom_level(c->view, zoomlevel + 0.1);
+	else if (a->i < 0)
+		webkit_web_view_set_zoom_level(c->view, zoomlevel - 0.1);
+	else
+		webkit_web_view_set_zoom_level(c->view, 1.0);
+
+	zoomlevel = webkit_web_view_get_zoom_level(c->view);
 }
 
 void
-setup(void)
+scroll_v(Client *c, const Arg *a)
 {
-	int i;
-	WebKitWebContext *context;
-	GError *error = NULL;
-
-	/* clean up any zombies immediately */
-	sigchld(0);
-	gtk_init(NULL, NULL);
-
-	dpy = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
-
-	/* atoms */
-	atoms[AtomFind] = XInternAtom(dpy, "_SURF_FIND", False);
-	atoms[AtomGo] = XInternAtom(dpy, "_SURF_GO", False);
-	atoms[AtomUri] = XInternAtom(dpy, "_SURF_URI", False);
-
-	/* dirs and files */
-	cookiefile = buildfile(cookiefile);
-	scriptfile = buildfile(scriptfile);
-	cachedir   = buildpath(cachedir);
-
-	if (stylefile == NULL) {
-		styledir = buildpath(styledir);
-		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].regex);
-				styles[i].regex = NULL;
-			}
-			styles[i].style = g_strconcat(styledir, "/",
-			    styles[i].style, NULL);
-		}
-		g_free(styledir);
-	} else {
-		stylefile = buildfile(stylefile);
-	}
+	evalscript(c, "window.scrollBy(0, %d * (window.innerHeight / 100))",
+	    a->i);
 }
 
 void
-sigchld(int unused)
+scroll_h(Client *c, const Arg *a)
 {
-	if (signal(SIGCHLD, sigchld) == SIG_ERR)
-		die("Can't install SIGCHLD handler");
-	while (0 < waitpid(-1, NULL, WNOHANG));
+	evalscript(c, "window.scrollBy(%d * (window.innerWidth / 100), 0)",
+	    a->i);
 }
 
 void
-spawn(Client *c, const Arg *arg)
+navigate(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]);
-		perror(" failed");
-		exit(0);
-	}
+	if (a->i < 0)
+		webkit_web_view_go_back(c->view);
+	else if (a->i > 0)
+		webkit_web_view_go_forward(c->view);
 }
 
 void
@@ -1261,47 +1329,63 @@ stop(Client *c, const Arg *arg)
 }
 
 void
-titlechanged(WebKitWebView *view, GParamSpec *ps, Client *c)
+toggle(Client *c, const Arg *a)
 {
-	c->title = webkit_web_view_get_title(c->view);
-	updatetitle(c);
-}
+	WebKitSettings *s;
 
-gboolean
-winevent(GtkWidget *w, GdkEvent *e, Client *c)
-{
-	switch (e->type) {
-	case GDK_LEAVE_NOTIFY:
-		c->targeturi = NULL;
+	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;
-	case GDK_WINDOW_STATE: /* fallthrough */
-		if (e->window_state.changed_mask ==
-		    GDK_WINDOW_STATE_FULLSCREEN) {
-			c->fullscreen = e->window_state.new_window_state &
-			    GDK_WINDOW_STATE_FULLSCREEN;
-			break;
-		}
 	default:
-		return FALSE;
+		break;
 	}
-
-	return TRUE;
+	reload(c, a);
 }
 
 void
-toggle(Client *c, const Arg *arg)
+togglefullscreen(Client *c, const Arg *a)
 {
-	WebKitWebSettings *settings;
-	char *name = (char *)arg->v;
-	gboolean value;
-	Arg a = { .b = FALSE };
-
-	settings = webkit_web_view_get_settings(c->view);
-	g_object_get(G_OBJECT(settings), name, &value, NULL);
-	g_object_set(G_OBJECT(settings), name, !value, NULL);
-
-	reload(c, &a);
+	/* toggling value is handled in winevent() */
+	if (c->fullscreen)
+		gtk_window_unfullscreen(GTK_WINDOW(c->win));
+	else
+		gtk_window_fullscreen(GTK_WINDOW(c->win));
 }
 
 void
@@ -1319,58 +1403,6 @@ togglecookiepolicy(Client *c, const Arg *arg)
 	/* Do not reload. */
 }
 
-void
-togglegeolocation(Client *c, const Arg *arg)
-{
-	Arg a = { .b = FALSE };
-
-	allowgeolocation ^= 1;
-	reload(c, &a);
-}
-
-void
-twitch(Client *c, const Arg *arg)
-{
-	GtkAdjustment *a;
-	gdouble v;
-
-	a = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(
-	                                        c->scroll));
-
-	v = gtk_adjustment_get_value(a);
-
-	v += arg->i;
-
-	v = MAX(v, 0.0);
-	v = MIN(v, gtk_adjustment_get_upper(a) -
-	        gtk_adjustment_get_page_size(a));
-	gtk_adjustment_set_value(a, v);
-}
-
-void
-togglescrollbars(Client *c, const Arg *arg)
-{
-	GtkPolicyType vspolicy;
-	Arg a;
-
-	gtk_scrolled_window_get_policy(GTK_SCROLLED_WINDOW(c->scroll), NULL,
-	                               &vspolicy);
-
-	if (vspolicy == GTK_POLICY_AUTOMATIC) {
-		gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(c->scroll),
-		                               GTK_POLICY_NEVER,
-					       GTK_POLICY_NEVER);
-	} else {
-		gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(c->scroll),
-		                               GTK_POLICY_AUTOMATIC,
-					       GTK_POLICY_AUTOMATIC);
-		a.i = +1;
-		twitch(c, &a);
-		a.i = -1;
-		twitch(c, &a);
-	}
-}
-
 void
 togglestyle(Client *c, const Arg *arg)
 {
@@ -1381,104 +1413,53 @@ togglestyle(Client *c, const Arg *arg)
 }
 
 void
-gettogglestat(Client *c)
+toggleinspector(Client *c, const Arg *a)
 {
-	gboolean value;
-	int p = 0;
-	WebKitWebSettings *settings = webkit_web_view_get_settings(c->view);
-
-	togglestat[p++] = cookiepolicy_set(cookiepolicy_get());
-
-	g_object_get(G_OBJECT(settings), "enable-caret-browsing", &value,
-	             NULL);
-	togglestat[p++] = value? 'C': 'c';
-
-	togglestat[p++] = allowgeolocation? 'G': 'g';
-
-	togglestat[p++] = enablediskcache? 'D': 'd';
-
-	g_object_get(G_OBJECT(settings), "auto-load-images", &value, NULL);
-	togglestat[p++] = value? 'I': 'i';
-
-	g_object_get(G_OBJECT(settings), "enable-scripts", &value, NULL);
-	togglestat[p++] = value? 'S': 's';
-
-	g_object_get(G_OBJECT(settings), "enable-plugins", &value, NULL);
-	togglestat[p++] = value? 'V': 'v';
-
-	togglestat[p++] = enablestyle ? 'M': 'm';
-
-	togglestat[p] = '\0';
+	if (enableinspector) {
+		if (webkit_web_inspector_is_attached(c->inspector))
+			webkit_web_inspector_close(c->inspector);
+		else
+			webkit_web_inspector_show(c->inspector);
+	}
 }
 
 void
-getpagestat(Client *c)
+find(Client *c, const Arg *a)
 {
-	const char *uri = geturi(c);
+	const char *s, *f;
 
-	pagestats[0] = c->tlsflags > G_TLS_CERTIFICATE_VALIDATE_ALL ? '-' :
-	    c->tlsflags > 0 ? 'U' : 'T';
-	pagestat[1] = '\0';
-}
+	if (a && a->i) {
+		if (a->i > 0)
+			webkit_find_controller_search_next(c->finder);
+		else
+			webkit_find_controller_search_previous(c->finder);
+	} else {
+		s = getatom(c, AtomFind);
+		f = webkit_find_controller_get_search_text(c->finder);
 
-void
-updatetitle(Client *c)
-{
-	char *t;
+		if (g_strcmp0(f, s) == 0) /* reset search */
+			webkit_find_controller_search(c->finder, "", findopts, G_MAXUINT);
 
-	if (showindicators) {
-		gettogglestat(c);
-		getpagestat(c);
-
-		if (c->linkhover) {
-			t = g_strdup_printf("%s:%s | %s", togglestat, pagestat,
-			                    c->linkhover);
-		} else if (c->progress != 100) {
-			t = g_strdup_printf("[%i%%] %s:%s | %s", c->progress,
-			                    togglestat, pagestat,
-			                    c->title == NULL ? "" : c->title);
-		} else {
-			t = g_strdup_printf("%s:%s | %s", togglestat, pagestat,
-			                    c->title == NULL ? "" : c->title);
-		}
+		webkit_find_controller_search(c->finder, s, findopts, G_MAXUINT);
 
-		gtk_window_set_title(GTK_WINDOW(c->win), t);
-		g_free(t);
-	} else {
-		gtk_window_set_title(GTK_WINDOW(c->win), (c->title == NULL) ?
-		                     "" : c->title);
+		if (strcmp(s, "") == 0)
+			webkit_find_controller_search_finish(c->finder);
 	}
 }
 
 void
-updatewinid(Client *c)
+clicknavigate(Client *c, const Arg *a, WebKitHitTestResult *h)
 {
-	snprintf(winid, LENGTH(winid), "%lu", c->xid);
+	navigate(c, a);
 }
 
 void
-usage(void)
+clicknewwindow(Client *c, const Arg *a, WebKitHitTestResult *h)
 {
-	die("usage: %s [-bBdDfFgGiIkKmMnNpPsSvx] [-a cookiepolicies ] "
-	    "[-c cookiefile] [-e xid] [-r scriptfile] [-t stylefile] "
-	    "[-u useragent] [-z zoomlevel] [uri]\n", basename(argv0));
-}
+	Arg arg;
 
-void
-zoom(Client *c, const Arg *arg)
-{
-	c->zoomed = TRUE;
-	if (arg->i < 0) {
-		/* zoom out */
-		webkit_web_view_zoom_out(c->view);
-	} else if (arg->i > 0) {
-		/* zoom in */
-		webkit_web_view_zoom_in(c->view);
-	} else {
-		/* reset */
-		c->zoomed = FALSE;
-		webkit_web_view_set_zoom_level(c->view, 1.0);
-	}
+	arg.v = webkit_hit_test_result_get_link_uri(h);
+	newwindow(c, &arg, a->b);
 }
 
 int
@@ -1504,10 +1485,10 @@ main(int argc, char *argv[])
 		cookiefile = EARGF(usage());
 		break;
 	case 'd':
-		enablediskcache = 0;
+		enablecache = 0;
 		break;
 	case 'D':
-		enablediskcache = 1;
+		enablecache = 1;
 		break;
 	case 'e':
 		embed = strtol(EARGF(usage()), NULL, 0);
@@ -1597,4 +1578,3 @@ main(int argc, char *argv[])
 
 	return EXIT_SUCCESS;
 }
-