4 files changed, 39 insertions, 24 deletions

diff --git a/src/app.c b/src/app.c
index 41e96b2d..6f076c97 100644
--- a/src/app.c
+++ b/src/app.c
@@ -57,6 +57,7 @@ struct Impl_App {
     iBool        pendingRefresh;
     iGmCerts *   certs;
     iVisited *   visited;
+    int          tabEnum;
     /* Preferences: */
     iBool        retainWindowSize;
     float        uiScale;
@@ -151,6 +152,7 @@ static void init_App_(iApp *d, int argc, char **argv) {
     d->pendingRefresh   = iFalse;
     d->certs            = new_GmCerts(dataDir_App_);
     d->visited          = new_Visited();
+    d->tabEnum          = 0;
     loadPrefs_App_(d);
     load_Visited(d->visited, dataDir_App_);
 #if defined (iHaveLoadEmbed)
@@ -351,6 +353,28 @@ iDocumentWidget *document_Command(const char *cmd) {
     return document_App();
 }
 
+iDocumentWidget *newTab_App(const iDocumentWidget *duplicateOf) {
+    iApp *d = &app_;
+    iWidget *tabs = findWidget_App("doctabs");
+    setFlags_Widget(tabs, hidden_WidgetFlag, iFalse);
+    iWidget *newTabButton = findChild_Widget(tabs, "newtab");
+    removeChild_Widget(newTabButton->parent, newTabButton);
+    iDocumentWidget *doc;
+    if (duplicateOf) {
+        doc = duplicate_DocumentWidget(duplicateOf);
+    }
+    else {
+        doc = new_DocumentWidget();
+    }
+    setId_Widget(as_Widget(doc), format_CStr("document%03d", ++d->tabEnum));
+    appendTabPage_Widget(tabs, iClob(doc), "", 0, 0);
+    addChild_Widget(findChild_Widget(tabs, "tabs.buttons"), iClob(newTabButton));
+    postCommandf_App("tabs.switch page:%p", doc);
+    arrange_Widget(tabs);
+    refresh_Widget(tabs);
+    return doc;
+}
+
 iBool handleCommand_App(const char *cmd) {
     iApp *d = &app_;
     if (equal_Command(cmd, "open")) {
@@ -363,6 +387,9 @@ iBool handleCommand_App(const char *cmd) {
             return iTrue;
         }
         iDocumentWidget *doc = document_Command(cmd);
+        if (argLabel_Command(cmd, "newtab")) {
+            doc = newTab_App(NULL);
+        }
         iHistory *history = history_DocumentWidget(doc);
         const iBool isHistory = argLabel_Command(cmd, "history") != 0;
         if (!isHistory) {
@@ -393,27 +420,11 @@ iBool handleCommand_App(const char *cmd) {
         return iFalse;
     }
     else if (equal_Command(cmd, "tabs.new")) {
-        iWidget *tabs = findWidget_App("doctabs");
-        setFlags_Widget(tabs, hidden_WidgetFlag, iFalse);
-        iWidget *newTabButton = findChild_Widget(tabs, "newtab");
-        removeChild_Widget(newTabButton->parent, newTabButton);
-        iDocumentWidget *newDoc;
-        const iBool isDuplicate = (argLabel_Command(cmd, "duplicate") != 0);
-        if (isDuplicate) {
-            newDoc = duplicate_DocumentWidget(document_App());
-        }
-        else {
-            newDoc = new_DocumentWidget();
-        }
-        setId_Widget(as_Widget(newDoc), format_CStr("document%03d", tabCount_Widget(tabs)));
-        appendTabPage_Widget(tabs, iClob(newDoc), "", 0, 0);
-        addChild_Widget(findChild_Widget(tabs, "tabs.buttons"), iClob(newTabButton));
-        postCommandf_App("tabs.switch page:%p", newDoc);
+        const iBool isDuplicate = argLabel_Command(cmd, "duplicate") != 0;
+        iDocumentWidget *newDoc = newTab_App(isDuplicate ? document_App() : NULL);
         if (!isDuplicate) {
             postCommand_App("navigate.home");
         }        
-        arrange_Widget(tabs);
-        refresh_Widget(tabs);
         return iTrue;
     }
     else if (equal_Command(cmd, "tabs.close")) {
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 2e51f253..90c270fc 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -545,7 +545,7 @@ void setUrlFromCache_DocumentWidget(iDocumentWidget *d, const iString *url, iBoo
     }
 }
 
-iDocumentWidget *duplicate_DocumentWidget(iDocumentWidget *orig) {
+iDocumentWidget *duplicate_DocumentWidget(const iDocumentWidget *orig) {
     iDocumentWidget *d = new_DocumentWidget();
     delete_History(d->history);
     d->textSizePercent = orig->textSizePercent;
@@ -1060,7 +1060,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
             return iTrue;
         }
     }
-    processContextMenuEvent_Widget(d->menu, ev);
+    processContextMenuEvent_Widget(d->menu, ev, d->hoverLink = NULL);
     switch (processEvent_Click(&d->click, ev)) {
         case started_ClickResult:
             d->selecting = iFalse;
@@ -1084,6 +1084,9 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
             return iTrue;
         }
         case finished_ClickResult:
+            if (isVisible_Widget(d->menu)) {
+                closeMenu_Widget(d->menu);
+            }
             if (!isMoved_Click(&d->click)) {
                 if (d->hoverLink) {
                     const iGmLinkId linkId = d->hoverLink->linkId;
@@ -1115,7 +1118,8 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                         refresh_Widget(w);
                     }
                     else {
-                        postCommandf_App("open url:%s",
+                        postCommandf_App("open newtab:%d url:%s",
+                                         (SDL_GetModState() & KMOD_PRIMARY) != 0,
                                          cstr_String(absoluteUrl_String(
                                              d->url, linkUrl_GmDocument(d->doc, linkId))));
                     }
diff --git a/src/ui/documentwidget.h b/src/ui/documentwidget.h
index 5e7c3f2c..85b9a710 100644
--- a/src/ui/documentwidget.h
+++ b/src/ui/documentwidget.h
@@ -7,7 +7,7 @@ iDeclareType(History)
 iDeclareWidgetClass(DocumentWidget)
 iDeclareObjectConstruction(DocumentWidget)
 
-iDocumentWidget *duplicate_DocumentWidget       (iDocumentWidget *);
+iDocumentWidget *duplicate_DocumentWidget       (const iDocumentWidget *);
 iHistory *      history_DocumentWidget          (iDocumentWidget *);
 
 const iString * url_DocumentWidget              (const iDocumentWidget *);
diff --git a/src/ui/util.h b/src/ui/util.h
index 26066e53..b67f0a87 100644
--- a/src/ui/util.h
+++ b/src/ui/util.h
@@ -84,9 +84,9 @@ void        closeMenu_Widget    (iWidget *);
 
 int         checkContextMenu_Widget   (iWidget *, const SDL_Event *ev); /* see macro below */
 
-#define processContextMenuEvent_Widget(menu, sdlEvent) \
+#define processContextMenuEvent_Widget(menu, sdlEvent, stmtEaten) \
     for (const int result = checkContextMenu_Widget((menu), (sdlEvent));;) { \
-        if (result) return result >> 1; \
+        if (result) { {stmtEaten;} return result >> 1; } \
         break; \
     }