Adapt setstyle()

[surf.git] / config.def.h

diff --git a/config.def.h b/config.def.h
index 0a5d9fb..2fa96dc 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -4,7 +4,7 @@ static char *useragent      = "Mozilla/5.0 (X11; U; Unix; en-US) "
                               "Chrome/24.0.1295.0 Safari/537.15 Surf/"VERSION;
 static char *scriptfile     = "~/.surf/script.js";
 static char *styledir       = "~/.surf/styles/";
-static char *cachefolder    = "~/.surf/cache/";
+static char *cachedir       = "~/.surf/cache/";
 
 static Bool kioskmode       = FALSE; /* Ignore shortcuts */
 static Bool showindicators  = TRUE;  /* Show indicators in window title */
@@ -107,7 +107,7 @@ static Key keys[] = {
        { MODKEY,                GDK_KEY_i,      scroll_h,   { .i = +1 } },
        { MODKEY,                GDK_KEY_u,      scroll_h,   { .i = -1 } },
 
-       { 0,                     GDK_KEY_F11,    fullscreen, { 0 } },
+       { 0,                     GDK_KEY_F11,    togglefullscreen, { 0 } },
        { 0,                     GDK_KEY_Escape, stop,       { 0 } },
        { MODKEY|GDK_SHIFT_MASK, GDK_KEY_o,      inspector,  { 0 } },
 
@@ -129,12 +129,12 @@ static Key keys[] = {
 };
 
 /* button definitions */
-/* click can be ClkDoc, ClkLink, ClkImg, ClkMedia, ClkSel, ClkEdit, ClkAny */
+/* target can be OnDoc, OnLink, OnImg, OnMedia, OnEdit, OnBar, OnSel, OnAny */
 static Button buttons[] = {
-       /* click        event mask  button  function        argument */
-       { ClkLink,      0,          2,      linkopenembed,  { 0 } },
-       { ClkLink,      MODKEY,     2,      linkopen,       { 0 } },
-       { ClkLink,      MODKEY,     1,      linkopen,       { 0 } },
-       { ClkAny,       0,          8,      navigate,       { .i = -1 } },
-       { ClkAny,       0,          9,      navigate,       { .i = +1 } },
+       /* 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 },
 };