iAllow true disabling of unsafe non-HTTPS content. - 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 49493c7f2bd7a1d9df99f6fa4343f64d202aea17 /scm/surf//commit/49493c7f2bd7a1d9df99f6fa4343f64d202aea17.gph gopher.r-36.net 70 1parent df1b4288031f4133974fb2d17c47ae110166c901 /scm/surf//commit/df1b4288031f4133974fb2d17c47ae110166c901.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:29:42 +0200 Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iAllow true disabling of unsafe non-HTTPS content. Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iDiffstat: Err gopher.r-36.net 70 i config.def.h | 2 +- Err gopher.r-36.net 70 i surf.c | 27 +++++++++++++++++++++++++-- Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i2 files changed, 26 insertions(+), 3 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@@ -159,6 +159,7 @@ static Key keys[] = { Err gopher.r-36.net 70 i { MODKEY, GDK_minus, zoom, { .i = -1 } }, Err gopher.r-36.net 70 i { MODKEY, GDK_plus, zoom, { .i = +1 } }, Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i+ { MODKEY|GDK_SHIFT_MASK,GDK_l, toggleinsecurecontent, { 0 } }, Err gopher.r-36.net 70 i { MODKEY, GDK_l, navigate, { .i = +1 } }, Err gopher.r-36.net 70 i { MODKEY, GDK_h, navigate, { .i = -1 } }, Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i@@ -185,7 +186,6 @@ 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_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 1diff --git a/surf.c b/surf.c /scm/surf//file/surf.c.gph gopher.r-36.net 70 i@@ -212,7 +212,9 @@ static void stop(Client *c, const Arg *arg); Err gopher.r-36.net 70 i static void titlechange(WebKitWebView *view, GParamSpec *pspec, Client *c); Err gopher.r-36.net 70 i static void titlechangeleave(void *a, void *b, Client *c); Err gopher.r-36.net 70 i static void toggle(Client *c, const Arg *arg); Err gopher.r-36.net 70 i+static void togglehelper(Client *c, const Arg *arg, int reload); Err gopher.r-36.net 70 i static void togglecookiepolicy(Client *c, const Arg *arg); Err gopher.r-36.net 70 i+static void toggleinsecurecontent(Client *c, const Arg *arg); Err gopher.r-36.net 70 i static void togglegeolocation(Client *c, const Arg *arg); Err gopher.r-36.net 70 i static void toggleproxy(Client *c, const Arg *arg); Err gopher.r-36.net 70 i static void togglescrollbars(Client *c, const Arg *arg); Err gopher.r-36.net 70 i@@ -1105,6 +1107,9 @@ newclient(void) 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 g_object_set(G_OBJECT(settings), Err gopher.r-36.net 70 i+ "enable-running-of-insecure-content", insecureresources, Err gopher.r-36.net 70 i+ NULL); Err gopher.r-36.net 70 i+ g_object_set(G_OBJECT(settings), Err gopher.r-36.net 70 i "enable-html5-database", enablehtml5db, NULL); Err gopher.r-36.net 70 i g_object_set(G_OBJECT(settings), Err gopher.r-36.net 70 i "enable-html5-local-storage", enablehtml5local, NULL); Err gopher.r-36.net 70 i@@ -1642,7 +1647,7 @@ titlechangeleave(void *a, void *b, Client *c) Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i void Err gopher.r-36.net 70 i-ttoggle(Client *c, const Arg *arg) Err gopher.r-36.net 70 i+ttogglehelper(Client *c, const Arg *arg, int doreload) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i WebKitWebSettings *settings; Err gopher.r-36.net 70 i char *name = (char *)arg->v; Err gopher.r-36.net 70 i@@ -1653,7 +1658,14 @@ toggle(Client *c, const Arg *arg) Err gopher.r-36.net 70 i g_object_get(G_OBJECT(settings), name, &value, NULL); Err gopher.r-36.net 70 i g_object_set(G_OBJECT(settings), name, !value, NULL); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- reload(c, &a); Err gopher.r-36.net 70 i+ if (doreload) Err gopher.r-36.net 70 i+ reload(c, &a); Err gopher.r-36.net 70 i+} Err gopher.r-36.net 70 i+ Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+ttoggle(Client *c, const Arg *arg) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i+ togglehelper(c, arg, 1); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i void Err gopher.r-36.net 70 i@@ -1678,6 +1690,17 @@ togglecookiepolicy(Client *c, const Arg *arg) Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i void Err gopher.r-36.net 70 i+ttoggleinsecurecontent(Client *c, const Arg *arg) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i+ Arg a; Err gopher.r-36.net 70 i+ Err gopher.r-36.net 70 i+ a.v = "enable-running-of-insecure-content"; Err gopher.r-36.net 70 i+ togglehelper(c, &a, 0); Err gopher.r-36.net 70 i+ a.v = "enable-display-of-insecure-content"; Err gopher.r-36.net 70 i+ togglehelper(c, &a, 1); Err gopher.r-36.net 70 i+} Err gopher.r-36.net 70 i+ Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i ttogglegeolocation(Client *c, const Arg *arg) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i Arg a = { .b = FALSE }; Err gopher.r-36.net 70 .