X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=surf.c;h=cac31d6a80e3b9f731443ce3a5459b0f2e60410f;hb=981e52d5a755f7a30fc59595ab84f9df05a84f01;hp=37135d80820c3d36635a78e7e3501a45d832a01d;hpb=19aaa5a74b16fd6fafbfaf6081e4f89491f0f344;p=surf.git

diff --git a/surf.c b/surf.c
index 37135d8..cac31d6 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
@@ -305,7 +306,11 @@ find(Client *c, const Arg *arg) {
 
 const char *
 getcookies(SoupURI *uri) {
-	return NULL;
+	const char *c;
+	SoupCookieJar *j = soup_cookie_jar_text_new(cookiefile, TRUE);
+	c = soup_cookie_jar_get_cookies(j, uri, TRUE);
+	g_object_unref(j);
+	return c;
 }
 
 const char *
@@ -352,11 +357,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))
@@ -364,20 +368,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;
 }
 
@@ -422,6 +420,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));
@@ -613,7 +613,7 @@ newwindow(Client *c, const Arg *arg) {
 	if(!plugin)
 		cmd[i++] = "-p";
 	if(!loadimage)
-		cmd[i++] = "-l";
+		cmd[i++] = "-i";
 	if(showxid)
 		cmd[i++] = "-x";
 	cmd[i++] = "--";
@@ -704,7 +704,15 @@ scroll(Client *c, const Arg *arg) {
 
 void
 setcookie(SoupCookie *c) {
-
+	SoupDate *e;
+	SoupCookieJar *j = soup_cookie_jar_text_new(cookiefile, FALSE);
+	c = soup_cookie_copy(c);
+	if(c->expires == NULL) {
+		e = soup_date_new_from_time_t(time(NULL) + sessiontime);
+		soup_cookie_set_expires(c, e);
+	}
+	soup_cookie_jar_add_cookie(j, c);
+	g_object_unref(j);
 }
 
 void
@@ -827,6 +835,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);
 }
 
@@ -839,7 +849,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
@@ -882,9 +892,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]);
@@ -900,8 +907,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)