NetSurf options rework (a=vince r=daniels,jmb)

svn path=/trunk/netsurf/; revision=13548

4 files changed, 272 insertions, 275 deletions

diff --git a/framebuffer/font_freetype.c b/framebuffer/font_freetype.c
index 5fc305616..b3c993f40 100644
--- a/framebuffer/font_freetype.c
+++ b/framebuffer/font_freetype.c
@@ -33,7 +33,6 @@
 
 #include "framebuffer/gui.h"
 #include "framebuffer/font.h"
-#include "framebuffer/options.h"
 #include "framebuffer/findfile.h"
 
 /* glyph cache minimum size */
@@ -172,7 +171,7 @@ bool fb_font_init(void)
         }
 
         /* set the Glyph cache size up */
-        max_cache_size = option_fb_font_cachesize * 1024; 
+        max_cache_size = nsoption_int(fb_font_cachesize) * 1024; 
 
 	if (max_cache_size < CACHE_MIN_SIZE) {
 		max_cache_size = CACHE_MIN_SIZE;
@@ -199,7 +198,7 @@ bool fb_font_init(void)
 	/* need to obtain the generic font faces */
 
 	/* Start with the sans serif font */
-	fb_face = fb_new_face(option_fb_face_sans_serif,
+	fb_face = fb_new_face(nsoption_charp(fb_face_sans_serif),
 			      "sans_serif.ttf",
 			      NETSURF_FB_FONT_SANS_SERIF);
 	if (fb_face == NULL) {
@@ -213,7 +212,7 @@ bool fb_font_init(void)
 	}
 
 	/* Bold sans serif face */
-	fb_face = fb_new_face(option_fb_face_sans_serif_bold,
+	fb_face = fb_new_face(nsoption_charp(fb_face_sans_serif_bold),
                             "sans_serif_bold.ttf",
                             NETSURF_FB_FONT_SANS_SERIF_BOLD);
 	if (fb_face == NULL) {
@@ -224,7 +223,7 @@ bool fb_font_init(void)
 	}
 
 	/* Italic sans serif face */
-	fb_face = fb_new_face(option_fb_face_sans_serif_italic,
+	fb_face = fb_new_face(nsoption_charp(fb_face_sans_serif_italic),
 			      "sans_serif_italic.ttf",
 			      NETSURF_FB_FONT_SANS_SERIF_ITALIC);
 	if (fb_face == NULL) {
@@ -235,7 +234,7 @@ bool fb_font_init(void)
 	}
 
 	/* Bold italic sans serif face */
-	fb_face = fb_new_face(option_fb_face_sans_serif_italic_bold, 
+	fb_face = fb_new_face(nsoption_charp(fb_face_sans_serif_italic_bold), 
 			      "sans_serif_italic_bold.ttf",
 			      NETSURF_FB_FONT_SANS_SERIF_ITALIC_BOLD);
 	if (fb_face == NULL) {
@@ -246,7 +245,7 @@ bool fb_font_init(void)
 	}
 
 	/* serif face */
-	fb_face = fb_new_face(option_fb_face_serif,
+	fb_face = fb_new_face(nsoption_charp(fb_face_serif),
                             "serif.ttf",
 			      NETSURF_FB_FONT_SERIF);
 	if (fb_face == NULL) {
@@ -257,7 +256,7 @@ bool fb_font_init(void)
 	}
 
 	/* bold serif face*/
-	fb_face = fb_new_face(option_fb_face_serif_bold,
+	fb_face = fb_new_face(nsoption_charp(fb_face_serif_bold),
 			      "serif_bold.ttf",
 			      NETSURF_FB_FONT_SERIF_BOLD);
 	if (fb_face == NULL) {
@@ -269,7 +268,7 @@ bool fb_font_init(void)
 
 
 	/* monospace face */
-	fb_face = fb_new_face(option_fb_face_monospace,
+	fb_face = fb_new_face(nsoption_charp(fb_face_monospace),
 			      "monospace.ttf",
 			      NETSURF_FB_FONT_MONOSPACE);
 	if (fb_face == NULL) {
@@ -280,7 +279,7 @@ bool fb_font_init(void)
 	}
 
 	/* bold monospace face*/
-	fb_face = fb_new_face(option_fb_face_monospace_bold,
+	fb_face = fb_new_face(nsoption_charp(fb_face_monospace_bold),
 			      "monospace_bold.ttf",
 			      NETSURF_FB_FONT_MONOSPACE_BOLD);
 	if (fb_face == NULL) {
@@ -291,7 +290,7 @@ bool fb_font_init(void)
 	}
 
 	/* cursive face */
-	fb_face = fb_new_face(option_fb_face_cursive,
+	fb_face = fb_new_face(nsoption_charp(fb_face_cursive),
 			      "cursive.ttf",
 			      NETSURF_FB_FONT_CURSIVE);
 	if (fb_face == NULL) {
@@ -302,7 +301,7 @@ bool fb_font_init(void)
 	}
 
 	/* fantasy face */
-	fb_face = fb_new_face(option_fb_face_fantasy,
+	fb_face = fb_new_face(nsoption_charp(fb_face_fantasy),
 			      "fantasy.ttf",
 			      NETSURF_FB_FONT_FANTASY);
 	if (fb_face == NULL) {
@@ -314,7 +313,7 @@ bool fb_font_init(void)
 
         
         /* set the default render mode */
-        if (option_fb_font_monochrome == true)
+        if (nsoption_bool(fb_font_monochrome) == true)
                 ft_load_type = FT_LOAD_MONOCHROME; /* faster but less pretty */
         else
                 ft_load_type = 0;
diff --git a/framebuffer/gui.c b/framebuffer/gui.c
index 0cbe1a2e5..4822a9e28 100644
--- a/framebuffer/gui.c
+++ b/framebuffer/gui.c
@@ -53,7 +53,6 @@
 #include "framebuffer/findfile.h"
 #include "framebuffer/image_data.h"
 #include "framebuffer/font.h"
-#include "framebuffer/options.h"
 
 #include "content/urldb.h"
 #include "desktop/history_core.h"
@@ -388,19 +387,21 @@ process_cmdline(int argc, char** argv)
 	fename = "sdl";
 	febpp = 32;
 
-	if ((option_window_width != 0) && (option_window_height != 0)) {
-		fewidth = option_window_width;
-		feheight = option_window_height;
+	if ((nsoption_int(window_width) != 0) && 
+	    (nsoption_int(window_height) != 0)) {
+		fewidth = nsoption_int(window_width);
+		feheight = nsoption_int(window_height);
 	} else {
 		fewidth = 800;
 		feheight = 600;
 	}
 
-	if (option_homepage_url != NULL && option_homepage_url[0] != '\0')
-		feurl = option_homepage_url;
-	else
+	if ((nsoption_charp(homepage_url) != NULL) && 
+	    (nsoption_charp(homepage_url)[0] != '\0')) {
+		feurl = nsoption_charp(homepage_url);
+	} else {
 		feurl = NETSURF_HOMEPAGE;
-
+	}
 
 	while((opt = getopt(argc, argv, "f:b:w:h:")) != -1) {
 		switch (opt) {
@@ -440,19 +441,19 @@ gui_init(int argc, char** argv)
 {
 	nsfb_t *nsfb;
 
-	option_core_select_menu = true;
+	nsoption_set_bool(core_select_menu, true);
 
-	if (option_cookie_file == NULL) {
-		option_cookie_file = strdup("~/.netsurf/Cookies");
-		LOG(("Using '%s' as Cookies file", option_cookie_file));
+	if (nsoption_charp(cookie_file) == NULL) {
+		nsoption_set_charp(cookie_file, strdup("~/.netsurf/Cookies"));
+		LOG(("Using '%s' as Cookies file", nsoption_charp(cookie_file)));
 	}
 
-	if (option_cookie_jar == NULL) {
-		option_cookie_jar = strdup("~/.netsurf/Cookies");
-		LOG(("Using '%s' as Cookie Jar file", option_cookie_jar));
+	if (nsoption_charp(cookie_jar) == NULL) {
+		nsoption_set_charp(cookie_jar, strdup("~/.netsurf/Cookies"));
+		LOG(("Using '%s' as Cookie Jar file", nsoption_charp(cookie_jar)));
 	}
 
-	if (option_cookie_file == NULL || option_cookie_jar == NULL)
+	if (nsoption_charp(cookie_file) == NULL || nsoption_charp(cookie_jar == NULL))
 		die("Failed initialising cookie options");
 
 	if (process_cmdline(argc,argv) != true)
@@ -471,7 +472,7 @@ gui_init(int argc, char** argv)
 
 	fbtk_enable_oskb(fbtk);
 
-	urldb_load_cookies(option_cookie_file);
+	urldb_load_cookies(nsoption_charp(cookie_file));
 }
 
 /** Entry point from OS.
@@ -546,7 +547,7 @@ gui_quit(void)
 {
 	LOG(("gui_quit"));
 
-	urldb_save_cookies(option_cookie_jar);
+	urldb_save_cookies(nsoption_charp(cookie_jar));
 
 	framebuffer_finalise();
 }
@@ -1150,13 +1151,13 @@ create_normal_browser_window(struct gui_window *gw, int furniture_width)
 	fbtk_widget_t *widget;
 	fbtk_widget_t *toolbar;
 	int statusbar_width = 0;
-	int toolbar_height = option_fb_toolbar_size;
+	int toolbar_height = nsoption_int(fb_toolbar_size);
 
 	LOG(("Normal window"));
 
 	gw->window = fbtk_create_window(fbtk, 0, 0, 0, 0, 0);
 
-	statusbar_width = option_toolbar_status_width *
+	statusbar_width = nsoption_int(toolbar_status_width) *
 		fbtk_get_width(gw->window) / 10000;
 
 	/* toolbar */
@@ -1164,7 +1165,7 @@ create_normal_browser_window(struct gui_window *gw, int furniture_width)
 				 toolbar_height, 
 				 2, 
 				 FB_FRAME_COLOUR, 
-				 option_fb_toolbar_layout);
+				 nsoption_charp(fb_toolbar_layout));
 
 	/* set the actually created toolbar height */
 	if (toolbar != NULL) {
@@ -1197,7 +1198,7 @@ create_normal_browser_window(struct gui_window *gw, int furniture_width)
 
 	/* fill bottom right area */
 
-	if (option_fb_osk == true) {
+	if (nsoption_bool(fb_osk) == true) {
 		widget = fbtk_create_text_button(gw->window,
 						 fbtk_get_width(gw->window) - furniture_width,
 						 fbtk_get_height(gw->window) - furniture_width,
@@ -1230,7 +1231,7 @@ create_normal_browser_window(struct gui_window *gw, int furniture_width)
 					  gw);
 
 	/* browser widget */
-	create_browser_widget(gw, toolbar_height, option_fb_furniture_size);
+	create_browser_widget(gw, toolbar_height, nsoption_int(fb_furniture_size));
 
 	/* Give browser_window's user widget input focus */
 	fbtk_set_focus(gw->browser);
@@ -1254,8 +1255,8 @@ gui_create_browser_window(struct browser_window *bw,
 	 */
 	gw->bw = bw;
 
-	create_normal_browser_window(gw, option_fb_furniture_size);
-	gw->localhistory = fb_create_localhistory(bw, fbtk, option_fb_furniture_size);
+	create_normal_browser_window(gw, nsoption_int(fb_furniture_size));
+	gw->localhistory = fb_create_localhistory(bw, fbtk, nsoption_int(fb_furniture_size));
 
 	/* map and request redraw of gui window */
 	fbtk_set_mapping(gw->window, true);
diff --git a/framebuffer/options.h b/framebuffer/options.h
index 0874f11f4..760cc3b51 100644
--- a/framebuffer/options.h
+++ b/framebuffer/options.h
@@ -16,93 +16,90 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef _NETSURF_DESKTOP_OPTIONS_INCLUDING_
+#error "Frontend options header cannot be included directly"
+#endif
+
 #ifndef _NETSURF_FRAMEBUFFER_OPTIONS_H_
 #define _NETSURF_FRAMEBUFFER_OPTIONS_H_
 
-#include "desktop/options.h"
-
-/* surface options */
-
-extern int option_fb_depth;
-extern int option_fb_refresh;
-extern char *option_fb_device;
-extern char *option_fb_input_devpath;
-extern char *option_fb_input_glob;
-
-/* toolkit options */
-
-extern int option_fb_furniture_size; /* toolkit furniture size */
-extern int option_fb_toolbar_size; /* toolbar furniture size */
-extern char *option_fb_toolbar_layout; /* toolbar layout */
-extern bool option_fb_osk; /* enable on screen keyboard */
-
-/* font options */
-
-/* render font monochrome */
-extern bool option_fb_font_monochrome; 
-/** size of font glyph cache in kilobytes. */
-extern int option_fb_font_cachesize; 
-
-extern char *option_fb_face_sans_serif; /* default sans face */
-extern char *option_fb_face_sans_serif_bold; /* bold sans face */
-extern char *option_fb_face_sans_serif_italic; /* bold sans face */
-extern char *option_fb_face_sans_serif_italic_bold; /* bold sans face */
-
-extern char *option_fb_face_serif; /* serif face */
-extern char *option_fb_face_serif_bold; /* bold serif face */
-
-extern char *option_fb_face_monospace; /* monospace face */
-extern char *option_fb_face_monospace_bold; /* bold monospace face */
-
-extern char *option_fb_face_cursive; /* cursive face */
-extern char *option_fb_face_fantasy; /* fantasy face */
-
-
-#define EXTRA_OPTION_DEFINE				\
-	int option_fb_depth = 32;			\
-	int option_fb_refresh = 70;			\
-	char *option_fb_device = 0;			\
-	char *option_fb_input_devpath = 0;		\
-	char *option_fb_input_glob = 0;			\
-	int option_fb_furniture_size = 18;		\
-	int option_fb_toolbar_size = 30;		\
-	char *option_fb_toolbar_layout;			\
-	bool option_fb_osk = false;			\
-	bool option_fb_font_monochrome = false;		\
-	int option_fb_font_cachesize = 2048;		\
-	char *option_fb_face_sans_serif;		\
-	char *option_fb_face_sans_serif_bold;		\
-	char *option_fb_face_sans_serif_italic;		\
-	char *option_fb_face_sans_serif_italic_bold;	\
-	char *option_fb_face_serif;			\
-	char *option_fb_face_serif_bold;		\
-	char *option_fb_face_monospace;			\
-	char *option_fb_face_monospace_bold;		\
-	char *option_fb_face_cursive;			\
-	char *option_fb_face_fantasy;			
-
-#define EXTRA_OPTION_TABLE                                              \
-    { "fb_depth", OPTION_INTEGER, &option_fb_depth },			\
-    { "fb_refresh", OPTION_INTEGER, &option_fb_refresh },		\
-    { "fb_device", OPTION_STRING, &option_fb_device },                  \
-    { "fb_input_devpath", OPTION_STRING, &option_fb_input_devpath },    \
-    { "fb_input_glob", OPTION_STRING, &option_fb_input_glob },          \
-    { "fb_furniture_size", OPTION_INTEGER, &option_fb_furniture_size }, \
-    { "fb_toolbar_size", OPTION_INTEGER, &option_fb_toolbar_size },     \
-    { "fb_toolbar_layout", OPTION_STRING, &option_fb_toolbar_layout },	\
-    { "fb_osk", OPTION_BOOL, &option_fb_osk },				\
-    { "fb_font_monochrome", OPTION_BOOL, &option_fb_font_monochrome },  \
-    { "fb_font_cachesize", OPTION_INTEGER, &option_fb_font_cachesize }, \
-    { "fb_face_sans_serif", OPTION_STRING, &option_fb_face_sans_serif }, \
-    { "fb_face_sans_serif_bold", OPTION_STRING, &option_fb_face_sans_serif_bold }, \
-    { "fb_face_sans_serif_italic", OPTION_STRING, &option_fb_face_sans_serif_italic }, \
-    { "fb_face_sans_serif_italic_bold", OPTION_STRING, &option_fb_face_sans_serif_italic_bold }, \
-    { "fb_face_serif", OPTION_STRING, &option_fb_face_serif },          \
-    { "fb_serif_bold", OPTION_STRING, &option_fb_face_serif_bold },	\
-    { "fb_face_monospace", OPTION_STRING, &option_fb_face_monospace },  \
-    { "fb_face_monospace_bold", OPTION_STRING, &option_fb_face_monospace_bold }, \
-    { "fb_face_cursive", OPTION_STRING, &option_fb_face_cursive },  \
-    { "fb_face_fantasy", OPTION_STRING, &option_fb_face_fantasy }
+#define NSOPTION_EXTRA_DEFINE						\
+	/* surface options */						\
+	int fb_depth;							\
+	int fb_refresh;							\
+	char *fb_device;						\
+	char *fb_input_devpath;						\
+	char *fb_input_glob;						\
+									\
+	/* toolkit options */						\
+	int fb_furniture_size; /**< toolkit furniture size */		\
+	int fb_toolbar_size; /**< toolbar furniture size */		\
+	char *fb_toolbar_layout; /**< toolbar layout */			\
+	bool fb_osk; /**< enable on screen keyboard */			\
+									\
+	/* font options */						\
+	bool fb_font_monochrome; /**< render font monochrome */		\
+	int fb_font_cachesize; /**< size of font glyph cache in kilobytes. */ \
+									\
+	char *fb_face_sans_serif; /**< default sans face */		\
+	char *fb_face_sans_serif_bold; /**< bold sans face */		\
+	char *fb_face_sans_serif_italic; /**< bold sans face */		\
+	char *fb_face_sans_serif_italic_bold; /**< bold sans face */	\
+									\
+	char *fb_face_serif; /**< serif face */				\
+	char *fb_face_serif_bold; /**< bold serif face */		\
+									\
+	char *fb_face_monospace; /**< monospace face */			\
+	char *fb_face_monospace_bold; /**< bold monospace face */	\
+									\
+	char *fb_face_cursive; /**< cursive face */			\
+	char *fb_face_fantasy /**< fantasy face */			
+
+#define NSOPTION_EXTRA_DEFAULTS				\
+	.fb_depth = 32,					\
+	.fb_refresh = 70,				\
+	.fb_device = NULL,				\
+	.fb_input_devpath = NULL,			\
+	.fb_input_glob = NULL,				\
+	.fb_furniture_size = 18,			\
+	.fb_toolbar_size = 30,				\
+	.fb_toolbar_layout = NULL,				\
+	.fb_osk = false,				\
+	.fb_font_monochrome = false,			\
+	.fb_font_cachesize = 2048,			\
+	.fb_face_sans_serif = NULL,			\
+	.fb_face_sans_serif_bold = NULL,		\
+	.fb_face_sans_serif_italic = NULL,		\
+	.fb_face_sans_serif_italic_bold = NULL,		\
+	.fb_face_serif = NULL,				\
+	.fb_face_serif_bold = NULL,			\
+	.fb_face_monospace = NULL,			\
+	.fb_face_monospace_bold = NULL,			\
+	.fb_face_cursive = NULL,			\
+	.fb_face_fantasy = NULL			
+
+#define NSOPTION_EXTRA_TABLE						\
+	{ "fb_depth", OPTION_INTEGER, &nsoptions.fb_depth },		\
+	{ "fb_refresh", OPTION_INTEGER, &nsoptions.fb_refresh },	\
+	{ "fb_device", OPTION_STRING, &nsoptions.fb_device },		\
+	{ "fb_input_devpath", OPTION_STRING, &nsoptions.fb_input_devpath }, \
+	{ "fb_input_glob", OPTION_STRING, &nsoptions.fb_input_glob },	\
+	{ "fb_furniture_size", OPTION_INTEGER, &nsoptions.fb_furniture_size }, \
+	{ "fb_toolbar_size", OPTION_INTEGER, &nsoptions.fb_toolbar_size }, \
+	{ "fb_toolbar_layout", OPTION_STRING, &nsoptions.fb_toolbar_layout }, \
+	{ "fb_osk", OPTION_BOOL, &nsoptions.fb_osk },			\
+	{ "fb_font_monochrome", OPTION_BOOL, &nsoptions.fb_font_monochrome }, \
+	{ "fb_font_cachesize", OPTION_INTEGER, &nsoptions.fb_font_cachesize }, \
+	{ "fb_face_sans_serif", OPTION_STRING, &nsoptions.fb_face_sans_serif }, \
+	{ "fb_face_sans_serif_bold", OPTION_STRING, &nsoptions.fb_face_sans_serif_bold }, \
+	{ "fb_face_sans_serif_italic", OPTION_STRING, &nsoptions.fb_face_sans_serif_italic }, \
+	{ "fb_face_sans_serif_italic_bold", OPTION_STRING, &nsoptions.fb_face_sans_serif_italic_bold }, \
+	{ "fb_face_serif", OPTION_STRING, &nsoptions.fb_face_serif },	\
+	{ "fb_serif_bold", OPTION_STRING, &nsoptions.fb_face_serif_bold }, \
+	{ "fb_face_monospace", OPTION_STRING, &nsoptions.fb_face_monospace }, \
+	{ "fb_face_monospace_bold", OPTION_STRING, &nsoptions.fb_face_monospace_bold }, \
+	{ "fb_face_cursive", OPTION_STRING, &nsoptions.fb_face_cursive }, \
+	{ "fb_face_fantasy", OPTION_STRING, &nsoptions.fb_face_fantasy }
 
 #endif
 
diff --git a/framebuffer/system_colour.c b/framebuffer/system_colour.c
index b58717492..abe1adcd2 100644
--- a/framebuffer/system_colour.c
+++ b/framebuffer/system_colour.c
@@ -34,176 +34,176 @@ struct gui_system_colour_ctx {
 	lwc_string *lwcstr;
 };
 
-static struct gui_system_colour_ctx colour_list[] = { 
-	{ 
-		"ActiveBorder", 
-		SLEN("ActiveBorder"), 
-		0xff000000, 
-		&option_sys_colour_ActiveBorder, 
-		NULL 
-	}, { 
-		"ActiveCaption", 
-		SLEN("ActiveCaption"), 
-		0xffdddddd, 
-		&option_sys_colour_ActiveCaption, 
-		NULL 
-	}, { 
-		"AppWorkspace", 
-		SLEN("AppWorkspace"), 
-		0xffeeeeee, 
-		&option_sys_colour_AppWorkspace, 
-		NULL 
-	}, { 
-		"Background", 
-		SLEN("Background"), 
-		0xff0000aa, 
-		&option_sys_colour_Background, 
-		NULL 
+static struct gui_system_colour_ctx colour_list[] = {
+	{
+		"ActiveBorder",
+		SLEN("ActiveBorder"),
+		0xff000000,
+		&nsoption_colour(sys_colour_ActiveBorder),
+		NULL
 	}, {
-		"ButtonFace", 
-		SLEN("ButtonFace"), 
-		0xffaaaaaa, 
-		&option_sys_colour_ButtonFace, 
-		NULL 
+		"ActiveCaption",
+		SLEN("ActiveCaption"),
+		0xffdddddd,
+		&nsoption_colour(sys_colour_ActiveCaption),
+		NULL
 	}, {
-		"ButtonHighlight", 
-		SLEN("ButtonHighlight"), 
-		0xffdddddd, 
-		&option_sys_colour_ButtonHighlight, 
+		"AppWorkspace",
+		SLEN("AppWorkspace"),
+		0xffeeeeee,
+		&nsoption_colour(sys_colour_AppWorkspace),
 		NULL
 	}, {
-		"ButtonShadow", 
-		SLEN("ButtonShadow"), 
-		0xffbbbbbb, 
-		&option_sys_colour_ButtonShadow, 
-		NULL 
+		"Background",
+		SLEN("Background"),
+		0xff0000aa,
+		&nsoption_colour(sys_colour_Background),
+		NULL
 	}, {
-		"ButtonText", 
-		SLEN("ButtonText"), 
-		0xff000000, 
-		&option_sys_colour_ButtonText, 
-		NULL 
+		"ButtonFace",
+		SLEN("ButtonFace"),
+		0xffaaaaaa,
+		&nsoption_colour(sys_colour_ButtonFace),
+		NULL
 	}, {
-		"CaptionText", 
-		SLEN("CaptionText"), 
-		0xff000000, 
-		&option_sys_colour_CaptionText, 
-		NULL 
+		"ButtonHighlight",
+		SLEN("ButtonHighlight"),
+		0xffdddddd,
+		&nsoption_colour(sys_colour_ButtonHighlight),
+		NULL
 	}, {
-		"GrayText", 
-		SLEN("GrayText"), 
-		0xffcccccc, 
-		&option_sys_colour_GrayText, 
-		NULL 
+		"ButtonShadow",
+		SLEN("ButtonShadow"),
+		0xffbbbbbb,
+		&nsoption_colour(sys_colour_ButtonShadow),
+		NULL
 	}, {
-		"Highlight", 
-		SLEN("Highlight"), 
-		0xff0000ee, 
-		&option_sys_colour_Highlight, 
-		NULL 
+		"ButtonText",
+		SLEN("ButtonText"),
+		0xff000000,
+		&nsoption_colour(sys_colour_ButtonText),
+		NULL
 	}, {
-		"HighlightText", 
-		SLEN("HighlightText"), 
-		0xff000000, 
-		&option_sys_colour_HighlightText, 
-		NULL 
+		"CaptionText",
+		SLEN("CaptionText"),
+		0xff000000,
+		&nsoption_colour(sys_colour_CaptionText),
+		NULL
 	}, {
-		"InactiveBorder", 
-		SLEN("InactiveBorder"), 
-		0xffffffff, 
-		&option_sys_colour_InactiveBorder, 
-		NULL 
+		"GrayText",
+		SLEN("GrayText"),
+		0xffcccccc,
+		&nsoption_colour(sys_colour_GrayText),
+		NULL
 	}, {
-		"InactiveCaption", 
-		SLEN("InactiveCaption"), 
-		0xffffffff, 
-		&option_sys_colour_InactiveCaption, 
-		NULL 
+		"Highlight",
+		SLEN("Highlight"),
+		0xff0000ee,
+		&nsoption_colour(sys_colour_Highlight),
+		NULL
 	}, {
-		"InactiveCaptionText", 
-		SLEN("InactiveCaptionText"), 
-		0xffcccccc, 
-		&option_sys_colour_InactiveCaptionText, 
-		NULL 
+		"HighlightText",
+		SLEN("HighlightText"),
+		0xff000000,
+		&nsoption_colour(sys_colour_HighlightText),
+		NULL
 	}, {
-		"InfoBackground", 
-		SLEN("InfoBackground"), 
-		0xffaaaaaa, 
-		&option_sys_colour_InfoBackground, 
-		NULL 
+		"InactiveBorder",
+		SLEN("InactiveBorder"),
+		0xffffffff,
+		&nsoption_colour(sys_colour_InactiveBorder),
+		NULL
 	}, {
-		"InfoText", 
-		SLEN("InfoText"), 
-		0xff000000, 
-		&option_sys_colour_InfoText, 
-		NULL 
+		"InactiveCaption",
+		SLEN("InactiveCaption"),
+		0xffffffff,
+		&nsoption_colour(sys_colour_InactiveCaption),
+		NULL
 	}, {
-		"Menu", 
-		SLEN("Menu"), 
-		0xffaaaaaa, 
-		&option_sys_colour_Menu, 
-		NULL 
+		"InactiveCaptionText",
+		SLEN("InactiveCaptionText"),
+		0xffcccccc,
+		&nsoption_colour(sys_colour_InactiveCaptionText),
+		NULL
 	}, {
-		"MenuText", 
-		SLEN("MenuText"), 
-		0xff000000, 
-		&option_sys_colour_MenuText, 
-		NULL 
+		"InfoBackground",
+		SLEN("InfoBackground"),
+		0xffaaaaaa,
+		&nsoption_colour(sys_colour_InfoBackground),
+		NULL
 	}, {
-		"Scrollbar", 
-		SLEN("Scrollbar"), 
-		0xffaaaaaa, 
-		&option_sys_colour_Scrollbar, 
-		NULL 
+		"InfoText",
+		SLEN("InfoText"),
+		0xff000000,
+		&nsoption_colour(sys_colour_InfoText),
+		NULL
 	}, {
-		"ThreeDDarkShadow", 
-		SLEN("ThreeDDarkShadow"), 
-		0xff555555, 
-		&option_sys_colour_ThreeDDarkShadow, 
-		NULL 
+		"Menu",
+		SLEN("Menu"),
+		0xffaaaaaa,
+		&nsoption_colour(sys_colour_Menu),
+		NULL
 	}, {
-		"ThreeDFace", 
-		SLEN("ThreeDFace"), 
-		0xffdddddd, 
-		&option_sys_colour_ThreeDFace, 
-		NULL 
+		"MenuText",
+		SLEN("MenuText"),
+		0xff000000,
+		&nsoption_colour(sys_colour_MenuText),
+		NULL
+	}, {
+		"Scrollbar",
+		SLEN("Scrollbar"),
+		0xffaaaaaa,
+		&nsoption_colour(sys_colour_Scrollbar),
+		NULL
+	}, {
+		"ThreeDDarkShadow",
+		SLEN("ThreeDDarkShadow"),
+		0xff555555,
+		&nsoption_colour(sys_colour_ThreeDDarkShadow),
+		NULL
+	}, {
+		"ThreeDFace",
+		SLEN("ThreeDFace"),
+		0xffdddddd,
+		&nsoption_colour(sys_colour_ThreeDFace),
+		NULL
 	}, {
-		"ThreeDHighlight", 
-		SLEN("ThreeDHighlight"), 
-		0xffaaaaaa, 
-		&option_sys_colour_ThreeDHighlight, 
-		NULL 
+		"ThreeDHighlight",
+		SLEN("ThreeDHighlight"),
+		0xffaaaaaa,
+		&nsoption_colour(sys_colour_ThreeDHighlight),
+		NULL
 	}, {
-		"ThreeDLightShadow", 
-		SLEN("ThreeDLightShadow"), 
-		0xff999999, 
-		&option_sys_colour_ThreeDLightShadow, 
-		NULL 
+		"ThreeDLightShadow",
+		SLEN("ThreeDLightShadow"),
+		0xff999999,
+		&nsoption_colour(sys_colour_ThreeDLightShadow),
+		NULL
 	}, {
-		"ThreeDShadow", 
-		SLEN("ThreeDShadow"), 
-		0xff777777, 
-		&option_sys_colour_ThreeDShadow, 
-		NULL 
+		"ThreeDShadow",
+		SLEN("ThreeDShadow"),
+		0xff777777,
+		&nsoption_colour(sys_colour_ThreeDShadow),
+		NULL
 	}, {
-		"Window", 
-		SLEN("Window"), 
-		0xffaaaaaa, 
-		&option_sys_colour_Window, 
-		NULL 
+		"Window",
+		SLEN("Window"),
+		0xffaaaaaa,
+		&nsoption_colour(sys_colour_Window),
+		NULL
 	}, {
-		"WindowFrame", 
-		SLEN("WindowFrame"), 
-		0xff000000, 
-		&option_sys_colour_WindowFrame, 
-		NULL 
+		"WindowFrame",
+		SLEN("WindowFrame"),
+		0xff000000,
+		&nsoption_colour(sys_colour_WindowFrame),
+		NULL
 	}, {
-		
-		"WindowText", 
-		SLEN("WindowText"), 
-		0xff000000, 
-		&option_sys_colour_WindowText, 
-		NULL 
+
+		"WindowText",
+		SLEN("WindowText"),
+		0xff000000,
+		&nsoption_colour(sys_colour_WindowText),
+		NULL
 	},
 
 };
@@ -217,13 +217,13 @@ bool gui_system_colour_init(void)
 {
 	unsigned int ccount;
 
-	if (gui_system_colour_pw != NULL) 
+	if (gui_system_colour_pw != NULL)
 		return false;
 
 	/* Intern colour strings */
 	for (ccount = 0; ccount < colour_list_len; ccount++) {
-		if (lwc_intern_string(colour_list[ccount].name, 
-				      colour_list[ccount].length, 
+		if (lwc_intern_string(colour_list[ccount].name,
+				      colour_list[ccount].length,
 				      &(colour_list[ccount].lwcstr)) != lwc_error_ok) {
 			return false;
 		}
@@ -237,7 +237,7 @@ bool gui_system_colour_init(void)
 	}
 
 	gui_system_colour_pw = colour_list;
-	
+
 	return true;
 }
 
@@ -256,8 +256,8 @@ colour gui_system_colour_char(char *name)
 	unsigned int ccount;
 
 	for (ccount = 0; ccount < colour_list_len; ccount++) {
-		if (strncasecmp(name, 
-				colour_list[ccount].name, 
+		if (strncasecmp(name,
+				colour_list[ccount].name,
 				colour_list[ccount].length) == 0) {
 			ret = colour_list[ccount].colour;
 			break;
@@ -272,13 +272,13 @@ css_error gui_system_colour(void *pw, lwc_string *name, css_color *colour)
 	bool match;
 
 	for (ccount = 0; ccount < colour_list_len; ccount++) {
-		if (lwc_string_caseless_isequal(name, 
+		if (lwc_string_caseless_isequal(name,
 				colour_list[ccount].lwcstr,
 				&match) == lwc_error_ok && match) {
 			*colour = colour_list[ccount].colour;
 			return CSS_OK;
 		}
-	}	
+	}
 
 	return CSS_INVALID;
 }