X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=surf.c;h=a046a5a41b01869e8a6d5ca6238d617aa958e5c3;hb=a05bcc653e3ee1ae856b3073707ffb5aec13940e;hp=b3b4f91732bd99b98b095b4a8f2cd1e279b76e07;hpb=b8105c64eda87a16e3cae4f7615cb20eb29f3870;p=surf.git

diff --git a/surf.c b/surf.c
index b3b4f91..a046a5a 100644
--- a/surf.c
+++ b/surf.c
@@ -263,6 +263,7 @@ download(Client *c, const Arg *arg) {
 	r = webkit_network_request_new(uri);
 	dl = webkit_download_new(r);
 	initdownload(c->view, dl, c);
+	webkit_download_start(c->download);
 }
 
 void
@@ -352,9 +353,10 @@ gotheaders(SoupMessage *msg, gpointer v) {
 gboolean
 initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) {
 	const char *filename;
-	char *uri, *html;
+	char *uri;
+	WebKitWebBackForwardList *h;
+	WebKitWebHistoryItem *i;
 
-	stop(c, NULL);
 	c->download = o;
 	filename = webkit_download_get_suggested_filename(o);
 	if(!strcmp("", filename))
@@ -362,17 +364,14 @@ initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) {
 	uri = g_strconcat("file://", dldir, "/", filename, NULL);
 	webkit_download_set_destination_uri(c->download, uri);
 	c->progress = 0;
-	g_free(uri);
-	html = g_strdup_printf("Download <b>%s</b>...", filename);
-	webkit_web_view_load_html_string(c->view, html,
-			webkit_download_get_uri(c->download));
+	h = webkit_web_view_get_back_forward_list(c->view);
+	i = webkit_web_history_item_new_with_data(webkit_download_get_uri(c->download), filename);
+	webkit_web_back_forward_list_add_item(h, i);
 	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);
 	update(c);
-	g_free(html);
 	return TRUE;
 }
 
@@ -417,6 +416,8 @@ linkhover(WebKitWebView *v, const char* t, const char* l, Client *c) {
 
 void
 loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c) {
+	if(c->download)
+		stop(c, NULL);
 	switch(webkit_web_view_get_load_status (c->view)) {
 	case WEBKIT_LOAD_COMMITTED:
 		setatom(c, uriprop, geturi(c));
@@ -587,6 +588,7 @@ newrequest(SoupSession *s, SoupMessage *msg, gpointer v) {
 	if((c = getcookies(uri))) {
 		soup_message_headers_append(h, "Cookie", c);
 	}
+	g_signal_connect_after(G_OBJECT(msg), "got-headers", G_CALLBACK(gotheaders), NULL);
 }
 
 void
@@ -739,7 +741,6 @@ setup(void) {
 	soup_session_remove_feature_by_type(s, soup_cookie_get_type());
 	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);
-	g_signal_connect_after(G_OBJECT(s), "got-headers", G_CALLBACK(gotheaders), NULL);
 
 
 	/* proxy */
@@ -822,6 +823,8 @@ updatedownload(WebKitDownload *o, GParamSpec *pspec, Client *c) {
 	if(status == WEBKIT_DOWNLOAD_STATUS_STARTED || status == WEBKIT_DOWNLOAD_STATUS_CREATED) {
 		c->progress = (gint)(webkit_download_get_progress(c->download)*100);
 	}
+	else
+		stop(c, NULL);
 	update(c);
 }
 
@@ -834,7 +837,7 @@ updatewinid(Client *c) {
 void
 usage(void) {
 	fputs("surf - simple browser\n", stderr);
-	die("usage: surf [-e Window] [-x] [-i] [-p] [-s] [uri]\n");
+	die("usage: surf [-e xid] [-i] [-p] [-s] [-v] [-x] [uri]\n");
 }
 
 void
@@ -877,9 +880,6 @@ main(int argc, char *argv[]) {
 			break;
 		}
 		switch(argv[i][1]) {
-		case 'x':
-			showxid = TRUE;
-			break;
 		case 'e':
 			if(++i < argc)
 				embed = atoi(argv[i]);
@@ -895,8 +895,13 @@ main(int argc, char *argv[]) {
 		case 's':
 			script = 0;
 			break;
+		case 'x':
+			showxid = TRUE;
+			break;
 		case 'v':
 			die("surf-"VERSION", © 2009 surf engineers, see LICENSE for details\n");
+		default:
+			usage();
 		}
 	}
 	if(i < argc)