Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/336a7dc17044f966c0e0390bce740b61ac0a3cdb
...commit
http://git.netsurf-browser.org/netsurf.git/commit/336a7dc17044f966c0e0390bce740b61ac0a3cdb
...tree
http://git.netsurf-browser.org/netsurf.git/tree/336a7dc17044f966c0e0390bce740b61ac0a3cdb
The branch, master has been updated
via 336a7dc17044f966c0e0390bce740b61ac0a3cdb (commit)
via 6ac65a367462367addea548be8bd0051980feead (commit)
via 24b910f4ff72b24a871c7d66f9e5f5992625c975 (commit)
via a5051c7128ee7ee9b0bc26a81ad7eb3af199d7ca (commit)
from 97010ecef521de524846734e093db89a18f81f62 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=336a7dc17044f966c0e0390bce740b61ac0a3cdb
commit 336a7dc17044f966c0e0390bce740b61ac0a3cdb
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Mark functions as static
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index 7f1578c..831ed2f 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -349,17 +349,15 @@ static const __attribute__((used)) char *stack_cookie =
"\0$STACK:196608\0";
const char * const versvn;
const char * const verdate;
-void ami_switch_tab(struct gui_window_2 *gwin, bool redraw);
-void ami_change_tab(struct gui_window_2 *gwin, int direction);
-void ami_get_hscroll_pos(struct gui_window_2 *gwin, ULONG *xs);
-void ami_get_vscroll_pos(struct gui_window_2 *gwin, ULONG *ys);
-void ami_quit_netsurf_delayed(void);
-Object *ami_gui_splash_open(void);
-void ami_gui_splash_close(Object *win_obj);
-HOOKF(uint32, ami_set_favicon_render_hook, APTR, space, struct gpRender *);
-HOOKF(uint32, ami_set_throbber_render_hook, APTR, space, struct gpRender *);
-bool ami_gui_map_filename(char **remapped, const char *restrict path, const
char *restrict file,
- const char *restrict map);
+static void ami_switch_tab(struct gui_window_2 *gwin, bool redraw);
+static void ami_change_tab(struct gui_window_2 *gwin, int direction);
+static void ami_get_hscroll_pos(struct gui_window_2 *gwin, ULONG *xs);
+static void ami_get_vscroll_pos(struct gui_window_2 *gwin, ULONG *ys);
+static void ami_quit_netsurf_delayed(void);
+static Object *ami_gui_splash_open(void);
+static void ami_gui_splash_close(Object *win_obj);
+static bool ami_gui_map_filename(char **remapped, const char *restrict path,
+ const char *restrict file, const char *restrict map);
static void ami_gui_window_update_box_deferred(struct gui_window *g, bool
draw);
static void ami_do_redraw(struct gui_window_2 *g);
static void ami_schedule_redraw_remove(struct gui_window_2 *gwin);
@@ -368,8 +366,9 @@ static bool gui_window_get_scroll(struct gui_window *g, int
*restrict sx, int *r
static nserror gui_window_set_scroll(struct gui_window *g, const struct rect
*rect);
static void gui_window_remove_caret(struct gui_window *g);
static void gui_window_place_caret(struct gui_window *g, int x, int y, int
height, const struct rect *clip);
-//static void amiga_window_invalidate_area(struct gui_window *g, const struct
rect *restrict rect);
+HOOKF(uint32, ami_set_favicon_render_hook, APTR, space, struct gpRender *);
+HOOKF(uint32, ami_set_throbber_render_hook, APTR, space, struct gpRender *);
/* accessors for default options - user option is updated if it is set as per
default */
#define nsoption_default_set_int(OPTION, VALUE)
\
@@ -729,7 +728,7 @@ STRPTR ami_locale_langs(int *codeset)
return acceptlangs;
}
-bool ami_gui_map_filename(char **remapped, const char *restrict path,
+static bool ami_gui_map_filename(char **remapped, const char *restrict path,
const char *restrict file, const char *restrict map)
{
BPTR fh = 0;
@@ -3285,7 +3284,7 @@ void ami_get_msg(void)
ami_quit_netsurf_delayed();
}
-void ami_change_tab(struct gui_window_2 *gwin, int direction)
+static void ami_change_tab(struct gui_window_2 *gwin, int direction)
{
struct Node *tab_node = gwin->gw->tab_node;
struct Node *ptab = NULL;
@@ -3307,7 +3306,7 @@ void ami_change_tab(struct gui_window_2 *gwin, int
direction)
ami_switch_tab(gwin, true);
}
-void ami_switch_tab(struct gui_window_2 *gwin, bool redraw)
+static void ami_switch_tab(struct gui_window_2 *gwin, bool redraw)
{
struct Node *tabnode;
struct IBox *bbox;
@@ -3403,7 +3402,7 @@ void ami_quit_netsurf(void)
}
}
-void ami_quit_netsurf_delayed(void)
+static void ami_quit_netsurf_delayed(void)
{
int res = -1;
#ifdef __amigaos4__
@@ -5379,7 +5378,7 @@ static void ami_do_redraw(struct gui_window_2 *gwin)
}
-void ami_get_hscroll_pos(struct gui_window_2 *gwin, ULONG *xs)
+static void ami_get_hscroll_pos(struct gui_window_2 *gwin, ULONG *xs)
{
if(gwin->objects[GID_HSCROLL])
{
@@ -5390,7 +5389,7 @@ void ami_get_hscroll_pos(struct gui_window_2 *gwin, ULONG
*xs)
}
}
-void ami_get_vscroll_pos(struct gui_window_2 *gwin, ULONG *ys)
+static void ami_get_vscroll_pos(struct gui_window_2 *gwin, ULONG *ys)
{
if(gwin->objects[GID_VSCROLL]) {
GetAttr(SCROLLER_Top, gwin->objects[GID_VSCROLL], ys);
@@ -5812,7 +5811,7 @@ BOOL ami_gadget_hit(Object *obj, int x, int y)
else return FALSE;
}
-Object *ami_gui_splash_open(void)
+static Object *ami_gui_splash_open(void)
{
Object *restrict win_obj, *restrict bm_obj;
struct Window *win;
@@ -5911,7 +5910,7 @@ Object *ami_gui_splash_open(void)
return win_obj;
}
-void ami_gui_splash_close(Object *win_obj)
+static void ami_gui_splash_close(Object *win_obj)
{
if(win_obj == NULL) return;
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=6ac65a367462367addea548be8bd0051980feead
commit 6ac65a367462367addea548be8bd0051980feead
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Hide the message port which is shared amongst all Amiga NetSurf windows
diff --git a/frontends/amiga/cookies.c b/frontends/amiga/cookies.c
index a0761e4..5d46a3a 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 c5365db..cb9e997 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 ba6244f..7f1578c 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 1376495..70f1c50 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() */
@@ -141,6 +139,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.
*
* @return App ID.
@@ -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 c731598..36d8546 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 6e33464..fd33a67 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 f8a8816..fc980be 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 f8df8c8..9a1d423 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 6c0c1cd..e7c7a63 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 e0b5254..97c70b9 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 e46c9df..853c06f 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 92b06a1..854d6b0 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,
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=24b910f4ff72b24a871c7d66f9e5f5992625c975
commit 24b910f4ff72b24a871c7d66f9e5f5992625c975
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Make the window list more private
TODO: fix arexx.c to not need it
diff --git a/frontends/amiga/arexx.c b/frontends/amiga/arexx.c
index 7497ff9..05e7802 100644
--- a/frontends/amiga/arexx.c
+++ b/frontends/amiga/arexx.c
@@ -235,6 +235,7 @@ static int ami_find_tab_bw(struct gui_window_2 *gwin,
struct browser_window *bw)
static struct gui_window *ami_find_tab(int window, int tab)
{
struct nsObject *node, *nnode;
+ struct MinList *window_list = ami_gui_get_window_list();
if(!IsMinListEmpty(window_list))
{
@@ -607,6 +608,7 @@ RXHOOKF(rx_active)
struct gui_window *gw = ami_gui_get_active_gw();
struct nsObject *node, *nnode;
struct gui_window_2 *gwin = NULL;
+ struct MinList *window_list = ami_gui_get_window_list();
cmd->ac_RC = 0;
diff --git a/frontends/amiga/drag.c b/frontends/amiga/drag.c
index 5ae3f25..907d8f8 100644
--- a/frontends/amiga/drag.c
+++ b/frontends/amiga/drag.c
@@ -24,7 +24,6 @@
#include <proto/intuition.h>
#include <proto/utility.h>
#include <proto/icon.h>
-#include <proto/layers.h>
#include <graphics/blitattr.h>
#include <workbench/icon.h>
@@ -109,6 +108,7 @@ void ami_drag_save(struct Window *win)
{
ULONG which = WBO_NONE, type;
char path[1025], dpath[1025];
+ struct Screen *scrn = ami_gui_get_screen();
path[0] = 0; /* ensure path is terminated */
@@ -289,44 +289,6 @@ bool ami_drag_has_data(void)
else return false;
}
-static void *ami_find_gwin_by_id(struct Window *win, uint32 type)
-{
- struct nsObject *node, *nnode;
- struct gui_window_2 *gwin;
-
- if(!IsMinListEmpty(window_list))
- {
- node = (struct nsObject *)GetHead((struct List *)window_list);
-
- do
- {
- nnode=(struct nsObject *)GetSucc((struct Node *)node);
-
- if(node->Type == type)
- {
- gwin = node->objstruct;
- if(win == ami_gui2_get_window(gwin)) return
gwin;
- }
- } while((node = nnode));
- }
- return NULL;
-}
-
-void *ami_window_at_pointer(int type)
-{
- struct Layer *layer;
- struct Screen *scrn = ami_gui_get_screen();
-
- LockLayerInfo(&scrn->LayerInfo);
-
- layer = WhichLayer(&scrn->LayerInfo, scrn->MouseX, scrn->MouseY);
-
- UnlockLayerInfo(&scrn->LayerInfo);
-
- if(layer) return ami_find_gwin_by_id(layer->Window, type);
- else return NULL;
-}
-
#else
#include <stddef.h>
@@ -368,10 +330,5 @@ bool ami_drag_has_data(void)
{
return false;
}
-
-void *ami_window_at_pointer(int type)
-{
- return NULL;
-}
#endif
diff --git a/frontends/amiga/drag.h b/frontends/amiga/drag.h
index c0b040f..1a54668 100644
--- a/frontends/amiga/drag.h
+++ b/frontends/amiga/drag.h
@@ -35,8 +35,5 @@ void ami_drag_icon_close(struct Window *win);
bool ami_drag_icon_move(void);
BOOL ami_drag_in_progress(void);
bool ami_drag_has_data(void);
-
-void *ami_window_at_pointer(int type);
-
#endif
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index 6e60e6d..ba6244f 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2016 Chris Young <[email protected]>
+ * Copyright 2008-2019 Chris Young <[email protected]>
*
* This file is part of NetSurf, http://www.netsurf-browser.org/
*
@@ -36,6 +36,7 @@
#include <proto/icon.h>
#include <proto/intuition.h>
#include <proto/keymap.h>
+#include <proto/layers.h>
#include <proto/locale.h>
#include <proto/utility.h>
#include <proto/wb.h>
@@ -310,7 +311,7 @@ struct ami_gui_tb_userdata {
int items;
};
-struct MinList *window_list = NULL;
+static struct MinList *window_list = NULL;
static struct Screen *scrn = NULL;
struct MsgPort *sport = NULL;
static struct gui_window *cur_gw = NULL;
@@ -387,6 +388,12 @@ struct Screen *ami_gui_get_screen(void)
return scrn;
}
+struct MinList *ami_gui_get_window_list(void)
+{
+ assert(window_list != NULL);
+ return window_list;
+}
+
void ami_gui_beep(void)
{
DisplayBeep(scrn);
@@ -615,6 +622,52 @@ void ami_gui2_set_new_content(struct gui_window_2 *gwin,
bool new_content)
/** undocumented, or internal, or documented elsewhere **/
+#ifdef __amigaos4__
+static void *ami_find_gwin_by_id(struct Window *win, uint32 type)
+{
+ struct nsObject *node, *nnode;
+ struct gui_window_2 *gwin;
+
+ if(!IsMinListEmpty(window_list))
+ {
+ node = (struct nsObject *)GetHead((struct List *)window_list);
+
+ do
+ {
+ nnode=(struct nsObject *)GetSucc((struct Node *)node);
+
+ if(node->Type == type)
+ {
+ gwin = node->objstruct;
+ if(win == ami_gui2_get_window(gwin)) return
gwin;
+ }
+ } while((node = nnode));
+ }
+ return NULL;
+}
+
+void *ami_window_at_pointer(int type)
+{
+ struct Layer *layer;
+ struct Screen *scrn = ami_gui_get_screen();
+
+ LockLayerInfo(&scrn->LayerInfo);
+
+ layer = WhichLayer(&scrn->LayerInfo, scrn->MouseX, scrn->MouseY);
+
+ UnlockLayerInfo(&scrn->LayerInfo);
+
+ if(layer) return ami_find_gwin_by_id(layer->Window, type);
+ else return NULL;
+}
+#else
+/**\todo check if OS4 version of this function will build on OS3, even if it
isn't called */
+void *ami_window_at_pointer(int type)
+{
+ return NULL;
+}
+#endif
+
void ami_set_pointer(struct gui_window_2 *gwin, gui_pointer_shape shape, bool
update)
{
if(gwin->mouse_pointer == shape) return;
diff --git a/frontends/amiga/gui.h b/frontends/amiga/gui.h
index c4af98f..1376495 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 MinList *window_list; /**\todo stop arexx.c poking about in here
*/
extern struct MsgPort *sport;
#define IS_CURRENT_GW(GWIN,GW) (ami_gui2_get_gui_window(GWIN) == GW)
@@ -105,6 +103,7 @@ int ami_gui_count_windows(int window, int *tabs);
void ami_gui_set_scale(struct gui_window *gw, float scale);
void ami_set_pointer(struct gui_window_2 *gwin, gui_pointer_shape shape, bool
update);
void ami_reset_pointer(struct gui_window_2 *gwin);
+void *ami_window_at_pointer(int type);
/**
* Beep
@@ -178,6 +177,15 @@ nserror ami_gui_win_list_add(void *win, int type, const
struct ami_win_event_tab
void ami_gui_win_list_remove(void *win);
/**
+ * Get the window list.
+ *
+ *\TODO: Nothing should be poking around in this list, but we aren't
+ * assigning unique IDs to windows (ARexx interface needs this)
+ * ami_find_gwin_by_id() is close but not ARexx-friendly
+ */
+struct MinList *ami_gui_get_window_list(void);
+
+/**
* Get which qualifier keys are being pressed
*/
int ami_gui_get_quals(Object *win_obj);
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=a5051c7128ee7ee9b0bc26a81ad7eb3af199d7ca
commit a5051c7128ee7ee9b0bc26a81ad7eb3af199d7ca
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Use new beep function
diff --git a/frontends/amiga/drag.c b/frontends/amiga/drag.c
index ee831f4..5ae3f25 100644
--- a/frontends/amiga/drag.c
+++ b/frontends/amiga/drag.c
@@ -109,7 +109,6 @@ void ami_drag_save(struct Window *win)
{
ULONG which = WBO_NONE, type;
char path[1025], dpath[1025];
- struct Screen *scrn = ami_gui_get_screen();
path[0] = 0; /* ensure path is terminated */
@@ -135,7 +134,7 @@ void ami_drag_save(struct Window *win)
{
if(drag_save == GUI_SAVE_TEXT_SELECTION)
ami_drag_selection((struct gui_window *)drag_save_data);
- else DisplayBeep(scrn);
+ else ami_gui_beep();
drag_save = 0;
drag_save_data = NULL;
@@ -144,7 +143,7 @@ void ami_drag_save(struct Window *win)
if(path[0] == '\0')
{
- DisplayBeep(scrn);
+ ami_gui_beep();
drag_save = 0;
drag_save_data = NULL;
return;
diff --git a/frontends/amiga/history.c b/frontends/amiga/history.c
index a505101..6e33464 100644
--- a/frontends/amiga/history.c
+++ b/frontends/amiga/history.c
@@ -200,7 +200,7 @@ ami_history_global_drag_end(struct ami_corewindow *ami_cw,
int x, int y)
}
if((ok == false) || (url == NULL)) {
- DisplayBeep(ami_gui_get_screen());
+ ami_gui_beep();
} else if(url) {
if((gwin = ami_window_at_pointer(AMINS_WINDOW))) {
browser_window_navigate(ami_gui2_get_browser_window(gwin),
-----------------------------------------------------------------------
Summary of changes:
frontends/amiga/arexx.c | 2 +
frontends/amiga/cookies.c | 2 +-
frontends/amiga/download.c | 2 +-
frontends/amiga/drag.c | 48 +-----------------
frontends/amiga/drag.h | 3 --
frontends/amiga/gui.c | 104 ++++++++++++++++++++++++++++++---------
frontends/amiga/gui.h | 22 +++++++--
frontends/amiga/gui_options.c | 2 +-
frontends/amiga/history.c | 4 +-
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 +-
15 files changed, 114 insertions(+), 87 deletions(-)
diff --git a/frontends/amiga/arexx.c b/frontends/amiga/arexx.c
index 7497ff9..05e7802 100644
--- a/frontends/amiga/arexx.c
+++ b/frontends/amiga/arexx.c
@@ -235,6 +235,7 @@ static int ami_find_tab_bw(struct gui_window_2 *gwin,
struct browser_window *bw)
static struct gui_window *ami_find_tab(int window, int tab)
{
struct nsObject *node, *nnode;
+ struct MinList *window_list = ami_gui_get_window_list();
if(!IsMinListEmpty(window_list))
{
@@ -607,6 +608,7 @@ RXHOOKF(rx_active)
struct gui_window *gw = ami_gui_get_active_gw();
struct nsObject *node, *nnode;
struct gui_window_2 *gwin = NULL;
+ struct MinList *window_list = ami_gui_get_window_list();
cmd->ac_RC = 0;
diff --git a/frontends/amiga/cookies.c b/frontends/amiga/cookies.c
index a0761e4..5d46a3a 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 c5365db..cb9e997 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/drag.c b/frontends/amiga/drag.c
index ee831f4..907d8f8 100644
--- a/frontends/amiga/drag.c
+++ b/frontends/amiga/drag.c
@@ -24,7 +24,6 @@
#include <proto/intuition.h>
#include <proto/utility.h>
#include <proto/icon.h>
-#include <proto/layers.h>
#include <graphics/blitattr.h>
#include <workbench/icon.h>
@@ -135,7 +134,7 @@ void ami_drag_save(struct Window *win)
{
if(drag_save == GUI_SAVE_TEXT_SELECTION)
ami_drag_selection((struct gui_window *)drag_save_data);
- else DisplayBeep(scrn);
+ else ami_gui_beep();
drag_save = 0;
drag_save_data = NULL;
@@ -144,7 +143,7 @@ void ami_drag_save(struct Window *win)
if(path[0] == '\0')
{
- DisplayBeep(scrn);
+ ami_gui_beep();
drag_save = 0;
drag_save_data = NULL;
return;
@@ -290,44 +289,6 @@ bool ami_drag_has_data(void)
else return false;
}
-static void *ami_find_gwin_by_id(struct Window *win, uint32 type)
-{
- struct nsObject *node, *nnode;
- struct gui_window_2 *gwin;
-
- if(!IsMinListEmpty(window_list))
- {
- node = (struct nsObject *)GetHead((struct List *)window_list);
-
- do
- {
- nnode=(struct nsObject *)GetSucc((struct Node *)node);
-
- if(node->Type == type)
- {
- gwin = node->objstruct;
- if(win == ami_gui2_get_window(gwin)) return
gwin;
- }
- } while((node = nnode));
- }
- return NULL;
-}
-
-void *ami_window_at_pointer(int type)
-{
- struct Layer *layer;
- struct Screen *scrn = ami_gui_get_screen();
-
- LockLayerInfo(&scrn->LayerInfo);
-
- layer = WhichLayer(&scrn->LayerInfo, scrn->MouseX, scrn->MouseY);
-
- UnlockLayerInfo(&scrn->LayerInfo);
-
- if(layer) return ami_find_gwin_by_id(layer->Window, type);
- else return NULL;
-}
-
#else
#include <stddef.h>
@@ -369,10 +330,5 @@ bool ami_drag_has_data(void)
{
return false;
}
-
-void *ami_window_at_pointer(int type)
-{
- return NULL;
-}
#endif
diff --git a/frontends/amiga/drag.h b/frontends/amiga/drag.h
index c0b040f..1a54668 100644
--- a/frontends/amiga/drag.h
+++ b/frontends/amiga/drag.h
@@ -35,8 +35,5 @@ void ami_drag_icon_close(struct Window *win);
bool ami_drag_icon_move(void);
BOOL ami_drag_in_progress(void);
bool ami_drag_has_data(void);
-
-void *ami_window_at_pointer(int type);
-
#endif
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index 6e60e6d..831ed2f 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2016 Chris Young <[email protected]>
+ * Copyright 2008-2019 Chris Young <[email protected]>
*
* This file is part of NetSurf, http://www.netsurf-browser.org/
*
@@ -36,6 +36,7 @@
#include <proto/icon.h>
#include <proto/intuition.h>
#include <proto/keymap.h>
+#include <proto/layers.h>
#include <proto/locale.h>
#include <proto/utility.h>
#include <proto/wb.h>
@@ -310,9 +311,9 @@ struct ami_gui_tb_userdata {
int items;
};
-struct MinList *window_list = NULL;
+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;
@@ -348,17 +349,15 @@ static const __attribute__((used)) char *stack_cookie =
"\0$STACK:196608\0";
const char * const versvn;
const char * const verdate;
-void ami_switch_tab(struct gui_window_2 *gwin, bool redraw);
-void ami_change_tab(struct gui_window_2 *gwin, int direction);
-void ami_get_hscroll_pos(struct gui_window_2 *gwin, ULONG *xs);
-void ami_get_vscroll_pos(struct gui_window_2 *gwin, ULONG *ys);
-void ami_quit_netsurf_delayed(void);
-Object *ami_gui_splash_open(void);
-void ami_gui_splash_close(Object *win_obj);
-HOOKF(uint32, ami_set_favicon_render_hook, APTR, space, struct gpRender *);
-HOOKF(uint32, ami_set_throbber_render_hook, APTR, space, struct gpRender *);
-bool ami_gui_map_filename(char **remapped, const char *restrict path, const
char *restrict file,
- const char *restrict map);
+static void ami_switch_tab(struct gui_window_2 *gwin, bool redraw);
+static void ami_change_tab(struct gui_window_2 *gwin, int direction);
+static void ami_get_hscroll_pos(struct gui_window_2 *gwin, ULONG *xs);
+static void ami_get_vscroll_pos(struct gui_window_2 *gwin, ULONG *ys);
+static void ami_quit_netsurf_delayed(void);
+static Object *ami_gui_splash_open(void);
+static void ami_gui_splash_close(Object *win_obj);
+static bool ami_gui_map_filename(char **remapped, const char *restrict path,
+ const char *restrict file, const char *restrict map);
static void ami_gui_window_update_box_deferred(struct gui_window *g, bool
draw);
static void ami_do_redraw(struct gui_window_2 *g);
static void ami_schedule_redraw_remove(struct gui_window_2 *gwin);
@@ -367,8 +366,9 @@ static bool gui_window_get_scroll(struct gui_window *g, int
*restrict sx, int *r
static nserror gui_window_set_scroll(struct gui_window *g, const struct rect
*rect);
static void gui_window_remove_caret(struct gui_window *g);
static void gui_window_place_caret(struct gui_window *g, int x, int y, int
height, const struct rect *clip);
-//static void amiga_window_invalidate_area(struct gui_window *g, const struct
rect *restrict rect);
+HOOKF(uint32, ami_set_favicon_render_hook, APTR, space, struct gpRender *);
+HOOKF(uint32, ami_set_throbber_render_hook, APTR, space, struct gpRender *);
/* accessors for default options - user option is updated if it is set as per
default */
#define nsoption_default_set_int(OPTION, VALUE)
\
@@ -377,6 +377,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;
@@ -387,6 +393,12 @@ struct Screen *ami_gui_get_screen(void)
return scrn;
}
+struct MinList *ami_gui_get_window_list(void)
+{
+ assert(window_list != NULL);
+ return window_list;
+}
+
void ami_gui_beep(void)
{
DisplayBeep(scrn);
@@ -615,6 +627,52 @@ void ami_gui2_set_new_content(struct gui_window_2 *gwin,
bool new_content)
/** undocumented, or internal, or documented elsewhere **/
+#ifdef __amigaos4__
+static void *ami_find_gwin_by_id(struct Window *win, uint32 type)
+{
+ struct nsObject *node, *nnode;
+ struct gui_window_2 *gwin;
+
+ if(!IsMinListEmpty(window_list))
+ {
+ node = (struct nsObject *)GetHead((struct List *)window_list);
+
+ do
+ {
+ nnode=(struct nsObject *)GetSucc((struct Node *)node);
+
+ if(node->Type == type)
+ {
+ gwin = node->objstruct;
+ if(win == ami_gui2_get_window(gwin)) return
gwin;
+ }
+ } while((node = nnode));
+ }
+ return NULL;
+}
+
+void *ami_window_at_pointer(int type)
+{
+ struct Layer *layer;
+ struct Screen *scrn = ami_gui_get_screen();
+
+ LockLayerInfo(&scrn->LayerInfo);
+
+ layer = WhichLayer(&scrn->LayerInfo, scrn->MouseX, scrn->MouseY);
+
+ UnlockLayerInfo(&scrn->LayerInfo);
+
+ if(layer) return ami_find_gwin_by_id(layer->Window, type);
+ else return NULL;
+}
+#else
+/**\todo check if OS4 version of this function will build on OS3, even if it
isn't called */
+void *ami_window_at_pointer(int type)
+{
+ return NULL;
+}
+#endif
+
void ami_set_pointer(struct gui_window_2 *gwin, gui_pointer_shape shape, bool
update)
{
if(gwin->mouse_pointer == shape) return;
@@ -670,7 +728,7 @@ STRPTR ami_locale_langs(int *codeset)
return acceptlangs;
}
-bool ami_gui_map_filename(char **remapped, const char *restrict path,
+static bool ami_gui_map_filename(char **remapped, const char *restrict path,
const char *restrict file, const char *restrict map)
{
BPTR fh = 0;
@@ -3226,7 +3284,7 @@ void ami_get_msg(void)
ami_quit_netsurf_delayed();
}
-void ami_change_tab(struct gui_window_2 *gwin, int direction)
+static void ami_change_tab(struct gui_window_2 *gwin, int direction)
{
struct Node *tab_node = gwin->gw->tab_node;
struct Node *ptab = NULL;
@@ -3248,7 +3306,7 @@ void ami_change_tab(struct gui_window_2 *gwin, int
direction)
ami_switch_tab(gwin, true);
}
-void ami_switch_tab(struct gui_window_2 *gwin, bool redraw)
+static void ami_switch_tab(struct gui_window_2 *gwin, bool redraw)
{
struct Node *tabnode;
struct IBox *bbox;
@@ -3344,7 +3402,7 @@ void ami_quit_netsurf(void)
}
}
-void ami_quit_netsurf_delayed(void)
+static void ami_quit_netsurf_delayed(void)
{
int res = -1;
#ifdef __amigaos4__
@@ -5320,7 +5378,7 @@ static void ami_do_redraw(struct gui_window_2 *gwin)
}
-void ami_get_hscroll_pos(struct gui_window_2 *gwin, ULONG *xs)
+static void ami_get_hscroll_pos(struct gui_window_2 *gwin, ULONG *xs)
{
if(gwin->objects[GID_HSCROLL])
{
@@ -5331,7 +5389,7 @@ void ami_get_hscroll_pos(struct gui_window_2 *gwin, ULONG
*xs)
}
}
-void ami_get_vscroll_pos(struct gui_window_2 *gwin, ULONG *ys)
+static void ami_get_vscroll_pos(struct gui_window_2 *gwin, ULONG *ys)
{
if(gwin->objects[GID_VSCROLL]) {
GetAttr(SCROLLER_Top, gwin->objects[GID_VSCROLL], ys);
@@ -5753,7 +5811,7 @@ BOOL ami_gadget_hit(Object *obj, int x, int y)
else return FALSE;
}
-Object *ami_gui_splash_open(void)
+static Object *ami_gui_splash_open(void)
{
Object *restrict win_obj, *restrict bm_obj;
struct Window *win;
@@ -5852,7 +5910,7 @@ Object *ami_gui_splash_open(void)
return win_obj;
}
-void ami_gui_splash_close(Object *win_obj)
+static void ami_gui_splash_close(Object *win_obj)
{
if(win_obj == NULL) return;
diff --git a/frontends/amiga/gui.h b/frontends/amiga/gui.h
index c4af98f..70f1c50 100644
--- a/frontends/amiga/gui.h
+++ b/frontends/amiga/gui.h
@@ -75,10 +75,6 @@ struct ami_generic_window {
const struct ami_win_event_table *tbl;
};
-
-extern struct MinList *window_list; /**\todo stop arexx.c poking about in here
*/
-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() */
@@ -105,6 +101,7 @@ int ami_gui_count_windows(int window, int *tabs);
void ami_gui_set_scale(struct gui_window *gw, float scale);
void ami_set_pointer(struct gui_window_2 *gwin, gui_pointer_shape shape, bool
update);
void ami_reset_pointer(struct gui_window_2 *gwin);
+void *ami_window_at_pointer(int type);
/**
* Beep
@@ -142,6 +139,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.
*
* @return App ID.
@@ -178,6 +182,15 @@ nserror ami_gui_win_list_add(void *win, int type, const
struct ami_win_event_tab
void ami_gui_win_list_remove(void *win);
/**
+ * Get the window list.
+ *
+ *\TODO: Nothing should be poking around in this list, but we aren't
+ * assigning unique IDs to windows (ARexx interface needs this)
+ * ami_find_gwin_by_id() is close but not ARexx-friendly
+ */
+struct MinList *ami_gui_get_window_list(void);
+
+/**
* Get which qualifier keys are being pressed
*/
int ami_gui_get_quals(Object *win_obj);
@@ -346,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 c731598..36d8546 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 a505101..fd33a67 100644
--- a/frontends/amiga/history.c
+++ b/frontends/amiga/history.c
@@ -200,7 +200,7 @@ ami_history_global_drag_end(struct ami_corewindow *ami_cw,
int x, int y)
}
if((ok == false) || (url == NULL)) {
- DisplayBeep(ami_gui_get_screen());
+ ami_gui_beep();
} else if(url) {
if((gwin = ami_window_at_pointer(AMINS_WINDOW))) {
browser_window_navigate(ami_gui2_get_browser_window(gwin),
@@ -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 f8a8816..fc980be 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 f8df8c8..9a1d423 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 6c0c1cd..e7c7a63 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 e0b5254..97c70b9 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 e46c9df..853c06f 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 92b06a1..854d6b0 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,
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
