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 --- riscos/options.h | 167 ++++++++++++++----------------------------------------- 1 file changed, 43 insertions(+), 124 deletions(-) (limited to 'riscos') diff --git a/riscos/options.h b/riscos/options.h index 62bfcf2bb..3aac155f0 100644 --- a/riscos/options.h +++ b/riscos/options.h @@ -1,7 +1,5 @@ /* - * Copyright 2003 Phil Mellor - * Copyright 2004 James Bursa - * Copyright 2004 Richard Wilson + * Copyright 2012 Vincent Sanders * * This file is part of NetSurf, http://www.netsurf-browser.org/ * @@ -22,131 +20,52 @@ * RISC OS specific options. */ -#include "riscos/tinct.h" - -#ifndef _NETSURF_DESKTOP_OPTIONS_INCLUDING_ -#error "Frontend options header cannot be included directly" -#endif - #ifndef _NETSURF_RISCOS_OPTIONS_H_ #define _NETSURF_RISCOS_OPTIONS_H_ -#define NSOPTION_EXTRA_DEFINE \ - bool use_mouse_gestures; \ - bool allow_text_selection; \ - char *theme; \ - char *language; \ - int fg_plot_style; /* tinct flagword */ \ - int bg_plot_style; /* tinct flagword */ \ - bool history_tooltip; \ - bool toolbar_show_buttons; \ - bool toolbar_show_address; \ - bool toolbar_show_throbber; \ - char *toolbar_browser; \ - char *toolbar_hotlist; \ - char *toolbar_history; \ - char *toolbar_cookies; \ - bool window_stagger; \ - bool window_size_clone; \ - bool buffer_animations; \ - bool buffer_everything; \ - bool open_browser_at_startup; \ - bool no_plugins; \ - bool block_popups; \ - int image_memory_direct; /* -1 means auto-detect */ \ - int image_memory_compressed; /* -1 means auto-detect */ \ - bool strip_extensions; \ - bool confirm_overwrite; \ - char *url_path; \ - char *url_save; \ - char *hotlist_path; \ - char *hotlist_save; \ - char *recent_path; \ - char *recent_save; \ - char *theme_path; \ - char *theme_save; \ - bool thumbnail_iconise; \ - bool interactive_help; \ - bool external_hotlists; \ - char *external_hotlist_app - +#include "riscos/tinct.h" -#define NSOPTION_EXTRA_DEFAULTS \ - .use_mouse_gestures = false, \ - .allow_text_selection = true, \ - .theme = NULL, \ - .language = NULL, \ - .fg_plot_style = tinct_ERROR_DIFFUSE, \ - .bg_plot_style = tinct_DITHER, \ - .history_tooltip = true, \ - .toolbar_show_buttons = true, \ - .toolbar_show_address = true, \ - .toolbar_show_throbber = true, \ - .toolbar_browser = NULL, \ - .toolbar_hotlist = NULL, \ - .toolbar_history = NULL, \ - .toolbar_cookies = NULL, \ - .window_stagger = true, \ - .window_size_clone = true, \ - .buffer_animations = true, \ - .buffer_everything = true, \ - .open_browser_at_startup = false, \ - .no_plugins = false, \ - .block_popups = false, \ - .image_memory_direct = -1, \ - .image_memory_compressed = -1, \ - .strip_extensions = true, \ - .confirm_overwrite = true, \ - .url_path = NULL, \ - .url_save = NULL, \ - .hotlist_path = NULL, \ - .hotlist_save = NULL, \ - .recent_path = NULL, \ - .recent_save = NULL, \ - .theme_path = NULL, \ - .theme_save = NULL, \ - .thumbnail_iconise = true, \ - .interactive_help = true, \ - .external_hotlists = false, \ - .external_hotlist_app = NULL +/* setup longer default reflow time */ +#define DEFAULT_REFLOW_PERIOD 100 /* time in cs */ -#define NSOPTION_EXTRA_TABLE \ -{ "use_mouse_gestures", OPTION_BOOL, &nsoptions.use_mouse_gestures },\ -{ "allow_text_selection", OPTION_BOOL, &nsoptions.allow_text_selection },\ -{ "theme", OPTION_STRING, &nsoptions.theme },\ -{ "language", OPTION_STRING, &nsoptions.language },\ -{ "plot_fg_quality", OPTION_INTEGER, &nsoptions.fg_plot_style },\ -{ "plot_bg_quality", OPTION_INTEGER, &nsoptions.bg_plot_style },\ -{ "history_tooltip", OPTION_BOOL, &nsoptions.history_tooltip }, \ -{ "toolbar_show_buttons", OPTION_BOOL, &nsoptions.toolbar_show_buttons }, \ -{ "toolbar_show_address", OPTION_BOOL, &nsoptions.toolbar_show_address }, \ -{ "toolbar_show_throbber", OPTION_BOOL, &nsoptions.toolbar_show_throbber }, \ -{ "toolbar_browser", OPTION_STRING, &nsoptions.toolbar_browser }, \ -{ "toolbar_hotlist", OPTION_STRING, &nsoptions.toolbar_hotlist }, \ -{ "toolbar_history", OPTION_STRING, &nsoptions.toolbar_history }, \ -{ "toolbar_cookies", OPTION_STRING, &nsoptions.toolbar_cookies }, \ -{ "window_stagger", OPTION_BOOL, &nsoptions.window_stagger }, \ -{ "window_size_clone", OPTION_BOOL, &nsoptions.window_size_clone }, \ -{ "buffer_animations", OPTION_BOOL, &nsoptions.buffer_animations }, \ -{ "buffer_everything", OPTION_BOOL, &nsoptions.buffer_everything }, \ -{ "open_browser_at_startup",OPTION_BOOL, &nsoptions.open_browser_at_startup }, \ -{ "no_plugins", OPTION_BOOL, &nsoptions.no_plugins }, \ -{ "block_popups", OPTION_BOOL, &nsoptions.block_popups }, \ -{ "image_memory_direct", OPTION_INTEGER, &nsoptions.image_memory_direct }, \ -{ "image_memory_compressed",OPTION_INTEGER, &nsoptions.image_memory_compressed }, \ -{ "strip_extensions", OPTION_BOOL, &nsoptions.strip_extensions }, \ -{ "confirm_overwrite", OPTION_BOOL, &nsoptions.confirm_overwrite }, \ -{ "url_path", OPTION_STRING, &nsoptions.url_path }, \ -{ "url_save", OPTION_STRING, &nsoptions.url_save }, \ -{ "hotlist_path", OPTION_STRING, &nsoptions.hotlist_path }, \ -{ "hotlist_save", OPTION_STRING, &nsoptions.hotlist_save }, \ -{ "recent_path", OPTION_STRING, &nsoptions.recent_path }, \ -{ "recent_save", OPTION_STRING, &nsoptions.recent_save }, \ -{ "theme_path", OPTION_STRING, &nsoptions.theme_path }, \ -{ "theme_save", OPTION_STRING, &nsoptions.theme_save }, \ -{ "thumbnail_iconise", OPTION_BOOL, &nsoptions.thumbnail_iconise }, \ -{ "interactive_help", OPTION_BOOL, &nsoptions.interactive_help }, \ -{ "external_hotlists", OPTION_BOOL, &nsoptions.external_hotlists }, \ -{ "external_hotlist_app", OPTION_STRING, &nsoptions.external_hotlist_app } +#define CHOICES_PREFIX ".WWW.NetSurf." #endif + +NSOPTION_BOOL(use_mouse_gestures, false) +NSOPTION_BOOL(allow_text_selection, false) +NSOPTION_STRING(theme, "Aletheia") +NSOPTION_STRING(language, NULL) +NSOPTION_INTEGER(plot_fg_quality, tinct_ERROR_DIFFUSE) +NSOPTION_INTEGER(plot_bg_quality, tinct_DITHER) +NSOPTION_BOOL(history_tooltip, true) +NSOPTION_BOOL(toolbar_show_buttons, true) +NSOPTION_BOOL(toolbar_show_address, true) +NSOPTION_BOOL(toolbar_show_throbber, true) +NSOPTION_STRING(toolbar_browser, "0123|58|9") +NSOPTION_STRING(toolbar_hotlist, "40|12|3") +NSOPTION_STRING(toolbar_history, "0|12|3") +NSOPTION_STRING(toolbar_cookies, "0|12") +NSOPTION_BOOL(window_stagger, true) +NSOPTION_BOOL(window_size_clone, true) +NSOPTION_BOOL(buffer_animations, true) +NSOPTION_BOOL(buffer_everything, true) +NSOPTION_BOOL(open_browser_at_startup, false) +NSOPTION_BOOL(no_plugins, false) +NSOPTION_BOOL(block_popups, false) +NSOPTION_INTEGER(image_memory_direct, -1) +NSOPTION_INTEGER(image_memory_compressed, -1) +NSOPTION_BOOL(strip_extensions, true) +NSOPTION_BOOL(confirm_overwrite, true) +NSOPTION_STRING(url_path, "NetSurf:URL") +NSOPTION_STRING(url_save, CHOICES_PREFIX "URL") +NSOPTION_STRING(hotlist_path, "NetSurf:Hotlist") +NSOPTION_STRING(hotlist_save, CHOICES_PREFIX "Hotlist") +NSOPTION_STRING(recent_path, "NetSurf:Recent") +NSOPTION_STRING(recent_save, CHOICES_PREFIX "Recent") +NSOPTION_STRING(theme_path, "NetSurf:Themes") +NSOPTION_STRING(theme_save, CHOICES_PREFIX "Themes") +NSOPTION_BOOL(thumbnail_iconise, true) +NSOPTION_BOOL(interactive_help, true) +NSOPTION_BOOL(external_hotlists, false) +NSOPTION_STRING(external_hotlist_app, NULL) -- cgit v1.2.3