2 files changed, 67 insertions, 40 deletions

diff --git a/src/ui/text.c b/src/ui/text.c
index 3683aee4..4b82191f 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -895,6 +895,14 @@ static void prepare_AttributedText_(iAttributedText *d, int overrideBaseDir) {
                         NULL,
                         (FriBidiLevel *) d->bidiLevels);
         d->isBaseRTL = (overrideBaseDir == 0 ? FRIBIDI_IS_RTL(baseDir) : (overrideBaseDir < 0));
+#else
+        /* 1:1 mapping. */
+        setCopy_Array(&d->visual, &d->logical);
+        resize_Array(&d->logicalToVisual, length);
+        for (size_t i = 0; i < length; i++) {
+            set_Array(&d->logicalToVisual, i, &(int){ i });
+        }
+        d->isBaseRTL = iFalse;
 #endif
     }
     /* The mapping needs to include the terminating NULL position. */ {
@@ -1208,13 +1216,13 @@ enum iRunMode {
     draw_RunMode                    = 1,
     modeMask_RunMode                = 0x00ff,
     flagsMask_RunMode               = 0xff00,
-    noWrapFlag_RunMode              = iBit(9),
+//    noWrapFlag_RunMode              = iBit(9),
     visualFlag_RunMode              = iBit(10), /* actual visible bounding box of the glyph,
                                                    e.g., for icons */
     permanentColorFlag_RunMode      = iBit(11),
     alwaysVariableWidthFlag_RunMode = iBit(12),
     fillBackground_RunMode          = iBit(13),
-    stopAtNewline_RunMode           = iBit(14), /* don't advance past \n, consider it a wrap pos */
+//    stopAtNewline_RunMode           = iBit(14), /* don't advance past \n, consider it a wrap pos */
 };
 
 iDeclareType(RunArgs)
@@ -1225,14 +1233,14 @@ struct Impl_RunArgs {
     size_t        maxLen; /* max characters to process */
     iInt2         pos;
     iWrapText *   wrap;
-    int           xposLimit;        /* hard limit for wrapping */
-    int           xposLayoutBound;  /* visible bound for layout purposes; does not affect wrapping */
+//    int           xposLimit;        /* hard limit for wrapping */
+//    int           xposLayoutBound;  /* visible bound for layout purposes; does not affect wrapping */
     int           color;
     int           baseDir;
     /* TODO: Cleanup using TextMetrics
        Use TextMetrics output pointer instead of return value & cursorAdvance_out. */
     iInt2 *       cursorAdvance_out;
-    const char ** continueFrom_out;
+//    const char ** continueFrom_out;
     int *         runAdvance_out;
 };
 
@@ -1368,9 +1376,9 @@ static iRect run_Font_(iFont *d, const iRunArgs *args) {
     float        xCursorMax = 0.0f;
     const iBool  isMonospaced = d->isMonospaced;
     iAssert(args->text.end >= args->text.start);
-    if (args->continueFrom_out) {
-        *args->continueFrom_out = args->text.end;
-    }
+//    if (args->continueFrom_out) {
+//        *args->continueFrom_out = args->text.end;
+//    }
     /* Split the text into a number of attributed runs that specify exactly which
        font is used and other attributes such as color. (HarfBuzz shaping is done
        with one specific font.) */
@@ -1575,10 +1583,10 @@ static iRect run_Font_(iFont *d, const iRunArgs *args) {
             if (layoutBound > 0) {
                 origin = layoutBound - wrapAdvance;
             }
-            else if (args->xposLayoutBound > 0) {
-                iAssert(mode & draw_RunMode);
-//                origin = args->xposLayoutBound - orig.x - wrapAdvance * 2;
-            }
+//            else if (args->xposLayoutBound > 0) {
+//                iAssert(mode & draw_RunMode);
+////                origin = args->xposLayoutBound - orig.x - wrapAdvance * 2;
+//            }
         }
         /* Make a callback for each wrapped line. */
         if (!notify_WrapText_(args->wrap,
@@ -1768,6 +1776,7 @@ iInt2 tryAdvance_Text(int fontId, iRangecc text, int width, const char **endPos)
 
 iInt2 tryAdvanceNoWrap_Text(int fontId, iRangecc text, int width, const char **endPos) {
     /* TODO: "NoWrap" means words aren't wrapped; the line is broken at nearest character. */
+    /* FIXME: Get rid of this. Caller could use WrapText directly? */
     iWrapText wrap = { .mode     = anyCharacter_WrapTextMode,
                        .text     = text,
                        .maxWidth = width,
@@ -1803,7 +1812,7 @@ static void drawBoundedN_Text_(int fontId, iInt2 pos, int xposBound, int color,
                            .text            = text,
                            .maxLen          = maxLen,                           
                            .pos             = pos,
-                           .xposLayoutBound = xposBound,
+//                           .xposLayoutBound = xposBound,
                            .color           = color & mask_ColorId,
                            .baseDir         = xposBound ? iSign(xposBound - pos.x) : 0 });
 }
diff --git a/src/ui/text_simple.c b/src/ui/text_simple.c
index 575d00cb..b843f2e8 100644
--- a/src/ui/text_simple.c
+++ b/src/ui/text_simple.c
@@ -68,13 +68,19 @@ static iRect runSimple_Font_(iFont *d, const iRunArgs *args) {
     int         ypos        = orig.y;
     size_t      maxLen      = args->maxLen ? args->maxLen : iInvalidSize;
     float       xposExtend  = orig.x; /* allows wide glyphs to use more space; restored by whitespace */
+    iWrapText * wrap        = args->wrap;
+    int         wrapAdvance = 0;
+    const int   xposLimit   = (wrap && wrap->maxWidth ? orig.x + wrap->maxWidth : 0);
     const enum iRunMode mode        = args->mode;
     const char *        lastWordEnd = args->text.start;
-    iAssert(args->xposLimit == 0 || isMeasuring_(mode));
+    iAssert(xposLimit == 0 || isMeasuring_(mode));
     iAssert(args->text.end >= args->text.start);
-    if (args->continueFrom_out) {
-        *args->continueFrom_out = args->text.end;
+    if (wrap) {
+        wrap->wrapRange_ = args->text;
     }
+//    if (args->continueFrom_out) {
+//        *args->continueFrom_out = args->text.end;
+//    }
     iChar prevCh = 0;
     const iBool isMonospaced = d->isMonospaced && !(mode & alwaysVariableWidthFlag_RunMode);
     if (isMonospaced) {
@@ -85,7 +91,8 @@ static iRect runSimple_Font_(iFont *d, const iRunArgs *args) {
         SDL_SetRenderDrawColor(text_.render, initial.r, initial.g, initial.b, 0);
     }
     /* Text rendering is not very straightforward! Let's dive in... */
-    for (const char *chPos = args->text.start; chPos != args->text.end; ) {
+    const char *chPos;
+    for (chPos = args->text.start; chPos != args->text.end; ) {
         iAssert(chPos < args->text.end);
         const char *currentPos = chPos;
         if (*chPos == 0x1b) { /* ANSI escape. */
@@ -123,11 +130,11 @@ static iRect runSimple_Font_(iFont *d, const iRunArgs *args) {
             if (ch == 0xad) { /* soft hyphen */
                 lastWordEnd = chPos;
                 if (isMeasuring_(mode)) {
-                    if (args->xposLimit > 0) {
+                    if (xposLimit > 0) {
                         const char *postHyphen = chPos;
                         iChar       nextCh     = nextChar_(&postHyphen, args->text.end);
                         if ((int) xpos + glyph_Font_(d, ch)->rect[0].size.x +
-                            glyph_Font_(d, nextCh)->rect[0].size.x > args->xposLimit) {
+                            glyph_Font_(d, nextCh)->rect[0].size.x > xposLimit) {
                             /* Wraps after hyphen, should show it. */
                         }
                         else continue;
@@ -143,11 +150,8 @@ static iRect runSimple_Font_(iFont *d, const iRunArgs *args) {
             }
             /* TODO: Check out if `uc_wordbreak_property()` from libunistring can be used here. */
             if (ch == '\n') {
-                if (args->xposLimit > 0 && mode & stopAtNewline_RunMode) {
-                    /* Stop the line here, this is a hard warp. */
-                    if (args->continueFrom_out) {
-                        *args->continueFrom_out = chPos;
-                    }
+                /* Notify about the wrap. */
+                if (!notify_WrapText_(wrap, chPos, 0, iMax(xpos, xposExtend) - orig.x, iFalse)) {
                     break;
                 }
                 xpos = xposExtend = orig.x;
@@ -157,7 +161,7 @@ static iRect runSimple_Font_(iFont *d, const iRunArgs *args) {
             }
             if (ch == '\t') {
                 const int tabStopWidth = d->height * 10;
-                const int halfWidth    = (iMax(args->xposLimit, args->xposLayoutBound) - orig.x) / 2;
+                const int halfWidth    = (xposLimit - orig.x) / 2;
                 const int xRel         = xpos - orig.x;
                 /* First stop is always to half width. */
                 if (halfWidth > 0 && xRel < halfWidth) {
@@ -204,23 +208,32 @@ static iRect runSimple_Font_(iFont *d, const iRunArgs *args) {
         if (mode & draw_RunMode && ch != 0x20 && ch != 0 && !isRasterized_Glyph_(glyph, hoff)) {
             /* Need to pause here and make sure all glyphs have been cached in the text. */
 //            printf("[Text] missing from cache: %lc (%x)\n", (int) ch, ch);
-            cacheTextGlyphs_Font_(d, args->text);
+            //cacheTextGlyphs_Font_(d, args->text);
+            cacheSingleGlyph_Font_(glyph->font, index_Glyph_(glyph));
             glyph = glyph_Font_(d, ch); /* cache may have been reset */
         }
         int x2 = x1 + glyph->rect[hoff].size.x;
         /* Out of the allotted space on the line? */
-        if (args->xposLimit > 0 && x2 > args->xposLimit) {
-            if (args->continueFrom_out) {
-                if (lastWordEnd != args->text.start && ~mode & noWrapFlag_RunMode) {
-                    *args->continueFrom_out = skipSpace_CStr(lastWordEnd);
-                    *args->continueFrom_out = iMin(*args->continueFrom_out,
-                                                   args->text.end);
-                }
-                else {
-                    *args->continueFrom_out = currentPos; /* forced break */
-                }
+        if (xposLimit > 0 && x2 > xposLimit) {
+            iAssert(wrap);
+            const char *wrapPos = currentPos;
+            int advance = x1 - orig.x;
+            if (lastWordEnd != args->text.start && wrap->mode == word_WrapTextMode) {
+                wrapPos = skipSpace_CStr(lastWordEnd);
+                wrapPos = iMin(wrapPos, args->text.end);
+                advance = wrapAdvance;
             }
-            break;
+//            if (args->continueFrom_out) {
+//                *args->continueFrom_out = wrapPos;
+//            }
+            if (!notify_WrapText_(wrap, wrapPos, 0, advance, iFalse)) {
+                break;
+            }
+            xpos = xposExtend = orig.x;
+            ypos += d->height;
+            prevCh = 0;
+            chPos = wrapPos; /* go back */
+            continue;
         }
         const int yLineMax = ypos + d->height;
         SDL_Rect dst = { x1 + glyph->d[hoff].x,
@@ -289,10 +302,10 @@ static iRect runSimple_Font_(iFont *d, const iRunArgs *args) {
             /* TODO: No need to decode the next char twice; check this on the next iteration. */
             const char *peek = chPos;
             const iChar next = nextChar_(&peek, args->text.end);
-            if (enableKerning_Text && !d->manualKernOnly && next) {
+            if (enableKerning_Text && next) {
                 const uint32_t nextGlyphIndex = glyphIndex_Font_(glyph->font, next);
                 int kern = stbtt_GetGlyphKernAdvance(
-                    &glyph->font->font, glyph->glyphIndex, nextGlyphIndex);
+                    &glyph->font->font, index_Glyph_(glyph), nextGlyphIndex);
                 /* Nunito needs some kerning fixes. */
                 if (glyph->font->family == nunito_TextFont) {
                     if (ch == 'W' && (next == 'i' || next == 'h')) {
@@ -317,14 +330,19 @@ static iRect runSimple_Font_(iFont *d, const iRunArgs *args) {
 #endif
         xposExtend = iMax(xposExtend, xpos);
         xposMax    = iMax(xposMax, xposExtend);
-        if (args->continueFrom_out && ((mode & noWrapFlag_RunMode) || isWrapBoundary_(prevCh, ch))) {
+        if ((wrap && wrap->mode == anyCharacter_WrapTextMode) || isWrapBoundary_(prevCh, ch)) {
             lastWordEnd = currentPos; /* mark word wrap position */
+            wrapAdvance = x2 - orig.x;
         }
         prevCh = ch;
         if (--maxLen == 0) {
             break;
         }
     }
+    notify_WrapText_(wrap, chPos, 0, xpos - orig.x, iFalse);
+    if (args->cursorAdvance_out) {
+        *args->cursorAdvance_out = sub_I2(init_I2(xpos, ypos), orig);
+    }
     if (args->runAdvance_out) {
         *args->runAdvance_out = xposMax - orig.x;
     }