nilix/surf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixing downloads based on Evan Gates' patch.

Browse source
This commit is contained in:
Enno Boland (tox) 2009-10-27 08:11:44 +01:00
parent 1d019cf8af
commit a9d733bd9f
2 changed files with 37 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
config.def.h
View file

@ -42,4 +42,5 @@ static Item items[] = {
{ "Stop", stop, { 0 } }, { "Stop", stop, { 0 } },
{ "Paste URI", clipboard, { .b = TRUE } }, { "Paste URI", clipboard, { .b = TRUE } },
{ "Copy URI", clipboard, { .b = FALSE } }, { "Copy URI", clipboard, { .b = FALSE } },
{ "Download", download, { 0 } },
}; };

46
surf.c
View file

@ -76,7 +76,7 @@ static gboolean decidewindow(WebKitWebView *v, WebKitWebFrame *f, WebKitNetworkR
static void destroyclient(Client *c); static void destroyclient(Client *c);
static void destroywin(GtkWidget* w, Client *c); static void destroywin(GtkWidget* w, Client *c);
static void die(char *str); 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 void drawindicator(Client *c);
static gboolean exposeindicator(GtkWidget *w, GdkEventExpose *e, Client *c); static gboolean exposeindicator(GtkWidget *w, GdkEventExpose *e, Client *c);
static char *geturi(Client *c); static char *geturi(Client *c);
@ -110,6 +110,7 @@ static void stop(Client *c, const Arg *arg);
static void titlechange(WebKitWebView *v, WebKitWebFrame* frame, const char* title, Client *c); static void titlechange(WebKitWebView *v, WebKitWebFrame* frame, const char* title, Client *c);
static void usage(void); static void usage(void);
static void update(Client *c); static void update(Client *c);
static void updatedownload(WebKitDownload *o, GParamSpec *pspec, Client *c);
static void updatewinid(Client *c); static void updatewinid(Client *c);
static void windowobjectcleared(GtkWidget *w, WebKitWebFrame *frame, JSContextRef js, JSObjectRef win, Client *c); static void windowobjectcleared(GtkWidget *w, WebKitWebFrame *frame, JSContextRef js, JSObjectRef win, Client *c);
static void zoom(Client *c, const Arg *arg); static void zoom(Client *c, const Arg *arg);
@ -231,6 +232,15 @@ destroyclient(Client *c) {
gtk_main_quit(); gtk_main_quit();
} }
gboolean
mime_policy_cb(WebKitWebView *web_view, WebKitWebFrame *frame, WebKitNetworkRequest *request, gchar *mime_type, WebKitWebPolicyDecision *policy_decision, gpointer user_data) {
if(webkit_web_view_can_show_mime_type(web_view, mime_type))
webkit_web_policy_decision_use(policy_decision);
else
webkit_web_policy_decision_download(policy_decision);
return TRUE;
}
gboolean gboolean
decidewindow(WebKitWebView *view, WebKitWebFrame *f, WebKitNetworkRequest *r, WebKitWebNavigationAction *n, WebKitWebPolicyDecision *p, Client *c) { decidewindow(WebKitWebView *view, WebKitWebFrame *f, WebKitNetworkRequest *r, WebKitWebNavigationAction *n, WebKitWebPolicyDecision *p, Client *c) {
Arg arg; Arg arg;
@ -285,14 +295,18 @@ exposeindicator(GtkWidget *w, GdkEventExpose *e, Client *c) {
} }
void void
download(WebKitDownload *o, GParamSpec *pspec, Client *c) { download(Client *c, const Arg *arg) {
WebKitDownloadStatus status; char *uri;
WebKitNetworkRequest *r;
WebKitDownload *dl;
status = webkit_download_get_status(c->download); if(arg->v)
if(status == WEBKIT_DOWNLOAD_STATUS_STARTED || status == WEBKIT_DOWNLOAD_STATUS_CREATED) { uri = (char *)arg->v;
c->progress = (gint)(webkit_download_get_progress(c->download)*100); else
} uri = c->linkhover ? c->linkhover : geturi(c);
update(c); r = webkit_network_request_new(uri);
dl = webkit_download_new(r);
initdownload(c->view, dl, c);
} }
const char * const char *
@ -322,6 +336,8 @@ initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) {
stop(c, NULL); stop(c, NULL);
c->download = o; c->download = o;
filename = webkit_download_get_suggested_filename(o); filename = webkit_download_get_suggested_filename(o);
if(!strcmp("", filename))
filename = "index.html";
uri = g_strconcat("file://", dldir, "/", filename, NULL); uri = g_strconcat("file://", dldir, "/", filename, NULL);
webkit_download_set_destination_uri(c->download, uri); webkit_download_set_destination_uri(c->download, uri);
c->progress = 0; c->progress = 0;
@ -329,8 +345,8 @@ initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) {
html = g_strdup_printf("Download <b>%s</b>...", filename); html = g_strdup_printf("Download <b>%s</b>...", filename);
webkit_web_view_load_html_string(c->view, html, webkit_web_view_load_html_string(c->view, html,
webkit_download_get_uri(c->download)); webkit_download_get_uri(c->download));
g_signal_connect(c->download, "notify::progress", G_CALLBACK(download), c); g_signal_connect(c->download, "notify::progress", G_CALLBACK(updatedownload), c);
g_signal_connect(c->download, "notify::status", G_CALLBACK(download), c); g_signal_connect(c->download, "notify::status", G_CALLBACK(updatedownload), c);
webkit_download_start(c->download); webkit_download_start(c->download);
c->title = copystr(&c->title, filename); c->title = copystr(&c->title, filename);
@ -753,7 +769,17 @@ update(Client *c) {
drawindicator(c); drawindicator(c);
gtk_window_set_title(GTK_WINDOW(c->win), t); gtk_window_set_title(GTK_WINDOW(c->win), t);
g_free(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 void