3 files changed, 38 insertions, 50 deletions

diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index 38c93f93..3a774b89 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -178,28 +178,17 @@ struct Impl_InputWidget {
     enum iInputMode mode;
     int             inFlags;
     size_t          maxLen; /* characters */
-//    size_t          maxLayoutLines;
-//    iArray          text;    /* iChar[] */
-//    iArray          oldText; /* iChar[] */
-    size_t          length; /* current length in characters */
     iArray          lines;    /* iInputLine[] */
-    //iArray          oldLines; /* iInputLine[], for restoring if edits cancelled */
     iString         oldText; /* for restoring if edits cancelled */
     int             lastUpdateWidth;
     iString         srcHint;
     iString         hint;
     int             leftPadding;
     int             rightPadding;
-//    size_t          cursor; /* offset from beginning */
-//    size_t          lastCursor;
-//    size_t          cursorLine;
     iInt2           cursor; /* cursor position: x = byte offset, y = line index */
     iInt2           prevCursor; /* previous cursor position */
-//    int             verticalMoveX;
     iRangei         visWrapLines; /* which wrap lines are current visible */
-//    int             visLineOffsetY; /* vertical offset of first visible line (pixels) */
     int             minWrapLines, maxWrapLines; /* min/max number of visible lines allowed */
-//    int             scrollY; /* wrap lines */
     iRanges         mark;
     iRanges         initialMark;
     iArray          undoStack;
@@ -356,12 +345,16 @@ static int visLineOffsetY_InputWidget_(const iInputWidget *d) {
     return (line->wrapLines.start - d->visWrapLines.start) * lineHeight_Text(d->font);
 }
 
+static const iChar sensitiveChar_ = 0x25cf; /* black circle */
+static const char *sensitive_     = "\u25cf"; /* black circle */
+
 static iWrapText wrap_InputWidget_(const iInputWidget *d, int y) {
     return (iWrapText){
         .text     = range_String(&line_InputWidget_(d, y)->text),
         .maxWidth = width_Rect(contentBounds_InputWidget_(d)),
         .mode     = (d->inFlags & isUrl_InputWidgetFlag ? anyCharacter_WrapTextMode
                                                         : word_WrapTextMode),
+        .overrideChar = (d->inFlags & isSensitive_InputWidgetFlag ? sensitiveChar_ : 0),
     };
 }
 
@@ -469,8 +462,7 @@ static size_t length_InputWidget_(const iInputWidget *d) {
     return len;
 }
 
-static const char *sensitive_ = "\u25cf"; /* black circle */
-
+#if 0
 static iString *visText_InputWidget_(const iInputWidget *d) {
     iString *text;
     if (~d->inFlags & isSensitive_InputWidgetFlag) {
@@ -478,15 +470,15 @@ static iString *visText_InputWidget_(const iInputWidget *d) {
     }
     else {
         text = new_String();
-        iAssert(d->length == length_InputWidget_(d));
-        for (size_t i = 0; i < d->length; i++) {
+//        iAssert(d->length == length_InputWidget_(d));
+        const size_t len = length_InputWidget_(d);
+        for (size_t i = 0; i < len; i++) {
             appendCStr_String(text, sensitive_);
         }
     }
     return text;
 }
 
-#if 0
 static void clearLines_InputWidget_(iInputWidget *d) {
     iForEach(Array, i, &d->lines) {
         deinit_InputLine(i.value);
@@ -1134,20 +1126,6 @@ static size_t indexForRelativeX_InputWidget_(const iInputWidget *d, int x, const
 }
 #endif
 
-iDeclareType(LineMover)
-
-struct Impl_LineMover {
-    iInputWidget *d;
-    int dir;
-    int x;
-};
-
-static iBool findXBreaks_LineMover_(iWrapText *wrap, iRangecc wrappedText,
-                                    int origin, int advance, iBool isBaseRTL) {
-    iUnused(isBaseRTL);
-    
-}
-
 static iBool moveCursorByLine_InputWidget_(iInputWidget *d, int dir, int horiz) {
     const iInputLine *line = cursorLine_InputWidget_(d);
     iRangecc text = range_String(&line->text);
@@ -1400,6 +1378,7 @@ static iInt2 coordCursor_InputWidget_(const iInputWidget *d, iInt2 coord) {
         .maxWidth = width_Rect(bounds),
         .mode = (d->inFlags & isUrl_InputWidgetFlag ? anyCharacter_WrapTextMode : word_WrapTextMode),
         .hitPoint = relCoord,
+        .overrideChar = (d->inFlags & isSensitive_InputWidgetFlag ? sensitiveChar_ : 0),
     };
     const iRangei visLines = visibleLineRange_InputWidget_(d);
     for (size_t y = visLines.start; y < visLines.end; y++) {
@@ -1710,14 +1689,15 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
                 return iTrue;
             case SDLK_RETURN:
             case SDLK_KP_ENTER:
-                if (mods == KMOD_SHIFT || (d->maxLen == 0 &&
-                                           ~d->inFlags & isUrl_InputWidgetFlag &&
-                                           d->inFlags & enterKeyInsertsLineFeed_InputWidgetFlag)) {
-                    pushUndo_InputWidget_(d);
-                    deleteMarked_InputWidget_(d);
-                    insertChar_InputWidget_(d, '\n');
-                    contentsWereChanged_InputWidget_(d);
-                    return iTrue;
+                if (~d->inFlags & isSensitive_InputWidgetFlag && d->maxLen == 0) {
+                    if (mods == KMOD_SHIFT || (~d->inFlags & isUrl_InputWidgetFlag &&
+                                               d->inFlags & enterKeyInsertsLineFeed_InputWidgetFlag)) {
+                        pushUndo_InputWidget_(d);
+                        deleteMarked_InputWidget_(d);
+                        insertChar_InputWidget_(d, '\n');
+                        contentsWereChanged_InputWidget_(d);
+                        return iTrue;
+                    }
                 }
                 if (d->inFlags & enterKeyEnabled_InputWidgetFlag) {
                     d->inFlags |= enterPressed_InputWidgetFlag;
@@ -1973,8 +1953,10 @@ static void draw_InputWidget_(const iInputWidget *d) {
                              : isFocused /*&& !isEmpty_Array(&d->lines)*/ ? uiInputTextFocused_ColorId
                                                                       : uiInputText_ColorId;
     iWrapText wrapText = {
-        .maxWidth = width_Rect(contentBounds),
-        .mode     = (d->inFlags & isUrl_InputWidgetFlag ? anyCharacter_WrapTextMode : word_WrapTextMode)
+        .maxWidth     = width_Rect(contentBounds),
+        .mode         = (d->inFlags & isUrl_InputWidgetFlag ? anyCharacter_WrapTextMode
+                                                            : word_WrapTextMode),
+        .overrideChar = (d->inFlags & isSensitive_InputWidgetFlag ? sensitiveChar_ : 0),
     };
     const iRangei visLines       = visibleLineRange_InputWidget_(d);
     const int     visLineOffsetY = visLineOffsetY_InputWidget_(d);
@@ -1995,6 +1977,7 @@ static void draw_InputWidget_(const iInputWidget *d) {
             .contentBounds = contentBounds,
             .mark = mark_InputWidget_(d)
         };
+        iAssert(~d->inFlags & isSensitive_InputWidgetFlag || size_Range(&visLines) == 1);
         for (size_t vis = visLines.start; vis < visLines.end; vis++) {
             const iInputLine *line = constAt_Array(&d->lines, vis);
             wrapText.text     = range_String(&line->text);
@@ -2061,7 +2044,7 @@ static void draw_InputWidget_(const iInputWidget *d) {
             else {
                 cursorChar = range_CStr(" ");
             }
-            curSize = addX_I2(measureRange_Text(d->font, ch ? cursorChar : range_CStr("_")).bounds.size,
+            curSize = addX_I2(measureRange_Text(d->font, ch ? cursorChar : range_CStr("0")).bounds.size,
                               iMin(2, gap_UI / 4));
         }
         else {
diff --git a/src/ui/text.c b/src/ui/text.c
index 27ed80ab..bbfd71b8 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -795,7 +795,7 @@ struct Impl_AttributedRun {
 
 iDeclareType(AttributedText)
 iDeclareTypeConstructionArgs(AttributedText, iRangecc text, size_t maxLen, iFont *font,
-                             iColor fgColor, int baseDir)
+                             iColor fgColor, int baseDir, iChar overrideChar)
 
 struct Impl_AttributedText {
     iRangecc source; /* original source text */
@@ -813,8 +813,9 @@ struct Impl_AttributedText {
 };
 
 iDefineTypeConstructionArgs(AttributedText,
-                            (iRangecc text, size_t maxLen, iFont *font, iColor fgColor, int baseDir),
-                            text, maxLen, font, fgColor, baseDir)
+                            (iRangecc text, size_t maxLen, iFont *font, iColor fgColor,
+                             int baseDir, iChar overrideChar),
+                            text, maxLen, font, fgColor, baseDir, overrideChar)
 
 static const char *sourcePtr_AttributedText_(const iAttributedText *d, int logicalPos) {
     const int *logToSource = constData_Array(&d->logicalToSourceOffset);
@@ -859,7 +860,7 @@ static enum iFontId fontId_Text_(const iFont *font) {
     return (enum iFontId) (font - text_.fonts);
 }
 
-static void prepare_AttributedText_(iAttributedText *d, int overrideBaseDir) {
+static void prepare_AttributedText_(iAttributedText *d, int overrideBaseDir, iChar overrideChar) {
     iAssert(isEmpty_Array(&d->runs));
     size_t length = 0;
     /* Prepare the UTF-32 logical string. */ {
@@ -867,6 +868,9 @@ static void prepare_AttributedText_(iAttributedText *d, int overrideBaseDir) {
             iChar u32;
             int len = decodeBytes_MultibyteChar(ch, d->source.end, &u32);
             if (len <= 0) break;
+            if (overrideChar) {
+                u32 = overrideChar;
+            }
             pushBack_Array(&d->logical, &u32);
             length++;
             if (length == d->maxLen) {
@@ -1025,7 +1029,7 @@ static void prepare_AttributedText_(iAttributedText *d, int overrideBaseDir) {
 }
 
 void init_AttributedText(iAttributedText *d, iRangecc text, size_t maxLen, iFont *font, iColor fgColor,
-                         int baseDir) {
+                         int baseDir, iChar overrideChar) {
     d->source  = text;
     d->maxLen  = maxLen ? maxLen : iInvalidSize;
     d->font    = font;
@@ -1038,7 +1042,7 @@ void init_AttributedText(iAttributedText *d, iRangecc text, size_t maxLen, iFont
     init_Array(&d->logicalToSourceOffset, sizeof(int));
     d->bidiLevels = NULL;
     d->isBaseRTL = iFalse;
-    prepare_AttributedText_(d, baseDir);
+    prepare_AttributedText_(d, baseDir, overrideChar);
 }
 
 void deinit_AttributedText(iAttributedText *d) {
@@ -1189,7 +1193,7 @@ static void cacheTextGlyphs_Font_(iFont *d, const iRangecc text) {
     iArray glyphIndices;
     init_Array(&glyphIndices, sizeof(uint32_t));
     iAttributedText attrText;
-    init_AttributedText(&attrText, text, 0, d, (iColor){}, 0);
+    init_AttributedText(&attrText, text, 0, d, (iColor){}, 0, 0);
     /* We use AttributedText here so the font lookup matches the behavior during text drawing --
        glyphs may be selected from a font that's different than `d`. */
     const iChar *logicalText = constData_Array(&attrText.logical);
@@ -1367,14 +1371,14 @@ static iRect run_Font_(iFont *d, const iRunArgs *args) {
     float        yCursor    = 0.0f;
     float        xCursorMax = 0.0f;
     const iBool  isMonospaced = d->isMonospaced;
+    iWrapText *wrap = args->wrap;
     iAssert(args->text.end >= args->text.start);
     /* 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.) */
     iAttributedText attrText;
     init_AttributedText(&attrText, args->text, args->maxLen, d, get_Color(args->color),
-                        args->baseDir);
-    iWrapText *wrap = args->wrap;
+                        args->baseDir, wrap ? wrap->overrideChar : 0);
     if (wrap) {
         wrap->baseDir = attrText.isBaseRTL ? -1 : +1;
         /* TODO: Duplicated args? */
diff --git a/src/ui/text.h b/src/ui/text.h
index 322d2938..71776dca 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -211,6 +211,7 @@ struct Impl_WrapText {
     enum iWrapTextMode mode;
     iBool     (*wrapFunc)(iWrapText *, iRangecc wrappedText, int origin, int advance, iBool isBaseRTL);
     void *      context;
+    iChar       overrideChar; /* use this for all characters instead of the real ones */
     int         baseDir; /* set to +1 for LTR, -1 for RTL */
     iInt2       hitPoint; /* sets hitChar_out */
     const char *hitChar; /* sets hitAdvance_out */