X-Git-Url: https://git.danieliu.xyz/?p=surf.git;a=blobdiff_plain;f=surf.c;h=16ec39881eabcaef8b1167c4f2d136e030b88e51;hp=30c3f8544594d6d28c3222d69a5137484656c11f;hb=e6cefa584e605b8a9984b1a542098df1191adcb1;hpb=42829cdad04c6191c6571d571cde051b16834e43

diff --git a/surf.c b/surf.c
index 30c3f85..16ec398 100644
--- a/surf.c
+++ b/surf.c
@@ -35,14 +35,26 @@ char *argv0;
 #define CLEANMASK(mask)         (mask & (MODKEY|GDK_SHIFT_MASK))
 
 enum { AtomFind, AtomGo, AtomUri, AtomLast };
+
+enum {
+	OnDoc   = WEBKIT_HIT_TEST_RESULT_CONTEXT_DOCUMENT,
+	OnLink  = WEBKIT_HIT_TEST_RESULT_CONTEXT_LINK,
+	OnImg   = WEBKIT_HIT_TEST_RESULT_CONTEXT_IMAGE,
+	OnMedia = WEBKIT_HIT_TEST_RESULT_CONTEXT_MEDIA,
+	OnEdit  = WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE,
+	OnBar   = WEBKIT_HIT_TEST_RESULT_CONTEXT_SCROLLBAR,
+	OnSel   = WEBKIT_HIT_TEST_RESULT_CONTEXT_SELECTION,
+	OnAny   = OnDoc | OnLink | OnImg | OnMedia | OnEdit | OnBar | OnSel,
+};
+
 enum {
-	ClkDoc   = WEBKIT_HIT_TEST_RESULT_CONTEXT_DOCUMENT,
-	ClkLink  = WEBKIT_HIT_TEST_RESULT_CONTEXT_LINK,
-	ClkImg   = WEBKIT_HIT_TEST_RESULT_CONTEXT_IMAGE,
-	ClkMedia = WEBKIT_HIT_TEST_RESULT_CONTEXT_MEDIA,
-	ClkSel   = WEBKIT_HIT_TEST_RESULT_CONTEXT_SELECTION,
-	ClkEdit  = WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE,
-	ClkAny   = ClkDoc | ClkLink | ClkImg | ClkMedia | ClkSel | ClkEdit,
+	CaretBrowsing,
+	FrameFlattening,
+	Geolocation,
+	JavaScript,
+	LoadImages,
+	Plugins,
+	ScrollBars,
 };
 
 typedef union Arg Arg;
@@ -57,11 +69,14 @@ typedef struct Client {
 	Window xid;
 	WebKitWebView *view;
 	WebKitWebInspector *inspector;
-	char *title, *linkhover;
+	WebKitFindController *finder;
+	WebKitHitTestResult *mousepos;
+	GTlsCertificateFlags tlsflags;
+	const char *title, *targeturi;
 	const char *needle;
 	gint progress;
 	struct Client *next;
-	gboolean zoomed, fullscreen, isinspecting, sslfailed;
+	gboolean fullscreen;
 } Client;
 
 typedef struct {
@@ -72,11 +87,12 @@ typedef struct {
 } Key;
 
 typedef struct {
-	unsigned int click;
+	unsigned int target;
 	unsigned int mask;
 	guint button;
-	void (*func)(Client *c, const Arg *arg);
+	void (*func)(Client *c, const Arg *a, WebKitHitTestResult *h);
 	const Arg arg;
+	unsigned int stopevent;
 } Button;
 
 typedef struct {
@@ -91,105 +107,92 @@ 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 char togglestats[10];
+static char pagestats[2];
 static GTlsDatabase *tlsdb;
 static int cookiepolicy;
 static char *stylefile = NULL;
 
 static void addaccelgroup(Client *c);
-static void beforerequest(WebKitWebView *w, WebKitWebFrame *f,
-                          WebKitWebResource *r, WebKitNetworkRequest *req,
-                          WebKitNetworkResponse *resp, Client *c);
 static char *buildfile(const char *path);
 static char *buildpath(const char *path);
-static gboolean buttonrelease(WebKitWebView *web, GdkEventButton *e, Client *c);
+static gboolean buttonreleased(GtkWidget *w, GdkEventKey *e, Client *c);
 static void cleanup(void);
-static void clipboard(Client *c, const Arg *arg);
+static void clipboard(Client *c, const Arg *a);
 
 static WebKitCookieAcceptPolicy cookiepolicy_get(void);
 static char cookiepolicy_set(const WebKitCookieAcceptPolicy p);
 
 static char *copystr(char **str, const char *src);
-static WebKitWebView *createwindow(WebKitWebView *v, WebKitWebFrame *f,
-                                   Client *c);
-static gboolean decidedownload(WebKitWebView *v, WebKitWebFrame *f,
-                               WebKitNetworkRequest *r, gchar *m,
-			       WebKitWebPolicyDecision *p, Client *c);
-static gboolean decidewindow(WebKitWebView *v, WebKitWebFrame *f,
-                             WebKitNetworkRequest *r, WebKitWebNavigationAction
-			     *n, WebKitWebPolicyDecision *p, Client *c);
-static gboolean deletion_interface(WebKitWebView *view,
-                                   WebKitDOMHTMLElement *arg1, Client *c);
+static GtkWidget *createview(WebKitWebView *v, WebKitNavigationAction *a,
+		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 eval(Client *c, const Arg *arg);
-static void find(Client *c, const Arg *arg);
-static void fullscreen(Client *c, const Arg *arg);
-static void geopolicyrequested(WebKitWebView *v, WebKitWebFrame *f,
-                               WebKitGeolocationPolicyDecision *d, Client *c);
+static void evalscript(Client *c, const char *jsstr, ...);
+static void runscript(Client *c);
+static void find(Client *c, const Arg *a);
+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 void gettogglestats(Client *c);
+static void getpagestats(Client *c);
 static char *geturi(Client *c);
 static const gchar *getstyle(const char *uri);
-static void setstyle(Client *c, const char *style);
+static void setstyle(Client *c, const char *stylefile);
 
-static void handleplumb(Client *c, WebKitWebView *w, const gchar *uri);
+static void handleplumb(Client *c, const gchar *uri);
 
-static gboolean initdownload(WebKitWebView *v, WebKitDownload *o, Client *c);
+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 inspector(Client *c, const Arg *arg);
-static WebKitWebView *inspector_new(WebKitWebInspector *i, WebKitWebView *v,
-                                    Client *c);
-static gboolean inspector_show(WebKitWebInspector *i, Client *c);
-static gboolean inspector_close(WebKitWebInspector *i, Client *c);
-static void inspector_finished(WebKitWebInspector *i, 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 linkhover(WebKitWebView *v, const char* t, const char* l,
-                      Client *c);
-static void loadstatuschange(WebKitWebView *view, GParamSpec *pspec,
-                             Client *c);
-static void loaduri(Client *c, const Arg *arg);
-static void navigate(Client *c, const Arg *arg);
-static Client *newclient(void);
+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 *a);
+static void navigate(Client *c, const Arg *a);
+static void clicknavigate(Client *c, const Arg *a, WebKitHitTestResult *h);
+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);
 static void pasteuri(GtkClipboard *clipboard, const char *text, gpointer d);
-static gboolean contextmenu(WebKitWebView *view, GtkWidget *menu,
-                            WebKitHitTestResult *target, gboolean keyboard,
-			    Client *c);
-static void menuactivate(GtkMenuItem *item, Client *c);
-static void print(Client *c, const Arg *arg);
+static void print(Client *c, const Arg *a);
 static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event,
                                 gpointer d);
-static void progresschange(WebKitWebView *view, GParamSpec *pspec, Client *c);
-static void linkopen(Client *c, const Arg *arg);
-static void linkopenembed(Client *c, const Arg *arg);
+static gboolean winevent(GtkWidget *w, GdkEvent *e, Client *c);
+static void progresschanged(WebKitWebView *v, GParamSpec *ps, Client *c);
+static void clicknewwindow(Client *c, const Arg *a, WebKitHitTestResult *h);
 static void reload(Client *c, const Arg *arg);
-static void scroll_h(Client *c, const Arg *arg);
-static void scroll_v(Client *c, const Arg *arg);
-static void scroll(GtkAdjustment *a, const Arg *arg);
+static void scroll_h(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 stop(Client *c, const Arg *arg);
-static void titlechange(WebKitWebView *view, GParamSpec *pspec, Client *c);
-static void titlechangeleave(void *a, void *b, Client *c);
-static void toggle(Client *c, const Arg *arg);
+static void titlechanged(WebKitWebView *view, GParamSpec *ps, Client *c);
+static void toggle(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 windowobjectcleared(GtkWidget *w, WebKitWebFrame *frame,
-                                JSContextRef js, JSObjectRef win, Client *c);
-static void zoom(Client *c, const Arg *arg);
+static void zoom(Client *c, const Arg *a);
 
 /* configuration, allows nested code to access above variables */
 #include "config.h"
@@ -209,35 +212,6 @@ addaccelgroup(Client *c)
 	gtk_window_add_accel_group(GTK_WINDOW(c->win), group);
 }
 
-void
-beforerequest(WebKitWebView *w, WebKitWebFrame *f, WebKitWebResource *r,
-              WebKitNetworkRequest *req, WebKitNetworkResponse *resp,
-	      Client *c)
-{
-	const gchar *uri = webkit_network_request_get_uri(req);
-	int i, isascii = 1;
-
-	if (g_str_has_suffix(uri, "/favicon.ico"))
-		webkit_network_request_set_uri(req, "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, w, uri);
-	}
-}
-
 char *
 buildfile(const char *path)
 {
@@ -301,27 +275,25 @@ buildpath(const char *path)
 }
 
 gboolean
-buttonrelease(WebKitWebView *web, GdkEventButton *e, Client *c)
+buttonreleased(GtkWidget *w, GdkEventKey *e, Client *c)
 {
-	WebKitHitTestResultContext context;
-	WebKitHitTestResult *result;
-	Arg arg;
-	unsigned int i;
-
-	result = webkit_web_view_get_hit_test_result(web, e);
-	g_object_get(result, "context", &context, NULL);
-	g_object_get(result, "link-uri", &arg.v, NULL);
-	for (i = 0; i < LENGTH(buttons); i++) {
-		if (context & buttons[i].click
-		    && e->button == buttons[i].button
-		    && CLEANMASK(e->state) == CLEANMASK(buttons[i].mask)
-		    && buttons[i].func) {
-			buttons[i].func(c, buttons[i].click == ClkLink
-			    && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg);
-			return true;
+	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;
+
+	return FALSE;
 }
 
 void
@@ -332,6 +304,7 @@ cleanup(void)
 	g_free(cookiefile);
 	g_free(scriptfile);
 	g_free(stylefile);
+	g_free(cachedir);
 }
 
 WebKitCookieAcceptPolicy
@@ -367,44 +340,41 @@ cookiepolicy_set(const WebKitCookieAcceptPolicy ep)
 }
 
 void
-evalscript(JSContextRef js, char *script, char* scriptname)
+evalscript(Client *c, const char *jsstr, ...)
 {
-	JSStringRef jsscript, jsscriptname;
-	JSValueRef exception = NULL;
+	va_list ap;
+	gchar *script;
+
+	va_start(ap, jsstr);
+	script = g_strdup_vprintf(jsstr, ap);
+	va_end(ap);
 
-	jsscript = JSStringCreateWithUTF8CString(script);
-	jsscriptname = JSStringCreateWithUTF8CString(scriptname);
-	JSEvaluateScript(js, jsscript, JSContextGetGlobalObject(js),
-	                 jsscriptname, 0, &exception);
-	JSStringRelease(jsscript);
-	JSStringRelease(jsscriptname);
+	webkit_web_view_run_javascript(c->view, script, NULL, NULL, NULL);
+	g_free(script);
 }
 
 void
-runscript(WebKitWebFrame *frame)
+runscript(Client *c)
 {
-	char *script;
-	GError *error;
+	gchar *script;
+	gsize l;
 
-	if (g_file_get_contents(scriptfile, &script, NULL, &error)) {
-		evalscript(webkit_web_frame_get_global_context(frame), script,
-		           scriptfile);
-	}
+	if (g_file_get_contents(scriptfile, &script, &l, NULL) && l)
+		evalscript(c, script);
+	g_free(script);
 }
 
 void
-clipboard(Client *c, const Arg *arg)
+clipboard(Client *c, const Arg *a)
 {
-	gboolean paste = *(gboolean *)arg;
-
-	if (paste) {
+	if (a->b) { /* load clipboard uri */
 		gtk_clipboard_request_text(gtk_clipboard_get(
 		                           GDK_SELECTION_PRIMARY),
 		                           pasteuri, c);
-	} else {
+	} else { /* copy uri */
 		gtk_clipboard_set_text(gtk_clipboard_get(
-		                       GDK_SELECTION_PRIMARY), c->linkhover
-		                       ? c->linkhover : geturi(c), -1);
+		                       GDK_SELECTION_PRIMARY), c->targeturi
+		                       ? c->targeturi : geturi(c), -1);
 	}
 }
 
@@ -421,45 +391,159 @@ copystr(char **str, const char *src)
 	return tmp;
 }
 
-WebKitWebView *
-createwindow(WebKitWebView  *v, WebKitWebFrame *f, Client *c)
+GtkWidget *
+createview(WebKitWebView *v, WebKitNavigationAction *a, Client *c)
 {
-	Client *n = newclient();
-	return n->view;
+	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
-decidedownload(WebKitWebView *v, WebKitWebFrame *f, WebKitNetworkRequest *r,
-               gchar *m,  WebKitWebPolicyDecision *p, Client *c)
+decidepolicy(WebKitWebView *v, WebKitPolicyDecision *d,
+    WebKitPolicyDecisionType dt, Client *c)
 {
-	if (!webkit_web_view_can_show_mime_type(v, m)) {
-		webkit_web_policy_decision_download(p);
-		return TRUE;
+	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 FALSE;
+	return TRUE;
 }
 
-gboolean
-decidewindow(WebKitWebView *view, WebKitWebFrame *f, WebKitNetworkRequest *r,
-             WebKitWebNavigationAction *n, WebKitWebPolicyDecision *p,
-	     Client *c)
+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;
 
-	if (webkit_web_navigation_action_get_reason(n)
-	    == WEBKIT_WEB_NAVIGATION_REASON_LINK_CLICKED) {
-		webkit_web_policy_decision_ignore(p);
-		arg.v = (void *)webkit_network_request_get_uri(r);
-		newwindow(NULL, &arg, 0);
-		return TRUE;
+	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;
 	}
-	return FALSE;
+
+	webkit_policy_decision_ignore(d);
 }
 
-gboolean
-deletion_interface(WebKitWebView *view, WebKitDOMHTMLElement *arg1, Client *c)
+void
+decideresource(WebKitPolicyDecision *d, Client *c)
 {
-	return FALSE;
+	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
@@ -468,10 +552,9 @@ destroyclient(Client *c)
 	Client *p;
 
 	webkit_web_view_stop_loading(c->view);
-	gtk_widget_destroy(GTK_WIDGET(c->view));
-	gtk_widget_destroy(c->scroll);
-	gtk_widget_destroy(c->vbox);
+	/* Not needed, has already been called
 	gtk_widget_destroy(c->win);
+	 */
 
 	for (p = clients; p && p->next != c; p = p->next)
 		;
@@ -480,14 +563,20 @@ destroyclient(Client *c)
 	else
 		clients = c->next;
 	free(c);
-	if (clients == NULL)
-		gtk_main_quit();
+}
+
+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
@@ -502,33 +591,51 @@ die(const char *errstr, ...)
 }
 
 void
-find(Client *c, const Arg *arg)
+find(Client *c, const Arg *a)
 {
-	const char *s;
+	const char *s, *f;
+
+	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);
+
+		if (g_strcmp0(f, s) == 0) /* reset search */
+			webkit_find_controller_search(c->finder, "", findopts, G_MAXUINT);
 
-	s = getatom(c, AtomFind);
-	gboolean forward = *(gboolean *)arg;
-	webkit_web_view_search_text(c->view, s, FALSE, forward, TRUE);
+		webkit_find_controller_search(c->finder, s, findopts, G_MAXUINT);
+
+		if (strcmp(s, "") == 0)
+			webkit_find_controller_search_finish(c->finder);
+	}
 }
 
 void
-fullscreen(Client *c, const Arg *arg)
+togglefullscreen(Client *c, const Arg *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));
-	c->fullscreen = !c->fullscreen;
 }
 
-void
-geopolicyrequested(WebKitWebView *v, WebKitWebFrame *f,
-                   WebKitGeolocationPolicyDecision *d, Client *c)
+gboolean
+permissionrequested(WebKitWebView *v, WebKitPermissionRequest *r, Client *c)
 {
-	if (allowgeolocation)
-		webkit_geolocation_policy_allow(d);
-	else
-		webkit_geolocation_policy_deny(d);
+	if (WEBKIT_IS_GEOLOCATION_PERMISSION_REQUEST(r)) {
+		if (allowgeolocation)
+			webkit_permission_request_allow(r);
+		else
+			webkit_permission_request_deny(r);
+		return TRUE;
+	}
+
+	return FALSE;
 }
 
 const char *
@@ -580,87 +687,66 @@ getstyle(const char *uri)
 }
 
 void
-setstyle(Client *c, const char *style)
+setstyle(Client *c, const char *stylefile)
 {
-	WebKitWebSettings *settings = webkit_web_view_get_settings(c->view);
+	gchar *style;
 
-	g_object_set(G_OBJECT(settings), "user-stylesheet-uri", style, NULL);
-}
+	if (!g_file_get_contents(stylefile, &style, NULL, NULL)) {
+		fprintf(stderr, "Could not read style file: %s\n", stylefile);
+		return;
+	}
 
-void
-handleplumb(Client *c, WebKitWebView *w, const gchar *uri)
-{
-	Arg arg;
+	webkit_user_content_manager_add_style_sheet(
+	    webkit_web_view_get_user_content_manager(c->view),
+	    webkit_user_style_sheet_new(style,
+	    WEBKIT_USER_CONTENT_INJECT_ALL_FRAMES,
+	    WEBKIT_USER_STYLE_LEVEL_USER,
+	    NULL, NULL));
 
-	webkit_web_view_stop_loading(w);
-	arg = (Arg)PLUMB((char *)uri);
-	spawn(c, &arg);
+	g_free(style);
 }
 
-gboolean
-initdownload(WebKitWebView *view, WebKitDownload *o, Client *c)
+void
+handleplumb(Client *c, const gchar *uri)
 {
 	Arg arg;
 
-	updatewinid(c);
-	arg = (Arg)DOWNLOAD((char *)webkit_download_get_uri(o), geturi(c));
+	arg = (Arg)PLUMB(uri);
 	spawn(c, &arg);
-	return FALSE;
 }
 
 void
-inspector(Client *c, const Arg *arg)
+downloadstarted(WebKitWebContext *wc, WebKitDownload *d, Client *c)
 {
-	if (enableinspector) {
-		if (c->isinspecting)
-			webkit_web_inspector_close(c->inspector);
-		else
-			webkit_web_inspector_show(c->inspector);
-	}
+	g_signal_connect(G_OBJECT(d), "notify::response",
+	    G_CALLBACK(responsereceived), c);
 }
 
-WebKitWebView *
-inspector_new(WebKitWebInspector *i, WebKitWebView *v, Client *c)
-{
-	return WEBKIT_WEB_VIEW(webkit_web_view_new());
-}
-
-gboolean
-inspector_show(WebKitWebInspector *i, Client *c)
+void
+responsereceived(WebKitDownload *d, GParamSpec *ps, Client *c)
 {
-	WebKitWebView *w;
-
-	if (c->isinspecting)
-		return false;
-
-	w = webkit_web_inspector_get_web_view(i);
-	gtk_paned_pack2(GTK_PANED(c->pane), GTK_WIDGET(w), TRUE, TRUE);
-	gtk_widget_show(GTK_WIDGET(w));
-	c->isinspecting = true;
-
-	return true;
+	download(c, webkit_download_get_response(d));
+	webkit_download_cancel(d);
 }
 
-gboolean
-inspector_close(WebKitWebInspector *i, Client *c)
+void
+download(Client *c, WebKitURIResponse *r)
 {
-	GtkWidget *w;
-
-	if (!c->isinspecting)
-		return false;
-
-	w = GTK_WIDGET(webkit_web_inspector_get_web_view(i));
-	gtk_widget_hide(w);
-	gtk_widget_destroy(w);
-	c->isinspecting = false;
+	Arg a;
 
-	return true;
+	a = (Arg)DOWNLOAD(webkit_uri_response_get_uri(r), geturi(c));
+	spawn(c, &a);
 }
 
 void
-inspector_finished(WebKitWebInspector *i, Client *c)
+toggleinspector(Client *c, const Arg *a)
 {
-	g_free(c->inspector);
+	if (enableinspector) {
+		if (webkit_web_inspector_is_attached(c->inspector))
+			webkit_web_inspector_close(c->inspector);
+		else
+			webkit_web_inspector_show(c->inspector);
+	}
 }
 
 gboolean
@@ -686,103 +772,110 @@ keypress(GtkAccelGroup *group, GObject *obj, guint key, GdkModifierType mods,
 }
 
 void
-linkhover(WebKitWebView *v, const char* t, const char* l, Client *c)
+mousetargetchanged(WebKitWebView *v, WebKitHitTestResult *h, guint modifiers,
+    Client *c)
 {
-	if (l) {
-		c->linkhover = copystr(&c->linkhover, l);
-	} else if (c->linkhover) {
-		free(c->linkhover);
-		c->linkhover = NULL;
-	}
+	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);
 }
 
 void
-loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c)
+loadchanged(WebKitWebView *v, WebKitLoadEvent e, Client *c)
 {
-	WebKitWebFrame *frame;
-	WebKitWebDataSource *src;
-	WebKitNetworkRequest *request;
-	SoupMessage *msg;
-	char *uri;
-
-	switch (webkit_web_view_get_load_status (c->view)) {
+	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:
-		uri = geturi(c);
-		if (strstr(uri, "https://") == uri) {
-			frame = webkit_web_view_get_main_frame(c->view);
-			src = webkit_web_frame_get_data_source(frame);
-			request = webkit_web_data_source_get_request(src);
-			msg = webkit_network_request_get_message(request);
-			c->sslfailed = !(soup_message_get_flags(msg)
-			               & SOUP_MESSAGE_CERTIFICATE_TRUSTED);
-		}
-		setatom(c, AtomUri, uri);
+		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(uri));
+			setstyle(c, getstyle(geturi(c)));
 		break;
 	case WEBKIT_LOAD_FINISHED:
-		c->progress = 100;
-		updatetitle(c);
-		break;
-	default:
+		/* 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
-loaduri(Client *c, const Arg *arg)
+loaduri(Client *c, const Arg *a)
 {
-	char *u = NULL, *rp;
-	const char *uri = (char *)arg->v;
-	Arg a = { .b = FALSE };
 	struct stat st;
+	char *url, *path;
+	const char *uri = (char *)a->v;
 
-	if (strcmp(uri, "") == 0)
+	if (g_strcmp0(uri, "") == 0)
 		return;
 
-	/* 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);
+	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 {
-		u = g_strrstr(uri, "://") ? g_strdup(uri)
-		    : g_strdup_printf("http://%s", uri);
+		url = g_strdup_printf("http://%s", uri);
 	}
 
-	setatom(c, AtomUri, uri);
+	setatom(c, AtomUri, url);
 
-	/* prevents endless loop */
-	if (strcmp(u, geturi(c)) == 0) {
-		reload(c, &a);
+	if (strcmp(url, geturi(c)) == 0) {
+		reload(c, a);
 	} else {
-		webkit_web_view_load_uri(c->view, u);
-		c->progress = 0;
-		c->title = copystr(&c->title, u);
+		webkit_web_view_load_uri(c->view, url);
+		c->title = geturi(c);
 		updatetitle(c);
 	}
-	g_free(u);
+
+	g_free(url);
 }
 
 void
-navigate(Client *c, const Arg *arg)
+navigate(Client *c, const Arg *a)
 {
-	int steps = *(int *)arg;
-	webkit_web_view_go_back_or_forward(c->view, steps);
+	if (a->i < 0)
+		webkit_web_view_go_back(c->view);
+	else if (a->i > 0)
+		webkit_web_view_go_forward(c->view);
+}
+
+void
+clicknavigate(Client *c, const Arg *a, WebKitHitTestResult *h)
+{
+	navigate(c, a);
 }
 
 Client *
-newclient(void)
+newclient(Client *rc)
 {
 	Client *c;
-	WebKitWebSettings *settings;
-	GdkGeometry hints = { 1, 1 };
-	GdkScreen *screen;
-	GdkWindow *gwin;
 	gdouble dpi;
-	char *ua;
 
 	if (!(c = calloc(1, sizeof(Client))))
 		die("Cannot malloc!\n");
@@ -790,82 +883,133 @@ newclient(void)
 	c->title = NULL;
 	c->progress = 100;
 
-	/* Window */
-	if (embed) {
-		c->win = gtk_plug_new(embed);
-	} else {
-		c->win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+	c->next = clients;
+	clients = c;
 
-		/* 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(c->win), "surf", "Surf");
+	c->view = newview(c, rc ? rc->view : NULL);
+	c->tlsflags = G_TLS_CERTIFICATE_VALIDATE_ALL + 1;
 
-		/* TA:  20091214:  And set the role here as well -- so that
-		 * sessions can pick this up.
-		 */
-		gtk_window_set_role(GTK_WINDOW(c->win), "Surf");
-	}
-	gtk_window_set_default_size(GTK_WINDOW(c->win), 800, 600);
-	g_signal_connect(G_OBJECT(c->win),
-	                 "destroy",
-			 G_CALLBACK(destroywin), c);
-	g_signal_connect(G_OBJECT(c->win),
-	                 "leave_notify_event",
-			 G_CALLBACK(titlechangeleave), c);
+	return c;
+}
 
-	if (!kioskmode)
-		addaccelgroup(c);
+WebKitWebView *
+newview(Client *c, WebKitWebView *rv)
+{
+	WebKitWebView *v;
+	WebKitSettings *settings;
+	WebKitUserContentManager *contentmanager;
+	WebKitWebContext *context;
+	char *ua;
 
 	/* Webview */
-	c->view = WEBKIT_WEB_VIEW(webkit_web_view_new());
+	if (rv) {
+		v = WEBKIT_WEB_VIEW(
+		    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);
+		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 */
+
+		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));
+
+		/* 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);
+		/* disk cache */
+		webkit_web_context_set_cache_model(context, enablecache ?
+		    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(
+		    webkit_web_context_get_cookie_manager(context), cookiefile,
+		    WEBKIT_COOKIE_PERSISTENT_STORAGE_TEXT);
+		/* cookie policy */
+		webkit_cookie_manager_set_accept_policy(
+		    webkit_web_context_get_cookie_manager(context),
+		    cookiepolicy_get());
+
+		g_signal_connect(G_OBJECT(context), "download-started",
+		    G_CALLBACK(downloadstarted), c);
+
+		v = g_object_new(WEBKIT_TYPE_WEB_VIEW,
+		    "settings", settings,
+		    "user-content-manager", contentmanager,
+		    "web-context", context,
+		    NULL);
+	}
 
-	g_signal_connect(G_OBJECT(c->view),
+	g_signal_connect(G_OBJECT(v),
 	                 "notify::title",
-			 G_CALLBACK(titlechange), c);
-	g_signal_connect(G_OBJECT(c->view),
-	                 "hovering-over-link",
-			 G_CALLBACK(linkhover), c);
-	g_signal_connect(G_OBJECT(c->view),
-	                 "geolocation-policy-decision-requested",
-			 G_CALLBACK(geopolicyrequested), c);
-	g_signal_connect(G_OBJECT(c->view),
-	                 "create-web-view",
-			 G_CALLBACK(createwindow), c);
-	g_signal_connect(G_OBJECT(c->view),
-	                 "new-window-policy-decision-requested",
-			 G_CALLBACK(decidewindow), c);
-	g_signal_connect(G_OBJECT(c->view),
-	                 "mime-type-policy-decision-requested",
-			 G_CALLBACK(decidedownload), c);
-	g_signal_connect(G_OBJECT(c->view),
-	                 "window-object-cleared",
-			 G_CALLBACK(windowobjectcleared), c);
-	g_signal_connect(G_OBJECT(c->view),
-	                 "notify::load-status",
-			 G_CALLBACK(loadstatuschange), c);
-	g_signal_connect(G_OBJECT(c->view),
-	                 "notify::progress",
-			 G_CALLBACK(progresschange), c);
-	g_signal_connect(G_OBJECT(c->view),
-	                 "download-requested",
-			 G_CALLBACK(initdownload), c);
-	g_signal_connect(G_OBJECT(c->view),
+			 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(buttonrelease), c);
-	g_signal_connect(G_OBJECT(c->view),
-	                 "context-menu",
-			 G_CALLBACK(contextmenu), c);
-	g_signal_connect(G_OBJECT(c->view),
-	                 "resource-request-starting",
-			 G_CALLBACK(beforerequest), c);
-	g_signal_connect(G_OBJECT(c->view),
-	                 "should-show-delete-interface-for-element",
-			 G_CALLBACK(deletion_interface), c);
+			 G_CALLBACK(buttonreleased), c);
+	g_signal_connect(G_OBJECT(v), "close",
+			G_CALLBACK(closeview), c);
+
+	return v;
+}
+
+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);
+
+	if (!kioskmode)
+		addaccelgroup(c);
 
 	/* Arranging */
 	gtk_container_add(GTK_CONTAINER(c->win), GTK_WIDGET(c->view));
@@ -880,74 +1024,17 @@ newclient(void)
 				      GDK_HINT_MIN_SIZE);
 	gdk_window_set_events(gwin, GDK_ALL_EVENTS_MASK);
 	gdk_window_add_filter(gwin, processx, c);
-	webkit_web_view_set_full_content_zoom(c->view, TRUE);
-
-	runscript(frame);
-
-	settings = webkit_web_view_get_settings(c->view);
-	if (!(ua = getenv("SURF_USERAGENT")))
-		ua = useragent;
-	g_object_set(G_OBJECT(settings), "user-agent", ua, NULL);
-	g_object_set(G_OBJECT(settings),
-	             "auto-load-images", loadimages, NULL);
-	g_object_set(G_OBJECT(settings),
-	             "enable-plugins", enableplugins, NULL);
-	g_object_set(G_OBJECT(settings),
-	             "enable-scripts", enablescripts, NULL);
-	g_object_set(G_OBJECT(settings),
-		     "enable-spatial-navigation", enablespatialbrowsing, NULL);
-	g_object_set(G_OBJECT(settings),
-	             "enable-developer-extras", enableinspector, NULL);
-	g_object_set(G_OBJECT(settings),
-	             "enable-default-context-menu", kioskmode ^ 1, NULL);
-	g_object_set(G_OBJECT(settings),
-	             "default-font-size", defaultfontsize, NULL);
-	g_object_set(G_OBJECT(settings),
-	             "resizable-text-areas", 1, NULL);
-	if (enablestyle)
-		setstyle(c, getstyle("about:blank"));
-
-	/*
-	 * While stupid, CSS specifies that a pixel represents 1/96 of an inch.
-	 * This ensures websites are not unusably small with a high DPI screen.
-	 * It is equivalent to firefox's "layout.css.devPixelsPerPx" setting.
-	 */
-	if (zoomto96dpi) {
-		screen = gdk_window_get_screen(gwin);
-		dpi = gdk_screen_get_resolution(screen);
-		if (dpi != -1) {
-			g_object_set(G_OBJECT(settings),
-			             "enforce-96-dpi", true, NULL);
-			webkit_web_view_set_zoom_level(c->view, dpi/96);
-		}
-	}
-	/* This might conflict with _zoomto96dpi_. */
+
 	if (zoomlevel != 1.0)
 		webkit_web_view_set_zoom_level(c->view, zoomlevel);
 
-	if (enableinspector) {
-		c->inspector = webkit_web_view_get_inspector(c->view);
-		g_signal_connect(G_OBJECT(c->inspector), "inspect-web-view",
-		                 G_CALLBACK(inspector_new), c);
-		g_signal_connect(G_OBJECT(c->inspector), "show-window",
-		                 G_CALLBACK(inspector_show), c);
-		g_signal_connect(G_OBJECT(c->inspector), "close-window",
-		                 G_CALLBACK(inspector_close), c);
-		g_signal_connect(G_OBJECT(c->inspector), "finished",
-		                 G_CALLBACK(inspector_finished), c);
-		c->isinspecting = false;
-	}
-
 	if (runinfullscreen)
-		fullscreen(c, NULL);
+		togglefullscreen(c, NULL);
 
 	setatom(c, AtomFind, "");
 	setatom(c, AtomUri, "about:blank");
 	if (hidebackground)
-		webkit_web_view_set_transparent(c->view, TRUE);
-
-	c->next = clients;
-	clients = c;
+		webkit_web_view_set_background_color(c->view, &bgcolor);
 
 	if (showxid) {
 		gdk_display_sync(gtk_widget_get_display(c->win));
@@ -957,8 +1044,6 @@ newclient(void)
 			die("Error closing stdout");
                 }
 	}
-
-	return c;
 }
 
 void
@@ -991,7 +1076,7 @@ newwindow(Client *c, const Arg *arg, gboolean noembed)
 		cmd[i++] = "-s";
 	if (showxid)
 		cmd[i++] = "-x";
-	if (enablediskcache)
+	if (enablecache)
 		cmd[i++] = "-D";
 	cmd[i++] = "-c";
 	cmd[i++] = cookiefile;
@@ -1003,51 +1088,41 @@ newwindow(Client *c, const Arg *arg, gboolean noembed)
 	spawn(NULL, &a);
 }
 
-gboolean
-contextmenu(WebKitWebView *view, GtkWidget *menu, WebKitHitTestResult *target,
-            gboolean keyboard, Client *c)
+GtkWidget *
+createwindow(Client *c)
 {
-	GList *items = gtk_container_get_children(GTK_CONTAINER(GTK_MENU(menu)));
+	GtkWidget *w;
 
-	for (GList *l = items; l; l = l->next)
-		g_signal_connect(l->data, "activate", G_CALLBACK(menuactivate), c);
+	if (embed) {
+		w = gtk_plug_new(embed);
+	} else {
+		w = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 
-	g_list_free(items);
-	return FALSE;
-}
+		/* 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");
 
-void
-menuactivate(GtkMenuItem *item, Client *c)
-{
-	/*
-	 * context-menu-action-2000 open link
-	 * context-menu-action-1    open link in window
-	 * context-menu-action-2    download linked file
-	 * context-menu-action-3    copy link location
-	 * context-menu-action-7    copy image address
-	 * context-menu-action-13   reload
-	 * context-menu-action-10   back
-	 * context-menu-action-11   forward
-	 * context-menu-action-12   stop
-	 */
+		/* TA:  20091214:  And set the role here as well -- so that
+		 * sessions can pick this up.
+		 */
+		gtk_window_set_role(GTK_WINDOW(w), "Surf");
 
-	const gchar *name, *uri;
-	GtkClipboard *prisel, *clpbrd;
+		gtk_window_set_default_size(GTK_WINDOW(w), 800, 600);
+	}
 
-	name = gtk_actionable_get_action_name(GTK_ACTIONABLE(item));
-	if (name == NULL)
-		return;
+	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);
 
-	if (!g_strcmp0(name, "context-menu-action-3")) {
-		prisel = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
-		gtk_clipboard_set_text(prisel, c->linkhover, -1);
-	} else if (!g_strcmp0(name, "context-menu-action-7")) {
-		prisel = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
-		clpbrd = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
-		uri = gtk_clipboard_wait_for_text(clpbrd);
-		if (uri)
-			gtk_clipboard_set_text(prisel, uri, -1);
-	}
+	return w;
 }
 
 void
@@ -1059,9 +1134,10 @@ pasteuri(GtkClipboard *clipboard, const char *text, gpointer d)
 }
 
 void
-print(Client *c, const Arg *arg)
+print(Client *c, const Arg *a)
 {
-	webkit_web_frame_print(webkit_web_view_get_main_frame(c->view));
+	webkit_print_operation_run_dialog(webkit_print_operation_new(c->view),
+	    GTK_WINDOW(c->win));
 }
 
 GdkFilterReturn
@@ -1075,8 +1151,7 @@ processx(GdkXEvent *e, GdkEvent *event, gpointer d)
 		ev = &((XEvent *)e)->xproperty;
 		if (ev->state == PropertyNewValue) {
 			if (ev->atom == atoms[AtomFind]) {
-				arg.b = TRUE;
-				find(c, &arg);
+				find(c, NULL);
 
 				return GDK_FILTER_REMOVE;
 			} else if (ev->atom == atoms[AtomGo]) {
@@ -1091,22 +1166,20 @@ processx(GdkXEvent *e, GdkEvent *event, gpointer d)
 }
 
 void
-progresschange(WebKitWebView *view, GParamSpec *pspec, Client *c)
+progresschanged(WebKitWebView *v, GParamSpec *ps, Client *c)
 {
-	c->progress = webkit_web_view_get_progress(c->view) * 100;
+	c->progress = webkit_web_view_get_estimated_load_progress(c->view) *
+	    100;
 	updatetitle(c);
 }
 
 void
-linkopen(Client *c, const Arg *arg)
+clicknewwindow(Client *c, const Arg *a, WebKitHitTestResult *h)
 {
-	newwindow(NULL, arg, 1);
-}
+	Arg arg;
 
-void
-linkopenembed(Client *c, const Arg *arg)
-{
-	newwindow(NULL, arg, 0);
+	arg.v = webkit_hit_test_result_get_link_uri(h);
+	newwindow(c, &arg, a->b);
 }
 
 void
@@ -1120,40 +1193,17 @@ reload(Client *c, const Arg *arg)
 }
 
 void
-scroll_h(Client *c, const Arg *arg)
+scroll_h(Client *c, const Arg *a)
 {
-	scroll(gtk_scrolled_window_get_hadjustment(
-	       GTK_SCROLLED_WINDOW(c->scroll)), arg);
+	evalscript(c, "window.scrollBy(%d * (window.innerWidth / 100), 0)",
+	    a->i);
 }
 
 void
-scroll_v(Client *c, const Arg *arg)
+scroll_v(Client *c, const Arg *a)
 {
-	scroll(gtk_scrolled_window_get_vadjustment(
-	       GTK_SCROLLED_WINDOW(c->scroll)), arg);
-}
-
-void
-scroll(GtkAdjustment *a, const Arg *arg)
-{
-	gdouble v;
-
-	v = gtk_adjustment_get_value(a);
-	switch (arg->i) {
-	case +10000:
-	case -10000:
-		v += gtk_adjustment_get_page_increment(a) * (arg->i / 10000);
-		break;
-	case +20000:
-	case -20000:
-	default:
-		v += gtk_adjustment_get_step_increment(a) * 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);
+	evalscript(c, "window.scrollBy(0, %d * (window.innerHeight / 100))",
+	    a->i);
 }
 
 void
@@ -1169,7 +1219,6 @@ void
 setup(void)
 {
 	int i;
-	char *styledirfile, *stylepath;
 	WebKitWebContext *context;
 	GError *error = NULL;
 
@@ -1187,7 +1236,8 @@ setup(void)
 	/* dirs and files */
 	cookiefile = buildfile(cookiefile);
 	scriptfile = buildfile(scriptfile);
-	cachefolder = buildpath(cachefolder);
+	cachedir   = buildpath(cachedir);
+
 	if (stylefile == NULL) {
 		styledir = buildpath(styledir);
 		for (i = 0; i < LENGTH(styles); i++) {
@@ -1198,38 +1248,13 @@ setup(void)
 				        styles[i].regex);
 				styles[i].regex = NULL;
 			}
-			styledirfile    = g_strconcat(styledir, "/",
-			                              styles[i].style, NULL);
-			stylepath       = buildfile(styledirfile);
-			styles[i].style = g_strconcat("file://", stylepath,
-			                              NULL);
-			g_free(styledirfile);
-			g_free(stylepath);
+			styles[i].style = g_strconcat(styledir, "/",
+			    styles[i].style, NULL);
 		}
 		g_free(styledir);
 	} else {
-		stylepath = buildfile(stylefile);
-		stylefile = g_strconcat("file://", stylepath, NULL);
-		g_free(stylepath);
+		stylefile = buildfile(stylefile);
 	}
-
-	/* cookie policy */
-	webkit_cookie_manager_set_persistent_storage(
-	    webkit_web_context_get_cookie_manager(context), cookiefile,
-	    WEBKIT_COOKIE_PERSISTENT_STORAGE_TEXT);
-	webkit_cookie_manager_set_accept_policy(
-	    webkit_web_context_get_cookie_manager(context),
-	    cookiepolicy_get());
-
-	/* disk cache */
-	webkit_web_context_set_cache_model(context, enablecache ?
-	    WEBKIT_CACHE_MODEL_WEB_BROWSER :
-	    WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER);
-
-	/* ssl */
-	webkit_web_context_set_tls_errors_policy(context, strictssl ?
-	    WEBKIT_TLS_ERRORS_POLICY_FAIL :
-	    WEBKIT_TLS_ERRORS_POLICY_IGNORE);
 }
 
 void
@@ -1255,49 +1280,88 @@ spawn(Client *c, const Arg *arg)
 }
 
 void
-eval(Client *c, const Arg *arg)
+stop(Client *c, const Arg *arg)
 {
-	WebKitWebFrame *frame = webkit_web_view_get_main_frame(c->view);
-	evalscript(webkit_web_frame_get_global_context(frame),
-	           ((char **)arg->v)[0], "");
+	webkit_web_view_stop_loading(c->view);
 }
 
 void
-stop(Client *c, const Arg *arg)
+titlechanged(WebKitWebView *view, GParamSpec *ps, Client *c)
 {
-	webkit_web_view_stop_loading(c->view);
+	c->title = webkit_web_view_get_title(c->view);
+	updatetitle(c);
 }
 
-void
-titlechange(WebKitWebView *view, GParamSpec *pspec, Client *c)
+gboolean
+winevent(GtkWidget *w, GdkEvent *e, Client *c)
 {
-	const gchar *t = webkit_web_view_get_title(view);
-	if (t) {
-		c->title = copystr(&c->title, t);
+	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;
 	}
-}
 
-void
-titlechangeleave(void *a, void *b, Client *c)
-{
-	c->linkhover = NULL;
-	updatetitle(c);
+	return TRUE;
 }
 
 void
-toggle(Client *c, const Arg *arg)
+toggle(Client *c, const Arg *a)
 {
-	WebKitWebSettings *settings;
-	char *name = (char *)arg->v;
-	gboolean value;
-	Arg a = { .b = FALSE };
+	WebKitSettings *s;
 
-	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);
+	s = webkit_web_view_get_settings(c->view);
 
-	reload(c, &a);
+	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);
 }
 
 void
@@ -1315,58 +1379,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)
 {
@@ -1377,75 +1389,52 @@ togglestyle(Client *c, const Arg *arg)
 }
 
 void
-gettogglestat(Client *c)
+gettogglestats(Client *c)
 {
-	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';
+	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
-getpagestat(Client *c)
+getpagestats(Client *c)
 {
-	const char *uri = geturi(c);
-
-	if (strstr(uri, "https://") == uri)
-		pagestat[0] = c->sslfailed ? 'U' : 'T';
-	else
-		pagestat[0] = '-';
-
-	pagestat[1] = '\0';
+	pagestats[0] = c->tlsflags > G_TLS_CERTIFICATE_VALIDATE_ALL ? '-' :
+	    c->tlsflags > 0 ? 'U' : 'T';
+	pagestats[1] = '\0';
 }
 
 void
 updatetitle(Client *c)
 {
-	char *t;
+	char *title;
 
 	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);
+		gettogglestats(c);
+		getpagestats(c);
+
+		if (c->progress != 100) {
+			title = g_strdup_printf("[%i%%] %s:%s | %s",
+			    c->progress, togglestats, pagestats,
+			    c->targeturi ? c->targeturi : c->title);
 		} else {
-			t = g_strdup_printf("%s:%s | %s", togglestat, pagestat,
-			                    c->title == NULL ? "" : c->title);
+			title = g_strdup_printf("%s:%s | %s",
+			    togglestats, pagestats,
+			    c->targeturi ? c->targeturi : c->title);
 		}
 
-		gtk_window_set_title(GTK_WINDOW(c->win), t);
-		g_free(t);
+		gtk_window_set_title(GTK_WINDOW(c->win), title);
+		g_free(title);
 	} else {
-		gtk_window_set_title(GTK_WINDOW(c->win), (c->title == NULL) ?
-		                     "" : c->title);
+		gtk_window_set_title(GTK_WINDOW(c->win), c->title ?
+		    c->title : "");
 	}
 }
 
@@ -1464,27 +1453,16 @@ usage(void)
 }
 
 void
-windowobjectcleared(GtkWidget *w, WebKitWebFrame *frame, JSContextRef js,
-                    JSObjectRef win, Client *c)
+zoom(Client *c, const Arg *a)
 {
-	runscript(frame);
-}
-
-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;
+	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);
 }
 
 int
@@ -1510,10 +1488,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);
@@ -1591,7 +1569,8 @@ main(int argc, char *argv[])
 		arg.v = argv[0];
 
 	setup();
-	c = newclient();
+	c = newclient(NULL);
+	showview(NULL, c);
 	if (arg.v)
 		loaduri(clients, &arg);
 	else