Replace initdownload() and intercept global download requests.

[surf.git] / surf.c

diff --git a/surf.c b/surf.c
index fecbd98..d893b27 100644 (file)
--- a/surf.c
+++ b/surf.c
@@ -60,11 +60,12 @@ typedef struct Client {
        WebKitWebView *view;
        WebKitWebInspector *inspector;
        WebKitHitTestResult *mousepos;
+       GTlsCertificateFlags tlsflags;
        const char *title, *targeturi;
        const char *needle;
        gint progress;
        struct Client *next;
-       gboolean zoomed, fullscreen, isinspecting, sslfailed;
+       gboolean zoomed, fullscreen, isinspecting;
 } Client;
 
 typedef struct {
@@ -140,7 +141,10 @@ static void setstyle(Client *c, const char *style);
 
 static void handleplumb(Client *c, WebKitWebView *w, const gchar *uri);
 
-static gboolean initdownload(WebKitWebView *v, WebKitDownload *o, Client *c);
+static void downloadstarted(WebKitWebContext *wc, WebKitDownload *d,
+               Client *c);
+static void responsereceived(WebKitDownload *d, GParamSpec *ps, Client *c);
+static void download(Client *c, WebKitURIResponse *r);
 
 static void inspector(Client *c, const Arg *arg);
 static WebKitWebView *inspector_new(WebKitWebInspector *i, WebKitWebView *v,
@@ -168,7 +172,7 @@ static void menuactivate(GtkMenuItem *item, Client *c);
 static void print(Client *c, const Arg *arg);
 static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event,
                                 gpointer d);
-static void progresschange(WebKitWebView *view, GParamSpec *pspec, Client *c);
+static void progresschanged(WebKitWebView *v, GParamSpec *ps, Client *c);
 static void linkopen(Client *c, const Arg *arg);
 static void linkopenembed(Client *c, const Arg *arg);
 static void reload(Client *c, const Arg *arg);
@@ -697,15 +701,27 @@ handleplumb(Client *c, WebKitWebView *w, const gchar *uri)
        spawn(c, &arg);
 }
 
-gboolean
-initdownload(WebKitWebView *view, WebKitDownload *o, Client *c)
+void
+downloadstarted(WebKitWebContext *wc, WebKitDownload *d, Client *c)
 {
-       Arg arg;
+       g_signal_connect(G_OBJECT(d), "notify::response",
+           G_CALLBACK(responsereceived), c);
+}
 
-       updatewinid(c);
-       arg = (Arg)DOWNLOAD((char *)webkit_download_get_uri(o), geturi(c));
-       spawn(c, &arg);
-       return FALSE;
+void
+responsereceived(WebKitDownload *d, GParamSpec *ps, Client *c)
+{
+       download(c, webkit_download_get_response(d));
+       webkit_download_cancel(d);
+}
+
+void
+download(Client *c, WebKitURIResponse *r)
+{
+       Arg a;
+
+       a = (Arg)DOWNLOAD(webkit_uri_response_get_uri(r), geturi(c));
+       spawn(c, &a);
 }
 
 void
@@ -896,6 +912,7 @@ newclient(Client *rc)
        clients = c;
 
        c->view = newview(c, rc ? rc->view : NULL);
+       c->tlsflags = G_TLS_CERTIFICATE_VALIDATE_ALL + 1;
 
        return c;
 }
@@ -960,6 +977,9 @@ newview(Client *c, WebKitWebView *rv)
                    webkit_web_context_get_cookie_manager(context),
                    cookiepolicy_get());
 
+               g_signal_connect(G_OBJECT(context), "download-started",
+                   G_CALLBACK(downloadstarted), c);
+
                v = g_object_new(WEBKIT_TYPE_WEB_VIEW,
                    "settings", settings,
                    "user-content-manager", contentmanager,
@@ -991,11 +1011,8 @@ newview(Client *c, WebKitWebView *rv)
                         "load-changed",
                         G_CALLBACK(loadchanged), c);
        g_signal_connect(G_OBJECT(v),
-                        "notify::progress",
-                        G_CALLBACK(progresschange), c);
-       g_signal_connect(G_OBJECT(v),
-                        "download-requested",
-                        G_CALLBACK(initdownload), c);
+                        "notify::estimated-load-progress",
+                        G_CALLBACK(progresschanged), c);
        g_signal_connect(G_OBJECT(v),
                         "button-release-event",
                         G_CALLBACK(buttonrelease), c);
@@ -1218,9 +1235,10 @@ processx(GdkXEvent *e, GdkEvent *event, gpointer d)
 }
 
 void
-progresschange(WebKitWebView *view, GParamSpec *pspec, Client *c)
+progresschanged(WebKitWebView *v, GParamSpec *ps, Client *c)
 {
-       c->progress = webkit_web_view_get_progress(c->view) * 100;
+       c->progress = webkit_web_view_get_estimated_load_progress(c->view) *
+           100;
        updatetitle(c);
 }
 
@@ -1518,11 +1536,8 @@ getpagestat(Client *c)
 {
        const char *uri = geturi(c);
 
-       if (strstr(uri, "https://") == uri)
-               pagestat[0] = c->sslfailed ? 'U' : 'T';
-       else
-               pagestat[0] = '-';
-
+       pagestats[0] = c->tlsflags > G_TLS_CERTIFICATE_VALIDATE_ALL ? '-' :
+           c->tlsflags > 0 ? 'U' : 'T';
        pagestat[1] = '\0';
 }