r = webkit_network_request_new(uri);
dl = webkit_download_new(r);
initdownload(c->view, dl, c);
+ webkit_download_start(c->download);
}
void
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))
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;
}
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));
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
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 */
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);
}
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
break;
}
switch(argv[i][1]) {
- case 'x':
- showxid = TRUE;
- break;
case 'e':
if(++i < argc)
embed = atoi(argv[i]);
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)