Refactor: Separate media from GmDocument

6 files changed, 283 insertions, 187 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1e323d47..15ff9a0a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,6 +97,8 @@ set (SOURCES
     src/history.h
     src/lookup.c
     src/lookup.h
+    src/media.c
+    src/media.h
     src/prefs.c
     src/prefs.h
     src/stb_image.h
diff --git a/src/gmdocument.c b/src/gmdocument.c
index a273a8d5..6e139e45 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -32,9 +32,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include <the_Foundation/ptrarray.h>
 #include <the_Foundation/regexp.h>
 
-#include <SDL_hints.h>
-#include <SDL_render.h>
-#include <stb_image.h>
 #include <ctype.h>
 
 iDeclareType(GmLink)
@@ -57,65 +54,24 @@ void deinit_GmLink(iGmLink *d) {
 
 iDefineTypeConstruction(GmLink)
 
-iDeclareType(GmImage)
-
-struct Impl_GmImage {
-    iInt2        size;
-    size_t       numBytes;
-    iString      mime;
-    iGmLinkId    linkId;
-    iBool        isPermanent;
-    SDL_Texture *texture;
-};
-
-void init_GmImage(iGmImage *d, const iBlock *data) {
-    init_String(&d->mime);
-    d->isPermanent = iFalse;
-    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) {
-        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);
-    deinit_String(&d->mime);
-}
-
-iDefineTypeConstructionArgs(GmImage, (const iBlock *data), data)
-
 /*----------------------------------------------------------------------------------------------*/
 
 struct Impl_GmDocument {
     iObject object;
     enum iGmDocumentFormat format;
-    iString source;
-    iString url; /* for resolving relative links */
-    iString localHost;
-    int forceBreakWidth; /* force breaks on very long preformatted lines */
-    iInt2 size;
-    iArray layout; /* contents of source, laid out in document space */
+    iString   source;
+    iString   url; /* for resolving relative links */
+    iString   localHost;
+    int       forceBreakWidth; /* force breaks on very long preformatted lines */
+    iInt2     size;
+    iArray    layout; /* contents of source, laid out in document space */
     iPtrArray links;
-    iString bannerText;
-    iString title; /* the first top-level title */
-    iArray headings;
-    iPtrArray images; /* persistent across layouts, references links by ID */
-    uint32_t themeSeed;
-    iChar siteIcon;
+    iString   bannerText;
+    iString   title; /* the first top-level title */
+    iArray    headings;
+    uint32_t  themeSeed;
+    iChar     siteIcon;
+    iMedia *  media;
 };
 
 iDefineObjectConstruction(GmDocument)
@@ -180,7 +136,7 @@ static int lastVisibleRunBottom_GmDocument_(const iGmDocument *d) {
     return 0;
 }
 
-iInt2 measurePreformattedBlock_GmDocument_(const iGmDocument *d, const char *start, int font) {
+static iInt2 measurePreformattedBlock_GmDocument_(const iGmDocument *d, const char *start, int font) {
     const iRangecc content = { start, constEnd_String(&d->source) };
     iRangecc line = iNullRange;
     nextSplit_Rangecc(content, "\n", &line);
@@ -243,7 +199,7 @@ static iRangecc addLink_GmDocument_(iGmDocument *d, iRangecc line, iGmLinkId *li
                     link->flags |= imageFileExtension_GmLinkFlag;
                 }
                 else if (endsWithCase_String(path, ".mp3") || endsWithCase_String(path, ".wav") ||
-                         endsWithCase_String(path, ".mid")) {
+                         endsWithCase_String(path, ".mid") || endsWithCase_String(path, ".ogg")) {
                     link->flags |= audioFileExtension_GmLinkFlag;
                 }
                 delete_String(path);
@@ -278,17 +234,6 @@ 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 iBool isGopher_GmDocument_(const iGmDocument *d) {
     return equalCase_Rangecc(urlScheme_String(&d->url), "gopher");
 }
@@ -576,13 +521,14 @@ static void doLayout_GmDocument_(iGmDocument *d) {
         ((iGmRun *) back_Array(&d->layout))->flags |= endOfLine_GmRunFlag;
         /* 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);
+            const iMediaId imageId = findLinkImage_Media(d->media, run.linkId);
+            if (imageId) {
+                iGmImageInfo img;
+                imageInfo_Media(d->media, imageId, &img);
                 /* Mark the link as having content. */ {
                     iGmLink *link = at_PtrArray(&d->links, run.linkId - 1);
                     link->flags |= content_GmLinkFlag;
-                    if (img->isPermanent) {
+                    if (img.isPermanent) {
                         link->flags |= permanent_GmLinkFlag;
                     }
                 }
@@ -590,10 +536,10 @@ static void doLayout_GmDocument_(iGmDocument *d) {
                 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;
+                const float aspect = (float) img.size.y / (float) img.size.x;
                 run.bounds.size.y = d->size.x * aspect;
                 run.visBounds = run.bounds;
-                const iInt2 maxSize = mulf_I2(img->size, get_Window()->pixelRatio);
+                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);
@@ -601,10 +547,10 @@ static void doLayout_GmDocument_(iGmDocument *d) {
                     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;
+                run.text    = iNullRange;
+                run.font    = 0;
+                run.color   = 0;
+                run.imageId = imageId;
                 pushBack_Array(&d->layout, &run);
                 pos.y += run.bounds.size.y + margin;
             }
@@ -625,12 +571,13 @@ void init_GmDocument(iGmDocument *d) {
     init_String(&d->bannerText);
     init_String(&d->title);
     init_Array(&d->headings, sizeof(iGmHeading));
-    init_PtrArray(&d->images);
     d->themeSeed = 0;
     d->siteIcon = 0;
+    d->media = new_Media();
 }
 
 void deinit_GmDocument(iGmDocument *d) {
+    delete_Media(d->media);
     deinit_String(&d->bannerText);
     deinit_String(&d->title);
     clearLinks_GmDocument_(d);
@@ -642,12 +589,16 @@ void deinit_GmDocument(iGmDocument *d) {
     deinit_String(&d->source);
 }
 
+iMedia *media_GmDocument(iGmDocument *d) {
+    return d->media;
+}
+
+const iMedia *constMedia_GmDocument(const iGmDocument *d) {
+    return d->media;
+}
+
 void reset_GmDocument(iGmDocument *d) {
-    /* Free the loaded images. */
-    iForEach(PtrArray, i, &d->images) {
-        deinit_GmImage(i.ptr);
-    }
-    clear_PtrArray(&d->images);
+    clear_Media(d->media);
     clearLinks_GmDocument_(d);
     clear_Array(&d->layout);
     clear_Array(&d->headings);
@@ -947,6 +898,10 @@ void setWidth_GmDocument(iGmDocument *d, int width, int forceBreakWidth) {
     doLayout_GmDocument_(d); /* TODO: just flag need-layout and do it later */
 }
 
+void redoLayout_GmDocument(iGmDocument *d) {
+    doLayout_GmDocument_(d);
+}
+
 iLocalDef iBool isNormalizableSpace_(char ch) {
     return ch == ' ' || ch == '\t';
 }
@@ -1021,32 +976,6 @@ void setSource_GmDocument(iGmDocument *d, const iString *source, int width, int
     setWidth_GmDocument(d, width, forceBreakWidth); /* re-do layout */
 }
 
-void setImage_GmDocument(iGmDocument *d, iGmLinkId linkId, const iString *mime, const iBlock *data,
-                         iBool allowHide) {
-    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 */
-        /* Upload the image. */ {
-            iGmImage *img = new_GmImage(data);
-            img->linkId = linkId; /* TODO: use a hash? */
-            img->isPermanent = !allowHide;
-            set_String(&img->mime, mime);
-            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;
@@ -1191,13 +1120,8 @@ const iTime *linkTime_GmDocument(const iGmDocument *d, iGmLinkId linkId) {
     return link ? &link->when : NULL;
 }
 
-
 uint16_t linkImage_GmDocument(const iGmDocument *d, iGmLinkId linkId) {
-    size_t index = findLinkImage_GmDocument_(d, linkId);
-    if (index != iInvalidPos) {
-        return index + 1;
-    }
-    return 0;
+    return findLinkImage_Media(d->media, linkId);
 }
 
 enum iColorId linkColor_GmDocument(const iGmDocument *d, iGmLinkId linkId, enum iGmLinkPart part) {
@@ -1256,26 +1180,6 @@ iBool isMediaLink_GmDocument(const iGmDocument *d, iGmLinkId 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;
-}
-
-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 891ac6f2..a04398d9 100644
--- a/src/gmdocument.h
+++ b/src/gmdocument.h
@@ -23,15 +23,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #pragma once
 
 #include "gmutil.h"
+#include "media.h"
 
 #include <the_Foundation/array.h>
 #include <the_Foundation/object.h>
 #include <the_Foundation/rect.h>
 #include <the_Foundation/string.h>
 #include <the_Foundation/time.h>
-#include <SDL_render.h>
 
-iDeclareType(GmImageInfo)
 iDeclareType(GmHeading)
 iDeclareType(GmRun)
 
@@ -60,12 +59,6 @@ enum iGmLinkFlags {
     permanent_GmLinkFlag          = iBit(15), /* content cannot be dismissed; media link */
 };
 
-struct Impl_GmImageInfo {
-    iInt2 size;
-    size_t numBytes;
-    const char *mime;
-};
-
 struct Impl_GmHeading {
     iRangecc text;
     int level; /* 0, 1, 2 */
@@ -86,7 +79,8 @@ struct Impl_GmRun {
     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 */
+    uint16_t  imageId;   /* zero if not an image */
+    uint16_t  audioId;   /* zero if not audio */
 };
 
 const char *    findLoc_GmRun   (const iGmRun *, iInt2 pos);
@@ -103,15 +97,17 @@ enum iGmDocumentFormat {
 void    setThemeSeed_GmDocument (iGmDocument *, const iBlock *seed);
 void    setFormat_GmDocument    (iGmDocument *, enum iGmDocumentFormat format);
 void    setWidth_GmDocument     (iGmDocument *, int width, int forceBreakWidth);
+void    redoLayout_GmDocument   (iGmDocument *);
 void    setUrl_GmDocument       (iGmDocument *, const iString *url);
 void    setSource_GmDocument    (iGmDocument *, const iString *source, int width, int forceBreakWidth);
-void    setImage_GmDocument     (iGmDocument *, iGmLinkId linkId, const iString *mime, const iBlock *data,
-                                 iBool allowHide);
 
 void    reset_GmDocument        (iGmDocument *); /* free images */
 
 typedef void (*iGmDocumentRenderFunc)(void *, const iGmRun *);
 
+iMedia *        media_GmDocument            (iGmDocument *);
+const iMedia *  constMedia_GmDocument       (const iGmDocument *);
+
 void            render_GmDocument           (const iGmDocument *, iRangei visRangeY,
                                              iGmDocumentRenderFunc render, void *);
 iInt2           size_GmDocument             (const iGmDocument *);
@@ -144,5 +140,3 @@ iBool           isMediaLink_GmDocument  (const iGmDocument *, iGmLinkId linkId);
 const iString * title_GmDocument        (const iGmDocument *);
 iChar           siteIcon_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/media.c b/src/media.c
new file mode 100644
index 00000000..9f6acd19
--- /dev/null
+++ b/src/media.c
@@ -0,0 +1,155 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
+
+#include "media.h"
+#include "gmdocument.h"
+#include "ui/window.h"
+
+#include <the_Foundation/ptrarray.h>
+#include <stb_image.h>
+#include <SDL_hints.h>
+#include <SDL_render.h>
+
+iDeclareType(GmImage)
+
+struct Impl_GmImage {
+    iInt2        size;
+    size_t       numBytes;
+    iString      mime;
+    iGmLinkId    linkId;
+    iBool        isPermanent;
+    SDL_Texture *texture;
+};
+
+void init_GmImage(iGmImage *d, const iBlock *data) {
+    init_String(&d->mime);
+    d->isPermanent   = iFalse;
+    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) {
+        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);
+    deinit_String(&d->mime);
+}
+
+iDefineTypeConstructionArgs(GmImage, (const iBlock *data), data)
+
+/*----------------------------------------------------------------------------------------------*/
+
+struct Impl_Media {
+    iPtrArray images;
+};
+
+iDefineTypeConstruction(Media)
+
+void init_Media(iMedia *d) {
+    init_PtrArray(&d->images);
+}
+
+void deinit_Media(iMedia *d) {
+    clear_Media(d);
+    deinit_PtrArray(&d->images);
+}
+
+void clear_Media(iMedia *d) {
+    iForEach(PtrArray, i, &d->images) {
+        deinit_GmImage(i.ptr);
+    }
+    clear_PtrArray(&d->images);
+}
+
+void setImage_Media(iMedia *d, iGmLinkId linkId, const iString *mime, const iBlock *data,
+                    iBool allowHide) {
+    if (!mime || !data) {
+        iGmImage *img;
+        const iMediaId existing = findLinkImage_Media(d, linkId);
+        if (existing) {
+            take_PtrArray(&d->images, existing - 1, (void **) &img);
+            delete_GmImage(img);
+        }
+    }
+    else {
+        /* TODO: check if we know this MIME type */
+        /* Upload the image. */ {
+            iGmImage *img = new_GmImage(data);
+            img->linkId = linkId; /* TODO: use a hash? */
+            img->isPermanent = !allowHide;
+            set_String(&img->mime, mime);
+            if (img->texture) {
+                pushBack_PtrArray(&d->images, img);
+            }
+            else {
+                delete_GmImage(img);
+            }
+        }
+    }
+//    doLayout_GmDocument_(d);
+}
+
+iMediaId findLinkImage_Media(const iMedia *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) + 1;
+        }
+    }
+    return 0;
+}
+
+SDL_Texture *imageTexture_Media(const iMedia *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;
+}
+
+void imageInfo_Media(const iMedia *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);
+        info_out->isPermanent = img->isPermanent;
+    }
+    else {
+        iZap(*info_out);
+    }
+}
diff --git a/src/media.h b/src/media.h
new file mode 100644
index 00000000..0a6c1a81
--- /dev/null
+++ b/src/media.h
@@ -0,0 +1,48 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
+
+#pragma once
+
+#include <the_Foundation/block.h>
+#include <the_Foundation/string.h>
+#include <the_Foundation/vec2.h>
+#include <SDL_render.h>
+
+typedef uint16_t iMediaId;
+
+iDeclareType(GmImageInfo)
+
+struct Impl_GmImageInfo {
+    iInt2 size;
+    size_t numBytes;
+    const char *mime;
+    iBool isPermanent;
+};
+
+iDeclareType(Media) iDeclareTypeConstruction(Media)
+
+void    clear_Media     (iMedia *);
+void    setImage_Media  (iMedia *, uint16_t linkId, const iString *mime, const iBlock *data, iBool allowHide);
+
+iMediaId        findLinkImage_Media (const iMedia *, uint16_t linkId);
+SDL_Texture *   imageTexture_Media  (const iMedia *, iMediaId imageId);
+void            imageInfo_Media     (const iMedia *, iMediaId imageId, iGmImageInfo *info_out);
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index eb248ceb..f63d93f4 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -31,9 +31,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "util.h"
 #include "history.h"
 #include "app.h"
-#include "../gmdocument.h"
-#include "../gmrequest.h"
-#include "../gmutil.h"
+#include "gmdocument.h"
+#include "gmrequest.h"
+#include "gmutil.h"
+#include "media.h"
 
 #include <the_Foundation/file.h>
 #include <the_Foundation/fileinfo.h>
@@ -735,8 +736,12 @@ static void updateDocument_DocumentWidget_(iDocumentWidget *d, const iGmResponse
                                 baseName_Path(collect_String(newRange_String(parts.path))).start;
                         }
                         format_String(&str, "=> %s %s\n", cstr_String(d->mod.url), imageTitle);
-                        setImage_GmDocument(
-                            d->doc, 1, mimeStr, &response->body, iFalse /* it's fixed */);
+                        setImage_Media(media_GmDocument(d->doc),
+                                       1,
+                                       mimeStr,
+                                       &response->body,
+                                       iFalse /* it's fixed */);
+                        redoLayout_GmDocument(d->doc);
                     }
                     else {
                         clear_String(&str);
@@ -1136,13 +1141,13 @@ static iBool handleMediaCommand_DocumentWidget_(iDocumentWidget *d, const char *
         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), iTrue);
+                setImage_Media(media_GmDocument(d->doc),
+                               req->linkId,
+                               meta_GmRequest(req->req),
+                               body_GmRequest(req->req),
+                               iTrue);
+                redoLayout_GmDocument(d->doc);
                 updateVisible_DocumentWidget_(d);
                 invalidate_DocumentWidget_(d);
                 refresh_Widget(as_Widget(d));
@@ -1792,10 +1797,11 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                                further to do. */
                             return iTrue;
                         }
-                        if (!requestMedia_DocumentWidget_(d, linkId)) {
+                        if (!requestMedia_DocumentWidget_(d, linkId)) {                            
                             if (linkFlags & content_GmLinkFlag) {
                                 /* Dismiss shown content on click. */
-                                setImage_GmDocument(d->doc, linkId, NULL, NULL, iTrue);
+                                setImage_Media(media_GmDocument(d->doc), linkId, NULL, NULL, iTrue);
+                                redoLayout_GmDocument(d->doc);
                                 d->hoverLink = NULL;
                                 scroll_DocumentWidget_(d, 0);
                                 updateVisible_DocumentWidget_(d);
@@ -1807,8 +1813,12 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                                 /* 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), iTrue);
+                                    setImage_Media(media_GmDocument(d->doc),
+                                                   linkId,
+                                                   meta_GmRequest(req->req),
+                                                   body_GmRequest(req->req),
+                                                   iTrue);
+                                    redoLayout_GmDocument(d->doc);
                                     updateVisible_DocumentWidget_(d);
                                     invalidate_DocumentWidget_(d);
                                     refresh_Widget(w);
@@ -1894,7 +1904,7 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
     iDrawContext *d      = context;
     const iInt2   origin = d->viewPos;
     if (run->imageId) {
-        SDL_Texture *tex = imageTexture_GmDocument(d->widget->doc, run->imageId);
+        SDL_Texture *tex = imageTexture_Media(media_GmDocument(d->widget->doc), run->imageId);
         if (tex) {
             const iRect dst = moved_Rect(run->visBounds, origin);
             fillRect_Paint(&d->paint, dst, tmBackground_ColorId); /* in case the image has alpha */
@@ -1981,7 +1991,7 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
             fg = linkColor_GmDocument(doc, run->linkId, textHover_GmLinkPart);
             iAssert(!isEmpty_Rect(run->bounds));
             iGmImageInfo info;
-            imageInfo_GmDocument(doc, linkImage_GmDocument(doc, run->linkId), &info);
+            imageInfo_Media(constMedia_GmDocument(doc), linkImage_GmDocument(doc, run->linkId), &info);
             iString text;
             init_String(&text);
             format_String(&text, "%s \u2014 %d x %d \u2014 %.1fMB",
@@ -2083,7 +2093,7 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
 //    drawRect_Paint(&d->paint, (iRect){ visPos, run->visBounds.size }, red_ColorId);
 }
 
-static int drawSideRect_(iPaint *p, iRect rect) { //}, int thickness) {
+static int drawSideRect_(iPaint *p, iRect rect) {
     int bg = tmBannerBackground_ColorId;
     int fg = tmBannerIcon_ColorId;
     if (equal_Color(get_Color(bg), get_Color(tmBackground_ColorId))) {
@@ -2131,34 +2141,17 @@ static void drawSideElements_DocumentWidget_(const iDocumentWidget *d) {
             const iChar icon = siteIcon_GmDocument(d->doc);
             iRect       rect = { add_I2(topLeft_Rect(bounds), init1_I2(margin)), init1_I2(minBannerSize) };
             p.alpha = opacity * 255;
-            //int offset = iMax(0, bottom_Rect(banner->visBounds) - d->scrollY);
-            rect.pos.y += height_Rect(bounds) / 2 - rect.size.y / 2 - (banner ? banner->visBounds.size.y / 2 : 0); // offset;
-            //rect.pos.y -= lineHeight_Text(heading3_FontId) / 2; /* the heading text underneath */
-            int fg = drawSideRect_(&p, rect); //, gap_UI / 2);
+            rect.pos.y += height_Rect(bounds) / 2 - rect.size.y / 2 - (banner ? banner->visBounds.size.y / 2 : 0);
+            int fg = drawSideRect_(&p, rect);
             iString str;
             initUnicodeN_String(&str, &icon, 1);
             drawCentered_Text(banner_FontId, rect, iTrue, fg, "%s", cstr_String(&str));
-#if 1
             if (avail >= minBannerSize * 2.25f) {
                 iRangecc    text = currentHeading_DocumentWidget_(d);// bannerText_DocumentWidget_(d);
                 iInt2       pos  = addY_I2(bottomLeft_Rect(rect), gap_Text);
                 const int   font = heading3_FontId;
                 drawWrapRange_Text(font, pos, avail - margin, tmBannerSideTitle_ColorId, text);
-#if 0
-                while (!isEmpty_Range(&text)) {
-                    tryAdvance_Text(font, text, avail - 2 * margin, &endp);
-                    drawRange_Text(
-                        font, pos, tmBannerTitle_ColorId, (iRangecc){ text.start, endp });
-//                    drawRange_Text(font,
-//                                   add_I2(pos, init1_I2(-gap_UI / 4)),
-//                                   tmBackground_ColorId,
-//                                   (iRangecc){ text.start, endp });
-                    text.start = endp;
-                    pos.y += lineHeight_Text(font);
-                }
-#endif
             }
-#endif
             setOpacity_Text(1.0f);
             SDL_SetRenderDrawBlendMode(renderer_Window(get_Window()), SDL_BLENDMODE_NONE);
         }