X-Git-Url: https://git.danieliu.xyz/?p=surf.git;a=blobdiff_plain;f=surf.c;h=4d13b0e1c3d25a5a32f381299b7ff0be0e95fa01;hp=e08bfe5468969c51a6289a027e5426df46bf571c;hb=2940d2bd07325714d5eee5de3877641578c20c95;hpb=27cec484084f37e01cadcdf7ea92c64de71e0b34 diff --git a/surf.c b/surf.c index e08bfe5..4d13b0e 100644 --- a/surf.c +++ b/surf.c @@ -247,7 +247,7 @@ void usage(void) { die("usage: %s [-bBdDfFgGiIkKmMnNpPsSvx] [-a cookiepolicies ] " - "[-c cookiefile] [-e xid] [-r scriptfile] [-t stylefile] " + "[-c cookiefile] [-C stylefile] [-e xid] [-r scriptfile] " "[-u useragent] [-z zoomlevel] [uri]\n", basename(argv0)); } @@ -817,7 +817,7 @@ newwindow(Client *c, const Arg *a, int noembed) { int i = 0; char tmp[64]; - const char *cmd[26], *uri; + const char *cmd[27], *uri; const Arg arg = { .v = cmd }; cmd[i++] = argv0; @@ -828,6 +828,10 @@ newwindow(Client *c, const Arg *a, int noembed) cmd[i++] = "-c"; cmd[i++] = cookiefile; } + if (stylefile && g_strcmp0(stylefile, "")) { + cmd[i++] = "-C"; + cmd[i++] = stylefile; + } cmd[i++] = curconfig[DiskCache].val.b ? "-D" : "-d"; if (embed && !noembed) { cmd[i++] = "-e"; @@ -846,10 +850,6 @@ newwindow(Client *c, const Arg *a, int noembed) cmd[i++] = scriptfile; } cmd[i++] = curconfig[JavaScript].val.b ? "-S" : "-s"; - if (stylefile && g_strcmp0(stylefile, "")) { - cmd[i++] = "-t"; - cmd[i++] = stylefile; - } if (fulluseragent && g_strcmp0(fulluseragent, "")) { cmd[i++] = "-u"; cmd[i++] = fulluseragent; @@ -1747,7 +1747,7 @@ main(int argc, char *argv[]) fulluseragent = EARGF(usage()); break; case 'v': - die("surf-"VERSION", ©2009-2015 surf engineers, " + die("surf-"VERSION", ©2009-2017 surf engineers, " "see LICENSE for details\n"); case 'x': showxid = 1;