removed warning when closing a surf-window.

[surf.git] / surf.c

diff --git a/surf.c b/surf.c
index a4dc3be..43981ad 100644 (file)
--- a/surf.c
+++ b/surf.c
@@ -72,11 +72,12 @@ 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 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);
@@ -110,6 +111,7 @@ 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 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
@@ -212,10 +214,10 @@ 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,6 +233,15 @@ destroyclient(Client *c) {
                gtk_main_quit();
 }
 
+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;
@@ -285,14 +296,18 @@ exposeindicator(GtkWidget *w, GdkEventExpose *e, Client *c) {
 }
 
 void
-download(WebKitDownload *o, GParamSpec *pspec, Client *c) {
-       WebKitDownloadStatus status;
+download(Client *c, const Arg *arg) {
+       char *uri;
+       WebKitNetworkRequest *r;
+       WebKitDownload       *dl;
 
-       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);
+       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);
 }
 
 const char *
@@ -322,6 +337,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 +346,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);
@@ -390,13 +407,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
@@ -469,6 +486,7 @@ 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);
@@ -745,7 +763,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 +771,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