From 5c7b5476f0739e5f62071800830b7600a64a3dd5 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Tue, 7 May 2019 21:45:40 +0100 Subject: Make gui_window private to gui.c TODO: ratonalise these accessors --- frontends/amiga/arexx.c | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'frontends/amiga/arexx.c') diff --git a/frontends/amiga/arexx.c b/frontends/amiga/arexx.c index 5be8a4f2e..b2e2ac89e 100644 --- a/frontends/amiga/arexx.c +++ b/frontends/amiga/arexx.c @@ -226,7 +226,7 @@ static int ami_find_tab_bw(struct gui_window_2 *gwin, struct browser_window *bw) GetClickTabNodeAttrs(ctab, TNA_UserData, &tgw, TAG_DONE); - if(tgw->bw == bw) return tabs; + if(ami_gui_get_browser_window(tgw) == bw) return tabs; } while((ctab=ntab)); return 0; @@ -281,8 +281,8 @@ RXHOOKF(rx_open) dln->filename = strdup((char *)cmd->ac_ArgList[3]); dln->node.ln_Name = strdup((char *)cmd->ac_ArgList[0]); dln->node.ln_Type = NT_USER; - AddTail(&gw->dllist, (struct Node *)dln); - browser_window_navigate(gw->bw, + AddTail(ami_gui_get_download_list(gw), (struct Node *)dln); + browser_window_navigate(ami_gui_get_browser_window(gw), url, NULL, BW_NAVIGATE_DOWNLOAD, @@ -303,11 +303,11 @@ RXHOOKF(rx_open) BW_CREATE_TAB, url, NULL, - gw->bw, + ami_gui_get_browser_window(gw), NULL); if(cmd->ac_ArgList[6]) { - ami_gui_switch_to_new_tab(gw->shared); + ami_gui_switch_to_new_tab(ami_gui_get_gui_window_2(gw)); } } } @@ -323,7 +323,7 @@ RXHOOKF(rx_open) { if(gw) { - browser_window_navigate(gw->bw, + browser_window_navigate(ami_gui_get_browser_window(gw), url, NULL, BW_NAVIGATE_HISTORY, @@ -355,23 +355,23 @@ RXHOOKF(rx_save) if(!gw) return; - ami_set_pointer(gw->shared, GUI_POINTER_WAIT, false); + ami_set_pointer(ami_gui_get_gui_window_2(gw), GUI_POINTER_WAIT, false); if((fh = FOpen((char *)cmd->ac_ArgList[0], MODE_NEWFILE, 0))) { const uint8_t *source_data; size_t source_size; - struct hlcache_handle *h = browser_window_get_content(gw->bw); + struct hlcache_handle *h = browser_window_get_content(ami_gui_get_browser_window(gw)); source_data = content_get_source_data(h, &source_size); if (source_data != NULL) { FWrite(fh, source_data, 1, source_size); } FClose(fh); - SetComment((char *)cmd->ac_ArgList[0], nsurl_access(browser_window_access_url(gw->bw))); + SetComment((char *)cmd->ac_ArgList[0], nsurl_access(browser_window_access_url(ami_gui_get_browser_window(gw)))); } - ami_reset_pointer(gw->shared); + ami_reset_pointer(ami_gui_get_gui_window_2(gw)); } RXHOOKF(rx_quit) @@ -395,9 +395,9 @@ RXHOOKF(rx_geturl) if((cmd->ac_ArgList[0]) && (cmd->ac_ArgList[1])) gw = ami_find_tab(*(ULONG *)cmd->ac_ArgList[0], *(ULONG *)cmd->ac_ArgList[1]); - if(gw && gw->bw) + if(gw && ami_gui_get_browser_window(gw)) { - strcpy(result, nsurl_access(browser_window_access_url(gw->bw))); + strcpy(result, nsurl_access(browser_window_access_url(ami_gui_get_browser_window(gw)))); } else { @@ -418,10 +418,10 @@ RXHOOKF(rx_gettitle) if(gw) { - if(gw->shared->tabs > 1) - strcpy(result, gw->tabtitle); + if(ami_gui_get_gui_window_2(gw)->tabs > 1) + strcpy(result, ami_gui_get_tab_title(gw)); else - strcpy(result, gw->shared->wintitle); + strcpy(result, ami_gui_get_gui_window_2(gw)->wintitle); } else { @@ -522,7 +522,7 @@ RXHOOKF(rx_back) if((cmd->ac_ArgList[0]) && (cmd->ac_ArgList[1])) gw = ami_find_tab(*(ULONG *)cmd->ac_ArgList[0], *(ULONG *)cmd->ac_ArgList[1]); - if(gw) ami_gui_history(gw->shared, true); + if(gw) ami_gui_history(ami_gui_get_gui_window_2(gw), true); } RXHOOKF(rx_forward) @@ -534,7 +534,7 @@ RXHOOKF(rx_forward) if((cmd->ac_ArgList[0]) && (cmd->ac_ArgList[1])) gw = ami_find_tab(*(ULONG *)cmd->ac_ArgList[0], *(ULONG *)cmd->ac_ArgList[1]); - if(gw) ami_gui_history(gw->shared, false); + if(gw) ami_gui_history(ami_gui_get_gui_window_2(gw), false); } @@ -553,7 +553,7 @@ RXHOOKF(rx_home) if (nsurl_create(nsoption_charp(homepage_url), &url) != NSERROR_OK) { amiga_warn_user("NoMemory", 0); } else { - browser_window_navigate(gw->bw, + browser_window_navigate(ami_gui_get_browser_window(gw), url, NULL, BW_NAVIGATE_HISTORY, @@ -577,11 +577,11 @@ RXHOOKF(rx_reload) { if(cmd->ac_ArgList[0]) /* FORCE */ { - browser_window_reload(gw->bw, true); + browser_window_reload(ami_gui_get_browser_window(gw), true); } else { - browser_window_reload(gw->bw, false); + browser_window_reload(ami_gui_get_browser_window(gw), false); } } } @@ -636,7 +636,7 @@ RXHOOKF(rx_active) if(cmd->ac_ArgList[0]) { - tab = ami_find_tab_bw(gwin, gw->bw); + tab = ami_find_tab_bw(gwin, ami_gui_get_browser_window(gw)); } if(cmd->ac_ArgList[0]) sprintf(result, "%d", tab); @@ -654,11 +654,11 @@ RXHOOKF(rx_close) gw = ami_find_tab(*(ULONG *)cmd->ac_ArgList[0], *(ULONG *)cmd->ac_ArgList[1]); else if(cmd->ac_ArgList[0]) { - ami_gui_close_window(gw->shared); + ami_gui_close_window(ami_gui_get_gui_window_2(gw)); return; } - if(gw) browser_window_destroy(gw->bw); + if(gw) browser_window_destroy(ami_gui_get_browser_window(gw)); } RXHOOKF(rx_hotlist) -- cgit v1.2.3