Split view pinning, "linksplit" special tag

A navigation aid: when in split mode, option to keep one of the tabs pinned to the current page so all links open to the side.

Added "linksplit" bookmark tag to activate view splitting when opening a link on the page.

23 files changed, 132 insertions, 45 deletions

diff --git a/po/en.po b/po/en.po
index e51b434c..e01d303b 100644
--- a/po/en.po
+++ b/po/en.po
@@ -1066,6 +1066,18 @@ msgstr "Collapse preformatted:"
 msgid "prefs.archive.openindex"
 msgstr "Open archive indices:"
 
+msgid "prefs.pinsplit"
+msgstr "Split view pinning:"
+
+msgid "prefs.pinsplit.none"
+msgstr "None"
+
+msgid "prefs.pinsplit.left"
+msgstr "Left Tab"
+
+msgid "prefs.pinsplit.right"
+msgstr "Right Tab"
+
 msgid "prefs.smoothscroll"
 msgstr "Smooth scrolling:"
 
diff --git a/res/lang/de.bin b/res/lang/de.bin
index 9ca2be68..846dc8e1 100644
--- a/res/lang/de.bin
+++ b/res/lang/de.bin
diff --git a/res/lang/en.bin b/res/lang/en.bin
index 1a18bc38..64e150d5 100644
--- a/res/lang/en.bin
+++ b/res/lang/en.bin
diff --git a/res/lang/es.bin b/res/lang/es.bin
index b37813d1..8fdd3d8b 100644
--- a/res/lang/es.bin
+++ b/res/lang/es.bin
diff --git a/res/lang/fi.bin b/res/lang/fi.bin
index 4e2bee52..7ab951b4 100644
--- a/res/lang/fi.bin
+++ b/res/lang/fi.bin
diff --git a/res/lang/fr.bin b/res/lang/fr.bin
index 8cfb9331..01cc217d 100644
--- a/res/lang/fr.bin
+++ b/res/lang/fr.bin
diff --git a/res/lang/ia.bin b/res/lang/ia.bin
index 5310ac72..eb3e44a8 100644
--- a/res/lang/ia.bin
+++ b/res/lang/ia.bin
diff --git a/res/lang/ie.bin b/res/lang/ie.bin
index 151cdf7d..62d74fa7 100644
--- a/res/lang/ie.bin
+++ b/res/lang/ie.bin
diff --git a/res/lang/ru.bin b/res/lang/ru.bin
index 95ebe75d..1e8a4a90 100644
--- a/res/lang/ru.bin
+++ b/res/lang/ru.bin
diff --git a/res/lang/sr.bin b/res/lang/sr.bin
index 0f254c81..08682c88 100644
--- a/res/lang/sr.bin
+++ b/res/lang/sr.bin
diff --git a/res/lang/tok.bin b/res/lang/tok.bin
index d6b0aba7..5061520c 100644
--- a/res/lang/tok.bin
+++ b/res/lang/tok.bin
diff --git a/res/lang/zh_Hans.bin b/res/lang/zh_Hans.bin
index 249d88d5..cee2f096 100644
--- a/res/lang/zh_Hans.bin
+++ b/res/lang/zh_Hans.bin
diff --git a/res/lang/zh_Hant.bin b/res/lang/zh_Hant.bin
index 99e29957..67240240 100644
--- a/res/lang/zh_Hant.bin
+++ b/res/lang/zh_Hant.bin
diff --git a/src/app.c b/src/app.c
index 4872799b..39f0346e 100644
--- a/src/app.c
+++ b/src/app.c
@@ -1446,6 +1446,14 @@ static void updatePrefsThemeButtons_(iWidget *d) {
     }
 }
 
+static void updatePrefsPinSplitButtons_(iWidget *d, int value) {
+    for (size_t i = 0; i < 3; i++) {
+        setFlags_Widget(findChild_Widget(d, format_CStr("prefs.pinsplit.%u", i)),
+                        selected_WidgetFlag,
+                        i == value);
+    }
+}
+
 static void updateDropdownSelection_(iLabelWidget *dropButton, const char *selectedCommand) {
     iWidget *menu = findChild_Widget(as_Widget(dropButton), "menu");
     iForEach(ObjectList, i, children_Widget(menu)) {
@@ -1526,6 +1534,10 @@ static iBool handlePrefsCommands_(iWidget *d, const char *cmd) {
         setFlags_Widget(findChild_Widget(d, "prefs.quoteicon.1"), selected_WidgetFlag, arg == 1);
         return iFalse;
     }
+    else if (equal_Command(cmd, "pinsplit.set")) {
+        updatePrefsPinSplitButtons_(d, arg_Command(cmd));
+        return iFalse;
+    }
     else if (equal_Command(cmd, "doctheme.dark.set")) {
         updateColorThemeButton_(findChild_Widget(d, "prefs.doctheme.dark"), arg_Command(cmd));
         return iFalse;
@@ -1824,6 +1836,10 @@ iBool handleCommand_App(const char *cmd) {
         }
         return iTrue;
     }
+    else if (equal_Command(cmd, "pinsplit.set")) {
+        d->prefs.pinSplit = arg_Command(cmd);
+        return iTrue;
+    }
     else if (equal_Command(cmd, "theme.set")) {
         const int isAuto = argLabel_Command(cmd, "auto");
         d->prefs.theme = arg_Command(cmd);
@@ -2030,6 +2046,7 @@ iBool handleCommand_App(const char *cmd) {
         iRoot *oldRoot = root;
         if (newTab & otherRoot_OpenTabFlag) {
             root = otherRoot_Window(d->window, root);
+            setKeyRoot_Window(d->window, root);
             setCurrent_Root(root); /* need to change for widget creation */
         }
         iDocumentWidget *doc = document_Command(cmd);
@@ -2172,6 +2189,7 @@ iBool handleCommand_App(const char *cmd) {
         setToggle_Widget(findChild_Widget(dlg, "prefs.archive.openindex"), d->prefs.openArchiveIndexPages);
         setToggle_Widget(findChild_Widget(dlg, "prefs.ostheme"), d->prefs.useSystemTheme);
         setToggle_Widget(findChild_Widget(dlg, "prefs.customframe"), d->prefs.customFrame);
+        updatePrefsPinSplitButtons_(dlg, d->prefs.pinSplit);
         updateDropdownSelection_(findChild_Widget(dlg, "prefs.uilang"), cstr_String(&d->prefs.uiLanguage));
         setToggle_Widget(findChild_Widget(dlg, "prefs.retainwindow"), d->prefs.retainWindowSize);
         setText_InputWidget(findChild_Widget(dlg, "prefs.uiscale"),
@@ -2234,7 +2252,8 @@ iBool handleCommand_App(const char *cmd) {
     }
     else if (equal_Command(cmd, "navigate.home")) {
         /* Look for bookmarks tagged "homepage". */
-        iRegExp *pattern = iClob(new_RegExp("\\bhomepage\\b", caseInsensitive_RegExpOption));
+        iRegExp *pattern = iClob(new_RegExp("\\b" homepage_BookmarkTag "\\b",
+                                            caseInsensitive_RegExpOption));
         const iPtrArray *homepages =
             list_Bookmarks(d->bookmarks, NULL, filterTagsRegExp_Bookmarks, pattern);
         if (isEmpty_PtrArray(homepages)) {
diff --git a/src/bookmarks.c b/src/bookmarks.c
index 5fff9c75..1f887c98 100644
--- a/src/bookmarks.c
+++ b/src/bookmarks.c
@@ -219,7 +219,7 @@ iBool remove_Bookmarks(iBookmarks *d, uint32_t id) {
     if (bm) {
         /* If this is a remote source, make sure all the remote bookmarks are
            removed as well. */
-        if (hasTag_Bookmark(bm, "remotesource")) {
+        if (hasTag_Bookmark(bm, remoteSource_BookmarkTag)) {
             iForEach(Hash, i, &d->bookmarks) {
                 iBookmark *j = (iBookmark *) i.value;
                 if (j->sourceId == id_Bookmark(bm)) {
@@ -240,7 +240,7 @@ iBool updateBookmarkIcon_Bookmarks(iBookmarks *d, const iString *url, iChar icon
     const uint32_t id = findUrl_Bookmarks(d, url);
     if (id) {
         iBookmark *bm = get_Bookmarks(d, id);
-        if (!hasTag_Bookmark(bm, "remote") && !hasTag_Bookmark(bm, "usericon")) {
+        if (!hasTag_Bookmark(bm, remote_BookmarkTag) && !hasTag_Bookmark(bm, userIcon_BookmarkTag)) {
             if (icon != bm->icon) {
                 bm->icon = icon;
                 changed = iTrue;
@@ -257,7 +257,7 @@ iChar siteIcon_Bookmarks(const iBookmarks *d, const iString *url) {
     }
     static iRegExp *tagPattern_;
     if (!tagPattern_) {
-        tagPattern_ = new_RegExp("\\busericon\\b", caseSensitive_RegExpOption);
+        tagPattern_ = new_RegExp("\\b" userIcon_BookmarkTag "\\b", caseSensitive_RegExpOption);
     }
     const iRangecc urlRoot      = urlRoot_String(url);
     size_t         matchingSize = iInvalidSize; /* we'll pick the shortest matching */
@@ -412,7 +412,7 @@ const iString *bookmarkListPage_Bookmarks(const iBookmarks *d, enum iBookmarkLis
 
 static iBool isRemoteSource_Bookmark_(void *context, const iBookmark *d) {
     iUnused(context);
-    return hasTag_Bookmark(d, "remotesource");
+    return hasTag_Bookmark(d, remoteSource_BookmarkTag);
 }
 
 void remoteRequestFinished_Bookmarks_(iBookmarks *d, iGmRequest *req) {
@@ -484,7 +484,7 @@ void fetchRemote_Bookmarks(iBookmarks *d) {
         size_t numRemoved = 0;
         iForEach(Hash, i, &d->bookmarks) {
             iBookmark *bm = (iBookmark *) i.value;
-            if (hasTag_Bookmark(bm, "remote")) {
+            if (hasTag_Bookmark(bm, remote_BookmarkTag)) {
                 remove_HashIterator(&i);
                 delete_Bookmark(bm);
                 numRemoved++;
diff --git a/src/bookmarks.h b/src/bookmarks.h
index ab9c683b..635682d1 100644
--- a/src/bookmarks.h
+++ b/src/bookmarks.h
@@ -32,6 +32,14 @@ iDeclareType(GmRequest)
 iDeclareType(Bookmark)
 iDeclareTypeConstruction(Bookmark)
 
+#define headings_BookmarkTag        "headings"
+#define homepage_BookmarkTag        "homepage"
+#define linkSplit_BookmarkTag       "linksplit"
+#define remote_BookmarkTag          "remote"
+#define remoteSource_BookmarkTag    "remotesource"
+#define subscribed_BookmarkTag      "subscribed"
+#define userIcon_BookmarkTag        "usericon"
+
 struct Impl_Bookmark {
     iHashNode node;
     iString url;
diff --git a/src/feeds.c b/src/feeds.c
index 2f4714f3..dcd97b43 100644
--- a/src/feeds.c
+++ b/src/feeds.c
@@ -95,7 +95,7 @@ static void init_FeedJob(iFeedJob *d, const iBookmark *bookmark) {
     init_PtrArray(&d->results);
     iZap(d->startTime);
     d->isFirstUpdate = iFalse;
-    d->checkHeadings = hasTag_Bookmark(bookmark, "headings");
+    d->checkHeadings = hasTag_Bookmark(bookmark, headings_BookmarkTag);
 }
 
 static void deinit_FeedJob(iFeedJob *d) {
diff --git a/src/prefs.c b/src/prefs.c
index e26efaba..e6eba2a6 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -37,6 +37,7 @@ void init_Prefs(iPrefs *d) {
     d->zoomPercent       = 100;
     d->sideIcon          = iTrue;
     d->hideToolbarOnScroll = iTrue;
+    d->pinSplit          = 1;
     d->hoverLink         = iFalse;
     d->smoothScrolling   = iTrue;
     d->loadImageInsteadOfScrolling = iFalse;
diff --git a/src/prefs.h b/src/prefs.h
index 7f02a100..0f604ee2 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -51,6 +51,7 @@ struct Impl_Prefs {
     int              zoomPercent;
     iBool            sideIcon;
     iBool            hideToolbarOnScroll;
+    int              pinSplit; /* 0: no pinning, 1: left doc, 2: right doc */
     /* Behavior */
     iString          downloadDir;
     iBool            hoverLink;
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 6a44fd5f..8d519865 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -221,6 +221,7 @@ enum iDocumentWidgetFlag {
     pinchZoom_DocumentWidgetFlag             = iBit(9),
     movingSelectMarkStart_DocumentWidgetFlag = iBit(10),
     movingSelectMarkEnd_DocumentWidgetFlag   = iBit(11),
+    otherRootByDefault_DocumentWidgetFlag    = iBit(12), /* links open to other root by default */
 };
 
 enum iDocumentLinkOrdinalMode {
@@ -956,6 +957,20 @@ static void documentRunsInvalidated_DocumentWidget_(iDocumentWidget *d) {
     iZap(d->renderRuns);
 }
 
+iBool isPinned_DocumentWidget_(const iDocumentWidget *d) {
+    if (d->flags & otherRootByDefault_DocumentWidgetFlag) {
+        return iTrue;
+    }
+    const iWidget *w = constAs_Widget(d);
+    const iWindow *win = get_Window();
+    if (numRoots_Window(win) == 1) {
+        return iFalse;
+    }
+    const iPrefs *prefs = prefs_App();
+    return (prefs->pinSplit == 1 && w->root == win->roots[0]) ||
+           (prefs->pinSplit == 2 && w->root == win->roots[1]);
+}
+
 void setSource_DocumentWidget(iDocumentWidget *d, const iString *source) {
     setUrl_GmDocument(d->doc, d->mod.url);
     setSource_GmDocument(d->doc, source, documentWidth_DocumentWidget_(d));
@@ -965,6 +980,15 @@ void setSource_DocumentWidget(iDocumentWidget *d, const iString *source) {
     d->drawBufs->flags |= updateSideBuf_DrawBufsFlag;
     invalidate_DocumentWidget_(d);
     refresh_Widget(as_Widget(d));
+    /* Check for special bookmark tags. */
+    d->flags &= ~otherRootByDefault_DocumentWidgetFlag;
+    const uint16_t bmid = findUrl_Bookmarks(bookmarks_App(), d->mod.url);
+    if (bmid) {
+        const iBookmark *bm = get_Bookmarks(bookmarks_App(), bmid);
+        if (hasTag_Bookmark(bm, linkSplit_BookmarkTag)) {
+            d->flags |= otherRootByDefault_DocumentWidgetFlag;
+        }
+    }
 }
 
 static void updateTheme_DocumentWidget_(iDocumentWidget *d) {
@@ -2455,7 +2479,7 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
                                           linkUrl_GmDocument(d->doc, run->linkId))) != 0) {
                 const iBookmark *bm = get_Bookmarks(bookmarks_App(), bmid);
                 /* We can import local copies of remote bookmarks. */
-                if (!hasTag_Bookmark(bm, "remote")) {
+                if (!hasTag_Bookmark(bm, remote_BookmarkTag)) {
                     remove_PtrArrayIterator(&i);
                 }
             }
@@ -2740,11 +2764,12 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                     else {
                         postCommandf_Root(w->root,
                                           "open newtab:%d url:%s",
-                                         d->ordinalMode ==
+                                          (isPinned_DocumentWidget_(d) ? otherRoot_OpenTabFlag : 0) ^
+                                          (d->ordinalMode ==
                                                  numbersAndAlphabet_DocumentLinkOrdinalMode
                                              ? openTabMode_Sym(modState_Keys())
-                                             : (d->flags & newTabViaHomeKeys_DocumentWidgetFlag ? 1 : 0),
-                                         cstr_String(absoluteUrl_String(
+                                             : (d->flags & newTabViaHomeKeys_DocumentWidgetFlag ? 1 : 0)),
+                                          cstr_String(absoluteUrl_String(
                                              d->mod.url, linkUrl_GmDocument(d->doc, run->linkId))));
                     }
                     setLinkNumberMode_DocumentWidget_(d, iFalse);
@@ -2862,8 +2887,9 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
         }
         if (ev->button.button == SDL_BUTTON_MIDDLE && d->hoverLink) {
             postCommandf_Root(w->root, "open newtab:%d url:%s",
-                             modState_Keys() & KMOD_SHIFT ? 1 : 2,
-                             cstr_String(linkUrl_GmDocument(d->doc, d->hoverLink->linkId)));
+                              (isPinned_DocumentWidget_(d) ? otherRoot_OpenTabFlag : 0) |
+                              (modState_Keys() & KMOD_SHIFT ? new_OpenTabFlag : newBackground_OpenTabFlag),
+                              cstr_String(linkUrl_GmDocument(d->doc, d->hoverLink->linkId)));
             return iTrue;
         }
         if (ev->button.button == SDL_BUTTON_RIGHT &&
@@ -3237,8 +3263,12 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                         refresh_Widget(w);
                     }
                     else if (linkFlags & supportedProtocol_GmLinkFlag) {
+                        int tabMode = openTabMode_Sym(modState_Keys());
+                        if (isPinned_DocumentWidget_(d)) {
+                            tabMode ^= otherRoot_OpenTabFlag;
+                        }
                         postCommandf_Root(w->root, "open newtab:%d url:%s",
-                                         openTabMode_Sym(modState_Keys()),
+                                         tabMode,
                                          cstr_String(absoluteUrl_String(
                                              d->mod.url, linkUrl_GmDocument(d->doc, linkId))));
                     }
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 7d08b83a..245b76a3 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -824,12 +824,12 @@ iBool handleBookmarkEditorCommands_SidebarWidget_(iWidget *editor, const char *c
             set_String(&bm->url, url);
             set_String(&bm->tags, tags);
             if (isEmpty_String(icon)) {
-                removeTag_Bookmark(bm, "usericon");
+                removeTag_Bookmark(bm, userIcon_BookmarkTag);
                 bm->icon = 0;
             }
             else {
-                if (!hasTag_Bookmark(bm, "usericon")) {
-                    addTag_Bookmark(bm, "usericon");
+                if (!hasTag_Bookmark(bm, userIcon_BookmarkTag)) {
+                    addTag_Bookmark(bm, userIcon_BookmarkTag);
                 }
                 bm->icon = first_String(icon);
             }
@@ -1008,7 +1008,7 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                 setText_InputWidget(findChild_Widget(dlg, "bmed.title"), &bm->title);
                 setText_InputWidget(findChild_Widget(dlg, "bmed.url"), &bm->url);
                 setText_InputWidget(findChild_Widget(dlg, "bmed.tags"), &bm->tags);
-                if (hasTag_Bookmark(bm, "usericon")) {
+                if (hasTag_Bookmark(bm, userIcon_BookmarkTag)) {
                     setText_InputWidget(findChild_Widget(dlg, "bmed.icon"),
                                         collect_String(newUnicodeN_String(&bm->icon, 1)));
                 }
@@ -1022,7 +1022,7 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
             if (d->mode == bookmarks_SidebarMode && item) {
                 setFlags_Widget(w, disabled_WidgetFlag, iTrue);
                 iBookmark *bm = get_Bookmarks(bookmarks_App(), item->id);
-                const iBool isRemote = hasTag_Bookmark(bm, "remote");
+                const iBool isRemote = hasTag_Bookmark(bm, remote_BookmarkTag);
                 iChar icon = isRemote ? 0x1f588 : bm->icon;
                 iWidget *dlg = makeBookmarkCreation_Widget(&bm->url, &bm->title, icon);
                 setId_Widget(dlg, format_CStr("bmed.%s", cstr_String(id_Widget(w))));
@@ -1040,7 +1040,7 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                 iBookmark *bm = get_Bookmarks(bookmarks_App(), item->id);
                 if (hasTag_Bookmark(bm, tag)) {
                     removeTag_Bookmark(bm, tag);
-                    if (!iCmpStr(tag, "subscribed")) {
+                    if (!iCmpStr(tag, subscribed_BookmarkTag)) {
                         removeEntries_Feeds(item->id);
                     }
                 }
@@ -1119,7 +1119,7 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                     }
                     if (isCommand_Widget(w, ev, "feed.entry.unsubscribe")) {
                         if (arg_Command(cmd)) {
-                            removeTag_Bookmark(feedBookmark, "subscribed");
+                            removeTag_Bookmark(feedBookmark, subscribed_BookmarkTag);
                             removeEntries_Feeds(id_Bookmark(feedBookmark));
                             updateItems_SidebarWidget_(d);
                         }
@@ -1308,7 +1308,7 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                                                                      "bookmark.tag tag:homepage");
                         if (menuItem) {
                             setTextCStr_LabelWidget(menuItem,
-                                                    hasTag_Bookmark(bm, "homepage")
+                                                    hasTag_Bookmark(bm, homepage_BookmarkTag)
                                                         ? home_Icon " ${bookmark.untag.home}"
                                                         : home_Icon " ${bookmark.tag.home}");
                             checkIcon_LabelWidget(menuItem);
@@ -1316,7 +1316,7 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                         menuItem = findMenuItem_Widget(d->menu, "bookmark.tag tag:subscribed");
                         if (menuItem) {
                             setTextCStr_LabelWidget(menuItem,
-                                                    hasTag_Bookmark(bm, "subscribed")
+                                                    hasTag_Bookmark(bm, subscribed_BookmarkTag)
                                                         ? star_Icon " ${bookmark.untag.sub}"
                                                         : star_Icon " ${bookmark.tag.sub}");
                             checkIcon_LabelWidget(menuItem);
@@ -1324,7 +1324,7 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                         menuItem = findMenuItem_Widget(d->menu, "bookmark.tag tag:remotesource");
                         if (menuItem) {
                             setTextCStr_LabelWidget(menuItem,
-                                                    hasTag_Bookmark(bm, "remotesource")
+                                                    hasTag_Bookmark(bm, remoteSource_BookmarkTag)
                                                         ? downArrowBar_Icon " ${bookmark.untag.remote}"
                                                         : downArrowBar_Icon " ${bookmark.tag.remote}");
                             checkIcon_LabelWidget(menuItem);
@@ -1386,13 +1386,13 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
             const iSidebarItem *hoverItem = hoverItem_ListWidget(d->list);
             iAssert(hoverItem);
             const iBookmark *  bm              = get_Bookmarks(bookmarks_App(), hoverItem->id);
-            const iBool        isRemote        = hasTag_Bookmark(bm, "remote");
+            const iBool        isRemote        = hasTag_Bookmark(bm, remote_BookmarkTag);
             static const char *localOnlyCmds[] = { "bookmark.edit",
                                                    "bookmark.delete",
-                                                   "bookmark.tag tag:subscribed",
-                                                   "bookmark.tag tag:homepage",
-                                                   "bookmark.tag tag:remotesource",
-                                                   "bookmark.tag tag:subscribed" };
+                                                   "bookmark.tag tag:" subscribed_BookmarkTag,
+                                                   "bookmark.tag tag:" homepage_BookmarkTag,
+                                                   "bookmark.tag tag:" remoteSource_BookmarkTag,
+                                                   "bookmark.tag tag:" subscribed_BookmarkTag };
             iForIndices(i, localOnlyCmds) {
                 setFlags_Widget(as_Widget(findMenuItem_Widget(d->menu, localOnlyCmds[i])),
                                 disabled_WidgetFlag,
diff --git a/src/ui/util.c b/src/ui/util.c
index 5995f6a0..8c058ac3 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -2218,6 +2218,14 @@ iWidget *makePreferences_Widget(void) {
         addChild_Widget(values, iClob(makeToggle_Widget("prefs.hoverlink")));
         addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.archive.openindex}")));
         addChild_Widget(values, iClob(makeToggle_Widget("prefs.archive.openindex")));
+        addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.pinsplit}")));
+        iWidget *pinSplit = new_Widget();
+        /* Split mode document pinning. */ {
+            addRadioButton_(pinSplit, "prefs.pinsplit.0", "${prefs.pinsplit.none}", "pinsplit.set arg:0");
+            addRadioButton_(pinSplit, "prefs.pinsplit.1", "${prefs.pinsplit.left}", "pinsplit.set arg:1");
+            addRadioButton_(pinSplit, "prefs.pinsplit.2", "${prefs.pinsplit.right}", "pinsplit.set arg:2");
+        }
+        addChildFlags_Widget(values, iClob(pinSplit), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
         addChild_Widget(headings, iClob(makePadding_Widget(bigGap)));
         addChild_Widget(values, iClob(makePadding_Widget(bigGap)));
         /* UI languages. */ {
@@ -2457,10 +2465,21 @@ iWidget *makeBookmarkEditor_Widget(void) {
     setUrlContent_InputWidget(inputs[1], iTrue);
     addDialogInputWithHeading_(headings, values, "${dlg.bookmark.tags}",  "bmed.tags",  iClob(inputs[2] = new_InputWidget(0)));
     addDialogInputWithHeading_(headings, values, "${dlg.bookmark.icon}",  "bmed.icon",  iClob(inputs[3] = new_InputWidget(1)));
+    /* Buttons for special tags. */
+    addChild_Widget(dlg, iClob(makePadding_Widget(gap_UI)));
+    addChild_Widget(dlg, iClob(makeTwoColumnWidget_(&headings, &values)));
+    makeTwoColumnHeading_("SPECIAL TAGS", headings, values);
+    addChild_Widget(headings, iClob(makeHeading_Widget("${bookmark.tag.home}")));
+    addChild_Widget(values, iClob(makeToggle_Widget("bmed.tag.home")));
+    addChild_Widget(headings, iClob(makeHeading_Widget("${bookmark.tag.remote}")));
+    addChild_Widget(values, iClob(makeToggle_Widget("bmed.tag.remote")));
+    addChild_Widget(headings, iClob(makeHeading_Widget("${bookmark.tag.sub}")));
+    addChild_Widget(values, iClob(makeToggle_Widget("bmed.tag.sub")));
     arrange_Widget(dlg);
     for (int i = 0; i < 3; ++i) {
         as_Widget(inputs[i])->rect.size.x = 100 * gap_UI - headings->rect.size.x;
     }
+    addChild_Widget(dlg, iClob(makePadding_Widget(gap_UI)));
     addChild_Widget(
         dlg,
         iClob(makeDialogButtons_Widget((iMenuItem[]){ { "${cancel}", 0, 0, NULL },
@@ -2489,8 +2508,8 @@ static iBool handleBookmarkCreationCommands_SidebarWidget_(iWidget *editor, cons
             const uint32_t id    = add_Bookmarks(bookmarks_App(), url, title, tags, first_String(icon));
             if (!isEmpty_String(icon)) {
                 iBookmark *bm = get_Bookmarks(bookmarks_App(), id);
-                if (!hasTag_Bookmark(bm, "usericon")) {
-                    addTag_Bookmark(bm, "usericon");
+                if (!hasTag_Bookmark(bm, userIcon_BookmarkTag)) {
+                    addTag_Bookmark(bm, userIcon_BookmarkTag);
                 }
             }
             postCommand_App("bookmarks.changed");
@@ -2609,7 +2628,7 @@ iWidget *makeFeedSettings_Widget(uint32_t bookmarkId) {
         setText_InputWidget(findChild_Widget(dlg, "feedcfg.title"),
                             bm ? &bm->title : feedTitle_DocumentWidget(document_App()));
         setFlags_Widget(findChild_Widget(dlg,
-                                         hasTag_Bookmark(bm, "headings") ? "feedcfg.type.headings"
+                                         hasTag_Bookmark(bm, headings_BookmarkTag) ? "feedcfg.type.headings"
                                                                          : "feedcfg.type.gemini"),
                         selected_WidgetFlag,
                         iTrue);
diff --git a/src/ui/window.c b/src/ui/window.c
index 5a8a1e26..c4d06d75 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -1218,9 +1218,15 @@ void setSplitMode_Window(iWindow *d, int splitFlags) {
             setCurrent_Root(d->roots[1]);
             d->keyRoot = d->roots[1];
             createUserInterface_Root(d->roots[1]);
-            /* If the old root has multiple tabs, move the current one to the new split. */ {
+            if (!isEmpty_String(d->pendingSplitUrl)) {
+                postCommandf_Root(d->roots[1], "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");
+                /* 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);
@@ -1228,19 +1234,10 @@ void setSplitMode_Window(iWindow *d, int splitFlags) {
                     iRelease(removeTabPage_Widget(docTabs1, 0)); /* delete the default tab */
                     setRoot_Widget(as_Widget(moved), d->roots[1]);
                     prependTabPage_Widget(docTabs1, iClob(moved), "", 0, 0);
-                    if (~splitFlags & noEvents_WindowSplit) {
-                        postCommandf_App("tabs.switch page:%p", moved);
-                    }
+                    postCommandf_App("tabs.switch page:%p", moved);
                 }
-                else if (~splitFlags & noEvents_WindowSplit) {
-                    if (isEmpty_String(d->pendingSplitUrl)) {
-                        postCommand_Root(d->roots[1], "navigate.home");
-                    }
-                    else {
-                        postCommandf_Root(d->roots[1], "open url:%s",
-                                          cstr_String(d->pendingSplitUrl));
-                        clear_String(d->pendingSplitUrl);
-                    }
+                else {
+                    postCommand_Root(d->roots[1], "navigate.home");
                 }
             }
             setCurrent_Root(NULL);