1 files changed, 54 insertions, 6 deletions

diff --git a/src/ui/text.c b/src/ui/text.c
index 9838fb00..889aa2e4 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -781,6 +781,7 @@ enum iRunMode {
     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 */
 };
 
 static enum iFontId fontId_Text_(const iFont *font) {
@@ -923,7 +924,7 @@ static iRect run_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 & noWrapFlag_RunMode) {
+                if (args->xposLimit > 0 && mode & stopAtNewline_RunMode) {
                     /* Stop the line here, this is a hard warp. */
                     if (args->continueFrom_out) {
                         *args->continueFrom_out = chPos;
@@ -1148,7 +1149,8 @@ iInt2 advanceRange_Text(int fontId, iRangecc text) {
 iInt2 tryAdvance_Text(int fontId, iRangecc text, int width, const char **endPos) {
     int advance;
     const int height = run_Font_(font_Text_(fontId),
-                                 &(iRunArgs){ .mode = measure_RunMode | runFlagsFromId_(fontId),
+                                 &(iRunArgs){ .mode = measure_RunMode | stopAtNewline_RunMode |
+                                                      runFlagsFromId_(fontId),
                                               .text = text,
                                               .xposLimit        = width,
                                               .continueFrom_out = endPos,
@@ -1161,6 +1163,7 @@ iInt2 tryAdvanceNoWrap_Text(int fontId, iRangecc text, int width, const char **e
     int advance;
     const int height = run_Font_(font_Text_(fontId),
                                  &(iRunArgs){ .mode = measure_RunMode | noWrapFlag_RunMode |
+                                                      stopAtNewline_RunMode |
                                                       runFlagsFromId_(fontId),
                                               .text             = text,
                                               .xposLimit        = width,
@@ -1269,7 +1272,7 @@ int drawWrapRange_Text(int fontId, iInt2 pos, int maxWidth, int color, iRangecc
         const iInt2 adv = tryAdvance_Text(fontId, text, maxWidth, &endp);
         drawRange_Text(fontId, pos, color, (iRangecc){ text.start, endp });
         text.start = endp;
-        pos.y += adv.y;
+        pos.y += iMax(adv.y, lineHeight_Text(fontId));
     }
     return pos.y;
 }
@@ -1404,9 +1407,21 @@ iString *renderBlockChars_Text(const iBlock *fontData, int height, enum iTextBlo
 
 iDefineTypeConstructionArgs(TextBuf, (int font, int color, const char *text), font, color, text)
 
-void init_TextBuf(iTextBuf *d, int font, int color, const char *text) {
+static void initWrap_TextBuf_(iTextBuf *d, int font, int color, int maxWidth, iBool doWrap, const char *text) {
     SDL_Renderer *render = text_.render;
-    d->size    = advance_Text(font, text);
+    if (maxWidth == 0) {
+        d->size = advance_Text(font, text);
+    }
+    else {
+        d->size = zero_I2();
+        iRangecc content = range_CStr(text);
+        while (!isEmpty_Range(&content)) {
+            const iInt2 size = (doWrap ? tryAdvance_Text(font, content, maxWidth, &content.start)
+                                 : tryAdvanceNoWrap_Text(font, content, maxWidth, &content.start));
+            d->size.x = iMax(d->size.x, size.x);
+            d->size.y += iMax(size.y, lineHeight_Text(font));
+        }
+    }
     SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "0");
     if (d->size.x * d->size.y) {
         d->texture = SDL_CreateTexture(render,
@@ -1424,17 +1439,50 @@ void init_TextBuf(iTextBuf *d, int font, int color, const char *text) {
         SDL_SetTextureBlendMode(text_.cache, SDL_BLENDMODE_NONE); /* blended when TextBuf is drawn */
         SDL_SetRenderDrawColor(text_.render, 0, 0, 0, 0);
         SDL_RenderClear(text_.render);
-        draw_Text_(font, zero_I2(), color | fillBackground_ColorId, range_CStr(text));
+        const int fg    = color | fillBackground_ColorId;
+        iRangecc  range = range_CStr(text);
+        if (maxWidth == 0) {
+            draw_Text_(font, zero_I2(), fg, range);
+        }
+        else if (doWrap) {
+            drawWrapRange_Text(font, zero_I2(), maxWidth, fg, range);
+        }
+        else {
+            iInt2 pos = zero_I2();
+            while (!isEmpty_Range(&range)) {
+                const char *endp;
+                tryAdvanceNoWrap_Text(font, range, maxWidth, &endp);
+                draw_Text_(font, pos, fg, (iRangecc){ range.start, endp });
+                range.start = endp;
+                pos.y += lineHeight_Text(font);
+            }
+        }
         SDL_SetTextureBlendMode(text_.cache, SDL_BLENDMODE_BLEND);
         SDL_SetRenderTarget(render, oldTarget);
         SDL_SetTextureBlendMode(d->texture, SDL_BLENDMODE_BLEND);
     }
 }
 
+void init_TextBuf(iTextBuf *d, int font, int color, const char *text) {
+    initWrap_TextBuf_(d, font, color, 0, iFalse, text);
+}
+
 void deinit_TextBuf(iTextBuf *d) {
     SDL_DestroyTexture(d->texture);
 }
 
+iTextBuf *newBound_TextBuf(int font, int color, int boundWidth, const char *text) {
+    iTextBuf *d = iMalloc(TextBuf);
+    initWrap_TextBuf_(d, font, color, boundWidth, iFalse, text);
+    return d;
+}
+
+iTextBuf *newWrap_TextBuf(int font, int color, int wrapWidth, const char *text) {
+    iTextBuf *d = iMalloc(TextBuf);
+    initWrap_TextBuf_(d, font, color, wrapWidth, iTrue, text);
+    return d;
+}
+
 void draw_TextBuf(const iTextBuf *d, iInt2 pos, int color) {
     const iColor clr = get_Color(color);
     SDL_SetTextureColorMod(d->texture, clr.r, clr.g, clr.b);