6 files changed, 96 insertions, 27 deletions

diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index ed38ad0b..5a5a4f84 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -298,10 +298,12 @@ struct Impl_DocumentWidget {
 
 iDefineObjectConstruction(DocumentWidget)
 
+static int docEnum_ = 0;
+
 void init_DocumentWidget(iDocumentWidget *d) {
     iWidget *w = as_Widget(d);
     init_Widget(w);
-    setId_Widget(w, "document000");
+    setId_Widget(w, format_CStr("document%03d", ++docEnum_));
     setFlags_Widget(w, hover_WidgetFlag, iTrue);
     init_PersistentDocumentState(&d->mod);
     d->flags           = 0;
@@ -880,7 +882,7 @@ static void updateWindowTitle_DocumentWidget_(const iDocumentWidget *d) {
     }
     /* Take away parts if it doesn't fit. */
     const int avail = bounds_Widget(as_Widget(tabButton)).size.x - 3 * gap_UI;
-    iBool setWindow = (document_App() == d);
+    iBool setWindow = (document_App() == d && isUnderKeyRoot_Widget(d));
     for (;;) {
         iString *text = collect_String(joinCStr_StringArray(title, " \u2014 "));
         if (setWindow) {
@@ -1094,6 +1096,7 @@ static const char *zipPageHeading_(const iRangecc mime) {
 }
 
 static void postProcessRequestContent_DocumentWidget_(iDocumentWidget *d) {
+    iWidget *w = as_Widget(d);
     delete_Gempub(d->sourceGempub);
     d->sourceGempub = NULL;
     if (!cmpCase_String(&d->sourceMime, "application/octet-stream") ||
@@ -1111,20 +1114,27 @@ static void postProcessRequestContent_DocumentWidget_(iDocumentWidget *d) {
         }
     }
     if (!d->sourceGempub) {
-        iString *localPath = localFilePathFromUrl_String(d->mod.url);
+        const iString *localPath = collect_String(localFilePathFromUrl_String(d->mod.url));
+        iBool isInside = iFalse;
+        if (localPath && !fileExists_FileInfo(localPath)) {
+            /* This URL may refer to a file inside the archive. */
+            localPath = findContainerArchive_Path(localPath);
+            isInside = iTrue;
+        }
         if (localPath && equal_CStr(mediaType_Path(localPath), "application/gpub+zip")) {
             iGempub *gempub = new_Gempub();
             if (openFile_Gempub(gempub, localPath)) {
-                setBaseUrl_Gempub(gempub, d->mod.url);
-                setSource_DocumentWidget(d, collect_String(coverPageSource_Gempub(gempub)));
-                setCStr_String(&d->sourceMime, mimeType_Gempub);
+                setBaseUrl_Gempub(gempub, collect_String(makeFileUrl_String(localPath)));
+                if (!isInside) {
+                    setSource_DocumentWidget(d, collect_String(coverPageSource_Gempub(gempub)));
+                    setCStr_String(&d->sourceMime, mimeType_Gempub);
+                }
                 d->sourceGempub = gempub;
             }
             else {
                 delete_Gempub(gempub);
             }
         }
-        delete_String(localPath);
     }
     if (d->sourceGempub) {
         if (preloadCoverImage_Gempub(d->sourceGempub, d->doc)) {
@@ -1132,6 +1142,26 @@ static void postProcessRequestContent_DocumentWidget_(iDocumentWidget *d) {
             updateVisible_DocumentWidget_(d);
             invalidate_DocumentWidget_(d);
         }
+        if (prefs_App()->pinSplit && equal_String(d->mod.url, indexPageUrl_Gempub(d->sourceGempub))) {
+            const iString *navStart = navStartLinkUrl_Gempub(d->sourceGempub);
+            if (navStart) {
+                iWindow *win = get_Window();
+                /* Auto-split to show index and the first navigation link. */
+                if (numRoots_Window(win) == 2) {
+                    /* This document is showing the index page. */
+                    iRoot *other = otherRoot_Window(win, w->root);
+                    postCommandf_Root(other, "open url:%s", cstr_String(navStart));
+                    if (prefs_App()->pinSplit == 1 && w->root == win->roots[1]) {
+                        /* On the wrong side. */
+                        postCommand_App("ui.split swap:1");
+                    }
+                }
+                else {
+                    postCommandf_App(
+                        "open newtab:%d url:%s", otherRoot_OpenTabFlag, cstr_String(navStart));
+                }
+            }
+        }
     }
 }
 
@@ -1925,7 +1955,8 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         }
         return iTrue;
     }
-    else if (equal_Command(cmd, "window.resized") || equal_Command(cmd, "font.changed")) {
+    else if (equal_Command(cmd, "window.resized") || equal_Command(cmd, "font.changed") ||
+             equal_Command(cmd, "keyroot.changed")) {
         /* Alt/Option key may be involved in window size changes. */
         setLinkNumberMode_DocumentWidget_(d, iFalse);
         d->phoneToolbar = findWidget_App("toolbar");
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 245b76a3..eae0432f 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -265,9 +265,10 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
             break;
         }
         case bookmarks_SidebarMode: {
-            iRegExp *homeTag = iClob(new_RegExp("\\bhomepage\\b", caseSensitive_RegExpOption));
-            iRegExp *subTag  = iClob(new_RegExp("\\bsubscribed\\b", caseSensitive_RegExpOption));
-            iRegExp *remoteSourceTag = iClob(new_RegExp("\\bremotesource\\b", caseSensitive_RegExpOption));
+            iRegExp *homeTag         = iClob(new_RegExp("\\b" homepage_BookmarkTag "\\b", caseSensitive_RegExpOption));
+            iRegExp *subTag          = iClob(new_RegExp("\\b" subscribed_BookmarkTag "\\b", caseSensitive_RegExpOption));
+            iRegExp *remoteSourceTag = iClob(new_RegExp("\\b" remoteSource_BookmarkTag "\\b", caseSensitive_RegExpOption));
+            iRegExp *linkSplitTag    = iClob(new_RegExp("\\b" linkSplit_BookmarkTag "\\b", caseSensitive_RegExpOption));
             iConstForEach(PtrArray, i, list_Bookmarks(bookmarks_App(), cmpTitle_Bookmark_, NULL, NULL)) {
                 const iBookmark *bm = i.ptr;
                 iSidebarItem *item = new_SidebarItem();
@@ -290,6 +291,10 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
                         appendChar_String(&item->meta, 0x2913);
                         item->isBold = iTrue;
                     }
+                    init_RegExpMatch(&m);
+                    if (matchString_RegExp(linkSplitTag, &bm->tags, &m)) {
+                        appendChar_String(&item->meta, 0x25e7);
+                    }
                 }
                 addItem_ListWidget(d->list, item);
                 iRelease(item);
@@ -828,11 +833,15 @@ iBool handleBookmarkEditorCommands_SidebarWidget_(iWidget *editor, const char *c
                 bm->icon = 0;
             }
             else {
-                if (!hasTag_Bookmark(bm, userIcon_BookmarkTag)) {
-                    addTag_Bookmark(bm, userIcon_BookmarkTag);
-                }
+                addTagIfMissing_Bookmark(bm, userIcon_BookmarkTag);
                 bm->icon = first_String(icon);
             }
+            addOrRemoveTag_Bookmark(bm, homepage_BookmarkTag,
+                                    isSelected_Widget(findChild_Widget(editor, "bmed.tag.home")));
+            addOrRemoveTag_Bookmark(bm, remoteSource_BookmarkTag,
+                                    isSelected_Widget(findChild_Widget(editor, "bmed.tag.remote")));
+            addOrRemoveTag_Bookmark(bm, linkSplit_BookmarkTag,
+                                    isSelected_Widget(findChild_Widget(editor, "bmed.tag.linksplit")));
             postCommand_App("bookmarks.changed");
         }
         setFlags_Widget(as_Widget(d), disabled_WidgetFlag, iFalse);
@@ -1012,6 +1021,15 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                     setText_InputWidget(findChild_Widget(dlg, "bmed.icon"),
                                         collect_String(newUnicodeN_String(&bm->icon, 1)));
                 }
+                setFlags_Widget(findChild_Widget(dlg, "bmed.tag.home"),
+                                selected_WidgetFlag,
+                                hasTag_Bookmark(bm, homepage_BookmarkTag));
+                setFlags_Widget(findChild_Widget(dlg, "bmed.tag.remote"),
+                                selected_WidgetFlag,
+                                hasTag_Bookmark(bm, remoteSource_BookmarkTag));
+                setFlags_Widget(findChild_Widget(dlg, "bmed.tag.linksplit"),
+                                selected_WidgetFlag,
+                                hasTag_Bookmark(bm, linkSplit_BookmarkTag));
                 setCommandHandler_Widget(dlg, handleBookmarkEditorCommands_SidebarWidget_);
                 setFocus_Widget(findChild_Widget(dlg, "bmed.title"));
             }
diff --git a/src/ui/util.c b/src/ui/util.c
index d2f27a8b..92cf85b7 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -2506,11 +2506,18 @@ static iBool handleBookmarkCreationCommands_SidebarWidget_(iWidget *editor, cons
             const iString *tags  = text_InputWidget(findChild_Widget(editor, "bmed.tags"));
             const iString *icon  = collect_String(trimmed_String(text_InputWidget(findChild_Widget(editor, "bmed.icon"))));
             const uint32_t id    = add_Bookmarks(bookmarks_App(), url, title, tags, first_String(icon));
+            iBookmark *    bm    = get_Bookmarks(bookmarks_App(), id);
             if (!isEmpty_String(icon)) {
-                iBookmark *bm = get_Bookmarks(bookmarks_App(), id);
-                if (!hasTag_Bookmark(bm, userIcon_BookmarkTag)) {
-                    addTag_Bookmark(bm, userIcon_BookmarkTag);
-                }
+                addTagIfMissing_Bookmark(bm, userIcon_BookmarkTag);
+            }
+            if (isSelected_Widget(findChild_Widget(editor, "bmed.tag.home"))) {
+                addTag_Bookmark(bm, homepage_BookmarkTag);
+            }
+            if (isSelected_Widget(findChild_Widget(editor, "bmed.tag.remote"))) {
+                addTag_Bookmark(bm, remoteSource_BookmarkTag);
+            }
+            if (isSelected_Widget(findChild_Widget(editor, "bmed.tag.linksplit"))) {
+                addTag_Bookmark(bm, linkSplit_BookmarkTag);
             }
             postCommand_App("bookmarks.changed");
         }
diff --git a/src/ui/widget.c b/src/ui/widget.c
index 00fe0f5f..67ce1345 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -1346,6 +1346,12 @@ iBool isHover_Widget(const iAnyObject *d) {
     return get_Window()->hover == d;
 }
 
+iBool isUnderKeyRoot_Widget(const iAnyObject *d) {
+    iAssert(isInstance_Object(d, &Class_Widget));
+    const iWidget *w = d;
+    return w && get_Window() && w->root == get_Window()->keyRoot;
+}
+
 iBool isSelected_Widget(const iAnyObject *d) {
     if (d) {
         iAssert(isInstance_Object(d, &Class_Widget));
diff --git a/src/ui/widget.h b/src/ui/widget.h
index 36797210..5b6b18e1 100644
--- a/src/ui/widget.h
+++ b/src/ui/widget.h
@@ -232,6 +232,7 @@ iBool   isDisabled_Widget           (const iAnyObject *);
 iBool   isFocused_Widget            (const iAnyObject *);
 iBool   isHover_Widget              (const iAnyObject *);
 iBool   isSelected_Widget           (const iAnyObject *);
+iBool   isUnderKeyRoot_Widget       (const iAnyObject *);
 iBool   isCommand_Widget            (const iWidget *d, const SDL_Event *ev, const char *cmd);
 iBool   hasParent_Widget            (const iWidget *d, const iWidget *someParent);
 iBool   isAffectedByVisualOffset_Widget
diff --git a/src/ui/window.c b/src/ui/window.c
index c4d06d75..a1df2609 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -1214,30 +1214,36 @@ void setSplitMode_Window(iWindow *d, int splitFlags) {
             /* Add a second root. */
             iDocumentWidget *moved = document_Root(d->roots[0]);
             iAssert(d->roots[1] == NULL);
-            d->roots[1] = new_Root();
-            setCurrent_Root(d->roots[1]);
-            d->keyRoot = d->roots[1];
-            createUserInterface_Root(d->roots[1]);
+            const iBool addToLeft = (prefs_App()->pinSplit == 2);
+            size_t newRootIndex = 1;
+            if (addToLeft) {
+                iSwap(iRoot *, d->roots[0], d->roots[1]);
+                newRootIndex = 0;
+            }
+            d->roots[newRootIndex] = new_Root();
+            d->keyRoot             = d->roots[newRootIndex];
+            setCurrent_Root(d->roots[newRootIndex]);
+            createUserInterface_Root(d->roots[newRootIndex]);
             if (!isEmpty_String(d->pendingSplitUrl)) {
-                postCommandf_Root(d->roots[1], "open url:%s",
+                postCommandf_Root(d->roots[newRootIndex], "open url:%s",
                                   cstr_String(d->pendingSplitUrl));
                 clear_String(d->pendingSplitUrl);
             }
             else if (~splitFlags & noEvents_WindowSplit) {
-                iWidget *docTabs0 = findChild_Widget(d->roots[0]->widget, "doctabs");
-                iWidget *docTabs1 = findChild_Widget(d->roots[1]->widget, "doctabs");
+                iWidget *docTabs0 = findChild_Widget(d->roots[newRootIndex ^ 1]->widget, "doctabs");
+                iWidget *docTabs1 = findChild_Widget(d->roots[newRootIndex]->widget, "doctabs");
                 /* If the old root has multiple tabs, move the current one to the new split. */
                 if (tabCount_Widget(docTabs0) >= 2) {
                     int movedIndex = tabPageIndex_Widget(docTabs0, moved);
                     removeTabPage_Widget(docTabs0, movedIndex);
                     showTabPage_Widget(docTabs0, tabPage_Widget(docTabs0, iMax(movedIndex - 1, 0)));
                     iRelease(removeTabPage_Widget(docTabs1, 0)); /* delete the default tab */
-                    setRoot_Widget(as_Widget(moved), d->roots[1]);
+                    setRoot_Widget(as_Widget(moved), d->roots[newRootIndex]);
                     prependTabPage_Widget(docTabs1, iClob(moved), "", 0, 0);
                     postCommandf_App("tabs.switch page:%p", moved);
                 }
                 else {
-                    postCommand_Root(d->roots[1], "navigate.home");
+                    postCommand_Root(d->roots[newRootIndex], "navigate.home");
                 }
             }
             setCurrent_Root(NULL);