Opening links in a new background tab

4 files changed, 22 insertions, 17 deletions

diff --git a/src/app.c b/src/app.c
index 8fa16b93..c0c0c47e 100644
--- a/src/app.c
+++ b/src/app.c
@@ -242,7 +242,7 @@ static iBool loadState_App_(iApp *d) {
             readData_File(f, 4, magic);
             if (!memcmp(magic, magicTabDocument_App_, 4)) {
                 if (!doc) {
-                    doc = newTab_App(NULL);
+                    doc = newTab_App(NULL, iTrue);
                 }
                 if (read8_File(f)) {
                     current = doc;
@@ -711,7 +711,7 @@ iDocumentWidget *document_Command(const char *cmd) {
     return document_App();
 }
 
-iDocumentWidget *newTab_App(const iDocumentWidget *duplicateOf) {
+iDocumentWidget *newTab_App(const iDocumentWidget *duplicateOf, iBool switchToNew) {
     iApp *d = &app_;
     iWidget *tabs = findWidget_App("doctabs");
     setFlags_Widget(tabs, hidden_WidgetFlag, iFalse);
@@ -727,7 +727,9 @@ iDocumentWidget *newTab_App(const iDocumentWidget *duplicateOf) {
     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);
+    if (switchToNew) {
+        postCommandf_App("tabs.switch page:%p", doc);
+    }
     arrange_Widget(tabs);
     refresh_Widget(tabs);
     return doc;
@@ -817,8 +819,9 @@ iBool handleCommand_App(const char *cmd) {
             return iTrue;
         }
         iDocumentWidget *doc = document_Command(cmd);
-        if (argLabel_Command(cmd, "newtab")) {
-            doc = newTab_App(NULL);
+        const int newTab = argLabel_Command(cmd, "newtab");
+        if (newTab) {
+            doc = newTab_App(NULL, (newTab & 1) != 0); /* newtab:2 to open in background */
         }
         iHistory *history = history_DocumentWidget(doc);
         const iBool isHistory = argLabel_Command(cmd, "history") != 0;
@@ -853,7 +856,7 @@ iBool handleCommand_App(const char *cmd) {
     }
     else if (equal_Command(cmd, "tabs.new")) {
         const iBool isDuplicate = argLabel_Command(cmd, "duplicate") != 0;
-        newTab_App(isDuplicate ? document_App() : NULL);
+        newTab_App(isDuplicate ? document_App() : NULL, iTrue);
         if (!isDuplicate) {
             postCommand_App("navigate.home");
         }
diff --git a/src/app.h b/src/app.h
index acc3e952..75d9b48c 100644
--- a/src/app.h
+++ b/src/app.h
@@ -70,7 +70,7 @@ iBookmarks *        bookmarks_App       (void);
 iDocumentWidget *   document_App        (void);
 iObjectList *       listDocuments_App   (void);
 iDocumentWidget *   document_Command    (const char *cmd);
-iDocumentWidget *   newTab_App          (const iDocumentWidget *duplicateOf);
+iDocumentWidget *   newTab_App          (const iDocumentWidget *duplicateOf, iBool switchToNew);
 
 iAny *      findWidget_App      (const char *id);
 void        addTicker_App       (void (*ticker)(iAny *), iAny *context);
diff --git a/src/gmdocument.c b/src/gmdocument.c
index 4d4ba603..c533a7f4 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -620,7 +620,6 @@ void init_GmDocument(iGmDocument *d) {
     init_String(&d->title);
     init_Array(&d->headings, sizeof(iGmHeading));
     init_PtrArray(&d->images);
-    setThemeSeed_GmDocument(d, NULL);
 }
 
 void deinit_GmDocument(iGmDocument *d) {
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 91b33464..ac37bb01 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -573,7 +573,9 @@ static void updateDocument_DocumentWidget_(iDocumentWidget *d, const iGmResponse
     if (category_GmStatusCode(statusCode) != categoryInput_GmStatusCode) {
         iString str;
         invalidate_DocumentWidget_(d);
-        updateTheme_DocumentWidget_(d);
+        if (document_App() == d) {
+            updateTheme_DocumentWidget_(d);
+        }
         clear_String(&d->sourceMime);
 //        set_Block(&d->sourceContent, &response->body);
         initBlock_String(&str, &response->body);
@@ -1550,20 +1552,21 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                 iArray items;
                 init_Array(&items, sizeof(iMenuItem));
                 if (d->contextLink) {
+                    const iString *linkUrl = linkUrl_GmDocument(d->doc, d->contextLink->linkId);
                     pushBackN_Array(
                         &items,
-                        (iMenuItem[]){ { "Open Link in New Tab",
+                        (iMenuItem[]){
+                            { "Open Link in New Tab",
                               0,
                               0,
-                              format_CStr("!open newtab:1 url:%s",
-                                          cstr_String(linkUrl_GmDocument(
-                                              d->doc, d->contextLink->linkId))) },
-                            { "---", 0, 0, NULL },
-                            { "Copy Link",
+                              format_CStr("!open newtab:1 url:%s", cstr_String(linkUrl)) },
+                            { "Open Link in Background Tab",
                               0,
                               0,
-                              "document.copylink" }},
-                        3);
+                              format_CStr("!open newtab:2 url:%s", cstr_String(linkUrl)) },
+                            { "---", 0, 0, NULL },
+                            { "Copy Link", 0, 0, "document.copylink" } },
+                        4);
                 }
                 else {
                     if (!isEmpty_Range(&d->selectMark)) {