3 files changed, 51 insertions, 25 deletions

diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index a5e8cf43..f7d41a44 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -1090,8 +1090,13 @@ static iBool findXBreaks_LineMover_(iWrapText *wrap, iRangecc wrappedText,
 static iBool moveCursorByLine_InputWidget_(iInputWidget *d, int dir) {
     const iInputLine *line = cursorLine_InputWidget_(d);
     iRangecc text = range_String(&line->text);
-    iInt2 relCoord = measureRange_Text(d->font, (iRangecc){ text.start,
-                                                            text.start + d->cursor.x }).advance;
+    iWrapText wrapText = {
+        .text     = rangeSize_String(&line->text, d->cursor.x),
+        .maxWidth = width_Rect(contentBounds_InputWidget_(d)),
+        .mode     = (d->inFlags & isUrl_InputWidgetFlag ? anyCharacter_WrapTextMode
+                                                        : word_WrapTextMode),
+    };
+    iInt2 relCoord = measure_WrapText(&wrapText, d->font).advance;
     const int cursorWidth = measureN_Text(d->font, charPos_InputWidget_(d, d->cursor), 1).advance.x;
     int relLine = relCoord.y / lineHeight_Text(d->font);
     if ((dir < 0 && relLine > 0) || (dir > 0 && relLine < numWrapLines_InputLine_(line) - 1)) {
@@ -1111,13 +1116,8 @@ static iBool moveCursorByLine_InputWidget_(iInputWidget *d, int dir) {
     else {
         return iFalse;
     }
-    iWrapText wrapText = {
-        .text     = range_String(&cursorLine_InputWidget_(d)->text),
-        .maxWidth = width_Rect(contentBounds_InputWidget_(d)),
-        .mode     = (d->inFlags & isUrl_InputWidgetFlag ? anyCharacter_WrapTextMode
-                                                        : word_WrapTextMode),
-        .hitPoint = addY_I2(relCoord, 1), //arelCddX_I2(relCoord, cursorWidth),
-    };
+    wrapText.text     = range_String(&cursorLine_InputWidget_(d)->text);
+    wrapText.hitPoint = addY_I2(relCoord, 1); //arelCddX_I2(relCoord, cursorWidth),
     measure_WrapText(&wrapText, d->font);
     iAssert(wrapText.hitChar_out);
     d->cursor.x = wrapText.hitChar_out - wrapText.text.start;
@@ -1129,7 +1129,8 @@ static iBool moveCursorByLine_InputWidget_(iInputWidget *d, int dir) {
             d->cursor.x += n;
         }
     }*/
-    showCursor_InputWidget_(d);
+    //showCursor_InputWidget_(d);
+    setCursor_InputWidget(d, d->cursor);
     return iTrue;
     
 #if 0
@@ -1896,20 +1897,28 @@ static iBool draw_MarkPainter_(iWrapText *wrapText, iRangecc wrappedText, int or
         wrappedText.end   - cstr + mp->line->range.start
     };
     if (mark.end <= lineRange.start || mark.start >= lineRange.end) {
+        mp->pos.y += lineHeight_Text(mp->d->font);
         return iTrue; /* outside of mark */
     }
     iRect rect = { addX_I2(mp->pos, origin), init_I2(advance, lineHeight_Text(mp->d->font)) };
     if (mark.end < lineRange.end) {
         /* Calculate where the mark ends. */
-        const iRangecc markedPrefix = { cstr, cstr + mark.end - lineRange.start };
+        const iRangecc markedPrefix = { //cstr, cstr + mark.end - lineRange.start };
+            wrappedText.start,
+            wrappedText.start + mark.end - lineRange.start
+        };
         rect.size.x = measureRange_Text(mp->d->font, markedPrefix).advance.x;
     }
     if (mark.start > lineRange.start) {
         /* Calculate where the mark starts. */
-        const iRangecc unmarkedPrefix = { cstr, cstr + mark.start - lineRange.start };
+        const iRangecc unmarkedPrefix = { //cstr, cstr + mark.start - lineRange.start
+            wrappedText.start,
+            wrappedText.start + mark.start - lineRange.start
+        };
         adjustEdges_Rect(&rect, 0, 0, 0, measureRange_Text(mp->d->font, unmarkedPrefix).advance.x);
     }
     rect.size.x = iMax(gap_UI / 3, rect.size.x);
+    mp->pos.y += lineHeight_Text(mp->d->font);
     fillRect_Paint(mp->paint, rect, uiMarked_ColorId);
     return iTrue;
 }
@@ -2041,11 +2050,11 @@ static void draw_InputWidget_(const iInputWidget *d) {
         /* The bounds include visible characters, while advance includes whitespace as well.
            Normally only the advance is needed, but if the cursor is at a newline, the advance
            will have reset back to zero. */
-        wrapText.text = range_String(text);
-        wrapText.text.end = wrapText.text.start + d->cursor.x;
-        iAssert(wrapText.text.end <= constEnd_String(text));
+        wrapText.text    = range_String(text);
+        wrapText.hitChar = wrapText.text.start + d->cursor.x;
         //const int prefixSize = maxWidth_TextMetrics(
-        const iTextMetrics tm = measure_WrapText(&wrapText, d->font);
+        measure_WrapText(&wrapText, d->font);
+        const iInt2 advance = wrapText.hitAdvance_out;
         //        const iInt2 curPos   = addX_I2(addY_I2(contentBounds.pos, lineHeight_Text(d->font)
         //        * d->cursorLine),
         //                                       prefixSize +
@@ -2054,7 +2063,7 @@ static void draw_InputWidget_(const iInputWidget *d) {
         //printf("%d -> tm.advance: %d, %d\n", d->cursor.x, tm.advance.x, tm.advance.y);
         const iInt2 curPos = add_I2(addY_I2(topLeft_Rect(contentBounds), visLineOffsetY +
                                             visWrapsAbove * lineHeight_Text(d->font)),
-                                    addX_I2(tm.advance,
+                                    addX_I2(advance,
                                             (d->mode == insert_InputMode ? -curSize.x / 2 : 0)));
         const iRect curRect  = { curPos, curSize };
         fillRect_Paint(&p, curRect, uiInputCursor_ColorId);
diff --git a/src/ui/text.c b/src/ui/text.c
index d6a45c69..ce383ccf 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -1380,8 +1380,9 @@ static iRect run_Font_(iFont *d, const iRunArgs *args) {
         /* TODO: Duplicated args? */
         iAssert(equalRange_Rangecc(wrap->text, args->text));
         /* Initialize the wrap range. */
-        wrap->wrapRange_ = args->text;
-        wrap->hitChar_out = NULL;
+        wrap->wrapRange_        = args->text;
+        wrap->hitAdvance_out    = zero_I2();
+        wrap->hitChar_out       = NULL;
         wrap->hitGlyphNormX_out = 0.0f;
     }
     const iChar *logicalText = constData_Array(&attrText.logical);
@@ -1427,6 +1428,7 @@ static iRect run_Font_(iFont *d, const iRunArgs *args) {
     const int    layoutBound        = (wrap ? wrap->maxWidth : 0);
     iBool        isFirst            = iTrue;
     const iBool  checkHitPoint      = wrap && !isEqual_I2(wrap->hitPoint, zero_I2());
+    const iBool  checkHitChar       = wrap && wrap->hitChar;
     while (!isEmpty_Range(&wrapRuns)) {
         if (isFirst) {
             isFirst = iFalse;
@@ -1446,6 +1448,11 @@ static iRect run_Font_(iFont *d, const iRunArgs *args) {
             for (size_t runIndex = wrapRuns.start; runIndex < wrapRuns.end; runIndex++) {
                 const iAttributedRun *run = at_Array(&attrText.runs, runIndex);
                 if (run->flags.isLineBreak) {
+                    if (checkHitChar) {
+                        if (wrap->hitChar == sourcePtr_AttributedText_(&attrText, run->logical.start)) {
+                            wrap->hitAdvance_out = init_I2(wrapAdvance, yCursor);
+                        }
+                    }
                     wrapPosRange.end   = run->logical.start;
                     wrapResumePos      = run->logical.end;
                     wrapRuns.end       = runIndex;
@@ -1468,6 +1475,11 @@ static iRect run_Font_(iFont *d, const iRunArgs *args) {
                     if (logPos < wrapPosRange.start || logPos >= wrapPosRange.end) {
                         continue;
                     }
+                    if (checkHitChar) {
+                        if (wrap->hitChar == sourcePtr_AttributedText_(&attrText, logPos)) {
+                            wrap->hitAdvance_out = init_I2(wrapAdvance, yCursor);
+                        }
+                    }
                     /* Check if the hit point is on the left side of this line. */
                     if (isHitPointOnThisLine && !wrap->hitChar_out && wrap->hitPoint.x < orig.x) {
                         wrap->hitChar_out = sourcePtr_AttributedText_(&attrText, logPos);
@@ -1723,6 +1735,9 @@ static iRect run_Font_(iFont *d, const iRunArgs *args) {
         wrapPosRange.start = wrapResumePos;
         wrapPosRange.end   = textLen;
     }
+    if (checkHitChar && wrap->hitChar == args->text.end) {
+        wrap->hitAdvance_out = init_I2(xCursor, yCursor);
+    }
     if (endsWith_Rangecc(args->text, "\n")) {
         /* FIXME: This is a kludge, the wrap loop should handle this case, too. */
         /* The last wrap is an empty newline wrap. */
diff --git a/src/ui/text.h b/src/ui/text.h
index a82da22c..322d2938 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -206,15 +206,17 @@ enum iWrapTextMode {
 
 struct Impl_WrapText {
     /* arguments */
-    iRangecc text;
-    int      maxWidth;
+    iRangecc    text;
+    int         maxWidth;
     enum iWrapTextMode mode;
-    iBool  (*wrapFunc)(iWrapText *, iRangecc wrappedText, int origin, int advance, iBool isBaseRTL);
-    void *   context;
-    int      baseDir; /* set to +1 for LTR, -1 for RTL */
-    iInt2    hitPoint;
+    iBool     (*wrapFunc)(iWrapText *, iRangecc wrappedText, int origin, int advance, iBool isBaseRTL);
+    void *      context;
+    int         baseDir; /* set to +1 for LTR, -1 for RTL */
+    iInt2       hitPoint; /* sets hitChar_out */
+    const char *hitChar; /* sets hitAdvance_out */
     /* output */
     const char *hitChar_out;
+    iInt2       hitAdvance_out;
     float       hitGlyphNormX_out; /* normalized X inside the glyph */
     /* internal */
     iRangecc wrapRange_;