move gtk frontend to use new options API

5 files changed, 48 insertions, 310 deletions

diff --git a/gtk/Makefile.target b/gtk/Makefile.target
index 16b9325a7..ae67fd7f4 100644
--- a/gtk/Makefile.target
+++ b/gtk/Makefile.target
@@ -111,7 +111,7 @@ S_GTK := font_pango.c bitmap.c gui.c schedule.c thumbnail.c plotters.c	\
 	treeview.c scaffolding.c gdk.c completion.c login.c throbber.c	\
 	selection.c history.c window.c filetype.c download.c menu.c	\
 	print.c search.c tabs.c theme.c toolbar.c gettext.c		\
-	compat.c cookies.c hotlist.c system_colour.c			\
+	compat.c cookies.c hotlist.c 					\
 	$(addprefix dialogs/,preferences.c about.c source.c)
 
 S_GTK := $(addprefix gtk/,$(S_GTK)) $(addprefix utils/,container.c)
diff --git a/gtk/dialogs/preferences.c b/gtk/dialogs/preferences.c
index ca4ac2ef7..f17f1ccb0 100644
--- a/gtk/dialogs/preferences.c
+++ b/gtk/dialogs/preferences.c
@@ -999,7 +999,7 @@ G_MODULE_EXPORT void
 nsgtk_preferences_dialogPreferences_response(GtkDialog *dlg, gint resid)
 {
 	if (resid == GTK_RESPONSE_CLOSE) {
-		nsoption_write(options_file_location);
+		nsoption_write(options_file_location, NULL, NULL);
 		gtk_widget_hide(GTK_WIDGET(dlg));
 	}
 }
@@ -1008,7 +1008,7 @@ G_MODULE_EXPORT gboolean
 nsgtk_preferences_dialogPreferences_deleteevent(GtkDialog *dlg,
 						struct ppref *priv)
 {
-	nsoption_write(options_file_location);
+	nsoption_write(options_file_location, NULL, NULL);
 	gtk_widget_hide(GTK_WIDGET(dlg));
 
 	/* delt with it by hiding window, no need to destory widget by
@@ -1019,7 +1019,7 @@ nsgtk_preferences_dialogPreferences_deleteevent(GtkDialog *dlg,
 G_MODULE_EXPORT void
 nsgtk_preferences_dialogPreferences_destroy(GtkDialog *dlg, struct ppref *priv)
 {
-	nsoption_write(options_file_location);
+	nsoption_write(options_file_location, NULL, NULL);
 }
 
 
diff --git a/gtk/gui.c b/gtk/gui.c
index 657770db6..ac743c5d0 100644
--- a/gtk/gui.c
+++ b/gtk/gui.c
@@ -241,8 +241,13 @@ nsgtk_init_glade(char **respath)
 	widWarning = GTK_WIDGET(gtk_builder_get_object(gladeWarning, "labelWarning"));
 }
 
-/* Documented in utils/nsoption.h */
-void gui_options_init_defaults(void)
+/**
+ * Set option defaults for gtk frontend
+ *
+ * @param defaults The option table to update.
+ * @return error status.
+ */
+static nserror set_defaults(struct nsoption_s *defaults)
 {
 	char *hdir = getenv("HOME");
 	char buf[PATH_MAX];
@@ -252,8 +257,10 @@ void gui_options_init_defaults(void)
 	nsoption_setnull_charp(cookie_file, strdup(buf));
 	nsoption_setnull_charp(cookie_jar, strdup(buf));
 	if (nsoption_charp(cookie_file) == NULL ||
-			nsoption_charp(cookie_jar) == NULL)
-		die("Failed initialising cookie options");
+	    nsoption_charp(cookie_jar) == NULL) {
+		LOG(("Failed initialising cookie options"));
+		return NSERROR_BAD_PARAMETER;
+	}
 
 	if (nsoption_charp(downloads_directory) == NULL) {
 		snprintf(buf, PATH_MAX, "%s/", hdir);
@@ -276,8 +283,18 @@ void gui_options_init_defaults(void)
 			nsoption_charp(ca_path) == NULL ||
 			nsoption_charp(downloads_directory) == NULL ||
 			nsoption_charp(hotlist_path) == NULL) {
-		die("Failed initialising string options");
+		LOG(("Failed initialising string options"));
+		return NSERROR_BAD_PARAMETER;
 	}
+
+	/* set default font names */
+	nsoption_set_charp(font_sans, strdup("Sans"));
+	nsoption_set_charp(font_serif, strdup("Serif"));
+	nsoption_set_charp(font_mono, strdup("Monospace"));
+	nsoption_set_charp(font_cursive, strdup("Serif"));
+	nsoption_set_charp(font_fantasy, strdup("Serif"));
+
+	return NSERROR_OK;
 }
 
 static void check_options(char **respath)
@@ -308,15 +325,6 @@ static void check_options(char **respath)
 	LOG(("Using '%s' as Print Settings file", buf));
 	print_options_file_location = strdup(buf);
 
-	/* check what the font settings are, setting them to a default font
-	 * if they're not set - stops Pango whinging
-	 */
-#define SETFONTDEFAULT(OPTION,y) if (nsoption_charp(OPTION) == NULL) nsoption_set_charp(OPTION, strdup((y)))
-	SETFONTDEFAULT(font_sans, "Sans");
-	SETFONTDEFAULT(font_serif, "Serif");
-	SETFONTDEFAULT(font_mono, "Monospace");
-	SETFONTDEFAULT(font_cursive, "Serif");
-	SETFONTDEFAULT(font_fantasy, "Serif");
 
 }
 
@@ -355,9 +363,6 @@ static void gui_init(int argc, char** argv, char **respath)
 	nsurl *url;
 	nserror error;
 
-	/* check user options */
-	check_options(respath);
-
 	/* find the languages file */	
 	languages_file_location = filepath_find(respath, "languages");
 	if ((languages_file_location == NULL) || 
@@ -532,6 +537,7 @@ int main(int argc, char** argv)
 {
 	char *messages;
 	char *options;
+	nserror ret;
 
 	/* check home directory is available */
 	nsgtk_check_homedir();
@@ -540,25 +546,39 @@ int main(int argc, char** argv)
 
 	gtk_init(&argc, &argv);
 	
-	options = filepath_find(respaths, "Choices");
-	messages = filepath_find(respaths, "Messages");
-
 	/* initialise logging. Not fatal if it fails but not much we
 	 * can do about it either.
 	 */
 	nslog_init(nslog_stream_configure, &argc, argv);
 
-	netsurf_init(&argc, &argv, options, messages);
+	/* user options setup */
+	ret = nsoption_init(set_defaults, &nsoptions, &nsoptions_default);
+	if (ret != NSERROR_OK) {
+		die("Options failed to initialise");
+	}
+	options = filepath_find(respaths, "Choices");
+	nsoption_read(options, NULL);
+	free(options);
+	nsoption_commandline(&argc, argv, NULL);
+	check_options(respaths); /* check user options */
 
+	/* common initialisation */
+	messages = filepath_find(respaths, "Messages");
+	ret = netsurf_init(messages);
 	free(messages);
-	free(options);
+	if (ret != NSERROR_OK) {
+		die("NetSurf failed to initialise");
+	}
 
+	/* run the browser */
 	gui_init(argc, argv, respaths);
 
 	/* Ensure all scaffoldings are destroyed before we go into exit */
-	while (scaf_list != NULL)
+	while (scaf_list != NULL) {
 		nsgtk_scaffolding_destroy(scaf_list);
+	}
 	
+	/* common finalisation */
 	netsurf_exit();
 
 	return 0;
diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c
index cf5bbed85..566197dcd 100644
--- a/gtk/scaffolding.c
+++ b/gtk/scaffolding.c
@@ -1297,7 +1297,7 @@ MULTIHANDLER(savewindowsize)
 	nsoption_set_int(window_x, x);
 	nsoption_set_int(window_y, y);
 
-	nsoption_write(options_file_location);
+	nsoption_write(options_file_location, NULL, NULL);
 
 	return TRUE;
 }
diff --git a/gtk/system_colour.c b/gtk/system_colour.c
deleted file mode 100644
index c136e50a0..000000000
--- a/gtk/system_colour.c
+++ /dev/null
@@ -1,282 +0,0 @@
-/*
- * Copyright 2011 Vincent Sanders <vince@netsurf-browser.org>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * NetSurf is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/** \file
- * System colour handling
- *
- */
-
-#include "utils/utils.h"
-#include "utils/log.h"
-#include "desktop/gui.h"
-#include "utils/nsoption.h"
-
-struct gui_system_colour_ctx {
-	const char *name;
-	int length;
-	css_color colour;
-	colour *option_colour;
-	lwc_string *lwcstr;
-};
-
-static struct gui_system_colour_ctx colour_list[] = { 
-	{ 
-		"ActiveBorder", 
-		SLEN("ActiveBorder"), 
-		0xff000000, 
-		&nsoption_charp(sys_colour_ActiveBorder), 
-		NULL 
-	}, { 
-		"ActiveCaption", 
-		SLEN("ActiveCaption"), 
-		0xffdddddd, 
-		&nsoption_charp(sys_colour_ActiveCaption), 
-		NULL 
-	}, { 
-		"AppWorkspace", 
-		SLEN("AppWorkspace"), 
-		0xffeeeeee, 
-		&nsoption_charp(sys_colour_AppWorkspace), 
-		NULL 
-	}, { 
-		"Background", 
-		SLEN("Background"), 
-		0xff0000aa, 
-		&nsoption_charp(sys_colour_Background), 
-		NULL 
-	}, {
-		"ButtonFace", 
-		SLEN("ButtonFace"), 
-		0xffaaaaaa, 
-		&nsoption_charp(sys_colour_ButtonFace), 
-		NULL 
-	}, {
-		"ButtonHighlight", 
-		SLEN("ButtonHighlight"), 
-		0xffdddddd, 
-		&nsoption_charp(sys_colour_ButtonHighlight), 
-		NULL
-	}, {
-		"ButtonShadow", 
-		SLEN("ButtonShadow"), 
-		0xffbbbbbb, 
-		&nsoption_charp(sys_colour_ButtonShadow), 
-		NULL 
-	}, {
-		"ButtonText", 
-		SLEN("ButtonText"), 
-		0xff000000, 
-		&nsoption_charp(sys_colour_ButtonText), 
-		NULL 
-	}, {
-		"CaptionText", 
-		SLEN("CaptionText"), 
-		0xff000000, 
-		&nsoption_charp(sys_colour_CaptionText), 
-		NULL 
-	}, {
-		"GrayText", 
-		SLEN("GrayText"), 
-		0xffcccccc, 
-		&nsoption_charp(sys_colour_GrayText), 
-		NULL 
-	}, {
-		"Highlight", 
-		SLEN("Highlight"), 
-		0xff0000ee, 
-		&nsoption_charp(sys_colour_Highlight), 
-		NULL 
-	}, {
-		"HighlightText", 
-		SLEN("HighlightText"), 
-		0xff000000, 
-		&nsoption_charp(sys_colour_HighlightText), 
-		NULL 
-	}, {
-		"InactiveBorder", 
-		SLEN("InactiveBorder"), 
-		0xffffffff, 
-		&nsoption_charp(sys_colour_InactiveBorder), 
-		NULL 
-	}, {
-		"InactiveCaption", 
-		SLEN("InactiveCaption"), 
-		0xffffffff, 
-		&nsoption_charp(sys_colour_InactiveCaption), 
-		NULL 
-	}, {
-		"InactiveCaptionText", 
-		SLEN("InactiveCaptionText"), 
-		0xffcccccc, 
-		&nsoption_charp(sys_colour_InactiveCaptionText), 
-		NULL 
-	}, {
-		"InfoBackground", 
-		SLEN("InfoBackground"), 
-		0xffaaaaaa, 
-		&nsoption_charp(sys_colour_InfoBackground), 
-		NULL 
-	}, {
-		"InfoText", 
-		SLEN("InfoText"), 
-		0xff000000, 
-		&nsoption_charp(sys_colour_InfoText), 
-		NULL 
-	}, {
-		"Menu", 
-		SLEN("Menu"), 
-		0xffaaaaaa, 
-		&nsoption_charp(sys_colour_Menu), 
-		NULL 
-	}, {
-		"MenuText", 
-		SLEN("MenuText"), 
-		0xff000000, 
-		&nsoption_charp(sys_colour_MenuText), 
-		NULL 
-	}, {
-		"Scrollbar", 
-		SLEN("Scrollbar"), 
-		0xffaaaaaa, 
-		&nsoption_charp(sys_colour_Scrollbar), 
-		NULL 
-	}, {
-		"ThreeDDarkShadow", 
-		SLEN("ThreeDDarkShadow"), 
-		0xff555555, 
-		&nsoption_charp(sys_colour_ThreeDDarkShadow), 
-		NULL 
-	}, {
-		"ThreeDFace", 
-		SLEN("ThreeDFace"), 
-		0xffdddddd, 
-		&nsoption_charp(sys_colour_ThreeDFace), 
-		NULL 
-	}, {
-		"ThreeDHighlight", 
-		SLEN("ThreeDHighlight"), 
-		0xffaaaaaa, 
-		&nsoption_charp(sys_colour_ThreeDHighlight), 
-		NULL 
-	}, {
-		"ThreeDLightShadow", 
-		SLEN("ThreeDLightShadow"), 
-		0xff999999, 
-		&nsoption_charp(sys_colour_ThreeDLightShadow), 
-		NULL 
-	}, {
-		"ThreeDShadow", 
-		SLEN("ThreeDShadow"), 
-		0xff777777, 
-		&nsoption_charp(sys_colour_ThreeDShadow), 
-		NULL 
-	}, {
-		"Window", 
-		SLEN("Window"), 
-		0xffaaaaaa, 
-		&nsoption_charp(sys_colour_Window), 
-		NULL 
-	}, {
-		"WindowFrame", 
-		SLEN("WindowFrame"), 
-		0xff000000, 
-		&nsoption_charp(sys_colour_WindowFrame), 
-		NULL 
-	}, {
-		
-		"WindowText", 
-		SLEN("WindowText"), 
-		0xff000000, 
-		&nsoption_charp(sys_colour_WindowText), 
-		NULL 
-	},
-
-};
-
-#define colour_list_len (sizeof(colour_list) / sizeof(struct gui_system_colour_ctx))
-
-static struct gui_system_colour_ctx *gui_system_colour_pw = NULL;
-
-
-bool gui_system_colour_init(void)
-{
-	unsigned int ccount;
-
-	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, 
-				      &(colour_list[ccount].lwcstr)) != lwc_error_ok) {
-			return false;
-		}
-	}
-
-	/* pull in options if set (ie not transparent) */
-	for (ccount = 0; ccount < colour_list_len; ccount++) {
-		if (*(colour_list[ccount].option_colour) != 0) {
-			colour_list[ccount].colour = *(colour_list[ccount].option_colour);
-		}
-	}
-
-	gui_system_colour_pw = colour_list;
-	
-	return true;
-}
-
-void gui_system_colour_finalize(void)
-{
-	unsigned int ccount;
-
-	for (ccount = 0; ccount < colour_list_len; ccount++) {
-		lwc_string_unref(colour_list[ccount].lwcstr);
-	}
-}
-
-colour gui_system_colour_char(const char *name)
-{
-	colour ret = 0xff00000;
-	unsigned int ccount;
-
-	for (ccount = 0; ccount < colour_list_len; ccount++) {
-		if (strcmp(name, colour_list[ccount].name) == 0) {
-			ret = colour_list[ccount].colour;
-			break;
-		}
-	}
-	return ret;
-}
-
-css_error gui_system_colour(void *pw, lwc_string *name, css_color *colour)
-{
-	unsigned int ccount;
-	bool match;
-
-	for (ccount = 0; ccount < colour_list_len; ccount++) {
-		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;
-}