4 files changed, 49 insertions, 13 deletions

diff --git a/res/about/version.gmi b/res/about/version.gmi
index cb3f482a..a2a773e9 100644
--- a/res/about/version.gmi
+++ b/res/about/version.gmi
@@ -23,6 +23,7 @@
 * Fixed percent-decoding of URLs on the command line and coming in via system URL handlers.
 
 User interface:
+* Added unread feed entry count to the sidebar.
 * Default page scroll keybindings changed: PageUp/Down scroll a whole page, and Space/Shift+Space scrolls half a page. If you're changed these bindings, you'll need to rebind them.
 * UI scaling factor is applied immediately when closing Preferences. Restarting is no longer necessary.
 * Window scaling changes automatically when moving window to a different display.
diff --git a/src/feeds.c b/src/feeds.c
index 73c68987..db426994 100644
--- a/src/feeds.c
+++ b/src/feeds.c
@@ -381,7 +381,8 @@ static iThreadResult fetch_Feeds_(iThread *thread) {
     }
     initCurrent_Time(&d->lastRefreshedAt);
     save_Feeds_(d);
-    postCommandf_App("feeds.update.finished arg:%d", gotNew ? 1 : 0);
+    postCommandf_App("feeds.update.finished arg:%d unread:%zu", gotNew ? 1 : 0,
+                     numUnread_Feeds());
     return 0;
 }
 
@@ -624,6 +625,18 @@ size_t numSubscribed_Feeds(void) {
     return size_PtrArray(listSubscriptions_());
 }
 
+size_t numUnread_Feeds(void) {
+    size_t count = 0;
+    size_t max = 100; /* match the number of items shown in the sidebar */
+    iConstForEach(PtrArray, i, listEntries_Feeds()) {
+        if (!max--) break;
+        if (isUnread_FeedEntry(i.ptr)) {
+            count++;
+        }
+    }
+    return count;
+}
+
 #define iPluralS(c) ((c) != 1 ? "s" : "")
 
 const iString *entryListPage_Feeds(void) {
diff --git a/src/feeds.h b/src/feeds.h
index 7528d111..3ebef8ac 100644
--- a/src/feeds.h
+++ b/src/feeds.h
@@ -54,3 +54,4 @@ void    refreshFinished_Feeds   (void); /* called on "feeds.update.finished" */
 const iPtrArray *   listEntries_Feeds   (void);
 const iString *     entryListPage_Feeds (void);
 size_t              numSubscribed_Feeds (void);
+size_t              numUnread_Feeds     (void);
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 8c1bb60d..2cc1d899 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -99,6 +99,7 @@ struct Impl_SidebarWidget {
     int               maxButtonLabelWidth;
     int               width;
     int               itemFonts[2];
+    size_t            numUnreadEntries;
     iWidget *         resizer;
     iWidget *         menu;
     iSidebarItem *    contextItem; /* list item accessed in the context menu */
@@ -507,6 +508,7 @@ void init_SidebarWidget(iSidebarWidget *d, enum iSidebarSide side) {
     iZap(d->modeScroll);
     d->side = side;
     d->mode = -1;
+    d->numUnreadEntries = 0;
     d->itemFonts[0] = uiContent_FontId;
     d->itemFonts[1] = uiContentBold_FontId;
 #if defined (iPlatformAppleMobile)
@@ -587,6 +589,9 @@ void init_SidebarWidget(iSidebarWidget *d, enum iSidebarSide side) {
     d->menu = NULL;
     addAction_Widget(w, SDLK_r, KMOD_PRIMARY | KMOD_SHIFT, "feeds.refresh");
     updateMetrics_SidebarWidget_(d);
+    if (side == left_SideBarSide) {
+        postCommand_App("~sidebar.update"); /* unread count */
+    }
 }
 
 void deinit_SidebarWidget(iSidebarWidget *d) {
@@ -686,14 +691,19 @@ static void checkModeButtonLayout_SidebarWidget_(iSidebarWidget *d) {
     const iBool isTight =
         (width_Rect(bounds_Widget(as_Widget(d->modeButtons[0]))) < d->maxButtonLabelWidth);
     for (int i = 0; i < max_SidebarMode; i++) {
-        if (!d->modeButtons[i]) continue;
-        if (isTight && ~flags_Widget(as_Widget(d->modeButtons[i])) & tight_WidgetFlag) {
-            setFlags_Widget(as_Widget(d->modeButtons[i]), tight_WidgetFlag, iTrue);
-            updateTextCStr_LabelWidget(d->modeButtons[i], tightModeLabels_[i]);
+        iLabelWidget *button = d->modeButtons[i];
+        if (!button) continue;
+        setFlags_Widget(as_Widget(button), tight_WidgetFlag, isTight);
+        if (i == feeds_SidebarMode && d->numUnreadEntries) {
+            updateText_LabelWidget(button,
+                                   collectNewFormat_String("%s " uiTextAction_ColorEscape "%zu%s",
+                                                           tightModeLabels_[i],
+                                                           d->numUnreadEntries,
+                                                           !isTight ? " Unread" : ""));
         }
-        else if (!isTight && flags_Widget(as_Widget(d->modeButtons[i])) & tight_WidgetFlag) {
-            setFlags_Widget(as_Widget(d->modeButtons[i]), tight_WidgetFlag, iFalse);
-            updateTextCStr_LabelWidget(d->modeButtons[i], normalModeLabels_[i]);
+        else {
+            updateTextCStr_LabelWidget(button,
+                                       isTight ? tightModeLabels_[i] : normalModeLabels_[i]);
         }
     }
 }
@@ -814,11 +824,18 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
             updateItems_SidebarWidget_(d);
             scrollOffset_ListWidget(d->list, 0);
         }
-        else if (equal_Command(cmd, "sidebar.update") ||
-                 (equal_Command(cmd, "visited.changed") &&
-                  (d->mode == history_SidebarMode || d->mode == feeds_SidebarMode))) {
+        else if (equal_Command(cmd, "sidebar.update")) {
+            d->numUnreadEntries = numUnread_Feeds();
+            checkModeButtonLayout_SidebarWidget_(d);
             updateItems_SidebarWidget_(d);
         }
+        else if (equal_Command(cmd, "visited.changed")) {
+            d->numUnreadEntries = numUnread_Feeds();
+            checkModeButtonLayout_SidebarWidget_(d);
+            if (d->mode == history_SidebarMode || d->mode == feeds_SidebarMode) {
+                updateItems_SidebarWidget_(d);
+            }
+        }
         else if (equal_Command(cmd, "bookmarks.changed") && (d->mode == bookmarks_SidebarMode ||
                                                              d->mode == feeds_SidebarMode)) {
             updateItems_SidebarWidget_(d);
@@ -954,8 +971,12 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
             }
             return iTrue;
         }
-        else if (equal_Command(cmd, "feeds.update.finished") && d->mode == feeds_SidebarMode) {
-            updateItems_SidebarWidget_(d);
+        else if (equal_Command(cmd, "feeds.update.finished")) {
+            d->numUnreadEntries = argLabel_Command(cmd, "unread");
+            checkModeButtonLayout_SidebarWidget_(d);
+            if (d->mode == feeds_SidebarMode) {
+                updateItems_SidebarWidget_(d);
+            }
         }
         else if (equal_Command(cmd, "feeds.markallread") && d->mode == feeds_SidebarMode) {
             iConstForEach(PtrArray, i, listEntries_Feeds()) {