Adapt updatetitle()

[surf.git] / config.def.h

diff --git a/config.def.h b/config.def.h
index 2fa96dc..ac78f0e 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -8,7 +8,6 @@ static char *cachedir       = "~/.surf/cache/";
 
 static Bool kioskmode       = FALSE; /* Ignore shortcuts */
 static Bool showindicators  = TRUE;  /* Show indicators in window title */
-static Bool zoomto96dpi     = TRUE;  /* Zoom pages to always emulate 96dpi */
 static Bool runinfullscreen = FALSE; /* Run in fullscreen mode by default */
 
 static guint defaultfontsize = 12;   /* Default font size */
@@ -18,15 +17,12 @@ static gfloat zoomlevel = 1.0;       /* Default zoom level */
 static char *cookiefile     = "~/.surf/cookies.txt";
 static char *cookiepolicies = "Aa@"; /* A: accept all; a: accept nothing,
                                       * @: accept no third party */
-static char *cafile         = "/etc/ssl/certs/ca-certificates.crt";
 static Bool strictssl       = FALSE; /* Refuse untrusted SSL connections */
-static time_t sessiontime   = 3600;
 
 /* Webkit default features */
 static Bool enablescrollbars      = TRUE;
-static Bool enablespatialbrowsing = TRUE;
-static Bool enablediskcache       = TRUE;
-static int diskcachebytes         = 5 * 1024 * 1024;
+static Bool enablecaretbrowsing   = TRUE;
+static Bool enablecache           = TRUE;
 static Bool enableplugins         = TRUE;
 static Bool enablescripts         = TRUE;
 static Bool enableinspector       = TRUE;
@@ -34,9 +30,14 @@ static Bool enablestyle           = TRUE;
 static Bool loadimages            = TRUE;
 static Bool hidebackground        = FALSE;
 static Bool allowgeolocation      = TRUE;
+static Bool enablednsprefetching  = FALSE;
+static Bool enableframeflattening = FALSE;
+
+static WebKitFindOptions findopts = WEBKIT_FIND_OPTIONS_CASE_INSENSITIVE |
+                                    WEBKIT_FIND_OPTIONS_WRAP_AROUND;
 
 #define SETPROP(p, q) { \
-       .v = (char *[]){ "/bin/sh", "-c", \
+       .v = (const char *[]){ "/bin/sh", "-c", \
             "prop=\"`xprop -id $2 $0 " \
             "| sed \"s/^$0(STRING) = \\(\\\\\"\\?\\)\\(.*\\)\\1$/\\2/\" " \
             "| xargs -0 printf %b | dmenu`\" &&" \
@@ -47,7 +48,7 @@ static Bool allowgeolocation      = TRUE;
 
 /* DOWNLOAD(URI, referer) */
 #define DOWNLOAD(d, r) { \
-       .v = (char *[]){ "/bin/sh", "-c", \
+       .v = (const char *[]){ "/bin/sh", "-c", \
             "st -e /bin/sh -c \"curl -L -J -O --user-agent '$1'" \
             " --referer '$2' -b $3 -c $3 '$0';" \
             " sleep 5;\"", \
@@ -60,7 +61,7 @@ static Bool allowgeolocation      = TRUE;
  * "http://" or "https://" should be opened.
  */
 #define PLUMB(u) {\
-       .v = (char *[]){ "/bin/sh", "-c", \
+       .v = (const char *[]){ "/bin/sh", "-c", \
             "xdg-open \"$0\"", u, NULL \
        } \
 }
@@ -100,41 +101,44 @@ static Key keys[] = {
        { MODKEY,                GDK_KEY_l,      navigate,   { .i = +1 } },
        { MODKEY,                GDK_KEY_h,      navigate,   { .i = -1 } },
 
-       { MODKEY,                GDK_KEY_j,      scroll_v,   { .i = +1 } },
-       { MODKEY,                GDK_KEY_k,      scroll_v,   { .i = -1 } },
-       { MODKEY,                GDK_KEY_b,      scroll_v,   { .i = -10000 } },
-       { MODKEY,                GDK_KEY_space,  scroll_v,   { .i = +10000 } },
-       { MODKEY,                GDK_KEY_i,      scroll_h,   { .i = +1 } },
-       { MODKEY,                GDK_KEY_u,      scroll_h,   { .i = -1 } },
+                                                            /* in page % */
+       { MODKEY,                GDK_KEY_j,      scroll_v,   { .i = +10 } },
+       { MODKEY,                GDK_KEY_k,      scroll_v,   { .i = -10 } },
+       { MODKEY,                GDK_KEY_b,      scroll_v,   { .i = -50 } },
+       { MODKEY,                GDK_KEY_space,  scroll_v,   { .i = +50 } },
+       { MODKEY,                GDK_KEY_i,      scroll_h,   { .i = +10 } },
+       { MODKEY,                GDK_KEY_u,      scroll_h,   { .i = -10 } },
 
        { 0,                     GDK_KEY_F11,    togglefullscreen, { 0 } },
        { 0,                     GDK_KEY_Escape, stop,       { 0 } },
-       { MODKEY|GDK_SHIFT_MASK, GDK_KEY_o,      inspector,  { 0 } },
+       { MODKEY|GDK_SHIFT_MASK, GDK_KEY_o,      toggleinspector, { 0 } },
 
        { MODKEY,                GDK_KEY_g,      spawn,      SETPROP("_SURF_URI", "_SURF_GO") },
        { MODKEY,                GDK_KEY_f,      spawn,      SETPROP("_SURF_FIND", "_SURF_FIND") },
        { MODKEY,                GDK_KEY_slash,  spawn,      SETPROP("_SURF_FIND", "_SURF_FIND") },
 
-       { MODKEY,                GDK_KEY_n,      find,       { .b = TRUE } },
-       { MODKEY|GDK_SHIFT_MASK, GDK_KEY_n,      find,       { .b = FALSE } },
+       { MODKEY,                GDK_KEY_n,      find,       { .i = +1 } },
+       { MODKEY|GDK_SHIFT_MASK, GDK_KEY_n,      find,       { .i = -1 } },
+
+       { MODKEY|GDK_SHIFT_MASK, GDK_KEY_c,      toggle,     { .i = CaretBrowsing } },
+       { MODKEY|GDK_SHIFT_MASK, GDK_KEY_f,      toggle,     { .i = FrameFlattening } },
+       { MODKEY|GDK_SHIFT_MASK, GDK_KEY_g,      toggle,     { .i = Geolocation } },
+       { MODKEY|GDK_SHIFT_MASK, GDK_KEY_s,      toggle,     { .i = JavaScript } },
+       { MODKEY|GDK_SHIFT_MASK, GDK_KEY_i,      toggle,     { .i = LoadImages } },
+       { MODKEY|GDK_SHIFT_MASK, GDK_KEY_v,      toggle,     { .i = Plugins } },
+       { MODKEY|GDK_SHIFT_MASK, GDK_KEY_b,      toggle,     { .i = ScrollBars } },
 
-       { MODKEY|GDK_SHIFT_MASK, GDK_KEY_c,      toggle,     { .v = "enable-caret-browsing" } },
-       { MODKEY|GDK_SHIFT_MASK, GDK_KEY_i,      toggle,     { .v = "auto-load-images" } },
-       { MODKEY|GDK_SHIFT_MASK, GDK_KEY_s,      toggle,     { .v = "enable-scripts" } },
-       { MODKEY|GDK_SHIFT_MASK, GDK_KEY_v,      toggle,     { .v = "enable-plugins" } },
        { MODKEY|GDK_SHIFT_MASK, GDK_KEY_a,      togglecookiepolicy, { 0 } },
        { MODKEY|GDK_SHIFT_MASK, GDK_KEY_m,      togglestyle, { 0 } },
-       { MODKEY|GDK_SHIFT_MASK, GDK_KEY_b,      togglescrollbars, { 0 } },
-       { MODKEY|GDK_SHIFT_MASK, GDK_KEY_g,      togglegeolocation, { 0 } },
 };
 
 /* button definitions */
 /* 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,      linkopenembed,  { 0 },          1 },
-       { OnLink,       MODKEY,         2,      linkopen,       { 0 },          1 },
-       { OnLink,       MODKEY,         1,      linkopen,       { 0 },          1 },
-       { OnAny,        0,              8,      navigate,       { .i = -1 },    1 },
-       { OnAny,        0,              9,      navigate,       { .i = +1 },    1 },
+       { OnLink,       0,              2,      clicknewwindow, { .b = 0 },     1 },
+       { OnLink,       MODKEY,         2,      clicknewwindow, { .b = 1 },     1 },
+       { OnLink,       MODKEY,         1,      clicknewwindow, { .b = 1 },     1 },
+       { OnAny,        0,              8,      clicknavigate,  { .i = -1 },    1 },
+       { OnAny,        0,              9,      clicknavigate,  { .i = +1 },    1 },
 };