7 files changed, 172 insertions, 35 deletions

diff --git a/src/ui/command.c b/src/ui/command.c
index 71228784..b79c8bcf 100644
--- a/src/ui/command.c
+++ b/src/ui/command.c
@@ -51,7 +51,7 @@ void *pointer_Command(const char *cmd) {
     return pointerLabel_Command(cmd, "ptr");
 }
 
-const char *valuePtr_Command(const char *cmd, const char *label) {
+const char *suffixPtr_Command(const char *cmd, const char *label) {
     const iString *tok = tokenString_(label);
     const char *ptr = strstr(cmd, cstr_String(tok));
     if (ptr) {
@@ -60,8 +60,12 @@ const char *valuePtr_Command(const char *cmd, const char *label) {
     return NULL;
 }
 
+iString *suffix_Command(const char *cmd, const char *label) {
+    return newCStr_String(suffixPtr_Command(cmd, label));
+}
+
 const iString *string_Command(const char *cmd, const char *label) {
-    iRangecc val = { valuePtr_Command(cmd, label), NULL };
+    iRangecc val = { suffixPtr_Command(cmd, label), NULL };
     if (val.start) {
         for (val.end = val.start; *val.end && !isspace(*val.end); val.end++) {}
         return collect_String(newRange_String(val));
diff --git a/src/ui/command.h b/src/ui/command.h
index 84533d77..aed4a0f2 100644
--- a/src/ui/command.h
+++ b/src/ui/command.h
@@ -12,5 +12,6 @@ void *  pointerLabel_Command    (const char *, const char *label);
 iInt2   coord_Command           (const char *);
 iInt2   dir_Command             (const char *);
 
-const iString * string_Command  (const char *, const char *label);
-const char *    valuePtr_Command(const char *, const char *label);
+const iString * string_Command      (const char *, const char *label); /* space-delimited */
+const char *    suffixPtr_Command   (const char *, const char *label); /* until end-of-command */
+iString *       suffix_Command      (const char *, const char *label); /* until end-of-command */
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 2a3a2509..9fdadc4c 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -38,6 +38,7 @@ struct Impl_DocumentWidget {
     iClick click;
     iScrollWidget *scroll;
     iWidget *menu;
+//    iWidget *userInput;
 };
 
 iDefineObjectConstruction(DocumentWidget)
@@ -64,6 +65,7 @@ void init_DocumentWidget(iDocumentWidget *d) {
                                        { "---", 0, 0, NULL },
                                        { "Reload", 'r', KMOD_PRIMARY, "navigate.reload" } },
                         4);
+//    setFlags_Widget(d->userInput, hidden_WidgetFlag | disabled_WidgetFlag, iTrue);
 }
 
 void deinit_DocumentWidget(iDocumentWidget *d) {
@@ -139,20 +141,27 @@ static void updateVisible_DocumentWidget_(iDocumentWidget *d) {
     render_GmDocument(d->doc, visRange, addVisibleLink_DocumentWidget_, d);
 }
 
-static void updateSource_DocumentWidget_(iDocumentWidget *d) {
-    /* TODO: Do this in the background. However, that requires a text metrics calculator
-       that does not try to cache the glyph bitmaps. */
-    iString str;
-    initBlock_String(&str, body_GmRequest(d->request));
-    setSource_GmDocument(d->doc, &str, documentWidth_DocumentWidget_(d));
-    deinit_String(&str);
-    updateVisible_DocumentWidget_(d);
-    refresh_Widget(as_Widget(d));
+static void updateWindowTitle_DocumentWidget_(const iDocumentWidget *d) {
     setTitle_Window(get_Window(),
                     !isEmpty_String(title_GmDocument(d->doc)) ? title_GmDocument(d->doc)
                                                               : collectNewCStr_String("Lagrange"));
 }
 
+static void updateSource_DocumentWidget_(iDocumentWidget *d) {
+    /* TODO: Do this in the background. However, that requires a text metrics calculator
+       that does not try to cache the glyph bitmaps. */
+    if (status_GmRequest(d->request) != input_GmStatusCode &&
+        status_GmRequest(d->request) != sensitiveInput_GmStatusCode) {
+        iString str;
+        initBlock_String(&str, body_GmRequest(d->request));
+        setSource_GmDocument(d->doc, &str, documentWidth_DocumentWidget_(d));
+        updateWindowTitle_DocumentWidget_(d);
+        updateVisible_DocumentWidget_(d);
+        refresh_Widget(as_Widget(d));
+        deinit_String(&str);
+    }
+}
+
 static void fetch_DocumentWidget_(iDocumentWidget *d) {
     /* Forget the previous request. */
     if (d->request) {
@@ -256,22 +265,80 @@ static const iString *absoluteUrl_DocumentWidget_(const iDocumentWidget *d, cons
     return collect_String(absolute);
 }
 
+static void showErrorPage_DocumentWidget_(iDocumentWidget *d, enum iGmStatusCode code) {
+    iWidget *w = as_Widget(d);
+    iString *src = collectNew_String();
+    const iGmError *msg = get_GmError(code);
+    format_String(src,
+                  "# %lc %s\n%s",
+                  msg->icon ? msg->icon : 0x2327, /* X in a box */
+                  msg->title,
+                  msg->info);
+    switch (code) {
+        case failedToOpenFile_GmStatusCode:
+        case certificateNotValid_GmStatusCode:
+            appendFormat_String(src, "\n\n%s", cstr_String(meta_GmRequest(d->request)));
+            break;
+        case slowDown_GmStatusCode:
+            appendFormat_String(src, "\n\nWait %s seconds before your next request.",
+                                cstr_String(meta_GmRequest(d->request)));
+            break;
+        default:
+            break;
+    }
+    setSource_GmDocument(d->doc, src, documentWidth_DocumentWidget_(d));
+    updateWindowTitle_DocumentWidget_(d);
+    updateVisible_DocumentWidget_(d);
+    refresh_Widget(w);
+}
+
 static void checkResponseCode_DocumentWidget_(iDocumentWidget *d) {
     if (d->state == fetching_DocumentState) {
         d->state = receivedPartialResponse_DocumentState;
         d->scrollY = 0;
         switch (status_GmRequest(d->request)) {
+            case none_GmStatusCode:
+            case success_GmStatusCode:
+                break;
+            case input_GmStatusCode:
+            case sensitiveInput_GmStatusCode: {
+                iUrl parts;
+                init_Url(&parts, d->url);
+                makeValueInput_Widget(
+                    as_Widget(d),
+                    NULL,
+                    cstrFormat_String(cyan_ColorEscape "%s",
+                                      cstr_String(collect_String(newRange_String(parts.host)))),
+                    isEmpty_String(meta_GmRequest(d->request))
+                        ? cstrFormat_String(
+                              "Please enter input for %s:",
+                              cstr_String(collect_String(newRange_String(parts.path))))
+                        : cstr_String(meta_GmRequest(d->request)),
+                    orange_ColorEscape "Send \u21d2",
+                    "document.input.submit");
+                break;
+            }
             case redirectTemporary_GmStatusCode:
             case redirectPermanent_GmStatusCode:
-                postCommandf_App("open redirect:1 url:%s", cstr_String(meta_GmRequest(d->request)));
-                iReleasePtr(&d->request);
+                if (isEmpty_String(meta_GmRequest(d->request))) {
+                    showErrorPage_DocumentWidget_(d, invalidRedirect_GmStatusCode);
+                }
+                else {
+                    postCommandf_App("open redirect:1 url:%s", cstr_String(meta_GmRequest(d->request)));
+                    iReleasePtr(&d->request);
+                }
                 break;
             default:
+                showErrorPage_DocumentWidget_(d, status_GmRequest(d->request));
                 break;
         }
     }
 }
 
+const iString *valueString_Command(const char *cmd, const char *label) {
+    return collect_String(newCStr_String(suffixPtr_Command(cmd, label)));
+}
+
 static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *ev) {
     iWidget *w = as_Widget(d);
     if (isResize_UserEvent(ev)) {
@@ -279,6 +346,25 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
         updateVisible_DocumentWidget_(d);
         refresh_Widget(w);
     }
+    else if (isCommand_UserEvent(ev, "document.input.submit")) {
+        iString *value = collect_String(suffix_Command(command_UserEvent(ev), "value"));
+        urlEncode_String(value);
+        iString *url = collect_String(copy_String(d->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_App("open url:%s", cstr_String(url));
+        return iTrue;
+    }
+    else if (isCommand_UserEvent(ev, "valueinput.cancelled") &&
+             cmp_String(string_Command(command_UserEvent(ev), "id"), "document.input.submit") ==
+                 0) {
+        postCommand_App("navigate.back");
+        return iTrue;
+    }
     else if (isCommand_Widget(w, ev, "document.request.updated") &&
              pointerLabel_Command(command_UserEvent(ev), "request") == d->request) {
         updateSource_DocumentWidget_(d);
@@ -325,6 +411,17 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                 updateVisible_DocumentWidget_(d);
                 refresh_Widget(w);
                 return iTrue;
+#if 0
+            case 't':
+                if (mods == KMOD_PRIMARY) {
+                    makeValueInput_Widget(get_Window()->root,
+                                          NULL,
+                                          cyan_ColorEscape "Input Needed",
+                                          "Give it!",
+                                          "document.input.submit");
+                }
+                return iTrue;
+#endif
             case SDLK_END:
                 d->scrollY = scrollMax_DocumentWidget_(d);
                 updateVisible_DocumentWidget_(d);
diff --git a/src/ui/macos.m b/src/ui/macos.m
index f7c49547..b50fbf38 100644
--- a/src/ui/macos.m
+++ b/src/ui/macos.m
@@ -407,7 +407,7 @@ void handleCommand_MacOS(const char *cmd) {
 #if 0
     if (equal_Command(cmd, "tabs.changed")) {
         MyDelegate *myDel = (MyDelegate *) [[NSApplication sharedApplication] delegate];
-        const char *tabId = valuePtr_Command(cmd, "id");
+        const char *tabId = suffixPtr_Command(cmd, "id");
         if (equal_CStr(tabId, "tracker")) {
             [myDel setTouchBarVariant:tracker_TouchBarVariant];
         }
diff --git a/src/ui/util.c b/src/ui/util.c
index c468ba2b..cf75a2b0 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -426,10 +426,8 @@ iWidget *makeSheet_Widget(const char *id) {
     setId_Widget(sheet, id);
     setFrameColor_Widget(sheet, black_ColorId);
     setBackgroundColor_Widget(sheet, gray25_ColorId);
-    setFlags_Widget(sheet,
-                    keepOnTop_WidgetFlag | arrangeVertical_WidgetFlag |
-                        arrangeHeight_WidgetFlag,
-                    iTrue);
+    setFlags_Widget(
+        sheet, keepOnTop_WidgetFlag | arrangeVertical_WidgetFlag | arrangeHeight_WidgetFlag, iTrue);
     const iInt2 rootSize = rootSize_Window(get_Window());
     setSize_Widget(sheet, init_I2(rootSize.x / 2, 0));
     setFlags_Widget(sheet, fixedHeight_WidgetFlag, iFalse);
@@ -440,6 +438,7 @@ void centerSheet_Widget(iWidget *sheet) {
     arrange_Widget(sheet);
     const iInt2 rootSize = rootSize_Window(get_Window());
     sheet->rect.pos.x = rootSize.x / 2 - sheet->rect.size.x / 2;
+    postRefresh_App();
 }
 
 void makeFilePath_Widget(iWidget *      parent,
@@ -479,19 +478,38 @@ static void acceptValueInput_(iWidget *dlg) {
                      cstr_String(val));
 }
 
+static void updateValueInputWidth_(iWidget *dlg) {
+    const iInt2 rootSize = rootSize_Window(get_Window());
+    iWidget *   title    = findChild_Widget(dlg, "valueinput.title");
+    iWidget *   prompt   = findChild_Widget(dlg, "valueinput.prompt");
+    dlg->rect.size.x     = iMaxi(iMaxi(rootSize.x / 2, title->rect.size.x), prompt->rect.size.x);
+    as_Widget(findChild_Widget(dlg, "input"))->rect.size.x = dlg->rect.size.x;
+    centerSheet_Widget(dlg);
+}
+
 iBool valueInputHandler_(iWidget *dlg, const char *cmd) {
     iWidget *ptr = as_Widget(pointer_Command(cmd));
+    if (equal_Command(cmd, "window.resized")) {
+        if (isVisible_Widget(dlg)) {
+            updateValueInputWidth_(dlg);
+        }
+        return iFalse;
+    }
     if (equal_Command(cmd, "input.ended")) {
         if (hasParent_Widget(ptr, dlg)) {
             if (arg_Command(cmd)) {
                 acceptValueInput_(dlg);
             }
+            else {
+                postCommandf_App("valueinput.cancelled id:%s", cstr_String(id_Widget(dlg)));
+            }
             destroy_Widget(dlg);
             return iTrue;
         }
         return iFalse;
     }
     else if (equal_Command(cmd, "cancel")) {
+        postCommandf_App("valueinput.cancelled id:%s", cstr_String(id_Widget(dlg)));
         destroy_Widget(dlg);
         return iTrue;
     }
@@ -504,32 +522,48 @@ iBool valueInputHandler_(iWidget *dlg, const char *cmd) {
 }
 
 iWidget *makeValueInput_Widget(iWidget *parent, const iString *initialValue, const char *title,
-                               const char *prompt, const char *command) {
-    setFocus_Widget(NULL);
-    processEvents_App(postedEventsOnly_AppEventMode);
+                               const char *prompt, const char *acceptLabel, const char *command) {
+    if (parent) {
+        setFocus_Widget(NULL);
+        processEvents_App(postedEventsOnly_AppEventMode);
+    }
     iWidget *dlg = makeSheet_Widget(command);
     setCommandHandler_Widget(dlg, valueInputHandler_);
-    addChild_Widget(parent, iClob(dlg));
-    addChild_Widget(dlg, iClob(new_LabelWidget(title, 0, 0, NULL)));
-    addChild_Widget(dlg, iClob(new_LabelWidget(prompt, 0, 0, NULL)));
+    if (parent) {
+        addChild_Widget(parent, iClob(dlg));
+    }
+    setId_Widget(addChild_Widget(dlg, iClob(new_LabelWidget(title, 0, 0, NULL))), "valueinput.title");
+    setId_Widget(addChild_Widget(dlg, iClob(new_LabelWidget(prompt, 0, 0, NULL))), "valueinput.prompt");
     iInputWidget *input = addChild_Widget(dlg, iClob(new_InputWidget(0)));
     if (initialValue) {
         setText_InputWidget(input, initialValue);
     }
     setId_Widget(as_Widget(input), "input");
-    as_Widget(input)->rect.size.x = dlg->rect.size.x;
+    updateValueInputWidth_(dlg);
     addChild_Widget(dlg, iClob(makePadding_Widget(gap_UI)));
     iWidget *div = new_Widget(); {
         setFlags_Widget(div, arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag, iTrue);
         addChild_Widget(div, iClob(new_LabelWidget("Cancel", SDLK_ESCAPE, 0, "cancel")));
-        addChild_Widget(div, iClob(new_LabelWidget(cyan_ColorEscape "OK", SDLK_RETURN, 0, "valueinput.accept")));
+        addChild_Widget(div,
+                        iClob(new_LabelWidget(acceptLabel ? acceptLabel : cyan_ColorEscape "OK",
+                                              SDLK_RETURN,
+                                              0,
+                                              "valueinput.accept")));
     }
     addChild_Widget(dlg, iClob(div));
     centerSheet_Widget(dlg);
-    setFocus_Widget(as_Widget(input));
+    if (parent) {
+        setFocus_Widget(as_Widget(input));
+    }
     return dlg;
 }
 
+void updateValueInput_Widget(iWidget *d, const char *title, const char *prompt) {
+    setTextCStr_LabelWidget(findChild_Widget(d, "valueinput.title"), title);
+    setTextCStr_LabelWidget(findChild_Widget(d, "valueinput.prompt"), prompt);
+    updateValueInputWidth_(d);
+}
+
 static iBool messageHandler_(iWidget *msg, const char *cmd) {
     /* Any command dismisses the sheet. */
     iUnused(cmd);
diff --git a/src/ui/util.h b/src/ui/util.h
index 3181ea3f..a23f84c1 100644
--- a/src/ui/util.h
+++ b/src/ui/util.h
@@ -111,7 +111,8 @@ void        centerSheet_Widget      (iWidget *sheet);
 void        makeFilePath_Widget     (iWidget *parent, const iString *initialPath, const char *title,
                                      const char *acceptLabel, const char *command);
 iWidget *   makeValueInput_Widget   (iWidget *parent, const iString *initialValue, const char *title,
-                                     const char *prompt, const char *command);
+                                     const char *prompt, const char *acceptLabel, const char *command);
+void        updateValueInput_Widget (iWidget *, const char *title, const char *prompt);
 void        makeMessage_Widget      (const char *title, const char *msg);
 iWidget *   makeQuestion_Widget     (const char *title, const char *msg,
                                      const char *labels[], const char *commands[], size_t count);
diff --git a/src/ui/window.c b/src/ui/window.c
index e9ed8d61..e4ee2799 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -74,8 +74,8 @@ static const iMenuItem editMenuItems[] = {
 static const iMenuItem viewMenuItems[] = {
 };
 
-static const char *reloadCStr_ = "\u25cb";
-static const char *stopCStr_   = orange_ColorEscape "\u00d7";
+static const char *reloadCStr_ = "\U0001f503";
+static const char *stopCStr_   = orange_ColorEscape "\U0001f310";
 
 static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
     if (equal_Command(cmd, "input.ended")) {
@@ -87,7 +87,7 @@ static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
     }
     else if (equal_Command(cmd, "document.changed")) {
         iInputWidget *url = findWidget_App("url");
-        setTextCStr_InputWidget(url, valuePtr_Command(cmd, "url"));
+        setTextCStr_InputWidget(url, suffixPtr_Command(cmd, "url"));
         updateTextCStr_LabelWidget(findChild_Widget(navBar, "reload"), reloadCStr_);
         return iFalse;
     }
@@ -100,7 +100,7 @@ static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
         if (isFocused_Widget(as_Widget(url))) {
             setFocus_Widget(NULL);
         }
-        setTextCStr_InputWidget(url, valuePtr_Command(cmd, "url"));
+        setTextCStr_InputWidget(url, suffixPtr_Command(cmd, "url"));
         updateTextCStr_LabelWidget(findChild_Widget(navBar, "reload"), stopCStr_);
         return iFalse;
     }
@@ -139,7 +139,7 @@ static void setupUserInterface_Window(iWindow *d) {
 
         addChild_Widget(navBar, iClob(new_LabelWidget(" \u25c4 ", 0, 0, "navigate.back")));
         addChild_Widget(navBar, iClob(new_LabelWidget(" \u25ba ", 0, 0, "navigate.forward")));
-        addChild_Widget(navBar, iClob(new_LabelWidget("Home", 0, 0, "navigate.home")));
+        addChild_Widget(navBar, iClob(new_LabelWidget("\U0001f3e0", 0, 0, "navigate.home")));
         iInputWidget *url = new_InputWidget(0);
         setId_Widget(as_Widget(url), "url");
         setTextCStr_InputWidget(url, "gemini://");