X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=surf.c;h=796ee968976d434b6a3aee2d1e640aeeab558fd1;hb=2f9c554f025a3cc6eae053d2ad26c2b88975a5bc;hp=a4dc3be4915f91b0c785961dd3117e1113495aa3;hpb=05fbb4ab76272fbccd0e9a8c47f61968731fc0e5;p=surf.git

diff --git a/surf.c b/surf.c
index a4dc3be..796ee96 100644
--- a/surf.c
+++ b/surf.c
@@ -72,15 +72,18 @@ static void cleanup(void);
 static void clipboard(Client *c, const Arg *arg);
 static void context(WebKitWebView *v, GtkMenu *m, Client *c);
 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 void destroyclient(Client *c);
 static void destroywin(GtkWidget* w, Client *c);
 static void die(char *str);
-static void download(WebKitDownload *o, GParamSpec *pspec, Client *c);
+static void download(Client *c, const Arg *arg);
 static void drawindicator(Client *c);
 static gboolean exposeindicator(GtkWidget *w, GdkEventExpose *e, Client *c);
-static char *geturi(Client *c);
+static void find(Client *c, const Arg *arg);
 static const char *getatom(Client *c, Atom a);
+static char *geturi(Client *c);
 static gboolean initdownload(WebKitWebView *v, WebKitDownload *o, Client *c);
 static void itemclick(GtkMenuItem *mi, Client *c);
 static gboolean keypress(GtkWidget *w, GdkEventKey *ev, Client *c);
@@ -91,26 +94,25 @@ static void loaduri(Client *c, const Arg *arg);
 static void navigate(Client *c, const Arg *arg);
 static Client *newclient(void);
 static void newwindow(Client *c, const Arg *arg);
-static WebKitWebView *createwindow(WebKitWebView *v, WebKitWebFrame *f, Client *c);
 static void pasteuri(GtkClipboard *clipboard, const char *text, gpointer d);
-static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, gpointer d);
 static void print(Client *c, const Arg *arg);
+static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, gpointer d);
 static void progresschange(WebKitWebView *v, gint p, Client *c);
-static void reloadcookies();
 static void reload(Client *c, const Arg *arg);
+static void reloadcookies();
 static void resize(GtkWidget *w, GtkAllocation *a, Client *c);
-static void sigchld(int unused);
+static void scroll(Client *c, const Arg *arg);
 static void setatom(Client *c, Atom a, const char *v);
 static void setup(void);
-static void spawn(Client *c, const Arg *arg);
-static void scroll(Client *c, const Arg *arg);
-static void find(Client *c, const Arg *arg);
+static void sigchld(int unused);
 static void source(Client *c, const Arg *arg);
+static void spawn(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 usage(void);
 static void update(Client *c);
+static void updatedownload(WebKitDownload *o, GParamSpec *pspec, 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);
 
@@ -176,7 +178,7 @@ clipboard(Client *c, const Arg *arg) {
 	if(paste)
 		gtk_clipboard_request_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), pasteuri, c);
 	else
-		gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), geturi(c), -1);
+		gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), c->linkhover ? c->linkhover : geturi(c), -1);
 }
 
 void
@@ -207,15 +209,43 @@ copystr(char **str, const char *src) {
 	return tmp;
 }
 
+WebKitWebView *
+createwindow(WebKitWebView  *v, WebKitWebFrame *f, Client *c) {
+	Client *n = newclient();
+	return n->view;
+}
+
+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_download(p);
+		return TRUE;
+	}
+	return FALSE;
+}
+
+gboolean
+decidewindow(WebKitWebView *view, WebKitWebFrame *f, WebKitNetworkRequest *r, WebKitWebNavigationAction *n, WebKitWebPolicyDecision *p, Client *c) {
+	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);
+		return TRUE;
+	}
+	return FALSE;
+}
+
 void
 destroyclient(Client *c) {
 	int i;
 	Client *p;
 
+	gtk_widget_destroy(c->indicator);
 	gtk_widget_destroy(GTK_WIDGET(c->view));
 	gtk_widget_destroy(c->scroll);
 	gtk_widget_destroy(c->vbox);
-	gtk_widget_destroy(c->indicator);
 	gtk_widget_destroy(c->win);
 	for(i = 0; i < LENGTH(items); i++)
 		gtk_widget_destroy(c->items[i]);
@@ -231,19 +261,6 @@ destroyclient(Client *c) {
 		gtk_main_quit();
 }
 
-gboolean
-decidewindow(WebKitWebView *view, WebKitWebFrame *f, WebKitNetworkRequest *r, WebKitWebNavigationAction *n, WebKitWebPolicyDecision *p, Client *c) {
-	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);
-		return TRUE;
-	}
-	return FALSE;
-}
-
 void
 destroywin(GtkWidget* w, Client *c) {
 	destroyclient(c);
@@ -255,6 +272,21 @@ die(char *str) {
 	exit(EXIT_FAILURE);
 }
 
+void
+download(Client *c, const Arg *arg) {
+	char *uri;
+	WebKitNetworkRequest *r;
+	WebKitDownload       *dl;
+
+	if(arg->v)
+		uri = (char *)arg->v;
+	else
+		uri = c->linkhover ? c->linkhover : geturi(c);
+	r = webkit_network_request_new(uri);
+	dl = webkit_download_new(r);
+	initdownload(c->view, dl, c);
+}
+
 void
 drawindicator(Client *c) {
 	gint width;
@@ -285,14 +317,12 @@ exposeindicator(GtkWidget *w, GdkEventExpose *e, Client *c) {
 }
 
 void
-download(WebKitDownload *o, GParamSpec *pspec, Client *c) {
-	WebKitDownloadStatus status;
+find(Client *c, const Arg *arg) {
+	const char *s;
 
-	status = webkit_download_get_status(c->download);
-	if(status == WEBKIT_DOWNLOAD_STATUS_STARTED || status == WEBKIT_DOWNLOAD_STATUS_CREATED) {
-		c->progress = (gint)(webkit_download_get_progress(c->download)*100);
-	}
-	update(c);
+	s = getatom(c, findprop);
+	gboolean forward = *(gboolean *)arg;
+	webkit_web_view_search_text(c->view, s, FALSE, forward, TRUE);
 }
 
 const char *
@@ -314,6 +344,15 @@ getatom(Client *c, Atom a) {
 	return buf;
 }
 
+char *
+geturi(Client *c) {
+	char *uri;
+
+	if(!(uri = (char *)webkit_web_view_get_uri(c->view)))
+		uri = "about:blank";
+	return uri;
+}
+
 gboolean
 initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) {
 	const char *filename;
@@ -322,6 +361,8 @@ initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) {
 	stop(c, NULL);
 	c->download = o;
 	filename = webkit_download_get_suggested_filename(o);
+	if(!strcmp("", filename))
+		filename = "index.html";
 	uri = g_strconcat("file://", dldir, "/", filename, NULL);
 	webkit_download_set_destination_uri(c->download, uri);
 	c->progress = 0;
@@ -329,8 +370,8 @@ initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) {
 	html = g_strdup_printf("Download <b>%s</b>...", filename);
 	webkit_web_view_load_html_string(c->view, html,
 			webkit_download_get_uri(c->download));
-	g_signal_connect(c->download, "notify::progress", G_CALLBACK(download), c);
-	g_signal_connect(c->download, "notify::status", G_CALLBACK(download), c);
+	g_signal_connect(c->download, "notify::progress", G_CALLBACK(updatedownload), c);
+	g_signal_connect(c->download, "notify::status", G_CALLBACK(updatedownload), c);
 	webkit_download_start(c->download);
 	
 	c->title = copystr(&c->title, filename);
@@ -339,15 +380,6 @@ initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) {
 	return TRUE;
 }
 
-char *
-geturi(Client *c) {
-	char *uri;
-
-	if(!(uri = (char *)webkit_web_view_get_uri(c->view)))
-		uri = "about:blank";
-	return uri;
-}
-
 void
 itemclick(GtkMenuItem *mi, Client *c) {
 	int i;
@@ -390,13 +422,13 @@ linkhover(WebKitWebView *v, const char* t, const char* l, Client *c) {
 void
 loadcommit(WebKitWebView *view, WebKitWebFrame *f, Client *c) {
 	setatom(c, uriprop, geturi(c));
-	reloadcookies();
 }
 
 void
 loadstart(WebKitWebView *view, WebKitWebFrame *f, Client *c) {
 	c->progress = 0;
 	update(c);
+	reloadcookies();
 }
 
 void
@@ -425,7 +457,7 @@ newclient(void) {
 	Client *c;
 	WebKitWebSettings *settings;
 	GdkGeometry hints = { 1, 1 };
-	char *uri;
+	char *uri, *ua;
 
 	if(!(c = calloc(1, sizeof(Client))))
 		die("Cannot malloc!\n");
@@ -435,7 +467,19 @@ newclient(void) {
 	}
 	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);
@@ -455,12 +499,12 @@ newclient(void) {
 	/* VBox */
 	c->vbox = gtk_vbox_new(FALSE, 0);
 
-	/* scrolled window */
+	/* Scrolled Window */
 	c->scroll = gtk_scrolled_window_new(NULL, NULL);
 	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(c->scroll),
 			GTK_POLICY_NEVER, GTK_POLICY_NEVER);
 
-	/* webview */
+	/* Webview */
 	c->view = WEBKIT_WEB_VIEW(webkit_web_view_new());
 	g_signal_connect(G_OBJECT(c->view), "title-changed", G_CALLBACK(titlechange), c);
 	g_signal_connect(G_OBJECT(c->view), "load-progress-changed", G_CALLBACK(progresschange), c);
@@ -469,11 +513,12 @@ newclient(void) {
 	g_signal_connect(G_OBJECT(c->view), "hovering-over-link", G_CALLBACK(linkhover), c);
 	g_signal_connect(G_OBJECT(c->view), "create-web-view", G_CALLBACK(createwindow), c);
 	g_signal_connect(G_OBJECT(c->view), "new-window-policy-decision-requested", G_CALLBACK(decidewindow), c);
+	g_signal_connect(G_OBJECT(c->view), "mime-type-policy-decision-requested", G_CALLBACK(decidedownload), c);
 	g_signal_connect(G_OBJECT(c->view), "download-requested", G_CALLBACK(initdownload), c);
 	g_signal_connect(G_OBJECT(c->view), "window-object-cleared", G_CALLBACK(windowobjectcleared), c);
 	g_signal_connect(G_OBJECT(c->view), "populate-popup", G_CALLBACK(context), c);
 
-	/* indicator */
+	/* Indicator */
 	c->indicator = gtk_drawing_area_new();
 	gtk_widget_set_size_request(c->indicator, 0, 2);
 	g_signal_connect (G_OBJECT (c->indicator), "expose_event",
@@ -499,7 +544,9 @@ newclient(void) {
 	gdk_window_add_filter(GTK_WIDGET(c->win)->window, processx, c);
 	webkit_web_view_set_full_content_zoom(c->view, TRUE);
 	settings = webkit_web_view_get_settings(c->view);
-	g_object_set(G_OBJECT(settings), "user-agent", useragent, NULL);
+	if(!(ua = getenv("SURF_USERAGENT")))
+		ua = useragent;
+	g_object_set(G_OBJECT(settings), "user-agent", ua, NULL);
 	uri = g_strconcat("file://", stylefile, NULL);
 	g_object_set(G_OBJECT(settings), "user-stylesheet-uri", uri, NULL);
 	g_free(uri);
@@ -541,12 +588,6 @@ newwindow(Client *c, const Arg *arg) {
 	spawn(NULL, &a);
 }
 
-WebKitWebView *
-createwindow(WebKitWebView  *v, WebKitWebFrame *f, Client *c) {
-	Client *n = newclient();
-	return n->view;
-}
-
 void
 pasteuri(GtkClipboard *clipboard, const char *text, gpointer d) {
 	Arg arg = {.v = text };
@@ -554,6 +595,11 @@ pasteuri(GtkClipboard *clipboard, const char *text, gpointer d) {
 		loaduri((Client *) d, &arg);
 }
 
+void
+print(Client *c, const Arg *arg) {
+	webkit_web_frame_print(webkit_web_view_get_main_frame(c->view));
+}
+
 GdkFilterReturn
 processx(GdkXEvent *e, GdkEvent *event, gpointer d) {
 	Client *c = (Client *)d;
@@ -579,11 +625,6 @@ processx(GdkXEvent *e, GdkEvent *event, gpointer d) {
 	return GDK_FILTER_CONTINUE;
 }
 
-void
-print(Client *c, const Arg *arg) {
-	webkit_web_frame_print(webkit_web_view_get_main_frame(c->view));
-}
-
 void
 progresschange(WebKitWebView *v, gint p, Client *c) {
 	c->progress = p;
@@ -616,19 +657,6 @@ reloadcookies() {
 	g_object_unref(jar);
 }
 
-void
-scroll(Client *c, const Arg *arg) {
-	gdouble v;
-	GtkAdjustment *a;
-
-	a = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(c->scroll));
-	v = gtk_adjustment_get_value(a);
-	v += gtk_adjustment_get_step_increment(a) * arg->i;
-	v = MAX(v, 0.0);
-	v = MIN(v, gtk_adjustment_get_upper(a) - gtk_adjustment_get_page_size(a));
-	gtk_adjustment_set_value(a, v);
-}
-
 void
 resize(GtkWidget *w, GtkAllocation *a, Client *c) {
 	double zoom;
@@ -643,10 +671,16 @@ resize(GtkWidget *w, GtkAllocation *a, Client *c) {
 }
 
 void
-sigchld(int unused) {
-	if(signal(SIGCHLD, sigchld) == SIG_ERR)
-		die("Can't install SIGCHLD handler");
-	while(0 < waitpid(-1, NULL, WNOHANG));
+scroll(Client *c, const Arg *arg) {
+	gdouble v;
+	GtkAdjustment *a;
+
+	a = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(c->scroll));
+	v = gtk_adjustment_get_value(a);
+	v += gtk_adjustment_get_step_increment(a) * arg->i;
+	v = MAX(v, 0.0);
+	v = MIN(v, gtk_adjustment_get_upper(a) - gtk_adjustment_get_page_size(a));
+	gtk_adjustment_set_value(a, v);
 }
 
 void
@@ -661,6 +695,9 @@ setatom(Client *c, Atom a, const char *v) {
 void
 setup(void) {
 	SoupSession *s;
+	char *proxy;
+	char *new_proxy;
+	SoupURI *puri;
 
 	/* clean up any zombies immediately */
 	sigchld(0);
@@ -684,9 +721,25 @@ setup(void) {
 	cookies = soup_cookie_jar_new();
 	soup_session_add_feature(s, SOUP_SESSION_FEATURE(cookies));
 	g_signal_connect(cookies, "changed", G_CALLBACK(changecookie), NULL);
+	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);
+		g_free(new_proxy);
+	}
 	reloadcookies();
 }
 
+void
+sigchld(int unused) {
+	if(signal(SIGCHLD, sigchld) == SIG_ERR)
+		die("Can't install SIGCHLD handler");
+	while(0 < waitpid(-1, NULL, WNOHANG));
+}
+
 void
 source(Client *c, const Arg *arg) {
 	Arg a = { .b = FALSE };
@@ -697,24 +750,6 @@ source(Client *c, const Arg *arg) {
 	reload(c, &a);
 }
 
-void
-find(Client *c, const Arg *arg) {
-	const char *s;
-
-	s = getatom(c, findprop);
-	gboolean forward = *(gboolean *)arg;
-	webkit_web_view_search_text(c->view, s, FALSE, forward, TRUE);
-}
-
-void
-stop(Client *c, const Arg *arg) {
-	if(c->download)
-		webkit_download_cancel(c->download);
-	else
-		webkit_web_view_stop_loading(c->view);
-	c->download = NULL;
-}
-
 void
 spawn(Client *c, const Arg *arg) {
 	if(fork() == 0) {
@@ -729,15 +764,18 @@ spawn(Client *c, const Arg *arg) {
 }
 
 void
-titlechange(WebKitWebView *v, WebKitWebFrame *f, const char *t, Client *c) {
-	c->title = copystr(&c->title, t);
-	update(c);
+stop(Client *c, const Arg *arg) {
+	if(c->download)
+		webkit_download_cancel(c->download);
+	else
+		webkit_web_view_stop_loading(c->view);
+	c->download = NULL;
 }
 
 void
-usage(void) {
-	fputs("surf - simple browser\n", stderr);
-	die("usage: surf [-e Window] [-x] [uri]\n");
+titlechange(WebKitWebView *v, WebKitWebFrame *f, const char *t, Client *c) {
+	c->title = copystr(&c->title, t);
+	update(c);
 }
 
 void
@@ -745,7 +783,7 @@ update(Client *c) {
 	char *t;
 
 	if(c->progress != 100)
-		t = g_strdup_printf("%s [%i%%]", c->title, c->progress);
+		t = g_strdup_printf("[%i%%] %s", c->progress, c->title);
 	else if(c->linkhover)
 		t = g_strdup(c->linkhover);
 	else
@@ -753,7 +791,17 @@ update(Client *c) {
 	drawindicator(c);
 	gtk_window_set_title(GTK_WINDOW(c->win), t);
 	g_free(t);
+}
+
+void
+updatedownload(WebKitDownload *o, GParamSpec *pspec, Client *c) {
+	WebKitDownloadStatus status;
 
+	status = webkit_download_get_status(c->download);
+	if(status == WEBKIT_DOWNLOAD_STATUS_STARTED || status == WEBKIT_DOWNLOAD_STATUS_CREATED) {
+		c->progress = (gint)(webkit_download_get_progress(c->download)*100);
+	}
+	update(c);
 }
 
 void
@@ -762,6 +810,12 @@ updatewinid(Client *c) {
 			(int)GDK_WINDOW_XID(GTK_WIDGET(c->win)->window));
 }
 
+void
+usage(void) {
+	fputs("surf - simple browser\n", stderr);
+	die("usage: surf [-e Window] [-x] [uri]\n");
+}
+
 void
 windowobjectcleared(GtkWidget *w, WebKitWebFrame *frame, JSContextRef js, JSObjectRef win, Client *c) {
 	JSStringRef jsscript;
@@ -816,9 +870,8 @@ int main(int argc, char *argv[]) {
 		arg.v = argv[i];
 	setup();
 	newclient();
-	if(arg.v) {
+	if(arg.v)
 		loaduri(clients, &arg);
-	}
 	gtk_main();
 	cleanup();
 	return EXIT_SUCCESS;