change all core and frontend options headers to new format

1 files changed, 23 insertions, 67 deletions

diff --git a/atari/options.h b/atari/options.h
index f9bb3b4c5..7a4da6a15 100755
--- a/atari/options.h
+++ b/atari/options.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 Ole Loots <ole@monochrom.net>
+ * Copyright 2012 Vincent Sanders <vince@netsurf-browser.org>
  *
  * This file is part of NetSurf, http://www.netsurf-browser.org/
  *
@@ -16,76 +16,32 @@
  * 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 NS_ATARI_OPTIONS_H_
 #define NS_ATARI_OPTIONS_H_
 
+/* setup longer default reflow time */
+#define DEFAULT_REFLOW_PERIOD 350 /* time in cs */
 
-#define NSOPTION_EXTRA_DEFINE										\
-	char *atari_font_driver;										\
-	int atari_font_monochrom;										\
-	int atari_dither;												\
-	int atari_transparency;											\
-	char *atari_face_sans_serif; /* default sans face */			\
-	char *atari_face_sans_serif_bold; /* bold sans face */			\
-	char *atari_face_sans_serif_italic; /* bold sans face */		\
-	char *atari_face_sans_serif_italic_bold; /* bold sans face */	\
-	char *atari_face_monospace; /* monospace face */				\
-	char *atari_face_monospace_bold; /* monospace face */			\
-	char *atari_face_serif; /* serif face */						\
-	char *atari_face_serif_bold; /* bold serif face */				\
-	char *atari_face_cursive;										\
-	char *atari_face_fantasy;										\
-	char *atari_editor;												\
-	char *downloads_path;											\
-	char *url_file;													\
-	char *hotlist_file;												\
-	char *tree_icons_path
-
-#define NSOPTION_EXTRA_DEFAULTS						\
-	.atari_font_driver = (char*)"freetype",			\
-	.atari_font_monochrom = 0,						\
-	.atari_dither = 1,								\
-	.atari_transparency = 1,						\
-	.atari_face_sans_serif = NULL,					\
-	.atari_face_sans_serif_bold = NULL,				\
-	.atari_face_sans_serif_italic = NULL,			\
-	.atari_face_sans_serif_italic_bold = NULL,		\
-	.atari_face_monospace = NULL,					\
-	.atari_face_monospace_bold = NULL,				\
-	.atari_face_serif = NULL,						\
-	.atari_face_serif_bold = NULL,					\
-	.atari_face_cursive = NULL,						\
-	.atari_face_fantasy = NULL,						\
-	.atari_editor = (char*)"",						\
-	.downloads_path = (char*)"downloads",			\
-	.url_file = (char*)"url.db",					\
-	.hotlist_file = (char*)"hotlist",				\
-	.tree_icons_path = (char*)"./res/icons"
+#endif
 
-#define NSOPTION_EXTRA_TABLE \
-	{ "atari_font_driver", OPTION_STRING, &nsoptions.atari_font_driver },\
-	{ "atari_font_monochrom", OPTION_INTEGER, &nsoptions.atari_font_monochrom },\
-	{ "atari_transparency", OPTION_INTEGER, &nsoptions.atari_transparency },\
-	{ "atari_dither", OPTION_INTEGER, &nsoptions.atari_dither },\
-	{ "atari_editor", OPTION_STRING, &nsoptions.atari_editor },\
-	{ "font_face_sans_serif", OPTION_STRING, &nsoptions.atari_face_sans_serif },\
-	{ "font_face_sans_serif_bold", OPTION_STRING, &nsoptions.atari_face_sans_serif_bold },\
-	{ "font_face_sans_serif_italic", OPTION_STRING, &nsoptions.atari_face_sans_serif_italic },\
-	{ "font_face_sans_serif_italic_bold", OPTION_STRING, &nsoptions.atari_face_sans_serif_italic_bold },\
-	{ "font_face_monospace", OPTION_STRING, &nsoptions.atari_face_monospace },\
-	{ "font_face_monospace_bold", OPTION_STRING, &nsoptions.atari_face_monospace_bold },\
-	{ "font_face_serif", OPTION_STRING, &nsoptions.atari_face_serif },\
-	{ "font_face_serif_bold", OPTION_STRING, &nsoptions.atari_face_serif_bold },\
-	{ "font_face_cursive", OPTION_STRING, &nsoptions.atari_face_cursive },\
-	{ "font_face_fantasy", OPTION_STRING, &nsoptions.atari_face_fantasy },\
-	{ "downloads_path", OPTION_STRING, &nsoptions.downloads_path },\
-	{ "url_file", OPTION_STRING, &nsoptions.url_file },\
-	{ "hotlist_file", OPTION_STRING, &nsoptions.hotlist_file },\
-	{ "tree_icons_path", OPTION_STRING, &nsoptions.tree_icons_path }
+NSOPTION_STRING(atari_font_driver, "freetype")
+NSOPTION_INTEGER(atari_font_monochrom, 0)
+NSOPTION_INTEGER(atari_transparency, 1)
+NSOPTION_INTEGER(atari_dither, 1)
+NSOPTION_STRING(atari_editor, NULL)
+NSOPTION_STRING(font_face_sans_serif, NULL)
+NSOPTION_STRING(font_face_sans_serif_bold, NULL)
+NSOPTION_STRING(font_face_sans_serif_italic, NULL)
+NSOPTION_STRING(font_face_sans_serif_italic_bold, NULL)
+NSOPTION_STRING(font_face_monospace, NULL)
+NSOPTION_STRING(font_face_monospace_bold, NULL)
+NSOPTION_STRING(font_face_serif, NULL)
+NSOPTION_STRING(font_face_serif_bold, NULL)
+NSOPTION_STRING(font_face_cursive, NULL)
+NSOPTION_STRING(font_face_fantasy, NULL)
+NSOPTION_STRING(downloads_path, "downloads")
+NSOPTION_STRING(url_file, "url.db")
+NSOPTION_STRING(hotlist_file, "hotlist")
+NSOPTION_STRING(tree_icons_path, "./res/icons")
 
-#endif