Change site styles structure for a more generic one
This commit is contained in:
		
							parent
							
								
									5c52733984
								
							
						
					
					
						commit
						d0e3c69e59
					
				| 
						 | 
				
			
			@ -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 list.
 | 
			
		||||
 */
 | 
			
		||||
static SiteStyle styles[] = {
 | 
			
		||||
static SiteSpecific styles[] = {
 | 
			
		||||
	/* regexp               file in $styledir */
 | 
			
		||||
	{ ".*",                 "default.css" },
 | 
			
		||||
};
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										10
									
								
								surf.c
								
								
								
								
							
							
						
						
									
										10
									
								
								surf.c
								
								
								
								
							| 
						 | 
				
			
			@ -136,9 +136,9 @@ typedef struct {
 | 
			
		|||
 | 
			
		||||
typedef struct {
 | 
			
		||||
	char *regex;
 | 
			
		||||
	char *style;
 | 
			
		||||
	char *file;
 | 
			
		||||
	regex_t re;
 | 
			
		||||
} SiteStyle;
 | 
			
		||||
} SiteSpecific;
 | 
			
		||||
 | 
			
		||||
/* Surf */
 | 
			
		||||
static void usage(void);
 | 
			
		||||
| 
						 | 
				
			
			@ -304,8 +304,8 @@ setup(void)
 | 
			
		|||
				        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 {
 | 
			
		||||
| 
						 | 
				
			
			@ -748,7 +748,7 @@ getstyle(const char *uri)
 | 
			
		|||
	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 "";
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue