From a5355ec55721b6d874168d979338044c4a12dc52 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Mon, 27 May 2013 09:36:26 +0100 Subject: change all core and frontend options headers to new format --- framebuffer/options.h | 122 +++++++++++++++++--------------------------------- 1 file changed, 41 insertions(+), 81 deletions(-) (limited to 'framebuffer') diff --git a/framebuffer/options.h b/framebuffer/options.h index 760cc3b51..5cb5bfb1a 100644 --- a/framebuffer/options.h +++ b/framebuffer/options.h @@ -1,5 +1,5 @@ /* - * Copyright 2008, 2010 Daniel Silverstone + * Copyright 2012 Vincent Sanders * * This file is part of NetSurf, http://www.netsurf-browser.org/ * @@ -16,92 +16,52 @@ * along with this program. If not, see . */ -#ifndef _NETSURF_DESKTOP_OPTIONS_INCLUDING_ -#error "Frontend options header cannot be included directly" -#endif - #ifndef _NETSURF_FRAMEBUFFER_OPTIONS_H_ #define _NETSURF_FRAMEBUFFER_OPTIONS_H_ -#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 */ +/* currently nothing here */ -#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 +#endif -#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 } +/***** surface options *****/ -#endif +NSOPTION_INTEGER(fb_depth, 32) +NSOPTION_INTEGER(fb_refresh, 70) +NSOPTION_STRING(fb_device, NULL) +NSOPTION_STRING(fb_input_devpath, NULL) +NSOPTION_STRING(fb_input_glob, NULL) + +/***** toolkit options *****/ + +/** toolkit furniture size */ +NSOPTION_INTEGER(fb_furniture_size, 18) +/** toolbar furniture size */ +NSOPTION_INTEGER(fb_toolbar_size, 30) +/** toolbar layout */ +NSOPTION_STRING(fb_toolbar_layout, NULL) +/** enable on screen keyboard */ +NSOPTION_BOOL(fb_osk, false) + +/***** font options *****/ + +/** render all fonts monochrome */ +NSOPTION_BOOL(fb_font_monochrome, false) +/** size of font glyph cache in kilobytes. */ +NSOPTION_INTEGER(fb_font_cachesize, 2048) + +/* Font face paths. These are treated as absolute paths if they start + * with a / otherwise the compile time resource path is searched. + */ +NSOPTION_STRING(fb_face_sans_serif, NULL) +NSOPTION_STRING(fb_face_sans_serif_bold, NULL) +NSOPTION_STRING(fb_face_sans_serif_italic, NULL) +NSOPTION_STRING(fb_face_sans_serif_italic_bold, NULL) +NSOPTION_STRING(fb_face_serif, NULL) +NSOPTION_STRING(fb_serif_bold, NULL) +NSOPTION_STRING(fb_face_monospace, NULL) +NSOPTION_STRING(fb_face_monospace_bold, NULL) +NSOPTION_STRING(fb_face_cursive, NULL) +NSOPTION_STRING(fb_face_fantasy, NULL) /* * Local Variables: -- cgit v1.2.3