X-Git-Url: https://git.danieliu.xyz/?p=surf.git;a=blobdiff_plain;f=config.def.h;h=dea8091aa10df48048c5527d2782f781ebe6f145;hp=0a5d9fbe3b5253ab26f9bd2e0223ff3f663f8f28;hb=320e4e4388ff65318f6daed76f2ab16b87e20c7b;hpb=4415c475f7063ac5df0a0cca6b6696f0987f1404

diff --git a/config.def.h b/config.def.h
index 0a5d9fb..dea8091 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 */
@@ -100,16 +100,17 @@ 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,    fullscreen, { 0 } },
+	{ 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") },
@@ -124,17 +125,16 @@ static Key keys[] = {
 	{ 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 */
-/* 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 },
 };