Fixing cookie handling for https/http by using curl.

[surf.git] / config.def.h

diff --git a/config.def.h b/config.def.h
index 789ada4..a221c86 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -16,8 +16,12 @@ static char *cafile         = "/etc/ssl/certs/ca-certificates.crt";
 static char *strictssl      = FALSE; /* Refuse untrusted SSL connections */
 static int   indicator_thickness = 2;
 
-/* Webkit features */
-static Bool spatialbrowsing = TRUE;
+/* Webkit default features */
+static Bool enablespatialbrowsing = TRUE;
+static Bool enableplugins = TRUE;
+static Bool enablescripts = TRUE;
+static Bool enableinspector = TRUE;
+static Bool loadimages = TRUE;
 static Bool hidebackground  = FALSE;
 
 #define SETPROP(p, q) { \
@@ -31,16 +35,21 @@ static Bool hidebackground  = FALSE;
 /* DOWNLOAD(URI, referer) */
 #define DOWNLOAD(d, r) { \
        .v = (char *[]){ "/bin/sh", "-c", \
-               "xterm -e \"wget '$0'" \
-               " --load-cookies ~/.surf/cookies.txt" \
-               " --user-agent '$1'" \
-               " --referer '$2' ; sleep 5\"", d, useragent, r, NULL \
+               "st -e /bin/sh -c \"curl -J -O --user-agent '$1'" \
+               " --referer '$2'" \
+               " -b ~/.surf/cookies.txt -c ~/.surf/cookies.txt '$0';" \
+               " sleep 5;\"", \
+               d, useragent, r, NULL \
        } \
 }
 
 #define MODKEY GDK_CONTROL_MASK
 
 /* hotkeys */
+/*
+ * If you use anything else but MODKEY and GDK_SHIFT_MASK, don't forget to
+ * edit the CLEANMASK() macro.
+ */
 static Key keys[] = {
     /* modifier                    keyval      function    arg             Focus */
     { MODKEY|GDK_SHIFT_MASK,GDK_r,      reload,     { .b = TRUE } },
@@ -69,6 +78,7 @@ static Key keys[] = {
     { 0,                    GDK_F11,    fullscreen, { 0 } },
     { 0,                    GDK_Escape, stop,       { 0 } },
     { MODKEY,               GDK_o,      source,     { 0 } },
+    { MODKEY|GDK_SHIFT_MASK,GDK_o,      inspector,  { 0 } },
 
     { MODKEY,               GDK_g,      spawn,      SETPROP("_SURF_URI", "_SURF_GO") },
     { MODKEY,               GDK_f,      spawn,      SETPROP("_SURF_FIND", "_SURF_FIND") },