4 files changed, 75 insertions, 14 deletions

diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 4706033a..e138af6f 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -1549,6 +1549,43 @@ static void togglePreFold_DocumentWidget_(iDocumentWidget *d, uint16_t preId) {
     refresh_Widget(as_Widget(d));
 }
 
+static iString *makeQueryUrl_DocumentWidget_(const iDocumentWidget *d,
+                                             const iString *userEnteredText) {
+    iString *url = copy_String(d->mod.url);
+    /* Remove the existing query string. */
+    const size_t qPos = indexOfCStr_String(url, "?");
+    if (qPos != iInvalidPos) {
+        remove_Block(&url->chars, qPos, iInvalidSize);
+    }
+    appendCStr_String(url, "?");
+    append_String(url, collect_String(urlEncode_String(userEnteredText)));
+    return url;
+}
+
+static void inputQueryValidator_(iInputWidget *input, void *context) {
+    iDocumentWidget *d = context;
+    iString *url = makeQueryUrl_DocumentWidget_(d, text_InputWidget(input));
+    iWidget *dlg = parent_Widget(input);
+    iLabelWidget *counter = findChild_Widget(dlg, "valueinput.counter");
+    iAssert(counter);
+    int avail = 1024 - (int) size_String(url);
+    setFlags_Widget(findChild_Widget(dlg, "default"), disabled_WidgetFlag, avail < 0);
+    setEnterKeyEnabled_InputWidget(input, avail >= 0);
+    int len = length_String(text_InputWidget(input));
+    if (len > 1024) {
+        iString *trunc = copy_String(text_InputWidget(input));
+        truncate_String(trunc, 1024);
+        setText_InputWidget(input, trunc);
+        delete_String(trunc);
+    }
+    setTextCStr_LabelWidget(counter, format_CStr("%d", avail)); /* Gemini URL maxlen */
+    setTextColor_LabelWidget(counter,
+                             avail < 0   ? uiTextCaution_ColorId :
+                             avail < 128 ? uiTextStrong_ColorId
+                                         : uiTextDim_ColorId);
+    delete_String(url);
+}
+
 static void checkResponse_DocumentWidget_(iDocumentWidget *d) {
     if (!d->request) {
         return;
@@ -1578,6 +1615,11 @@ static void checkResponse_DocumentWidget_(iDocumentWidget *d) {
                         : cstr_String(&resp->meta),
                     uiTextCaution_ColorEscape "${dlg.input.send}",
                     format_CStr("!document.input.submit doc:%p", d));
+                setId_Widget(addChildPosFlags_Widget(findChild_Widget(dlg, "dialogbuttons"),
+                                                     iClob(new_LabelWidget("", NULL)),
+                                                     front_WidgetAddPos, frameless_WidgetFlag),
+                             "valueinput.counter");
+                setValidator_InputWidget(findChild_Widget(dlg, "input"), inputQueryValidator_, d);
                 setSensitiveContent_InputWidget(findChild_Widget(dlg, "input"),
                                                 statusCode == sensitiveInput_GmStatusCode);
                 if (document_App() != d) {
@@ -2209,17 +2251,10 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         return iTrue;
     }
     else if (equal_Command(cmd, "document.input.submit") && document_Command(cmd) == d) {
-        iString *value = suffix_Command(cmd, "value");
-        set_String(value, collect_String(urlEncode_String(value)));
-        iString *url = collect_String(copy_String(d->mod.url));
-        const size_t qPos = indexOfCStr_String(url, "?");
-        if (qPos != iInvalidPos) {
-            remove_Block(&url->chars, qPos, iInvalidSize);
-        }
-        appendCStr_String(url, "?");
-        append_String(url, value);
-        postCommandf_Root(w->root, "open url:%s", cstr_String(url));
-        delete_String(value);
+        postCommandf_Root(w->root,
+                          "open url:%s",
+                          cstrCollect_String(makeQueryUrl_DocumentWidget_
+                                             (d, collect_String(suffix_Command(cmd, "value")))));
         return iTrue;
     }
     else if (equal_Command(cmd, "valueinput.cancelled") &&
diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index 72f9f706..38d025b9 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -75,6 +75,7 @@ enum iInputWidgetFlag {
     isMarking_InputWidgetFlag        = iBit(7),
     markWords_InputWidgetFlag        = iBit(8),
     needUpdateBuffer_InputWidgetFlag = iBit(9),
+    enterKeyEnabled_InputWidgetFlag  = iBit(10),
 };
 
 /*----------------------------------------------------------------------------------------------*/
@@ -124,6 +125,8 @@ struct Impl_InputWidget {
     int             cursorVis;
     uint32_t        timer;
     iTextBuf *      buffered;
+    iInputWidgetValidatorFunc validator;
+    void *          validatorContext;
 };
 
 iDefineObjectConstructionArgs(InputWidget, (size_t maxLen), maxLen)
@@ -295,6 +298,8 @@ static void updateLinesAndResize_InputWidget_(iInputWidget *d) {
 void init_InputWidget(iInputWidget *d, size_t maxLen) {
     iWidget *w = &d->widget;
     init_Widget(w);
+    d->validator = NULL;
+    d->validatorContext = NULL;
     setFlags_Widget(w, focusable_WidgetFlag | hover_WidgetFlag | touchDrag_WidgetFlag, iTrue);
 #if defined (iPlatformMobile)
     setFlags_Widget(w, extraPadding_WidgetFlag, iTrue);
@@ -312,7 +317,7 @@ void init_InputWidget(iInputWidget *d, size_t maxLen) {
     d->lastCursor   = 0;
     d->cursorLine   = 0;
     d->verticalMoveX = -1; /* TODO: Use this. */
-    d->inFlags      = eatEscape_InputWidgetFlag;
+    d->inFlags      = eatEscape_InputWidgetFlag | enterKeyEnabled_InputWidgetFlag;
     iZap(d->mark);
     setMaxLen_InputWidget(d, maxLen);
     d->maxLayoutLines = iInvalidSize;
@@ -423,6 +428,15 @@ void setMaxLayoutLines_InputWidget(iInputWidget *d, size_t maxLayoutLines) {
     updateMetrics_InputWidget_(d);
 }
 
+void setValidator_InputWidget(iInputWidget *d, iInputWidgetValidatorFunc validator, void *context) {
+    d->validator = validator;
+    d->validatorContext = context;
+}
+
+void setEnterKeyEnabled_InputWidget(iInputWidget *d, iBool enterKeyEnabled) {
+    iChangeFlags(d->inFlags, enterKeyEnabled_InputWidgetFlag, enterKeyEnabled);
+}
+
 void setHint_InputWidget(iInputWidget *d, const char *hintText) {
     /* Keep original for retranslations. */
     setCStr_String(&d->srcHint, hintText);
@@ -715,6 +729,9 @@ static iRanges mark_InputWidget_(const iInputWidget *d) {
 }
 
 static void contentsWereChanged_InputWidget_(iInputWidget *d) {
+    if (d->validator) {
+        d->validator(d, d->validatorContext); /* this may change the contents */
+    }
     updateLinesAndResize_InputWidget_(d);
     if (d->inFlags & notifyEdits_InputWidgetFlag) {
         postCommand_Widget(d, "input.edited id:%s", cstr_String(id_Widget(constAs_Widget(d))));
@@ -1068,8 +1085,10 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
                     contentsWereChanged_InputWidget_(d);
                     return iTrue;
                 }
-                d->inFlags |= enterPressed_InputWidgetFlag;
-                setFocus_Widget(NULL);
+                if (d->inFlags & enterKeyEnabled_InputWidgetFlag) {
+                    d->inFlags |= enterPressed_InputWidgetFlag;
+                    setFocus_Widget(NULL);
+                }
                 return iTrue;
             case SDLK_ESCAPE:
                 end_InputWidget(d, iFalse);
diff --git a/src/ui/inputwidget.h b/src/ui/inputwidget.h
index a632e230..cb32a29c 100644
--- a/src/ui/inputwidget.h
+++ b/src/ui/inputwidget.h
@@ -39,6 +39,8 @@ struct Impl_InputWidgetContentPadding {
     int right;
 };
 
+typedef void (*iInputWidgetValidatorFunc)(iInputWidget *, void *context);
+
 void    setHint_InputWidget     (iInputWidget *, const char *hintText);
 void    setMode_InputWidget     (iInputWidget *, enum iInputMode mode);
 void    setMaxLen_InputWidget   (iInputWidget *, size_t maxLen);
@@ -48,6 +50,8 @@ void    setFont_InputWidget     (iInputWidget *, int fontId);
 void    setCursor_InputWidget   (iInputWidget *, size_t pos);
 void    setContentPadding_InputWidget   (iInputWidget *, int left, int right); /* only affects the text entry */
 void    setMaxLayoutLines_InputWidget   (iInputWidget *, size_t maxLayoutLines);
+void    setValidator_InputWidget        (iInputWidget *, iInputWidgetValidatorFunc validator, void *context);
+void    setEnterKeyEnabled_InputWidget  (iInputWidget *, iBool enterKeyEnabled);
 void    begin_InputWidget       (iInputWidget *);
 void    end_InputWidget         (iInputWidget *, iBool accept);
 void    selectAll_InputWidget   (iInputWidget *);
diff --git a/src/ui/util.c b/src/ui/util.c
index f20338b5..ece527e1 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -1901,6 +1901,9 @@ iWidget *makeDialogButtons_Widget(const iMenuItem *actions, size_t numActions) {
         }
         iLabelWidget *button =
             addChild_Widget(div, iClob(newKeyMods_LabelWidget(label, key, kmods, cmd)));
+        if (isDefault) {
+            setId_Widget(as_Widget(button), "default");
+        }
         setFlags_Widget(as_Widget(button), alignLeft_WidgetFlag | drawKey_WidgetFlag, isDefault);
         setFont_LabelWidget(button, isDefault ? fonts[1] : fonts[0]);
     }