Merge branch 'dev' into work/v1.6

# Conflicts:
#	CMakeLists.txt

5 files changed, 83 insertions, 8 deletions

diff --git a/src/app.c b/src/app.c
index 3a1ee101..b25a213e 100644
--- a/src/app.c
+++ b/src/app.c
@@ -59,6 +59,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include <stdarg.h>
 #include <errno.h>
 
+//#define LAGRANGE_ENABLE_MOUSE_TOUCH_EMULATION 1
+
 #if defined (iPlatformAppleDesktop)
 #   include "macos.h"
 #endif
@@ -1197,6 +1199,45 @@ void processEvents_App(enum iAppEventMode eventMode) {
                     ev.wheel.x = -ev.wheel.x;
 #endif
                 }
+#if defined (LAGRANGE_ENABLE_MOUSE_TOUCH_EMULATION)
+                /* Convert mouse events to finger events to test the touch handling. */ {
+                    static float xPrev = 0.0f;
+                    static float yPrev = 0.0f;
+                    if (ev.type == SDL_MOUSEBUTTONDOWN || ev.type == SDL_MOUSEBUTTONUP) {
+                        const float xf = (d->window->pixelRatio * ev.button.x) / (float) d->window->size.x;
+                        const float yf = (d->window->pixelRatio * ev.button.y) / (float) d->window->size.y;
+                        ev.type = (ev.type == SDL_MOUSEBUTTONDOWN ? SDL_FINGERDOWN : SDL_FINGERUP);
+                        ev.tfinger.x = xf;
+                        ev.tfinger.y = yf;
+                        ev.tfinger.dx = xf - xPrev;
+                        ev.tfinger.dy = yf - yPrev;
+                        xPrev = xf;
+                        yPrev = yf;
+                        ev.tfinger.fingerId = 0x1234;
+                        ev.tfinger.pressure = 1.0f;
+                        ev.tfinger.timestamp = SDL_GetTicks();
+                        ev.tfinger.touchId = SDL_TOUCH_MOUSEID;
+                    }
+                    else if (ev.type == SDL_MOUSEMOTION) {
+                        if (~ev.motion.state & SDL_BUTTON(SDL_BUTTON_LEFT)) {
+                            continue; /* only when pressing a button */    
+                        }
+                        const float xf = (d->window->pixelRatio * ev.motion.x) / (float) d->window->size.x;
+                        const float yf = (d->window->pixelRatio * ev.motion.y) / (float) d->window->size.y;
+                        ev.type = SDL_FINGERMOTION;
+                        ev.tfinger.x = xf;
+                        ev.tfinger.y = yf;
+                        ev.tfinger.dx = xf - xPrev;
+                        ev.tfinger.dy = yf - yPrev;
+                        xPrev = xf;
+                        yPrev = yf;
+                        ev.tfinger.fingerId = 0x1234;
+                        ev.tfinger.pressure = 1.0f;
+                        ev.tfinger.timestamp = SDL_GetTicks();
+                        ev.tfinger.touchId = SDL_TOUCH_MOUSEID;                        
+                    }
+                }
+#endif
                 iBool wasUsed = processEvent_Window(d->window, &ev);
                 if (!wasUsed) {
                     /* There may be a key bindings for this. */
diff --git a/src/gmdocument.c b/src/gmdocument.c
index aa2baa4a..f15d9d1d 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -289,6 +289,12 @@ static void clearLinks_GmDocument_(iGmDocument *d) {
     clear_PtrArray(&d->links);
 }
 
+static iBool isGopher_GmDocument_(const iGmDocument *d) {
+    const iRangecc scheme = urlScheme_String(&d->url);
+    return (equalCase_Rangecc(scheme, "gopher") ||
+            equalCase_Rangecc(scheme, "finger"));
+}
+
 static iBool isForcedMonospace_GmDocument_(const iGmDocument *d) {
     const iRangecc scheme = urlScheme_String(&d->url);
     if (equalCase_Rangecc(scheme, "gemini")) {
@@ -364,6 +370,7 @@ static void updateOpenURLs_GmDocument_(iGmDocument *d) {
 static void doLayout_GmDocument_(iGmDocument *d) {
     const iPrefs *prefs             = prefs_App();
     const iBool   isMono            = isForcedMonospace_GmDocument_(d);
+    const iBool   isGopher          = isGopher_GmDocument_(d);
     const iBool   isNarrow          = d->size.x < 90 * gap_Text;
     const iBool   isVeryNarrow      = d->size.x <= 70 * gap_Text;
     const iBool   isExtremelyNarrow = d->size.x <= 60 * gap_Text;
@@ -482,7 +489,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
                     meta.flags = constValue_Array(oldPreMeta, preIndex, iGmPreMeta).flags &
                                  folded_GmPreMetaFlag;
                 }
-                else if (prefs->collapsePreOnLoad) {
+                else if (prefs->collapsePreOnLoad && !isGopher) {
                     meta.flags |= folded_GmPreMetaFlag;
                 }
                 pushBack_Array(&d->preMeta, &meta);
@@ -1451,6 +1458,9 @@ iBool updateOpenURLs_GmDocument(iGmDocument *d) {
             const iBool isOpen = contains_StringSet(d->openURLs, &link->url);
             if (isOpen ^ ((link->flags & isOpen_GmLinkFlag) != 0)) {
                 iChangeFlags(link->flags, isOpen_GmLinkFlag, isOpen);
+                if (isOpen) {
+                    link->flags |= visited_GmLinkFlag;
+                }
                 wasChanged = iTrue;
             }
         }
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 7f8d70a3..cb1fde28 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -4155,11 +4155,12 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
                     linkOrdinalChar_DocumentWidget_(d->widget, ord - d->widget->ordinalBase);
                 if (ordChar) {
                     const char *circle = "\u25ef"; /* Large Circle */
+                    const int   circleFont = defaultContentRegular_FontId;
                     iRect nbArea = { init_I2(d->viewPos.x - gap_UI / 3, visPos.y),
-                                     init_I2(3.95f * gap_Text, 1.0f * lineHeight_Text(run->font)) };
+                                     init_I2(3.95f * gap_Text, 1.0f * lineHeight_Text(circleFont)) };
                     drawRange_Text(
-                        run->font, topLeft_Rect(nbArea), tmQuote_ColorId, range_CStr(circle));
-                    iRect circleArea = visualBounds_Text(run->font, range_CStr(circle));
+                        circleFont, topLeft_Rect(nbArea), tmQuote_ColorId, range_CStr(circle));
+                    iRect circleArea = visualBounds_Text(circleFont, range_CStr(circle));
                     addv_I2(&circleArea.pos, topLeft_Rect(nbArea));
                     drawCentered_Text(defaultContentSmall_FontId,
                                       circleArea,
diff --git a/src/ui/text.c b/src/ui/text.c
index ae1248a7..edbc6583 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -116,6 +116,7 @@ iDefineTypeConstructionArgs(Glyph, (iChar ch), ch)
 
 struct Impl_Font {
     iBlock *       data;
+    enum iTextFont family;
     stbtt_fontinfo font;
     float          xScale, yScale;
     int            vertOffset; /* offset due to scaling */
@@ -134,6 +135,15 @@ static void init_Font(iFont *d, const iBlock *data, int height, float scale,
                       enum iFontSize sizeId, iBool isMonospaced) {
     init_Hash(&d->glyphs);
     d->data = NULL;
+    d->family = undefined_TextFont;
+    /* Note: We only use `family` currently for applying a kerning fix to Nunito. */
+    if (data == &fontNunitoRegular_Embedded ||
+        data == &fontNunitoBold_Embedded ||
+        data == &fontNunitoExtraBold_Embedded ||
+        data == &fontNunitoLightItalic_Embedded ||
+        data == &fontNunitoExtraLight_Embedded) {
+        d->family = nunito_TextFont;
+    }
     d->isMonospaced = isMonospaced;
     d->height = height;
     iZap(d->font);
@@ -1131,14 +1141,26 @@ static iRect run_Font_(iFont *d, const iRunArgs *args) {
             const iChar next = nextChar_(&peek, args->text.end);
             if (enableKerning_Text && !d->manualKernOnly && next) {
                 const uint32_t nextGlyphIndex = glyphIndex_Font_(glyph->font, next);
-                const int kern = stbtt_GetGlyphKernAdvance(
+                int kern = stbtt_GetGlyphKernAdvance(
                     &glyph->font->font, glyph->glyphIndex, nextGlyphIndex);
+                /* Nunito needs some kerning fixes. */
+                if (glyph->font->family == nunito_TextFont) {
+                    if (ch == 'W' && (next == 'i' || next == 'h')) {
+                        kern = -30;
+                    }
+                    else if (ch == 'T' && next == 'h') {
+                        kern = -15;
+                    }
+                    else if (ch == 'V' && next == 'i') {
+                        kern = -15;
+                    }
+                }
                 if (kern) {
 //                    printf("%lc(%u) -> %lc(%u): kern %d (%f)\n", ch, glyph->glyphIndex, next,
 //                           nextGlyphIndex,
 //                           kern, d->xScale * kern);
-                    xpos       += d->xScale * kern;
-                    xposExtend += d->xScale * kern;
+                    xpos       += glyph->font->xScale * kern;
+                    xposExtend += glyph->font->xScale * kern;
                 }
             }
         }
diff --git a/src/ui/text.h b/src/ui/text.h
index dd377247..5a099142 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -117,7 +117,8 @@ iLocalDef iBool isJapanese_FontId(enum iFontId id) {
 #define emojiVariationSelector_Char     ((iChar) 0xfe0f)
 
 enum iTextFont {
-    nunito_TextFont,
+    undefined_TextFont = -1,
+    nunito_TextFont = 0,
     firaSans_TextFont,
     literata_TextFont,
     tinos_TextFont,