static gboolean showxid = FALSE;
static char winid[64];
static gboolean usingproxy = 0;
-static char togglestat[8];
+static char togglestat[9];
static char pagestat[3];
static GTlsDatabase *tlsdb;
static int policysel = 0;
static char *stylefile = NULL;
+static SoupCache *diskcache = NULL;
static void addaccelgroup(Client *c);
static void beforerequest(WebKitWebView *w, WebKitWebFrame *f,
WebKitWebResource *r, WebKitNetworkRequest *req,
- WebKitNetworkResponse *resp, gpointer d);
+ WebKitNetworkResponse *resp, Client *c);
static char *buildpath(const char *path);
static gboolean buttonrelease(WebKitWebView *web, GdkEventButton *e,
GList *gl);
static char *geturi(Client *c);
static gchar *getstyle(const char *uri);
+static void handleplumb(Client *c, WebKitWebView *w, const gchar *uri);
+
static gboolean initdownload(WebKitWebView *v, WebKitDownload *o, Client *c);
static void inspector(Client *c, const Arg *arg);
static void
beforerequest(WebKitWebView *w, WebKitWebFrame *f, WebKitWebResource *r,
WebKitNetworkRequest *req, WebKitNetworkResponse *resp,
- gpointer d) {
+ Client *c) {
const gchar *uri = webkit_network_request_get_uri(req);
if(g_str_has_suffix(uri, "/favicon.ico"))
webkit_network_request_set_uri(req, "about:blank");
+
+ if(!g_str_has_prefix(uri, "http://") \
+ && !g_str_has_prefix(uri, "https://") \
+ && !g_str_has_prefix(uri, "about:") \
+ && strlen(uri) > 0) {
+ printf("Handle plumb: %s\n", uri);
+ handleplumb(c, w, uri);
+ }
}
static char *
static void
cleanup(void) {
+ if (diskcache) {
+ soup_cache_flush(diskcache);
+ soup_cache_dump(diskcache);
+ }
while(clients)
destroyclient(clients);
g_free(cookiefile);
return g_strdup("");
}
+static void
+handleplumb(Client *c, WebKitWebView *w, const gchar *uri) {
+ Arg arg;
+
+ webkit_web_view_stop_loading(w);
+ arg = (Arg)PLUMB((char *)uri);
+ spawn(c, &arg);
+}
+
static gboolean
initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) {
Arg arg;
case WEBKIT_LOAD_FINISHED:
c->progress = 100;
updatetitle(c);
+ if (diskcache) {
+ soup_cache_flush(diskcache);
+ soup_cache_dump(diskcache);
+ }
break;
default:
break;
static void
newwindow(Client *c, const Arg *arg, gboolean noembed) {
guint i = 0;
- const char *cmd[16], *uri;
+ const char *cmd[18], *uri;
const Arg a = { .v = (void *)cmd };
char tmp[64];
cmd[i++] = "-s";
if(showxid)
cmd[i++] = "-x";
+ if(enablediskcache)
+ cmd[i++] = "-D";
cmd[i++] = "-c";
cmd[i++] = cookiefile;
cmd[i++] = "--";
/* dirs and files */
cookiefile = buildpath(cookiefile);
scriptfile = buildpath(scriptfile);
+ cachefolder = buildpath(cachefolder);
styledir = buildpath(styledir);
if(stylefile == NULL && enablestyles) {
for(i = 0; i < LENGTH(styles); i++) {
SOUP_SESSION_FEATURE(cookiejar_new(cookiefile, FALSE,
cookiepolicy_get())));
+ /* disk cache */
+ if(enablediskcache) {
+ diskcache = soup_cache_new(cachefolder, SOUP_CACHE_SINGLE_USER);
+ soup_cache_set_max_size(diskcache, diskcachebytes);
+ soup_cache_load(diskcache);
+ soup_session_add_feature(s, SOUP_SESSION_FEATURE(diskcache));
+ }
+
/* ssl */
tlsdb = g_tls_file_database_new(cafile, &error);
togglestat[p++] = allowgeolocation? 'G': 'g';
+ togglestat[p++] = enablediskcache? 'D': 'd';
+
g_object_get(G_OBJECT(settings), "auto-load-images", &value, NULL);
togglestat[p++] = value? 'I': 'i';
case 'c':
cookiefile = EARGF(usage());
break;
+ case 'd':
+ enablediskcache = 0;
+ break;
+ case 'D':
+ enablediskcache = 1;
+ break;
case 'e':
embed = strtol(EARGF(usage()), NULL, 0);
break;