X-Git-Url: https://git.danieliu.xyz/?p=surf.git;a=blobdiff_plain;f=surf.c;h=d893b270d555ddec22ab42bfb6250286eb4e2bec;hp=22a3e8a736bee5ea85beda66b6d30098744a8a4b;hb=96188f83f0f77f93fc5f4590c1f1c8f13b78e599;hpb=b9530ad5d1cd29e176c9f16b92f1983993b22049

diff --git a/surf.c b/surf.c
index 22a3e8a..d893b27 100644
--- a/surf.c
+++ b/surf.c
@@ -59,11 +59,13 @@ typedef struct Client {
 	Window xid;
 	WebKitWebView *view;
 	WebKitWebInspector *inspector;
-	const char *title, *linkhover;
+	WebKitHitTestResult *mousepos;
+	GTlsCertificateFlags tlsflags;
+	const char *title, *targeturi;
 	const char *needle;
 	gint progress;
 	struct Client *next;
-	gboolean zoomed, fullscreen, isinspecting, sslfailed;
+	gboolean zoomed, fullscreen, isinspecting;
 } Client;
 
 typedef struct {
@@ -113,14 +115,13 @@ 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 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 gboolean deletion_interface(WebKitWebView *view,
                                    WebKitDOMHTMLElement *arg1, Client *c);
 static void destroyclient(Client *c);
@@ -129,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);
@@ -140,7 +141,10 @@ static void setstyle(Client *c, const char *style);
 
 static void handleplumb(Client *c, WebKitWebView *w, 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,
@@ -151,10 +155,9 @@ 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 loadstatuschange(WebKitWebView *view, GParamSpec *pspec,
-                             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);
@@ -169,7 +172,7 @@ static void menuactivate(GtkMenuItem *item, Client *c);
 static void print(Client *c, const Arg *arg);
 static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event,
                                 gpointer d);
-static void progresschange(WebKitWebView *view, GParamSpec *pspec, 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);
@@ -426,39 +429,131 @@ 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;
+	}
+
+	webkit_policy_decision_ignore(d);
+}
+
+void
+decideresource(WebKitPolicyDecision *d, Client *c)
+{
+	WebKitResponsePolicyDecision *r = WEBKIT_RESPONSE_POLICY_DECISION(d);
+	WebKitURIResponse *res;
+
+	if (webkit_response_policy_decision_is_mime_type_supported(r)) {
+		webkit_policy_decision_use(d);
+	} else {
+res = webkit_response_policy_decision_get_response(r);
+		webkit_policy_decision_ignore(d);
+		download(c, res);
 	}
-	return FALSE;
 }
 
 gboolean
@@ -526,14 +621,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 *
@@ -602,15 +701,27 @@ handleplumb(Client *c, WebKitWebView *w, const gchar *uri)
 	spawn(c, &arg);
 }
 
-gboolean
-initdownload(WebKitWebView *view, WebKitDownload *o, Client *c)
+void
+downloadstarted(WebKitWebContext *wc, WebKitDownload *d, Client *c)
 {
-	Arg arg;
+	g_signal_connect(G_OBJECT(d), "notify::response",
+	    G_CALLBACK(responsereceived), c);
+}
 
-	updatewinid(c);
-	arg = (Arg)DOWNLOAD((char *)webkit_download_get_uri(o), geturi(c));
-	spawn(c, &arg);
-	return FALSE;
+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)
+{
+	Arg a;
+
+	a = (Arg)DOWNLOAD(webkit_uri_response_get_uri(r), geturi(c));
+	spawn(c, &a);
 }
 
 void
@@ -691,49 +802,56 @@ 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
@@ -794,6 +912,7 @@ newclient(Client *rc)
 	clients = c;
 
 	c->view = newview(c, rc ? rc->view : NULL);
+	c->tlsflags = G_TLS_CERTIFICATE_VALIDATE_ALL + 1;
 
 	return c;
 }
@@ -858,6 +977,9 @@ newview(Client *c, WebKitWebView *rv)
 		    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,
@@ -869,34 +991,28 @@ newview(Client *c, WebKitWebView *rv)
 	                 "notify::title",
 			 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);
+	                 "permission-request",
+			 G_CALLBACK(permissionrequested), c);
 	g_signal_connect(G_OBJECT(v),
-	                 "create-web-view",
-			 G_CALLBACK(createwindow), c);
+	                 "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(v),
-	                 "mime-type-policy-decision-requested",
-			 G_CALLBACK(decidedownload), c);
+	                 "decide-policy",
+			 G_CALLBACK(decidepolicy), c);
 	g_signal_connect(G_OBJECT(v),
 	                 "window-object-cleared",
 			 G_CALLBACK(windowobjectcleared), c);
 	g_signal_connect(G_OBJECT(v),
-	                 "notify::load-status",
-			 G_CALLBACK(loadstatuschange), c);
-	g_signal_connect(G_OBJECT(v),
-	                 "notify::progress",
-			 G_CALLBACK(progresschange), c);
+	                 "load-changed",
+			 G_CALLBACK(loadchanged), c);
 	g_signal_connect(G_OBJECT(v),
-	                 "download-requested",
-			 G_CALLBACK(initdownload), c);
+	                 "notify::estimated-load-progress",
+			 G_CALLBACK(progresschanged), c);
 	g_signal_connect(G_OBJECT(v),
 	                 "button-release-event",
 			 G_CALLBACK(buttonrelease), c);
@@ -1119,9 +1235,10 @@ 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);
 }
 
@@ -1419,11 +1536,8 @@ getpagestat(Client *c)
 {
 	const char *uri = geturi(c);
 
-	if (strstr(uri, "https://") == uri)
-		pagestat[0] = c->sslfailed ? 'U' : 'T';
-	else
-		pagestat[0] = '-';
-
+	pagestats[0] = c->tlsflags > G_TLS_CERTIFICATE_VALIDATE_ALL ? '-' :
+	    c->tlsflags > 0 ? 'U' : 'T';
 	pagestat[1] = '\0';
 }