6 files changed, 178 insertions, 55 deletions

diff --git a/src/gmdocument.c b/src/gmdocument.c
index f8998c17..4a3f8e06 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -33,12 +33,16 @@ iDefineTypeConstruction(GmLink)
 iDeclareType(GmImage)
 
 struct Impl_GmImage {
-    iInt2 size;
+    iInt2        size;
+    size_t       numBytes;
+    iString      mime;
+    iGmLinkId    linkId;
     SDL_Texture *texture;
-    iGmLinkId linkId;
 };
 
 void init_GmImage(iGmImage *d, const iBlock *data) {
+    init_String(&d->mime);
+    d->numBytes = size_Block(data);
     uint8_t *imgData = stbi_load_from_memory(
         constData_Block(data), size_Block(data), &d->size.x, &d->size.y, NULL, 4);
     if (!imgData) {
@@ -60,6 +64,7 @@ void init_GmImage(iGmImage *d, const iBlock *data) {
 
 void deinit_GmImage(iGmImage *d) {
     SDL_DestroyTexture(d->texture);
+    deinit_String(&d->mime);
 }
 
 iDefineTypeConstructionArgs(GmImage, (const iBlock *data), data)
@@ -379,6 +384,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
             if (link->flags & remote_GmLinkFlag) {
                 run.visBounds.pos.x -= gap_UI / 2;
             }
+
             run.color = linkColor_GmDocument(d, run.linkId);
             pushBack_Array(&d->layout, &run);
         }
@@ -429,18 +435,29 @@ static void doLayout_GmDocument_(iGmDocument *d) {
         if (type == link_GmLineType) {
             const size_t imgIndex = findLinkImage_GmDocument_(d, run.linkId);
             if (imgIndex != iInvalidPos) {
+                ((iGmLink *) at_PtrArray(&d->links, run.linkId - 1))->flags |= content_GmLinkFlag;
                 const iGmImage *img = constAt_PtrArray(&d->images, imgIndex);
+                const int margin = 0.5f * lineHeight_Text(paragraph_FontId);
+                pos.y += margin;
                 run.bounds.pos = pos;
                 run.bounds.size.x = d->size.x;
                 const float aspect = (float) img->size.y / (float) img->size.x;
                 run.bounds.size.y = d->size.x * aspect;
-                run.visBounds = run.bounds; /* TODO: limit max height? */
+                run.visBounds = run.bounds;
+                const iInt2 maxSize = mulf_I2(img->size, get_Window()->pixelRatio);
+                if (width_Rect(run.visBounds) > maxSize.x) {
+                    /* Don't scale the image up. */
+                    run.visBounds.size.y = run.visBounds.size.y * maxSize.x / width_Rect(run.visBounds);
+                    run.visBounds.size.x = img->size.x;
+                    run.visBounds.pos.x = run.bounds.size.x / 2 - width_Rect(run.visBounds) / 2;
+                    run.bounds.size.y = run.visBounds.size.y;
+                }
                 run.text = iNullRange;
                 run.font = 0;
                 run.color = 0;
                 run.imageId = imgIndex + 1;
                 pushBack_Array(&d->layout, &run);
-                pos.y += run.bounds.size.y;
+                pos.y += run.bounds.size.y + margin;
             }
         }
         prevType = type;
@@ -559,17 +576,26 @@ void setSource_GmDocument(iGmDocument *d, const iString *source, int width) {
 }
 
 void setImage_GmDocument(iGmDocument *d, iGmLinkId linkId, const iString *mime, const iBlock *data) {
-    /* TODO: check if we know this MIME type */
-    /* Load the image. */ {
-        iGmImage *img = new_GmImage(data);
-        img->linkId = linkId; /* TODO: use a hash? */
-        if (img->texture) {
-            pushBack_PtrArray(&d->images, img);
-        }
-        else {
+    if (!mime || !data) {
+        iGmImage *img;
+        if (take_PtrArray(&d->images, findLinkImage_GmDocument_(d, linkId), (void **) &img)) {
             delete_GmImage(img);
         }
     }
+    else {
+        /* TODO: check if we know this MIME type */
+        /* Load the image. */ {
+            iGmImage *img = new_GmImage(data);
+            img->linkId = linkId; /* TODO: use a hash? */
+            set_String(&img->mime, mime);
+            if (img->texture) {
+                pushBack_PtrArray(&d->images, img);
+            }
+            else {
+                delete_GmImage(img);
+            }
+        }
+    }
     doLayout_GmDocument_(d);
 }
 
@@ -649,25 +675,34 @@ const iGmRun *findRunAtLoc_GmDocument(const iGmDocument *d, const char *textCStr
     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);
-        return &link->url;
+static const iGmLink *link_GmDocument_(const iGmDocument *d, iGmLinkId id) {
+    if (id > 0 && id <= size_PtrArray(&d->links)) {
+        return constAt_PtrArray(&d->links, id - 1);
     }
     return NULL;
 }
 
+const iString *linkUrl_GmDocument(const iGmDocument *d, iGmLinkId linkId) {
+    const iGmLink *link = link_GmDocument_(d, linkId);
+    return link ? &link->url : NULL;
+}
+
 int linkFlags_GmDocument(const iGmDocument *d, iGmLinkId linkId) {
-    if (linkId > 0 && linkId <= size_PtrArray(&d->links)) {
-        const iGmLink *link = constAt_PtrArray(&d->links, linkId - 1);
-        return link->flags;
+    const iGmLink *link = link_GmDocument_(d, linkId);
+    return link ? link->flags : 0;
+}
+
+uint16_t linkImage_GmDocument(const iGmDocument *d, iGmLinkId linkId) {
+    size_t index = findLinkImage_GmDocument_(d, linkId);
+    if (index != iInvalidPos) {
+        return index + 1;
     }
     return 0;
 }
 
 enum iColorId linkColor_GmDocument(const iGmDocument *d, iGmLinkId linkId) {
-    if (linkId > 0 && linkId <= size_PtrArray(&d->links)) {
-        const iGmLink *link = constAt_PtrArray(&d->links, linkId - 1);
+    const iGmLink *link = link_GmDocument_(d, linkId);
+    if (link) {
         return link->flags & http_GmLinkFlag
                    ? orange_ColorId
                    : link->flags & gopher_GmLinkFlag ? blue_ColorId : cyan_ColorId;
@@ -688,6 +723,18 @@ SDL_Texture *imageTexture_GmDocument(const iGmDocument *d, uint16_t imageId) {
     return NULL;
 }
 
+void imageInfo_GmDocument(const iGmDocument *d, uint16_t imageId, iGmImageInfo *info_out) {
+    if (imageId > 0 && imageId <= size_PtrArray(&d->images)) {
+        const iGmImage *img = constAt_PtrArray(&d->images, imageId - 1);
+        info_out->size = img->size;
+        info_out->numBytes = img->numBytes;
+        info_out->mime = cstr_String(&img->mime);
+    }
+    else {
+        iZap(*info_out);
+    }
+}
+
 const iString *title_GmDocument(const iGmDocument *d) {
     return &d->title;
 }
diff --git a/src/gmdocument.h b/src/gmdocument.h
index c619c47b..584efb5a 100644
--- a/src/gmdocument.h
+++ b/src/gmdocument.h
@@ -19,6 +19,15 @@ enum iGmLinkFlags {
     file_GmLinkFlag               = 0x10,
     imageFileExtension_GmLinkFlag = 0x20,
     audioFileExtension_GmLinkFlag = 0x40,
+    content_GmLinkFlag            = 0x80, /* content visible below */
+};
+
+iDeclareType(GmImageInfo)
+
+struct Impl_GmImageInfo {
+    iInt2 size;
+    size_t numBytes;
+    const char *mime;
 };
 
 struct Impl_GmRun {
@@ -61,9 +70,11 @@ const iGmRun *  findRun_GmDocument      (const iGmDocument *, iInt2 pos);
 const char *    findLoc_GmDocument      (const iGmDocument *, iInt2 pos);
 const iGmRun *  findRunAtLoc_GmDocument (const iGmDocument *, const char *loc);
 const iString * linkUrl_GmDocument      (const iGmDocument *, iGmLinkId linkId);
+uint16_t        linkImage_GmDocument    (const iGmDocument *, iGmLinkId linkId);
 int             linkFlags_GmDocument    (const iGmDocument *, iGmLinkId linkId);
 enum iColorId   linkColor_GmDocument    (const iGmDocument *, iGmLinkId linkId);
 iBool           isMediaLink_GmDocument  (const iGmDocument *, iGmLinkId linkId);
 const iString * title_GmDocument        (const iGmDocument *);
 
 SDL_Texture *   imageTexture_GmDocument (const iGmDocument *, uint16_t imageId);
+void            imageInfo_GmDocument    (const iGmDocument *, uint16_t imageId, iGmImageInfo *info_out);
diff --git a/src/ui/color.c b/src/ui/color.c
index 330dab1d..46d8a71f 100644
--- a/src/ui/color.c
+++ b/src/ui/color.c
@@ -30,6 +30,31 @@ iColor get_Color(int color) {
     return *clr;
 }
 
+const char *escape_Color(int color) {
+    static const char *esc[] = {
+        black_ColorEscape,
+        gray15_ColorEscape,
+        gray25_ColorEscape,
+        gray50_ColorEscape,
+        gray75_ColorEscape,
+        gray88_ColorEscape,
+        white_ColorEscape,
+        brown_ColorEscape,
+        orange_ColorEscape,
+        teal_ColorEscape,
+        cyan_ColorEscape,
+        yellow_ColorEscape,
+        red_ColorEscape,
+        magenta_ColorEscape,
+        blue_ColorEscape,
+        green_ColorEscape,
+    };
+    if (color >= 0 && color < max_ColorId) {
+        return esc[color];
+    }
+    return white_ColorEscape;
+}
+
 iColor ansi_Color(iRangecc escapeSequence, int fallback) {
     iColor clr = get_Color(fallback);
     for (const char *ch = escapeSequence.start; ch < escapeSequence.end; ch++) {
diff --git a/src/ui/color.h b/src/ui/color.h
index d8b1f4d1..01e49c9c 100644
--- a/src/ui/color.h
+++ b/src/ui/color.h
@@ -49,5 +49,6 @@ struct Impl_Color {
     uint8_t r, g, b, a;
 };
 
-iColor  get_Color   (int color);
-iColor  ansi_Color  (iRangecc escapeSequence, int fallback);
+iColor          get_Color       (int color);
+iColor          ansi_Color      (iRangecc escapeSequence, int fallback);
+const char *    escape_Color    (int color);
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index cffd284f..f63e98bf 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -497,13 +497,15 @@ static iMediaRequest *findMediaRequest_DocumentWidget_(const iDocumentWidget *d,
     return NULL;
 }
 
-static void requestMedia_DocumentWidget_(iDocumentWidget *d, iGmLinkId linkId) {
+static iBool requestMedia_DocumentWidget_(iDocumentWidget *d, iGmLinkId linkId) {
     if (!findMediaRequest_DocumentWidget_(d, linkId)) {
         pushBack_ObjectList(
             d->media,
             iClob(new_MediaRequest(
                 d, linkId, absoluteUrl_DocumentWidget_(d, linkUrl_GmDocument(d->doc, linkId)))));
+        return iTrue;
     }
+    return iFalse;
 }
 
 static iBool handleMediaEvent_DocumentWidget_(iDocumentWidget *d, const char *cmd) {
@@ -777,7 +779,26 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                     iAssert(linkId);
                     /* Media links are opened inline by default. */
                     if (isMediaLink_GmDocument(d->doc, linkId)) {
-                        requestMedia_DocumentWidget_(d, linkId);
+                        if (!requestMedia_DocumentWidget_(d, linkId)) {
+                            if (linkFlags_GmDocument(d->doc, linkId) & content_GmLinkFlag) {
+                                setImage_GmDocument(d->doc, linkId, NULL, NULL);
+                                d->hoverLink = NULL;
+                                updateVisible_DocumentWidget_(d);
+                                refresh_Widget(w);
+                                return iTrue;
+                            }
+                            else {
+                                /* Show the existing content again if we have it. */
+                                iMediaRequest *req = findMediaRequest_DocumentWidget_(d, linkId);
+                                if (req) {
+                                    setImage_GmDocument(d->doc, linkId, meta_GmRequest(req->req),
+                                                        body_GmRequest(req->req));
+                                    updateVisible_DocumentWidget_(d);
+                                    refresh_Widget(w);
+                                    return iTrue;
+                                }
+                            }
+                        }
                     }
                     else {
                         postCommandf_App("open url:%s",
@@ -840,8 +861,8 @@ static void fillRange_DrawContext_(iDrawContext *d, const iGmRun *run, enum iCol
 }
 
 static void drawRun_DrawContext_(void *context, const iGmRun *run) {
-    iDrawContext *d = context;
-    const iInt2 origin = addY_I2(d->bounds.pos, -d->widget->scrollY);
+    iDrawContext *d      = context;
+    const iInt2   origin = addY_I2(d->bounds.pos, -d->widget->scrollY);
     if (run->imageId) {
         SDL_Texture *tex = imageTexture_GmDocument(d->widget->doc, run->imageId);
         if (tex) {
@@ -854,32 +875,50 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
     iString text;
     /* TODO: making a copy is unnecessary; the text routines should accept Rangecc */
     initRange_String(&text, run->text);
-    enum iColorId fg = run->color;
-    if (run == d->widget->hoverLink) {
-        const iGmDocument *doc    = d->widget->doc;
-        const iGmLinkId    linkId = d->widget->hoverLink->linkId;
-        const iString *    url    = linkUrl_GmDocument(doc, linkId);
-        const int          flags  = linkFlags_GmDocument(doc, linkId);
-        iUrl parts;
-        init_Url(&parts, url);
-        const iString *host = collect_String(newRange_String(parts.host));
-        fg = linkColor_GmDocument(doc, linkId);
-        const iBool showHost = (!isEmpty_String(host) && flags & userFriendly_GmLinkFlag);
-        const iBool showImage = (flags & imageFileExtension_GmLinkFlag) != 0;
-        const iBool showAudio = (flags & audioFileExtension_GmLinkFlag) != 0;
-        if (flags & (imageFileExtension_GmLinkFlag | audioFileExtension_GmLinkFlag) || showHost) {
+    enum iColorId      fg  = run->color;
+    const iGmDocument *doc = d->widget->doc;
+    if (run->linkId) {
+        /* TODO: Visualize an ongoing media request. */
+        const int flags = linkFlags_GmDocument(doc, run->linkId);
+        if (flags & content_GmLinkFlag) {
+            fg = linkColor_GmDocument(doc, run->linkId);
+            if (!isEmpty_Rect(run->bounds)) {
+                iGmImageInfo info;
+                imageInfo_GmDocument(doc, linkImage_GmDocument(doc, run->linkId), &info);
+                drawAlign_Text(default_FontId,
+                               add_I2(topRight_Rect(run->bounds), origin),
+                               fg,
+                               right_Alignment,
+                               "%s \u2014 %d x %d \u2014 %.1fMB %s \u2715",
+                               info.mime, info.size.x, info.size.y, info.numBytes / 1.0e6f,
+                               run == d->widget->hoverLink ? white_ColorEscape : "");
+            }
+        }
+        else if (run == d->widget->hoverLink) {
+            const iGmLinkId    linkId = d->widget->hoverLink->linkId;
+            const iString *    url    = linkUrl_GmDocument(doc, linkId);
+            const int          flags  = linkFlags_GmDocument(doc, linkId);
+            iUrl parts;
+            init_Url(&parts, url);
+            const iString *host = collect_String(newRange_String(parts.host));
+            fg = linkColor_GmDocument(doc, linkId);
+            const iBool showHost = (!isEmpty_String(host) && flags & userFriendly_GmLinkFlag);
+            const iBool showImage = (flags & imageFileExtension_GmLinkFlag) != 0;
+            const iBool showAudio = (flags & audioFileExtension_GmLinkFlag) != 0;
             iRect linkRect = moved_Rect(run->visBounds, origin);
-            drawAlign_Text(default_FontId,
-                           topRight_Rect(linkRect),
-                           fg - 1,
-                           left_Alignment,
-                           " \u2014%s%s%s\r%c%s",
-                           showHost ? " " : "",
-                           showHost ? cstr_String(host) : "",
-                           showHost && (showImage || showAudio) ? " \u2014" : "",
-                           showImage || showAudio ? '0' + fg : ('0' + fg - 1),
-                           showImage ? " View Image \U0001f5bc"
-                                     : showAudio ? " Play Audio \U0001f3b5" : "");
+            if (flags & (imageFileExtension_GmLinkFlag | audioFileExtension_GmLinkFlag) || showHost) {
+                drawAlign_Text(default_FontId,
+                               topRight_Rect(linkRect),
+                               fg - 1,
+                               left_Alignment,
+                               " \u2014%s%s%s\r%c%s",
+                               showHost ? " " : "",
+                               showHost ? cstr_String(host) : "",
+                               showHost && (showImage || showAudio) ? " \u2014" : "",
+                               showImage || showAudio ? '0' + fg : ('0' + fg - 1),
+                               showImage ? " View Image \U0001f5bc"
+                                         : showAudio ? " Play Audio \U0001f3b5" : "");
+            }
         }
     }
     const iInt2 visPos = add_I2(run->visBounds.pos, origin);
diff --git a/src/ui/window.c b/src/ui/window.c
index a7291320..feb917ff 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -204,9 +204,9 @@ static void setupUserInterface_Window(iWindow *d) {
         iInputWidget *input = new_InputWidget(0);
         setId_Widget(addChildFlags_Widget(searchBar, iClob(input), expand_WidgetFlag),
                      "find.input");
-        addChild_Widget(searchBar, iClob(new_LabelWidget(" \U0001f86b ", 'g', KMOD_PRIMARY, "find.next")));
-        addChild_Widget(searchBar, iClob(new_LabelWidget(" \U0001f869 ", 'g', KMOD_PRIMARY | KMOD_SHIFT, "find.prev")));
-        addChild_Widget(searchBar, iClob(new_LabelWidget("\u00d7", SDLK_ESCAPE, 0, "find.close")));
+        addChild_Widget(searchBar, iClob(new_LabelWidget("  \U0001f86b  ", 'g', KMOD_PRIMARY, "find.next")));
+        addChild_Widget(searchBar, iClob(new_LabelWidget("  \U0001f869  ", 'g', KMOD_PRIMARY | KMOD_SHIFT, "find.prev")));
+        addChild_Widget(searchBar, iClob(new_LabelWidget("\u2715", SDLK_ESCAPE, 0, "find.close")));
     }
 
 #if 0