From 6ac65a367462367addea548be8bd0051980feead Mon Sep 17 00:00:00 2001 From: Chris Young Date: Fri, 10 May 2019 21:59:03 +0100 Subject: Hide the message port which is shared amongst all Amiga NetSurf windows --- frontends/amiga/cookies.c | 2 +- frontends/amiga/download.c | 2 +- frontends/amiga/gui.c | 8 +++++++- frontends/amiga/gui.h | 10 ++++++++-- frontends/amiga/gui_options.c | 2 +- frontends/amiga/history.c | 2 +- frontends/amiga/history_local.c | 2 +- frontends/amiga/hotlist.c | 2 +- frontends/amiga/login.c | 2 +- frontends/amiga/print.c | 2 +- frontends/amiga/search.c | 2 +- frontends/amiga/sslcert.c | 2 +- 12 files changed, 25 insertions(+), 13 deletions(-) (limited to 'frontends') diff --git a/frontends/amiga/cookies.c b/frontends/amiga/cookies.c index a0761e4ca..5d46a3a57 100644 --- a/frontends/amiga/cookies.c +++ b/frontends/amiga/cookies.c @@ -319,7 +319,7 @@ ami_cookies_create_window(struct ami_cookie_window *cookie_win) WINDOW_IDCMPHook, &ami_cw->idcmp_hook, WINDOW_IDCMPHookBits, IDCMP_IDCMPUPDATE | IDCMP_EXTENDEDMOUSE | IDCMP_SIZEVERIFY | IDCMP_REFRESHWINDOW, - WINDOW_SharedPort, sport, + WINDOW_SharedPort, ami_gui_get_shared_msgport(), WINDOW_HorizProp, 1, WINDOW_VertProp, 1, WINDOW_UserData, cookie_win, diff --git a/frontends/amiga/download.c b/frontends/amiga/download.c index c5365db0a..cb9e99785 100644 --- a/frontends/amiga/download.c +++ b/frontends/amiga/download.c @@ -200,7 +200,7 @@ static struct gui_download_window *gui_download_window_create(download_context * WA_CloseGadget, FALSE, WA_SizeGadget, TRUE, WA_PubScreen, ami_gui_get_screen(), - WINDOW_SharedPort,sport, + WINDOW_SharedPort, ami_gui_get_shared_msgport(), WINDOW_UserData,dw, WINDOW_IconifyGadget, FALSE, WINDOW_LockHeight,TRUE, diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c index ba6244f66..7f1578c15 100644 --- a/frontends/amiga/gui.c +++ b/frontends/amiga/gui.c @@ -313,7 +313,7 @@ struct ami_gui_tb_userdata { static struct MinList *window_list = NULL; static struct Screen *scrn = NULL; -struct MsgPort *sport = NULL; +static struct MsgPort *sport = NULL; static struct gui_window *cur_gw = NULL; static bool ami_quit = false; @@ -378,6 +378,12 @@ static void gui_window_place_caret(struct gui_window *g, int x, int y, int heigh nsoptions_default[NSOPTION_##OPTION].value.i = VALUE /* Functions documented in gui.h */ +struct MsgPort *ami_gui_get_shared_msgport(void) +{ + assert(sport != NULL); + return sport; +} + struct gui_window *ami_gui_get_active_gw(void) { return cur_gw; diff --git a/frontends/amiga/gui.h b/frontends/amiga/gui.h index 1376495c7..70f1c505e 100644 --- a/frontends/amiga/gui.h +++ b/frontends/amiga/gui.h @@ -75,8 +75,6 @@ struct ami_generic_window { const struct ami_win_event_table *tbl; }; -extern struct MsgPort *sport; - #define IS_CURRENT_GW(GWIN,GW) (ami_gui2_get_gui_window(GWIN) == GW) /* The return value for these functions must be deallocated using FreeVec() */ @@ -140,6 +138,13 @@ nserror ami_gui_get_space_box(Object *obj, struct IBox **bbox); */ void ami_gui_free_space_box(struct IBox *bbox); +/** + * Get shared message port + * + * @return Pointer to an initialised MsgPort + */ +struct MsgPort *ami_gui_get_shared_msgport(void); + /** * Get the application.library ID NetSurf is registered as. * @@ -354,6 +359,7 @@ void ami_gui2_set_closed(struct gui_window_2 *gwin, bool closed); /** * Set new_content in gui_window_2 + * Indicates the window needs redrawing */ void ami_gui2_set_new_content(struct gui_window_2 *gwin, bool new_content); diff --git a/frontends/amiga/gui_options.c b/frontends/amiga/gui_options.c index c731598e9..36d8546e7 100755 --- a/frontends/amiga/gui_options.c +++ b/frontends/amiga/gui_options.c @@ -658,7 +658,7 @@ void ami_gui_opts_open(void) WA_CloseGadget, TRUE, WA_SizeGadget, FALSE, WA_PubScreen, ami_gui_get_screen(), - WINDOW_SharedPort,sport, + WINDOW_SharedPort, ami_gui_get_shared_msgport(), WINDOW_UserData,gow, WINDOW_IconifyGadget, FALSE, WINDOW_Position, WPOS_CENTERSCREEN, diff --git a/frontends/amiga/history.c b/frontends/amiga/history.c index 6e33464a6..fd33a67f3 100644 --- a/frontends/amiga/history.c +++ b/frontends/amiga/history.c @@ -393,7 +393,7 @@ ami_history_global_create_window(struct ami_history_global_window *history_win) WINDOW_IDCMPHook, &ami_cw->idcmp_hook, WINDOW_IDCMPHookBits, IDCMP_IDCMPUPDATE | IDCMP_EXTENDEDMOUSE | IDCMP_SIZEVERIFY | IDCMP_REFRESHWINDOW, - WINDOW_SharedPort, sport, + WINDOW_SharedPort, ami_gui_get_shared_msgport(), WINDOW_HorizProp, 1, WINDOW_VertProp, 1, WINDOW_UserData, history_win, diff --git a/frontends/amiga/history_local.c b/frontends/amiga/history_local.c index f8a881693..fc980be3d 100644 --- a/frontends/amiga/history_local.c +++ b/frontends/amiga/history_local.c @@ -218,7 +218,7 @@ ami_history_local_create_window(struct ami_history_local_window *history_local_w WINDOW_IDCMPHook, &ami_cw->idcmp_hook, WINDOW_IDCMPHookBits, IDCMP_IDCMPUPDATE | IDCMP_EXTENDEDMOUSE | IDCMP_SIZEVERIFY | IDCMP_REFRESHWINDOW, - WINDOW_SharedPort, sport, + WINDOW_SharedPort, ami_gui_get_shared_msgport(), WINDOW_HorizProp, 1, WINDOW_VertProp, 1, WINDOW_UserData, history_local_win, diff --git a/frontends/amiga/hotlist.c b/frontends/amiga/hotlist.c index f8df8c823..9a1d423bc 100644 --- a/frontends/amiga/hotlist.c +++ b/frontends/amiga/hotlist.c @@ -496,7 +496,7 @@ ami_hotlist_create_window(struct ami_hotlist_window *hotlist_win) WINDOW_IDCMPHook, &ami_cw->idcmp_hook, WINDOW_IDCMPHookBits, IDCMP_IDCMPUPDATE | IDCMP_EXTENDEDMOUSE | IDCMP_SIZEVERIFY | IDCMP_REFRESHWINDOW, - WINDOW_SharedPort, sport, + WINDOW_SharedPort, ami_gui_get_shared_msgport(), WINDOW_HorizProp, 1, WINDOW_VertProp, 1, WINDOW_UserData, hotlist_win, diff --git a/frontends/amiga/login.c b/frontends/amiga/login.c index 6c0c1cd19..e7c7a6301 100755 --- a/frontends/amiga/login.c +++ b/frontends/amiga/login.c @@ -147,7 +147,7 @@ nserror gui_401login_open(nsurl *url, const char *realm, WA_CloseGadget, FALSE, WA_SizeGadget, TRUE, WA_PubScreen, ami_gui_get_screen(), - WINDOW_SharedPort,sport, + WINDOW_SharedPort, ami_gui_get_shared_msgport(), WINDOW_UserData,lw, WINDOW_IconifyGadget, FALSE, WINDOW_LockHeight,TRUE, diff --git a/frontends/amiga/print.c b/frontends/amiga/print.c index e0b52548f..97c70b96c 100644 --- a/frontends/amiga/print.c +++ b/frontends/amiga/print.c @@ -277,7 +277,7 @@ void ami_print_ui(struct hlcache_handle *c) WA_CloseGadget, TRUE, WA_SizeGadget, FALSE, WA_PubScreen, ami_gui_get_screen(), - WINDOW_SharedPort, sport, + WINDOW_SharedPort, ami_gui_get_shared_msgport(), WINDOW_UserData, pw, WINDOW_IconifyGadget, FALSE, WINDOW_Position, WPOS_CENTERSCREEN, diff --git a/frontends/amiga/search.c b/frontends/amiga/search.c index e46c9dfdb..853c06fef 100755 --- a/frontends/amiga/search.c +++ b/frontends/amiga/search.c @@ -170,7 +170,7 @@ void ami_search_open(struct gui_window *gwin) WA_CloseGadget, TRUE, WA_SizeGadget, TRUE, WA_PubScreen, ami_gui_get_screen(), - WINDOW_SharedPort, sport, + WINDOW_SharedPort, ami_gui_get_shared_msgport(), WINDOW_UserData, fwin, WINDOW_IconifyGadget, FALSE, WINDOW_LockHeight, TRUE, diff --git a/frontends/amiga/sslcert.c b/frontends/amiga/sslcert.c index 92b06a17a..854d6b085 100644 --- a/frontends/amiga/sslcert.c +++ b/frontends/amiga/sslcert.c @@ -243,7 +243,7 @@ ami_crtvrfy_create_window(struct ami_crtvrfy_window *crtvrfy_win) WINDOW_IDCMPHook, &ami_cw->idcmp_hook, WINDOW_IDCMPHookBits, IDCMP_IDCMPUPDATE | IDCMP_EXTENDEDMOUSE | IDCMP_SIZEVERIFY | IDCMP_REFRESHWINDOW, - WINDOW_SharedPort, sport, + WINDOW_SharedPort, ami_gui_get_shared_msgport(), WINDOW_UserData, crtvrfy_win, /* WINDOW_NewMenu, twin->menu, -> No menu for SSL Cert */ WINDOW_IconifyGadget, FALSE, -- cgit v1.2.3