iAdding disk cache support for soup. - surf - Surf web browser. Err gopher.r-36.net 70 i Err gopher.r-36.net 70 1Log /scm/surf//log.gph gopher.r-36.net 70 1Files /scm/surf//files.gph gopher.r-36.net 70 1Refs /scm/surf//refs.gph gopher.r-36.net 70 1README /scm/surf//file/README.gph gopher.r-36.net 70 1LICENSE /scm/surf//file/LICENSE.gph gopher.r-36.net 70 i--- Err gopher.r-36.net 70 1commit 117d4848338315d15e1ab93cd551889fc6964a2b /scm/surf//commit/117d4848338315d15e1ab93cd551889fc6964a2b.gph gopher.r-36.net 70 1parent 24ec46fc241b655bf91a4529fa164ae9703d4eb6 /scm/surf//commit/24ec46fc241b655bf91a4529fa164ae9703d4eb6.gph gopher.r-36.net 70 hAuthor: Christoph Lohmann <20h@r-36.net> URL:mailto:20h@r-36.net gopher.r-36.net 70 iDate: Sat, 17 Jan 2015 20:50:21 +0100 Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iAdding disk cache support for soup. Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iThis is a merge of the patch of Ben Woolley Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iDiffstat: Err gopher.r-36.net 70 i config.def.h | 19 +++++++++++-------- Err gopher.r-36.net 70 i surf.c | 30 +++++++++++++++++++++++++++++- Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i2 files changed, 40 insertions(+), 9 deletions(-) Err gopher.r-36.net 70 i--- Err gopher.r-36.net 70 1diff --git a/config.def.h b/config.def.h /scm/surf//file/config.def.h.gph gopher.r-36.net 70 i@@ -4,6 +4,7 @@ static char *useragent = "Mozilla/5.0 (X11; U; Unix; en-US) " Err gopher.r-36.net 70 i "Safari/537.15 Surf/"VERSION; Err gopher.r-36.net 70 i static char *scriptfile = "~/.surf/script.js"; Err gopher.r-36.net 70 i static char *styledir = "~/.surf/styles/"; Err gopher.r-36.net 70 i+static char *cachefolder = "~/.surf/cache/"; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i static Bool kioskmode = FALSE; /* Ignore shortcuts */ Err gopher.r-36.net 70 i static Bool showindicators = TRUE; /* Show indicators in window title */ Err gopher.r-36.net 70 i@@ -22,15 +23,17 @@ static char *strictssl = FALSE; /* Refuse untrusted SSL connections */ Err gopher.r-36.net 70 i static time_t sessiontime = 3600; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* Webkit default features */ Err gopher.r-36.net 70 i-static Bool enablescrollbars = TRUE; Err gopher.r-36.net 70 i+static Bool enablescrollbars = TRUE; Err gopher.r-36.net 70 i static Bool enablespatialbrowsing = TRUE; Err gopher.r-36.net 70 i-static Bool enableplugins = TRUE; Err gopher.r-36.net 70 i-static Bool enablescripts = TRUE; Err gopher.r-36.net 70 i-static Bool enableinspector = TRUE; Err gopher.r-36.net 70 i-static Bool enablestyles = TRUE; Err gopher.r-36.net 70 i-static Bool loadimages = TRUE; Err gopher.r-36.net 70 i-static Bool hidebackground = FALSE; Err gopher.r-36.net 70 i-static Bool allowgeolocation = TRUE; Err gopher.r-36.net 70 i+static Bool enablediskcache = TRUE; Err gopher.r-36.net 70 i+static int diskcachebytes = 5 * 1024 * 1024; Err gopher.r-36.net 70 i+static Bool enableplugins = TRUE; Err gopher.r-36.net 70 i+static Bool enablescripts = TRUE; Err gopher.r-36.net 70 i+static Bool enableinspector = TRUE; Err gopher.r-36.net 70 i+static Bool enablestyles = TRUE; Err gopher.r-36.net 70 i+static Bool loadimages = TRUE; Err gopher.r-36.net 70 i+static Bool hidebackground = FALSE; Err gopher.r-36.net 70 i+static Bool allowgeolocation = TRUE; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i #define SETPROP(p, q) { \ Err gopher.r-36.net 70 i .v = (char *[]){ "/bin/sh", "-c", \ Err gopher.r-36.net 70 1diff --git a/surf.c b/surf.c /scm/surf//file/surf.c.gph gopher.r-36.net 70 i@@ -85,11 +85,12 @@ static GdkNativeWindow embed = 0; Err gopher.r-36.net 70 i static gboolean showxid = FALSE; Err gopher.r-36.net 70 i static char winid[64]; Err gopher.r-36.net 70 i static gboolean usingproxy = 0; Err gopher.r-36.net 70 i-static char togglestat[8]; Err gopher.r-36.net 70 i+static char togglestat[9]; Err gopher.r-36.net 70 i static char pagestat[3]; Err gopher.r-36.net 70 i static GTlsDatabase *tlsdb; Err gopher.r-36.net 70 i static int policysel = 0; Err gopher.r-36.net 70 i static char *stylefile = NULL; Err gopher.r-36.net 70 i+static SoupCache *diskcache = NULL; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i static void addaccelgroup(Client *c); Err gopher.r-36.net 70 i static void beforerequest(WebKitWebView *w, WebKitWebFrame *f, Err gopher.r-36.net 70 i@@ -270,6 +271,10 @@ buttonrelease(WebKitWebView *web, GdkEventButton *e, GList *gl) { Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i static void Err gopher.r-36.net 70 i cleanup(void) { Err gopher.r-36.net 70 i+ if (diskcache) { Err gopher.r-36.net 70 i+ soup_cache_flush(diskcache); Err gopher.r-36.net 70 i+ soup_cache_dump(diskcache); Err gopher.r-36.net 70 i+ } Err gopher.r-36.net 70 i while(clients) Err gopher.r-36.net 70 i destroyclient(clients); Err gopher.r-36.net 70 i g_free(cookiefile); Err gopher.r-36.net 70 i@@ -677,6 +682,10 @@ loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c) { Err gopher.r-36.net 70 i case WEBKIT_LOAD_FINISHED: Err gopher.r-36.net 70 i c->progress = 100; Err gopher.r-36.net 70 i updatetitle(c); Err gopher.r-36.net 70 i+ if (diskcache) { Err gopher.r-36.net 70 i+ soup_cache_flush(diskcache); Err gopher.r-36.net 70 i+ soup_cache_dump(diskcache); Err gopher.r-36.net 70 i+ } Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i default: Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i@@ -972,6 +981,8 @@ newwindow(Client *c, const Arg *arg, gboolean noembed) { Err gopher.r-36.net 70 i cmd[i++] = "-s"; Err gopher.r-36.net 70 i if(showxid) Err gopher.r-36.net 70 i cmd[i++] = "-x"; Err gopher.r-36.net 70 i+ if(enablediskcache) Err gopher.r-36.net 70 i+ cmd[i++] = "-D"; Err gopher.r-36.net 70 i cmd[i++] = "-c"; Err gopher.r-36.net 70 i cmd[i++] = cookiefile; Err gopher.r-36.net 70 i cmd[i++] = "--"; Err gopher.r-36.net 70 i@@ -1149,6 +1160,7 @@ setup(void) { Err gopher.r-36.net 70 i /* dirs and files */ Err gopher.r-36.net 70 i cookiefile = buildpath(cookiefile); Err gopher.r-36.net 70 i scriptfile = buildpath(scriptfile); Err gopher.r-36.net 70 i+ cachefolder = buildpath(cachefolder); Err gopher.r-36.net 70 i styledir = buildpath(styledir); Err gopher.r-36.net 70 i if(stylefile == NULL && enablestyles) { Err gopher.r-36.net 70 i for(i = 0; i < LENGTH(styles); i++) { Err gopher.r-36.net 70 i@@ -1175,6 +1187,14 @@ setup(void) { Err gopher.r-36.net 70 i SOUP_SESSION_FEATURE(cookiejar_new(cookiefile, FALSE, Err gopher.r-36.net 70 i cookiepolicy_get()))); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i+ /* disk cache */ Err gopher.r-36.net 70 i+ if(enablediskcache) { Err gopher.r-36.net 70 i+ diskcache = soup_cache_new(cachefolder, SOUP_CACHE_SINGLE_USER); Err gopher.r-36.net 70 i+ soup_cache_set_max_size(diskcache, diskcachebytes); Err gopher.r-36.net 70 i+ soup_cache_load(diskcache); Err gopher.r-36.net 70 i+ soup_session_add_feature(s, SOUP_SESSION_FEATURE(diskcache)); Err gopher.r-36.net 70 i+ } Err gopher.r-36.net 70 i+ Err gopher.r-36.net 70 i /* ssl */ Err gopher.r-36.net 70 i tlsdb = g_tls_file_database_new(cafile, &error); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i@@ -1363,6 +1383,8 @@ gettogglestat(Client *c){ Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i togglestat[p++] = allowgeolocation? 'G': 'g'; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i+ togglestat[p++] = enablediskcache? 'D': 'd'; Err gopher.r-36.net 70 i+ Err gopher.r-36.net 70 i g_object_get(G_OBJECT(settings), "auto-load-images", &value, NULL); Err gopher.r-36.net 70 i togglestat[p++] = value? 'I': 'i'; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i@@ -1479,6 +1501,12 @@ main(int argc, char *argv[]) { Err gopher.r-36.net 70 i case 'c': Err gopher.r-36.net 70 i cookiefile = EARGF(usage()); Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i+ case 'd': Err gopher.r-36.net 70 i+ enablediskcache = 0; Err gopher.r-36.net 70 i+ break; Err gopher.r-36.net 70 i+ case 'D': Err gopher.r-36.net 70 i+ enablediskcache = 1; Err gopher.r-36.net 70 i+ break; Err gopher.r-36.net 70 i case 'e': Err gopher.r-36.net 70 i embed = strtol(EARGF(usage()), NULL, 0); Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 .