iAllow to toggle insecure websites. - 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 20b2831bbc5937b382725667d474422f2ea183ec /scm/surf//commit/20b2831bbc5937b382725667d474422f2ea183ec.gph gopher.r-36.net 70 1parent 55b66eda460db4e936bd995f7cd048c8438d0975 /scm/surf//commit/55b66eda460db4e936bd995f7cd048c8438d0975.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 20:56:14 +0200 Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iAllow to toggle insecure websites. Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iDiffstat: Err gopher.r-36.net 70 i config.def.h | 3 +++ Err gopher.r-36.net 70 i surf.1 | 8 +++++++- Err gopher.r-36.net 70 i surf.c | 32 ++++++++++++++++++++++++------- Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i3 files changed, 35 insertions(+), 8 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@@ -40,6 +40,8 @@ static Bool enablestyle = 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 insecureresources = FALSE; /* Whether to allow to load Err gopher.r-36.net 70 i+ * non-HTTPS resources in HTTPS pages. */ Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* Err gopher.r-36.net 70 i * Now on TV: »What is the best User-Agent for me?« Err gopher.r-36.net 70 i@@ -167,6 +169,7 @@ static Key keys[] = { Err gopher.r-36.net 70 i { MODKEY|GDK_SHIFT_MASK,GDK_i, toggle, { .v = "auto-load-images" } }, Err gopher.r-36.net 70 i { MODKEY|GDK_SHIFT_MASK,GDK_s, toggle, { .v = "enable-scripts" } }, 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_a, togglecookiepolicy, { 0 } }, Err gopher.r-36.net 70 i { MODKEY|GDK_SHIFT_MASK,GDK_m, togglestyle, { 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 [-bBdDfFgGiIkKmMnNpPsStTvx] Err gopher.r-36.net 70 i+.RB [-bBdDfFgGiIkKmLlMnNpPsStTvx] 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@@ -74,6 +74,12 @@ Disable kiosk mode (disable key strokes and right click) Err gopher.r-36.net 70 i .B \-K Err gopher.r-36.net 70 i Enable kiosk mode (disable key strokes and right click) Err gopher.r-36.net 70 i .TP Err gopher.r-36.net 70 i+.B \-l Err gopher.r-36.net 70 i+Disable loading of non-HTTPS resources on HTTPS pages. Err gopher.r-36.net 70 i+.TP Err gopher.r-36.net 70 i+.B \-L Err gopher.r-36.net 70 i+Enable loading of non-HTTPS resources on HTTPS pages. Err gopher.r-36.net 70 i+.TP Err gopher.r-36.net 70 i .B \-m Err gopher.r-36.net 70 i Disable application of user style sheets. Err gopher.r-36.net 70 i .TP 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[10]; Err gopher.r-36.net 70 i+static char togglestat[11]; 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@@ -1097,6 +1097,9 @@ newclient(void) Err gopher.r-36.net 70 i "default-encoding", defaultencoding, NULL); Err gopher.r-36.net 70 i g_object_set(G_OBJECT(settings), Err gopher.r-36.net 70 i "enable-accelerated-compositing", accelrendering, NULL); Err gopher.r-36.net 70 i+ g_object_set(G_OBJECT(settings), Err gopher.r-36.net 70 i+ "enable-display-of-insecure-content", insecureresources, Err gopher.r-36.net 70 i+ NULL); Err gopher.r-36.net 70 i if (enablestyle) Err gopher.r-36.net 70 i setstyle(c, getstyle("about:blank")); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i@@ -1158,7 +1161,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[28], *uri; Err gopher.r-36.net 70 i+ const char *cmd[29], *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@@ -1210,6 +1213,11 @@ newwindow(Client *c, const Arg *arg, gboolean noembed) Err gopher.r-36.net 70 i else Err gopher.r-36.net 70 i cmd[i++] = "-k"; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i+ if (insecureresources) Err gopher.r-36.net 70 i+ cmd[i++] = "-L"; Err gopher.r-36.net 70 i+ else Err gopher.r-36.net 70 i+ cmd[i++] = "-l"; Err gopher.r-36.net 70 i+ Err gopher.r-36.net 70 i if (enablestyle) Err gopher.r-36.net 70 i cmd[i++] = "-M"; Err gopher.r-36.net 70 i else Err gopher.r-36.net 70 i@@ -1764,13 +1772,19 @@ gettogglestat(Client *c) Err gopher.r-36.net 70 i NULL); Err gopher.r-36.net 70 i togglestat[p++] = value? 'C': '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+ togglestat[p++] = allowgeolocation? 'G': 'g'; 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+ g_object_get(G_OBJECT(settings), Err gopher.r-36.net 70 i+ "enable-display-of-insecure-content", &value, NULL); Err gopher.r-36.net 70 i+ togglestat[p++] = value? 'L': 'l'; Err gopher.r-36.net 70 i+ Err gopher.r-36.net 70 i+ togglestat[p++] = enablestyle ? 'M': 'm'; Err gopher.r-36.net 70 i+ Err gopher.r-36.net 70 i g_object_get(G_OBJECT(settings), "enable-scripts", &value, NULL); Err gopher.r-36.net 70 i togglestat[p++] = value? 'S': 's'; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i@@ -1780,8 +1794,6 @@ 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- togglestat[p++] = enablestyle ? 'M': 'm'; 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@@ -1838,7 +1850,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 [-bBdDfFgGiIkKmMnNpPsStTvx] [-a cookiepolicies ] " Err gopher.r-36.net 70 i+ die("usage: %s [-bBdDfFgGiIkKlLmMnNpPsStTvx] [-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@@ -1922,6 +1934,12 @@ main(int argc, char *argv[]) Err gopher.r-36.net 70 i case 'K': Err gopher.r-36.net 70 i kioskmode = 1; Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i+ case 'L': Err gopher.r-36.net 70 i+ insecureresources = 1; Err gopher.r-36.net 70 i+ break; Err gopher.r-36.net 70 i+ case 'l': Err gopher.r-36.net 70 i+ insecureresources = 0; Err gopher.r-36.net 70 i+ break; Err gopher.r-36.net 70 i case 'm': Err gopher.r-36.net 70 i enablestyle = 0; Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 .