mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2025-02-08 10:34:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

remove use of deprecated netsurf_quit variable

Browse Source 
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.

The Amiga maintainer probably wants to look at moving the ami_quit
signalling inside ami_handle_msg() to further reduce overhead.
This commit is contained in:
Vincent Sanders 2014-10-12 09:58:54 +01:00
parent 1a2040bc72
commit 265f63e679
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
amiga/gui.c
View File

@ -150,6 +150,8 @@
#define EXTRADOWN (IECODE_5TH_BUTTON) #define EXTRADOWN (IECODE_5TH_BUTTON)
#define EXTRAUP (IECODE_5TH_BUTTON | IECODE_UP_PREFIX) #define EXTRAUP (IECODE_5TH_BUTTON | IECODE_UP_PREFIX)
static bool ami_quit = false;
extern struct gui_utf8_table *amiga_utf8_table; extern struct gui_utf8_table *amiga_utf8_table;
struct ami_gui_tb_userdata { struct ami_gui_tb_userdata {
@ -973,7 +975,7 @@ static void gui_init2(int argc, char** argv)
IDoMethod(arexx_obj,AM_EXECUTE,sendcmd,"NETSURF",NULL,NULL,NULL,NULL); IDoMethod(arexx_obj,AM_EXECUTE,sendcmd,"NETSURF",NULL,NULL,NULL,NULL);
FreeVec(sendcmd); FreeVec(sendcmd);
netsurf_quit=true; ami_quit=true;
return; return;
} }
@ -2502,12 +2504,6 @@ void ami_get_msg(void)
ami_quit_netsurf_delayed(); ami_quit_netsurf_delayed();
} }
static void gui_poll(bool active)
{
ami_get_msg();
}
void ami_change_tab(struct gui_window_2 *gwin, int direction) void ami_change_tab(struct gui_window_2 *gwin, int direction)
{ {
struct Node *tab_node = gwin->bw->window->tab_node; struct Node *tab_node = gwin->bw->window->tab_node;
@ -2629,7 +2625,7 @@ void ami_quit_netsurf(void)
if(IsMinListEmpty(window_list)) { if(IsMinListEmpty(window_list)) {
/* last window closed, so exit */ /* last window closed, so exit */
netsurf_quit = true; ami_quit = true;
} }
} }
@ -2696,7 +2692,7 @@ void ami_try_quit(void)
if(nsoption_bool(close_no_quit) == false) if(nsoption_bool(close_no_quit) == false)
{ {
netsurf_quit = true; ami_quit = true;
return; return;
} }
else else
@ -5109,7 +5105,6 @@ static struct gui_search_web_table amiga_search_web_table = {
}; };
static struct gui_browser_table amiga_browser_table = { static struct gui_browser_table amiga_browser_table = {
.poll = gui_poll,
.schedule = ami_schedule, .schedule = ami_schedule,
.quit = gui_quit, .quit = gui_quit,
@ -5224,7 +5219,9 @@ int main(int argc, char** argv)
AddPart(script, nsoption_charp(arexx_startup), 1024); AddPart(script, nsoption_charp(arexx_startup), 1024);
ami_arexx_execute(script); ami_arexx_execute(script);
netsurf_main_loop(); while (!ami_quit) {
ami_get_msg();
}
strlcpy(script, nsoption_charp(arexx_dir), 1024); strlcpy(script, nsoption_charp(arexx_dir), 1024);
AddPart(script, nsoption_charp(arexx_shutdown), 1024); AddPart(script, nsoption_charp(arexx_shutdown), 1024);