5 files changed, 55 insertions, 13 deletions

diff --git a/src/app.c b/src/app.c
index 01a2e5a8..92334d42 100644
--- a/src/app.c
+++ b/src/app.c
@@ -1246,6 +1246,21 @@ iBool handleCommand_App(const char *cmd) {
         save_Bookmarks(d->bookmarks, dataDir_App_);
         return iFalse;
     }
+    else if (equal_Command(cmd, "feeds.refresh")) {
+        refresh_Feeds();
+        return iTrue;
+    }
+    else if (equal_Command(cmd, "feeds.update.started")) {
+        setFlags_Widget(findWidget_App("feeds.progress"), hidden_WidgetFlag, iFalse);
+        refresh_App();
+        return iFalse;
+    }
+    else if (equal_Command(cmd, "feeds.update.finished")) {
+        setFlags_Widget(findWidget_App("feeds.progress"), hidden_WidgetFlag, iTrue);
+        refreshFinished_Feeds();
+        refresh_App();
+        return iFalse;
+    }
     else if (equal_Command(cmd, "visited.changed")) {
         save_Visited(d->visited, dataDir_App_);
         return iFalse;
diff --git a/src/feeds.c b/src/feeds.c
index 9538d948..1af42477 100644
--- a/src/feeds.c
+++ b/src/feeds.c
@@ -259,7 +259,7 @@ static const iPtrArray *listSubscriptions_(void) {
 
 static iBool startWorker_Feeds_(iFeeds *d) {
     if (d->worker) {
-        return iFalse; /* Oops? */
+        return iFalse; /* Refresh is already ongoing. */
     }
     /* Queue up all the subscriptions for the worker. */
     iConstForEach(PtrArray, i, listSubscriptions_()) {
@@ -449,6 +449,14 @@ void deinit_Feeds(void) {
     deinit_SortedArray(&d->entries);
 }
 
+void refresh_Feeds(void) {
+    startWorker_Feeds_(&feeds_);
+}
+
+void refreshFinished_Feeds(void) {
+    stopWorker_Feeds_(&feeds_);
+}
+
 static int cmpTimeDescending_FeedEntryPtr_(const void *a, const void *b) {
     const iFeedEntry * const *e1 = a, * const *e2 = b;
     return -cmp_Time(&(*e1)->timestamp, &(*e2)->timestamp);
@@ -470,7 +478,7 @@ const iPtrArray *listEntries_Feeds(void) {
 const iString *entryListPage_Feeds(void) {
     iFeeds *d = &feeds_;
     iString *src = collectNew_String();
-    format_String(src, "# Aggregated Gemini feeds\n");
+    format_String(src, "# Feed entries\n\n");
     lock_Mutex(d->mtx);
     const iPtrArray *subs = listSubscriptions_();
     int elapsed = elapsedSeconds_Time(&d->lastRefreshedAt) / 60;
diff --git a/src/feeds.h b/src/feeds.h
index 7ad6c2aa..eb516690 100644
--- a/src/feeds.h
+++ b/src/feeds.h
@@ -36,7 +36,9 @@ struct Impl_FeedEntry {
 
 void    init_Feeds      (const char *saveDir);
 void    deinit_Feeds    (void);
+void    refresh_Feeds   (void);
 
-const iPtrArray *   listEntries_Feeds   (void);
+void    refreshFinished_Feeds  (void); /* called on "feeds.update.finished" */
 
+const iPtrArray *   listEntries_Feeds   (void);
 const iString *     entryListPage_Feeds (void);
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 3fdfe190..3bd0f229 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -690,6 +690,9 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                  (d->mode == history_SidebarMode || d->mode == feeds_SidebarMode)) {
             updateItems_SidebarWidget_(d);
         }
+        else if (equal_Command(cmd, "feeds.update.finished") && d->mode == feeds_SidebarMode) {
+            updateItems_SidebarWidget_(d);
+        }
         else if (equal_Command(cmd, "bookmarks.changed") && d->mode == bookmarks_SidebarMode) {
             updateItems_SidebarWidget_(d);
         }
diff --git a/src/ui/window.c b/src/ui/window.c
index 6e046bdc..b4b8fff6 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -159,8 +159,9 @@ static const iMenuItem viewMenuItems_[] = {
 static iMenuItem bookmarksMenuItems_[] = {
     { "Bookmark This Page...", SDLK_d, KMOD_PRIMARY, "bookmark.add" },
     { "---", 0, 0, NULL },
-    { "Subscribe as Feed", 0, 0, "bookmark.addtag tag:subscribed" },
+    { "Subscribe to This Page", 0, 0, "bookmark.addtag tag:subscribed" },
     { "---", 0, 0, NULL },
+    { "Show Feed Entries", 0, 0, "open url:about:feeds" },
     { "Refresh Feeds", SDLK_r, KMOD_PRIMARY | KMOD_SHIFT, "feeds.refresh" },
 };
 
@@ -401,16 +402,29 @@ static void setupUserInterface_Window(iWindow *d) {
             setNotifyEdits_InputWidget(url, iTrue);
             setTextCStr_InputWidget(url, "gemini://");
             addChildFlags_Widget(navBar, iClob(url), expand_WidgetFlag);
-            /* Download progress indicator is inside the input field, but hidden normally. */
             setPadding_Widget(as_Widget(url),0, 0, gap_UI * 1, 0);
-            iLabelWidget *progress = new_LabelWidget(uiTextCaution_ColorEscape "00.000 MB", NULL);
-            setId_Widget(as_Widget(progress), "document.progress");
-            setAlignVisually_LabelWidget(progress, iTrue);
-            shrink_Rect(&as_Widget(progress)->rect, init_I2(0, gap_UI));
-            addChildFlags_Widget(as_Widget(url),
-                                 iClob(progress),
-                                 moveToParentRightEdge_WidgetFlag);
-            setBackgroundColor_Widget(as_Widget(progress), uiBackground_ColorId);
+            /* Feeds refresh indicator is inside the input field. */ {
+                iLabelWidget *fprog = new_LabelWidget(uiTextCaution_ColorEscape
+                                                      "\u2605 Refreshing Feeds...", NULL);
+                setId_Widget(as_Widget(fprog), "feeds.progress");
+                setBackgroundColor_Widget(as_Widget(fprog), uiBackground_ColorId);
+                setAlignVisually_LabelWidget(fprog, iTrue);
+                shrink_Rect(&as_Widget(fprog)->rect, init_I2(0, gap_UI));
+                addChildFlags_Widget(as_Widget(url),
+                                     iClob(fprog),
+                                     moveToParentRightEdge_WidgetFlag | hidden_WidgetFlag);
+            }
+            /* Download progress indicator is also inside the input field, but hidden normally.
+               TODO: It shouldn't overlap the feeds indicator... */ {
+                iLabelWidget *progress = new_LabelWidget(uiTextCaution_ColorEscape "00.000 MB", NULL);
+                setId_Widget(as_Widget(progress), "document.progress");
+                setBackgroundColor_Widget(as_Widget(progress), uiBackground_ColorId);
+                setAlignVisually_LabelWidget(progress, iTrue);
+                shrink_Rect(&as_Widget(progress)->rect, init_I2(0, gap_UI));
+                addChildFlags_Widget(as_Widget(url),
+                                     iClob(progress),
+                                     moveToParentRightEdge_WidgetFlag);
+            }
         }
         setId_Widget(addChild_Widget(
                          navBar, iClob(newIcon_LabelWidget(reloadCStr_, 0, 0, "navigate.reload"))),