Author: rjek Date: Tue Aug 29 01:17:35 2006 New Revision: 2900 URL: http://svn.semichrome.net?rev=2900&view=rev Log: Move default window size opens into core for use from nsgtk Modified: trunk/netsurf/desktop/options.c trunk/netsurf/desktop/options.h trunk/netsurf/riscos/options.h Modified: trunk/netsurf/desktop/options.c URL: http://svn.semichrome.net/trunk/netsurf/desktop/options.c?rev=2900&r1... ============================================================================== --- trunk/netsurf/desktop/options.c (original) +++ trunk/netsurf/desktop/options.c Tue Aug 29 01:17:35 2006 @@ -93,6 +93,25 @@ char *option_homepage_url = 0; /** URL completion in url bar */ bool option_url_suggestion = true; +/** default x position of new windows */ +int option_window_x = 0; +/** default y position of new windows */ +int option_window_y = 0; +/** default width of new windows */ +int option_window_width = 0; +/** default height of new windows */ +int option_window_height = 0; +/** width of screen when above options were saved */ +int option_window_screen_width = 0; +/** height of screen when above options were saved */ +int option_window_screen_height = 0; +/** default size of status bar vs. h scroll bar */ +#ifdef nsgtk +int option_toolbar_status_width = 5; +#else +int option_toolbar_status_width = 6667; +#endif + /* Fetcher configuration */ /** Maximum simultaneous active fetchers */ int option_max_fetchers = 24; @@ -142,6 +161,13 @@ { "cookie_jar", OPTION_STRING, &option_cookie_jar }, { "homepage_url", OPTION_STRING, &option_homepage_url }, { "url_suggestion", OPTION_BOOL, &option_url_suggestion }, + { "window_x", OPTION_INTEGER, &option_window_x }, + { "window_y", OPTION_INTEGER, &option_window_y }, + { "window_width", OPTION_INTEGER, &option_window_width }, + { "window_height", OPTION_INTEGER, &option_window_height }, + { "window_screen_width", OPTION_INTEGER, &option_window_screen_width }, + { "window_screen_height", OPTION_INTEGER, &option_window_screen_height }, + { "toolbar_status_size", OPTION_INTEGER, &option_toolbar_status_width }, /* Fetcher options */ { "max_fetchers", OPTION_INTEGER, &option_max_fetchers }, { "max_fetchers_per_host", Modified: trunk/netsurf/desktop/options.h URL: http://svn.semichrome.net/trunk/netsurf/desktop/options.h?rev=2900&r1... ============================================================================== --- trunk/netsurf/desktop/options.h (original) +++ trunk/netsurf/desktop/options.h Tue Aug 29 01:17:35 2006 @@ -58,6 +58,13 @@ extern char *option_cookie_jar; extern char *option_homepage_url; extern bool option_url_suggestion; +extern int option_window_x; +extern int option_window_y; +extern int option_window_width; +extern int option_window_height; +extern int option_window_screen_width; +extern int option_window_screen_height; +extern int option_toolbar_status_width; /* Fetcher configuration. */ extern int option_max_fetchers; Modified: trunk/netsurf/riscos/options.h URL: http://svn.semichrome.net/trunk/netsurf/riscos/options.h?rev=2900&r1=... ============================================================================== --- trunk/netsurf/riscos/options.h (original) +++ trunk/netsurf/riscos/options.h Tue Aug 29 01:17:35 2006 @@ -24,7 +24,6 @@ extern int option_bg_plot_style; /* tinct flagword */ extern bool option_history_tooltip; extern int option_scale; -extern int option_toolbar_status_width; extern bool option_toolbar_show_status; extern bool option_toolbar_show_buttons; extern bool option_toolbar_show_address; @@ -33,12 +32,6 @@ extern char *option_toolbar_hotlist; extern char *option_toolbar_history; extern char *option_toolbar_cookies; -extern int option_window_x; -extern int option_window_y; -extern int option_window_width; -extern int option_window_height; -extern int option_window_screen_width; -extern int option_window_screen_height; extern bool option_window_stagger; extern bool option_window_size_clone; extern bool option_background_images; @@ -70,7 +63,6 @@ int option_bg_plot_style = tinct_DITHER;\ bool option_history_tooltip = true; \ int option_scale = 100; \ -int option_toolbar_status_width = 6667; \ bool option_toolbar_show_status = true; \ bool option_toolbar_show_buttons = true; \ bool option_toolbar_show_address = true; \ @@ -79,12 +71,6 @@ char *option_toolbar_hotlist = 0; \ char *option_toolbar_history = 0; \ char *option_toolbar_cookies = 0; \ -int option_window_x = 0; \ -int option_window_y = 0; \ -int option_window_width = 0; \ -int option_window_height = 0; \ -int option_window_screen_width = 0; \ -int option_window_screen_height = 0; \ bool option_window_stagger = true; \ bool option_window_size_clone = true; \ bool option_background_images = true; \ @@ -125,12 +111,6 @@ { "toolbar_hotlist", OPTION_STRING, &option_toolbar_hotlist }, \ { "toolbar_history", OPTION_STRING, &option_toolbar_history }, \ { "toolbar_cookies", OPTION_STRING, &option_toolbar_cookies }, \ -{ "window_x", OPTION_INTEGER, &option_window_x }, \ -{ "window_y", OPTION_INTEGER, &option_window_y }, \ -{ "window_width", OPTION_INTEGER, &option_window_width }, \ -{ "window_height", OPTION_INTEGER, &option_window_height }, \ -{ "window_screen_width", OPTION_INTEGER, &option_window_screen_width }, \ -{ "window_screen_height", OPTION_INTEGER, &option_window_screen_height }, \ { "window_stagger", OPTION_BOOL, &option_window_stagger }, \ { "window_size_clone", OPTION_BOOL, &option_window_size_clone }, \ { "background_images", OPTION_BOOL, &option_background_images }, \