typedef struct {
char *regex;
- char *style;
+ char *file;
regex_t re;
-} SiteStyle;
+} SiteSpecific;
/* Surf */
static void usage(void);
static void seturiparameters(Client *c, const char *uri);
static void setparameter(Client *c, int refresh, ParamName p, const Arg *a);
static const char *getstyle(const char *uri);
-static void setstyle(Client *c, const char *stylefile);
+static void setstyle(Client *c, const char *file);
static void runscript(Client *c);
static void evalscript(Client *c, const char *jsstr, ...);
static void updatewinid(Client *c);
static void clickexternplayer(Client *c, const Arg *a, WebKitHitTestResult *h);
static char winid[64];
-static char togglestats[10];
+static char togglestats[11];
static char pagestats[2];
static Atom atoms[AtomLast];
static Window embed;
void
usage(void)
{
- die("usage: %s [-bBdDfFgGiIkKmMnNpPsSvx] [-a cookiepolicies ] "
- "[-c cookiefile] [-e xid] [-r scriptfile] [-t stylefile] "
+ die("usage: %s [-bBdDfFgGiIkKmMnNpPsStTvx] [-a cookiepolicies ] "
+ "[-c cookiefile] [-C stylefile] [-e xid] [-r scriptfile] "
"[-u useragent] [-z zoomlevel] [uri]\n", basename(argv0));
}
styles[i].regex);
styles[i].regex = NULL;
}
- styles[i].style = g_strconcat(styledir, "/",
- styles[i].style, NULL);
+ styles[i].file = g_strconcat(styledir, "/",
+ styles[i].file, NULL);
}
g_free(styledir);
} else {
togglestats[6] = curconfig[Plugins].val.b ? 'V' : 'v';
togglestats[7] = curconfig[Style].val.b ? 'M' : 'm';
togglestats[8] = curconfig[FrameFlattening].val.b ? 'F' : 'f';
- togglestats[9] = '\0';
+ togglestats[9] = curconfig[StrictTLS].val.b ? 'T' : 't';
+ togglestats[10] = '\0';
}
void
webkit_web_view_get_context(c->view), a->b ?
WEBKIT_TLS_ERRORS_POLICY_FAIL :
WEBKIT_TLS_ERRORS_POLICY_IGNORE);
- return; /* do not update */
+ break;
case Style:
if (a->b)
setstyle(c, getstyle(geturi(c)));
for (i = 0; i < LENGTH(styles); ++i) {
if (styles[i].regex &&
!regexec(&(styles[i].re), uri, 0, NULL, 0))
- return styles[i].style;
+ return styles[i].file;
}
return "";
}
void
-setstyle(Client *c, const char *stylefile)
+setstyle(Client *c, const char *file)
{
gchar *style;
- if (!g_file_get_contents(stylefile, &style, NULL, NULL)) {
- fprintf(stderr, "Could not read style file: %s\n", stylefile);
+ if (!g_file_get_contents(file, &style, NULL, NULL)) {
+ fprintf(stderr, "Could not read style file: %s\n", file);
return;
}
{
int i = 0;
char tmp[64];
- const char *cmd[26], *uri;
+ const char *cmd[28], *uri;
const Arg arg = { .v = cmd };
cmd[i++] = argv0;
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";
cmd[i++] = scriptfile;
}
cmd[i++] = curconfig[JavaScript].val.b ? "-S" : "-s";
- if (stylefile && g_strcmp0(stylefile, "")) {
- cmd[i++] = "-t";
- cmd[i++] = stylefile;
- }
+ cmd[i++] = curconfig[StrictTLS].val.b ? "-T" : "-t";
if (fulluseragent && g_strcmp0(fulluseragent, "")) {
cmd[i++] = "-u";
cmd[i++] = fulluseragent;
case 'c':
cookiefile = EARGF(usage());
break;
+ case 'C':
+ stylefile = EARGF(usage());
+ break;
case 'd':
defconfig CSETB(DiskCache, 0);
break;
defconfig CSETB(JavaScript, 1);
break;
case 't':
- stylefile = EARGF(usage());
+ defconfig CSETB(StrictTLS, 0);
+ break;
+ case 'T':
+ defconfig CSETB(StrictTLS, 1);
break;
case 'u':
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;