From 7b185a70ed17be4fcb8402823ae36a19ecc776ab Mon Sep 17 00:00:00 2001 From: Daniel Carl Date: Mon, 3 Dec 2012 22:53:12 +0100 Subject: [PATCH] Added alias for settings. This was done because the webkit settings don't always have short or mnemonic names. --- src/setting.c | 124 +++++++++++++++++++++++++------------------------- src/setting.h | 1 + 2 files changed, 63 insertions(+), 62 deletions(-) diff --git a/src/setting.c b/src/setting.c index 9e51c7c..fa083bf 100644 --- a/src/setting.c +++ b/src/setting.c @@ -33,70 +33,69 @@ static gboolean setting_completion_style(const Setting* s); static Setting default_settings[] = { /* webkit settings */ - {"auto-load-images", TYPE_BOOLEAN, setting_webkit, {.i = 1}}, - {"auto-shrink-images", TYPE_BOOLEAN, setting_webkit, {.i = 1}}, - {"cursive-font-family", TYPE_CHAR, setting_webkit, {.s = "serif"}}, - {"cursive-font-family", TYPE_CHAR, setting_webkit, {.s = "serif"}}, - {"default-encoding", TYPE_CHAR, setting_webkit, {.s = "utf-8"}}, - {"default-font-family", TYPE_CHAR, setting_webkit, {.s = "sans-serif"}}, - {"default-font-size", TYPE_INTEGER, setting_webkit, {.i = 12}}, - {"default-monospace-font-size", TYPE_INTEGER, setting_webkit, {.i = 10}}, - {"enable-caret-browsing", TYPE_BOOLEAN, setting_webkit, {.i = 0}}, - {"enable-default-context-menu", TYPE_BOOLEAN, setting_webkit, {.i = 1}}, - {"enable-developer-extras", TYPE_BOOLEAN, setting_webkit, {.i = 0}}, - {"enable-dns-prefetching", TYPE_BOOLEAN, setting_webkit, {.i = 1}}, - {"enable-dom-paste", TYPE_BOOLEAN, setting_webkit, {.i = 0}}, - {"enable-frame-flattening", TYPE_BOOLEAN, setting_webkit, {.i = 0}}, - {"enable-file-access-from-file-uris", TYPE_BOOLEAN, setting_webkit, {.i = 1}}, - {"enable-html5-database", TYPE_BOOLEAN, setting_webkit, {.i = 0}}, - {"enable-html5-local-storage", TYPE_BOOLEAN, setting_webkit, {.i = 0}}, - {"enable-java-applet", TYPE_BOOLEAN, setting_webkit, {.i = 0}}, - {"enable-offline-web-application-cache", TYPE_BOOLEAN, setting_webkit, {.i = 0}}, - {"enable-page-cache", TYPE_BOOLEAN, setting_webkit, {.i = 1}}, - {"enable-plugins", TYPE_BOOLEAN, setting_webkit, {.i = 1}}, - {"enable-private-browsing", TYPE_BOOLEAN, setting_webkit, {.i = 0}}, - {"enable-scripts", TYPE_BOOLEAN, setting_webkit, {.i = 1}}, - {"enable-site-specific-quirks", TYPE_BOOLEAN, setting_webkit, {.i = 0}}, - {"enable-spatial-navigation", TYPE_BOOLEAN, setting_webkit, {.i = 0}}, - {"enable-spell-checking", TYPE_BOOLEAN, setting_webkit, {.i = 0}}, - {"enable-universal-access-from-file-uris", TYPE_BOOLEAN, setting_webkit, {.i = 1}}, - {"enable-xss-auditor", TYPE_BOOLEAN, setting_webkit, {.i = 0}}, - {"enforce-96-dpi", TYPE_BOOLEAN, setting_webkit, {.i = 0}}, - {"fantasy-font-family", TYPE_CHAR, setting_webkit, {.s = "serif"}}, - {"javascript-can-access-clipboard", TYPE_BOOLEAN, setting_webkit, {.i = 0}}, - {"javascript-can-open-windows-automatically", TYPE_BOOLEAN, setting_webkit, {.i = 0}}, - {"minimum-font-size", TYPE_INTEGER, setting_webkit, {.i = 5}}, - {"minimum-logical-font-size", TYPE_INTEGER, setting_webkit, {.i = 5}}, - {"monospace-font-family", TYPE_CHAR, setting_webkit, {.s = "monospace"}}, - {"print-backgrounds", TYPE_BOOLEAN, setting_webkit, {.i = 1}}, - {"resizable-text-areas", TYPE_BOOLEAN, setting_webkit, {.i = 1}}, - {"sans-serif-font-family", TYPE_CHAR, setting_webkit, {.s = "sans-serif"}}, - {"serif-font-family", TYPE_CHAR, setting_webkit, {.s = "serif"}}, - {"spell-checking-languages", TYPE_CHAR, setting_webkit, {.s = NULL}}, - {"tab-key-cycles-through-elements", TYPE_BOOLEAN, setting_webkit, {.i = 1}}, - {"user-agent", TYPE_CHAR, setting_webkit, {.s = PROJECT "/" VERSION " (X11; Linux i686) AppleWebKit/535.22+ Compatible (Safari)"}}, - {"user-stylesheet-uri", TYPE_CHAR, setting_webkit, {.s = NULL}}, - {"zoom-step", TYPE_DOUBLE, setting_webkit, {.i = 100}}, + {"images", "auto-load-images", TYPE_BOOLEAN, setting_webkit, {.i = 1}}, + {"shrinkimages", "auto-shrink-images", TYPE_BOOLEAN, setting_webkit, {.i = 1}}, + {"cursivfont", "cursive-font-family", TYPE_CHAR, setting_webkit, {.s = "serif"}}, + {"defaultencondig", "default-encoding", TYPE_CHAR, setting_webkit, {.s = "utf-8"}}, + {"defaultfont", "default-font-family", TYPE_CHAR, setting_webkit, {.s = "sans-serif"}}, + {"fontsize", "default-font-size", TYPE_INTEGER, setting_webkit, {.i = 10}}, + {"monofontsize", "default-monospace-font-size", TYPE_INTEGER, setting_webkit, {.i = 10}}, + {"carret", "enable-caret-browsing", TYPE_BOOLEAN, setting_webkit, {.i = 0}}, + {NULL, "enable-default-context-menu", TYPE_BOOLEAN, setting_webkit, {.i = 1}}, + {"webinspector", "enable-developer-extras", TYPE_BOOLEAN, setting_webkit, {.i = 1}}, + {"dnsprefetching", "enable-dns-prefetching", TYPE_BOOLEAN, setting_webkit, {.i = 1}}, + {"dompaste", "enable-dom-paste", TYPE_BOOLEAN, setting_webkit, {.i = 0}}, + {"frameflattening", "enable-frame-flattening", TYPE_BOOLEAN, setting_webkit, {.i = 0}}, + {NULL, "enable-file-access-from-file-uris", TYPE_BOOLEAN, setting_webkit, {.i = 1}}, + {NULL, "enable-html5-database", TYPE_BOOLEAN, setting_webkit, {.i = 0}}, + {NULL, "enable-html5-local-storage", TYPE_BOOLEAN, setting_webkit, {.i = 0}}, + {"javaapplet", "enable-java-applet", TYPE_BOOLEAN, setting_webkit, {.i = 0}}, + {"offlinecache", "enable-offline-web-application-cache", TYPE_BOOLEAN, setting_webkit, {.i = 0}}, + {"pagecache", "enable-page-cache", TYPE_BOOLEAN, setting_webkit, {.i = 1}}, + {"plugins", "enable-plugins", TYPE_BOOLEAN, setting_webkit, {.i = 1}}, + {"privatebrowsing", "enable-private-browsing", TYPE_BOOLEAN, setting_webkit, {.i = 0}}, + {"scripts", "enable-scripts", TYPE_BOOLEAN, setting_webkit, {.i = 1}}, + {NULL, "enable-site-specific-quirks", TYPE_BOOLEAN, setting_webkit, {.i = 0}}, + {NULL, "enable-spatial-navigation", TYPE_BOOLEAN, setting_webkit, {.i = 0}}, + {"spell", "enable-spell-checking", TYPE_BOOLEAN, setting_webkit, {.i = 0}}, + {NULL, "enable-universal-access-from-file-uris", TYPE_BOOLEAN, setting_webkit, {.i = 1}}, + {"xssauditor", "enable-xss-auditor", TYPE_BOOLEAN, setting_webkit, {.i = 0}}, + {NULL, "enforce-96-dpi", TYPE_BOOLEAN, setting_webkit, {.i = 0}}, + {"fantasyfont", "fantasy-font-family", TYPE_CHAR, setting_webkit, {.s = "serif"}}, + {NULL, "javascript-can-access-clipboard", TYPE_BOOLEAN, setting_webkit, {.i = 0}}, + {NULL, "javascript-can-open-windows-automatically", TYPE_BOOLEAN, setting_webkit, {.i = 0}}, + {"minimumfontsize", "minimum-font-size", TYPE_INTEGER, setting_webkit, {.i = 5}}, + {NULL, "minimum-logical-font-size", TYPE_INTEGER, setting_webkit, {.i = 5}}, + {"monofont", "monospace-font-family", TYPE_CHAR, setting_webkit, {.s = "monospace"}}, + {"backgrounds", "print-backgrounds", TYPE_BOOLEAN, setting_webkit, {.i = 1}}, + {"resizetextareas", "resizable-text-areas", TYPE_BOOLEAN, setting_webkit, {.i = 1}}, + {"sansfont", "sans-serif-font-family", TYPE_CHAR, setting_webkit, {.s = "sans-serif"}}, + {"seriffont", "serif-font-family", TYPE_CHAR, setting_webkit, {.s = "serif"}}, + {"spelllang", "spell-checking-languages", TYPE_CHAR, setting_webkit, {.s = NULL}}, + {NULL, "tab-key-cycles-through-elements", TYPE_BOOLEAN, setting_webkit, {.i = 1}}, + {"useragent", "user-agent", TYPE_CHAR, setting_webkit, {.s = PROJECT "/" VERSION " (X11; Linux i686) AppleWebKit/535.22+ Compatible (Safari)"}}, + {"stylesheet", "user-stylesheet-uri", TYPE_CHAR, setting_webkit, {.s = NULL}}, + {"zoomstep", "zoom-step", TYPE_DOUBLE, setting_webkit, {.i = 100}}, /* internal variables */ #ifdef FEATURE_COOKIE - {"cookie-timeout", TYPE_INTEGER, setting_cookie_timeout, {.i = 4800}}, + {NULL, "cookie-timeout", TYPE_INTEGER, setting_cookie_timeout, {.i = 4800}}, #endif - {"scrollstep", TYPE_INTEGER, setting_scrollstep, {.i = 40}}, - {"status-color-bg", TYPE_CHAR, setting_status_color_bg, {.s = "#000"}}, - {"status-color-fg", TYPE_CHAR, setting_status_color_fg, {.s = "#fff"}}, - {"status-font", TYPE_CHAR, setting_status_font, {.s = "monospace bold 8"}}, - {"input-bg-normal", TYPE_CHAR, setting_input_style, {.s = "#fff"}}, - {"input-bg-error", TYPE_CHAR, setting_input_style, {.s = "#f00"}}, - {"input-fg-normal", TYPE_CHAR, setting_input_style, {.s = "#000"}}, - {"input-fg-error", TYPE_CHAR, setting_input_style, {.s = "#000"}}, - {"input-font-normal", TYPE_CHAR, setting_input_style, {.s = "monospace normal 8"}}, - {"input-font-error", TYPE_CHAR, setting_input_style, {.s = "monospace bold 8"}}, - {"completion-font-normal", TYPE_CHAR, setting_completion_style, {.s = "monospace normal 8"}}, - {"completion-font-active", TYPE_CHAR, setting_completion_style, {.s = "monospace bold 8"}}, - {"completion-fg-normal", TYPE_CHAR, setting_completion_style, {.s = "#f6f3e8"}}, - {"completion-fg-active", TYPE_CHAR, setting_completion_style, {.s = "#fff"}}, - {"completion-bg-normal", TYPE_CHAR, setting_completion_style, {.s = "#656565"}}, - {"completion-bg-active", TYPE_CHAR, setting_completion_style, {.s = "#777777"}}, + {NULL, "scrollstep", TYPE_INTEGER, setting_scrollstep, {.i = 40}}, + {NULL, "status-color-bg", TYPE_CHAR, setting_status_color_bg, {.s = "#000"}}, + {NULL, "status-color-fg", TYPE_CHAR, setting_status_color_fg, {.s = "#fff"}}, + {NULL, "status-font", TYPE_CHAR, setting_status_font, {.s = "monospace bold 8"}}, + {NULL, "input-bg-normal", TYPE_CHAR, setting_input_style, {.s = "#fff"}}, + {NULL, "input-bg-error", TYPE_CHAR, setting_input_style, {.s = "#f00"}}, + {NULL, "input-fg-normal", TYPE_CHAR, setting_input_style, {.s = "#000"}}, + {NULL, "input-fg-error", TYPE_CHAR, setting_input_style, {.s = "#000"}}, + {NULL, "input-font-normal", TYPE_CHAR, setting_input_style, {.s = "monospace normal 8"}}, + {NULL, "input-font-error", TYPE_CHAR, setting_input_style, {.s = "monospace bold 8"}}, + {NULL, "completion-font-normal", TYPE_CHAR, setting_completion_style, {.s = "monospace normal 8"}}, + {NULL, "completion-font-active", TYPE_CHAR, setting_completion_style, {.s = "monospace bold 8"}}, + {NULL, "completion-fg-normal", TYPE_CHAR, setting_completion_style, {.s = "#f6f3e8"}}, + {NULL, "completion-fg-active", TYPE_CHAR, setting_completion_style, {.s = "#fff"}}, + {NULL, "completion-bg-normal", TYPE_CHAR, setting_completion_style, {.s = "#656565"}}, + {NULL, "completion-bg-active", TYPE_CHAR, setting_completion_style, {.s = "#777777"}}, }; @@ -108,7 +107,8 @@ void setting_init(void) for (i = 0; i < LENGTH(default_settings); i++) { s = &default_settings[i]; - g_hash_table_insert(vp.settings, (gpointer)s->name, s); + /* use alias as key if available */ + g_hash_table_insert(vp.settings, (gpointer)s->alias != NULL ? s->alias : s->name, s); /* set the default settings */ s->func(s); diff --git a/src/setting.h b/src/setting.h index 8004c16..1c57c91 100644 --- a/src/setting.h +++ b/src/setting.h @@ -26,6 +26,7 @@ typedef struct _Setting Setting; typedef gboolean (*SettingFunc)(const Setting*); struct _Setting { + gchar* alias; gchar* name; Type type; SettingFunc func; -- 2.20.1