X-Git-Url: https://git.danieliu.xyz/?p=surf.git;a=blobdiff_plain;f=config.def.h;h=2fa96dcf6099c3b9a6545ee164395a7d25b5e823;hp=bed5fe1e5cc89292cfe047a570bcf03de85a5c5a;hb=ba8617e4ee9ff35a45059930ef611cb85ed33af2;hpb=566b452b46a171a4426256cdb02704ae8351a2b3

diff --git a/config.def.h b/config.def.h
index bed5fe1..2fa96dc 100644
--- 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,9 +107,8 @@ 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_KEY_o,      source,     { 0 } },
 	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_o,      inspector,  { 0 } },
 
 	{ MODKEY,                GDK_KEY_g,      spawn,      SETPROP("_SURF_URI", "_SURF_GO") },
@@ -130,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 },
 };