Merge branch '4.1'

jun7 · Nov 14, 2024 · 3db0580 · 3db0580
2 parents 2e63102 + 48d26d3
commit 3db0580
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/general.c b/general.c
@@ -167,7 +167,7 @@ static Conf dconf[] = {
 	{DSET    , "msgcolor"         , "#c07"},
 	{DSET    , "msgmsec"          , "600"},
 	{DSET    , "keepfavicondb"    , "false"},
-	{DSET    , "newwinhandle"     , "normal", "ignore | back | normal"},
+	{DSET    , "newwinhandle"     , "normal", "notnew | ignore | back | normal"},
 	{DSET    , "scriptdialog"     , "true"},
 
 	//loading

diff --git a/main.c b/main.c
@@ -4003,7 +4003,18 @@ static GtkWidget *createcb(Win *win)
 {
 	char *handle = getset(win, "newwinhandle");
 
-	if      (!g_strcmp0(handle, "notnew")) showmsg(win, "notnew no longer works");
+	if (!g_strcmp0(handle, "notnew"))
+		if (win->link)
+		{
+			showmsg(win, "Create window is canceled");
+			openuri(win, win->link);
+		}
+		else
+		{
+			Win *new = newwin(NULL, win, win, 0);
+			showmsg(new, "Link URL was not set");
+			return new->kitw;
+		}
 	else if (!g_strcmp0(handle, "ignore")) showmsg(win, "Create window is ignored") ;
 	else if (!g_strcmp0(handle, "back"  )) return newwin(NULL, win, win, 1)->kitw;
 	else                       /*normal*/  return newwin(NULL, win, win, 0)->kitw;