X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=surf.c;h=23ea087744bd9f2efa2a96b5f4efe04cfb7b136f;hb=1f99df029c5c190941a20ed87344aeef56f76418;hp=b2980309a08bf05b590cbed7fd3afda9ff039156;hpb=94f2f2eacef96aa3f34124352232aac3a17c995f;p=surf.git

diff --git a/surf.c b/surf.c
index b298030..23ea087 100644
--- a/surf.c
+++ b/surf.c
@@ -35,14 +35,16 @@ char *argv0;
 #define CLEANMASK(mask)         (mask & (MODKEY|GDK_SHIFT_MASK))
 
 enum { AtomFind, AtomGo, AtomUri, AtomLast };
+
 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,
+	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,
 };
 
 typedef union Arg Arg;
@@ -53,11 +55,12 @@ union Arg {
 };
 
 typedef struct Client {
-	GtkWidget *win, *scroll, *vbox, *pane;
+	GtkWidget *win;
 	Window xid;
 	WebKitWebView *view;
 	WebKitWebInspector *inspector;
-	char *title, *linkhover;
+	WebKitHitTestResult *mousepos;
+	const char *title, *targeturi;
 	const char *needle;
 	gint progress;
 	struct Client *next;
@@ -111,8 +114,8 @@ 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 GtkWidget *createview(WebKitWebView *v, WebKitNavigationAction *a,
+		Client *c);
 static gboolean decidedownload(WebKitWebView *v, WebKitWebFrame *f,
                                WebKitNetworkRequest *r, gchar *m,
 			       WebKitWebPolicyDecision *p, Client *c);
@@ -127,8 +130,8 @@ 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 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);
@@ -149,13 +152,15 @@ static void inspector_finished(WebKitWebInspector *i, Client *c);
 
 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 mousetargetchanged(WebKitWebView *v, WebKitHitTestResult *h,
+		guint modifiers, 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 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 void pasteuri(GtkClipboard *clipboard, const char *text, gpointer d);
 static gboolean contextmenu(WebKitWebView *view, GtkWidget *menu,
@@ -177,7 +182,7 @@ 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 titlechanged(WebKitWebView *view, GParamSpec *ps, Client *c);
 static void titlechangeleave(void *a, void *b, Client *c);
 static void toggle(Client *c, const Arg *arg);
 static void togglecookiepolicy(Client *c, const Arg *arg);
@@ -332,6 +337,7 @@ cleanup(void)
 	g_free(cookiefile);
 	g_free(scriptfile);
 	g_free(stylefile);
+	g_free(cachedir);
 }
 
 WebKitCookieAcceptPolicy
@@ -421,11 +427,34 @@ 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
+		 */
+		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
@@ -521,14 +550,18 @@ fullscreen(Client *c, const Arg *arg)
 	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 *
@@ -686,14 +719,24 @@ 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);
 }
 
@@ -774,16 +817,10 @@ navigate(Client *c, const Arg *arg)
 }
 
 Client *
-newclient(void)
+newclient(Client *rc)
 {
 	Client *c;
-	WebKitWebSettings *settings;
-	WebKitWebFrame *frame;
-	GdkGeometry hints = { 1, 1 };
-	GdkScreen *screen;
-	GdkWindow *gwin;
 	gdouble dpi;
-	char *ua;
 
 	if (!(c = calloc(1, sizeof(Client))))
 		die("Cannot malloc!\n");
@@ -791,119 +828,172 @@ 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);
-
-		/* 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");
-
-		/* 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);
+	c->next = clients;
+	clients = c;
 
-	if (!kioskmode)
-		addaccelgroup(c);
+	c->view = newview(c, rc ? rc->view : NULL);
 
-	/* Pane */
-	c->pane = gtk_paned_new(GTK_ORIENTATION_VERTICAL);
+	return c;
+}
 
-	/* VBox */
-	c->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
-	gtk_paned_pack1(GTK_PANED(c->pane), c->vbox, TRUE, TRUE);
+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());
+
+		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),
+			 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),
 	                 "new-window-policy-decision-requested",
 			 G_CALLBACK(decidewindow), c);
-	g_signal_connect(G_OBJECT(c->view),
+	g_signal_connect(G_OBJECT(v),
 	                 "mime-type-policy-decision-requested",
 			 G_CALLBACK(decidedownload), c);
-	g_signal_connect(G_OBJECT(c->view),
+	g_signal_connect(G_OBJECT(v),
 	                 "window-object-cleared",
 			 G_CALLBACK(windowobjectcleared), c);
-	g_signal_connect(G_OBJECT(c->view),
+	g_signal_connect(G_OBJECT(v),
 	                 "notify::load-status",
 			 G_CALLBACK(loadstatuschange), c);
-	g_signal_connect(G_OBJECT(c->view),
+	g_signal_connect(G_OBJECT(v),
 	                 "notify::progress",
 			 G_CALLBACK(progresschange), c);
-	g_signal_connect(G_OBJECT(c->view),
+	g_signal_connect(G_OBJECT(v),
 	                 "download-requested",
 			 G_CALLBACK(initdownload), c);
-	g_signal_connect(G_OBJECT(c->view),
+	g_signal_connect(G_OBJECT(v),
 	                 "button-release-event",
 			 G_CALLBACK(buttonrelease), c);
-	g_signal_connect(G_OBJECT(c->view),
+	g_signal_connect(G_OBJECT(v),
 	                 "context-menu",
 			 G_CALLBACK(contextmenu), c);
-	g_signal_connect(G_OBJECT(c->view),
+	g_signal_connect(G_OBJECT(v),
 	                 "resource-request-starting",
 			 G_CALLBACK(beforerequest), c);
-	g_signal_connect(G_OBJECT(c->view),
+	g_signal_connect(G_OBJECT(v),
 	                 "should-show-delete-interface-for-element",
 			 G_CALLBACK(deletion_interface), c);
 
-	/* Scrolled Window */
-	c->scroll = gtk_scrolled_window_new(NULL, NULL);
+	return v;
+}
 
-	frame = webkit_web_view_get_main_frame(WEBKIT_WEB_VIEW(c->view));
-	g_signal_connect(G_OBJECT(frame), "scrollbars-policy-changed",
-	                 G_CALLBACK(gtk_true), NULL);
+void
+showview(WebKitWebView *v, Client *c)
+{
+	GdkGeometry hints = { 1, 1 };
+	GdkRGBA bgcolor = { 0 };
+	GdkWindow *gwin;
 
-	if (!enablescrollbars) {
-		gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(c->scroll),
-		                               GTK_POLICY_NEVER,
-					       GTK_POLICY_NEVER);
+	/* Window */
+	if (embed) {
+		c->win = gtk_plug_new(embed);
 	} else {
-		gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(c->scroll),
-		                               GTK_POLICY_AUTOMATIC,
-					       GTK_POLICY_AUTOMATIC);
+		c->win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+
+		/* TA:  20091214:  Despite what the GNOME docs say, the ICCCM
+		 * is always correct, so we should still call this function.
+		 * But when doing so, we *must* differentiate between a
+		 * WM_CLASS and a resource on the window.  By convention, the
+		 * window class (WM_CLASS) is capped, while the resource is in
+		 * lowercase.   Both these values come as a pair.
+		 */
+		gtk_window_set_wmclass(GTK_WINDOW(c->win), "surf", "Surf");
+
+		/* 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);
+
+	if (!kioskmode)
+		addaccelgroup(c);
 
 	/* Arranging */
-	gtk_container_add(GTK_CONTAINER(c->scroll), GTK_WIDGET(c->view));
-	gtk_container_add(GTK_CONTAINER(c->win), c->pane);
-	gtk_container_add(GTK_CONTAINER(c->vbox), c->scroll);
+	gtk_container_add(GTK_CONTAINER(c->win), GTK_WIDGET(c->view));
 
 	/* Setup */
-	gtk_box_set_child_packing(GTK_BOX(c->vbox), c->scroll, TRUE, TRUE, 0,
-	                          GTK_PACK_START);
 	gtk_widget_grab_focus(GTK_WIDGET(c->view));
-	gtk_widget_show(c->pane);
-	gtk_widget_show(c->vbox);
-	gtk_widget_show(c->scroll);
 	gtk_widget_show(GTK_WIDGET(c->view));
 	gtk_widget_show(c->win);
 	gwin = gtk_widget_get_window(GTK_WIDGET(c->win));
@@ -912,74 +1002,20 @@ 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);
 
 	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));
@@ -989,8 +1025,6 @@ newclient(void)
 			die("Error closing stdout");
                 }
 	}
-
-	return c;
 }
 
 void
@@ -1219,7 +1253,7 @@ 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++) {
@@ -1244,24 +1278,6 @@ setup(void)
 		stylefile = g_strconcat("file://", stylepath, NULL);
 		g_free(stylepath);
 	}
-
-	/* 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
@@ -1301,13 +1317,10 @@ stop(Client *c, const Arg *arg)
 }
 
 void
-titlechange(WebKitWebView *view, GParamSpec *pspec, Client *c)
+titlechanged(WebKitWebView *view, GParamSpec *ps, Client *c)
 {
-	const gchar *t = webkit_web_view_get_title(view);
-	if (t) {
-		c->title = copystr(&c->title, t);
-		updatetitle(c);
-	}
+	c->title = webkit_web_view_get_title(c->view);
+	updatetitle(c);
 }
 
 void
@@ -1623,7 +1636,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