Style change in functions ordering

[surf.git] / config.def.h

diff --git a/config.def.h b/config.def.h
index a1baced..6d62c98 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -1,7 +1,6 @@
 /* modifier 0 means no modifier */
-static char *useragent      = "Mozilla/5.0 (X11; U; Unix; en-US) "
-                              "AppleWebKit/537.15 (KHTML, like Gecko) "
-                              "Chrome/24.0.1295.0 Safari/537.15 Surf/"VERSION;
+static int surfuseragent    = 1;  /* Append Surf version to default WebKit user agent */
+static char *fulluseragent  = ""; /* Or override the whole user agent string */
 static char *scriptfile     = "~/.surf/script.js";
 static char *styledir       = "~/.surf/styles/";
 static char *cachedir       = "~/.surf/cache/";
@@ -37,7 +36,7 @@ static WebKitFindOptions findopts = WEBKIT_FIND_OPTIONS_CASE_INSENSITIVE |
                                     WEBKIT_FIND_OPTIONS_WRAP_AROUND;
 
 #define SETPROP(p, q) { \
-       .v = (char *[]){ "/bin/sh", "-c", \
+       .v = (const char *[]){ "/bin/sh", "-c", \
             "prop=\"`xprop -id $2 $0 " \
             "| sed \"s/^$0(STRING) = \\(\\\\\"\\?\\)\\(.*\\)\\1$/\\2/\" " \
             "| xargs -0 printf %b | dmenu`\" &&" \
@@ -48,7 +47,7 @@ static WebKitFindOptions findopts = WEBKIT_FIND_OPTIONS_CASE_INSENSITIVE |
 
 /* DOWNLOAD(URI, referer) */
 #define DOWNLOAD(d, r) { \
-       .v = (char *[]){ "/bin/sh", "-c", \
+       .v = (const char *[]){ "/bin/sh", "-c", \
             "st -e /bin/sh -c \"curl -L -J -O --user-agent '$1'" \
             " --referer '$2' -b $3 -c $3 '$0';" \
             " sleep 5;\"", \
@@ -61,7 +60,7 @@ static WebKitFindOptions findopts = WEBKIT_FIND_OPTIONS_CASE_INSENSITIVE |
  * "http://" or "https://" should be opened.
  */
 #define PLUMB(u) {\
-       .v = (char *[]){ "/bin/sh", "-c", \
+       .v = (const char *[]){ "/bin/sh", "-c", \
             "xdg-open \"$0\"", u, NULL \
        } \
 }
@@ -85,18 +84,15 @@ static SiteStyle styles[] = {
  */
 static Key keys[] = {
        /* 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_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_p,      clipboard,  { .b = TRUE } },
-       { MODKEY,                GDK_KEY_y,      clipboard,  { .b = FALSE } },
+       { 0,                     GDK_KEY_Escape, stop,       { 0 } },
+       { MODKEY,                GDK_KEY_c,      stop,       { 0 } },
 
-       { 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_SHIFT_MASK, GDK_KEY_r,      reload,     { .b = TRUE } },
+       { MODKEY,                GDK_KEY_r,      reload,     { .b = FALSE } },
 
        { MODKEY,                GDK_KEY_l,      navigate,   { .i = +1 } },
        { MODKEY,                GDK_KEY_h,      navigate,   { .i = -1 } },
@@ -109,17 +105,25 @@ static Key keys[] = {
        { 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,      toggleinspector, { 0 } },
+       { 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_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_p,      clipboard,  { .b = TRUE } },
+       { MODKEY,                GDK_KEY_y,      clipboard,  { .b = FALSE } },
 
        { MODKEY,                GDK_KEY_n,      find,       { .i = +1 } },
        { MODKEY|GDK_SHIFT_MASK, GDK_KEY_n,      find,       { .i = -1 } },
 
+       { MODKEY|GDK_SHIFT_MASK, GDK_KEY_p,      print,      { 0 } },
+
+       { MODKEY|GDK_SHIFT_MASK, GDK_KEY_a,      togglecookiepolicy, { 0 } },
+       { 0,                     GDK_KEY_F11,    togglefullscreen, { 0 } },
+       { MODKEY|GDK_SHIFT_MASK, GDK_KEY_o,      toggleinspector, { 0 } },
+       { MODKEY|GDK_SHIFT_MASK, GDK_KEY_m,      togglestyle, { 0 } },
+
        { MODKEY|GDK_SHIFT_MASK, GDK_KEY_c,      toggle,     { .i = CaretBrowsing } },
        { MODKEY|GDK_SHIFT_MASK, GDK_KEY_f,      toggle,     { .i = FrameFlattening } },
        { MODKEY|GDK_SHIFT_MASK, GDK_KEY_g,      toggle,     { .i = Geolocation } },
@@ -127,9 +131,6 @@ static Key keys[] = {
        { MODKEY|GDK_SHIFT_MASK, GDK_KEY_i,      toggle,     { .i = LoadImages } },
        { MODKEY|GDK_SHIFT_MASK, GDK_KEY_v,      toggle,     { .i = Plugins } },
        { MODKEY|GDK_SHIFT_MASK, GDK_KEY_b,      toggle,     { .i = ScrollBars } },
-
-       { MODKEY|GDK_SHIFT_MASK, GDK_KEY_a,      togglecookiepolicy, { 0 } },
-       { MODKEY|GDK_SHIFT_MASK, GDK_KEY_m,      togglestyle, { 0 } },
 };
 
 /* button definitions */