iAdapting the new flags to newclient(). - 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 cef886fc3a6bb4a22fd8109c85d69ced25df9283 /scm/surf//commit/cef886fc3a6bb4a22fd8109c85d69ced25df9283.gph gopher.r-36.net 70 1parent 3276d6ebcf08c4c0ad73d7fb37a2f018e0eb3d1c /scm/surf//commit/3276d6ebcf08c4c0ad73d7fb37a2f018e0eb3d1c.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: Thu, 20 Apr 2017 21:47:41 +0200 Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iAdapting the new flags to newclient(). Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iDiffstat: Err gopher.r-36.net 70 i surf.c | 94 ++++++++++++++++++++++++++----- Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i1 file changed, 80 insertions(+), 14 deletions(-) Err gopher.r-36.net 70 i--- 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@@ -1152,38 +1152,104 @@ 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[18], *uri; Err gopher.r-36.net 70 i+ const char *cmd[28], *uri; Err gopher.r-36.net 70 i const Arg a = { .v = (void *)cmd }; Err gopher.r-36.net 70 i- char tmp[64]; 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 cmd[i++] = argv0; Err gopher.r-36.net 70 i- cmd[i++] = "-a"; Err gopher.r-36.net 70 i- cmd[i++] = cookiepolicies; Err gopher.r-36.net 70 i- if (!enablescrollbars) Err gopher.r-36.net 70 i+ Err gopher.r-36.net 70 i+ if (cookiepolicies != NULL) { Err gopher.r-36.net 70 i+ cmd[i++] = "-a"; Err gopher.r-36.net 70 i+ cmd[i++] = cookiepolicies; Err gopher.r-36.net 70 i+ } Err gopher.r-36.net 70 i+ Err gopher.r-36.net 70 i+ if (enablescrollbars) Err gopher.r-36.net 70 i+ cmd[i++] = "-B"; Err gopher.r-36.net 70 i+ else Err gopher.r-36.net 70 i cmd[i++] = "-b"; Err gopher.r-36.net 70 i+ Err gopher.r-36.net 70 i+ if (cookiefile != NULL) { 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+ } Err gopher.r-36.net 70 i+ 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+ else Err gopher.r-36.net 70 i+ cmd[i++] = "-d"; Err gopher.r-36.net 70 i+ Err gopher.r-36.net 70 i if (embed && !noembed) { Err gopher.r-36.net 70 i cmd[i++] = "-e"; Err gopher.r-36.net 70 i snprintf(tmp, LENGTH(tmp), "%u", (int)embed); Err gopher.r-36.net 70 i cmd[i++] = tmp; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i- if (!allowgeolocation) Err gopher.r-36.net 70 i+ Err gopher.r-36.net 70 i+ if (runinfullscreen) Err gopher.r-36.net 70 i+ cmd[i++] = "-F"; Err gopher.r-36.net 70 i+ else Err gopher.r-36.net 70 i+ cmd[i++] = "-f"; Err gopher.r-36.net 70 i+ Err gopher.r-36.net 70 i+ if (allowgeolocation) Err gopher.r-36.net 70 i+ cmd[i++] = "-G"; Err gopher.r-36.net 70 i+ else Err gopher.r-36.net 70 i cmd[i++] = "-g"; Err gopher.r-36.net 70 i- if (!loadimages) Err gopher.r-36.net 70 i+ Err gopher.r-36.net 70 i+ if (loadimages) Err gopher.r-36.net 70 i+ cmd[i++] = "-I"; Err gopher.r-36.net 70 i+ else Err gopher.r-36.net 70 i cmd[i++] = "-i"; Err gopher.r-36.net 70 i+ Err gopher.r-36.net 70 i if (kioskmode) Err gopher.r-36.net 70 i+ cmd[i++] = "-K"; 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- if (!enableplugins) 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+ cmd[i++] = "-m"; Err gopher.r-36.net 70 i+ Err gopher.r-36.net 70 i+ if (enableinspector) Err gopher.r-36.net 70 i+ cmd[i++] = "-N"; Err gopher.r-36.net 70 i+ else Err gopher.r-36.net 70 i+ cmd[i++] = "-n"; Err gopher.r-36.net 70 i+ Err gopher.r-36.net 70 i+ if (enableplugins) Err gopher.r-36.net 70 i+ cmd[i++] = "-P"; Err gopher.r-36.net 70 i+ else Err gopher.r-36.net 70 i cmd[i++] = "-p"; Err gopher.r-36.net 70 i- if (!enablescripts) Err gopher.r-36.net 70 i+ Err gopher.r-36.net 70 i+ if (scriptfile != NULL) { Err gopher.r-36.net 70 i+ cmd[i++] = "-r"; Err gopher.r-36.net 70 i+ cmd[i++] = scriptfile; Err gopher.r-36.net 70 i+ } Err gopher.r-36.net 70 i+ Err gopher.r-36.net 70 i+ if (enablescripts) Err gopher.r-36.net 70 i+ cmd[i++] = "-S"; Err gopher.r-36.net 70 i+ else Err gopher.r-36.net 70 i cmd[i++] = "-s"; Err gopher.r-36.net 70 i+ Err gopher.r-36.net 70 i+ if (strictssl) Err gopher.r-36.net 70 i+ cmd[i++] = "-T"; Err gopher.r-36.net 70 i+ else Err gopher.r-36.net 70 i+ cmd[i++] = "-t"; Err gopher.r-36.net 70 i+ Err gopher.r-36.net 70 i+ if (useragent != NULL) { Err gopher.r-36.net 70 i+ cmd[i++] = "-u"; 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 (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+ Err gopher.r-36.net 70 i+ if (zoomlevel != 1.0) { Err gopher.r-36.net 70 i+ cmd[i++] = "-z"; Err gopher.r-36.net 70 i+ snprintf(ztmp, LENGTH(ztmp), "%.1f", zoomlevel); Err gopher.r-36.net 70 i+ cmd[i++] = ztmp; Err gopher.r-36.net 70 i+ } Err gopher.r-36.net 70 i+ Err gopher.r-36.net 70 i cmd[i++] = "--"; Err gopher.r-36.net 70 i- uri = arg->v ? (char *)arg->v : c->linkhover; Err gopher.r-36.net 70 i+ uri = arg->v? (char *)arg->v : c->linkhover; Err gopher.r-36.net 70 i if (uri) Err gopher.r-36.net 70 i cmd[i++] = uri; Err gopher.r-36.net 70 i cmd[i++] = NULL; Err gopher.r-36.net 70 .