Ensure curl follows redirects for downloads

[surf.git] / config.def.h

diff --git a/config.def.h b/config.def.h
index da5a08f..76061f3 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -8,8 +8,12 @@ static char *cookiefile     = "~/.surf/cookies.txt";
 static time_t sessiontime   = 3600;
 static char *cafile         = "/etc/ssl/certs/ca-certificates.crt";
 static char *strictssl      = FALSE; /* Refuse untrusted SSL connections */
+static Bool kioskmode      = FALSE; /* Ignore shortcuts */
+
+static guint defaultfontsize = 12;
 
 /* Webkit default features */
+static Bool enablescrollbars = TRUE;
 static Bool enablespatialbrowsing = TRUE;
 static Bool enableplugins = TRUE;
 static Bool enablescripts = TRUE;
@@ -19,7 +23,7 @@ static Bool hidebackground  = FALSE;
 
 #define SETPROP(p, q) { \
        .v = (char *[]){ "/bin/sh", "-c", \
-               "prop=\"`xprop -id $2 $0 | cut -d '\"' -f 2 | dmenu`\" &&" \
+               "prop=\"`xprop -id $2 $0 | cut -d '\"' -f 2 | xargs -0 printf %b | dmenu`\" &&" \
                "xprop -id $2 -f $1 8s -set $1 \"$prop\"", \
                p, q, winid, NULL \
        } \
@@ -28,7 +32,7 @@ static Bool hidebackground  = FALSE;
 /* DOWNLOAD(URI, referer) */
 #define DOWNLOAD(d, r) { \
        .v = (char *[]){ "/bin/sh", "-c", \
-               "st -e /bin/sh -c \"curl -J -O --user-agent '$1'" \
+               "st -e /bin/sh -c \"curl -L -J -O --user-agent '$1'" \
                " --referer '$2' -b $3 -c $3 '$0';" \
                " sleep 5;\"", \
                d, useragent, r, cookiefile, NULL \
@@ -83,5 +87,7 @@ static Key keys[] = {
     { MODKEY|GDK_SHIFT_MASK,GDK_i,      toggle,     { .v = "auto-load-images" } },
     { MODKEY|GDK_SHIFT_MASK,GDK_s,      toggle,     { .v = "enable-scripts" } },
     { MODKEY|GDK_SHIFT_MASK,GDK_v,      toggle,     { .v = "enable-plugins" } },
+    { MODKEY|GDK_SHIFT_MASK,GDK_m,      togglestyle,{ 0 } },
+    { MODKEY|GDK_SHIFT_MASK,GDK_b,      togglescrollbars,{ 0 } },
 };