X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=config.def.h;h=6f58da71097eb90a63f4d3f787997528513be8f3;hb=c12b6499fe68b4bc3114ed241c937dd38f94de87;hp=e1d4d869ca01324dd0d8a5c3e36a88d3b6e37464;hpb=aadcd5b3f0afadfffecfa19f56512c33e136b7ab;p=surf.git

diff --git a/config.def.h b/config.def.h
index e1d4d86..6f58da7 100644
--- a/config.def.h
+++ b/config.def.h
@@ -1,28 +1,34 @@
 /* modifier 0 means no modifier */
-static char *useragent      = "Mozilla/5.0 (X11; U; Linux; en-us) AppleWebKit/531.2+ (KHTML, like Gecko, surf-"VERSION") Safari/531.2+";
-static char *progress       = "#FF0000";
+static char *useragent      = "Surf/"VERSION" (X11; U; Unix; en-US) AppleWebKit/531.2+ Compatible (Safari)";
+static char *progress       = "#0000FF";
+static char *progress_untrust = "#FF0000";
 static char *progress_trust = "#00FF00";
-static char *stylefile      = ".surf/style.css";
-static char *scriptfile     = ".surf/script.js";
-static char *cookiefile     = ".surf/cookies.txt";
+static char *progress_proxy = "#FFFF00";
+static char *progress_proxy_trust = "#66FF00";
+static char *progress_proxy_untrust = "#FF6600";
+static char *stylefile      = "~/.surf/style.css";
+static char *scriptfile     = "~/.surf/script.js";
+static char *cookiefile     = "~/.surf/cookies.txt";
 static time_t sessiontime   = 3600;
-#define NOBACKGROUND 0
+static char *cafile         = "/etc/ssl/certs/ca-certificates.crt";
+static char *strictssl      = FALSE; /* Refuse untrusted SSL connections */
+static int   indicator_thickness = 2;
 
-#define SETPROP(p, q)     { \
-	.v = (char *[]){ "sh", "-c", \
+#define HIDE_BACKGROUND FALSE
+#define SPATIAL_BROWSING TRUE
+
+#define SETPROP(p, q)     { .v = (char *[]){ "/bin/sh", "-c", \
 	"prop=\"`xprop -id $2 $0 | cut -d '\"' -f 2 | dmenu`\" &&" \
 	"xprop -id $2 -f $1 8s -set $1 \"$prop\"", \
 	p, q, winid, NULL } }
-#define DOWNLOAD(p)       { \
+#define DOWNLOAD(d) {			  \
 	.v = (char *[]){ "/bin/sh", "-c", \
-	"prop=\"`xprop -id $1 $0 | cut -d '\"' -f 2 | tr -d '\\''`\";" \
-	"xterm -e \"wget --load-cookies '~/.surf/cookies.txt' '$prop';\"", \
-	p, winid, NULL } }
-
+	"xterm -e \"wget '$0' \
+--load-cookies ~/.surf/cookies.txt \
+--user-agent '$1' ; sleep 5\"", d, useragent, NULL } }
 #define MODKEY GDK_CONTROL_MASK
 static Key keys[] = {
     /* modifier	            keyval      function    arg             Focus */
-    { MODKEY,               GDK_s,      spawn,      DOWNLOAD("_SURF_HILIGHT") },
     { MODKEY|GDK_SHIFT_MASK,GDK_r,      reload,     { .b = TRUE } },
     { MODKEY,               GDK_r,      reload,     { .b = FALSE } },
     { MODKEY|GDK_SHIFT_MASK,GDK_p,      print,      { 0 } },
@@ -33,12 +39,23 @@ static Key keys[] = {
     { MODKEY|GDK_SHIFT_MASK,GDK_i,      zoom,       { .i = 0  } },
     { MODKEY,               GDK_l,      navigate,   { .i = +1 } },
     { MODKEY,               GDK_h,      navigate,   { .i = -1 } },
-    { MODKEY,               GDK_j,      scroll,     { .i = +1 } },
-    { MODKEY,               GDK_k,      scroll,     { .i = -1 } },
+    { MODKEY,               GDK_j,           scroll_v,   { .i = +1 } },
+    { MODKEY,               GDK_k,           scroll_v,   { .i = -1 } },
+    { MODKEY,               GDK_b,           scroll_v,   { .i = -10000 } },
+    { MODKEY,               GDK_space,       scroll_v,   { .i = +10000 } },
+    { 0,                    GDK_i,      insert,     { 0 } },
+    { MODKEY,               GDK_i,           scroll_h,   { .i = +1 } },
+    { MODKEY,               GDK_u,           scroll_h,   { .i = -1 } },
     { 0,                    GDK_Escape, stop,       { 0 } },
     { MODKEY,               GDK_o,      source,     { 0 } },
     { MODKEY,               GDK_g,      spawn,      SETPROP("_SURF_URI", "_SURF_GO") },
+    { MODKEY,               GDK_f,      spawn,      SETPROP("_SURF_FIND", "_SURF_FIND") },
     { MODKEY,               GDK_slash,  spawn,      SETPROP("_SURF_FIND", "_SURF_FIND") },
     { MODKEY,               GDK_n,      find,       { .b = TRUE } },
     { MODKEY|GDK_SHIFT_MASK,GDK_n,      find,       { .b = FALSE } },
+    { MODKEY,               GDK_v,      toggle,     { .v = "enable-plugins" } },
+    { MODKEY|GDK_SHIFT_MASK,GDK_i,      toggle,     { .v = "auto-load-images" } },
+    { MODKEY,               GDK_c,      toggle,     { .v = "enable-caret-browsing" } },
+    { MODKEY|GDK_SHIFT_MASK,GDK_s,      toggle,     { .v = "enable-scripts" } },
 };
+