6 files changed, 317 insertions, 56 deletions

diff --git a/src/gmdocument.c b/src/gmdocument.c
index 3dbef514..f8998c17 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -3,10 +3,15 @@
 #include "ui/color.h"
 #include "ui/text.h"
 #include "ui/metrics.h"
+#include "ui/window.h"
 
 #include <the_Foundation/ptrarray.h>
 #include <the_Foundation/regexp.h>
 
+#include <SDL_hints.h>
+#include <SDL_render.h>
+#include <stb_image.h>
+
 iDeclareType(GmLink)
 
 struct Impl_GmLink {
@@ -25,6 +30,40 @@ void deinit_GmLink(iGmLink *d) {
 
 iDefineTypeConstruction(GmLink)
 
+iDeclareType(GmImage)
+
+struct Impl_GmImage {
+    iInt2 size;
+    SDL_Texture *texture;
+    iGmLinkId linkId;
+};
+
+void init_GmImage(iGmImage *d, const iBlock *data) {
+    uint8_t *imgData = stbi_load_from_memory(
+        constData_Block(data), size_Block(data), &d->size.x, &d->size.y, NULL, 4);
+    if (!imgData) {
+        d->size = zero_I2();
+        d->texture = NULL;
+    }
+    else {
+        SDL_Surface *surface = SDL_CreateRGBSurfaceWithFormatFrom(
+            imgData, d->size.x, d->size.y, 32, d->size.x * 4, SDL_PIXELFORMAT_ABGR8888);
+        /* TODO: In multiwindow case, all windows must have the same shared renderer?
+           Or at least a shared context. */
+        SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "1"); /* linear scaling */
+        d->texture = SDL_CreateTextureFromSurface(renderer_Window(get_Window()), surface);
+        SDL_FreeSurface(surface);
+        stbi_image_free(imgData);
+    }
+    d->linkId = 0;
+}
+
+void deinit_GmImage(iGmImage *d) {
+    SDL_DestroyTexture(d->texture);
+}
+
+iDefineTypeConstructionArgs(GmImage, (const iBlock *data), data)
+
 struct Impl_GmDocument {
     iObject object;
     enum iGmDocumentFormat format;
@@ -34,6 +73,7 @@ struct Impl_GmDocument {
     iArray layout; /* contents of source, laid out in document space */
     iPtrArray links;
     iString title; /* the first top-level title */
+    iPtrArray images; /* persistent across layouts, references links by ID */
 };
 
 iDefineObjectConstruction(GmDocument)
@@ -178,6 +218,17 @@ static void clearLinks_GmDocument_(iGmDocument *d) {
     clear_PtrArray(&d->links);
 }
 
+static size_t findLinkImage_GmDocument_(const iGmDocument *d, iGmLinkId linkId) {
+    /* TODO: use a hash */
+    iConstForEach(PtrArray, i, &d->images) {
+        const iGmImage *img = i.ptr;
+        if (img->linkId == linkId) {
+            return index_PtrArrayConstIterator(&i);
+        }
+    }
+    return iInvalidPos;
+}
+
 static void doLayout_GmDocument_(iGmDocument *d) {
     /* TODO: Collect these parameters into a GmTheme. */
     static const int fonts[max_GmLineType] = {
@@ -236,6 +287,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
         iGmRun run;
         run.color = white_ColorId;
         run.linkId = 0;
+        run.imageId = 0;
         enum iGmLineType type;
         int indent = 0;
         if (!isPreformat) {
@@ -373,6 +425,24 @@ static void doLayout_GmDocument_(iGmDocument *d) {
             trimStart_Rangecc(&runLine);
             pos.y += lineHeight_Text(run.font);
         }
+        /* Image content. */
+        if (type == link_GmLineType) {
+            const size_t imgIndex = findLinkImage_GmDocument_(d, run.linkId);
+            if (imgIndex != iInvalidPos) {
+                const iGmImage *img = constAt_PtrArray(&d->images, imgIndex);
+                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.text = iNullRange;
+                run.font = 0;
+                run.color = 0;
+                run.imageId = imgIndex + 1;
+                pushBack_Array(&d->layout, &run);
+                pos.y += run.bounds.size.y;
+            }
+        }
         prevType = type;
     }
     d->size.y = pos.y;
@@ -386,6 +456,7 @@ void init_GmDocument(iGmDocument *d) {
     init_Array(&d->layout, sizeof(iGmRun));
     init_PtrArray(&d->links);
     init_String(&d->title);
+    init_PtrArray(&d->images);
 }
 
 void deinit_GmDocument(iGmDocument *d) {
@@ -397,6 +468,16 @@ void deinit_GmDocument(iGmDocument *d) {
     deinit_String(&d->source);
 }
 
+void reset_GmDocument(iGmDocument *d) {
+    /* Free the loaded images. */
+    iForEach(PtrArray, i, &d->images) {
+        deinit_GmImage(i.ptr);
+    }
+    clear_PtrArray(&d->images);
+    clearLinks_GmDocument_(d);
+    clear_Array(&d->layout);
+}
+
 void setFormat_GmDocument(iGmDocument *d, enum iGmDocumentFormat format) {
     d->format = format;
 }
@@ -477,6 +558,21 @@ void setSource_GmDocument(iGmDocument *d, const iString *source, int width) {
     /* TODO: just flag need-layout and do it later */
 }
 
+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 {
+            delete_GmImage(img);
+        }
+    }
+    doLayout_GmDocument_(d);
+}
+
 void render_GmDocument(const iGmDocument *d, iRangei visRangeY, iGmDocumentRenderFunc render,
                        void *context) {
     iBool isInside = iFalse;
@@ -579,6 +675,19 @@ enum iColorId linkColor_GmDocument(const iGmDocument *d, iGmLinkId linkId) {
     return white_ColorId;
 }
 
+iBool isMediaLink_GmDocument(const iGmDocument *d, iGmLinkId linkId) {
+    return (linkFlags_GmDocument(d, linkId) &
+            (imageFileExtension_GmLinkFlag | audioFileExtension_GmLinkFlag)) != 0;
+}
+
+SDL_Texture *imageTexture_GmDocument(const iGmDocument *d, uint16_t imageId) {
+    if (imageId > 0 && imageId <= size_PtrArray(&d->images)) {
+        const iGmImage *img = constAt_PtrArray(&d->images, imageId - 1);
+        return img->texture;
+    }
+    return NULL;
+}
+
 const iString *title_GmDocument(const iGmDocument *d) {
     return &d->title;
 }
diff --git a/src/gmdocument.h b/src/gmdocument.h
index c671eaaf..c619c47b 100644
--- a/src/gmdocument.h
+++ b/src/gmdocument.h
@@ -5,6 +5,8 @@
 #include <the_Foundation/rect.h>
 #include <the_Foundation/string.h>
 
+#include <SDL_render.h>
+
 iDeclareType(GmRun)
 
 typedef uint16_t iGmLinkId;
@@ -20,12 +22,13 @@ enum iGmLinkFlags {
 };
 
 struct Impl_GmRun {
-    iRangecc text;
-    iRect bounds; /* used for hit testing, extends to edge */
-    iRect visBounds; /* actual text bounds */
-    uint8_t font;
-    uint8_t color;
-    iGmLinkId linkId; /* zero for non-links */
+    iRangecc  text;
+    uint8_t   font;
+    uint8_t   color;
+    iRect     bounds;    /* used for hit testing, may extend to edges */
+    iRect     visBounds; /* actual visual bounds */
+    iGmLinkId linkId;    /* zero for non-links */
+    uint16_t  imageId;   /* zero for images */
 };
 
 const char *    findLoc_GmRun   (const iGmRun *, iInt2 pos);
@@ -42,6 +45,9 @@ void    setFormat_GmDocument    (iGmDocument *, enum iGmDocumentFormat format);
 void    setWidth_GmDocument     (iGmDocument *, int width);
 void    setHost_GmDocument      (iGmDocument *, const iString *host); /* local host name */
 void    setSource_GmDocument    (iGmDocument *, const iString *source, int width);
+void    setImage_GmDocument     (iGmDocument *, iGmLinkId linkId, const iString *mime, const iBlock *data);
+
+void    reset_GmDocument        (iGmDocument *); /* free images */
 
 typedef void (*iGmDocumentRenderFunc)(void *, const iGmRun *);
 
@@ -57,4 +63,7 @@ const iGmRun *  findRunAtLoc_GmDocument (const iGmDocument *, const char *loc);
 const iString * linkUrl_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);
diff --git a/src/gmrequest.c b/src/gmrequest.c
index ad0c5ed7..25ff90af 100644
--- a/src/gmrequest.c
+++ b/src/gmrequest.c
@@ -163,8 +163,6 @@ static void requestFinished_GmRequest_(iAnyObject *obj) {
     }
     SDL_RemoveTimer(d->timeoutId);
     d->timeoutId = 0;
-//    iReleaseLater(d->req);
-//    d->req = NULL;
     d->state = finished_GmRequestState;
     unlock_Mutex(&d->mutex);
     iNotifyAudience(d, finished, GmRequestFinished);
@@ -193,6 +191,15 @@ void submit_GmRequest(iGmRequest *d) {
             else if (endsWithCase_String(path, ".txt")) {
                 setCStr_String(&d->header, "text/plain");
             }
+            else if (endsWithCase_String(path, ".png")) {
+                setCStr_String(&d->header, "image/png");
+            }
+            else if (endsWithCase_String(path, ".jpg") || endsWithCase_String(path, ".jpeg")) {
+                setCStr_String(&d->header, "image/jpeg");
+            }
+            else if (endsWithCase_String(path, ".gif")) {
+                setCStr_String(&d->header, "image/gif");
+            }
             else {
                 setCStr_String(&d->header, "application/octet-stream");
             }
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 10af43f3..cffd284f 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -11,6 +11,7 @@
 #include "../gmutil.h"
 
 #include <the_Foundation/file.h>
+#include <the_Foundation/objectlist.h>
 #include <the_Foundation/path.h>
 #include <the_Foundation/ptrarray.h>
 #include <the_Foundation/regexp.h>
@@ -26,13 +27,59 @@ enum iDocumentState {
     ready_DocumentState,
 };
 
+iDeclareClass(MediaRequest)
+
+struct Impl_MediaRequest {
+    iObject object;
+    iDocumentWidget *doc;
+    iGmLinkId linkId;
+    iGmRequest *req;
+    iAtomicInt isUpdated;
+};
+
+static void updated_MediaRequest_(iAnyObject *obj) {
+    iMediaRequest *d = obj;
+    int wasUpdated = exchange_Atomic(&d->isUpdated, iTrue);
+    if (!wasUpdated) {
+        postCommandf_App("media.updated link:%u request:%p", d->linkId, d);
+    }
+}
+
+static void finished_MediaRequest_(iAnyObject *obj) {
+    iMediaRequest *d = obj;
+    postCommandf_App("media.finished link:%u request:%p", d->linkId, d);
+}
+
+void init_MediaRequest(iMediaRequest *d, iDocumentWidget *doc, iGmLinkId linkId, const iString *url) {
+    d->doc    = doc;
+    d->linkId = linkId;
+    d->req    = new_GmRequest();
+    setUrl_GmRequest(d->req, url);
+    iConnect(GmRequest, d->req, updated, d, updated_MediaRequest_);
+    iConnect(GmRequest, d->req, finished, d, finished_MediaRequest_);
+    set_Atomic(&d->isUpdated, iFalse);
+    submit_GmRequest(d->req);
+}
+
+void deinit_MediaRequest(iMediaRequest *d) {
+    iDisconnect(GmRequest, d->req, updated, d, updated_MediaRequest_);
+    iDisconnect(GmRequest, d->req, finished, d, finished_MediaRequest_);
+    iRelease(d->req);
+}
+
+iDefineObjectConstructionArgs(MediaRequest,
+                              (iDocumentWidget *doc, iGmLinkId linkId, const iString *url),
+                              doc, linkId, url)
+iDefineClass(MediaRequest)
+
 struct Impl_DocumentWidget {
     iWidget widget;
     enum iDocumentState state;
     iString *url;
     iString *titleUser;
     iGmRequest *request;
-    iAtomicInt isSourcePending; /* request has new content, need to parse it */
+    iAtomicInt isRequestUpdated; /* request has new content, need to parse it */
+    iObjectList *media;
     iGmDocument *doc;
     iBool selecting;
     iRangecc selectMark;
@@ -55,21 +102,22 @@ 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->titleUser       = new_String();
-    d->request         = NULL;
-    d->isSourcePending = iFalse;
-    d->doc             = new_GmDocument();
-    d->selecting       = iFalse;
-    d->selectMark      = iNullRange;
-    d->foundMark       = iNullRange;
-    d->pageMargin      = 5;
-    d->scrollY         = 0;
-    d->hoverLink       = NULL;
-    d->arrowCursor     = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_ARROW);
-    d->beamCursor      = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_IBEAM);
-    d->handCursor      = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_HAND);
+    d->state            = blank_DocumentState;
+    d->url              = new_String();
+    d->titleUser        = new_String();
+    d->request          = NULL;
+    d->isRequestUpdated = iFalse;
+    d->media            = new_ObjectList();
+    d->doc              = new_GmDocument();
+    d->selecting        = iFalse;
+    d->selectMark       = iNullRange;
+    d->foundMark        = iNullRange;
+    d->pageMargin       = 5;
+    d->scrollY          = 0;
+    d->hoverLink        = NULL;
+    d->arrowCursor      = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_ARROW);
+    d->beamCursor       = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_IBEAM);
+    d->handCursor       = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_HAND);
     init_PtrArray(&d->visibleLinks);
     init_Click(&d->click, d, SDL_BUTTON_LEFT);
     addChild_Widget(w, iClob(d->scroll = new_ScrollWidget()));
@@ -85,16 +133,26 @@ void init_DocumentWidget(iDocumentWidget *d) {
 }
 
 void deinit_DocumentWidget(iDocumentWidget *d) {
+    iRelease(d->media);
+    iRelease(d->request);
+    iRelease(d->doc);
     deinit_PtrArray(&d->visibleLinks);
     delete_String(d->url);
     delete_String(d->titleUser);
-    iRelease(d->request);
-    iRelease(d->doc);
     SDL_FreeCursor(d->arrowCursor);
     SDL_FreeCursor(d->beamCursor);
     SDL_FreeCursor(d->handCursor);
 }
 
+static iString *cleanUrl_(const iString *url) {
+    iString *clean = copy_String(url);
+    if (indexOfCStr_String(url, "://") == iInvalidPos && !startsWithCase_String(url, "gemini:")) {
+        /* Prepend default protocol. */
+        prependCStr_String(clean, "gemini://");
+    }
+    return clean;
+}
+
 static int documentWidth_DocumentWidget_(const iDocumentWidget *d) {
     const iWidget *w = constAs_Widget(d);
     const iRect bounds = bounds_Widget(w);
@@ -124,8 +182,8 @@ static iInt2 documentPos_DocumentWidget_(const iDocumentWidget *d, iInt2 pos) {
 
 static void requestUpdated_DocumentWidget_(iAnyObject *obj) {
     iDocumentWidget *d = obj;
-    const int wasPending = exchange_Atomic(&d->isSourcePending, iTrue);
-    if (!wasPending) {
+    const int wasUpdated = exchange_Atomic(&d->isRequestUpdated, iTrue);
+    if (!wasUpdated) {
         postCommand_Widget(obj, "document.request.updated request:%p", d->request);
     }
 }
@@ -234,6 +292,10 @@ static void updateSource_DocumentWidget_(iDocumentWidget *d) {
             else if (startsWith_String(mime, "text/gemini")) {
                 setFormat_GmDocument(d->doc, gemini_GmDocumentFormat);
             }
+            else if (startsWith_String(mime, "image/")) {
+                /* TODO: Make a simple document with an image. */
+                clear_String(&str);
+            }
             else {
                 showErrorPage_DocumentWidget_(d, unsupportedMimeType_GmStatusCode);
                 deinit_String(&str);
@@ -252,8 +314,9 @@ static void fetch_DocumentWidget_(iDocumentWidget *d) {
         d->request = NULL;
     }
     postCommandf_App("document.request.started url:%s", cstr_String(d->url));
+    clear_ObjectList(d->media);
     d->state = fetching_DocumentState;
-    set_Atomic(&d->isSourcePending, iFalse);
+    set_Atomic(&d->isRequestUpdated, iFalse);
     d->request = new_GmRequest();
     setUrl_GmRequest(d->request, d->url);
     iConnect(GmRequest, d->request, updated, d, requestUpdated_DocumentWidget_);
@@ -262,12 +325,7 @@ static void fetch_DocumentWidget_(iDocumentWidget *d) {
 }
 
 void setUrl_DocumentWidget(iDocumentWidget *d, const iString *url) {
-    iString *newUrl = new_String();
-    if (indexOfCStr_String(url, "://") == iInvalidPos && !startsWithCase_String(url, "gemini:")) {
-        /* Prepend default protocol. */
-        setCStr_String(newUrl, "gemini://");
-    }
-    append_String(newUrl, url);
+    iString *newUrl = collect_String(cleanUrl_(url));
     if (cmpStringSc_String(d->url, newUrl, &iCaseInsensitive)) {
         set_String(d->url, newUrl);
         fetch_DocumentWidget_(d);
@@ -284,7 +342,6 @@ void setUrl_DocumentWidget(iDocumentWidget *d, const iString *url) {
             iRelease(userPats[i]);
         }
     }
-    delete_String(newUrl);
 }
 
 iBool isRequestOngoing_DocumentWidget(const iDocumentWidget *d) {
@@ -372,6 +429,7 @@ static void checkResponseCode_DocumentWidget_(iDocumentWidget *d) {
     if (d->state == fetching_DocumentState) {
         d->state = receivedPartialResponse_DocumentState;
         d->scrollY = 0;
+        reset_GmDocument(d->doc); /* new content incoming */
         enum iGmStatusCode statusCode = status_GmRequest(d->request);
         switch (statusCode) {
             case none_GmStatusCode:
@@ -384,10 +442,10 @@ static void checkResponseCode_DocumentWidget_(iDocumentWidget *d) {
                 iWidget *dlg = makeValueInput_Widget(
                     as_Widget(d),
                     NULL,
-                    cstrFormat_String(cyan_ColorEscape "%s",
+                    format_CStr(cyan_ColorEscape "%s",
                                       cstr_String(collect_String(newRange_String(parts.host)))),
                     isEmpty_String(meta_GmRequest(d->request))
-                        ? cstrFormat_String(
+                        ? format_CStr(
                               "Please enter input for %s:",
                               cstr_String(collect_String(newRange_String(parts.path))))
                         : cstr_String(meta_GmRequest(d->request)),
@@ -415,14 +473,73 @@ static void checkResponseCode_DocumentWidget_(iDocumentWidget *d) {
     }
 }
 
-const iString *valueString_Command(const char *cmd, const char *label) {
-    return collect_String(newCStr_String(suffixPtr_Command(cmd, label)));
-}
-
 static const char *sourceLoc_DocumentWidget_(const iDocumentWidget *d, iInt2 pos) {
     return findLoc_GmDocument(d->doc, documentPos_DocumentWidget_(d, pos));
 }
 
+static void removeMediaRequest_DocumentWidget_(iDocumentWidget *d, iGmLinkId linkId) {
+    iForEach(ObjectList, i, d->media) {
+        iMediaRequest *req = (iMediaRequest *) i.object;
+        if (req->linkId == linkId) {
+            remove_ObjectListIterator(&i);
+            break;
+        }
+    }
+}
+
+static iMediaRequest *findMediaRequest_DocumentWidget_(const iDocumentWidget *d, iGmLinkId linkId) {
+    iConstForEach(ObjectList, i, d->media) {
+        const iMediaRequest *req = (const iMediaRequest *) i.object;
+        if (req->linkId == linkId) {
+            return iConstCast(iMediaRequest *, req);
+        }
+    }
+    return NULL;
+}
+
+static void 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)))));
+    }
+}
+
+static iBool handleMediaEvent_DocumentWidget_(iDocumentWidget *d, const char *cmd) {
+    iMediaRequest *req = pointerLabel_Command(cmd, "request");
+    if (!req || req->doc != d) {
+        return iFalse; /* not our request */
+    }
+    if (equal_Command(cmd, "media.updated")) {
+        /* TODO: Show a progress indicator */
+        return iTrue;
+    }
+    else if (equal_Command(cmd, "media.finished")) {
+        const enum iGmStatusCode code = status_GmRequest(req->req);
+        /* Give the media to the document for presentation. */
+        if (code == success_GmStatusCode) {
+            printf("media finished: %s\n  size: %zu\n  type: %s\n",
+                   cstr_String(url_GmRequest(req->req)),
+                   size_Block(body_GmRequest(req->req)),
+                   cstr_String(meta_GmRequest(req->req)));
+            if (startsWith_String(meta_GmRequest(req->req), "image/")) {
+                setImage_GmDocument(d->doc, req->linkId, meta_GmRequest(req->req),
+                                    body_GmRequest(req->req));
+                updateVisible_DocumentWidget_(d);
+                refresh_Widget(as_Widget(d));
+            }
+        }
+        else {
+            const iGmError *err = get_GmError(code);
+            makeMessage_Widget(format_CStr(orange_ColorEscape "%s", err->title), err->info);
+            removeMediaRequest_DocumentWidget_(d, req->linkId);
+        }
+        return iTrue;
+    }
+    return iFalse;
+}
+
 static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *ev) {
     iWidget *w = as_Widget(d);
     if (isResize_UserEvent(ev)) {
@@ -499,6 +616,9 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
         }
         return iTrue;
     }
+    else if (isCommand_UserEvent(ev, "media.updated") || isCommand_UserEvent(ev, "media.finished")) {
+        return handleMediaEvent_DocumentWidget_(d, command_UserEvent(ev));
+    }
     else if (isCommand_UserEvent(ev, "document.reload")) {
         fetch_DocumentWidget_(d);
         return iTrue;
@@ -653,10 +773,17 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
         case finished_ClickResult:
             if (!isMoved_Click(&d->click)) {
                 if (d->hoverLink) {
-                    iAssert(d->hoverLink->linkId);
-                    postCommandf_App("open url:%s",
-                                     cstr_String(absoluteUrl_DocumentWidget_(
-                                         d, linkUrl_GmDocument(d->doc, d->hoverLink->linkId))));
+                    const iGmLinkId linkId = d->hoverLink->linkId;
+                    iAssert(linkId);
+                    /* Media links are opened inline by default. */
+                    if (isMediaLink_GmDocument(d->doc, linkId)) {
+                        requestMedia_DocumentWidget_(d, linkId);
+                    }
+                    else {
+                        postCommandf_App("open url:%s",
+                                         cstr_String(absoluteUrl_DocumentWidget_(
+                                             d, linkUrl_GmDocument(d->doc, linkId))));
+                    }
                 }
                 if (d->selectMark.start) {
                     d->selectMark = iNullRange;
@@ -714,20 +841,27 @@ 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);
+    if (run->imageId) {
+        SDL_Texture *tex = imageTexture_GmDocument(d->widget->doc, run->imageId);
+        if (tex) {
+            const iRect dst = moved_Rect(run->visBounds, origin);
+            SDL_RenderCopy(d->paint.dst->render, tex, NULL,
+                           &(SDL_Rect){ dst.pos.x, dst.pos.y, dst.size.x, dst.size.y });
+        }
+        return;
+    }
     iString text;
     /* 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);
     enum iColorId fg = run->color;
     if (run == d->widget->hoverLink) {
-        //const char *desc = "";
-        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);
+        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);
-//        desc = cstrFormat_String("\u2192 %s", cstr_String(collect_String(newRange_String(parts.protocol))));
         const iString *host = collect_String(newRange_String(parts.host));
         fg = linkColor_GmDocument(doc, linkId);
         const iBool showHost = (!isEmpty_String(host) && flags & userFriendly_GmLinkFlag);
@@ -739,9 +873,10 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
                            topRight_Rect(linkRect),
                            fg - 1,
                            left_Alignment,
-                           " \u2014%s%s\r%c%s",
+                           " \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" : "");
diff --git a/src/ui/util.c b/src/ui/util.c
index cf75a2b0..785841c9 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -308,7 +308,7 @@ static void addTabPage_Widget_(iWidget *tabs, enum iWidgetAddPos addPos, iWidget
     const iBool isSel  = childCount_Widget(pages) == 0;
     iWidget *   button = addChildPos_Widget(
         findChild_Widget(tabs, "tabs.buttons"),
-        iClob(new_LabelWidget(label, key, kmods, cstrFormat_String("tabs.switch page:%p", page))),
+        iClob(new_LabelWidget(label, key, kmods, format_CStr("tabs.switch page:%p", page))),
         addPos);
     setFlags_Widget(button, selected_WidgetFlag, isSel);
     addChildPos_Widget(pages, page, addPos);
@@ -615,7 +615,7 @@ static iBool toggleHandler_(iWidget *d, const char *cmd) {
     if (equal_Command(cmd, "toggle") && pointer_Command(cmd) == d) {
         setToggle_Widget(d, (flags_Widget(d) & selected_WidgetFlag) == 0);
         postCommand_Widget(d,
-                           cstrFormat_String("%s.changed arg:%d",
+                           format_CStr("%s.changed arg:%d",
                                              cstr_String(id_Widget(d)),
                                              isSelected_Widget(d) ? 1 : 0));
         return iTrue;
diff --git a/src/ui/window.h b/src/ui/window.h
index 70e52751..413c454c 100644
--- a/src/ui/window.h
+++ b/src/ui/window.h
@@ -31,5 +31,6 @@ float       uiScale_Window          (const iWindow *);
 iInt2       coord_Window            (const iWindow *, int x, int y);
 iInt2       mouseCoord_Window       (const iWindow *);
 uint32_t    frameTime_Window        (const iWindow *);
+SDL_Renderer *renderer_Window       (const iWindow *);
 
 iWindow *   get_Window              (void);