Allow tab creation without history clone. Changes browser_window_create and browser_window_navigate flags.

7 files changed, 60 insertions, 84 deletions

diff --git a/amiga/arexx.c b/amiga/arexx.c
index 472aea1ce..515ee6d00 100644
--- a/amiga/arexx.c
+++ b/amiga/arexx.c
@@ -248,8 +248,8 @@ STATIC VOID rx_open(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unu
 			browser_window_navigate(curbw,
 					url,
 					NULL,
-					BROWSER_WINDOW_DOWNLOAD |
-					BROWSER_WINDOW_VERIFIABLE,
+					BW_NAVIGATE_DOWNLOAD |
+					BW_NAVIGATE_VERIFIABLE,
 					NULL,
 					NULL,
 					NULL);
@@ -257,9 +257,8 @@ STATIC VOID rx_open(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unu
 	}
 	else if(cmd->ac_ArgList[2])
 	{
-		browser_window_create(BROWSER_WINDOW_VERIFIABLE |
-				      BROWSER_WINDOW_HISTORY |
-				      BROWSER_WINDOW_TAB,
+		browser_window_create(BW_CREATE_HISTORY |
+				      BW_CREATE_TAB,
 				      url,
 				      NULL,
 				      bw,
@@ -267,8 +266,7 @@ STATIC VOID rx_open(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unu
 	}
 	else if(cmd->ac_ArgList[1])
 	{
-		browser_window_create(BROWSER_WINDOW_VERIFIABLE |
-				      BROWSER_WINDOW_HISTORY,
+		browser_window_create(BW_CREATE_HISTORY,
 				      url,
 				      NULL,
 				      NULL,
@@ -281,16 +279,15 @@ STATIC VOID rx_open(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unu
 			browser_window_navigate(bw,
 					url,
 					NULL,
-					BROWSER_WINDOW_HISTORY |
-					BROWSER_WINDOW_VERIFIABLE,
+					BW_NAVIGATE_HISTORY |
+					BW_NAVIGATE_VERIFIABLE,
 					NULL,
 					NULL,
 					NULL);
 		}
 		else
 		{
-			browser_window_create(BROWSER_WINDOW_VERIFIABLE |
-					      BROWSER_WINDOW_HISTORY,
+			browser_window_create(BW_CREATE_HISTORY,
 					      url,
 					      NULL,
 					      NULL,
@@ -510,8 +507,8 @@ STATIC VOID rx_home(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unu
 		browser_window_navigate(bw,
 					url,
 					NULL,
-					BROWSER_WINDOW_HISTORY |
-					BROWSER_WINDOW_VERIFIABLE,
+					BW_NAVIGATE_HISTORY |
+					BW_NAVIGATE_VERIFIABLE,
 					NULL,
 					NULL,
 					NULL);
diff --git a/amiga/context_menu.c b/amiga/context_menu.c
index a1ce624e5..0662a2c33 100644
--- a/amiga/context_menu.c
+++ b/amiga/context_menu.c
@@ -779,8 +779,7 @@ static uint32 ami_context_menu_hook(struct Hook *hook,Object *item,APTR reserved
 			case CMID_URLOPENWIN:
 				error = nsurl_create(userdata, &url);
 				if (error == NSERROR_OK) {
-					error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
-								      BROWSER_WINDOW_HISTORY,
+					error = browser_window_create(BW_CREATE_CLONE | BW_CREATE_HISTORY,
 								      url,
 								      hlcache_handle_get_url(gwin->bw->current_content),
 								      gwin->bw,
@@ -798,9 +797,7 @@ static uint32 ami_context_menu_hook(struct Hook *hook,Object *item,APTR reserved
 			case CMID_URLOPENTAB:
 				error = nsurl_create(userdata, &url);
 				if (error == NSERROR_OK) {
-					error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
-								      BROWSER_WINDOW_HISTORY |
-								      BROWSER_WINDOW_TAB,
+					error = browser_window_create(BW_CREATE_CLONE | BW_CREATE_HISTORY | BW_CREATE_TAB,
 								      url,
 								      hlcache_handle_get_url(gwin->bw->current_content),
 								      gwin->bw,
@@ -823,8 +820,8 @@ static uint32 ami_context_menu_hook(struct Hook *hook,Object *item,APTR reserved
 					browser_window_navigate(gwin->bw,
 						url,
 						hlcache_handle_get_url(gwin->bw->current_content),
-						BROWSER_WINDOW_DOWNLOAD |
-						BROWSER_WINDOW_VERIFIABLE,
+						BW_NAVIGATE_DOWNLOAD |
+						BW_NAVIGATE_VERIFIABLE,
 						NULL,
 						NULL,
 						NULL);
@@ -838,8 +835,8 @@ static uint32 ami_context_menu_hook(struct Hook *hook,Object *item,APTR reserved
 				browser_window_navigate(gwin->bw,
 					hlcache_handle_get_url(userdata),
 					hlcache_handle_get_url(gwin->bw->current_content),
-					BROWSER_WINDOW_HISTORY |
-					BROWSER_WINDOW_VERIFIABLE,
+					BW_NAVIGATE_HISTORY |
+					BW_NAVIGATE_VERIFIABLE,
 					NULL,
 					NULL,
 					NULL);
@@ -855,8 +852,8 @@ static uint32 ami_context_menu_hook(struct Hook *hook,Object *item,APTR reserved
 					browser_window_navigate(gwin->bw,
 						url,
 						hlcache_handle_get_url(gwin->bw->current_content),
-						BROWSER_WINDOW_HISTORY |
-						BROWSER_WINDOW_VERIFIABLE,
+						BW_NAVIGATE_HISTORY |
+						BW_NAVIGATE_VERIFIABLE,
 						NULL,
 						NULL,
 						NULL);
@@ -931,8 +928,8 @@ static uint32 ami_context_menu_hook(struct Hook *hook,Object *item,APTR reserved
 					browser_window_navigate(gwin->bw,
 						url,
 						NULL,
-						BROWSER_WINDOW_HISTORY |
-						BROWSER_WINDOW_VERIFIABLE,
+						BW_NAVIGATE_HISTORY |
+						BW_NAVIGATE_VERIFIABLE,
 						NULL,
 						NULL,
 						NULL);
@@ -1002,8 +999,8 @@ static uint32 ami_context_menu_hook(struct Hook *hook,Object *item,APTR reserved
 						browser_window_navigate(gwin->bw,
 							url,
 							NULL,
-							BROWSER_WINDOW_HISTORY |
-							BROWSER_WINDOW_VERIFIABLE,
+							BW_NAVIGATE_HISTORY |
+							BW_NAVIGATE_VERIFIABLE,
 							NULL,
 							NULL,
 							NULL);
diff --git a/amiga/download.c b/amiga/download.c
index a65fad99f..a716d3862 100644
--- a/amiga/download.c
+++ b/amiga/download.c
@@ -274,8 +274,8 @@ static void gui_download_window_done(struct gui_download_window *dw)
 			browser_window_navigate(bw,
 				url,
 				NULL,
-				BROWSER_WINDOW_DOWNLOAD |
-				BROWSER_WINDOW_VERIFIABLE,
+				BW_NAVIGATE_DOWNLOAD |
+				BW_NAVIGATE_VERIFIABLE,
 				NULL,
 				NULL,
 				NULL);
diff --git a/amiga/file.c b/amiga/file.c
index 9500b4084..8cf460f61 100644
--- a/amiga/file.c
+++ b/amiga/file.c
@@ -103,8 +103,8 @@ void ami_file_open(struct gui_window_2 *gwin)
 				browser_window_navigate(gwin->bw,
 					url,
 					NULL,
-					BROWSER_WINDOW_HISTORY |
-					BROWSER_WINDOW_VERIFIABLE,
+					BW_NAVIGATE_HISTORY |
+					BW_NAVIGATE_VERIFIABLE,
 					NULL,
 					NULL,
 					NULL);
diff --git a/amiga/gui.c b/amiga/gui.c
index aebdf3ade..137e1593b 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -904,8 +904,7 @@ static void gui_init2(int argc, char** argv)
 	if(temp_homepage_url && notalreadyrunning) {
 		error = nsurl_create(temp_homepage_url, &url);
 		if (error == NSERROR_OK) {
-			error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
-					BROWSER_WINDOW_HISTORY,
+			error = browser_window_create(BW_CREATE_HISTORY,
 					url,
 					NULL,
 					NULL,
@@ -950,8 +949,7 @@ static void gui_init2(int argc, char** argv)
 					if (error == NSERROR_OK) {
 						if(!first)
 						{
-							error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
-										      BROWSER_WINDOW_HISTORY,
+							error = browser_window_create(BW_CREATE_HISTORY,
 										      url,
 										      NULL,
 										      NULL,
@@ -961,8 +959,7 @@ static void gui_init2(int argc, char** argv)
 						}
 						else
 						{
-							error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
-										      BROWSER_WINDOW_HISTORY,
+							error = browser_window_create(BW_CREATE_CLONE | BW_CREATE_HISTORY,
 										      url,
 										      NULL,
 										      bw,
@@ -1044,8 +1041,7 @@ static void gui_init2(int argc, char** argv)
 	if(!bw && (nsoption_bool(startup_no_window) == false)) {
 		error = nsurl_create(nsoption_charp(homepage_url), &url);
 		if (error == NSERROR_OK) {
-			error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
-						      BROWSER_WINDOW_HISTORY,
+			error = browser_window_create(BW_CREATE_HISTORY,
 						      url,
 						      NULL,
 						      NULL,
@@ -1859,8 +1855,8 @@ void ami_handle_msg(void)
 									browser_window_navigate(gwin->bw,
 											url,
 											NULL,
-											BROWSER_WINDOW_HISTORY |
-											BROWSER_WINDOW_VERIFIABLE,
+											BW_NAVIGATE_HISTORY |
+											BW_NAVIGATE_VERIFIABLE,
 											NULL,
 											NULL,
 											NULL);
@@ -1886,8 +1882,8 @@ void ami_handle_msg(void)
 									browser_window_navigate(gwin->bw,
 											url,
 											NULL,
-											BROWSER_WINDOW_HISTORY |
-											BROWSER_WINDOW_VERIFIABLE,
+											BW_NAVIGATE_HISTORY |
+											BW_NAVIGATE_VERIFIABLE,
 											NULL,
 											NULL,
 											NULL);
@@ -1904,8 +1900,8 @@ void ami_handle_msg(void)
 									browser_window_navigate(gwin->bw,
 											url,
 											NULL,
-											BROWSER_WINDOW_HISTORY |
-											BROWSER_WINDOW_VERIFIABLE,
+											BW_NAVIGATE_HISTORY |
+											BW_NAVIGATE_VERIFIABLE,
 											NULL,
 											NULL,
 											NULL);
@@ -1992,8 +1988,7 @@ void ami_handle_msg(void)
 
 									error = nsurl_create(nsoption_charp(homepage_url), &urlns);
 									if (error == NSERROR_OK) {
-										error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
-													      BROWSER_WINDOW_HISTORY,
+										error = browser_window_create(BW_CREATE_CLONE | BW_CREATE_HISTORY,
 													      urlns,
 													      NULL,
 													      gwin->bw,
@@ -2014,9 +2009,8 @@ void ami_handle_msg(void)
 
 									error = nsurl_create(nsoption_charp(homepage_url), &urlns);
 									if (error == NSERROR_OK) {
-										error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
-													      BROWSER_WINDOW_HISTORY |
-														  BROWSER_WINDOW_TAB,
+										error = browser_window_create(BW_CREATE_CLONE | BW_CREATE_HISTORY |
+													      BW_CREATE_TAB,
 													      urlns,
 													      NULL,
 													      gwin->bw,
@@ -2388,8 +2382,8 @@ void ami_handle_appmsg(void)
 									browser_window_navigate(gwin->bw,
 										url,
 										NULL,
-										BROWSER_WINDOW_HISTORY |
-										BROWSER_WINDOW_VERIFIABLE,
+										BW_NAVIGATE_HISTORY |
+										BW_NAVIGATE_VERIFIABLE,
 										NULL,
 										NULL,
 										NULL);
@@ -2398,9 +2392,8 @@ void ami_handle_appmsg(void)
 								}
 								else
 								{
-									browser_window_create(BROWSER_WINDOW_VERIFIABLE |
-											      BROWSER_WINDOW_HISTORY |
-											      BROWSER_WINDOW_TAB,
+									browser_window_create(BW_CREATE_CLONE | BW_CREATE_HISTORY |
+											      BW_CREATE_TAB,
 											      url,
 											      NULL,
 											      gwin->bw,
@@ -2429,8 +2422,8 @@ void ami_handle_appmsg(void)
 										browser_window_navigate(gwin->bw,
 											url,
 											NULL,
-											BROWSER_WINDOW_HISTORY |
-											BROWSER_WINDOW_VERIFIABLE,
+											BW_NAVIGATE_HISTORY |
+											BW_NAVIGATE_VERIFIABLE,
 											NULL,
 											NULL,
 											NULL);
@@ -2439,9 +2432,8 @@ void ami_handle_appmsg(void)
 									}
 									else
 									{
-										browser_window_create(BROWSER_WINDOW_VERIFIABLE |
-												      BROWSER_WINDOW_HISTORY |
-												      BROWSER_WINDOW_TAB,
+										browser_window_create(BW_CREATE_CLONE | BW_CREATE_HISTORY |
+												      BW_CREATE_TAB,
 												      url,
 												      NULL,
 												      gwin->bw,
@@ -2480,8 +2472,7 @@ void ami_handle_applib(void)
 
 				error = nsurl_create(nsoption_charp(homepage_url), &url);
 				if (error == NSERROR_OK) {
-					error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
-								      BROWSER_WINDOW_HISTORY,
+					error = browser_window_create(BW_CREATE_HISTORY,
 								      url,
 								      NULL,
 								      NULL,
@@ -2504,8 +2495,7 @@ void ami_handle_applib(void)
 
 				error = nsurl_create(tempurl, &url);
 				if (error == NSERROR_OK) {
-					error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
-								      BROWSER_WINDOW_HISTORY,
+					error = browser_window_create(BW_CREATE_HISTORY,
 								      url,
 								      NULL,
 								      NULL,
@@ -3202,9 +3192,8 @@ nserror ami_gui_new_blank_tab(struct gui_window_2 *gwin)
 
 	error = nsurl_create(nsoption_charp(homepage_url), &url);
 	if (error == NSERROR_OK) {
-		error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
-					      BROWSER_WINDOW_HISTORY |
-					      BROWSER_WINDOW_TAB,
+		error = browser_window_create(BW_CREATE_HISTORY |
+					      BW_CREATE_TAB,
 					      url,
 					      NULL,
 					      gwin->bw,
@@ -3216,10 +3205,6 @@ nserror ami_gui_new_blank_tab(struct gui_window_2 *gwin)
 		return error;
 	}
 
-	/* Front end /really/ should not be doing this. */
-	history_destroy(bw->history);
-	bw->history = history_create(bw);
-
 	return NSERROR_OK;
 }
 
@@ -4965,8 +4950,7 @@ void ami_scroller_hook(struct Hook *hook,Object *object,struct IntuiMessage *msg
 						GetSpeedButtonNodeAttrs(node, SBNA_UserData, (ULONG *)&url, TAG_DONE);
 
 						if(gwin->key_state & BROWSER_MOUSE_MOD_2) {
-							browser_window_create(BROWSER_WINDOW_VERIFIABLE |
-										      BROWSER_WINDOW_TAB,
+							browser_window_create(BW_CREATE_TAB,
 										      url,
 										      NULL,
 										      gwin->bw,
@@ -4975,8 +4959,8 @@ void ami_scroller_hook(struct Hook *hook,Object *object,struct IntuiMessage *msg
 							browser_window_navigate(gwin->bw,
 									url,
 									NULL,
-									BROWSER_WINDOW_HISTORY |
-									BROWSER_WINDOW_VERIFIABLE,
+									BW_NAVIGATE_HISTORY |
+									BW_NAVIGATE_VERIFIABLE,
 									NULL,
 									NULL,
 									NULL);
diff --git a/amiga/menu.c b/amiga/menu.c
index 26f5c2b81..9b3c44d30 100644
--- a/amiga/menu.c
+++ b/amiga/menu.c
@@ -698,8 +698,7 @@ static void ami_menu_item_project_newwin(struct Hook *hook, APTR window, struct
 
 	error = nsurl_create(nsoption_charp(homepage_url), &url);
 	if (error == NSERROR_OK) {
-		error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
-					      BROWSER_WINDOW_HISTORY,
+		error = browser_window_create(BW_CREATE_HISTORY,
 					      url,
 					      NULL,
 					      NULL,
@@ -811,8 +810,7 @@ static void ami_menu_item_project_about(struct Hook *hook, APTR window, struct I
 
 	if(url) {
 		if (error == NSERROR_OK) {
-			error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
-							  BROWSER_WINDOW_HISTORY,
+			error = browser_window_create(BW_CREATE_HISTORY,
 							  url,
 							  NULL,
 							  NULL,
@@ -1036,8 +1034,8 @@ static void ami_menu_item_hotlist_entries(struct Hook *hook, APTR window, struct
 	browser_window_navigate(gwin->bw,
 					url,
 					NULL,
-					BROWSER_WINDOW_HISTORY |
-					BROWSER_WINDOW_VERIFIABLE,
+					BW_NAVIGATE_HISTORY |
+					BW_NAVIGATE_VERIFIABLE,
 					NULL,
 					NULL,
 					NULL);
diff --git a/amiga/tree.c b/amiga/tree.c
index 42eae4fa6..38b63388c 100644
--- a/amiga/tree.c
+++ b/amiga/tree.c
@@ -322,8 +322,8 @@ void ami_tree_drag_end(struct treeview_window *twin, int x, int y)
 				browser_window_navigate(gwin->bw,
 						url,
 						NULL,
-						BROWSER_WINDOW_HISTORY |
-						BROWSER_WINDOW_VERIFIABLE,
+						BW_NAVIGATE_HISTORY |
+						BW_NAVIGATE_VERIFIABLE,
 						NULL,
 						NULL,
 						NULL);