X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=config.def.h;h=9682d0d2fe1775da1721369af1a4b1b4a5d7bbbb;hb=2aa1c38aed02bfc37379476a07516172b2817cae;hp=5a4e40d3b1a3b5889b0bbb521d0078ed289d5bfd;hpb=11fa5a7a4df034aace061c726cc261c5d57e2509;p=surf.git

diff --git a/config.def.h b/config.def.h
index 5a4e40d..9682d0d 100644
--- a/config.def.h
+++ b/config.def.h
@@ -5,9 +5,9 @@ static char *scriptfile     = "~/.surf/script.js";
 static char *styledir       = "~/.surf/styles/";
 static char *cachedir       = "~/.surf/cache/";
 
-static Bool kioskmode       = FALSE; /* Ignore shortcuts */
-static Bool showindicators  = TRUE;  /* Show indicators in window title */
-static Bool runinfullscreen = FALSE; /* Run in fullscreen mode by default */
+static int kioskmode       = 0;     /* Ignore shortcuts */
+static int showindicators  = 1;     /* Show indicators in window title */
+static int runinfullscreen = 0;     /* Run in fullscreen mode by default */
 
 static guint defaultfontsize = 12;   /* Default font size */
 static gfloat zoomlevel     = 1.0;   /* Default zoom level */
@@ -16,21 +16,26 @@ static gfloat zoomlevel     = 1.0;   /* Default zoom level */
 static char *cookiefile     = "~/.surf/cookies.txt";
 static char *cookiepolicies = "Aa@"; /* A: accept all; a: accept nothing,
                                       * @: accept no third party */
-static Bool strictssl       = FALSE; /* Refuse untrusted SSL connections */
+static int strictssl       = 0; /* Refuse untrusted SSL connections */
+
+/* Languages */
+static int enablespellchecking         = 0;
+static const char *spellinglanguages[] = { "en_US", NULL };
+static const char *preferedlanguages[] = { NULL };
 
 /* Webkit default features */
-static Bool enablescrollbars      = TRUE;
-static Bool enablecaretbrowsing   = TRUE;
-static Bool enablecache           = TRUE;
-static Bool enableplugins         = TRUE;
-static Bool enablescripts         = TRUE;
-static Bool enableinspector       = TRUE;
-static Bool enablestyle           = TRUE;
-static Bool loadimages            = TRUE;
-static Bool hidebackground        = FALSE;
-static Bool allowgeolocation      = TRUE;
-static Bool enablednsprefetching  = FALSE;
-static Bool enableframeflattening = FALSE;
+static int enablescrollbars      = 1;
+static int enablecaretbrowsing   = 1;
+static int enablecache           = 1;
+static int enableplugins         = 1;
+static int enablescripts         = 1;
+static int enableinspector       = 1;
+static int enablestyle           = 1;
+static int loadimages            = 1;
+static int hidebackground        = 0;
+static int allowgeolocation      = 1;
+static int enablednsprefetching  = 0;
+static int enableframeflattening = 0;
 
 static WebKitFindOptions findopts = WEBKIT_FIND_OPTIONS_CASE_INSENSITIVE |
                                     WEBKIT_FIND_OPTIONS_WRAP_AROUND;
@@ -48,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 \
@@ -98,19 +103,22 @@ static Key keys[] = {
 	{ 0,                     GDK_KEY_Escape, stop,       { 0 } },
 	{ MODKEY,                GDK_KEY_c,      stop,       { 0 } },
 
-	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_r,      reload,     { .b = TRUE } },
-	{ MODKEY,                GDK_KEY_r,      reload,     { .b = FALSE } },
+	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_r,      reload,     { .b = 1 } },
+	{ MODKEY,                GDK_KEY_r,      reload,     { .b = 0 } },
 
 	{ 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 } },
@@ -118,8 +126,8 @@ static Key keys[] = {
 	{ MODKEY,                GDK_KEY_minus,  zoom,       { .i = -1 } },
 	{ MODKEY,                GDK_KEY_plus,   zoom,       { .i = +1 } },
 
-	{ MODKEY,                GDK_KEY_p,      clipboard,  { .b = TRUE } },
-	{ MODKEY,                GDK_KEY_y,      clipboard,  { .b = FALSE } },
+	{ MODKEY,                GDK_KEY_p,      clipboard,  { .b = 1 } },
+	{ MODKEY,                GDK_KEY_y,      clipboard,  { .b = 0 } },
 
 	{ MODKEY,                GDK_KEY_n,      find,       { .i = +1 } },
 	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_n,      find,       { .i = -1 } },