Merge branch 'dev' into release

skyjake · skyjake · commit c2d0a5776bfb · 2025-08-13T19:15:37.000+03:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -18,20 +18,20 @@
 cmake_minimum_required (VERSION 3.10)
 
 project (Lagrange
-    VERSION 1.18.6
+    VERSION 1.18.7
     DESCRIPTION "A Beautiful Gemini Client"
     LANGUAGES C
 )
 set (COPYRIGHT_YEAR 2025)
 if (IOS)
     set (PROJECT_VERSION 1.18)
-    set (IOS_BUNDLE_VERSION 10)
-    set (IOS_BUILD_DATE "2025-06-04")
+    set (IOS_BUNDLE_VERSION 11)
+    set (IOS_BUILD_DATE "2025-08-07")
 endif ()
 if (ANDROID)
     set (PROJECT_VERSION 1.18)
-    set (ANDROID_BUILD_VERSION b35)  # remember to update Gradle, AndroidManifest.xml
-    set (ANDROID_BUILD_DATE "2024-12-10")
+    set (ANDROID_BUILD_VERSION b37)  # remember to update Gradle, AndroidManifest.xml
+    set (ANDROID_BUILD_DATE "2025-08-07")
 endif ()
 
 # Load modules from the source tree
@@ -501,7 +501,7 @@ if (ENABLE_GUI)
         if (TARGET harfbuzz-lib)
             target_link_libraries (app PUBLIC harfbuzz-lib)
         else ()
-            target_link_libraries (app PUBLIC ${HARFBUZZ_LIBRARIES})
+            target_link_libraries (app PUBLIC ${HARFBUZZ_LDFLAGS})
             target_include_directories (app PUBLIC ${HARFBUZZ_INCLUDE_DIRS})
         endif ()
         target_compile_definitions (app PUBLIC LAGRANGE_ENABLE_HARFBUZZ=1)
@@ -510,7 +510,7 @@ if (ENABLE_GUI)
         if (TARGET fribidi-lib)
             target_link_libraries (app PUBLIC fribidi-lib)
         else ()
-            target_link_libraries (app PUBLIC ${FRIBIDI_LIBRARIES})
+            target_link_libraries (app PUBLIC ${FRIBIDI_LDFLAGS})
             target_include_directories (app PUBLIC ${FRIBIDI_INCLUDE_DIRS})
         endif ()
         target_compile_definitions (app PUBLIC LAGRANGE_ENABLE_FRIBIDI=1)
diff --git a/cmake/Depends.cmake b/cmake/Depends.cmake
@@ -161,7 +161,7 @@ if (ENABLE_FRIBIDI)
                 "GNU FriBidi must be built with Meson. Please install Meson and Ninja and try again, or provide FriBidi via pkg-config.")
         endif ()
         add_library (fribidi-lib INTERFACE)
-        target_include_directories (fribidi-lib INTERFACE ${_dst}/include)
+        target_include_directories (fribidi-lib INTERFACE ${_dst}/include/fribidi)
         target_link_libraries (fribidi-lib INTERFACE ${_dst}/lib/libfribidi.a)
         target_compile_definitions (fribidi-lib INTERFACE FRIBIDI_LIB_STATIC=1)
         set (FRIBIDI_FOUND YES)
diff --git a/res/about/android-version.gmi b/res/about/android-version.gmi
@@ -6,6 +6,20 @@
 ```
 # Release notes
 
+## 1.18 (Beta 37)
+* Added Samogitian UI language.
+* Link icons are now included in the clickable part of a line.
+* Revised handling of reserved URI characters according to RFC 3986. The previous behavior did not fully conform to the standard.
+* Updated UI translations.
+
+## 1.18 (Beta 36)
+* Added "Copy Page URL" to the toolbar menu.
+* Fixed a potential crash when browsing to a bookmarked page due to inadvertent ID number overflow. (Courtesy of @cthulhu.)
+* Erase possible link icon leftovers after toggling link numbering.
+* Fixed hang when encountering the U+FDFD character.
+* Fixed layout issue with empty list widgets (focus border only partially visible).
+* Updated UI translations.
+
 ## 1.18 (Beta 35)
 * Added option to disable page width expansion to fit long lines.
 * Limited page width expansion to 33% so room is left for the current title in the margin.
diff --git a/res/about/ios-version.gmi b/res/about/ios-version.gmi
@@ -6,6 +6,11 @@
 ```
 # Release notes
 
+## 1.18 (11)
+* Link icons are now included in the clickable part of a line.
+* Revised handling of reserved URI characters according to RFC 3986. The previous behavior did not fully conform to the standard.
+* Updated UI translations.
+
 ## 1.18 (10)
 * Added Samogitian UI language.
 * Updated UI translations.
diff --git a/res/about/version.gmi b/res/about/version.gmi
@@ -6,6 +6,12 @@
 ```
 # Release notes
 
+## 1.18.7
+* Revised handling of reserved URI characters according to RFC 3986. The previous behavior did not fully conform to the standard.
+* Fixed opening some WebP images. There was a problem checking for the "image/webp" media type.
+* Fixed removal of unexpected NUL characters from the source text.
+* Fixed redundant mouse events when receiving touch events on the desktop.
+
 ## 1.18.6
 * Added Samogitian (sgs) UI translation.
 * Link icons are now included in the clickable part of a line.
diff --git a/src/app.c b/src/app.c
@@ -1687,8 +1687,8 @@ const iString *debugInfo_App(void) {
     iObjectList *docs = iClob(listDocuments_App(NULL));
     format_String(msg, "# Debug information\n");
     if (isDesktop_Platform()) {
-        appendFormat_String(msg, "Executable path: %s\n", cstr_String(execPath_App()));
-        appendFormat_String(msg, "User directory: %s\n", cstr_String(dataDir_App()));
+        appendFormat_String(msg, "\n## User directory\n%s\n", cstr_String(dataDir_App()));
+        appendFormat_String(msg, "\n## Executable path\n%s\n", cstr_String(execPath_App()));
     }
     appendFormat_String(msg, "\n## Memory usage\n"); {
         iMemInfo total = { 0, 0 };
@@ -2218,7 +2218,7 @@ void processEvents_App(enum iAppEventMode eventMode) {
                             break;
                         }
                         window->lastHover = window->hover;
-                        /* When clicking a mouse button, we need to be able to close previously 
+                        /* When clicking a mouse button, we need to be able to close previously
                            existing popup windows. However, after the event has been processed,
                            a new popup menu may have just opened, so we first take a copy
                            of the existing list of popups. */
@@ -2234,7 +2234,7 @@ void processEvents_App(enum iAppEventMode eventMode) {
                                     iRoot *popRoot = pop->roots[0];
                                     if (popRoot && !isRecentlyDeleted_Widget(popRoot->widget)) {
                                         postCommandf_Root(popRoot, "menu.cancel");
-                                    }                                    
+                                    }
                                 }
                             }
                             break;
diff --git a/src/gmdocument.c b/src/gmdocument.c
@@ -2511,7 +2511,7 @@ static void import_GmDocument_(iGmDocument *d) {
             if (*ch == 0) {
                 remove_Block(&d->source.chars, pos, 1);
                 pos--;
-                ch--;
+                ch = constBegin_String(&d->source) + pos;
             }
         }
     }
diff --git a/src/gmrequest.c b/src/gmrequest.c
@@ -779,7 +779,7 @@ void setUrl_GmRequest(iGmRequest *d, const iString *url) {
        characters? Could be a server-side issue, e.g., if they're using a URL parser meant for
        the web. */
     /* Encode everything except already-percent encoded characters. */
-    iString *enc = urlEncodeExclude_String(&d->url, "%" URL_RESERVED_CHARS);
+    iString *enc = urlEncodeExclude_String(&d->url, URL_ENCODE_EXCLUDE_CHARS);
     /* Normalize empty paths to /. */ {
         iUrl parts;
         init_Url(&parts, enc);
@@ -1253,8 +1253,12 @@ void submit_GmRequest(iGmRequest *d) {
     }
     else {
         /* Normal Gemini request. */
-        setContent_TlsRequest(d->req,
-                              utf8_String(collectNewFormat_String("%s\r\n", cstr_String(&d->url))));
+        iString content;
+        init_String(&content);
+        format_String(&content, "%s\r\n", cstr_String(&d->url));
+        truncate_Block(&content.chars, 1024 /* maximum permitted URI length */ + 2 /* \r\n */);
+        setContent_TlsRequest(d->req, utf8_String(&content));
+        deinit_String(&content);
     }
     submit_TlsRequest(d->req);
 }
diff --git a/src/gmutil.c b/src/gmutil.c
@@ -343,45 +343,6 @@ static iString *punyDecodeHost_(iRangecc host) {
     return result;
 }
 
-void urlDecodePath_String(iString *d) {
-    iUrl url;
-    init_Url(&url, d);
-    if (isEmpty_Range(&url.path)) {
-        return;
-    }
-    iString *decoded = new_String();
-    appendRange_String(decoded, (iRangecc){ constBegin_String(d), url.path.start });
-    iString *path    = newRange_String(url.path);
-    iString *decPath = urlDecodeExclude_String(path, ":;%?/#"); /* don't decode reserved path chars */
-    append_String(decoded, decPath);
-    delete_String(decPath);
-    delete_String(path);
-    appendRange_String(decoded, (iRangecc){ url.path.end, constEnd_String(d) });
-    set_String(d, decoded);
-    delete_String(decoded);
-}
-
-void urlEncodePath_String(iString *d) {
-    iUrl url;
-    init_Url(&url, d);
-    if (equalCase_Rangecc(url.scheme, "data")) {
-        return;
-    }
-    if (isEmpty_Range(&url.path)) {
-        return;
-    }
-    iString *encoded = new_String();
-    appendRange_String(encoded, (iRangecc){ constBegin_String(d), url.path.start });
-    iString *path    = newRange_String(url.path);
-    iString *encPath = urlEncodeExclude_String(path, "%/= ");
-    append_String(encoded, encPath);
-    delete_String(encPath);
-    delete_String(path);
-    appendRange_String(encoded, (iRangecc){ url.path.end, constEnd_String(d) });
-    set_String(d, encoded);
-    delete_String(encoded);
-}
-
 iString *withUrlParameters_String(const iString *d, ...) {
     iUrl url;
     init_Url(&url, d);
@@ -745,21 +706,23 @@ const iString *canonicalUrl_String(const iString *d) {
     iString *canon = NULL;
     iUrl parts;
     init_Url(&parts, d);
+#if 0
     /* Colons (0x3a) are in decoded form in the URL path. */
     if (iStrStrN(parts.path.start, "%3A", size_Range(&parts.path)) ||
         iStrStrN(parts.path.start, "%3a", size_Range(&parts.path))) {
         /* This is done separately to avoid the copy if %3A is not present; it's rare. */
         canon = copy_String(d);
-        urlDecodePath_String(canon);
+        /*urlDecodePath_String(canon);*/
         iString *dec = maybeUrlDecodeExclude_String(canon, "% " URL_RESERVED_CHARS); /* decode everything else in all parts */
         if (dec) {
             set_String(canon, dec);
             delete_String(dec);
         }
     }
     else {
-        canon = maybeUrlDecodeExclude_String(d, "% " URL_RESERVED_CHARS);
-    }
+#endif
+        canon = maybeUrlDecodeExclude_String(d, " " URL_DECODE_EXCLUDE_CHARS);
+//    }
     /* `canon` may now be NULL if nothing was decoded. */
     if (indexOfCStr_String(canon ? canon : d, " ") != iInvalidPos ||
         indexOfCStr_String(canon ? canon : d, "\n") != iInvalidPos) {
diff --git a/src/gmutil.h b/src/gmutil.h
@@ -106,6 +106,8 @@ iRegExp *       newGemtextLink_RegExp   (void);
 #define GEMINI_DEFAULT_PORT_CSTR    "1965"
 #define MISFIN_DEFAULT_PORT         ((uint16_t) 1958)
 #define URL_RESERVED_CHARS          ":/?#[]@!$&'()*+,;=" /* RFC 3986 */
+#define URL_DECODE_EXCLUDE_CHARS    URL_RESERVED_CHARS "%\""
+#define URL_ENCODE_EXCLUDE_CHARS    URL_RESERVED_CHARS "%"
 
 struct Impl_Url {
     iRangecc scheme;
@@ -141,8 +143,6 @@ void            stripUrlPort_String     (iString *);
 void            stripDefaultUrlPort_String(iString *);
 const iString * urlFragmentStripped_String(const iString *);
 const iString * urlQueryStripped_String (const iString *);
-void            urlDecodePath_String    (iString *);
-void            urlEncodePath_String    (iString *);
 iString *       withUrlParameters_String(const iString *d, ... /* key, value */); /* NULL key terminates; value can be NULL */
 void            urlEncodeQuery_String   (iString *);
 iString *       makeFileUrl_String      (const iString *localFilePath);
diff --git a/src/main.c b/src/main.c
@@ -83,7 +83,7 @@ int main(int argc, char **argv) {
 #if 0
     SDL_SetHint(SDL_HINT_MOUSE_TOUCH_EVENTS, "1"); /* debugging! */
 #endif
-#if defined (iPlatformAppleMobile)
+#if !defined (iPlatformTerminal)
     SDL_SetHint(SDL_HINT_TOUCH_MOUSE_EVENTS, "0");
 #endif
     if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER)) {
diff --git a/src/media.c b/src/media.c
@@ -137,7 +137,8 @@ void makeTexture_GmImage(iGmImage *d) {
     iBlock *data     = &d->partialData;
     d->numBytes      = size_Block(data);
     uint8_t *imgData = NULL;
-    if (cmp_String(&d->props.mime, "image/webp") == 0) {
+    if (cmp_String(&d->props.mime, "image/webp") == 0 ||
+        startsWith_String(&d->props.mime, "image/webp;")) {
 #if defined (LAGRANGE_ENABLE_WEBP)
         imgData = WebPDecodeRGBA(constData_Block(data), size_Block(data), &d->size.x, &d->size.y);
 #endif
diff --git a/src/ui/font.c b/src/ui/font.c
@@ -30,7 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #endif
 
 #if defined (LAGRANGE_ENABLE_FRIBIDI)
-#   include <fribidi/fribidi.h>
+#   include <fribidi.h>
 #endif
 
 iColor fgColor_AttributedRun(const iAttributedRun *d) {
diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
@@ -1209,23 +1209,16 @@ void setTextUndoable_InputWidget(iInputWidget *d, const iString *text, iBool isU
 #endif
     if (d->inFlags & isUrl_InputWidgetFlag) {
         if (prefs_App()->decodeUserVisibleURLs) {
-            iString *enc = collect_String(copy_String(text));
-            urlDecodePath_String(enc);
-            text = enc;
+            text = collect_String(urlDecodeExclude_String(text, URL_DECODE_EXCLUDE_CHARS));
         }
         else {
             /* The user wants URLs encoded, also Punycode the domain. */
-            iString *enc = collect_String(copy_String(text));
-            urlEncodePath_String(enc);
+            iString *enc = urlEncodeExclude_String(text, URL_ENCODE_EXCLUDE_CHARS);
             /* Prevent address bar spoofing (mentioned as IDN homograph attack in
                https://github.com/skyjake/lagrange/issues/73) */
             punyEncodeUrlHost_String(enc);
             text = enc;
         }
-        /* Omit the default (Gemini) scheme if there isn't much space. */
-        /*if (isNarrow_InputWidget_(d)) {
-            text = omitDefaultScheme_(collect_String(copy_String(text)));
-        }*/
     }
     iString *nfcText = collect_String(copy_String(text));
     normalize_String(nfcText);
@@ -1794,12 +1787,12 @@ static void paste_InputWidget_(iInputWidget *d) {
         if (d->inFlags & isUrl_InputWidgetFlag) {
             trim_String(paste);
             if (prefs_App()->decodeUserVisibleURLs) {
-                paste = collect_String(urlDecodeExclude_String(paste, URL_RESERVED_CHARS));
+                paste = collect_String(urlDecodeExclude_String(paste, URL_DECODE_EXCLUDE_CHARS));
                 replace_String(paste, "\n", "%0A");
                 replace_String(paste, "\t", "%09");
             }
             else {
-                urlEncodePath_String(paste);
+                paste = collect_String(urlEncodeExclude_String(paste, URL_ENCODE_EXCLUDE_CHARS));
             }
         }
         SDL_free(text);
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
@@ -596,10 +596,10 @@ static void updateItemsWithFlags_SidebarWidget_(iSidebarWidget *d, iBool keepAct
                 set_String(&item->url, &visit->url);
                 set_String(&item->label, &visit->url);
                 if (prefs_App()->decodeUserVisibleURLs) {
-                    urlDecodePath_String(&item->label);
+                    set_String(&item->label, collect_String(urlDecodeExclude_String(&item->label, URL_DECODE_EXCLUDE_CHARS)));
                 }
                 else {
-                    urlEncodePath_String(&item->label);
+                    set_String(&item->label, collect_String(urlEncodeExclude_String(&item->label, URL_ENCODE_EXCLUDE_CHARS)));
                 }
                 iDate date;
                 init_Date(&date, &visit->when);
diff --git a/src/ui/text.c b/src/ui/text.c
@@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #endif
 
 #if defined (LAGRANGE_ENABLE_FRIBIDI)
-#   include <fribidi/fribidi.h>
+#   include <fribidi.h>
 #endif
 
 static iText *current_Text_;
diff --git a/src/ui/text_stb.c b/src/ui/text_stb.c
@@ -70,7 +70,7 @@ Optimization notes:
 #endif
 
 #if defined (LAGRANGE_ENABLE_FRIBIDI)
-#   include <fribidi/fribidi.h>
+#   include <fribidi.h>
 #endif
 
 #if SDL_VERSION_ATLEAST(2, 0, 10)
diff --git a/src/ui/widget.c b/src/ui/widget.c
@@ -393,7 +393,7 @@ iWidget *root_Widget(const iWidget *d) {
 }
 
 iWindow *window_Widget(const iAnyObject *d) {
-    return constAs_Widget(d)->root->window;
+    return d ? constAs_Widget(d)->root->window : NULL;
 }
 
 void showCollapsed_Widget(iWidget *d, iBool show) {

Original file line number	Diff line number	Diff line change
`@@ -2511,7 +2511,7 @@ static void import_GmDocument_(iGmDocument *d) {`
`2511`	`2511`	`if (*ch == 0) {`
`2512`	`2512`	`remove_Block(&d->source.chars, pos, 1);`
`2513`	`2513`	`pos--;`
`2514`		`- ch--;`
	`2514`	`+ ch = constBegin_String(&d->source) + pos;`
`2515`	`2515`	`}`
`2516`	`2516`	`}`
`2517`	`2517`	`}`