Merge branch 'dev' into release

Author: skyjake

CMakeLists.txt

@@ -18,7 +18,7 @@
 cmake_minimum_required (VERSION 3.9)
 
 project (Lagrange
-    VERSION 0.12.0
+    VERSION 0.12.1
     DESCRIPTION "A Beautiful Gemini Client"
     LANGUAGES C
 )
@@ -30,6 +30,7 @@ option (ENABLE_X11_SWRENDER     "Use software rendering under X11" OFF)
 option (ENABLE_KERNING          "Enable kerning in font renderer (slower)" ON)
 option (ENABLE_RESOURCE_EMBED   "Embed resources inside the executable" OFF)
 option (ENABLE_WINDOWPOS_FIX    "Set position after showing window (workaround for SDL bug)" OFF)
+option (ENABLE_IDLE_SLEEP       "While idle, sleep in the main thread instead of waiting for events" ON)
 
 include (BuildType.cmake)
 include (res/Embed.cmake)
@@ -219,6 +220,9 @@ if (ENABLE_MPG123 AND MPG123_FOUND)
     target_compile_definitions (app PUBLIC LAGRANGE_ENABLE_MPG123=1)
     target_link_libraries (app PUBLIC PkgConfig::MPG123)
 endif ()
+if (ENABLE_IDLE_SLEEP)
+    target_compile_definitions (app PUBLIC LAGRANGE_IDLE_SLEEP=1)
+endif ()
 target_link_libraries (app PUBLIC the_Foundation::the_Foundation)
 target_link_libraries (app PUBLIC ${SDL2_LDFLAGS})
 if (APPLE)

debian/rules

@@ -6,7 +6,7 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=-format
 	dh $@  
 
 override_dh_auto_configure:
-	cmake .. -DENABLE_WINDOWPOS_FIX=YES -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$(pwd)/../usr
+	cmake .. -DCMAKE_BUILD_TYPE=Release -DENABLE_WINDOWPOS_FIX=YES -DTFDN_ENABLE_SSE41=NO -DCMAKE_INSTALL_PREFIX=$(pwd)/../usr
 
 override_dh_build_configure:
 	cmake --build .

lib/the_Foundation

@@ -54,16 +54,16 @@
 			<false/>
 		</dict>
 	</array>
-		<key>CFBundleURLTypes</key>
-		<array>
-			<dict>
-				<key>CFBundleURLName</key>
-				<string>Gemini</string>
-				<key>CFBundleURLSchemes</key>
-				<array>
-					<string>gemini</string>
-				</array>
-			</dict>
-		</array>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleURLName</key>
+			<string>Gemini</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>gemini</string>
+			</array>
+		</dict>
+	</array>
 </dict>
 </plist>

res/MacOSXBundleInfo.plist.in

@@ -63,7 +63,7 @@ Lagrange's user interface is modeled after web browsers:
 
 * There is a navigation bar at the top with Back and Forward buttons.
 * There is a tab bar for switching tabs. The tab bar is hidden if there is only one tab open.
-* There is a sidebar for managing bookmarks and TLS identities, and viewing history and the page outline. The sidebar is hidden by default.
+* There is a sidebar for managing bookmarks and TLS identities, and viewing history and the page outline. Sidebars are hidden by default.
 * There is a search bar that appears at the bottom when searching text on the page.
 
 Tip: Try pressing ${CTRL+}5 now to see the page outline.
@@ -126,17 +126,17 @@ Press ${CTRL+}T to open a new tab, and ${CTRL+}W to close the current tab. Right
 
 The set of open tabs is restored when you launch Lagrange.
 
-## Sidebar
+## Sidebars
 
-The sidebar can be toggled via menus or by pressing ${SHIFT+}${CTRL+}L. It has five tabs:
+The sidebars can be toggled via menus or by pressing ${SHIFT+}${CTRL+}L or ${SHIFT+}${CTRL+}P (for the left/right sidebar, respectively). Both sidebars have five tabs:
 
 * Bookmarks: List of bookmarks that you've created. These appear first in search results for quick and easy access.
-* Feeds: Entries found on subscribed feed index pages.
+* Feeds: Entries found on subscribed pages.
 * History: Chronological list of visited URLs. This is not a full history of all the URLs you've accessed over time — only unique URLs are shown at the latest access time.
 * Identities: TLS client certificates.
 * Outline: List of the headings in the currently open tab. Useful when reading longer documents.
 
-${CTRL+}1 through ${CTRL+}5 switch between the sidebar tabs, or hide the sidebar if the current tab's key is pressed. You can also press Escape to dismiss the sidebar.
+${CTRL+}1 through ${CTRL+}5 switch between the left sidebar tabs, or hide the sidebar if the current tab's key is pressed. You can also press Escape to dismiss sidebars.
 
 ## Bookmarks
 
@@ -150,10 +150,11 @@ In addition to a title, bookmarks can have tags. Some tags have a special meanin
 
 * Set a "homepage" tag on a bookmark to make it one of the pages that will be opened when pressing the 🏠 button. If multiple bookmarks are tagged as homepages, a random one is selected.
 * A "subscribed" tag means that Lagrange will periodically fetch the bookmarked page and look for Gemini feed links. All the found links that match the required style ("YYYY-MM-DD Entry title") will appear in the Feeds sidebar tab.
+* "headings" can be used together with "subscribed" to subscribe to new headings instead of Gemini feed links.
 
 ## Feeds
 
-You may be familiar with RSS and Atom XML feeds from the web. Lagrange does _not_ support RSS/Atom, only Gemini feeds. A Gemini feed is simply a regular 'text/gemini' page that contains one or more links whose labels are formatted in a particular way.
+You may be familiar with RSS and Atom XML feeds from the web. Lagrange does _not_ support RSS or Atom, only Gemini feeds. A Gemini feed is simply a regular 'text/gemini' page that contains one or more links whose labels are formatted in a particular way.
 
 => gemini://gemini.circumlunar.space/docs/companion/subscription.gmi  See "Subscribing to Gemini pages" for more information.
 
@@ -213,8 +214,6 @@ You can find a number of settings in Preferences to customize the user interface
 
 ### Browsing behavior
 
-The "Outline on scrollbar" option shows the page outline when the mouse cursor is moved over the scrollbar, allowing one to better navigate long documents. The outline will disappear after the mouse cursor is moved away. If you need a persistent outline, one is always available in the sidebar.
-
 One important characteristic of Gemini is that you remain in control of what gets loaded and when. The browser will not suddenly fetch a ton of images, autoplay videos, or make surreptitious connections to any tracking servers — each network request is purposeful and manually triggered. With this in mind, the "Load image on scroll" option is provided to assist keyboard-only browsing and to facilitate a focused reading experience. When enabled, if there is an image link visible on the page and you press Space or ↓, it will be loaded and shown inline _instead_ of the view scrolling down. This allows you to read and see all the content of the page while only tapping on a single key on the keyboard.
 
 ### Window and UI options
@@ -338,7 +337,7 @@ Example use cases:
 
 ## Interface
 
-When a hook is called, it is given the MIME type and parameters via command line arguments. The response body is provided via stdin.
+When a hook is called, it is given the MIME type and parameters via command line arguments. The response body is provided via stdin. The request's URL is available in the REQUEST_URL environment variable.
 
 The MIME type and parameters are split at semicolons, so "text/gemini; lang=ja" would be called as:
 ```

res/about/help.gmi

@@ -6,6 +6,15 @@
 ```
 # Release notes
 
+## 0.12.1
+* 'text/*' content falls back to plain text.
+* Minimized visual artifacts in Unicode box-drawing characters (overlapping/gaps) by fine-tuning glyph scaling.
+* Fixed truncated tab titles when opening tabs in background.
+* Fixed possible exit if hook program not found (SIGPIPE).
+* REQUEST_URL is set in the environment when running MIME hooks.
+* "about:debug" lists the configured MIME hooks.
+* macOS: Fixed excessive CPU usage while idling.
+
 ## 0.12
 * Added MIME hooks: pipe Gemini responses through external programs for arbitrary processing. (See "about:help" for usage.)
 * Added a right-hand sidebar; have a sidebar on the right or on both sides at once.

res/about/version.gmi

@@ -89,6 +89,8 @@ static const char *prefsFileName_App_ = "prefs.cfg";
 static const char *stateFileName_App_ = "state.binary";
 static const char *downloadDir_App_   = "~/Downloads";
 
+static const int idleThreshold_App_ = 1000; /* ms */
+
 struct Impl_App {
     iCommandLine args;
     iString *    execPath;
@@ -100,7 +102,12 @@ struct Impl_App {
     iSortedArray tickers;
     uint32_t     lastTickerTime;
     uint32_t     elapsedSinceLastTicker;
-    iBool        running;
+    iBool        isRunning;
+#if defined (LAGRANGE_IDLE_SLEEP)
+    iBool        isIdling;
+    uint32_t     lastEventTime;
+    int          sleepTimer;
+#endif
     iAtomicInt   pendingRefresh;
     int          tabEnum;
     iStringList *launchCommands;
@@ -320,6 +327,16 @@ static void saveState_App_(const iApp *d) {
     iRelease(f);
 }
 
+#if defined (LAGRANGE_IDLE_SLEEP)
+static uint32_t checkAsleep_App_(uint32_t interval, void *param) {
+    iApp *d = param;
+    SDL_Event ev = { .type = SDL_USEREVENT };
+    ev.user.code = asleep_UserEventCode;
+    SDL_PushEvent(&ev);
+    return interval;
+}
+#endif
+
 static void init_App_(iApp *d, int argc, char **argv) {
     const iBool isFirstRun = !fileExistsCStr_FileInfo(cleanedPath_CStr(dataDir_App_));
     d->isFinishedLaunching = iFalse;
@@ -349,7 +366,7 @@ static void init_App_(iApp *d, int argc, char **argv) {
 #endif
     init_Prefs(&d->prefs);
     setCStr_String(&d->prefs.downloadDir, downloadDir_App_);
-    d->running           = iFalse;
+    d->isRunning         = iFalse;
     d->window            = NULL;
     set_Atomic(&d->pendingRefresh, iFalse);
     d->mimehooks         = new_MimeHooks();
@@ -358,6 +375,11 @@ static void init_App_(iApp *d, int argc, char **argv) {
     d->bookmarks         = new_Bookmarks();
     d->tabEnum           = 0; /* generates unique IDs for tab pages */
     setThemePalette_Color(d->prefs.theme);
+#if defined (LAGRANGE_IDLE_SLEEP)
+    d->isIdling      = iFalse;
+    d->lastEventTime = 0;
+    d->sleepTimer    = SDL_AddTimer(1000, checkAsleep_App_, d);
+#endif
 #if defined (iPlatformApple)
     setupApplication_MacOS();
 #endif
@@ -480,23 +502,31 @@ const iString *debugInfo_App(void) {
     iConstForEach(StringList, j, d->launchCommands) {
         appendFormat_String(msg, "%s\n", cstr_String(j.value));
     }
+    appendFormat_String(msg, "## MIME hooks\n");
+    append_String(msg, debugInfo_MimeHooks(d->mimehooks));
     return msg;
 }
 
 iLocalDef iBool isWaitingAllowed_App_(iApp *d) {
+#if defined (LAGRANGE_IDLE_SLEEP)
+    if (d->isIdling) {
+        return iFalse;
+    }
+#endif
     return !value_Atomic(&d->pendingRefresh) && isEmpty_SortedArray(&d->tickers);
 }
 
 void processEvents_App(enum iAppEventMode eventMode) {
     iApp *d = &app_;
     SDL_Event ev;
+    iBool gotEvents = iFalse;
     while ((isWaitingAllowed_App_(d) && eventMode == waitForNewEvents_AppEventMode &&
             SDL_WaitEvent(&ev)) ||
            ((!isWaitingAllowed_App_(d) || eventMode == postedEventsOnly_AppEventMode) &&
             SDL_PollEvent(&ev))) {
         switch (ev.type) {
             case SDL_QUIT:
-                d->running = iFalse;
+                d->isRunning = iFalse;
                 goto backToMainLoop;
             case SDL_DROPFILE: {
                 iBool newTab = iFalse;
@@ -516,6 +546,25 @@ void processEvents_App(enum iAppEventMode eventMode) {
                 break;
             }
             default: {
+#if defined (LAGRANGE_IDLE_SLEEP)
+                if (ev.type == SDL_USEREVENT && ev.user.code == asleep_UserEventCode) {
+                    if (SDL_GetTicks() - d->lastEventTime > idleThreshold_App_) {
+                        if (!d->isIdling) {
+//                            printf("[App] idling...\n");
+                            fflush(stdout);
+                        }
+                        d->isIdling = iTrue;
+                    }
+                    continue;
+                }
+                d->lastEventTime = SDL_GetTicks();
+                if (d->isIdling) {
+//                    printf("[App] ...woke up\n");
+                    fflush(stdout);
+                }
+                d->isIdling = iFalse;
+#endif
+                gotEvents = iTrue;
                 iBool wasUsed = processEvent_Window(d->window, &ev);
                 if (!wasUsed) {
                     /* There may be a key bindings for this. */
@@ -539,6 +588,14 @@ void processEvents_App(enum iAppEventMode eventMode) {
             }
         }
     }
+#if defined (LAGRANGE_IDLE_SLEEP)
+    if (d->isIdling && !gotEvents) {
+        /* This is where we spend most of our time when idle. 60 Hz still quite a lot but we
+           can't wait too long after the user tries to interact again with the app. In any
+           case, on macOS SDL_WaitEvent() seems to use 10x more CPU time than sleeping. */
+        SDL_Delay(1000 / 60);
+    }
+#endif
 backToMainLoop:;
 }
 
@@ -586,10 +643,10 @@ static int resizeWatcher_(void *user, SDL_Event *event) {
 
 static int run_App_(iApp *d) {
     arrange_Widget(findWidget_App("root"));
-    d->running = iTrue;
+    d->isRunning = iTrue;
     SDL_EventState(SDL_DROPFILE, SDL_ENABLE); /* open files via drag'n'drop */
     SDL_AddEventWatch(resizeWatcher_, d);
-    while (d->running) {
+    while (d->isRunning) {
         processEvents_App(waitForNewEvents_AppEventMode);
         runTickers_App_(d);
         refresh_App();
@@ -600,6 +657,9 @@ static int run_App_(iApp *d) {
 
 void refresh_App(void) {
     iApp *d = &app_;
+#if defined (LAGRANGE_IDLE_SLEEP)
+    if (d->isIdling) return;
+#endif
     destroyPending_Widget();
     draw_Window(d->window);
     set_Atomic(&d->pendingRefresh, iFalse);
@@ -657,6 +717,9 @@ int run_App(int argc, char **argv) {
 
 void postRefresh_App(void) {
     iApp *d = &app_;
+#if defined (LAGRANGE_IDLE_SLEEP)
+    d->isIdling = iFalse;
+#endif
     const iBool wasPending = exchange_Atomic(&d->pendingRefresh, iTrue);
     if (!wasPending) {
         SDL_Event ev;
@@ -852,6 +915,7 @@ iDocumentWidget *newTab_App(const iDocumentWidget *duplicateOf, iBool switchToNe
     }
     arrange_Widget(tabs);
     refresh_Widget(tabs);
+    postCommandf_App("tab.created id:%s", cstr_String(id_Widget(as_Widget(doc))));
     return doc;
 }
 
@@ -972,7 +1036,13 @@ iBool willUseProxy_App(const iRangecc scheme) {
 
 iBool handleCommand_App(const char *cmd) {
     iApp *d = &app_;
-    if (equal_Command(cmd, "prefs.dialogtab")) {
+    if (equal_Command(cmd, "config.error")) {
+        makeMessage_Widget(uiTextCaution_ColorEscape "CONFIG ERROR",
+                           format_CStr("Error in config file: %s\nSee \"about:debug\" for details.",
+                                       suffixPtr_Command(cmd, "where")));
+        return iTrue;
+    }
+    else if (equal_Command(cmd, "prefs.dialogtab")) {
         d->prefs.dialogTab = arg_Command(cmd);
         return iTrue;
     }
@@ -1084,12 +1154,12 @@ iBool handleCommand_App(const char *cmd) {
     }
     else if (equal_Command(cmd, "prefs.sideicon.changed")) {
         d->prefs.sideIcon = arg_Command(cmd) != 0;
-        refresh_App();
+        postRefresh_App();
         return iTrue;
     }
     else if (equal_Command(cmd, "prefs.hoveroutline.changed")) {
         d->prefs.hoverOutline = arg_Command(cmd) != 0;
-        refresh_App();
+        postRefresh_App();
         return iTrue;
     }
     else if (equal_Command(cmd, "saturation.set")) {
@@ -1372,13 +1442,13 @@ iBool handleCommand_App(const char *cmd) {
     }
     else if (equal_Command(cmd, "feeds.update.started")) {
         setFlags_Widget(findWidget_App("feeds.progress"), hidden_WidgetFlag, iFalse);
-        refresh_App();
+        postRefresh_App();
         return iFalse;
     }
     else if (equal_Command(cmd, "feeds.update.finished")) {
         setFlags_Widget(findWidget_App("feeds.progress"), hidden_WidgetFlag, iTrue);
         refreshFinished_Feeds();
-        refresh_App();
+        postRefresh_App();
         return iFalse;
     }
     else if (equal_Command(cmd, "visited.changed")) {

src/app.c

@@ -46,6 +46,7 @@ enum iAppEventMode {
 enum iUserEventCode {
     command_UserEventCode = 1,
     refresh_UserEventCode = 2,
+    asleep_UserEventCode = 3,
 };
 
 const iString *execPath_App     (void);

src/app.h

@@ -262,8 +262,9 @@ static void requestFinished_GmRequest_(iGmRequest *d, iTlsRequest *req) {
     checkServerCertificate_GmRequest_(d);
     unlock_Mutex(d->mtx);
     /* Check for mimehooks. */
-    if (d->isRespFiltered && d->state == finished_GmRequestState) {       
-        iBlock *xbody = tryFilter_MimeHooks(mimeHooks_App(), &d->resp->meta, &d->resp->body);
+    if (d->isRespFiltered && d->state == finished_GmRequestState) {
+        iBlock *xbody =
+            tryFilter_MimeHooks(mimeHooks_App(), &d->resp->meta, &d->resp->body, &d->url);
         if (xbody) {
             lock_Mutex(d->mtx);
             clear_String(&d->resp->meta);