nilix/surf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change site styles structure for a more generic one

Browse source
This commit is contained in:
Quentin Rameau 2017-04-27 15:01:54 +02:00
parent 5c52733984
commit d0e3c69e59
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config.def.h
View file

@ -90,7 +90,7 @@ static WebKitFindOptions findopts = WEBKIT_FIND_OPTIONS_CASE_INSENSITIVE |
* The iteration will stop at the first match, beginning at the beginning of * The iteration will stop at the first match, beginning at the beginning of
* the list. * the list.
*/ */
static SiteStyle styles[] = { static SiteSpecific styles[] = {
/* regexp file in $styledir */ /* regexp file in $styledir */
{ ".*", "default.css" }, { ".*", "default.css" },
}; };

10
surf.c
View file

@ -136,9 +136,9 @@ typedef struct {
typedef struct { typedef struct {
char *regex; char *regex;
char *style; char *file;
regex_t re; regex_t re;
} SiteStyle; } SiteSpecific;
/* Surf */ /* Surf */
static void usage(void); static void usage(void);
@ -304,8 +304,8 @@ setup(void)
styles[i].regex); styles[i].regex);
styles[i].regex = NULL; styles[i].regex = NULL;
} }
styles[i].style = g_strconcat(styledir, "/", styles[i].file = g_strconcat(styledir, "/",
styles[i].style, NULL); styles[i].file, NULL);
} }
g_free(styledir); g_free(styledir);
} else { } else {
@ -748,7 +748,7 @@ getstyle(const char *uri)
for (i = 0; i < LENGTH(styles); ++i) { for (i = 0; i < LENGTH(styles); ++i) {
if (styles[i].regex && if (styles[i].regex &&
!regexec(&(styles[i].re), uri, 0, NULL, 0)) !regexec(&(styles[i].re), uri, 0, NULL, 0))
return styles[i].style; return styles[i].file;
} }
return ""; return "";