X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=surf.c;h=af994bb6ab77d5abdc546ae591ccee52bc2b410b;hb=42c6c90366b7ce7708b13037a6ba819b08fbb20e;hp=b1493ed48cd14b14c89d06ee75c74501e1ab4481;hpb=ad538bb00a38c5df7d7140414756724c1045307d;p=surf.git

diff --git a/surf.c b/surf.c
index b1493ed..af994bb 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;
@@ -57,7 +59,8 @@ typedef struct Client {
 	Window xid;
 	WebKitWebView *view;
 	WebKitWebInspector *inspector;
-	char *title, *linkhover;
+	WebKitHitTestResult *mousepos;
+	const char *title, *targeturi;
 	const char *needle;
 	gint progress;
 	struct Client *next;
@@ -149,8 +152,8 @@ 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);
@@ -179,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);
@@ -334,6 +337,7 @@ cleanup(void)
 	g_free(cookiefile);
 	g_free(scriptfile);
 	g_free(stylefile);
+	g_free(cachedir);
 }
 
 WebKitCookieAcceptPolicy
@@ -688,14 +692,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);
 }
 
@@ -800,6 +814,8 @@ newview(Client *c, WebKitWebView *rv)
 {
 	WebKitWebView *v;
 	WebKitSettings *settings;
+	WebKitUserContentManager *contentmanager;
+	WebKitWebContext *context;
 	char *ua;
 
 	/* Webview */
@@ -807,51 +823,65 @@ newview(Client *c, WebKitWebView *rv)
 		v = WEBKIT_WEB_VIEW(
 		    webkit_web_view_new_with_related_view(rv));
 	} else {
-		v = WEBKIT_WEB_VIEW(webkit_web_view_new());
-
-		settings = webkit_web_view_get_settings(v);
+		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;
-		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"));
-
-		if (enableinspector) {
-			c->inspector = webkit_web_view_get_inspector(v);
-			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;
-		}
+		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(v),
 	                 "notify::title",
-			 G_CALLBACK(titlechange), c);
+			 G_CALLBACK(titlechanged), c);
 	g_signal_connect(G_OBJECT(v),
-	                 "hovering-over-link",
-			 G_CALLBACK(linkhover), c);
+	                 "mouse-target-changed",
+			 G_CALLBACK(mousetargetchanged), c);
 	g_signal_connect(G_OBJECT(v),
 	                 "geolocation-policy-decision-requested",
 			 G_CALLBACK(geopolicyrequested), c);
@@ -1196,7 +1226,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++) {
@@ -1221,29 +1251,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());
-
-	/* 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);
-
-	/* 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
@@ -1283,13 +1290,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