diff options
Diffstat (limited to 'monkey')
-rw-r--r-- | monkey/main.c | 14 | ||||
-rw-r--r-- | monkey/options.h | 110 | ||||
-rw-r--r-- | monkey/system_colour.c | 56 |
3 files changed, 92 insertions, 88 deletions
diff --git a/monkey/main.c b/monkey/main.c index d1507f6b4..45be754e1 100644 --- a/monkey/main.c +++ b/monkey/main.c @@ -21,7 +21,7 @@ #include <stdlib.h> #include "monkey/filetype.h" -#include "monkey/options.h" +#include "desktop/options.h" #include "monkey/poll.h" #include "monkey/dispatch.h" #include "monkey/browser.h" @@ -57,11 +57,11 @@ nsmonkey_init_resource(const char *resource_path) void gui_quit(void) { - urldb_save_cookies(option_cookie_jar); - urldb_save(option_url_file); + urldb_save_cookies(nsoption_charp(cookie_jar)); + urldb_save(nsoption_charp(url_file)); sslcert_cleanup(); - free(option_cookie_file); - free(option_cookie_jar); + free(nsoption_charp(cookie_file)); + free(nsoption_charp(cookie_jar)); gtk_fetch_filetype_fin(); } @@ -117,8 +117,8 @@ main(int argc, char **argv) filepath_sfinddef(respaths, buf, "mime.types", "/etc/"); gtk_fetch_filetype_init(buf); - urldb_load(option_url_file); - urldb_load_cookies(option_cookie_file); + urldb_load(nsoption_charp(url_file)); + urldb_load_cookies(nsoption_charp(cookie_file)); sslcert_init("content.png"); diff --git a/monkey/options.h b/monkey/options.h index ac14259d8..88fb7e11b 100644 --- a/monkey/options.h +++ b/monkey/options.h @@ -16,62 +16,66 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _NETSURF_GTK_OPTIONS_H_ -#define _NETSURF_GTK_OPTIONS_H_ +#ifndef _NETSURF_DESKTOP_OPTIONS_INCLUDING_ +#error "Frontend options header cannot be included directly" +#endif + +#ifndef _NETSURF_MONKEY_OPTIONS_H_ +#define _NETSURF_MONKEY_OPTIONS_H_ -#include "desktop/options.h" +#define NSOPTION_EXTRA_DEFINE \ + bool render_resample; \ + bool downloads_clear; \ + bool request_overwrite; \ + char *downloads_directory; \ + char *url_file; \ + bool show_single_tab; \ + int button_type; \ + bool disable_popups; \ + bool disable_plugins; \ + int history_age; \ + bool hover_urls; \ + bool focus_new; \ + bool new_blank; \ + char *hotlist_path; \ + bool source_tab; \ + int current_theme -extern bool option_render_resample; -extern bool option_downloads_clear; -extern bool option_request_overwrite; -extern char *option_downloads_directory; -extern char *option_url_file; -extern bool option_show_single_tab; -extern int option_button_type; -extern bool option_disable_popups; -extern bool option_disable_plugins; -extern int option_history_age; -extern bool option_hover_urls; -extern bool option_focus_new; -extern bool option_new_blank; -extern char *option_hotlist_path; -extern bool option_source_tab; -extern int option_current_theme; +#define NSOPTION_EXTRA_DEFAULTS \ + .render_resample = true, \ + .downloads_clear = false, \ + .request_overwrite = true, \ + .downloads_directory = NULL, \ + .url_file = NULL, \ + .show_single_tab = false, \ + .button_type = 0, \ + .disable_popups = false, \ + .disable_plugins = false, \ + .history_age = 0, \ + .hover_urls = false, \ + .focus_new = false, \ + .new_blank = false, \ + .hotlist_path = NULL, \ + .source_tab = false, \ + .current_theme = 0 -#define EXTRA_OPTION_DEFINE \ -bool option_render_resample = true; \ -bool option_downloads_clear = false; \ -bool option_request_overwrite = true; \ -char *option_downloads_directory = 0; \ -char *option_url_file = 0; \ -bool option_show_single_tab = false; \ -int option_button_type = 0; \ -bool option_disable_popups = false; \ -bool option_disable_plugins = false; \ -int option_history_age = 0; \ -bool option_hover_urls = false; \ -bool option_focus_new = false; \ -bool option_new_blank = false; \ -char *option_hotlist_path = NULL; \ -bool option_source_tab = false;\ -int option_current_theme = 0; +#define NSOPTION_EXTRA_TABLE \ +{ "render_resample", OPTION_BOOL, &nsoptions.render_resample }, \ +{ "downloads_clear", OPTION_BOOL, &nsoptions.downloads_clear }, \ +{ "request_overwrite", OPTION_BOOL, &nsoptions.request_overwrite }, \ +{ "downloads_directory",OPTION_STRING, &nsoptions.downloads_directory }, \ +{ "url_file", OPTION_STRING, &nsoptions.url_file }, \ +{ "show_single_tab", OPTION_BOOL, &nsoptions.show_single_tab }, \ +{ "button_type", OPTION_INTEGER, &nsoptions.button_type}, \ +{ "disable_popups", OPTION_BOOL, &nsoptions.disable_popups}, \ +{ "disable_plugins", OPTION_BOOL, &nsoptions.disable_plugins}, \ +{ "history_age", OPTION_INTEGER, &nsoptions.history_age}, \ +{ "hover_urls", OPTION_BOOL, &nsoptions.hover_urls}, \ +{ "focus_new", OPTION_BOOL, &nsoptions.focus_new}, \ +{ "new_blank", OPTION_BOOL, &nsoptions.new_blank}, \ +{ "hotlist_path", OPTION_STRING, &nsoptions.hotlist_path}, \ +{ "source_tab", OPTION_BOOL, &nsoptions.source_tab},\ +{ "current_theme", OPTION_INTEGER, &nsoptions.current_theme} -#define EXTRA_OPTION_TABLE \ -{ "render_resample", OPTION_BOOL, &option_render_resample }, \ -{ "downloads_clear", OPTION_BOOL, &option_downloads_clear }, \ -{ "request_overwrite", OPTION_BOOL, &option_request_overwrite }, \ -{ "downloads_directory",OPTION_STRING, &option_downloads_directory }, \ -{ "url_file", OPTION_STRING, &option_url_file }, \ -{ "show_single_tab", OPTION_BOOL, &option_show_single_tab }, \ -{ "button_type", OPTION_INTEGER, &option_button_type}, \ -{ "disable_popups", OPTION_BOOL, &option_disable_popups}, \ -{ "disable_plugins", OPTION_BOOL, &option_disable_plugins}, \ -{ "history_age", OPTION_INTEGER, &option_history_age}, \ -{ "hover_urls", OPTION_BOOL, &option_hover_urls}, \ -{ "focus_new", OPTION_BOOL, &option_focus_new}, \ -{ "new_blank", OPTION_BOOL, &option_new_blank}, \ -{ "hotlist_path", OPTION_STRING, &option_hotlist_path}, \ -{ "source_tab", OPTION_BOOL, &option_source_tab},\ -{ "current_theme", OPTION_INTEGER, &option_current_theme} #endif diff --git a/monkey/system_colour.c b/monkey/system_colour.c index b58717492..ec40947c0 100644 --- a/monkey/system_colour.c +++ b/monkey/system_colour.c @@ -39,170 +39,170 @@ static struct gui_system_colour_ctx colour_list[] = { "ActiveBorder", SLEN("ActiveBorder"), 0xff000000, - &option_sys_colour_ActiveBorder, + &nsoption_charp(sys_colour_ActiveBorder), NULL }, { "ActiveCaption", SLEN("ActiveCaption"), 0xffdddddd, - &option_sys_colour_ActiveCaption, + &nsoption_charp(sys_colour_ActiveCaption), NULL }, { "AppWorkspace", SLEN("AppWorkspace"), 0xffeeeeee, - &option_sys_colour_AppWorkspace, + &nsoption_charp(sys_colour_AppWorkspace), NULL }, { "Background", SLEN("Background"), 0xff0000aa, - &option_sys_colour_Background, + &nsoption_charp(sys_colour_Background), NULL }, { "ButtonFace", SLEN("ButtonFace"), 0xffaaaaaa, - &option_sys_colour_ButtonFace, + &nsoption_charp(sys_colour_ButtonFace), NULL }, { "ButtonHighlight", SLEN("ButtonHighlight"), 0xffdddddd, - &option_sys_colour_ButtonHighlight, + &nsoption_charp(sys_colour_ButtonHighlight), NULL }, { "ButtonShadow", SLEN("ButtonShadow"), 0xffbbbbbb, - &option_sys_colour_ButtonShadow, + &nsoption_charp(sys_colour_ButtonShadow), NULL }, { "ButtonText", SLEN("ButtonText"), 0xff000000, - &option_sys_colour_ButtonText, + &nsoption_charp(sys_colour_ButtonText), NULL }, { "CaptionText", SLEN("CaptionText"), 0xff000000, - &option_sys_colour_CaptionText, + &nsoption_charp(sys_colour_CaptionText), NULL }, { "GrayText", SLEN("GrayText"), 0xffcccccc, - &option_sys_colour_GrayText, + &nsoption_charp(sys_colour_GrayText), NULL }, { "Highlight", SLEN("Highlight"), 0xff0000ee, - &option_sys_colour_Highlight, + &nsoption_charp(sys_colour_Highlight), NULL }, { "HighlightText", SLEN("HighlightText"), 0xff000000, - &option_sys_colour_HighlightText, + &nsoption_charp(sys_colour_HighlightText), NULL }, { "InactiveBorder", SLEN("InactiveBorder"), 0xffffffff, - &option_sys_colour_InactiveBorder, + &nsoption_charp(sys_colour_InactiveBorder), NULL }, { "InactiveCaption", SLEN("InactiveCaption"), 0xffffffff, - &option_sys_colour_InactiveCaption, + &nsoption_charp(sys_colour_InactiveCaption), NULL }, { "InactiveCaptionText", SLEN("InactiveCaptionText"), 0xffcccccc, - &option_sys_colour_InactiveCaptionText, + &nsoption_charp(sys_colour_InactiveCaptionText), NULL }, { "InfoBackground", SLEN("InfoBackground"), 0xffaaaaaa, - &option_sys_colour_InfoBackground, + &nsoption_charp(sys_colour_InfoBackground), NULL }, { "InfoText", SLEN("InfoText"), 0xff000000, - &option_sys_colour_InfoText, + &nsoption_charp(sys_colour_InfoText), NULL }, { "Menu", SLEN("Menu"), 0xffaaaaaa, - &option_sys_colour_Menu, + &nsoption_charp(sys_colour_Menu), NULL }, { "MenuText", SLEN("MenuText"), 0xff000000, - &option_sys_colour_MenuText, + &nsoption_charp(sys_colour_MenuText), NULL }, { "Scrollbar", SLEN("Scrollbar"), 0xffaaaaaa, - &option_sys_colour_Scrollbar, + &nsoption_charp(sys_colour_Scrollbar), NULL }, { "ThreeDDarkShadow", SLEN("ThreeDDarkShadow"), 0xff555555, - &option_sys_colour_ThreeDDarkShadow, + &nsoption_charp(sys_colour_ThreeDDarkShadow), NULL }, { "ThreeDFace", SLEN("ThreeDFace"), 0xffdddddd, - &option_sys_colour_ThreeDFace, + &nsoption_charp(sys_colour_ThreeDFace), NULL }, { "ThreeDHighlight", SLEN("ThreeDHighlight"), 0xffaaaaaa, - &option_sys_colour_ThreeDHighlight, + &nsoption_charp(sys_colour_ThreeDHighlight), NULL }, { "ThreeDLightShadow", SLEN("ThreeDLightShadow"), 0xff999999, - &option_sys_colour_ThreeDLightShadow, + &nsoption_charp(sys_colour_ThreeDLightShadow), NULL }, { "ThreeDShadow", SLEN("ThreeDShadow"), 0xff777777, - &option_sys_colour_ThreeDShadow, + &nsoption_charp(sys_colour_ThreeDShadow), NULL }, { "Window", SLEN("Window"), 0xffaaaaaa, - &option_sys_colour_Window, + &nsoption_charp(sys_colour_Window), NULL }, { "WindowFrame", SLEN("WindowFrame"), 0xff000000, - &option_sys_colour_WindowFrame, + &nsoption_charp(sys_colour_WindowFrame), NULL }, { "WindowText", SLEN("WindowText"), 0xff000000, - &option_sys_colour_WindowText, + &nsoption_charp(sys_colour_WindowText), NULL }, |