Replace curbw (current browser_window, used mostly for ARexx support) with cur_gw (current gui_window)

4 files changed, 27 insertions, 27 deletions

diff --git a/amiga/arexx.c b/amiga/arexx.c
index 867f71e63..8d6e8766d 100644
--- a/amiga/arexx.c
+++ b/amiga/arexx.c
@@ -221,7 +221,7 @@ static struct browser_window *ami_find_tab(int window, int tab)
 STATIC VOID rx_open(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unused)))
 {
 	struct dlnode *dln;
-	struct browser_window *bw = curbw;
+	struct browser_window *bw = cur_gw->bw;
 	nsurl *url;
 
 	cmd->ac_RC = 0;
@@ -244,7 +244,7 @@ STATIC VOID rx_open(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unu
 		dln->node.ln_Type = NT_USER;
 		AddTail(&bw->window->dllist, (struct Node *)dln);
 		if(!bw->download) {
-			browser_window_navigate(curbw,
+			browser_window_navigate(cur_gw->bw,
 					url,
 					NULL,
 					BW_NAVIGATE_DOWNLOAD,
@@ -299,7 +299,7 @@ STATIC VOID rx_save(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unu
 	BPTR fh = 0;
 	ULONG source_size;
 	const char *source_data;
-	struct browser_window *bw = curbw;
+	struct gui_window *gw = cur_gw;
 
 	cmd->ac_RC = 0;
 
@@ -308,18 +308,18 @@ STATIC VOID rx_save(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unu
 
 	if(!bw) return;
 
-	ami_set_pointer(bw->window->shared, GUI_POINTER_WAIT, false);
+	ami_set_pointer(gw->shared, GUI_POINTER_WAIT, false);
 					
 	if((fh = FOpen((char *)cmd->ac_ArgList[0], MODE_NEWFILE, 0)))
 	{
-		if((source_data = content_get_source_data(bw->current_content, &source_size)))
+		if((source_data = content_get_source_data(gw->bw->current_content, &source_size)))
 			FWrite(fh, source_data, 1, source_size);
 
 		FClose(fh);
-		SetComment((char *)cmd->ac_ArgList[0], nsurl_access(hlcache_handle_get_url(bw->current_content)));
+		SetComment((char *)cmd->ac_ArgList[0], nsurl_access(hlcache_handle_get_url(gw->bw->current_content)));
 	}
 
-	ami_reset_pointer(bw->window->shared);
+	ami_reset_pointer(gw->shared);
 }
 
 STATIC VOID rx_quit(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unused)))
@@ -336,7 +336,7 @@ STATIC VOID rx_tofront(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((
 
 STATIC VOID rx_geturl(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unused)))
 {
-	struct browser_window *bw = curbw;
+	struct browser_window *bw = cur_gw->bw;
 
 	cmd->ac_RC = 0;
 
@@ -357,7 +357,7 @@ STATIC VOID rx_geturl(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((u
 
 STATIC VOID rx_gettitle(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unused)))
 {
-	struct browser_window *bw = curbw;
+	struct browser_window *bw = cur_gw->bw;
 
 	cmd->ac_RC = 0;
 
@@ -463,7 +463,7 @@ STATIC VOID rx_pubscreen(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__
 
 STATIC VOID rx_back(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unused)))
 {
-	struct browser_window *bw = curbw;
+	struct browser_window *bw = cur_gw->bw;
 
 	cmd->ac_RC = 0;
 
@@ -475,7 +475,7 @@ STATIC VOID rx_back(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unu
 
 STATIC VOID rx_forward(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unused)))
 {
-	struct browser_window *bw = curbw;
+	struct browser_window *bw = cur_gw->bw;
 
 	cmd->ac_RC = 0;
 
@@ -488,7 +488,7 @@ STATIC VOID rx_forward(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((
 
 STATIC VOID rx_home(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unused)))
 {
-	struct browser_window *bw = curbw;
+	struct browser_window *bw = cur_gw->bw;
 	nsurl *url;
 
 	cmd->ac_RC = 0;
@@ -514,7 +514,7 @@ STATIC VOID rx_home(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unu
 
 STATIC VOID rx_reload(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unused)))
 {
-	struct browser_window *bw = curbw;
+	struct browser_window *bw = cur_gw->bw;
 
 	cmd->ac_RC = 0;
 
@@ -552,7 +552,7 @@ STATIC VOID rx_windows(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((
 STATIC VOID rx_active(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unused)))
 {
 	int window = 0, tab = 0;
-	struct browser_window *bw = curbw;
+	struct browser_window *bw = cur_gw->bw;
 	struct nsObject *node, *nnode;
 	struct gui_window_2 *gwin = NULL;
 
@@ -594,7 +594,7 @@ STATIC VOID rx_active(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((u
 
 STATIC VOID rx_close(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unused)))
 {
-	struct browser_window *bw = curbw;
+	struct browser_window *bw = cur_gw->bw;
 
 	cmd->ac_RC = 0;
 
diff --git a/amiga/gui.c b/amiga/gui.c
index 90ad909eb..f062cb916 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -2401,7 +2401,7 @@ static void ami_handle_msg(void)
 										(ULONG)gwin, gwin->win->Title, appport,
 										0, gwin->dobj, NULL);
 
-					curbw = NULL;
+					cur_gw = NULL;
 				}
 				break;
 
@@ -2411,7 +2411,7 @@ static void ami_handle_msg(void)
 				break;
 
 				case WMHI_ACTIVE:
-					if(gwin->gw->bw) curbw = gwin->gw->bw;
+					if(gwin->gw->bw) cur_gw = gwin->gw;
 					if(gwin->gw->c_h_temp)
 						gwin->gw->c_h = gwin->gw->c_h_temp;
 				break;
@@ -2641,11 +2641,11 @@ static void ami_handle_applib(void)
 			break;
 
 			case APPLIBMT_ToFront:
-				if(curbw)
+				if(cur_gw)
 				{
 					ScreenToFront(scrn);
-					WindowToFront(curbw->window->shared->win);
-					ActivateWindow(curbw->window->shared->win);
+					WindowToFront(cur_gw->shared->win);
+					ActivateWindow(cur_gw->shared->win);
 				}
 			break;
 
@@ -2789,7 +2789,7 @@ void ami_switch_tab(struct gui_window_2 *gwin, bool redraw)
 	GetClickTabNodeAttrs(tabnode,
 				TNA_UserData, &gwin->gw,
 				TAG_DONE);
-	curbw = gwin->gw->bw;
+	cur_gw = gwin->gw;
 
 	if(ami_gui_get_space_box((Object *)gwin->objects[GID_BROWSER], &bbox) != NSERROR_OK) {
 		warn_user("NoMemory", "");
@@ -3958,7 +3958,7 @@ gui_window_create(struct browser_window *bw,
 
 	g->shared->rmbtrapped = FALSE;
 	g->shared->gw = g;
-	curbw = bw;
+	cur_gw = g;
 
 	g->shared->appwin = AddAppWindowA((ULONG)g->shared->objects[OID_MAIN],
 							(ULONG)g->shared, g->shared->win, appport, NULL);
@@ -4033,7 +4033,7 @@ static void gui_window_destroy(struct gui_window *g)
 	FreeObjList(g->deferred_rects);
 	gui_window_stop_throbber(g);
 
-	curbw = NULL;
+	cur_gw = NULL;
 
 	if(g->shared->tabs > 1)
 	{
diff --git a/amiga/gui.h b/amiga/gui.h
index 7638e350d..c4a0575ab 100755
--- a/amiga/gui.h
+++ b/amiga/gui.h
@@ -200,7 +200,7 @@ struct Screen *scrn;
 STRPTR nsscreentitle;
 struct MsgPort *sport;
 bool win_destroyed;
-struct browser_window *curbw;
+struct gui_window *cur_gw;
 struct gui_globals browserglob;
 BOOL ami_autoscroll;
 BOOL popupmenu_lib_ok;
diff --git a/amiga/gui_options.c b/amiga/gui_options.c
index 78527ca34..8eb18f352 100755
--- a/amiga/gui_options.c
+++ b/amiga/gui_options.c
@@ -1974,13 +1974,13 @@ BOOL ami_gui_opts_event(void)
 					break;
 
 					case GID_OPTS_HOMEPAGE_CURRENT:
-						if(curbw) RefreshSetGadgetAttrs((struct Gadget *)gow->objects[GID_OPTS_HOMEPAGE],
+						if(cur_gw) RefreshSetGadgetAttrs((struct Gadget *)gow->objects[GID_OPTS_HOMEPAGE],
 							gow->win, NULL, STRINGA_TextVal,
-							nsurl_access(hlcache_handle_get_url(curbw->current_content)), TAG_DONE);
+							nsurl_access(hlcache_handle_get_url(cur_gw->bw->current_content)), TAG_DONE);
 					break;
 
 					case GID_OPTS_HOMEPAGE_BLANK:
-						if(curbw) RefreshSetGadgetAttrs((struct Gadget *)gow->objects[GID_OPTS_HOMEPAGE],
+						RefreshSetGadgetAttrs((struct Gadget *)gow->objects[GID_OPTS_HOMEPAGE],
 							gow->win, NULL, STRINGA_TextVal,
 							"about:blank", TAG_DONE);
 					break;