Adapt setstyle()

[surf.git] / config.def.h

diff --git a/config.def.h b/config.def.h
index 1c18827..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 */
@@ -83,59 +83,58 @@ static SiteStyle styles[] = {
  * edit the CLEANMASK() macro.
  */
 static Key keys[] = {
-       /* modifier             keyval      function    arg             Focus */
-       { MODKEY|GDK_SHIFT_MASK,GDK_r,      reload,     { .b = TRUE } },
-       { MODKEY,               GDK_r,      reload,     { .b = FALSE } },
-       { MODKEY|GDK_SHIFT_MASK,GDK_p,      print,      { 0 } },
-
-       { MODKEY,               GDK_p,      clipboard,  { .b = TRUE } },
-       { MODKEY,               GDK_y,      clipboard,  { .b = FALSE } },
-
-       { MODKEY|GDK_SHIFT_MASK,GDK_j,      zoom,       { .i = -1 } },
-       { MODKEY|GDK_SHIFT_MASK,GDK_k,      zoom,       { .i = +1 } },
-       { MODKEY|GDK_SHIFT_MASK,GDK_q,      zoom,       { .i = 0  } },
-       { MODKEY,               GDK_minus,  zoom,       { .i = -1 } },
-       { MODKEY,               GDK_plus,   zoom,       { .i = +1 } },
-
-       { MODKEY,               GDK_l,      navigate,   { .i = +1 } },
-       { MODKEY,               GDK_h,      navigate,   { .i = -1 } },
-
-       { MODKEY,               GDK_j,      scroll_v,   { .i = +1 } },
-       { MODKEY,               GDK_k,      scroll_v,   { .i = -1 } },
-       { MODKEY,               GDK_b,      scroll_v,   { .i = -10000 } },
-       { MODKEY,               GDK_space,  scroll_v,   { .i = +10000 } },
-       { MODKEY,               GDK_i,      scroll_h,   { .i = +1 } },
-       { MODKEY,               GDK_u,      scroll_h,   { .i = -1 } },
-
-       { 0,                    GDK_F11,    fullscreen, { 0 } },
-       { 0,                    GDK_Escape, stop,       { 0 } },
-       { MODKEY,               GDK_o,      source,     { 0 } },
-       { MODKEY|GDK_SHIFT_MASK,GDK_o,      inspector,  { 0 } },
-
-       { MODKEY,               GDK_g,      spawn,      SETPROP("_SURF_URI", "_SURF_GO") },
-       { MODKEY,               GDK_f,      spawn,      SETPROP("_SURF_FIND", "_SURF_FIND") },
-       { MODKEY,               GDK_slash,  spawn,      SETPROP("_SURF_FIND", "_SURF_FIND") },
-
-       { MODKEY,               GDK_n,      find,       { .b = TRUE } },
-       { MODKEY|GDK_SHIFT_MASK,GDK_n,      find,       { .b = FALSE } },
-
-       { MODKEY|GDK_SHIFT_MASK,GDK_c,      toggle,     { .v = "enable-caret-browsing" } },
-       { MODKEY|GDK_SHIFT_MASK,GDK_i,      toggle,     { .v = "auto-load-images" } },
-       { MODKEY|GDK_SHIFT_MASK,GDK_s,      toggle,     { .v = "enable-scripts" } },
-       { MODKEY|GDK_SHIFT_MASK,GDK_v,      toggle,     { .v = "enable-plugins" } },
-       { MODKEY|GDK_SHIFT_MASK,GDK_a,      togglecookiepolicy, { 0 } },
-       { MODKEY|GDK_SHIFT_MASK,GDK_m,      togglestyle, { 0 } },
-       { MODKEY|GDK_SHIFT_MASK,GDK_b,      togglescrollbars, { 0 } },
-       { MODKEY|GDK_SHIFT_MASK,GDK_g,      togglegeolocation, { 0 } },
+       /* modifier              keyval          function    arg */
+       { MODKEY|GDK_SHIFT_MASK, GDK_KEY_r,      reload,     { .b = TRUE } },
+       { MODKEY,                GDK_KEY_r,      reload,     { .b = FALSE } },
+       { MODKEY|GDK_SHIFT_MASK, GDK_KEY_p,      print,      { 0 } },
+
+       { MODKEY,                GDK_KEY_p,      clipboard,  { .b = TRUE } },
+       { MODKEY,                GDK_KEY_y,      clipboard,  { .b = FALSE } },
+
+       { MODKEY|GDK_SHIFT_MASK, GDK_KEY_j,      zoom,       { .i = -1 } },
+       { MODKEY|GDK_SHIFT_MASK, GDK_KEY_k,      zoom,       { .i = +1 } },
+       { MODKEY|GDK_SHIFT_MASK, GDK_KEY_q,      zoom,       { .i = 0  } },
+       { MODKEY,                GDK_KEY_minus,  zoom,       { .i = -1 } },
+       { MODKEY,                GDK_KEY_plus,   zoom,       { .i = +1 } },
+
+       { 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,    togglefullscreen, { 0 } },
+       { 0,                     GDK_KEY_Escape, stop,       { 0 } },
+       { MODKEY|GDK_SHIFT_MASK, GDK_KEY_o,      inspector,  { 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_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 */
-/* 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 },
 };