Introduce new data structure for handling settings

[surf.git] / config.def.h

diff --git a/config.def.h b/config.def.h
index 4f6d655..9682d0d 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -53,7 +53,7 @@ static WebKitFindOptions findopts = WEBKIT_FIND_OPTIONS_CASE_INSENSITIVE |
 /* DOWNLOAD(URI, referer) */
 #define DOWNLOAD(d, r) { \
         .v = (const char *[]){ "/bin/sh", "-c", \
-             "st -e /bin/sh -c \"curl -L -J -O --user-agent '$1'" \
+             "st -e /bin/sh -c \"curl -g -L -J -O --user-agent '$1'" \
              " --referer '$2' -b $3 -c $3 '$0';" \
              " sleep 5;\"", \
              d, useragent, r, cookiefile, NULL \
@@ -109,13 +109,16 @@ static Key keys[] = {
        { MODKEY,                GDK_KEY_l,      navigate,   { .i = +1 } },
        { MODKEY,                GDK_KEY_h,      navigate,   { .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 } },
+       /* Currently we have to use scrolling steps that WebKit2GTK+ gives us
+        * d: step down, u: step up, r: step right, l:step left
+        * D: page down, U: page up */
+       { MODKEY,                GDK_KEY_j,      scroll,     { .i = 'd' } },
+       { MODKEY,                GDK_KEY_k,      scroll,     { .i = 'u' } },
+       { MODKEY,                GDK_KEY_b,      scroll,     { .i = 'U' } },
+       { MODKEY,                GDK_KEY_space,  scroll,     { .i = 'D' } },
+       { MODKEY,                GDK_KEY_i,      scroll,     { .i = 'r' } },
+       { MODKEY,                GDK_KEY_u,      scroll,     { .i = 'l' } },
+
 
        { MODKEY|GDK_SHIFT_MASK, GDK_KEY_j,      zoom,       { .i = -1 } },
        { MODKEY|GDK_SHIFT_MASK, GDK_KEY_k,      zoom,       { .i = +1 } },