iAllow the page cache and private browsing to be configured. - 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 df1b4288031f4133974fb2d17c47ae110166c901 /scm/surf//commit/df1b4288031f4133974fb2d17c47ae110166c901.gph gopher.r-36.net 70 1parent de099ce636e90fa2ffa9ef54d3deb4597f60305e /scm/surf//commit/de099ce636e90fa2ffa9ef54d3deb4597f60305e.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: Fri, 21 Apr 2017 21:20:32 +0200 Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iAllow the page cache and private browsing to be configured. Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iDiffstat: Err gopher.r-36.net 70 i config.def.h | 6 ++++++ Err gopher.r-36.net 70 i surf.1 | 8 +++++++- Err gopher.r-36.net 70 i surf.c | 26 +++++++++++++++++++++++--- Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i3 files changed, 36 insertions(+), 4 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@@ -34,6 +34,11 @@ static int diskcachebytes = 5 * 1024 * 1024; 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 enablepagecache = TRUE; /* Enable cache of pages in current Err gopher.r-36.net 70 i+ * history. This will save memory Err gopher.r-36.net 70 i+ * if you do not have any. */ Err gopher.r-36.net 70 i+static Bool privatebrowsing = FALSE; /* Set default value for private Err gopher.r-36.net 70 i+ * browsing. */ 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 enablestyle = TRUE; Err gopher.r-36.net 70 i@@ -182,6 +187,7 @@ static Key keys[] = { Err gopher.r-36.net 70 i { MODKEY|GDK_SHIFT_MASK,GDK_v, toggle, { .v = "enable-plugins" } }, Err gopher.r-36.net 70 i { MODKEY|GDK_SHIFT_MASK,GDK_l, toggle, { .v = "enable-display-of-insecure-content" } }, Err gopher.r-36.net 70 i { MODKEY|GDK_SHIFT_MASK,GDK_t, togglesoup, { .v = "ssl-strict" } }, Err gopher.r-36.net 70 i+ { MODKEY|GDK_SHIFT_MASK,GDK_w, toggle, { .v = "enable-private-browsing" } }, Err gopher.r-36.net 70 i { MODKEY|GDK_SHIFT_MASK,GDK_a, togglecookiepolicy, { 0 } }, Err gopher.r-36.net 70 i { MODKEY|GDK_SHIFT_MASK,GDK_m, togglestyle, { 0 } }, Err gopher.r-36.net 70 i { MODKEY|GDK_SHIFT_MASK,GDK_b, togglescrollbars, { 0 } }, Err gopher.r-36.net 70 1diff --git a/surf.1 b/surf.1 /scm/surf//file/surf.1.gph gopher.r-36.net 70 i@@ -3,7 +3,7 @@ Err gopher.r-36.net 70 i surf \- simple webkit-based browser Err gopher.r-36.net 70 i .SH SYNOPSIS Err gopher.r-36.net 70 i .B surf Err gopher.r-36.net 70 i-.RB [-bBdDfFgGiIkKmLlMnNpPsStTvx] Err gopher.r-36.net 70 i+.RB [-bBdDfFgGiIkKlLmMnNpPsStTvwWx] Err gopher.r-36.net 70 i .RB [-a\ cookiepolicies] Err gopher.r-36.net 70 i .RB [-c\ cookiefile] Err gopher.r-36.net 70 i .RB [-e\ xid] Err gopher.r-36.net 70 i@@ -122,6 +122,12 @@ which surf should use. Err gopher.r-36.net 70 i .B \-v Err gopher.r-36.net 70 i Prints version information to standard output, then exits. Err gopher.r-36.net 70 i .TP Err gopher.r-36.net 70 i+.B \-w Err gopher.r-36.net 70 i+Disable private browsing. Err gopher.r-36.net 70 i+.TP Err gopher.r-36.net 70 i+.B \-W Err gopher.r-36.net 70 i+Enable private browsing. Err gopher.r-36.net 70 i+.TP Err gopher.r-36.net 70 i .B \-x Err gopher.r-36.net 70 i Prints xid to standard output. This can be used to script the browser in for Err gopher.r-36.net 70 i example 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@@ -109,7 +109,7 @@ 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[11]; Err gopher.r-36.net 70 i+static char togglestat[12]; 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@@ -1070,6 +1070,10 @@ newclient(void) Err gopher.r-36.net 70 i g_object_set(G_OBJECT(settings), Err gopher.r-36.net 70 i "enable-offline-web-application-cache", Err gopher.r-36.net 70 i offlineappcache, NULL); Err gopher.r-36.net 70 i+ g_object_set(G_OBJECT(settings), Err gopher.r-36.net 70 i+ "enable-page-cache", enablepagecache, NULL); Err gopher.r-36.net 70 i+ g_object_set(G_OBJECT(settings), Err gopher.r-36.net 70 i+ "enable-private-browsing", privatebrowsing, NULL); Err gopher.r-36.net 70 i g_object_set(G_OBJECT(settings), "enable-dns-prefetching", Err gopher.r-36.net 70 i dnsprefetching, NULL); Err gopher.r-36.net 70 i if (!(ua = getenv("SURF_USERAGENT"))) Err gopher.r-36.net 70 i@@ -1171,7 +1175,7 @@ void Err gopher.r-36.net 70 i newwindow(Client *c, const Arg *arg, gboolean noembed) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i guint i = 0; Err gopher.r-36.net 70 i- const char *cmd[29], *uri; Err gopher.r-36.net 70 i+ const char *cmd[30], *uri; Err gopher.r-36.net 70 i const Arg a = { .v = (void *)cmd }; Err gopher.r-36.net 70 i char tmp[64], ztmp[6]; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i@@ -1263,6 +1267,12 @@ newwindow(Client *c, const Arg *arg, gboolean noembed) Err gopher.r-36.net 70 i cmd[i++] = useragent; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i+ if (privatebrowsing) Err gopher.r-36.net 70 i+ cmd[i++] = "-W"; Err gopher.r-36.net 70 i+ else Err gopher.r-36.net 70 i+ cmd[i++] = "-w"; Err gopher.r-36.net 70 i+ Err gopher.r-36.net 70 i+ 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 Err gopher.r-36.net 70 i@@ -1804,6 +1814,10 @@ gettogglestat(Client *c) Err gopher.r-36.net 70 i g_object_get(G_OBJECT(settings), "enable-plugins", &value, NULL); Err gopher.r-36.net 70 i togglestat[p++] = value? 'V': 'v'; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i+ g_object_get(G_OBJECT(settings), "enable-private-browsing", &value, Err gopher.r-36.net 70 i+ NULL); Err gopher.r-36.net 70 i+ togglestat[p++] = value? 'W': 'w'; Err gopher.r-36.net 70 i+ Err gopher.r-36.net 70 i togglestat[p] = '\0'; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i@@ -1860,7 +1874,7 @@ updatewinid(Client *c) Err gopher.r-36.net 70 i void Err gopher.r-36.net 70 i usage(void) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i- die("usage: %s [-bBdDfFgGiIkKlLmMnNpPsStTvx] [-a cookiepolicies ] " Err gopher.r-36.net 70 i+ die("usage: %s [-bBdDfFgGiIkKlLmMnNpPsStTvwWx] [-a cookiepolicies ] " Err gopher.r-36.net 70 i "[-c cookiefile] [-e xid] [-r scriptfile] [-y stylefile] " Err gopher.r-36.net 70 i "[-u useragent] [-z zoomlevel] [uri]\n", basename(argv0)); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i@@ -1992,6 +2006,12 @@ main(int argc, char *argv[]) Err gopher.r-36.net 70 i case 'v': Err gopher.r-36.net 70 i die("surf-"VERSION", ©2009-2016 surf engineers, " Err gopher.r-36.net 70 i "see LICENSE for details\n"); Err gopher.r-36.net 70 i+ case 'w': Err gopher.r-36.net 70 i+ privatebrowsing = 0; Err gopher.r-36.net 70 i+ break; Err gopher.r-36.net 70 i+ case 'W': Err gopher.r-36.net 70 i+ privatebrowsing = 1; Err gopher.r-36.net 70 i+ break; Err gopher.r-36.net 70 i case 'x': Err gopher.r-36.net 70 i showxid = TRUE; Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 .