5 files changed, 150 insertions, 18 deletions

diff --git a/src/gmdocument.c b/src/gmdocument.c
index f1f63b29..3192acd5 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -232,8 +232,9 @@ static void doLayout_GmDocument_(iGmDocument *d) {
         if (!isPreformat || (prevType != preformatted_GmLineType)) {
             int required =
                 iMax(topMargin[type], bottomMargin[prevType]) * lineHeight_Text(paragraph_FontId);
-            if (type == link_GmLineType && prevType == link_GmLineType) {
-                /* No margin between consecutive links. */
+            if ((type == link_GmLineType && prevType == link_GmLineType) ||
+                (type == quote_GmLineType && prevType == quote_GmLineType)) {
+                /* No margin between consecutive links/quote lines. */
                 required = 0;
             }
             if (isEmpty_Array(&d->layout)) {
@@ -399,6 +400,17 @@ iInt2 size_GmDocument(const iGmDocument *d) {
     return d->size;
 }
 
+iRangecc findText_GmDocument(const iGmDocument *d, const iString *text, const char *start) {
+    const char * src      = constBegin_String(&d->source);
+    const size_t startPos = (start ? start - src : 0);
+    const size_t pos =
+        indexOfCStrFromSc_String(&d->source, cstr_String(text), startPos, &iCaseInsensitive);
+    if (pos == iInvalidPos) {
+        return iNullRange;
+    }
+    return (iRangecc){ src + pos, src + pos + size_String(text) };
+}
+
 const iGmRun *findRun_GmDocument(const iGmDocument *d, iInt2 pos) {
     /* TODO: Perf optimization likely needed; use a block map? */
     iConstForEach(Array, i, &d->layout) {
@@ -410,6 +422,16 @@ const iGmRun *findRun_GmDocument(const iGmDocument *d, iInt2 pos) {
     return NULL;
 }
 
+const iGmRun *findRunCStr_GmDocument(const iGmDocument *d, const char *textCStr) {
+    iConstForEach(Array, i, &d->layout) {
+        const iGmRun *run = i.value;
+        if (contains_Range(&run->text, textCStr) || run->text.start > textCStr /* went past */) {
+            return run;
+        }
+    }
+    return NULL;
+}
+
 const iString *linkUrl_GmDocument(const iGmDocument *d, iGmLinkId linkId) {
     if (linkId > 0 && linkId <= size_PtrArray(&d->links)) {
         const iGmLink *link = constAt_PtrArray(&d->links, linkId - 1);
diff --git a/src/gmdocument.h b/src/gmdocument.h
index 22e614ea..01ade5d3 100644
--- a/src/gmdocument.h
+++ b/src/gmdocument.h
@@ -28,6 +28,8 @@ typedef void (*iGmDocumentRenderFunc)(void *, const iGmRun *);
 void    render_GmDocument       (const iGmDocument *, iRangei visRangeY, iGmDocumentRenderFunc render, void *);
 iInt2   size_GmDocument         (const iGmDocument *);
 
-const iGmRun *  findRun_GmDocument  (const iGmDocument *, iInt2 pos);
-const iString * linkUrl_GmDocument  (const iGmDocument *, iGmLinkId linkId);
-const iString * title_GmDocument    (const iGmDocument *);
+iRangecc        findText_GmDocument     (const iGmDocument *, const iString *text, const char *start);
+const iGmRun *  findRun_GmDocument      (const iGmDocument *, iInt2 pos);
+const iGmRun *  findRunCStr_GmDocument  (const iGmDocument *, const char *textCStr);
+const iString * linkUrl_GmDocument      (const iGmDocument *, iGmLinkId linkId);
+const iString * title_GmDocument        (const iGmDocument *);
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 5df2b1b9..f7bfa39f 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -32,6 +32,7 @@ struct Impl_DocumentWidget {
     iGmRequest *request;
     iAtomicInt isSourcePending; /* request has new content, need to parse it */
     iGmDocument *doc;
+    iRangecc foundMark;
     int pageMargin;
     int scrollY;
     iPtrArray visibleLinks;
@@ -47,14 +48,15 @@ void init_DocumentWidget(iDocumentWidget *d) {
     iWidget *w = as_Widget(d);
     init_Widget(w);
     setId_Widget(w, "document");
-    d->state      = blank_DocumentState;
-    d->url        = new_String();
-    d->request    = NULL;
+    d->state           = blank_DocumentState;
+    d->url             = new_String();
+    d->request         = NULL;
     d->isSourcePending = iFalse;
-    d->doc        = new_GmDocument();
-    d->pageMargin = 5;
-    d->scrollY    = 0;
-    d->hoverLink  = NULL;
+    d->doc             = new_GmDocument();
+    d->foundMark       = iNullRange;
+    d->pageMargin      = 5;
+    d->scrollY         = 0;
+    d->hoverLink       = NULL;
     init_PtrArray(&d->visibleLinks);
     init_Click(&d->click, d, SDL_BUTTON_LEFT);
     addChild_Widget(w, iClob(d->scroll = new_ScrollWidget()));
@@ -150,10 +152,11 @@ 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) {
+        status_GmRequest(d->request) != sensitiveInput_GmStatusCode) {        
         iString str;
         initBlock_String(&str, body_GmRequest(d->request));
         setSource_GmDocument(d->doc, &str, documentWidth_DocumentWidget_(d));
+        d->foundMark = iNullRange;
         updateWindowTitle_DocumentWidget_(d);
         updateVisible_DocumentWidget_(d);
         refresh_Widget(as_Widget(d));
@@ -211,6 +214,11 @@ static void scroll_DocumentWidget_(iDocumentWidget *d, int offset) {
     refresh_Widget(as_Widget(d));
 }
 
+static void scrollTo_DocumentWidget_(iDocumentWidget *d, int documentY) {
+    d->scrollY = documentY - documentBounds_DocumentWidget_(d).size.y / 2;
+    scroll_DocumentWidget_(d, 0); /* clamp it */
+}
+
 static iRangecc dirPath_(iRangecc path) {
     const size_t pos = lastIndexOfCStr_Rangecc(&path, "/");
     if (pos == iInvalidPos) return path;
@@ -285,6 +293,7 @@ static void showErrorPage_DocumentWidget_(iDocumentWidget *d, enum iGmStatusCode
         default:
             break;
     }
+    d->foundMark = iNullRange;
     setSource_GmDocument(d->doc, src, documentWidth_DocumentWidget_(d));
     updateWindowTitle_DocumentWidget_(d);
     updateVisible_DocumentWidget_(d);
@@ -408,6 +417,34 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
             d, arg_Command(command_UserEvent(ev)) * height_Rect(documentBounds_DocumentWidget_(d)));
         return iTrue;
     }
+    else if (isCommand_UserEvent(ev, "find.next")) {
+        iInputWidget *find = findWidget_App("find.input");
+        if (isEmpty_String(text_InputWidget(find))) {
+            d->foundMark = iNullRange;
+        }
+        else {
+            const iBool wrap = d->foundMark.start != NULL;
+            d->foundMark = findText_GmDocument(d->doc, text_InputWidget(find), d->foundMark.end);
+            if (!d->foundMark.start && wrap) {
+                d->foundMark = findText_GmDocument(d->doc, text_InputWidget(find), 0);
+            }
+            if (d->foundMark.start) {
+                iGmRun *run = findRunCStr_GmDocument(d->doc, d->foundMark.start);
+                if (run) {
+                    scrollTo_DocumentWidget_(d, mid_Rect(run->bounds).y);
+                }
+            }
+        }
+        refresh_Widget(w);
+        return iTrue;
+    }
+    else if (isCommand_UserEvent(ev, "find.clearmark")) {
+        if (d->foundMark.start) {
+            d->foundMark = iNullRange;
+            refresh_Widget(w);
+        }
+        return iTrue;
+    }
     if (ev->type == SDL_KEYDOWN) {
         const int mods = keyMods_Sym(ev->key.keysym.mod);
         const int key = ev->key.keysym.sym;
@@ -493,6 +530,7 @@ struct Impl_DrawContext {
     const iDocumentWidget *widget;
     iRect bounds;
     iPaint paint;
+    int insideMark;
 };
 
 static void drawRun_DrawContext_(void *context, const iGmRun *run) {
@@ -501,10 +539,55 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
     /* TODO: making a copy is unnecessary; the text routines should accept Rangecc */
     initRange_String(&text, run->text);
     iInt2 origin = addY_I2(d->bounds.pos, -d->widget->scrollY);
-    drawString_Text(run->font, add_I2(run->bounds.pos, origin), run->color, &text);
     if (run == d->widget->hoverLink) {
-        drawRect_Paint(&d->paint, moved_Rect(run->bounds, origin), orange_ColorId);
+        const char *desc = "";
+        const iString *url = linkUrl_GmDocument(d->widget->doc, d->widget->hoverLink->linkId);
+        if (indexOfCStr_String(url, "://") == iInvalidPos) {
+            url = d->widget->url;
+        }
+        iUrl parts;
+        init_Url(&parts, url);
+        desc = cstrFormat_String("\u2192 %s", cstr_String(collect_String(newRange_String(parts.protocol))));
+        int descWidth = measure_Text(default_FontId, desc).x + gap_UI;
+        iRect linkRect = expanded_Rect(moved_Rect(run->bounds, origin), init_I2(gap_UI, 0));
+        linkRect.size.x += descWidth;
+        fillRect_Paint(&d->paint,
+                       linkRect,
+                       teal_ColorId);
+        drawAlign_Text(default_FontId,
+                       addX_I2(topRight_Rect(linkRect), -gap_UI),
+                       cyan_ColorId,
+                       right_Alignment,
+                       "%s",
+                       desc);
+    }
+    const iInt2 visPos = add_I2(run->bounds.pos, origin);
+    /* Found text marker. */
+    if ((!d->insideMark && contains_Range(&run->text, d->widget->foundMark.start)) ||
+        d->insideMark) {
+        int x = 0;
+        if (!d->insideMark) {
+            x = advanceRange_Text(run->font, (iRangecc){ run->text.start,
+                                                         d->widget->foundMark.start }).x;
+        }
+        int w = width_Rect(run->bounds) - x;
+        if (contains_Range(&run->text, d->widget->foundMark.end) ||
+            run->text.end == d->widget->foundMark.end) {
+            w = advanceRange_Text(run->font,
+                                  !d->insideMark
+                                      ? d->widget->foundMark
+                                      : (iRangecc){ run->text.start, d->widget->foundMark.end })
+                    .x;
+            d->insideMark = iFalse;
+        }
+        else {
+            d->insideMark = iTrue; /* at least until the next run */
+        }
+        fillRect_Paint(&d->paint,
+                       (iRect){ addX_I2(visPos, x), init_I2(w, height_Rect(run->bounds)) },
+                       teal_ColorId);
     }
+    drawString_Text(run->font, visPos, run->color, &text);
     deinit_String(&text);
 }
 
diff --git a/src/ui/widget.h b/src/ui/widget.h
index 3155d6df..48b796bc 100644
--- a/src/ui/widget.h
+++ b/src/ui/widget.h
@@ -74,18 +74,22 @@ struct Impl_Widget {
 iDeclareObjectConstruction(Widget)
 
 iLocalDef iWidget *as_Widget(iAnyObject *d) {
+#if !defined (NDEBUG)
     if (d) {
         iAssertIsObject(d);
         iAssert(isInstance_Object(d, &Class_Widget));
     }
+#endif
     return (iWidget *) d;
 }
 
 iLocalDef const iWidget *constAs_Widget(const iAnyObject *d) {
+#if !defined (NDEBUG)
     if (d) {
         iAssertIsObject(d);
         iAssert(isInstance_Object(d, &Class_Widget));
     }
+#endif
     return (const iWidget *) d;
 }
 
diff --git a/src/ui/window.c b/src/ui/window.c
index 5293b55b..e340e305 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -117,6 +117,24 @@ static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
     return iFalse;
 }
 
+static iBool handleSearchBarCommands_(iWidget *searchBar, const char *cmd) {
+    if (equal_Command(cmd, "input.ended") &&
+        cmp_String(string_Command(cmd, "id"), "find.input") == 0) {
+        if (arg_Command(cmd)) {
+            postCommand_App("find.next");
+            /* Keep focus. */
+            if (!isEmpty_String(text_InputWidget(findChild_Widget(searchBar, "find.input")))) {
+                postCommand_App("focus.set id:find.input");
+            }
+        }
+        else {
+            postCommand_App("find.clearmark");
+        }
+        return iTrue;
+    }
+    return iFalse;
+}
+
 static void setupUserInterface_Window(iWindow *d) {
     /* Children of root cover the entire window. */
     setFlags_Widget(d->root, resizeChildren_WidgetFlag, iTrue);
@@ -134,8 +152,8 @@ static void setupUserInterface_Window(iWindow *d) {
                             arrangeHorizontal_WidgetFlag,
                         iTrue);
         addChild_Widget(div, iClob(navBar));
-        setCommandHandler_Widget(navBar, handleNavBarCommands_);
         setBackgroundColor_Widget(navBar, gray25_ColorId);
+        setCommandHandler_Widget(navBar, handleNavBarCommands_);
 
         addChild_Widget(navBar, iClob(new_LabelWidget(" \u25c4 ", 0, 0, "navigate.back")));
         addChild_Widget(navBar, iClob(new_LabelWidget(" \u25ba ", 0, 0, "navigate.forward")));
@@ -160,9 +178,11 @@ static void setupUserInterface_Window(iWindow *d) {
                         iTrue);
         addChild_Widget(div, iClob(searchBar));
         setBackgroundColor_Widget(searchBar, gray25_ColorId);
+        setCommandHandler_Widget(searchBar, handleSearchBarCommands_);
 
-        addChild_Widget(searchBar, iClob(new_LabelWidget("\U0001f50d Find:", 0, 0, NULL)));
-        addChildFlags_Widget(searchBar, iClob(new_InputWidget(0)), expand_WidgetFlag);
+        addChild_Widget(searchBar, iClob(new_LabelWidget("\U0001f50d Text", 0, 0, NULL)));
+        setId_Widget(addChildFlags_Widget(searchBar, iClob(new_InputWidget(0)), expand_WidgetFlag),
+                     "find.input");
         addChild_Widget(searchBar, iClob(new_LabelWidget("Next", 0, 0, "find.next")));
         addChild_Widget(searchBar, iClob(new_LabelWidget("Previous", 0, 0, "find.prev")));
         addChild_Widget(searchBar, iClob(new_LabelWidget("\u00d7", 0, 0, "find.close")));
@@ -320,6 +340,7 @@ static void setupUserInterface_Window(iWindow *d) {
     /* Glboal keyboard shortcuts. */ {
         // addAction_Widget(d->root, SDLK_LEFTBRACKET, KMOD_SHIFT | KMOD_PRIMARY, "tabs.prev");
         addAction_Widget(d->root, 'l', KMOD_PRIMARY, "focus.set id:url");
+        addAction_Widget(d->root, 'f', KMOD_PRIMARY, "focus.set id:find.input");
     }
 }