Adapt zoom()

[surf.git] / config.def.h

diff --git a/config.def.h b/config.def.h
index 55e6da4..dea8091 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -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 } },
-
-       { 0,                     GDK_KEY_F11,    fullscreen, { 0 } },
+                                                            /* 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") },
@@ -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 },
 };