1 files changed, 366 insertions, 221 deletions

diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index ad45ed92..65710373 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -20,6 +20,10 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
+/* InputWidget supports both fully custom and system-provided text editing.
+   The primary source of complexity is the handling of wrapped text content
+   in the custom text editor. */
+
 #include "inputwidget.h"
 #include "command.h"
 #include "paint.h"
@@ -42,13 +46,19 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 #if defined (iPlatformAppleMobile)
 #   include "ios.h"
-#   define LAGRANGE_ENABLE_SYSTEM_INPUT 1
+#   define LAGRANGE_USE_SYSTEM_TEXT_INPUT 1 /* System-provided UI control almost handles everything. */
+#else
+#   define LAGRANGE_USE_SYSTEM_TEXT_INPUT 0
+iDeclareType(SystemTextInput)
 #endif
 
 static const int    refreshInterval_InputWidget_ = 512;
 static const size_t maxUndo_InputWidget_         = 64;
 static const int    unlimitedWidth_InputWidget_  = 1000000; /* TODO: WrapText disables some functionality if maxWidth==0 */
 
+static const iChar  sensitiveChar_ = 0x25cf;   /* black circle */
+static const char * sensitive_     = "\u25cf";
+
 static void enableEditorKeysInMenus_(iBool enable) {
 #if defined (iPlatformAppleDesktop)
     enableMenuItemsByKey_MacOS(SDLK_LEFT,  KMOD_PRIMARY, enable);
@@ -62,7 +72,10 @@ static void enableEditorKeysInMenus_(iBool enable) {
 #endif
 }
 
+static void updateMetrics_InputWidget_(iInputWidget *);
+
 /*----------------------------------------------------------------------------------------------*/
+#if !LAGRANGE_USE_SYSTEM_TEXT_INPUT
 
 iDeclareType(InputLine)
 
@@ -183,6 +196,8 @@ static void deinit_InputUndo_(iInputUndo *d) {
     deinit_String(&d->text);
 }
 
+#endif /* USE_SYSTEM_TEXT_INPUT */
+
 enum iInputWidgetFlag {
     isSensitive_InputWidgetFlag          = iBit(1),
     isUrl_InputWidgetFlag                = iBit(2), /* affected by decoding preference */
@@ -208,43 +223,45 @@ enum iInputWidgetFlag {
 struct Impl_InputWidget {
     iWidget         widget;
     enum iInputMode mode;
+    int             font;
     int             inFlags;
     size_t          maxLen;  /* characters */
-    iArray          lines;   /* iInputLine[] */
-    iString         oldText; /* for restoring if edits cancelled */
-    int             lastUpdateWidth;
     iString         srcHint;
     iString         hint;
     int             leftPadding;
     int             rightPadding;
+    int             minWrapLines, maxWrapLines; /* min/max number of visible lines allowed */
+    iRangei         visWrapLines; /* which wrap lines are current visible */
+    iClick          click;
+    int             wheelAccum;
+    iTextBuf *      buffered; /* pre-rendered static text */
+    iInputWidgetValidatorFunc validator;
+    void *          validatorContext;
+    iString *       backupPath;
+    int             backupTimer;
+    iString         oldText; /* for restoring if edits cancelled */
+    int             lastUpdateWidth;
+    iSystemTextInput *sysCtrl;
+#if LAGRANGE_USE_SYSTEM_TEXT_INPUT
+    iString         text;
+#else
+    iArray          lines;        /* iInputLine[] */
     iInt2           cursor;       /* cursor position: x = byte offset, y = line index */
     iInt2           prevCursor;   /* previous cursor position */
-    iRangei         visWrapLines; /* which wrap lines are current visible */
-    int             minWrapLines, maxWrapLines; /* min/max number of visible lines allowed */
     iRanges         mark;         /* TODO: would likely simplify things to use two Int2's for marking; no conversions needed */
     iRanges         initialMark;
     iArray          undoStack;
-    int             font;
-    iClick          click;
     uint32_t        tapStartTime;
     uint32_t        lastTapTime;
     iInt2           lastTapPos;
     int             tapCount;
-    int             wheelAccum;
     int             cursorVis;
     uint32_t        timer;
-    iTextBuf *      buffered; /* pre-rendered static text */
-    iInputWidgetValidatorFunc validator;
-    void *          validatorContext;
-    iString *       backupPath;
-    int             backupTimer;
-    iSystemTextInput *sysCtrl;
+#endif
 };
 
 iDefineObjectConstructionArgs(InputWidget, (size_t maxLen), maxLen)
 
-static void updateMetrics_InputWidget_(iInputWidget *);
-
 static void restoreBackup_InputWidget_(iInputWidget *d) {
     if (!d->backupPath) return;
     iFile *f = new_File(d->backupPath);
@@ -258,17 +275,21 @@ static void saveBackup_InputWidget_(iInputWidget *d) {
     if (!d->backupPath) return;
     iFile *f = new_File(d->backupPath);
     if (open_File(f, writeOnly_FileMode | text_FileMode)) {
+#if LAGRANGE_USE_SYSTEM_TEXT_INPUT
+        write_File(f, utf8_String(&d->text));
+#else
         iConstForEach(Array, i, &d->lines) {
             const iInputLine *line = i.value;
             write_File(f, utf8_String(&line->text));
         }
-        d->inFlags &= ~needBackup_InputWidgetFlag;
-#if !defined (NDEBUG)
+#   if !defined (NDEBUG)
         iConstForEach(Array, j, &d->lines) {
             iAssert(endsWith_String(&((const iInputLine *) j.value)->text, "\n") ||
                     index_ArrayConstIterator(&j) == size_Array(&d->lines) - 1);
         }
+#   endif
 #endif
+        d->inFlags &= ~needBackup_InputWidgetFlag;
     }
     iRelease(f);
 }
@@ -317,6 +338,12 @@ void setBackupFileName_InputWidget(iInputWidget *d, const char *fileName) {
     restoreBackup_InputWidget_(d);
 }
 
+iLocalDef iInt2 padding_(void) {
+    return init_I2(gap_UI / 2, gap_UI / 2);
+}
+
+#if !LAGRANGE_USE_SYSTEM_TEXT_INPUT
+
 static void clearUndo_InputWidget_(iInputWidget *d) {
     iForEach(Array, i, &d->undoStack) {
         deinit_InputUndo_(i.value);
@@ -324,10 +351,13 @@ static void clearUndo_InputWidget_(iInputWidget *d) {
     clear_Array(&d->undoStack);
 }
 
-iLocalDef iInt2 padding_(void) {
-    return init_I2(gap_UI / 2, gap_UI / 2);
+static const iInputLine *line_InputWidget_(const iInputWidget *d, size_t index) {
+    iAssert(!isEmpty_Array(&d->lines));
+    return constAt_Array(&d->lines, index);
 }
 
+#endif /* !LAGRANGE_USE_SYSTEM_TEXT_INPUT */
+
 #define extraPaddingHeight_ (1.25f * gap_UI)
 
 static iRect contentBounds_InputWidget_(const iInputWidget *d) {
@@ -343,6 +373,25 @@ static iRect contentBounds_InputWidget_(const iInputWidget *d) {
     return bounds;
 }
 
+static iWrapText wrap_InputWidget_(const iInputWidget *d, int y) {
+#if LAGRANGE_USE_SYSTEM_TEXT_INPUT
+    iUnused(y); /* full text is wrapped always */
+    iRangecc text = range_String(&d->text);
+#else
+    iRangecc text = range_String(&line_InputWidget_(d, y)->text);
+#endif
+    return (iWrapText){
+        .text = text,
+        .maxWidth = d->maxLen == 0 ? width_Rect(contentBounds_InputWidget_(d))
+                                   : unlimitedWidth_InputWidget_,
+        .mode =
+            (d->inFlags & isUrl_InputWidgetFlag ? anyCharacter_WrapTextMode : word_WrapTextMode),
+        .overrideChar = (d->inFlags & isSensitive_InputWidgetFlag ? sensitiveChar_ : 0),
+    };
+}
+
+#if !LAGRANGE_USE_SYSTEM_TEXT_INPUT
+
 iLocalDef iBool isLastLine_InputWidget_(const iInputWidget *d, const iInputLine *line) {
     return (const void *) line == constBack_Array(&d->lines);
 }
@@ -356,11 +405,6 @@ static int numWrapLines_InputWidget_(const iInputWidget *d) {
     return lastLine_InputWidget_(d)->wrapLines.end;
 }
 
-static const iInputLine *line_InputWidget_(const iInputWidget *d, size_t index) {
-    iAssert(!isEmpty_Array(&d->lines));
-    return constAt_Array(&d->lines, index);
-}
-
 static const iString *lineString_InputWidget_(const iInputWidget *d, int y) {
     return &line_InputWidget_(d, y)->text;
 }
@@ -461,20 +505,6 @@ static int visLineOffsetY_InputWidget_(const iInputWidget *d) {
            d->wheelAccum;
 }
 
-static const iChar sensitiveChar_ = 0x25cf;   /* black circle */
-static const char *sensitive_     = "\u25cf";
-
-static iWrapText wrap_InputWidget_(const iInputWidget *d, int y) {
-    return (iWrapText){
-        .text     = range_String(&line_InputWidget_(d, y)->text),
-        .maxWidth = d->maxLen == 0 ? width_Rect(contentBounds_InputWidget_(d))
-                                   : unlimitedWidth_InputWidget_,
-        .mode =
-            (d->inFlags & isUrl_InputWidgetFlag ? anyCharacter_WrapTextMode : word_WrapTextMode),
-        .overrideChar = (d->inFlags & isSensitive_InputWidgetFlag ? sensitiveChar_ : 0),
-    };
-}
-
 static iRangei visibleLineRange_InputWidget_(const iInputWidget *d) {
     iRangei vis = { -1, -1 };
     /* Determine which lines are in the potentially visible range. */
@@ -557,6 +587,19 @@ static void showCursor_InputWidget_(iInputWidget *d) {
     updateVisible_InputWidget_(d);
 }
 
+#else /* if LAGRANGE_USE_SYSTEM_TEXT_INPUT */
+
+static int visLineOffsetY_InputWidget_(const iInputWidget *d) {
+    return 0; /* offset for the buffered text */
+}
+
+static void updateVisible_InputWidget_(iInputWidget *d) {
+    iUnused(d);
+    /* TODO: Anything to do? */
+}
+
+#endif
+
 static void invalidateBuffered_InputWidget_(iInputWidget *d) {
     if (d->buffered) {
         delete_TextBuf(d->buffered);
@@ -580,11 +623,16 @@ static void updateSizeForFixedLength_InputWidget_(iInputWidget *d) {
 }
 
 static iString *text_InputWidget_(const iInputWidget *d) {
+#if LAGRANGE_USE_SYSTEM_TEXT_INPUT
+    return copy_String(&d->text);
+#else
     iString *text = new_String();
     mergeLines_(&d->lines, text);
     return text;
+#endif
 }
 
+#if !LAGRANGE_USE_SYSTEM_TEXT_INPUT
 static size_t length_InputWidget_(const iInputWidget *d) {
     /* Note: `d->length` is kept up to date, so don't call this normally. */
     size_t len = 0;
@@ -595,42 +643,6 @@ static size_t length_InputWidget_(const iInputWidget *d) {
     return len;
 }
 
-static int contentHeight_InputWidget_(const iInputWidget *d) {
-    if (d->sysCtrl) {
-        const int preferred = preferredHeight_SystemTextInput(d->sysCtrl);
-        return iClamp(preferred,
-                      d->minWrapLines * lineHeight_Text(d->font),
-                      d->maxWrapLines * lineHeight_Text(d->font));
-    }
-    return size_Range(&d->visWrapLines) * lineHeight_Text(d->font);
-}
-
-static void updateTextInputRect_InputWidget_(const iInputWidget *d) {
-    if (d->sysCtrl) {
-        setRect_SystemTextInput(d->sysCtrl, contentBounds_InputWidget_(d));
-    }
-#if !defined (iPlatformAppleMobile)
-    const iRect bounds = bounds_Widget(constAs_Widget(d));
-    SDL_SetTextInputRect(&(SDL_Rect){ bounds.pos.x, bounds.pos.y, bounds.size.x, bounds.size.y });
-#endif
-}
-
-static void updateMetrics_InputWidget_(iInputWidget *d) {
-    iWidget *w = as_Widget(d);
-    updateSizeForFixedLength_InputWidget_(d);
-    /* Caller must arrange the width, but the height is set here. */
-    const int oldHeight = height_Rect(w->rect);
-    w->rect.size.y = contentHeight_InputWidget_(d) + 3.0f * padding_().y; /* TODO: Why 3x? */
-    if (flags_Widget(w) & extraPadding_WidgetFlag) {
-        w->rect.size.y += extraPaddingHeight_;
-    }
-    invalidateBuffered_InputWidget_(d);
-    if (height_Rect(w->rect) != oldHeight) {
-        postCommand_Widget(d, "input.resized");
-        updateTextInputRect_InputWidget_(d);
-    }
-}
-
 static void updateLine_InputWidget_(iInputWidget *d, iInputLine *line) {
     iAssert(endsWith_String(&line->text, "\n") || isLastLine_InputWidget_(d, line));
     iWrapText wrapText = wrap_InputWidget_(d, indexOf_Array(&d->lines, line));
@@ -693,6 +705,63 @@ static void startOrStopCursorTimer_InputWidget_(iInputWidget *d, iBool doStart)
     }
 }
 
+#else /* using a system-provided text control */
+
+static void updateAllLinesAndResizeHeight_InputWidget_(iInputWidget *d) {
+    /* Rewrap the buffered text and resize accordingly. */
+    iWrapText wt = wrap_InputWidget_(d, 0);
+    const int height = measure_WrapText(&wt, d->font).bounds.size.y;
+    /* We use this to store the number wrapped lines for determining widget height. */
+    d->visWrapLines.start = 0;
+    d->visWrapLines.end = height / lineHeight_Text(d->font);
+    updateMetrics_InputWidget_(d);
+}
+
+#endif
+
+static int contentHeight_InputWidget_(const iInputWidget *d) {
+#if LAGRANGE_USE_SYSTEM_TEXT_INPUT
+    const int minHeight = d->minWrapLines * lineHeight_Text(d->font);
+    const int maxHeight = d->maxWrapLines * lineHeight_Text(d->font);
+    if (d->sysCtrl) {
+        const int preferred = preferredHeight_SystemTextInput(d->sysCtrl);
+        return iClamp(preferred, minHeight, maxHeight);
+    }
+    if (d->buffered && ~d->inFlags & needUpdateBuffer_InputWidgetFlag) {
+        return iClamp(d->buffered->size.y, minHeight, maxHeight);
+    }
+#endif
+    return size_Range(&d->visWrapLines) * lineHeight_Text(d->font);
+}
+
+static void updateTextInputRect_InputWidget_(const iInputWidget *d) {
+#if LAGRANGE_USE_SYSTEM_TEXT_INPUT
+    if (d->sysCtrl) {
+        setRect_SystemTextInput(d->sysCtrl, contentBounds_InputWidget_(d));
+    }
+#endif
+#if !defined (iPlatformAppleMobile)
+    const iRect bounds = bounds_Widget(constAs_Widget(d));
+    SDL_SetTextInputRect(&(SDL_Rect){ bounds.pos.x, bounds.pos.y, bounds.size.x, bounds.size.y });
+#endif
+}
+
+static void updateMetrics_InputWidget_(iInputWidget *d) {
+    iWidget *w = as_Widget(d);
+    updateSizeForFixedLength_InputWidget_(d);
+    /* Caller must arrange the width, but the height is set here. */
+    const int oldHeight = height_Rect(w->rect);
+    w->rect.size.y = contentHeight_InputWidget_(d) + 3.0f * padding_().y; /* TODO: Why 3x? */
+    if (flags_Widget(w) & extraPadding_WidgetFlag) {
+        w->rect.size.y += extraPaddingHeight_;
+    }
+    invalidateBuffered_InputWidget_(d);
+    if (height_Rect(w->rect) != oldHeight) {
+        postCommand_Widget(d, "input.resized");
+        updateTextInputRect_InputWidget_(d);
+    }
+}
+
 void init_InputWidget(iInputWidget *d, size_t maxLen) {
     iWidget *w = &d->widget;
     init_Widget(w);
@@ -702,37 +771,40 @@ void init_InputWidget(iInputWidget *d, size_t maxLen) {
 #if defined (iPlatformMobile)
     setFlags_Widget(w, extraPadding_WidgetFlag, iTrue);
 #endif
+#if LAGRANGE_USE_SYSTEM_TEXT_INPUT
+    init_String(&d->text);
+#else
     init_Array(&d->lines, sizeof(iInputLine));
+    init_Array(&d->undoStack, sizeof(iInputUndo));
+    d->cursor       = zero_I2();
+    d->prevCursor   = zero_I2();
+    d->lastTapTime  = 0;
+    d->tapCount     = 0;
+    d->timer        = 0;
+    d->cursorVis    = 0;
+    iZap(d->mark);
+    splitToLines_(&iStringLiteral(""), &d->lines);
+#endif
     init_String(&d->oldText);
-    init_Array(&d->lines, sizeof(iInputLine));
     init_String(&d->srcHint);
     init_String(&d->hint);
-    init_Array(&d->undoStack, sizeof(iInputUndo));
     d->font         = uiInput_FontId | alwaysVariableFlag_FontId;
     d->leftPadding  = 0;
     d->rightPadding = 0;
-    d->cursor       = zero_I2();
-    d->prevCursor   = zero_I2();
     d->lastUpdateWidth = 0;
     d->inFlags         = eatEscape_InputWidgetFlag | enterKeyEnabled_InputWidgetFlag |
                          lineBreaksEnabled_InputWidgetFlag | useReturnKeyBehavior_InputWidgetFlag;
     //    if (deviceType_App() != desktop_AppDeviceType) {
     //        d->inFlags |= enterKeyInsertsLineFeed_InputWidgetFlag;
     //    }
-    iZap(d->mark);
     setMaxLen_InputWidget(d, maxLen);
     d->visWrapLines.start = 0;
     d->visWrapLines.end = 1;
     d->maxWrapLines = maxLen > 0 ? 1 : 20; /* TODO: Choose maximum dynamically? */
     d->minWrapLines = 1;
-    splitToLines_(&iStringLiteral(""), &d->lines);
     setFlags_Widget(w, fixedHeight_WidgetFlag, iTrue); /* resizes its own height */
     init_Click(&d->click, d, SDL_BUTTON_LEFT);
-    d->lastTapTime = 0;
-    d->tapCount = 0;
     d->wheelAccum = 0;
-    d->timer = 0;
-    d->cursorVis = 0;
     d->buffered = NULL;
     d->backupPath = NULL;
     d->backupTimer = 0;
@@ -741,7 +813,6 @@ void init_InputWidget(iInputWidget *d, size_t maxLen) {
 }
 
 void deinit_InputWidget(iInputWidget *d) {
-    delete_SystemTextInput(d->sysCtrl);
     if (d->backupTimer) {
         SDL_RemoveTimer(d->backupTimer);
     }
@@ -750,19 +821,24 @@ void deinit_InputWidget(iInputWidget *d) {
     }
     delete_String(d->backupPath);
     d->backupPath = NULL;
+    delete_TextBuf(d->buffered);
+    deinit_String(&d->srcHint);
+    deinit_String(&d->hint);
+    deinit_String(&d->oldText);
+#if LAGRANGE_USE_SYSTEM_TEXT_INPUT
+    delete_SystemTextInput(d->sysCtrl);
+    deinit_String(&d->text);
+#else
+    startOrStopCursorTimer_InputWidget_(d, iFalse);
     clearInputLines_(&d->lines);
     if (isSelected_Widget(d)) {
         SDL_StopTextInput();
         enableEditorKeysInMenus_(iTrue);
     }
-    delete_TextBuf(d->buffered);
     clearUndo_InputWidget_(d);
     deinit_Array(&d->undoStack);
-    startOrStopCursorTimer_InputWidget_(d, iFalse);
-    deinit_String(&d->srcHint);
-    deinit_String(&d->hint);
-    deinit_String(&d->oldText);
     deinit_Array(&d->lines);
+#endif
 }
 
 static iBool isAllowedToInsertNewline_InputWidget_(const iInputWidget *d) {
@@ -771,7 +847,7 @@ static iBool isAllowedToInsertNewline_InputWidget_(const iInputWidget *d) {
         d->inFlags & lineBreaksEnabled_InputWidgetFlag && d->maxLen == 0;
 }
 
-#if defined (LAGRANGE_ENABLE_SYSTEM_INPUT)
+#if LAGRANGE_USE_SYSTEM_TEXT_INPUT
 static void updateAfterVisualOffsetChange_InputWidget_(iInputWidget *d, iRoot *root) {
     iAssert(as_Widget(d)->root == root);
     iUnused(root);
@@ -786,6 +862,7 @@ void setFont_InputWidget(iInputWidget *d, int fontId) {
     updateMetrics_InputWidget_(d);
 }
 
+#if !LAGRANGE_USE_SYSTEM_TEXT_INPUT
 static void pushUndo_InputWidget_(iInputWidget *d) {
     iInputUndo undo;
     init_InputUndo_(&undo, &d->lines, d->cursor);
@@ -799,7 +876,6 @@ static void pushUndo_InputWidget_(iInputWidget *d) {
 static iBool popUndo_InputWidget_(iInputWidget *d) {
     if (!isEmpty_Array(&d->undoStack)) {
         iInputUndo *undo = back_Array(&d->undoStack);
-        //setCopy_Array(&d->text, &undo->text);
         splitToLines_(&undo->text, &d->lines);
         d->cursor = undo->cursor;
         deinit_InputUndo_(undo);
@@ -811,6 +887,43 @@ static iBool popUndo_InputWidget_(iInputWidget *d) {
     return iFalse;
 }
 
+iLocalDef iInputLine *cursorLine_InputWidget_(iInputWidget *d) {
+    return at_Array(&d->lines, d->cursor.y);
+}
+
+iLocalDef const iInputLine *constCursorLine_InputWidget_(const iInputWidget *d) {
+    return constAt_Array(&d->lines, d->cursor.y);
+}
+
+iLocalDef iInt2 cursorMax_InputWidget_(const iInputWidget *d) {
+    const int yLast = size_Array(&d->lines) - 1;
+    return init_I2(endX_InputWidget_(d, yLast), yLast);
+}
+
+static size_t cursorToIndex_InputWidget_(const iInputWidget *d, iInt2 pos) {
+    if (pos.y < 0) {
+        return 0;
+    }
+    if (pos.y >= size_Array(&d->lines)) {
+        return lastLine_InputWidget_(d)->range.end;
+    }
+    const iInputLine *line = line_InputWidget_(d, pos.y);
+    pos.x = iClamp(pos.x, 0, endX_InputWidget_(d, pos.y));
+    return line->range.start + pos.x;
+}
+
+static iInt2 indexToCursor_InputWidget_(const iInputWidget *d, size_t index) {
+    /* TODO: The lines are sorted; this could use a binary search. */
+    iConstForEach(Array, i, &d->lines) {
+        const iInputLine *line = i.value;
+        if (contains_Range(&line->range, index)) {
+            return init_I2(index - line->range.start, index_ArrayConstIterator(&i));
+        }
+    }
+    return cursorMax_InputWidget_(d);
+}
+#endif
+
 void setMode_InputWidget(iInputWidget *d, enum iInputMode mode) {
     d->mode = mode;
 }
@@ -909,7 +1022,11 @@ void setContentPadding_InputWidget(iInputWidget *d, int left, int right) {
 }
 
 iLocalDef iBool isEmpty_InputWidget_(const iInputWidget *d) {
+#if LAGRANGE_USE_SYSTEM_TEXT_INPUT
+    return isEmpty_String(&d->text);
+#else
     return size_Array(&d->lines) == 1 && isEmpty_String(&line_InputWidget_(d, 0)->text);
+#endif
 }
 
 static iBool isHintVisible_InputWidget_(const iInputWidget *d) {
@@ -919,15 +1036,20 @@ static iBool isHintVisible_InputWidget_(const iInputWidget *d) {
 static void updateBuffered_InputWidget_(iInputWidget *d) {
     invalidateBuffered_InputWidget_(d);
     if (isHintVisible_InputWidget_(d)) {
+        /* TODO: This should have a "maximum number of lines" parameter! */
         d->buffered = newRange_TextBuf(d->font, uiAnnotation_ColorId, range_String(&d->hint));
     }
     else {
         /* Draw all the potentially visible lines to a buffer. */
+#if LAGRANGE_USE_SYSTEM_TEXT_INPUT
+        iString *visText = copy_String(&d->text);
+#else
         iString *visText = new_String();
         const iRangei visRange = visibleLineRange_InputWidget_(d);
         for (int i = visRange.start; i < visRange.end; i++) {
             append_String(visText, &line_InputWidget_(d, i)->text);
         }
+#endif
         if (d->inFlags & isUrl_InputWidgetFlag) {
             /* Highlight the host name. */
             iUrl parts;
@@ -953,19 +1075,6 @@ static void updateBuffered_InputWidget_(iInputWidget *d) {
     d->inFlags &= ~needUpdateBuffer_InputWidgetFlag;
 }
 
-iLocalDef iInputLine *cursorLine_InputWidget_(iInputWidget *d) {
-    return at_Array(&d->lines, d->cursor.y);
-}
-
-iLocalDef const iInputLine *constCursorLine_InputWidget_(const iInputWidget *d) {
-    return constAt_Array(&d->lines, d->cursor.y);
-}
-
-iLocalDef iInt2 cursorMax_InputWidget_(const iInputWidget *d) {
-    const int yLast = size_Array(&d->lines) - 1;
-    return init_I2(endX_InputWidget_(d, yLast), yLast);
-}
-
 void setText_InputWidget(iInputWidget *d, const iString *text) {
     if (!d) return;
     if (d->inFlags & isUrl_InputWidgetFlag) {
@@ -982,13 +1091,11 @@ void setText_InputWidget(iInputWidget *d, const iString *text) {
             text = omitDefaultScheme_(collect_String(copy_String(text)));
         }
     }
-    clearUndo_InputWidget_(d);
     iString *nfcText = collect_String(copy_String(text));
     normalize_String(nfcText);
+#if !LAGRANGE_USE_SYSTEM_TEXT_INPUT
+    clearUndo_InputWidget_(d);
     splitToLines_(nfcText, &d->lines);
-    if (d->sysCtrl) {
-        setText_SystemTextInput(d->sysCtrl, nfcText);
-    }
     iAssert(!isEmpty_Array(&d->lines));
     iForEach(Array, i, &d->lines) {
         updateLine_InputWidget_(d, i.value); /* count number of visible lines */
@@ -998,12 +1105,23 @@ void setText_InputWidget(iInputWidget *d, const iString *text) {
     if (!isFocused_Widget(d)) {
         iZap(d->mark);
     }
+#else
+    set_String(&d->text, nfcText);
+    if (d->sysCtrl) {
+        setText_SystemTextInput(d->sysCtrl, nfcText);
+    }
+    else {
+        updateAllLinesAndResizeHeight_InputWidget_(d); /* need to know the new height */
+    }
+#endif
     if (!isFocused_Widget(d)) {
         d->inFlags |= needUpdateBuffer_InputWidgetFlag;
     }
     updateVisible_InputWidget_(d);
     updateMetrics_InputWidget_(d);
-    refresh_Widget(as_Widget(d));
+    if (!d->sysCtrl) {
+        refresh_Widget(as_Widget(d));
+    }
 }
 
 void setTextCStr_InputWidget(iInputWidget *d, const char *cstr) {
@@ -1012,32 +1130,11 @@ void setTextCStr_InputWidget(iInputWidget *d, const char *cstr) {
     delete_String(str);
 }
 
-static size_t cursorToIndex_InputWidget_(const iInputWidget *d, iInt2 pos) {
-    if (pos.y < 0) {
-        return 0;
-    }
-    if (pos.y >= size_Array(&d->lines)) {
-        return lastLine_InputWidget_(d)->range.end;
-    }
-    const iInputLine *line = line_InputWidget_(d, pos.y);
-    pos.x = iClamp(pos.x, 0, endX_InputWidget_(d, pos.y));
-    return line->range.start + pos.x;
-}
-
-static iInt2 indexToCursor_InputWidget_(const iInputWidget *d, size_t index) {
-    /* TODO: The lines are sorted; this could use a binary search. */
-    iConstForEach(Array, i, &d->lines) {
-        const iInputLine *line = i.value;
-        if (contains_Range(&line->range, index)) {
-            return init_I2(index - line->range.start, index_ArrayConstIterator(&i));
-        }
-    }
-    return cursorMax_InputWidget_(d);
-}
-
 void selectAll_InputWidget(iInputWidget *d) {
+#if !LAGRANGE_USE_SYSTEM_TEXT_INPUT
     d->mark = (iRanges){ 0, lastLine_InputWidget_(d)->range.end };
     refresh_Widget(as_Widget(d));
+#endif
 }
 
 iLocalDef iBool isEditing_InputWidget_(const iInputWidget *d) {
@@ -1046,10 +1143,10 @@ iLocalDef iBool isEditing_InputWidget_(const iInputWidget *d) {
 
 static void contentsWereChanged_InputWidget_(iInputWidget *);
 
-#if defined (LAGRANGE_ENABLE_SYSTEM_INPUT)
+#if LAGRANGE_USE_SYSTEM_TEXT_INPUT
 void systemInputChanged_InputWidget_(iSystemTextInput *sysCtrl, void *widget) {
     iInputWidget *d = widget;
-    splitToLines_(text_SystemTextInput(sysCtrl), &d->lines);
+    set_String(&d->text, text_SystemTextInput(sysCtrl));
     contentsWereChanged_InputWidget_(d);
     updateMetrics_InputWidget_(d);
 }
@@ -1064,22 +1161,24 @@ void begin_InputWidget(iInputWidget *d) {
     invalidateBuffered_InputWidget_(d);
     setFlags_Widget(w, hidden_WidgetFlag | disabled_WidgetFlag, iFalse);
     setFlags_Widget(w, selected_WidgetFlag, iTrue);
-    mergeLines_(&d->lines, &d->oldText);
-#if defined (LAGRANGE_ENABLE_SYSTEM_INPUT)
+    d->inFlags &= ~enterPressed_InputWidgetFlag;
+#if LAGRANGE_USE_SYSTEM_TEXT_INPUT
+    set_String(&d->oldText, &d->text);
     d->sysCtrl = new_SystemTextInput(contentBounds_InputWidget_(d),
                                      (d->maxWrapLines > 1 ? multiLine_SystemTextInputFlags : 0) |
                                      (d->inFlags & isUrl_InputWidgetFlag ? (disableAutocorrect_SystemTextInputFlag |
                                                                             disableAutocapitalize_SystemTextInputFlag) : 0) |
                                      (!cmp_String(id_Widget(w), "url") ? returnGo_SystemTextInputFlags : 0) |
                                      (flags_Widget(w) & alignRight_WidgetFlag ? alignRight_SystemTextInputFlag : 0) |
-                                     (isAllowedToInsertNewline_InputWidget_(d) ? insertNewlines_SystemTextInputFlag : 0));
+                                     (isAllowedToInsertNewline_InputWidget_(d) ? insertNewlines_SystemTextInputFlag : 0) |
+                                     (d->inFlags & selectAllOnFocus_InputWidgetFlag ? selectAll_SystemTextInputFlags : 0));
     setFont_SystemTextInput(d->sysCtrl, d->font);
     setText_SystemTextInput(d->sysCtrl, &d->oldText);
     setTextChangedFunc_SystemTextInput(d->sysCtrl, systemInputChanged_InputWidget_, d);
     iConnect(Root, w->root, visualOffsetsChanged, d, updateAfterVisualOffsetChange_InputWidget_);
     updateMetrics_InputWidget_(d);
-    return;
-#endif
+#else
+    mergeLines_(&d->lines, &d->oldText);
     if (d->mode == overwrite_InputMode) {
         d->cursor = zero_I2();
     }
@@ -1091,7 +1190,6 @@ void begin_InputWidget(iInputWidget *d) {
     showCursor_InputWidget_(d);
     refresh_Widget(w);
     startOrStopCursorTimer_InputWidget_(d, iTrue);
-    d->inFlags &= ~enterPressed_InputWidgetFlag;
     if (d->inFlags & selectAllOnFocus_InputWidgetFlag) {
         d->mark = (iRanges){ 0, lastLine_InputWidget_(d)->range.end };
         d->cursor = cursorMax_InputWidget_(d);
@@ -1102,6 +1200,7 @@ void begin_InputWidget(iInputWidget *d) {
     enableEditorKeysInMenus_(iFalse);
     updateTextInputRect_InputWidget_(d);
     updateVisible_InputWidget_(d);
+#endif
 }
 
 void end_InputWidget(iInputWidget *d, iBool accept) {
@@ -1110,23 +1209,29 @@ void end_InputWidget(iInputWidget *d, iBool accept) {
         /* Was not active. */
         return;
     }
+#if LAGRANGE_USE_SYSTEM_TEXT_INPUT
     if (d->sysCtrl) {
         iDisconnect(Root, w->root, visualOffsetsChanged, d, updateAfterVisualOffsetChange_InputWidget_);
         if (accept) {
-            splitToLines_(text_SystemTextInput(d->sysCtrl), &d->lines);
+            set_String(&d->text, text_SystemTextInput(d->sysCtrl));
+        }
+        else {
+            set_String(&d->text, &d->oldText);
         }
         delete_SystemTextInput(d->sysCtrl);
         d->sysCtrl = NULL;
     }
-    else if (!accept) {
+#else
+    if (!accept) {
         /* Overwrite the edited lines. */
         splitToLines_(&d->oldText, &d->lines);
         SDL_StopTextInput();
     }
     enableEditorKeysInMenus_(iTrue);
-    d->inFlags |= needUpdateBuffer_InputWidgetFlag;
     d->inFlags &= ~isMarking_InputWidgetFlag;
     startOrStopCursorTimer_InputWidget_(d, iFalse);
+#endif
+    d->inFlags |= needUpdateBuffer_InputWidgetFlag;
     setFlags_Widget(w, selected_WidgetFlag | keepOnTop_WidgetFlag | touchDrag_WidgetFlag, iFalse);
     const char *id = cstr_String(id_Widget(as_Widget(d)));
     if (!*id) id = "_";
@@ -1138,6 +1243,7 @@ void end_InputWidget(iInputWidget *d, iBool accept) {
                        accept ? 1 : 0);
 }
 
+#if !LAGRANGE_USE_SYSTEM_TEXT_INPUT
 static void textOfLinesWasChanged_InputWidget_(iInputWidget *d, iRangei lineRange) {
     for (int i = lineRange.start; i < lineRange.end; i++) {
         updateLine_InputWidget_(d, at_Array(&d->lines, i));
@@ -1271,27 +1377,6 @@ static iBool moveCursorByLine_InputWidget_(iInputWidget *d, int dir, int horiz)
     return iTrue;
 }
 
-void setSensitiveContent_InputWidget(iInputWidget *d, iBool isSensitive) {
-    iChangeFlags(d->inFlags, isSensitive_InputWidgetFlag, isSensitive);
-}
-
-void setUrlContent_InputWidget(iInputWidget *d, iBool isUrl) {
-    iChangeFlags(d->inFlags, isUrl_InputWidgetFlag, isUrl);
-    d->inFlags |= needUpdateBuffer_InputWidgetFlag;
-}
-
-void setSelectAllOnFocus_InputWidget(iInputWidget *d, iBool selectAllOnFocus) {
-    iChangeFlags(d->inFlags, selectAllOnFocus_InputWidgetFlag, selectAllOnFocus);
-}
-
-void setNotifyEdits_InputWidget(iInputWidget *d, iBool notifyEdits) {
-    iChangeFlags(d->inFlags, notifyEdits_InputWidgetFlag, notifyEdits);
-}
-
-void setEatEscape_InputWidget(iInputWidget *d, iBool eatEscape) {
-    iChangeFlags(d->inFlags, eatEscape_InputWidgetFlag, eatEscape);
-}
-
 static iRanges mark_InputWidget_(const iInputWidget *d) {
     iRanges m = { iMin(d->mark.start, d->mark.end), iMax(d->mark.start, d->mark.end) };
     const iInputLine *last = lastLine_InputWidget_(d);
@@ -1300,15 +1385,6 @@ static iRanges mark_InputWidget_(const iInputWidget *d) {
     return m;
 }
 
-static void contentsWereChanged_InputWidget_(iInputWidget *d) {
-    if (d->validator) {
-        d->validator(d, d->validatorContext); /* this may change the contents */
-    }
-    if (d->inFlags & notifyEdits_InputWidgetFlag) {
-        postCommand_Widget(d, "input.edited id:%s", cstr_String(id_Widget(constAs_Widget(d))));
-    }
-}
-
 static void deleteIndexRange_InputWidget_(iInputWidget *d, iRanges deleted) {
     size_t firstModified = iInvalidPos;
     restartBackupTimer_InputWidget_(d);
@@ -1517,6 +1593,42 @@ static void extendRange_InputWidget_(iInputWidget *d, size_t *index, int dir) {
     *index = cursorToIndex_InputWidget_(d, pos);
 }
 
+static void lineTextWasChanged_InputWidget_(iInputWidget *d, iInputLine *line) {
+    const int y = indexOf_Array(&d->lines, line);
+    textOfLinesWasChanged_InputWidget_(d, (iRangei){ y, y + 1 });
+}
+#endif
+
+void setSensitiveContent_InputWidget(iInputWidget *d, iBool isSensitive) {
+    iChangeFlags(d->inFlags, isSensitive_InputWidgetFlag, isSensitive);
+}
+
+void setUrlContent_InputWidget(iInputWidget *d, iBool isUrl) {
+    iChangeFlags(d->inFlags, isUrl_InputWidgetFlag, isUrl);
+    d->inFlags |= needUpdateBuffer_InputWidgetFlag;
+}
+
+void setSelectAllOnFocus_InputWidget(iInputWidget *d, iBool selectAllOnFocus) {
+    iChangeFlags(d->inFlags, selectAllOnFocus_InputWidgetFlag, selectAllOnFocus);
+}
+
+void setNotifyEdits_InputWidget(iInputWidget *d, iBool notifyEdits) {
+    iChangeFlags(d->inFlags, notifyEdits_InputWidgetFlag, notifyEdits);
+}
+
+void setEatEscape_InputWidget(iInputWidget *d, iBool eatEscape) {
+    iChangeFlags(d->inFlags, eatEscape_InputWidgetFlag, eatEscape);
+}
+
+static void contentsWereChanged_InputWidget_(iInputWidget *d) {
+    if (d->validator) {
+        d->validator(d, d->validatorContext); /* this may change the contents */
+    }
+    if (d->inFlags & notifyEdits_InputWidgetFlag) {
+        postCommand_Widget(d, "input.edited id:%s", cstr_String(id_Widget(constAs_Widget(d))));
+    }
+}
+
 static iRect bounds_InputWidget_(const iInputWidget *d) {
     const iWidget *w = constAs_Widget(d);
     iRect bounds = bounds_Widget(w);
@@ -1535,11 +1647,6 @@ static iBool contains_InputWidget_(const iInputWidget *d, iInt2 coord) {
     return contains_Rect(bounds_InputWidget_(d), coord);
 }
 
-static void lineTextWasChanged_InputWidget_(iInputWidget *d, iInputLine *line) {
-    const int y = indexOf_Array(&d->lines, line);
-    textOfLinesWasChanged_InputWidget_(d, (iRangei){ y, y + 1 });
-}
-
 static iBool isArrowUpDownConsumed_InputWidget_(const iInputWidget *d) {
     return d->maxWrapLines > 1;
 }
@@ -1564,6 +1671,7 @@ enum iEventResult {
     true_EventResult    = 2, /* event was processed and should not be passed on */
 };
 
+#if !LAGRANGE_USE_SYSTEM_TEXT_INPUT
 static void markWordAtCursor_InputWidget_(iInputWidget *d) {
     d->mark.start = d->mark.end = cursorToIndex_InputWidget_(d, d->cursor);
     extendRange_InputWidget_(d, &d->mark.start, -1);
@@ -1580,8 +1688,10 @@ static void showClipMenu_(iInt2 coord) {
         openMenuFlags_Widget(clipMenu, coord, iFalse);
     }
 }
+#endif
 
 static enum iEventResult processPointerEvents_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
+#if !LAGRANGE_USE_SYSTEM_TEXT_INPUT
     iWidget *w = as_Widget(d);
     if (ev->type == SDL_MOUSEMOTION && (isHover_Widget(d) || flags_Widget(w) & keepOnTop_WidgetFlag)) {
         const iInt2 coord = init_I2(ev->motion.x, ev->motion.y);
@@ -1655,9 +1765,11 @@ static enum iEventResult processPointerEvents_InputWidget_(iInputWidget *d, cons
             return true_EventResult;
         }
     }
+#endif
     return ignored_EventResult;
 }
 
+#if !LAGRANGE_USE_SYSTEM_TEXT_INPUT
 static iInt2 touchCoordCursor_InputWidget_(const iInputWidget *d, iInt2 coord) {
     /* Clamp to the bounds so the cursor doesn't wrap at the ends. */
     iRect bounds = shrunk_Rect(contentBounds_InputWidget_(d), one_I2());
@@ -1679,9 +1791,11 @@ static int distanceToPos_InputWidget_(const iInputWidget *d, iInt2 uiCoord, iInt
     }
     return dist_I2(addY_I2(winCoord, lineHeight_Text(d->font) / 2), uiCoord);
 }
+#endif
 
 static enum iEventResult processTouchEvents_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
     iWidget *w = as_Widget(d);
+#if !LAGRANGE_USE_SYSTEM_TEXT_INPUT
     /*
      + first tap to focus & select all/place cursor
      + focused tap to place cursor
@@ -1923,9 +2037,22 @@ static enum iEventResult processTouchEvents_InputWidget_(iInputWidget *d, const
 //        /* Eat all mouse clicks on the widget. */
 //        return true_EventResult;
 //    }
+#else
+    /* Just a tap to activate the system-provided text input control. */
+    switch (processEvent_Click(&d->click, ev)) {
+        case none_ClickResult:
+            break;
+        case started_ClickResult:
+            setFocus_Widget(w);
+            return true_EventResult;
+        default:
+            return true_EventResult;
+    }
+#endif
     return ignored_EventResult;
 }
 
+#if !LAGRANGE_USE_SYSTEM_TEXT_INPUT
 static void clampWheelAccum_InputWidget_(iInputWidget *d, int wheel) {
     if (wheel > 0 && d->visWrapLines.start == 0) {
         d->wheelAccum = 0;
@@ -1936,6 +2063,7 @@ static void clampWheelAccum_InputWidget_(iInputWidget *d, int wheel) {
         refresh_Widget(d);
     }    
 }
+#endif
 
 static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
     iWidget *w = as_Widget(d);
@@ -1953,13 +2081,6 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
         begin_InputWidget(d);
         return iFalse;
     }
-    else if (isEditing_InputWidget_(d) && (isCommand_UserEvent(ev, "window.focus.lost") ||
-                                           isCommand_UserEvent(ev, "window.focus.gained"))) {
-        startOrStopCursorTimer_InputWidget_(d, isCommand_UserEvent(ev, "window.focus.gained"));
-        d->cursorVis = 1;
-        refresh_Widget(d);
-        return iFalse;
-    }
     else if (isCommand_UserEvent(ev, "keyroot.changed")) {
         d->inFlags |= needUpdateBuffer_InputWidgetFlag;
     }
@@ -1972,11 +2093,23 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
         end_InputWidget(d, iTrue);
         return iFalse;
     }
+#if !LAGRANGE_USE_SYSTEM_TEXT_INPUT
+    else if (isEditing_InputWidget_(d) && (isCommand_UserEvent(ev, "window.focus.lost") ||
+                                           isCommand_UserEvent(ev, "window.focus.gained"))) {
+        startOrStopCursorTimer_InputWidget_(d, isCommand_UserEvent(ev, "window.focus.gained"));
+        d->cursorVis = 1;
+        refresh_Widget(d);
+        return iFalse;
+    }
     else if ((isCommand_UserEvent(ev, "copy") || isCommand_UserEvent(ev, "input.copy")) &&
              isEditing_InputWidget_(d)) {
         copy_InputWidget_(d, argLabel_Command(command_UserEvent(ev), "cut"));
         return iTrue;
     }
+//    else if (isFocused_Widget(d) && isCommand_UserEvent(ev, "copy")) {
+//        copy_InputWidget_(d, iFalse);
+//        return iTrue;
+//    }
     else if (isCommand_UserEvent(ev, "input.paste") && isEditing_InputWidget_(d)) {
         paste_InputWidget_(d);
         return iTrue;
@@ -1992,6 +2125,14 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
         selectAll_InputWidget(d);
         return iTrue;
     }
+    else if (isCommand_UserEvent(ev, "text.insert")) {
+        pushUndo_InputWidget_(d);
+        deleteMarked_InputWidget_(d);
+        insertChar_InputWidget_(d, arg_Command(command_UserEvent(ev)));
+        contentsWereChanged_InputWidget_(d);
+        return iTrue;
+    }
+#endif
     else if (isCommand_UserEvent(ev, "theme.changed")) {
         if (d->buffered) {
             d->inFlags |= needUpdateBuffer_InputWidgetFlag;
@@ -2010,13 +2151,6 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
 //        }
 //        return iFalse;
 //    }
-    else if (isCommand_UserEvent(ev, "text.insert")) {
-        pushUndo_InputWidget_(d);
-        deleteMarked_InputWidget_(d);
-        insertChar_InputWidget_(d, arg_Command(command_UserEvent(ev)));
-        contentsWereChanged_InputWidget_(d);
-        return iTrue;
-    }
     else if (isCommand_Widget(w, ev, "input.backup")) {
         if (d->inFlags & needBackup_InputWidgetFlag) {
             saveBackup_InputWidget_(d);
@@ -2027,10 +2161,7 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
         updateMetrics_InputWidget_(d);
      //   updateLinesAndResize_InputWidget_(d);
     }
-    else if (isFocused_Widget(d) && isCommand_UserEvent(ev, "copy")) {
-        copy_InputWidget_(d, iFalse);
-        return iTrue;
-    }
+#if !LAGRANGE_USE_SYSTEM_TEXT_INPUT
     if (ev->type == SDL_MOUSEWHEEL && contains_Widget(w, coord_MouseWheelEvent(&ev->wheel))) {
         if (numWrapLines_InputWidget_(d) <= size_Range(&d->visWrapLines)) {
             return ignored_EventResult;
@@ -2064,6 +2195,17 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
         }
         return false_EventResult;
     }
+    if (ev->type == SDL_TEXTINPUT && isFocused_Widget(w)) {
+        pushUndo_InputWidget_(d);
+        deleteMarked_InputWidget_(d);
+        insertRange_InputWidget_(d, range_CStr(ev->text.text));
+        contentsWereChanged_InputWidget_(d);
+        return iTrue;
+    }
+    const iInt2 curMax    = cursorMax_InputWidget_(d);
+    const iInt2 lineFirst = init_I2(0, d->cursor.y);
+    const iInt2 lineLast  = init_I2(endX_InputWidget_(d, d->cursor.y), d->cursor.y);
+#endif
     /* Click behavior depends on device type. */ {
         const int mbResult = (deviceType_App() == desktop_AppDeviceType
                               ? processPointerEvents_InputWidget_(d, ev)
@@ -2075,12 +2217,10 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
     if (ev->type == SDL_KEYUP && isFocused_Widget(w)) {
         return iTrue;
     }
-    const iInt2 curMax    = cursorMax_InputWidget_(d);
-    const iInt2 lineFirst = init_I2(0, d->cursor.y);
-    const iInt2 lineLast  = init_I2(endX_InputWidget_(d, d->cursor.y), d->cursor.y);
     if (ev->type == SDL_KEYDOWN && isFocused_Widget(w)) {
         const int key  = ev->key.keysym.sym;
         const int mods = keyMods_Sym(ev->key.keysym.mod);
+#if !LAGRANGE_USE_SYSTEM_TEXT_INPUT
         if (mods == KMOD_PRIMARY) {
             switch (key) {
                 case 'c':
@@ -2098,7 +2238,7 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
                     return iTrue;
             }
         }
-#if defined (iPlatformApple)
+#  if defined (iPlatformApple)
         if (mods == KMOD_PRIMARY || mods == (KMOD_PRIMARY | KMOD_SHIFT)) {
             switch (key) {
                 case SDLK_UP:
@@ -2108,16 +2248,13 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
                     return iTrue;
             }
         }
-#endif
+#  endif
         d->prevCursor = d->cursor;
+#endif
         switch (key) {
-            case SDLK_INSERT:
-                if (mods == KMOD_SHIFT) {
-                    paste_InputWidget_(d);
-                }
-                return iTrue;
             case SDLK_RETURN:
             case SDLK_KP_ENTER:
+#if !LAGRANGE_USE_SYSTEM_TEXT_INPUT
                 if (isAllowedToInsertNewline_InputWidget_(d)) {
                     if (checkLineBreakMods_InputWidget_(d, mods)) {
                         pushUndo_InputWidget_(d);
@@ -2127,6 +2264,7 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
                         return iTrue;
                     }
                 }
+#endif
                 if (d->inFlags & enterKeyEnabled_InputWidgetFlag &&
                     (checkAcceptMods_InputWidget_(d, mods) ||
                      (~d->inFlags & lineBreaksEnabled_InputWidgetFlag))) {
@@ -2139,6 +2277,12 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
                 end_InputWidget(d, iTrue);
                 setFocus_Widget(NULL);
                 return (d->inFlags & eatEscape_InputWidgetFlag) != 0;
+#if !LAGRANGE_USE_SYSTEM_TEXT_INPUT
+            case SDLK_INSERT:
+                if (mods == KMOD_SHIFT) {
+                    paste_InputWidget_(d);
+                }
+                return iTrue;
             case SDLK_BACKSPACE:
                 if (!isEmpty_Range(&d->mark)) {
                     pushUndo_InputWidget_(d);
@@ -2238,7 +2382,7 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
                     refresh_Widget(w);
                     return iTrue;
                 }
-#if defined (iPlatformApple)
+# if defined (iPlatformApple)
                 /* fall through for Emacs-style Home/End */
             case SDLK_e:
                 if (mods == KMOD_CTRL || mods == (KMOD_CTRL | KMOD_SHIFT)) {
@@ -2246,7 +2390,7 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
                     refresh_Widget(w);
                     return iTrue;
                 }
-#endif
+# endif
                 break;
             case SDLK_LEFT:
             case SDLK_RIGHT: {
@@ -2296,22 +2440,17 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
                 }
                 refresh_Widget(d);
                 return iTrue;
+#endif
         }
         if (mods & (KMOD_PRIMARY | KMOD_SECONDARY)) {
             return iFalse;
         }
         return iTrue;
     }
-    else if (ev->type == SDL_TEXTINPUT && isFocused_Widget(w)) {
-        pushUndo_InputWidget_(d);
-        deleteMarked_InputWidget_(d);
-        insertRange_InputWidget_(d, range_CStr(ev->text.text));
-        contentsWereChanged_InputWidget_(d);
-        return iTrue;
-    }
     return processEvent_Widget(w, ev);
 }
 
+#if !LAGRANGE_USE_SYSTEM_TEXT_INPUT
 iDeclareType(MarkPainter)
 
 struct Impl_MarkPainter {
@@ -2370,6 +2509,7 @@ static iBool draw_MarkPainter_(iWrapText *wrapText, iRangecc wrappedText, iTextA
     }
     return iTrue;
 }
+#endif
 
 static void draw_InputWidget_(const iInputWidget *d) {
     const iWidget *w         = constAs_Widget(d);
@@ -2393,16 +2533,18 @@ static void draw_InputWidget_(const iInputWidget *d) {
                             isFocused ? uiInputFrameFocused_ColorId
                                       : isHover ? uiInputFrameHover_ColorId : uiInputFrame_ColorId);
     if (d->sysCtrl) {
+        /* The system-provided control is drawing the text. */
         drawChildren_Widget(w);
         return;
     }
-    setClip_Paint(&p, adjusted_Rect(bounds, init_I2(d->leftPadding, 0),
-                                    init_I2(-d->rightPadding, w->flags & extraPadding_WidgetFlag ? -gap_UI / 2 : 0)));
     const iRect contentBounds = contentBounds_InputWidget_(d);
     iInt2       drawPos    = topLeft_Rect(contentBounds);
     const int   fg         = isHint                                   ? uiAnnotation_ColorId
                              : isFocused /*&& !isEmpty_Array(&d->lines)*/ ? uiInputTextFocused_ColorId
                                                                       : uiInputText_ColorId;
+#if !LAGRANGE_USE_SYSTEM_TEXT_INPUT
+    setClip_Paint(&p, adjusted_Rect(bounds, init_I2(d->leftPadding, 0),
+                                    init_I2(-d->rightPadding, w->flags & extraPadding_WidgetFlag ? -gap_UI / 2 : 0)));
     iWrapText wrapText = {
         .maxWidth     = d->maxLen == 0 ? width_Rect(contentBounds) : unlimitedWidth_InputWidget_,
         .mode         = (d->inFlags & isUrl_InputWidgetFlag ? anyCharacter_WrapTextMode
@@ -2410,8 +2552,9 @@ static void draw_InputWidget_(const iInputWidget *d) {
         .overrideChar = (d->inFlags & isSensitive_InputWidgetFlag ? sensitiveChar_ : 0),
     };
     const iRangei visLines       = visibleLineRange_InputWidget_(d);
-    const int     visLineOffsetY = visLineOffsetY_InputWidget_(d);
     iRect         markerRects[2] = { zero_Rect(), zero_Rect() };
+#endif
+    const int     visLineOffsetY = visLineOffsetY_InputWidget_(d);
     /* If buffered, just draw the buffered copy. */
     if (d->buffered && !isFocused) {
         /* Most input widgets will use this, since only one is focused at a time. */
@@ -2439,6 +2582,7 @@ static void draw_InputWidget_(const iInputWidget *d) {
             drawRange_Text(d->font, drawPos, uiAnnotation_ColorId, range_String(&d->hint));
         }
     }
+#if !LAGRANGE_USE_SYSTEM_TEXT_INPUT
     else {
         iAssert(~d->inFlags & isSensitive_InputWidgetFlag || size_Range(&visLines) == 1);
         drawPos.y += visLineOffsetY;
@@ -2517,6 +2661,7 @@ static void draw_InputWidget_(const iInputWidget *d) {
             drawPin_Paint(&p, markerRects[i], i, uiTextCaution_ColorId);
         }
     }
+#endif
     drawChildren_Widget(w);
 }