diff options
| -rw-r--r-- | desktop/options.c | 15 | ||||
| -rw-r--r-- | desktop/options.h | 5 | ||||
| -rw-r--r-- | riscos/options.h | 16 |
3 files changed, 20 insertions, 16 deletions
diff --git a/desktop/options.c b/desktop/options.c index 71c6f1b91..448bb78f7 100644 --- a/desktop/options.c +++ b/desktop/options.c @@ -52,6 +52,16 @@ char *option_http_proxy_auth_pass = 0; int option_font_size = 100; /** Minimum font size. */ int option_font_min_size = 70; +/** Default sans serif font */ +char *option_font_sans; +/** Default serif font */ +char *option_font_serif; +/** Default monospace font */ +char *option_font_mono; +/** Default cursive font */ +char *option_font_cursive; +/** Default fantasy font */ +char *option_font_fantasy; /** Accept-Language header. */ char *option_accept_language = 0; /** Preferred maximum size of memory cache / bytes. */ @@ -107,6 +117,11 @@ struct { { "http_proxy_auth_pass", OPTION_STRING, &option_http_proxy_auth_pass }, { "font_size", OPTION_INTEGER, &option_font_size }, { "font_min_size", OPTION_INTEGER, &option_font_min_size }, + { "font_sans", OPTION_STRING, &option_font_sans }, + { "font_serif", OPTION_STRING, &option_font_serif }, + { "font_mono", OPTION_STRING, &option_font_mono }, + { "font_cursive", OPTION_STRING, &option_font_cursive }, + { "font_fantasy", OPTION_STRING, &option_font_fantasy }, { "accept_language", OPTION_STRING, &option_accept_language }, { "memory_cache_size", OPTION_INTEGER, &option_memory_cache_size }, { "disc_cache_age", OPTION_INTEGER, &option_disc_cache_age }, diff --git a/desktop/options.h b/desktop/options.h index e924892cc..35e1d62a9 100644 --- a/desktop/options.h +++ b/desktop/options.h @@ -46,6 +46,11 @@ extern bool option_send_referer; extern bool option_animate_images; extern int option_expire_url; extern int option_font_default; /* a css_font_family */ +extern char *option_font_sans; +extern char *option_font_serif; +extern char *option_font_mono; +extern char *option_font_cursive; +extern char *option_font_fantasy; extern char *option_ca_bundle; extern char *option_cookie_file; extern char *option_cookie_jar; diff --git a/riscos/options.h b/riscos/options.h index 4d0e6d322..de7d5e0e9 100644 --- a/riscos/options.h +++ b/riscos/options.h @@ -46,11 +46,6 @@ extern bool option_buffer_animations; extern bool option_buffer_everything; extern bool option_open_browser_at_startup; extern bool option_no_plugins; -extern char *option_font_sans; -extern char *option_font_serif; -extern char *option_font_mono; -extern char *option_font_cursive; -extern char *option_font_fantasy; extern bool option_block_popups; extern bool option_url_suggestion; extern int option_image_memory_direct; /* -1 means auto-detect */ @@ -94,14 +89,8 @@ bool option_window_size_clone = true; \ bool option_background_images = true; \ bool option_buffer_animations = true; \ bool option_buffer_everything = false; \ -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_serif = 0; \ -char *option_font_mono = 0; \ -char *option_font_cursive = 0; \ -char *option_font_fantasy = 0; \ bool option_block_popups = false; \ bool option_url_suggestion = true; \ int option_image_memory_direct = -1; \ @@ -147,11 +136,6 @@ char *option_theme_save = 0; { "buffer_everything", OPTION_BOOL, &option_buffer_everything }, \ { "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_serif", OPTION_STRING, &option_font_serif }, \ -{ "font_mono", OPTION_STRING, &option_font_mono }, \ -{ "font_cursive", OPTION_STRING, &option_font_cursive }, \ -{ "font_fantasy", OPTION_STRING, &option_font_fantasy }, \ { "block_popups", OPTION_BOOL, &option_block_popups }, \ { "url_suggestion", OPTION_BOOL, &option_url_suggestion }, \ { "image_memory_direct", OPTION_INTEGER, &option_image_memory_direct }, \ |