X-Git-Url: https://git.danieliu.xyz/?p=surf.git;a=blobdiff_plain;f=surf.c;h=f227d4c9851b0a58b15c3ec661d5997573ce763e;hp=74851ee9d9691d6811a265d72d16e9061633c9ef;hb=ba8617e4ee9ff35a45059930ef611cb85ed33af2;hpb=d542773e7527758060c188f734bd6b612bbaa529

diff --git a/surf.c b/surf.c
index 74851ee..f227d4c 100644
--- a/surf.c
+++ b/surf.c
@@ -103,14 +103,11 @@ 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 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);
@@ -123,14 +120,14 @@ static gboolean decidepolicy(WebKitWebView *v, WebKitPolicyDecision *d,
 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 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 evalscript(Client *c, const char *jsstr, ...);
+static void runscript(Client *c);
 static void find(Client *c, const Arg *arg);
-static void fullscreen(Client *c, const Arg *arg);
+static void togglefullscreen(Client *c, const Arg *a);
 static gboolean permissionrequested(WebKitWebView *v,
 		WebKitPermissionRequest *r, Client *c);
 static const char *getatom(Client *c, int a);
@@ -138,9 +135,9 @@ static void gettogglestat(Client *c);
 static void getpagestat(Client *c);
 static char *geturi(Client *c);
 static const gchar *getstyle(const char *uri);
-static void setstyle(Client *c, const char *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 void downloadstarted(WebKitWebContext *wc, WebKitDownload *d,
 		Client *c);
@@ -165,10 +162,12 @@ 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 void print(Client *c, const Arg *arg);
 static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event,
                                 gpointer d);
+static gboolean winevent(GtkWidget *w, GdkEvent *e, Client *c);
 static void progresschanged(WebKitWebView *v, GParamSpec *ps, Client *c);
 static void linkopen(Client *c, const Arg *arg);
 static void linkopenembed(Client *c, const Arg *arg);
@@ -182,7 +181,6 @@ static void sigchld(int unused);
 static void spawn(Client *c, const Arg *arg);
 static void stop(Client *c, const Arg *arg);
 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);
 static void togglegeolocation(Client *c, const Arg *arg);
@@ -191,8 +189,6 @@ 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);
 
 /* configuration, allows nested code to access above variables */
@@ -213,35 +209,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)
 {
@@ -370,44 +337,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);
 	}
 }
 
@@ -539,34 +503,55 @@ decidenewwindow(WebKitPolicyDecision *d, Client *c)
 void
 decideresource(WebKitPolicyDecision *d, Client *c)
 {
+	const gchar *uri;
+	int i, isascii = 1;
 	WebKitResponsePolicyDecision *r = WEBKIT_RESPONSE_POLICY_DECISION(d);
 	WebKitURIResponse *res;
 
+	res = webkit_response_policy_decision_get_response(r);
+	uri = webkit_uri_response_get_uri(res);
+
+	if (g_str_has_suffix(uri, "/favicon.ico"))
+		webkit_uri_request_set_uri(
+		    webkit_response_policy_decision_get_request(r),
+		    "about:blank");
+
+	if (!g_str_has_prefix(uri, "http://")
+	    && !g_str_has_prefix(uri, "https://")
+	    && !g_str_has_prefix(uri, "about:")
+	    && !g_str_has_prefix(uri, "file://")
+	    && !g_str_has_prefix(uri, "data:")
+	    && !g_str_has_prefix(uri, "blob:")
+	    && strlen(uri) > 0) {
+		for (i = 0; i < strlen(uri); i++) {
+			if (!g_ascii_isprint(uri[i])) {
+				isascii = 0;
+				break;
+			}
+		}
+		if (isascii) {
+			handleplumb(c, uri);
+			webkit_policy_decision_ignore(d);
+		}
+	}
+
 	if (webkit_response_policy_decision_is_mime_type_supported(r)) {
 		webkit_policy_decision_use(d);
 	} else {
-res = webkit_response_policy_decision_get_response(r);
 		webkit_policy_decision_ignore(d);
 		download(c, res);
 	}
 }
 
-gboolean
-deletion_interface(WebKitWebView *view, WebKitDOMHTMLElement *arg1, Client *c)
-{
-	return FALSE;
-}
-
 void
 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)
 		;
@@ -575,14 +560,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
@@ -607,13 +598,13 @@ find(Client *c, const Arg *arg)
 }
 
 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;
 }
 
 gboolean
@@ -679,20 +670,31 @@ 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;
+	}
+
+	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));
+
+	g_free(style);
 }
 
 void
-handleplumb(Client *c, WebKitWebView *w, const gchar *uri)
+handleplumb(Client *c, const gchar *uri)
 {
 	Arg arg;
 
-	webkit_web_view_stop_loading(w);
-	arg = (Arg)PLUMB((char *)uri);
+	arg = (Arg)PLUMB(uri);
 	spawn(c, &arg);
 }
 
@@ -999,9 +1001,6 @@ newview(Client *c, WebKitWebView *rv)
 	g_signal_connect(G_OBJECT(v),
 	                 "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),
 	                 "load-changed",
 			 G_CALLBACK(loadchanged), c);
@@ -1011,12 +1010,8 @@ newview(Client *c, WebKitWebView *rv)
 	g_signal_connect(G_OBJECT(v),
 	                 "button-release-event",
 			 G_CALLBACK(buttonreleased), c);
-	g_signal_connect(G_OBJECT(v),
-	                 "resource-request-starting",
-			 G_CALLBACK(beforerequest), c);
-	g_signal_connect(G_OBJECT(v),
-	                 "should-show-delete-interface-for-element",
-			 G_CALLBACK(deletion_interface), c);
+	g_signal_connect(G_OBJECT(v), "close",
+			G_CALLBACK(closeview), c);
 
 	return v;
 }
@@ -1028,33 +1023,7 @@ showview(WebKitWebView *v, Client *c)
 	GdkRGBA bgcolor = { 0 };
 	GdkWindow *gwin;
 
-	/* 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->win = createwindow(c);
 
 	if (!kioskmode)
 		addaccelgroup(c);
@@ -1073,14 +1042,12 @@ showview(WebKitWebView *v, Client *c)
 	gdk_window_set_events(gwin, GDK_ALL_EVENTS_MASK);
 	gdk_window_add_filter(gwin, processx, c);
 
-	runscript(frame);
-
 	/* This might conflict with _zoomto96dpi_. */
 	if (zoomlevel != 1.0)
 		webkit_web_view_set_zoom_level(c->view, zoomlevel);
 
 	if (runinfullscreen)
-		fullscreen(c, NULL);
+		togglefullscreen(c, NULL);
 
 	setatom(c, AtomFind, "");
 	setatom(c, AtomUri, "about:blank");
@@ -1139,6 +1106,43 @@ newwindow(Client *c, const Arg *arg, gboolean noembed)
 	spawn(NULL, &a);
 }
 
+GtkWidget *
+createwindow(Client *c)
+{
+	GtkWidget *w;
+
+	if (embed) {
+		w = gtk_plug_new(embed);
+	} else {
+		w = 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(w), "surf", "Surf");
+
+		/* TA:  20091214:  And set the role here as well -- so that
+		 * sessions can pick this up.
+		 */
+		gtk_window_set_role(GTK_WINDOW(w), "Surf");
+
+		gtk_window_set_default_size(GTK_WINDOW(w), 800, 600);
+	}
+
+	g_signal_connect(G_OBJECT(w), "destroy",
+	    G_CALLBACK(destroywin), c);
+	g_signal_connect(G_OBJECT(w), "leave-notify-event",
+	    G_CALLBACK(winevent), c);
+	g_signal_connect(G_OBJECT(w), "window-state-event",
+	    G_CALLBACK(winevent), c);
+
+	return w;
+}
+
 void
 pasteuri(GtkClipboard *clipboard, const char *text, gpointer d)
 {
@@ -1326,14 +1330,6 @@ spawn(Client *c, const Arg *arg)
 	}
 }
 
-void
-eval(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], "");
-}
-
 void
 stop(Client *c, const Arg *arg)
 {
@@ -1347,11 +1343,26 @@ titlechanged(WebKitWebView *view, GParamSpec *ps, Client *c)
 	updatetitle(c);
 }
 
-void
-titlechangeleave(void *a, void *b, Client *c)
+gboolean
+winevent(GtkWidget *w, GdkEvent *e, Client *c)
 {
-	c->linkhover = NULL;
-	updatetitle(c);
+	switch (e->type) {
+	case GDK_LEAVE_NOTIFY:
+		c->targeturi = NULL;
+		updatetitle(c);
+		break;
+	case GDK_WINDOW_STATE: /* fallthrough */
+		if (e->window_state.changed_mask ==
+		    GDK_WINDOW_STATE_FULLSCREEN) {
+			c->fullscreen = e->window_state.new_window_state &
+			    GDK_WINDOW_STATE_FULLSCREEN;
+			break;
+		}
+	default:
+		return FALSE;
+	}
+
+	return TRUE;
 }
 
 void
@@ -1529,13 +1540,6 @@ usage(void)
 	    "[-u useragent] [-z zoomlevel] [uri]\n", basename(argv0));
 }
 
-void
-windowobjectcleared(GtkWidget *w, WebKitWebFrame *frame, JSContextRef js,
-                    JSObjectRef win, Client *c)
-{
-	runscript(frame);
-}
-
 void
 zoom(Client *c, const Arg *arg)
 {