suckless.org now supports https access (you will need to re-clone the repo); the default config.h changed

3 files changed, 52 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8706c44d0cd4..82ae82739662 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Fri May 12 09:56:44 UTC 2017
+# Thu Aug 31 08:32:46 UTC 2017
 pkgbase = surf-git
 	pkgdesc = a WebKit based browser
-	pkgver = 2.0.r40.gf5be376
+	pkgver = 2.0.r50.g723ff26
 	pkgrel = 1
 	url = http://surf.suckless.org/
 	arch = i686
@@ -19,7 +19,7 @@ pkgbase = surf-git
 	optdepends = mpv: default video player
 	provides = surf
 	conflicts = surf
-	source = surf::git+http://git.suckless.org/surf
+	source = surf::git+https://git.suckless.org/surf
 	source = config.h
 	md5sums = SKIP
 	md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index cb9b1b1d86ae..eb7611149f7a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: sekret
 _pkgname=surf
 pkgname=$_pkgname-git
-pkgver=2.0.r40.gf5be376
+pkgver=2.0.r50.g723ff26
 pkgrel=1
 pkgdesc="a WebKit based browser"
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ optdepends=('dmenu: url bar and search'
             'mpv: default video player')
 provides=("$_pkgname")
 conflicts=("$_pkgname")
-source=("$_pkgname::git+http://git.suckless.org/surf"
+source=("$_pkgname::git+https://git.suckless.org/surf"
         'config.h')
 md5sums=('SKIP'
          'SKIP')
diff --git a/config.h b/config.h
index 50dd739b6063..2e735bfadc9b 100644
--- a/config.h
+++ b/config.h
@@ -8,42 +8,51 @@ static char *cachedir       = "~/.surf/cache/";
 static char *cookiefile     = "~/.surf/cookies.txt";
 
 /* Webkit default features */
+/* Highest priority value will be used.
+ * Default parameters are priority 0
+ * Per-uri parameters are priority 1
+ * Command parameters are priority 2
+ */
 static Parameter defconfig[ParameterLast] = {
-	SETB(AcceleratedCanvas,  1),
-	SETB(Certificate,        0),
-	SETB(CaretBrowsing,      0),
-	SETV(CookiePolicies,     "@Aa"),
-	SETV(DefaultCharset,     "UTF-8"),
-	SETB(DiskCache,          1),
-	SETB(DNSPrefetch,        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       priority */
+	[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 = 1 },     },
+	[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 },
 	}, },
 };
 
@@ -127,8 +136,8 @@ static Key keys[] = {
 	{ 0,                     GDK_KEY_Escape, stop,       { 0 } },
 	{ MODKEY,                GDK_KEY_c,      stop,       { 0 } },
 
-	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_r,      reload,     { .b = 1 } },
-	{ MODKEY,                GDK_KEY_r,      reload,     { .b = 0 } },
+	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_r,      reload,     { .i = 1 } },
+	{ MODKEY,                GDK_KEY_r,      reload,     { .i = 0 } },
 
 	{ MODKEY,                GDK_KEY_l,      navigate,   { .i = +1 } },
 	{ MODKEY,                GDK_KEY_h,      navigate,   { .i = -1 } },
@@ -150,8 +159,8 @@ static Key keys[] = {
 	{ MODKEY,                GDK_KEY_minus,  zoom,       { .i = -1 } },
 	{ MODKEY,                GDK_KEY_plus,   zoom,       { .i = +1 } },
 
-	{ MODKEY,                GDK_KEY_p,      clipboard,  { .b = 1 } },
-	{ MODKEY,                GDK_KEY_y,      clipboard,  { .b = 0 } },
+	{ MODKEY,                GDK_KEY_p,      clipboard,  { .i = 1 } },
+	{ MODKEY,                GDK_KEY_y,      clipboard,  { .i = 0 } },
 
 	{ MODKEY,                GDK_KEY_n,      find,       { .i = +1 } },
 	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_n,      find,       { .i = -1 } },
@@ -178,9 +187,9 @@ static Key keys[] = {
 /* target can be OnDoc, OnLink, OnImg, OnMedia, OnEdit, OnBar, OnSel, OnAny */
 static Button buttons[] = {
 	/* target       event mask      button  function        argument        stop event */
-	{ OnLink,       0,              2,      clicknewwindow, { .b = 0 },     1 },
-	{ OnLink,       MODKEY,         2,      clicknewwindow, { .b = 1 },     1 },
-	{ OnLink,       MODKEY,         1,      clicknewwindow, { .b = 1 },     1 },
+	{ OnLink,       0,              2,      clicknewwindow, { .i = 0 },     1 },
+	{ OnLink,       MODKEY,         2,      clicknewwindow, { .i = 1 },     1 },
+	{ OnLink,       MODKEY,         1,      clicknewwindow, { .i = 1 },     1 },
 	{ OnAny,        0,              8,      clicknavigate,  { .i = -1 },    1 },
 	{ OnAny,        0,              9,      clicknavigate,  { .i = +1 },    1 },
 	{ OnMedia,      MODKEY,         1,      clickexternplayer, { 0 },       1 },