From 1490b52a6b96b6a69a0c4fe9e0515dc717425128 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Thu, 22 Mar 2012 09:34:34 +0000 Subject: NetSurf options rework (a=vince r=daniels,jmb) svn path=/trunk/netsurf/; revision=13548 --- cocoa/BrowserViewController.m | 6 ++-- cocoa/BrowserWindowController.m | 2 +- cocoa/NetSurfAppDelegate.m | 2 +- cocoa/NetsurfApp.m | 24 ++++++---------- cocoa/PreferencesWindowController.m | 5 ++-- cocoa/gui.m | 2 +- cocoa/system_colour.m | 56 ++++++++++++++++++------------------- 7 files changed, 44 insertions(+), 53 deletions(-) (limited to 'cocoa') diff --git a/cocoa/BrowserViewController.m b/cocoa/BrowserViewController.m index b188dccf0..3ae0210c3 100644 --- a/cocoa/BrowserViewController.m +++ b/cocoa/BrowserViewController.m @@ -87,7 +87,7 @@ - (IBAction) zoomOriginal: (id) sender; { - browser_window_set_scale( browser, (float)option_scale / 100.0, true ); + browser_window_set_scale( browser, (float)nsoption_int(scale) / 100.0, true ); } - (IBAction) backForwardSelected: (id) sender; @@ -114,7 +114,7 @@ - (IBAction) goHome: (id) sender; { - browser_window_go( browser, option_homepage_url, NULL, true ); + browser_window_go( browser, nsoption_charp(homepage_url), NULL, true ); } - (IBAction) reloadPage: (id) sender; @@ -218,7 +218,7 @@ static inline bool compare_float( float a, float b ) } if (action == @selector( zoomOriginal: )) { - return !compare_float( browser->scale, (float)option_scale / 100.0 ); + return !compare_float( browser->scale, (float)nsoption_int(scale) / 100.0 ); } if (action == @selector( goBack: )) { diff --git a/cocoa/BrowserWindowController.m b/cocoa/BrowserWindowController.m index 343bd42e6..b709ec613 100644 --- a/cocoa/BrowserWindowController.m +++ b/cocoa/BrowserWindowController.m @@ -150,7 +150,7 @@ - (IBAction) newTab: (id) sender; { - browser_window_create( option_homepage_url, [activeBrowser browser], NULL, false, true ); + browser_window_create( nsoption_charp(homepage_url), [activeBrowser browser], NULL, false, true ); } - (IBAction) closeCurrentTab: (id) sender; diff --git a/cocoa/NetSurfAppDelegate.m b/cocoa/NetSurfAppDelegate.m index 80f29618e..651df1259 100644 --- a/cocoa/NetSurfAppDelegate.m +++ b/cocoa/NetSurfAppDelegate.m @@ -39,7 +39,7 @@ - (void) newDocument: (id) sender; { - browser_window_create( option_homepage_url, NULL, NULL, true, false ); + browser_window_create( nsoption_charp(homepage_url), NULL, NULL, true, false ); } - (void) openDocument: (id) sender; diff --git a/cocoa/NetsurfApp.m b/cocoa/NetsurfApp.m index 2194b966c..e7ba6f036 100644 --- a/cocoa/NetsurfApp.m +++ b/cocoa/NetsurfApp.m @@ -62,27 +62,21 @@ nil]]; - if (NULL == option_cookie_file) { - option_cookie_file = strdup( [[defaults objectForKey: kCookiesFileOption] UTF8String] ); - } - - if (NULL == option_cookie_jar) { - option_cookie_jar = strdup( option_cookie_file ); - } - - if (NULL == option_homepage_url) { - option_homepage_url = strdup( [[defaults objectForKey: kHomepageURLOption] UTF8String] ); - } + nsoption_setnull(cookie_file, strdup( [[defaults objectForKey: kCookiesFileOption] UTF8String] )); + + nsoption_setnull(cookie_jar, strdup( nsoption_charp(cookie_file) )); + + nsoption_setnull(homepage_url, strdup( [[defaults objectForKey: kHomepageURLOption] UTF8String] )); urldb_load( [[defaults objectForKey: kURLsFileOption] UTF8String] ); - urldb_load_cookies( option_cookie_file ); + urldb_load_cookies( nsoption_charp(cookie_file) ); cocoa_update_scale_factor(); } - (void) saveOptions; { - urldb_save_cookies( option_cookie_file ); + urldb_save_cookies( nsoption_charp(cookie_file) ); urldb_save( [[[NSUserDefaults standardUserDefaults] objectForKey: kURLsFileOption] UTF8String] ); } @@ -178,9 +172,7 @@ int main( int argc, char **argv ) const char * const options = cocoa_get_options_file(); const char * const ca_bundle = [[[NSBundle mainBundle] pathForResource: @"ca-bundle" ofType: @""] UTF8String]; - if (ca_bundle != NULL) { - option_ca_bundle = strdup(ca_bundle); - } + nsoption_setnull(ca_bundle, strdup(ca_bundle)); netsurf_init(&argc, &argv, options, messages); diff --git a/cocoa/PreferencesWindowController.m b/cocoa/PreferencesWindowController.m index adba8cf75..7038647f9 100644 --- a/cocoa/PreferencesWindowController.m +++ b/cocoa/PreferencesWindowController.m @@ -44,15 +44,14 @@ - (void) setHomepageURL: (NSString *) newUrl; { - free( option_homepage_url ); - option_homepage_url = strdup( [newUrl UTF8String] ); + nsoption_set_charp(homepage_url, strdup( [newUrl UTF8String] )); [[NSUserDefaults standardUserDefaults] setObject: newUrl forKey: kHomepageURLOption]; [[NSUserDefaults standardUserDefaults] synchronize]; } - (NSString *) homepageURL; { - return [NSString stringWithUTF8String: option_homepage_url]; + return [NSString stringWithUTF8String: nsoption_charp(homepage_url)]; } @end diff --git a/cocoa/gui.m b/cocoa/gui.m index 911bc93c3..5d4bb0124 100644 --- a/cocoa/gui.m +++ b/cocoa/gui.m @@ -84,7 +84,7 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw, bw->scale = clone->scale; window = [(BrowserViewController *)(clone->window) windowController]; } else { - bw->scale = (float) option_scale / 100; + bw->scale = (float) nsoption_int(scale) / 100; } BrowserViewController *result = [[BrowserViewController alloc] initWithBrowser: bw]; diff --git a/cocoa/system_colour.m b/cocoa/system_colour.m index 975fea2f5..5477dbfbe 100644 --- a/cocoa/system_colour.m +++ b/cocoa/system_colour.m @@ -39,170 +39,170 @@ static struct gui_system_colour_ctx colour_list[] = { "ActiveBorder", SLEN("ActiveBorder"), 0xff000000, - &option_sys_colour_ActiveBorder, + &nsoption_colour(sys_colour_ActiveBorder), NULL }, { "ActiveCaption", SLEN("ActiveCaption"), 0xffdddddd, - &option_sys_colour_ActiveCaption, + &nsoption_colour(sys_colour_ActiveCaption), NULL }, { "AppWorkspace", SLEN("AppWorkspace"), 0xffeeeeee, - &option_sys_colour_AppWorkspace, + &nsoption_colour(sys_colour_AppWorkspace), NULL }, { "Background", SLEN("Background"), 0xff0000aa, - &option_sys_colour_Background, + &nsoption_colour(sys_colour_Background), NULL }, { "ButtonFace", SLEN("ButtonFace"), 0xffaaaaaa, - &option_sys_colour_ButtonFace, + &nsoption_colour(sys_colour_ButtonFace), NULL }, { "ButtonHighlight", SLEN("ButtonHighlight"), 0xffdddddd, - &option_sys_colour_ButtonHighlight, + &nsoption_colour(sys_colour_ButtonHighlight), NULL }, { "ButtonShadow", SLEN("ButtonShadow"), 0xffbbbbbb, - &option_sys_colour_ButtonShadow, + &nsoption_colour(sys_colour_ButtonShadow), NULL }, { "ButtonText", SLEN("ButtonText"), 0xff000000, - &option_sys_colour_ButtonText, + &nsoption_colour(sys_colour_ButtonText), NULL }, { "CaptionText", SLEN("CaptionText"), 0xff000000, - &option_sys_colour_CaptionText, + &nsoption_colour(sys_colour_CaptionText), NULL }, { "GrayText", SLEN("GrayText"), 0xffcccccc, - &option_sys_colour_GrayText, + &nsoption_colour(sys_colour_GrayText), NULL }, { "Highlight", SLEN("Highlight"), 0xff0000ee, - &option_sys_colour_Highlight, + &nsoption_colour(sys_colour_Highlight), NULL }, { "HighlightText", SLEN("HighlightText"), 0xff000000, - &option_sys_colour_HighlightText, + &nsoption_colour(sys_colour_HighlightText), NULL }, { "InactiveBorder", SLEN("InactiveBorder"), 0xffffffff, - &option_sys_colour_InactiveBorder, + &nsoption_colour(sys_colour_InactiveBorder), NULL }, { "InactiveCaption", SLEN("InactiveCaption"), 0xffffffff, - &option_sys_colour_InactiveCaption, + &nsoption_colour(sys_colour_InactiveCaption), NULL }, { "InactiveCaptionText", SLEN("InactiveCaptionText"), 0xffcccccc, - &option_sys_colour_InactiveCaptionText, + &nsoption_colour(sys_colour_InactiveCaptionText), NULL }, { "InfoBackground", SLEN("InfoBackground"), 0xffaaaaaa, - &option_sys_colour_InfoBackground, + &nsoption_colour(sys_colour_InfoBackground), NULL }, { "InfoText", SLEN("InfoText"), 0xff000000, - &option_sys_colour_InfoText, + &nsoption_colour(sys_colour_InfoText), NULL }, { "Menu", SLEN("Menu"), 0xffaaaaaa, - &option_sys_colour_Menu, + &nsoption_colour(sys_colour_Menu), NULL }, { "MenuText", SLEN("MenuText"), 0xff000000, - &option_sys_colour_MenuText, + &nsoption_colour(sys_colour_MenuText), NULL }, { "Scrollbar", SLEN("Scrollbar"), 0xffaaaaaa, - &option_sys_colour_Scrollbar, + &nsoption_colour(sys_colour_Scrollbar), NULL }, { "ThreeDDarkShadow", SLEN("ThreeDDarkShadow"), 0xff555555, - &option_sys_colour_ThreeDDarkShadow, + &nsoption_colour(sys_colour_ThreeDDarkShadow), NULL }, { "ThreeDFace", SLEN("ThreeDFace"), 0xffdddddd, - &option_sys_colour_ThreeDFace, + &nsoption_colour(sys_colour_ThreeDFace), NULL }, { "ThreeDHighlight", SLEN("ThreeDHighlight"), 0xffaaaaaa, - &option_sys_colour_ThreeDHighlight, + &nsoption_colour(sys_colour_ThreeDHighlight), NULL }, { "ThreeDLightShadow", SLEN("ThreeDLightShadow"), 0xff999999, - &option_sys_colour_ThreeDLightShadow, + &nsoption_colour(sys_colour_ThreeDLightShadow), NULL }, { "ThreeDShadow", SLEN("ThreeDShadow"), 0xff777777, - &option_sys_colour_ThreeDShadow, + &nsoption_colour(sys_colour_ThreeDShadow), NULL }, { "Window", SLEN("Window"), 0xffaaaaaa, - &option_sys_colour_Window, + &nsoption_colour(sys_colour_Window), NULL }, { "WindowFrame", SLEN("WindowFrame"), 0xff000000, - &option_sys_colour_WindowFrame, + &nsoption_colour(sys_colour_WindowFrame), NULL }, { "WindowText", SLEN("WindowText"), 0xff000000, - &option_sys_colour_WindowText, + &nsoption_colour(sys_colour_WindowText), NULL }, -- cgit v1.2.3