diff options
author | Vincent Sanders <vince@netsurf-browser.org> | 2010-03-29 16:59:30 +0000 |
---|---|---|
committer | Vincent Sanders <vince@netsurf-browser.org> | 2010-03-29 16:59:30 +0000 |
commit | 7e6752726790043bc14c1843690cf9c7d32a6bc6 (patch) | |
tree | b8d51521208881c8c68c4ec7541eb1c966bda020 | |
parent | 99dee5e3d090a8cd03d1f786fe903b699aa2ac09 (diff) | |
download | netsurf-7e6752726790043bc14c1843690cf9c7d32a6bc6.tar.gz netsurf-7e6752726790043bc14c1843690cf9c7d32a6bc6.tar.bz2 |
first part of initialisation refactor move gui_init2 into frontends
svn path=/trunk/netsurf/; revision=10202
-rwxr-xr-x | amiga/gui.c | 30 | ||||
-rw-r--r-- | beos/beos_gui.cpp | 40 | ||||
-rw-r--r-- | desktop/gui.h | 1 | ||||
-rw-r--r-- | desktop/netsurf.c | 1 | ||||
-rw-r--r-- | framebuffer/gui.c | 41 | ||||
-rw-r--r-- | gtk/gtk_gui.c | 41 | ||||
-rw-r--r-- | riscos/gui.c | 33 | ||||
-rw-r--r-- | windows/gui.c | 4 |
8 files changed, 104 insertions, 87 deletions
diff --git a/amiga/gui.c b/amiga/gui.c index 52484930e..d45436828 100755 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -400,18 +400,6 @@ void ami_amiupdate(void) /* end Amiupdate */ } -/** Normal entry point from OS */ -int main(int argc, char** argv) -{ - setbuf(stderr, NULL); - - netsurf_init(argc, argv); - netsurf_main_loop(); - netsurf_exit(); - - return 0; -} - void gui_init(int argc, char** argv) { BPTR lock = 0; @@ -546,7 +534,7 @@ void ami_openscreenfirst(void) if(!browserglob.bm) ami_init_layers(&browserglob, 0, 0); } -void gui_init2(int argc, char** argv) +static void gui_init2(int argc, char** argv) { struct browser_window *bw = NULL; long rarray[] = {0,0}; @@ -693,6 +681,22 @@ void gui_init2(int argc, char** argv) bw = browser_window_create(option_homepage_url, 0, 0, true,false); } +/** Normal entry point from OS */ +int main(int argc, char** argv) +{ + setbuf(stderr, NULL); + + netsurf_init(argc, argv); + + gui_init2(argc, argv); + + netsurf_main_loop(); + + netsurf_exit(); + + return 0; +} + int ami_key_to_nskey(ULONG keycode, struct InputEvent *ie) { int nskey = 0, chars; diff --git a/beos/beos_gui.cpp b/beos/beos_gui.cpp index 90db0ff94..d506cdfe6 100644 --- a/beos/beos_gui.cpp +++ b/beos/beos_gui.cpp @@ -420,6 +420,25 @@ static int32 bapp_thread(void *arg) return 0; } +static void gui_init2(int argc, char** argv) +{ + CALLED(); + const char *addr = NETSURF_HOMEPAGE; + + if (option_homepage_url != NULL && option_homepage_url[0] != '\0') + addr = option_homepage_url; + + if (argc > 1) addr = argv[1]; + if (gFirstRefsReceived) addr = NULL; + browser_window_create(addr, 0, 0, true, false); + if (gFirstRefsReceived) { + // resend the refs we got before having a window to send them to + be_app_messenger.SendMessage(gFirstRefsReceived); + delete gFirstRefsReceived; + gFirstRefsReceived = NULL; + } +} + /** Normal entry point from OS */ int main(int argc, char** argv) { @@ -428,6 +447,8 @@ int main(int argc, char** argv) /* initialise netsurf */ netsurf_init(argc, argv); + gui_init2(argc, argv); + netsurf_main_loop(); netsurf_exit(); @@ -435,6 +456,7 @@ int main(int argc, char** argv) return 0; } + void gui_init(int argc, char** argv) { char buf[PATH_MAX]; @@ -632,24 +654,6 @@ void gui_init(int argc, char** argv) } -void gui_init2(int argc, char** argv) -{ - CALLED(); - const char *addr = NETSURF_HOMEPAGE; - - if (option_homepage_url != NULL && option_homepage_url[0] != '\0') - addr = option_homepage_url; - - if (argc > 1) addr = argv[1]; - if (gFirstRefsReceived) addr = NULL; - browser_window_create(addr, 0, 0, true, false); - if (gFirstRefsReceived) { - // resend the refs we got before having a window to send them to - be_app_messenger.SendMessage(gFirstRefsReceived); - delete gFirstRefsReceived; - gFirstRefsReceived = NULL; - } -} void nsbeos_pipe_message(BMessage *message, BView *_this, struct gui_window *gui) diff --git a/desktop/gui.h b/desktop/gui.h index 162632a1a..4c3ffaf63 100644 --- a/desktop/gui.h +++ b/desktop/gui.h @@ -62,7 +62,6 @@ typedef enum { GUI_POINTER_DEFAULT, GUI_POINTER_POINT, GUI_POINTER_CARET, void gui_stdout(void); void gui_init(int argc, char** argv); -void gui_init2(int argc, char** argv); void gui_multitask(void); void gui_poll(bool active); void gui_quit(void); diff --git a/desktop/netsurf.c b/desktop/netsurf.c index 6b3b860ea..ba9a45fae 100644 --- a/desktop/netsurf.c +++ b/desktop/netsurf.c @@ -107,7 +107,6 @@ void netsurf_init(int argc, char** argv) fetch_init(); /** \todo The frontend needs to provide the llcache_query_handler */ llcache_initialise(NULL, NULL); - gui_init2(argc, argv); } diff --git a/framebuffer/gui.c b/framebuffer/gui.c index d0f0490fb..fcce00a71 100644 --- a/framebuffer/gui.c +++ b/framebuffer/gui.c @@ -390,24 +390,6 @@ static bool process_cmdline(int argc, char** argv) return true; } -/** Entry point from OS. - * - * /param argc The number of arguments in the string vector. - * /param argv The argument string vector. - * /return The return code to the OS - */ -int main(int argc, char** argv) -{ - setbuf(stderr, NULL); - - netsurf_init(argc, argv); - - netsurf_main_loop(); - - netsurf_exit(); - - return 0; -} void gui_init(int argc, char** argv) { @@ -456,7 +438,7 @@ void gui_init(int argc, char** argv) } -void gui_init2(int argc, char** argv) +static void gui_init2(int argc, char** argv) { struct browser_window *bw; @@ -464,6 +446,27 @@ void gui_init2(int argc, char** argv) bw = browser_window_create(feurl, 0, 0, true, false); } +/** Entry point from OS. + * + * /param argc The number of arguments in the string vector. + * /param argv The argument string vector. + * /return The return code to the OS + */ +int main(int argc, char** argv) +{ + setbuf(stderr, NULL); + + netsurf_init(argc, argv); + + gui_init2(argc, argv); + + netsurf_main_loop(); + + netsurf_exit(); + + return 0; +} + void gui_multitask(void) { diff --git a/gtk/gtk_gui.c b/gtk/gtk_gui.c index faa38a960..00d668a4f 100644 --- a/gtk/gtk_gui.c +++ b/gtk/gtk_gui.c @@ -114,24 +114,6 @@ static void nsgtk_PDF_no_pass(GtkButton *w, gpointer data); #define THROBBER_FRAMES 9 -/** - * Main entry point from OS. - */ -int main(int argc, char** argv) -{ - gtk_init(&argc, &argv); - - setbuf(stderr, NULL); - - /* initialise netsurf */ - netsurf_init(argc, argv); - - netsurf_main_loop(); - - netsurf_exit(); - - return 0; -} /** @@ -321,7 +303,7 @@ void nsgtk_init_glade(void) * * Opens the main browser window. */ -void gui_init2(int argc, char** argv) +static void gui_init2(int argc, char** argv) { struct browser_window *bw; const char *addr = NETSURF_HOMEPAGE; @@ -335,6 +317,27 @@ void gui_init2(int argc, char** argv) bw = browser_window_create(addr, 0, 0, true, false); } +/** + * Main entry point from OS. + */ +int main(int argc, char** argv) +{ + gtk_init(&argc, &argv); + + setbuf(stderr, NULL); + + /* initialise netsurf */ + netsurf_init(argc, argv); + + gui_init2(argc, argv); + + netsurf_main_loop(); + + netsurf_exit(); + + return 0; +} + void gui_poll(bool active) { diff --git a/riscos/gui.c b/riscos/gui.c index d2b964146..3f60d5777 100644 --- a/riscos/gui.c +++ b/riscos/gui.c @@ -275,20 +275,6 @@ static void *myrealloc(void *ptr, size_t len, void *pw) return realloc(ptr, len); } -/** Normal entry point from OS */ -int main(int argc, char** argv) -{ - setbuf(stderr, NULL); - - /* initialise netsurf */ - netsurf_init(argc, argv); - - netsurf_main_loop(); - - netsurf_exit(); - - return 0; -} /** * Initialise the gui (RISC OS specific part). @@ -698,7 +684,7 @@ void ro_gui_check_resolvers(void) * Last-minute gui init, after all other modules have initialised. */ -void gui_init2(int argc, char** argv) +static void gui_init2(int argc, char** argv) { char *url = 0; bool open_window = option_open_browser_at_startup; @@ -771,6 +757,23 @@ void gui_init2(int argc, char** argv) free(url); } +/** Normal entry point from OS */ +int main(int argc, char** argv) +{ + setbuf(stderr, NULL); + + /* initialise netsurf */ + netsurf_init(argc, argv); + + gui_init2(argc, argv); + + netsurf_main_loop(); + + netsurf_exit(); + + return 0; +} + /** * Close down the gui (RISC OS). diff --git a/windows/gui.c b/windows/gui.c index fa0954b20..5072d5c6d 100644 --- a/windows/gui.c +++ b/windows/gui.c @@ -2413,7 +2413,7 @@ void gui_init(int argc, char** argv) } -void gui_init2(int argc, char** argv) +static void gui_init2(int argc, char** argv) { struct browser_window *bw; const char *addr = NETSURF_HOMEPAGE; @@ -2481,6 +2481,8 @@ WinMain(HINSTANCE hInstance, HINSTANCE hLastInstance, LPSTR lpcli, int ncmd) /* initialise netsurf */ netsurf_init(argc, argv); + gui_init2(argc, argv); + netsurf_main_loop(); netsurf_exit(); |