Use dashed setting names.

The mixes use of none separated settings names and those containing
multiple dashes looked ugly. So use consequently dashes setting names.

diff --git a/doc/vimb.1 b/doc/vimb.1
index 6f9fd4a..28c7e5d 100644 (file)
--- a/doc/vimb.1
+++ b/doc/vimb.1
@@ -189,7 +189,7 @@ Scroll page \fIN\fP steps up.
 Hinting in Vimb is how you accomplish the tasks that you would do with the
 mouse in common mouse-driven browsers: open a URI, yank a URI, save a page and
 so on. When hinting is started, the relevant elements on the page will
-be marked by labels generated from configured `hintkeys'.
+be marked by labels generated from configured `hint-keys'.
 Hints can be selected by using <Tab>, <C-I> or <C-Tab>, <C-O>,
 by typing the chars of the label, or filtering the elements by some text
 that is part of the hinted element (like URI, link text, button label)
@@ -826,14 +826,14 @@ hovered by the mouse.
 CSS style applied to the inputbox completion list item that is currently
 selected.
 .TP
-.B cursivfont (string)
+.B cursiv-font (string)
 The font family used as the default for content using cursive font.
 .TP
 .B default-charset (string)
 The default text charset used when interpreting content with an unspecified
 charset.
 .TP
-.B defaultfont (string)
+.B default-font (string)
 The font family to use as the default for content that does not specify a
 font.
 .TP
@@ -856,7 +856,7 @@ spawn the editor-like `x-terminal-emulator -e vim %s'.
 To use Gvim as the editor, it's necessary to call it with `-f' to run it in
 the foreground.
 .TP
-.B fontsize (int)
+.B font-size (int)
 The default font size used to display text.
 .TP
 .B frame-flattening (bool)
@@ -901,14 +901,14 @@ ambiguous.
 Timeout before automatically following a non-unique numerical hint.
 To disable auto fire of hints, set this value to 0.
 .TP
-.B hintkeys (string)
+.B hint-keys (string)
 The keys used to label and select hints.
 With its default value, each hint has a unique number which can be typed
 to select it, while all other characters are used to filter hints based
 on their text.
 With a value such as asdfg;lkjh,
 each hint is `numbered' based on the characters of the home row.
-Note that the hint matching by label built of hintkeys is case sensitive.
+Note that the hint matching by label built of hint-keys is case sensitive.
 In this vimb differs from some other browsers that show hint labels in upper
 case, but match them lowercase.
 .RS
@@ -976,16 +976,16 @@ Enable or disable support for MediaSource on pages.
 MediaSource is an experimental proposal which extends HTMLMediaElement
 to allow JavaScript to generate media streams for playback.
 .TP
-.B minimumfontsize (int)
+.B minimum-font-size (int)
 The minimum font size used to display text.
 .TP
-.B monofont (string)
+.B monospace-font (string)
 The font family used as the default for content using monospace font.
 .TP
-.B monofontsize (int)
+.B monospace-font-size (int)
 Default font size for the monospace font.
 .TP
-.B offlinecache (bool)
+.B offline-cache (bool)
 Whether to enable HTML5 offline web application cache support.
 Offline web application cache allows web applications to run even
 when the user is not connected to the network.
@@ -1002,16 +1002,16 @@ not allow a page to store data in the windows sessionStorage.
 .B plugins (bool)
 Determines whether or not plugins on the page are enabled.
 .TP
-.B sansfont (string)
+.B sans-serif-font (string)
 The font family used as the default for content using sans-serif font.
 .TP
 .B scripts (bool)
 Determines whether or not JavaScript executes within a page.
 .TP
-.B scrollstep (int)
+.B scroll-step (int)
 Number of pixel vimb scrolls if 'j' or 'k' is used.
 .TP
-.B seriffont (string)
+.B serif-font (string)
 The font family used as the default for content using serif font.
 .TP
 .B site-specific-quirks (bool)
@@ -1029,8 +1029,8 @@ For example, if a user presses the Right key, heuristics determine whether
 there is an element they might be trying to reach towards the right, and if
 there are multiple elements, which element they probably want.
 .TP
-.B statusbar (bool)
-Indicates if the statusbar should be shown.
+.B status-bar (bool)
+Indicates if the status bar should be shown.
 .TP
 .B status-css (string)
 CSS style applied to the status bar on none https pages.
@@ -1038,7 +1038,7 @@ CSS style applied to the status bar on none https pages.
 .B status-ssl-css (string)
 CSS style applied to the status bar on https pages with trusted certificate.
 .TP
-.B status-sslinvalid-css (string)
+.B status-ssl-invalid-css (string)
 CSS style applied to the status bar on https pages with untrusted certificate.
 .TP
 .B strict-ssl (bool)
@@ -1062,6 +1062,9 @@ to complete.
 .B useragent (string)
 The user-agent string used by WebKit.
 .TP
+.B user-scripts (bool)
+Indicates if user style sheet file $XDG_CONFIG_HOME/vimb/style.css is sourced.
+.TP
 .B webaudio (bool)
 Enable or disable support for WebAudio on pages.
 WebAudio is an experimental proposal for allowing web pages
@@ -1088,7 +1091,7 @@ This fills the inputbox with the prefilled download command and replaces
 .PD
 .RE
 .TP
-.B xssauditor (bool)
+.B xss-auditor (bool)
 Whether to enable the XSS auditor.
 This feature filters some kinds of reflective XSS attacks on vulnerable web
 sites.

diff --git a/src/hints.c b/src/hints.c
index 43a7834..d5f5f40 100644 (file)
--- a/src/hints.c
+++ b/src/hints.c
@@ -131,7 +131,7 @@ void hints_create(Client *c, const char *input)
             (char[]){hints.mode, '\0'},
             hints.gmode ? "true" : "false",
             MAXIMUM_HINTS,
-            GET_CHAR(c, "hintkeys"),
+            GET_CHAR(c, "hint-keys"),
             GET_BOOL(c, "hint-follow-last") ? "true" : "false",
             GET_BOOL(c, "hint-number-same-length") ? "true" : "false"
         );

diff --git a/src/main.c b/src/main.c
index d394f12..e1116fb 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1584,7 +1584,7 @@ void vb_gui_style_update(Client *c, const char *setting_name_new, const char *se
         {"input-error-css",             " #input.error{%s}"},
         {"status-css",                  " #statusbar{%s}"},
         {"status-ssl-css",              " #statusbar.secure{%s}"},
-        {"status-sslinvalid-css",       " #statusbar.unsecure{%s}"},
+        {"status-ssl-invalid-css",      " #statusbar.unsecure{%s}"},
 #endif /* FEATURE_GUI_STYLE_VIMB2_COMPAT */
 
         {0, 0},

diff --git a/src/setting.c b/src/setting.c
index 09c4077..ce25d08 100644 (file)
--- a/src/setting.c
+++ b/src/setting.c
@@ -78,19 +78,18 @@ void setting_init(Client *c)
     setting_add(c, "useragent", TYPE_CHAR, &"Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/603.1 (KHTML, like Gecko) " PROJECT "/" VERSION " Version/10.0 Safari/603.1", webkit, 0, "user-agent");
     /* TODO use the real names for webkit settings */
     i = 14;
-    setting_add(c, "fontsize", TYPE_INTEGER, &i, webkit, 0, "default-font-size");
     setting_add(c, "caret", TYPE_BOOLEAN, &off, webkit, 0, "enable-caret-browsing");
-    setting_add(c, "cursivfont", TYPE_CHAR, &"serif", webkit, 0, "cursive-font-family");
+    setting_add(c, "cursiv-font", TYPE_CHAR, &"serif", webkit, 0, "cursive-font-family");
     setting_add(c, "default-charset", TYPE_CHAR, &"utf-8", webkit, 0, "default-charset");
-    setting_add(c, "defaultfont", TYPE_CHAR, &"sans-serif", webkit, 0, "default-font-family");
+    setting_add(c, "default-font", TYPE_CHAR, &"sans-serif", webkit, 0, "default-font-family");
     setting_add(c, "dns-prefetching", TYPE_BOOLEAN, &on, webkit, 0, "enable-dns-prefetching");
     i = SETTING_DEFAULT_FONT_SIZE;
-    setting_add(c, "fontsize", TYPE_INTEGER, &i, webkit, 0, "default-font-size");
+    setting_add(c, "font-size", TYPE_INTEGER, &i, webkit, 0, "default-font-size");
     setting_add(c, "frame-flattening", TYPE_BOOLEAN, &off, webkit, 0, "enable-frame-flattening");
     setting_add(c, "header", TYPE_CHAR, &"", headers, FLAG_LIST|FLAG_NODUP, "header");
     i = 1000;
     setting_add(c, "hint-timeout", TYPE_INTEGER, &i, NULL, 0, NULL);
-    setting_add(c, "hintkeys", TYPE_CHAR, &"0123456789", NULL, 0, NULL);
+    setting_add(c, "hint-keys", TYPE_CHAR, &"0123456789", NULL, 0, NULL);
     setting_add(c, "hint-follow-last", TYPE_BOOLEAN, &on, NULL, 0, NULL);
     setting_add(c, "hint-number-same-length", TYPE_BOOLEAN, &off, NULL, 0, NULL);
     setting_add(c, "html5-database", TYPE_BOOLEAN, &on, webkit, 0, "enable-html5-database");
@@ -106,15 +105,15 @@ void setting_init(Client *c)
     setting_add(c, "mediasource", TYPE_BOOLEAN, &off, webkit, 0, "enable-mediasource");
 #endif
     i = 5;
-    setting_add(c, "minimumfontsize", TYPE_INTEGER, &i, webkit, 0, "minimum-font-size");
-    setting_add(c, "monofont", TYPE_CHAR, &"monospace", webkit, 0, "monospace-font-family");
+    setting_add(c, "minimum-font-size", TYPE_INTEGER, &i, webkit, 0, "minimum-font-size");
+    setting_add(c, "monospace-font", TYPE_CHAR, &"monospace", webkit, 0, "monospace-font-family");
     i = SETTING_DEFAULT_MONOSPACE_FONT_SIZE;
-    setting_add(c, "monofontsize", TYPE_INTEGER, &i, webkit, 0, "default-monospace-font-size");
-    setting_add(c, "offlinecache", TYPE_BOOLEAN, &on, webkit, 0, "enable-offline-web-application-cache");
+    setting_add(c, "monospace-font-size", TYPE_INTEGER, &i, webkit, 0, "default-monospace-font-size");
+    setting_add(c, "offline-cache", TYPE_BOOLEAN, &on, webkit, 0, "enable-offline-web-application-cache");
     setting_add(c, "plugins", TYPE_BOOLEAN, &on, webkit, 0, "enable-plugins");
     setting_add(c, "print-backgrounds", TYPE_BOOLEAN, &on, webkit, 0, "print-backgrounds");
     setting_add(c, "private-browsing", TYPE_BOOLEAN, &off, webkit, 0, "enable-private-browsing");
-    setting_add(c, "sansfont", TYPE_CHAR, &"sans-serif", webkit, 0, "sans-serif-font-family");
+    setting_add(c, "sans-serif-font", TYPE_CHAR, &"sans-serif", webkit, 0, "sans-serif-font-family");
     setting_add(c, "scripts", TYPE_BOOLEAN, &on, webkit, 0, "enable-javascript");
     setting_add(c, "seriffont", TYPE_CHAR, &"serif", webkit, 0, "serif-font-family");
     setting_add(c, "site-specific-quirks", TYPE_BOOLEAN, &off, webkit, 0, "enable-site-specific-quirks");
@@ -124,21 +123,21 @@ void setting_init(Client *c)
     setting_add(c, "webaudio", TYPE_BOOLEAN, &off, webkit, 0, "enable-webaudio");
     setting_add(c, "webgl", TYPE_BOOLEAN, &off, webkit, 0, "enable-webgl");
     setting_add(c, "webinspector", TYPE_BOOLEAN, &on, webkit, 0, "enable-developer-extras");
-    setting_add(c, "xssauditor", TYPE_BOOLEAN, &on, webkit, 0, "enable-xss-auditor");
+    setting_add(c, "xss-auditor", TYPE_BOOLEAN, &on, webkit, 0, "enable-xss-auditor");
 
     /* internal variables */
     setting_add(c, "stylesheet", TYPE_BOOLEAN, &on, user_style, 0, NULL);
-    setting_add(c, "userscripts", TYPE_BOOLEAN, &on, user_scripts, 0, NULL);
+    setting_add(c, "user-scripts", TYPE_BOOLEAN, &on, user_scripts, 0, NULL);
     setting_add(c, "cookie-accept", TYPE_CHAR, &"always", cookie_accept, 0, NULL);
     i = 40;
-    setting_add(c, "scrollstep", TYPE_INTEGER, &i, internal, 0, &c->config.scrollstep);
+    setting_add(c, "scroll-step", TYPE_INTEGER, &i, internal, 0, &c->config.scrollstep);
     setting_add(c, "home-page", TYPE_CHAR, &SETTING_HOME_PAGE, NULL, 0, NULL);
     i = 2000;
     /* TODO should be global and not overwritten by a new client */
     setting_add(c, "history-max-items", TYPE_INTEGER, &i, internal, 0, &vb.config.history_max);
     setting_add(c, "editor-command", TYPE_CHAR, &"x-terminal-emulator -e -vi '%s'", NULL, 0, NULL);
     setting_add(c, "strict-ssl", TYPE_BOOLEAN, &on, tls_policy, 0, NULL);
-    setting_add(c, "statusbar", TYPE_BOOLEAN, &on, statusbar, 0, NULL);
+    setting_add(c, "status-bar", TYPE_BOOLEAN, &on, statusbar, 0, NULL);
     i = 1000;
     setting_add(c, "timeoutlen", TYPE_INTEGER, &i, internal, 0, &c->map.timeoutlen);
     setting_add(c, "input-autohide", TYPE_BOOLEAN, &off, input_autohide, 0, &c->config.input_autohide);
@@ -183,7 +182,7 @@ void setting_init(Client *c)
     setting_add(c, "input-error-css", TYPE_CHAR, &"background-color:#f77;font:" SETTING_GUI_FONT_EMPH, gui_style, 0, NULL);
     setting_add(c, "status-css", TYPE_CHAR, &"color:#fff;background-color:#000;font:" SETTING_GUI_FONT_EMPH, gui_style, 0, NULL);
     setting_add(c, "status-ssl-css", TYPE_CHAR, &"background-color:#95e454;color:#000;", gui_style, 0, NULL);
-    setting_add(c, "status-sslinvalid-css", TYPE_CHAR, &"background-color:#f77;color:#000;", gui_style, 0, NULL);
+    setting_add(c, "status-ssl-invalid-css", TYPE_CHAR, &"background-color:#f77;color:#000;", gui_style, 0, NULL);
 #endif /* FEATURE_GUI_STYLE_VIMB2_COMPAT */
 
     /* initialize the shortcuts and set the default shortcuts */