X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=surf.c;h=baebe5c6411d8b8eeedde01e84c9802e7cf6d3b0;hb=590a9bb19d331320643c50cf90433b94c7a3ba28;hp=5905c04fb7ca3be66f9895b4be21319e6e86c1f7;hpb=0a6eafe0778f96d98502bf5ebc71179ac5f2d241;p=surf.git

diff --git a/surf.c b/surf.c
index 5905c04..baebe5c 100644
--- a/surf.c
+++ b/surf.c
@@ -21,7 +21,8 @@
 #include <sys/file.h>
 
 #define LENGTH(x)               (sizeof x / sizeof x[0])
-#define CLEANMASK(mask)         (mask & ~(GDK_MOD2_MASK))
+
+enum { AtomFind, AtomGo, AtomUri, AtomLast };
 
 typedef union Arg Arg;
 union Arg {
@@ -36,6 +37,7 @@ typedef struct Client {
 	char *title, *linkhover;
 	const char *uri, *needle;
 	gint progress;
+	gboolean sslfailed;
 	struct Client *next;
 	gboolean zoomed;
 } Client;
@@ -54,11 +56,10 @@ typedef struct {
 } Key;
 
 static Display *dpy;
-static Atom uriprop, findprop;
+static Atom atoms[AtomLast];
 static Client *clients = NULL;
 static GdkNativeWindow embed = 0;
 static gboolean showxid = FALSE;
-static int ignorexprop = 0;
 static char winid[64];
 static char *progname;
 static gboolean loadimage = 1, plugin = 1, script = 1;
@@ -76,10 +77,11 @@ static void die(char *str);
 static void drawindicator(Client *c);
 static gboolean exposeindicator(GtkWidget *w, GdkEventExpose *e, Client *c);
 static void find(Client *c, const Arg *arg);
-static const char *getatom(Client *c, Atom a);
+static const char *getatom(Client *c, int a);
 static const char *getcookies(SoupURI *uri);
 static char *geturi(Client *c);
 void gotheaders(SoupMessage *msg, gpointer user_data);
+static gboolean initdownload(WebKitWebView *v, WebKitDownload *o, Client *c);
 static gboolean keypress(GtkWidget *w, GdkEventKey *ev, Client *c);
 static void linkhover(WebKitWebView *v, const char* t, const char* l, Client *c);
 static void loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c);
@@ -95,12 +97,13 @@ static void progresschange(WebKitWebView *view, GParamSpec *pspec, Client *c);
 static void reload(Client *c, const Arg *arg);
 static void resize(GtkWidget *w, GtkAllocation *a, Client *c);
 static void scroll(Client *c, const Arg *arg);
-static void setatom(Client *c, Atom a, const char *v);
+static void setatom(Client *c, int a, const char *v);
 static void setcookie(SoupCookie *c);
 static void setup(void);
 static void sigchld(int unused);
 static void source(Client *c, const Arg *arg);
 static void spawn(Client *c, const Arg *arg);
+static void eval(Client *c, const Arg *arg);
 static void stop(Client *c, const Arg *arg);
 static void titlechange(WebKitWebView *v, WebKitWebFrame* frame, const char* title, Client *c);
 static void update(Client *c);
@@ -142,16 +145,25 @@ cleanup(void) {
 	g_free(stylefile);
 }
 
+void
+evalscript(WebKitWebFrame *frame, JSContextRef js, char *script, char* scriptname) {
+	JSStringRef jsscript, jsscriptname;
+	JSValueRef exception = NULL;
+
+	jsscript = JSStringCreateWithUTF8CString(script);
+	jsscriptname = JSStringCreateWithUTF8CString(scriptname);
+	JSEvaluateScript(js, jsscript, JSContextGetGlobalObject(js), jsscriptname, 0, &exception);
+	JSStringRelease(jsscript);
+	JSStringRelease(jsscriptname);
+}
+
 void
 runscript(WebKitWebFrame *frame, JSContextRef js) {
-	JSStringRef jsscript;
 	char *script;
-	JSValueRef exception = NULL;
 	GError *error;
-	
+
 	if(g_file_get_contents(scriptfile, &script, NULL, &error)) {
-		jsscript = JSStringCreateWithUTF8CString(script);
-		JSEvaluateScript(js, jsscript, JSContextGetGlobalObject(js), NULL, 0, &exception);
+		evalscript(frame, webkit_web_frame_get_global_context(frame), script, scriptfile);
 	}
 }
 
@@ -186,10 +198,7 @@ createwindow(WebKitWebView  *v, WebKitWebFrame *f, Client *c) {
 gboolean
 decidedownload(WebKitWebView *v, WebKitWebFrame *f, WebKitNetworkRequest *r, gchar *m,  WebKitWebPolicyDecision *p, Client *c) {
 	if(!webkit_web_view_can_show_mime_type(v, m)) {
-		webkit_web_policy_decision_ignore(p);
-		webkit_web_view_load_html_string(c->view,
-				"Can't display content.",
-				webkit_network_request_get_uri(r));
+		webkit_web_policy_decision_download(p);
 		return TRUE;
 	}
 	return FALSE;
@@ -212,6 +221,7 @@ void
 destroyclient(Client *c) {
 	Client *p;
 
+	webkit_web_view_stop_loading(c->view);
 	gtk_widget_destroy(c->indicator);
 	gtk_widget_destroy(GTK_WIDGET(c->view));
 	gtk_widget_destroy(c->scroll);
@@ -247,12 +257,15 @@ drawindicator(Client *c) {
 	GdkGC *gc;
 	GdkColor fg;
 
-	uri = getatom(c, uriprop);
+	uri = geturi(c);
 	w = c->indicator;
 	width = c->progress * w->allocation.width / 100;
 	gc = gdk_gc_new(w->window);
-	gdk_color_parse(strstr(uri, "https://") == uri ?
-			progress_trust : progress, &fg);
+	if(strstr(uri, "https://") == uri)
+		gdk_color_parse(c->sslfailed ?
+		                progress_untrust : progress_trust, &fg);
+	else
+		gdk_color_parse(progress, &fg);
 	gdk_gc_set_rgb_fg_color(gc, &fg);
 	gdk_draw_rectangle(w->window,
 			w->style->bg_gc[GTK_WIDGET_STATE(w)],
@@ -272,7 +285,7 @@ void
 find(Client *c, const Arg *arg) {
 	const char *s;
 
-	s = getatom(c, findprop);
+	s = getatom(c, AtomFind);
 	gboolean forward = *(gboolean *)arg;
 	webkit_web_view_search_text(c->view, s, FALSE, forward, TRUE);
 }
@@ -287,7 +300,7 @@ getcookies(SoupURI *uri) {
 }
 
 const char *
-getatom(Client *c, Atom a) {
+getatom(Client *c, int a) {
 	static char buf[BUFSIZ];
 	Atom adummy;
 	int idummy;
@@ -295,7 +308,7 @@ getatom(Client *c, Atom a) {
 	unsigned char *p = NULL;
 
 	XGetWindowProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window),
-			a, 0L, BUFSIZ, False, XA_STRING,
+			atoms[a], 0L, BUFSIZ, False, XA_STRING,
 			&adummy, &idummy, &ldummy, &ldummy, &p);
 	if(p)
 		strncpy(buf, (char *)p, LENGTH(buf)-1);
@@ -327,6 +340,16 @@ gotheaders(SoupMessage *msg, gpointer v) {
 	soup_cookies_free(l);
 }
 
+gboolean
+initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) {
+	Arg arg;
+
+	updatewinid(c);
+	arg = (Arg)DOWNLOAD((char *)webkit_download_get_uri(o));
+	spawn(c, &arg);
+	return FALSE;
+}
+
 gboolean
 keypress(GtkWidget* w, GdkEventKey *ev, Client *c) {
 	guint i;
@@ -335,7 +358,7 @@ keypress(GtkWidget* w, GdkEventKey *ev, Client *c) {
 	updatewinid(c);
 	for(i = 0; i < LENGTH(keys); i++) {
 		if(gdk_keyval_to_lower(ev->keyval) == keys[i].keyval
-				&& CLEANMASK(ev->state) == keys[i].mod
+				&& (ev->state & keys[i].mod) == keys[i].mod
 				&& keys[i].func) {
 			keys[i].func(c, &(keys[i].arg));
 			processed = TRUE;
@@ -358,9 +381,24 @@ linkhover(WebKitWebView *v, const char* t, const char* l, Client *c) {
 
 void
 loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c) {
+	WebKitWebFrame *frame;
+	WebKitWebDataSource *src;
+	WebKitNetworkRequest *request;
+	SoupMessage *msg;
+	char *uri;
+
 	switch(webkit_web_view_get_load_status (c->view)) {
 	case WEBKIT_LOAD_COMMITTED:
-		setatom(c, uriprop, geturi(c));
+		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);
 		break;
 	case WEBKIT_LOAD_FINISHED:
 		c->progress = 0;
@@ -423,7 +461,7 @@ newclient(void) {
 		 * 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");
+		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.
@@ -453,6 +491,7 @@ newclient(void) {
 	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);
 
 	/* Indicator */
 	c->indicator = gtk_drawing_area_new();
@@ -490,10 +529,13 @@ newclient(void) {
 	g_object_set(G_OBJECT(settings), "auto-load-images", loadimage, NULL);
 	g_object_set(G_OBJECT(settings), "enable-plugins", plugin, NULL);
 	g_object_set(G_OBJECT(settings), "enable-scripts", script, NULL);
+	g_object_set(G_OBJECT(settings), "enable-spatial-navigation", true, NULL);
+
 	g_free(uri);
-	setatom(c, findprop, "");
-	setatom(c, uriprop, "");
-	if(NOBACKGROUND)
+
+	setatom(c, AtomFind, "");
+	setatom(c, AtomUri, "about:blank");
+	if(HIDE_BACKGROUND)
 		webkit_web_view_set_transparent(c->view, TRUE);
 
 	c->title = NULL;
@@ -569,18 +611,17 @@ processx(GdkXEvent *e, GdkEvent *event, gpointer d) {
 
 	if(((XEvent *)e)->type == PropertyNotify) {
 		ev = &((XEvent *)e)->xproperty;
-		if(ignorexprop)
-			ignorexprop--;
-		else if(ev->state == PropertyNewValue) {
-			if(ev->atom == uriprop) {
-				arg.v = getatom(c, uriprop);
-				loaduri(c, &arg);
-			}
-			else if(ev->atom == findprop) {
+		if(ev->state == PropertyNewValue) {
+			if(ev->atom == atoms[AtomFind]) {
 				arg.b = TRUE;
 				find(c, &arg);
+				return GDK_FILTER_REMOVE;
+			}
+			else if(ev->atom == atoms[AtomGo]) {
+				arg.v = getatom(c, AtomGo);
+				loaduri(c, &arg);
+				return GDK_FILTER_REMOVE;
 			}
-			return GDK_FILTER_REMOVE;
 		}
 	}
 	return GDK_FILTER_CONTINUE;
@@ -647,10 +688,9 @@ setcookie(SoupCookie *c) {
 }
 
 void
-setatom(Client *c, Atom a, const char *v) {
+setatom(Client *c, int a, const char *v) {
 	XSync(dpy, False);
-	ignorexprop++;
-	XChangeProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window), a,
+	XChangeProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window), atoms[a],
 			XA_STRING, 8, PropModeReplace, (unsigned char *)v,
 			strlen(v) + 1);
 }
@@ -670,8 +710,11 @@ setup(void) {
 
 	dpy = GDK_DISPLAY();
 	s = webkit_get_default_session();
-	uriprop = XInternAtom(dpy, "_SURF_URI", False);
-	findprop = XInternAtom(dpy, "_SURF_FIND", False);
+
+	/* atoms */
+	atoms[AtomFind] = XInternAtom(dpy, "_SURF_FIND", False);
+	atoms[AtomGo] = XInternAtom(dpy, "_SURF_GO", False);
+	atoms[AtomUri] = XInternAtom(dpy, "_SURF_URI", False);
 
 	/* dirs and files */
 	cookiefile = buildpath(cookiefile);
@@ -684,11 +727,14 @@ setup(void) {
 	soup_session_remove_feature_by_type(s, soup_cookie_jar_get_type());
 	g_signal_connect_after(G_OBJECT(s), "request-started", G_CALLBACK(newrequest), NULL);
 
+	/* ssl */
+	g_object_set(G_OBJECT(s), "ssl-ca-file", cafile, NULL);
+	g_object_set(G_OBJECT(s), "ssl-strict", strictssl, NULL);
+
 	/* proxy */
 	if((proxy = getenv("http_proxy")) && strcmp(proxy, "")) {
 		new_proxy = g_strrstr(proxy, "http://") ? g_strdup(proxy) :
 			g_strdup_printf("http://%s", proxy);
-
 		puri = soup_uri_new(new_proxy);
 		g_object_set(G_OBJECT(s), "proxy-uri", puri, NULL);
 		soup_uri_free(puri);
@@ -726,6 +772,12 @@ spawn(Client *c, const Arg *arg) {
 	}
 }
 
+void
+eval(Client *c, const Arg *arg) {
+	WebKitWebFrame *frame = webkit_web_view_get_main_frame(c->view);
+	evalscript(frame, webkit_web_frame_get_global_context(frame), ((char **)arg->v)[0], "");
+}
+
 void
 stop(Client *c, const Arg *arg) {
 	webkit_web_view_stop_loading(c->view);