Build option to disable kerning; other optimizations

5 files changed, 30 insertions, 13 deletions

diff --git a/src/gmdocument.c b/src/gmdocument.c
index 42aec9e6..89d567b0 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -192,9 +192,12 @@ iInt2 measurePreformattedBlock_GmDocument_(const iGmDocument *d, const char *sta
 }
 
 static iRangecc addLink_GmDocument_(iGmDocument *d, iRangecc line, iGmLinkId *linkId) {
-    iRegExp *pattern = new_RegExp("=>\\s*([^\\s]+)(\\s.*)?", caseInsensitive_RegExpOption);
+    static iRegExp *pattern_;
+    if (!pattern_) {
+        pattern_ = new_RegExp("=>\\s*([^\\s]+)(\\s.*)?", caseInsensitive_RegExpOption);
+    }
     iRegExpMatch m;
-    if (matchRange_RegExp(pattern, line, &m)) {
+    if (matchRange_RegExp(pattern_, line, &m)) {
         iGmLink *link = new_GmLink();
         setRange_String(&link->url, capturedRange_RegExpMatch(&m, 1));
         set_String(&link->url, absoluteUrl_String(&d->url, &link->url));
@@ -254,7 +257,6 @@ static iRangecc addLink_GmDocument_(iGmDocument *d, iRangecc line, iGmLinkId *li
             line = capturedRange_RegExpMatch(&m, 1); /* Show the URL. */
         }
     }
-    iRelease(pattern);
     return line;
 }
 
diff --git a/src/gmutil.c b/src/gmutil.c
index d278669d..cd00eb1d 100644
--- a/src/gmutil.c
+++ b/src/gmutil.c
@@ -27,12 +27,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include <the_Foundation/path.h>
 
 void init_Url(iUrl *d, const iString *text) {
-    iRegExp *absPat =
-        new_RegExp("([a-z]+:)?(//[^/:?]*)(:[0-9]+)?([^?]*)(\\?.*)?", caseInsensitive_RegExpOption);
+    static iRegExp *absoluteUrlPattern_;
+    static iRegExp *relativeUrlPattern_;
+    if (!absoluteUrlPattern_) {
+        absoluteUrlPattern_ = new_RegExp("([a-z]+:)?(//[^/:?]*)(:[0-9]+)?([^?]*)(\\?.*)?",
+                                         caseInsensitive_RegExpOption);
+    }
     iRegExpMatch m;
-    if (matchString_RegExp(absPat, text, &m)) {
+    if (matchString_RegExp(absoluteUrlPattern_, text, &m)) {
         d->protocol = capturedRange_RegExpMatch(&m, 1);
-        d->host = capturedRange_RegExpMatch(&m, 2);
+        d->host     = capturedRange_RegExpMatch(&m, 2);
         if (!isEmpty_Range(&d->host)) {
             d->host.start += 2; /* skip the double slash */
         }
@@ -40,21 +44,21 @@ void init_Url(iUrl *d, const iString *text) {
         if (!isEmpty_Range(&d->port)) {
             d->port.start++; /* omit the colon */
         }
-        d->path = capturedRange_RegExpMatch(&m, 4);
+        d->path  = capturedRange_RegExpMatch(&m, 4);
         d->query = capturedRange_RegExpMatch(&m, 5);
     }
     else {
         /* Must be a relative path. */
         iZap(*d);
-        iRegExp *relPat = new_RegExp("([a-z]+:)?([^?]*)(\\?.*)?", 0);
-        if (matchString_RegExp(relPat, text, &m)) {
+        if (!relativeUrlPattern_) {
+            relativeUrlPattern_ = new_RegExp("([a-z]+:)?([^?]*)(\\?.*)?", 0);
+        }
+        if (matchString_RegExp(relativeUrlPattern_, text, &m)) {
             d->protocol = capturedRange_RegExpMatch(&m, 1);
             d->path     = capturedRange_RegExpMatch(&m, 2);
             d->query    = capturedRange_RegExpMatch(&m, 3);
         }
-        iRelease(relPat);
     }
-    iRelease(absPat);
     if (!isEmpty_Range(&d->protocol)) {
         d->protocol.end--; /* omit the colon */
     }
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 45bd4868..c39d9f12 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -1731,11 +1731,14 @@ static void draw_DocumentWidget_(const iDocumentWidget *d) {
         visBuf->index = vbDst;
     }
     /* Dynamic content. */ {
+        extern int enableKerning_Text;
+        enableKerning_Text = iFalse; /* need to be fast, these is redone on every redraw */
         iPaint *p = &ctxDynamic.paint;
         init_Paint(p);
         setClip_Paint(p, bounds);
         render_GmDocument(d->doc, visRange, drawRun_DrawContext_, &ctxDynamic);
         unsetClip_Paint(p);
+        enableKerning_Text = iTrue;
     }
 
 //    drawRect_Paint(&ctx.paint,
diff --git a/src/ui/text.c b/src/ui/text.c
index b4b7fb0c..40956e29 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -48,6 +48,7 @@ iDeclareTypeConstructionArgs(Glyph, iChar ch)
 
 int gap_Text;                           /* cf. gap_UI in metrics.h */
 int enableHalfPixelGlyphs_Text = iTrue; /* debug setting */
+int enableKerning_Text         = iTrue; /* looking up kern pairs is slow */
 
 struct Impl_Glyph {
     iHashNode node;
@@ -85,6 +86,7 @@ struct Impl_Font {
     int            baseline;
     iHash          glyphs;
     iBool          isMonospaced;
+    iBool          manualKernOnly;
     enum iFontId   symbolsFont; /* font to use for symbols */
 };
 
@@ -176,6 +178,9 @@ static void initFonts_Text_(iText *d) {
         if (fontData[i].ttf == &fontFiraMonoRegular_Embedded) {
             font->isMonospaced = iTrue;
         }
+        if (i == default_FontId || i == defaultMedium_FontId) {
+            font->manualKernOnly = iTrue;
+        }
     }
     gap_Text = iRound(gap_UI * d->contentFontSize);
 }
@@ -511,9 +516,11 @@ static iRect run_Font_(iFont *d, enum iRunMode mode, iRangecc text, size_t maxLe
                 /* Manual kerning for double-slash. */
                 xpos -= glyph->rect[hoff].size.x * 0.5f;
             }
-            else if (next) {
+#if defined (LAGRANGE_ENABLE_KERNING)
+            else if (enableKerning_Text && !d->manualKernOnly && next) {
                 xpos += d->scale * stbtt_GetCodepointKernAdvance(&d->font, ch, next);
             }
+#endif
         }
         prevCh = ch;
         if (--maxLen == 0) {
diff --git a/src/ui/text.h b/src/ui/text.h
index edd7ed4e..2b4ec5c3 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -58,6 +58,7 @@ enum iFontId {
     hugeEmoji_FontId,
     smallEmoji_FontId,
     max_FontId,
+
     /* Meta: */
     fromSymbolsToEmojiOffset_FontId = 7,
     /* UI fonts: */