diff options
author | Vincent Sanders <vince@kyllikki.org> | 2014-10-13 00:56:09 +0100 |
---|---|---|
committer | Vincent Sanders <vince@kyllikki.org> | 2014-10-13 00:56:09 +0100 |
commit | d0655bafc26d30f0e792202ff452907a5ff193d1 (patch) | |
tree | 39734553e7f59a6b710b561991ab3570ae41afee /riscos/gui.c | |
parent | 34fdedba787550a0ae12b573ad5acc1ecb3702e2 (diff) | |
download | netsurf-d0655bafc26d30f0e792202ff452907a5ff193d1.tar.gz netsurf-d0655bafc26d30f0e792202ff452907a5ff193d1.tar.bz2 |
remove use of deprecated netsurf_quit variable in riscos
The core no longer needs to run the event polling loop as fetches are now
scheduler driven. This is part of a series which will ultimately remove
netsurf_poll callback altogether.
Diffstat (limited to 'riscos/gui.c')
-rw-r--r-- | riscos/gui.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/riscos/gui.c b/riscos/gui.c index 2e337e5a2..944696fda 100644 --- a/riscos/gui.c +++ b/riscos/gui.c @@ -85,6 +85,8 @@ #include "riscos/content-handlers/draw.h" #include "riscos/content-handlers/sprite.h" +bool riscos_done = false; + extern bool ro_plot_patterned_lines; int os_version = 0; @@ -1777,7 +1779,7 @@ static void ro_gui_user_message(wimp_event_no event, wimp_message *message) ro_gui_hotlist_add_cleanup(); break; case message_QUIT: - netsurf_quit = true; + riscos_done = true; break; } } @@ -1854,7 +1856,7 @@ static void ro_gui_handle_event(wimp_event_no event, wimp_block *block) /** * Poll the RISC OS wimp for events. */ -static void riscos_poll(bool active) +static void riscos_poll(void) { wimp_event_no event; wimp_block block; @@ -2401,7 +2403,6 @@ static struct gui_fetch_table riscos_fetch_table = { }; static struct gui_browser_table riscos_browser_table = { - .poll = riscos_poll, .schedule = riscos_schedule, .quit = gui_quit, @@ -2524,7 +2525,9 @@ int main(int argc, char** argv) warn_user(messages_get_errorcode(ret), 0); } - netsurf_main_loop(); + while (!riscos_done) { + riscos_poll(); + } netsurf_exit(); |