Get rid of config parameter MACROs

There's no need to obfuscate so much what is done, the user can deal with a few extra knobs to set instead.
2017-05-20 19:21:41 +02:00
parent d3e974f4ea
commit a0ef4ba41d
2 changed files with 87 additions and 72 deletions
@@ -9,44 +9,45 @@ static char *cookiefile     = "~/.surf/cookies.txt";

 /* Webkit default features */
 static Parameter defconfig[ParameterLast] = {
-	SETB(AcceleratedCanvas,  1),
-	SETB(AccessMicrophone,   0),
-	SETB(AccessWebcam,       0),
-	SETB(Certificate,        0),
-	SETB(CaretBrowsing,      0),
-	SETV(CookiePolicies,     "@Aa"),
-	SETV(DefaultCharset,     "UTF-8"),
-	SETB(DiskCache,          1),
-	SETB(DNSPrefetch,        0),
-	SETB(FileURLsCrossAccess,0),
-	SETI(FontSize,           12),
-	SETB(FrameFlattening,    0),
-	SETB(Geolocation,        0),
-	SETB(HideBackground,     0),
-	SETB(Inspector,          0),
-	SETB(Java,               1),
-	SETB(JavaScript,         1),
-	SETB(KioskMode,          0),
-	SETB(LoadImages,         1),
-	SETB(MediaManualPlay,    0),
-	SETB(Plugins,            1),
-	SETV(PreferredLanguages, ((char *[]){ NULL })),
-	SETB(RunInFullscreen,    0),
-	SETB(ScrollBars,         1),
-	SETB(ShowIndicators,     1),
-	SETB(SiteQuirks,         1),
-	SETB(SmoothScrolling,    0),
-	SETB(SpellChecking,      0),
-	SETV(SpellLanguages,     ((char *[]){ "en_US", NULL })),
-	SETB(StrictTLS,          1),
-	SETB(Style,              1),
-	SETF(ZoomLevel,          1.0),
+	/*   parameter                  Arg value       force? */
+	[AcceleratedCanvas]   =       { { .i = 1 },     },
+	[AccessMicrophone]    =       { { .i = 0 },     },
+	[AccessWebcam]        =       { { .i = 0 },     },
+	[Certificate]         =       { { .i = 0 },     },
+	[CaretBrowsing]       =       { { .i = 0 },     },
+	[CookiePolicies]      =       { { .v = "@Aa" }, },
+	[DefaultCharset]      =       { { .v = "UTF-8" }, },
+	[DiskCache]           =       { { .i = 1 },     },
+	[DNSPrefetch]         =       { { .i = 0 },     },
+	[FileURLsCrossAccess] =       { { .i = 0 },     },
+	[FontSize]            =       { { .i = 12 },    },
+	[FrameFlattening]     =       { { .i = 0 },     },
+	[Geolocation]         =       { { .i = 0 },     },
+	[HideBackground]      =       { { .i = 0 },     },
+	[Inspector]           =       { { .i = 0 },     },
+	[Java]                =       { { .i = 1 },     },
+	[JavaScript]          =       { { .i = 1 },     },
+	[KioskMode]           =       { { .i = 0 },     },
+	[LoadImages]          =       { { .i = 1 },     },
+	[MediaManualPlay]     =       { { .i = 0 },     },
+	[Plugins]             =       { { .i = 1 },     },
+	[PreferredLanguages]  =       { { .v = (char *[]){ NULL } }, },
+	[RunInFullscreen]     =       { { .i = 0 },     },
+	[ScrollBars]          =       { { .i = 1 },     },
+	[ShowIndicators]      =       { { .i = 1 },     },
+	[SiteQuirks]          =       { { .i = 1 },     },
+	[SmoothScrolling]     =       { { .i = 0 },     },
+	[SpellChecking]       =       { { .i = 0 },     },
+	[SpellLanguages]      =       { { .v = ((char *[]){ "en_US", NULL }) }, },
+	[StrictTLS]           =       { { .i = 1 },     },
+	[Style]               =       { { .i = 1 },     },
+	[ZoomLevel]           =       { { .f = 1.0 },   },
 };

 static UriParameters uriparams[] = {
 	{ "(://|\\.)suckless\\.org(/|$)", {
-	  FSETB(JavaScript, 0),
-	  FSETB(Plugins,    0),
+	  [JavaScript] = { { .i = 0 }, 1 },
+	  [Plugins]    = { { .i = 0 }, 1 },
 	}, },
 };