Bookmark editor has toggles for some special tags

3 files changed, 52 insertions, 13 deletions

diff --git a/src/bookmarks.h b/src/bookmarks.h
index 635682d1..353b4197 100644
--- a/src/bookmarks.h
+++ b/src/bookmarks.h
@@ -52,9 +52,23 @@ struct Impl_Bookmark {
 
 iLocalDef uint32_t  id_Bookmark (const iBookmark *d) { return d->node.key; }
 
-iBool   hasTag_Bookmark     (const iBookmark *d, const char *tag);
-void    addTag_Bookmark     (iBookmark *d, const char *tag);
-void    removeTag_Bookmark  (iBookmark *d, const char *tag);
+iBool   hasTag_Bookmark     (const iBookmark *, const char *tag);
+void    addTag_Bookmark     (iBookmark *, const char *tag);
+void    removeTag_Bookmark  (iBookmark *, const char *tag);
+
+iLocalDef void addTagIfMissing_Bookmark(iBookmark *d, const char *tag) {
+    if (!hasTag_Bookmark(d, tag)) {
+        addTag_Bookmark(d, tag);
+    }
+}
+iLocalDef void addOrRemoveTag_Bookmark(iBookmark *d, const char *tag, iBool add) {
+    if (add) {
+        addTagIfMissing_Bookmark(d, tag);
+    }
+    else {
+        removeTag_Bookmark(d, tag);
+    }
+}
 
 /*----------------------------------------------------------------------------------------------*/
 
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");
         }