diff options
Diffstat (limited to 'riscos/options.h')
-rw-r--r-- | riscos/options.h | 61 |
1 files changed, 4 insertions, 57 deletions
diff --git a/riscos/options.h b/riscos/options.h index db140b9dd..51d4ec13c 100644 --- a/riscos/options.h +++ b/riscos/options.h @@ -14,6 +14,7 @@ #ifndef _NETSURF_RISCOS_OPTIONS_H_ #define _NETSURF_RISCOS_OPTIONS_H_ +#include "netsurf/css/css.h" #include "netsurf/desktop/options.h" #include "netsurf/riscos/tinct.h" @@ -47,30 +48,14 @@ extern char *option_homepage_url; extern bool option_open_browser_at_startup; extern bool option_no_plugins; extern char *option_font_sans; -extern char *option_font_sans_italic; -extern char *option_font_sans_bold; -extern char *option_font_sans_bold_italic; extern char *option_font_serif; -extern char *option_font_serif_italic; -extern char *option_font_serif_bold; -extern char *option_font_serif_bold_italic; extern char *option_font_mono; -extern char *option_font_mono_italic; -extern char *option_font_mono_bold; -extern char *option_font_mono_bold_italic; extern char *option_font_cursive; -extern char *option_font_cursive_italic; -extern char *option_font_cursive_bold; -extern char *option_font_cursive_bold_italic; extern char *option_font_fantasy; -extern char *option_font_fantasy_italic; -extern char *option_font_fantasy_bold; -extern char *option_font_fantasy_bold_italic; -extern char *option_font_default; +extern int option_font_default; /* a css_font_family */ extern char *option_font_default_italic; extern char *option_font_default_bold; extern char *option_font_default_bold_italic; -extern bool option_font_ufont; extern int option_screen_cache; extern bool option_block_popups; extern bool option_url_suggestion; @@ -106,30 +91,11 @@ char *option_homepage_url = 0; \ bool option_open_browser_at_startup = false; \ bool option_no_plugins = false; \ char *option_font_sans = 0; \ -char *option_font_sans_italic = 0; \ -char *option_font_sans_bold = 0; \ -char *option_font_sans_bold_italic = 0; \ char *option_font_serif = 0; \ -char *option_font_serif_italic = 0; \ -char *option_font_serif_bold = 0; \ -char *option_font_serif_bold_italic = 0; \ char *option_font_mono = 0; \ -char *option_font_mono_italic = 0; \ -char *option_font_mono_bold = 0; \ -char *option_font_mono_bold_italic = 0; \ char *option_font_cursive = 0; \ -char *option_font_cursive_italic = 0; \ -char *option_font_cursive_bold = 0; \ -char *option_font_cursive_bold_italic = 0; \ char *option_font_fantasy = 0; \ -char *option_font_fantasy_italic = 0; \ -char *option_font_fantasy_bold = 0; \ -char *option_font_fantasy_bold_italic = 0; \ -char *option_font_default = 0; \ -char *option_font_default_italic = 0; \ -char *option_font_default_bold = 0; \ -char *option_font_default_bold_italic = 0; \ -bool option_font_ufont = false; \ +int option_font_default = CSS_FONT_FAMILY_SANS_SERIF; \ int option_screen_cache = 0; \ bool option_block_popups = false; \ bool option_url_suggestion = true; @@ -165,30 +131,11 @@ bool option_url_suggestion = true; { "open_browser_at_startup",OPTION_BOOL, &option_open_browser_at_startup }, \ { "no_plugins", OPTION_BOOL, &option_no_plugins }, \ { "font_sans", OPTION_STRING, &option_font_sans }, \ -{ "font_sans_italic", OPTION_STRING, &option_font_sans_italic }, \ -{ "font_sans_bold", OPTION_STRING, &option_font_sans_bold }, \ -{ "font_sans_bold_italic", OPTION_STRING, &option_font_sans_bold_italic }, \ { "font_serif", OPTION_STRING, &option_font_serif }, \ -{ "font_serif_italic", OPTION_STRING, &option_font_serif_italic }, \ -{ "font_serif_bold", OPTION_STRING, &option_font_serif_bold }, \ -{ "font_serif_bold_italic", OPTION_STRING, &option_font_serif_bold_italic }, \ { "font_mono", OPTION_STRING, &option_font_mono }, \ -{ "font_mono_italic", OPTION_STRING, &option_font_mono_italic }, \ -{ "font_mono_bold", OPTION_STRING, &option_font_mono_bold }, \ -{ "font_mono_bold_italic", OPTION_STRING, &option_font_mono_bold_italic }, \ { "font_cursive", OPTION_STRING, &option_font_cursive }, \ -{ "font_cursive_italic", OPTION_STRING, &option_font_cursive_italic }, \ -{ "font_cursive_bold", OPTION_STRING, &option_font_cursive_bold }, \ -{ "font_cursive_bold_italic", OPTION_STRING, &option_font_cursive_bold_italic }, \ { "font_fantasy", OPTION_STRING, &option_font_fantasy }, \ -{ "font_fantasy_italic", OPTION_STRING, &option_font_fantasy_italic }, \ -{ "font_fantasy_bold", OPTION_STRING, &option_font_fantasy_bold }, \ -{ "font_fantasy_bold_italic", OPTION_STRING, &option_font_fantasy_bold_italic }, \ -{ "font_default", OPTION_STRING, &option_font_default }, \ -{ "font_default_italic", OPTION_STRING, &option_font_default_italic }, \ -{ "font_default_bold", OPTION_STRING, &option_font_default_bold }, \ -{ "font_default_bold_italic", OPTION_STRING, &option_font_default_bold_italic }, \ -{ "font_ufont", OPTION_BOOL, &option_font_ufont }, \ +{ "font_default", OPTION_INTEGER, &option_font_default }, \ { "screen_cache", OPTION_INTEGER, &option_screen_cache }, \ { "block_popups", OPTION_BOOL, &option_block_popups }, \ { "url_suggestion", OPTION_BOOL, &option_url_suggestion } |