summaryrefslogtreecommitdiff
path: root/frontends/amiga/gui.c
diff options
context:
space:
mode:
authorChris Young <chris@unsatisfactorysoftware.co.uk>2017-02-13 00:18:32 +0000
committerChris Young <chris@unsatisfactorysoftware.co.uk>2017-02-13 00:18:32 +0000
commitedaa9c29f22a550ddc7c8e1f02ff6d9dedf9a5b1 (patch)
treeb5e5c8acfc567da678cf7ffd85b11e030942d221 /frontends/amiga/gui.c
parent7b9fa8d7eb60950401065a81efffebd10d84309a (diff)
downloadnetsurf-edaa9c29f22a550ddc7c8e1f02ff6d9dedf9a5b1.tar.gz
netsurf-edaa9c29f22a550ddc7c8e1f02ff6d9dedf9a5b1.tar.bz2
Remove use of global context data from Amiga frontend
Diffstat (limited to 'frontends/amiga/gui.c')
-rw-r--r--frontends/amiga/gui.c19
1 files changed, 5 insertions, 14 deletions
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index b2a489e72..a18d4d5b8 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -993,11 +993,6 @@ static STRPTR ami_gui_read_all_tooltypes(int argc, char **argv)
return current_user;
}
-void ami_gui_set_default_gg(void)
-{
- glob = &browserglob;
-}
-
static void gui_init2(int argc, char** argv)
{
struct Screen *screen;
@@ -1008,9 +1003,6 @@ static void gui_init2(int argc, char** argv)
notalreadyrunning = ami_arexx_init(&rxsig);
- /* Treeview init code ends up calling a font function which needs this */
- ami_gui_set_default_gg();
-
/* ...and this ensures the treeview at least gets the WB colour palette to work with */
if(scrn == NULL) {
if((screen = LockPubScreen("Workbench"))) {
@@ -3529,6 +3521,7 @@ static void ami_do_redraw_tiled(struct gui_window_2 *gwin, bool busy,
int left, int top, int width, int height,
int sx, int sy, struct IBox *bbox, struct redraw_context *ctx)
{
+ struct gui_globals *glob = (struct gui_globals *)ctx->priv;
int x, y;
struct rect clip;
int tile_size_x = glob->width;
@@ -3636,7 +3629,8 @@ static void ami_do_redraw_limits(struct gui_window *g, struct browser_window *bw
struct redraw_context ctx = {
.interactive = true,
.background_images = true,
- .plot = &amiplot
+ .plot = &amiplot,
+ .priv = &browserglob
};
if(!g) return;
@@ -4459,8 +4453,6 @@ gui_window_create(struct browser_window *bw,
ami_gui_win_list_add(g->shared, AMINS_WINDOW, &ami_gui_table);
- ami_gui_set_default_gg();
-
if(locked_screen) {
UnlockPubScreen(NULL,scrn);
locked_screen = FALSE;
@@ -4907,11 +4899,10 @@ static void ami_do_redraw(struct gui_window_2 *gwin)
struct redraw_context ctx = {
.interactive = true,
.background_images = true,
- .plot = &amiplot
+ .plot = &amiplot,
+ .priv = &browserglob
};
- ami_gui_set_default_gg();
-
if(nsoption_bool(direct_render) == false)
{
ami_do_redraw_tiled(gwin, true, hcurrent, vcurrent, width, height, hcurrent, vcurrent, bbox, &ctx);