12 files changed, 234 insertions, 48 deletions

diff --git a/src/app.c b/src/app.c
index 6282ade2..70b611c2 100644
--- a/src/app.c
+++ b/src/app.c
@@ -231,6 +231,9 @@ static iString *serializePrefs_App_(const iApp *d) {
     appendFormat_String(str, "linewidth.set arg:%d\n", d->prefs.lineWidth);
     appendFormat_String(str, "linespacing.set arg:%f\n", d->prefs.lineSpacing);
     appendFormat_String(str, "returnkey.set arg:%d\n", d->prefs.returnKey);
+    iConstForEach(StringSet, fp, d->prefs.disabledFontPacks) {
+        appendFormat_String(str, "fontpack.disable id:%s\n", cstr_String(fp.value));
+    }
     /* TODO: This array belongs in Prefs. It can then be used for command handling as well. */
     const struct {
         const char * id;
@@ -256,21 +259,6 @@ static iString *serializePrefs_App_(const iApp *d) {
     iForIndices(i, boolPrefs) {
         appendFormat_String(str, "%s.changed arg:%d\n", boolPrefs[i].id, *boolPrefs[i].value);
     }
-//    appendFormat_String(str, "prefs.animate.changed arg:%d\n", d->prefs.uiAnimations);
-//    appendFormat_String(str, "prefs.font.smooth.changed arg:%d\n", d->prefs.fontSmoothing);
-//    appendFormat_String(str, "prefs.gemtext.ansi.changed arg:%d\n", d->prefs.gemtextAnsiEscapes);
-//    appendFormat_String(str, "prefs.mono.gemini.changed arg:%d\n", d->prefs.monospaceGemini);
-//    appendFormat_String(str, "prefs.mono.gopher.changed arg:%d\n", d->prefs.monospaceGopher);
-//    appendFormat_String(str, "prefs.boldlink.dark.changed arg:%d\n", d->prefs.boldLinkDark);
-//    appendFormat_String(str, "prefs.boldlink.light.changed arg:%d\n", d->prefs.boldLinkLight);
-//    appendFormat_String(str, "prefs.biglede.changed arg:%d\n", d->prefs.bigFirstParagraph);
-//    appendFormat_String(str, "prefs.plaintext.wrap.changed arg:%d\n", d->prefs.plainTextWrap);
-//    appendFormat_String(str, "prefs.sideicon.changed arg:%d\n", d->prefs.sideIcon);
-//    appendFormat_String(str, "prefs.centershort.changed arg:%d\n", d->prefs.centerShortDocs);
-//    appendFormat_String(str, "prefs.collapsepreonload.changed arg:%d\n", d->prefs.collapsePreOnLoad);
-//    appendFormat_String(str, "prefs.hoverlink.changed arg:%d\n", d->prefs.hoverLink);
-//    appendFormat_String(str, "prefs.bookmarks.addbottom arg:%d\n", d->prefs.addBookmarksToBottom);
-//    appendFormat_String(str, "prefs.archive.openindex.changed arg:%d\n", d->prefs.openArchiveIndexPages);
     appendFormat_String(str, "quoteicon.set arg:%d\n", d->prefs.quoteIcon ? 1 : 0);
     appendFormat_String(str, "theme.set arg:%d auto:1\n", d->prefs.theme);
     appendFormat_String(str, "accent.set arg:%d\n", d->prefs.accent);
@@ -381,6 +369,10 @@ static void loadPrefs_App_(iApp *d) {
                 d->initialWindowRect = init_Rect(
                     pos.x, pos.y, argLabel_Command(cmd, "width"), argLabel_Command(cmd, "height"));
             }
+            else if (equal_Command(cmd, "fontpack.disable")) {
+                insert_StringSet(d->prefs.disabledFontPacks,
+                                 collect_String(suffix_Command(cmd, "id")));
+            }
 #if !defined (LAGRANGE_ENABLE_DOWNLOAD_EDIT)
             else if (equal_Command(cmd, "downloads")) {
                 continue; /* can't change downloads directory */
@@ -1119,6 +1111,18 @@ void trimMemory_App(void) {
     iRelease(docs);
 }
 
+iBool findCachedContent_App(const iString *url, iString *mime_out, iBlock *data_out) {
+    /* Cached content can be found in MediaRequests of DocumentWidgets (loaded on the currently
+       open page) and the DocumentWidget itself. `Media` doesn't store source data, only
+       presentation data. */
+    iConstForEach(ObjectList, i, iClob(listDocuments_App(NULL))) {
+        if (findCachedContent_DocumentWidget(i.object, url, mime_out, data_out)) {
+            return iTrue;
+        }
+    }
+    return iFalse;
+}
+
 iLocalDef iBool isWaitingAllowed_App_(iApp *d) {
     if (!isEmpty_Periodic(&d->periodic)) {
         return iFalse;
@@ -2086,7 +2090,8 @@ const iString *searchQueryUrl_App(const iString *queryStringUnescaped) {
         "%s?%s", cstr_String(&d->prefs.strings[searchUrl_PrefsString]), cstr_String(escaped));
 }
 
-static void resetFonts_App_(iApp *d) {
+void resetFonts_App(void) {
+    iApp *d = &app_;
     iConstForEach(PtrArray, win, listWindows_App_(d)) {
         resetFonts_Text(text_Window(win.ptr));
     }
@@ -2163,7 +2168,11 @@ iBool handleCommand_App(const char *cmd) {
         return iTrue;
     }
     else if (equal_Command(cmd, "font.reset")) {
-        resetFonts_App_(d);
+        resetFonts_App();
+        return iTrue;
+    }
+    else if (equal_Command(cmd, "font.reload")) {
+        reload_Fonts(); /* also does font cache reset, window invalidation */
         return iTrue;
     }
 #if 0
@@ -2175,7 +2184,7 @@ iBool handleCommand_App(const char *cmd) {
             }
             setCStr_String(&d->prefs.symbolFontPath, path);
             loadUserFonts_Text();
-            resetFonts_App_(d);
+            resetFonts_App(d);
             if (!isFrozen) {
                 postCommand_App("font.changed");
                 postCommand_App("window.unfreeze");
@@ -3034,6 +3043,22 @@ iBool handleCommand_App(const char *cmd) {
         }
         return iFalse;
     }
+    else if (equal_Command(cmd, "media.fontpack.enable")) {
+        const iString *packId = collect_String(suffix_Command(cmd, "packid"));
+        if (arg_Command(cmd)) {
+            remove_StringSet(d->prefs.disabledFontPacks, packId);
+        }
+        else {
+            insert_StringSet(d->prefs.disabledFontPacks, packId);
+        }
+        resetFonts_App();
+        const iMedia *media = pointerLabel_Command(cmd, "media");
+        if (media) {
+            postCommandf_App("media.fontpack.updated id:%u media:%p",
+                             argU32Label_Command(cmd, "mediaid"), media);
+        }
+        return iTrue;
+    }
 #if defined (LAGRANGE_ENABLE_IPC)
     else if (equal_Command(cmd, "ipc.list.urls")) {
         iProcessId pid = argLabel_Command(cmd, "pid");
diff --git a/src/app.h b/src/app.h
index 2313ec15..8543f3b5 100644
--- a/src/app.h
+++ b/src/app.h
@@ -99,6 +99,7 @@ iStringSet *        listOpenURLs_App    (void); /* all tabs */
 iDocumentWidget *   newTab_App          (const iDocumentWidget *duplicateOf, iBool switchToNew);
 void                trimCache_App       (void);
 void                trimMemory_App      (void);
+iBool               findCachedContent_App(const iString *url, iString *mime_out, iBlock *data_out);
 
 iDocumentWidget *   document_Root       (iRoot *);
 
@@ -137,6 +138,7 @@ iDocumentWidget *   document_Command    (const char *cmd);
 
 void            openInDefaultBrowser_App(const iString *url);
 void            revealPath_App          (const iString *path);
+void            resetFonts_App          (void);
 
 iMainWindow *   mainWindow_App  (void);
 void            closePopups_App (void);
diff --git a/src/fontpack.c b/src/fontpack.c
index b135ea43..9603bded 100644
--- a/src/fontpack.c
+++ b/src/fontpack.c
@@ -22,6 +22,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 #include "fontpack.h"
 #include "embedded.h"
+#include "ui/window.h"
 #include "app.h"
 
 #include <the_Foundation/archive.h>
@@ -396,6 +397,24 @@ static iBool load_FontPack_(iFontPack *d, const iString *ini) {
     return ok;
 }
 
+iBool detect_FontPack(const iBlock *data) {
+    iBool ok = iFalse;
+    iArchive *zip = new_Archive();
+    if (openData_Archive(zip, data)) {
+        iString ini;
+        initBlock_String(&ini, dataCStr_Archive(zip, "fontpack.ini"));
+        if (isUtf8_Rangecc(range_String(&ini))) {
+            /* Validate the TOML syntax without actually checking any values. */
+            iTomlParser *toml = new_TomlParser();
+            ok = parse_TomlParser(toml, &ini);
+            delete_TomlParser(toml);
+        }
+        deinit_String(&ini);
+    }
+    iRelease(zip);
+    return ok;
+}
+
 iBool loadArchive_FontPack(iFontPack *d, const iArchive *zip) {
     d->archive = zip;
     iBool ok = iFalse;
@@ -467,16 +486,24 @@ static void sortSpecs_Fonts_(iFonts *d) {
     clear_PtrArray(&d->specOrder);
     iConstForEach(PtrArray, p, &d->packs) {
         const iFontPack *pack = p.ptr;
-        iConstForEach(Array, i, &pack->fonts) {
-            pushBack_PtrArray(&d->specOrder, i.value);
+        if (!contains_StringSet(prefs_App()->disabledFontPacks, &pack->id)) {
+            iConstForEach(Array, i, &pack->fonts) {
+                pushBack_PtrArray(&d->specOrder, i.value);
+            }
         }
     }
     sort_Array(&d->specOrder, cmpPriority_FontSpecPtr_);
 }
 
+static const iString *userFontsDirectory_Fonts_(const iFonts *d) {
+    return collect_String(concatCStr_Path(&d->userDir, "fonts"));
+}
+
 void init_Fonts(const char *userDir) {
     iFonts *d = &fonts_;
     initCStr_String(&d->userDir, userDir);
+    const iString *userFontsDir = userFontsDirectory_Fonts_(d);
+    makeDirs_Path(userFontsDir);
     init_PtrArray(&d->packs);
     d->files = new_ObjectList();
     init_PtrArray(&d->specOrder);
@@ -496,7 +523,7 @@ void init_Fonts(const char *userDir) {
             "./fonts",
             "../share/lagrange", /* Note: These must match CMakeLists.txt install destination */
             "../../share/lagrange",
-            concatPath_CStr(userDir, "fonts"),
+            cstr_String(userFontsDir),
             userDir,
         };
         const iString *execDir = collectNewRange_String(dirName_Path(execPath_App()));
@@ -555,7 +582,6 @@ void init_Fonts(const char *userDir) {
 void deinit_Fonts(void) {
     iFonts *d = &fonts_;
     unloadFonts_Fonts_(d);
-    //unloadFiles_Fonts_(d);
     iAssert(isEmpty_ObjectList(d->files));
     deinit_PtrArray(&d->specOrder);
     deinit_PtrArray(&d->packs);
@@ -617,7 +643,18 @@ const iString *infoPage_Fonts(void) {
     return str;
 }
 
-const iFontPack *findPack_Fonts(const iString *path) {
+const iFontPack *pack_Fonts(const char *packId) {
+    iFonts *d = &fonts_;
+    iConstForEach(PtrArray, i, &d->packs) {
+        const iFontPack *pack = i.ptr;
+        if (!cmp_String(&pack->id, packId)) {
+            return pack;
+        }
+    }
+    return NULL;
+}
+
+const iFontPack *packByPath_Fonts(const iString *path) {
     iFonts *d = &fonts_;
     iConstForEach(PtrArray, i, &d->packs) {
         const iFontPack *pack = i.ptr;
@@ -628,6 +665,28 @@ const iFontPack *findPack_Fonts(const iString *path) {
     return NULL;
 }
 
+void reload_Fonts(void) {
+    iFonts *d = &fonts_;
+    iString *userDir = copy_String(&d->userDir);
+    deinit_Fonts(); /* `d->userDir` is freed */
+    init_Fonts(cstr_String(userDir));
+    resetFonts_App();
+    invalidate_Window(get_MainWindow());
+    delete_String(userDir);
+}
+
+void install_Fonts(const iString *fontId, const iBlock *data) {
+    iFonts *d = &fonts_;
+    iFile *f = new_File(collect_String(concatCStr_Path(
+        userFontsDirectory_Fonts_(d), format_CStr("%s.fontpack", cstr_String(fontId)))));
+    if (open_File(f, writeOnly_FileMode)) {
+        write_File(f, data);
+    }
+    iRelease(f);
+    /* Newly installed fontpacks may have a higher priority that overrides other fonts. */
+    reload_Fonts();
+}
+
 iBool preloadLocalFontpackForPreview_Fonts(iGmDocument *doc) {
     iBool wasLoaded = iFalse;
     for (size_t linkId = 1; ; linkId++) {
diff --git a/src/fontpack.h b/src/fontpack.h
index f69e2adc..2fdfa9ab 100644
--- a/src/fontpack.h
+++ b/src/fontpack.h
@@ -149,6 +149,7 @@ void                setReadOnly_FontPack    (iFontPack *, iBool readOnly);
 void                setStandalone_FontPack  (iFontPack *, iBool standalone);
 void                setLoadPath_FontPack    (iFontPack *, const iString *path);
 iBool               loadArchive_FontPack    (iFontPack *, const iArchive *zip);
+iBool               detect_FontPack         (const iBlock *data);
 
 iFontPackId         id_FontPack             (const iFontPack *);
 const iPtrArray *   listSpecs_FontPack      (const iFontPack *);
@@ -159,11 +160,18 @@ iDeclareType(GmDocument)
 void    init_Fonts      (const char *userDir);
 void    deinit_Fonts    (void);
 
-const iFontPack *   findPack_Fonts              (const iString *path);
+const iFontPack *   pack_Fonts                  (const char *packId);
+const iFontPack *   packByPath_Fonts            (const iString *path);
 const iFontSpec *   findSpec_Fonts              (const char *fontId);
 const iPtrArray *   listPacks_Fonts             (void);
 const iPtrArray *   listSpecs_Fonts             (iBool (*filterFunc)(const iFontSpec *));
 const iPtrArray *   listSpecsByPriority_Fonts   (void);
 const iString *     infoPage_Fonts              (void);
+void                install_Fonts               (const iString *fontId, const iBlock *data);
+void                reload_Fonts                (void);
 
 iBool   preloadLocalFontpackForPreview_Fonts    (iGmDocument *doc);
+
+iLocalDef iBool isInstalled_Fonts(const char *packId) {
+    return pack_Fonts(packId) != NULL;
+}
diff --git a/src/media.c b/src/media.c
index 0ce2ac5c..412205a7 100644
--- a/src/media.c
+++ b/src/media.c
@@ -312,15 +312,19 @@ void deinit_GmFontpack(iGmFontpack *d) {
 
 static void loadData_GmFontpack_(iGmFontpack *d, const iBlock *data) {
     const iString *loadPath = collect_String(localFilePathFromUrl_String(&d->props.url));
-    const iFontPack *pack = findPack_Fonts(loadPath);
+    const iFontPack *pack = packByPath_Fonts(loadPath);
     d->info.isValid = d->info.isInstalled = pack != NULL;
     d->info.isReadOnly = iFalse;
+    d->info.isDisabled = iFalse;
+    clear_StringList(d->info.names);
+    clear_String(&d->packId);
     if (!pack) {
         /* Let's load it now temporarily and see what's inside. */
         iArchive *zip = new_Archive();
         if (openData_Archive(zip, data)) {
             iFontPack *fp = collect_FontPack(new_FontPack());
             setLoadPath_FontPack(fp, loadPath);
+            /* TODO: No need to load all the font files here, just the metadata. */
             setStandalone_FontPack(fp, iTrue);
             if (loadArchive_FontPack(fp, zip)) {
                 d->info.isValid = iTrue;
@@ -334,6 +338,7 @@ static void loadData_GmFontpack_(iGmFontpack *d, const iBlock *data) {
         d->info.packId.id = &d->packId; /* we own this String */
         d->info.packId.version = id_FontPack(pack).version;
         d->info.isReadOnly = isReadOnly_FontPack(pack);
+        d->info.isDisabled = contains_StringSet(prefs_App()->disabledFontPacks, &d->packId);
     }
     iPtrSet *unique = new_PtrSet();
     iConstForEach(PtrArray, i, listSpecs_FontPack(pack)) {
@@ -455,7 +460,7 @@ iBool setData_Media(iMedia *d, iGmLinkId linkId, const iString *mime, const iBlo
     const iBool isPartial  = (flags & partialData_MediaFlag) != 0;
     const iBool allowHide  = (flags & allowHide_MediaFlag) != 0;
     const iBool isDeleting = (!mime || !data);
-    iMediaId    existing   = findMediaForLink_Media(d, linkId, none_MediaType);// findLinkImage_Media(d, linkId);
+    iMediaId    existing   = findMediaForLink_Media(d, linkId, none_MediaType);
     const size_t existingIndex = index_MediaId(existing);
     iBool       isNew      = iFalse;
     if (existing.type == image_MediaType) {
@@ -574,17 +579,34 @@ static iMediaId findMediaPtr_Media_(const iPtrArray *items, enum iMediaType medi
 
 iMediaId findMediaForLink_Media(const iMedia *d, iGmLinkId linkId, enum iMediaType mediaType) {
     /* TODO: Use hashes, this will get very slow if there is a large number of media items. */
-    iMediaId mid;
+    iMediaId mid = iInvalidMediaId;
     for (int i = 0; i < max_MediaType; i++) {
         if (mediaType == i || !mediaType) {
             mid = findMediaPtr_Media_(&d->items[i], i, linkId);
             if (mid.type) {
-                return mid;
+                break;
             }
         }
     }
-    return iInvalidMediaId;
+    return mid;
+}
+
+#if 0
+iMediaId findUrl_Media(const iMedia *d, const iString *url) {
+    iMediaId mid = iInvalidMediaId;
+    for (int i = 0; i < max_MediaType; i++) {
+        for (int j = 0; j < size_PtrArray(&d->items[i]); j++) {
+            const iGmMediaProps *props = constAt_PtrArray(&d->items[i], j);
+            if (equal_String(&props->url, url)) {
+                mid.type = i;
+                mid.id   = j + 1;
+                break;
+            }
+        }
+    }
+    return mid;
 }
+#endif
 
 size_t numAudio_Media(const iMedia *d) {
     return size_PtrArray(&d->items[audio_MediaType]);
diff --git a/src/media.h b/src/media.h
index 47a4da93..92a46cd3 100644
--- a/src/media.h
+++ b/src/media.h
@@ -74,6 +74,7 @@ iBool           setData_Media           (iMedia *, uint16_t linkId, const iStrin
 
 size_t          memorySize_Media        (const iMedia *);
 iMediaId        findMediaForLink_Media  (const iMedia *, uint16_t linkId, enum iMediaType mediaType);
+//iMediaId        findUrl_Media           (const iMedia *, const iString *url);
 
 iMediaId        id_Media        (const iMedia *, uint16_t linkId, enum iMediaType type);
 iBool           info_Media      (const iMedia *, iMediaId mediaId, iGmMediaInfo *info_out);
@@ -114,6 +115,7 @@ struct Impl_FontpackMediaInfo {
     iFontPackId packId;
     iBool isValid;
     iBool isInstalled;
+    iBool isDisabled;
     iBool isReadOnly;
     size_t sizeInBytes;
     iStringList *names;
diff --git a/src/prefs.c b/src/prefs.c
index 673470d6..523ec649 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -60,6 +60,7 @@ void init_Prefs(iPrefs *d) {
     setCStr_String(&d->strings[bodyFont_PrefsString], "default");
     setCStr_String(&d->strings[monospaceFont_PrefsString], "iosevka");
     setCStr_String(&d->strings[monospaceDocumentFont_PrefsString], "iosevka-body");
+    d->disabledFontPacks = new_StringSet();
     d->fontSmoothing     = iTrue;
     d->gemtextAnsiEscapes = iFalse;
     d->monospaceGemini   = iFalse;
@@ -88,6 +89,7 @@ void init_Prefs(iPrefs *d) {
 }
 
 void deinit_Prefs(iPrefs *d) {
+    iRelease(d->disabledFontPacks);
     iForIndices(i, d->strings) {
         deinit_String(&d->strings[i]);
     }
diff --git a/src/prefs.h b/src/prefs.h
index 70846be4..bbf98370 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -22,7 +22,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 #pragma once
 
-#include <the_Foundation/string.h>
+#include <the_Foundation/stringset.h>
 
 #include "gmdocument.h"
 #include "ui/color.h"
@@ -87,6 +87,7 @@ struct Impl_Prefs {
     int              maxCacheSize; /* MB */
     int              maxMemorySize; /* MB */
     /* Style */
+    iStringSet *     disabledFontPacks;
     iBool            fontSmoothing;
     iBool            gemtextAnsiEscapes;
     iBool            monospaceGemini;
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 924dc0c4..1aca895c 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -2916,6 +2916,27 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         updateMedia_DocumentWidget_(d);
         return iFalse;
     }
+    else if (equal_Command(cmd, "media.fontpack.updated")) {
+        iMedia *media = pointerLabel_Command(cmd, "media");
+        if (media == media_GmDocument(d->doc)) {
+            /*iGmMediaInfo info;
+            if (info_Media(media,
+                           (iMediaId){ fontpack_MediaType, argU32Label_Command(cmd, "id")},
+                           &info)) {
+                
+            }*/
+            
+//            findCachedContent_App(<#const iString *url#>, <#iString *mime_out#>, <#iBlock *data_out#>)
+//            setData_Media(media,
+        }
+        return iFalse;
+    }
+    else if (equal_Command(cmd, "media.fontpack.install")) {
+        if (pointerLabel_Command(cmd, "media") == media_GmDocument(d->doc)) {
+            /* TODO: This is ours, we may have a MediaRequest with the data in memory. */
+        }
+        return iFalse;
+    }
     else if (equal_Command(cmd, "document.stop") && document_App() == d) {
         if (cancelRequest_DocumentWidget_(d, iTrue /* navigate back */)) {
             return iTrue;
@@ -5169,6 +5190,28 @@ void updateSize_DocumentWidget(iDocumentWidget *d) {
     invalidate_DocumentWidget_(d);
 }
 
+iBool findCachedContent_DocumentWidget(const iDocumentWidget *d, const iString *url,
+                                       iString *mime_out, iBlock *data_out) {
+    if (equal_String(d->mod.url, url) && !isRequestOngoing_DocumentWidget(d)) {
+        /* It's the currently open page. */
+        set_String(mime_out, &d->sourceMime);
+        set_Block(data_out, &d->sourceContent);
+        return iTrue;
+    }
+    /* Finished media requests are kept in memory while the page is open. */
+    iConstForEach(ObjectList, i, d->media) {
+        const iMediaRequest *mr = i.object;
+        if (mr->req &&
+            isFinished_GmRequest(mr->req) &&
+            equal_String(linkUrl_GmDocument(d->doc, mr->linkId), url)) {
+            set_String(mime_out, meta_GmRequest(mr->req));
+            set_Block(data_out, body_GmRequest(mr->req));
+            return iTrue;
+        }
+    }
+    return iFalse;
+}
+
 iBeginDefineSubclass(DocumentWidget, Widget)
     .processEvent = (iAny *) processEvent_DocumentWidget_,
     .draw         = (iAny *) draw_DocumentWidget_,
diff --git a/src/ui/documentwidget.h b/src/ui/documentwidget.h
index 1f2ecfc0..9bfab57a 100644
--- a/src/ui/documentwidget.h
+++ b/src/ui/documentwidget.h
@@ -48,6 +48,9 @@ const iString *     bookmarkTitle_DocumentWidget    (const iDocumentWidget *);
 const iString *     feedTitle_DocumentWidget        (const iDocumentWidget *);
 int                 documentWidth_DocumentWidget    (const iDocumentWidget *);
 
+iBool   findCachedContent_DocumentWidget(const iDocumentWidget *, const iString *url,
+                                         iString *mime_out, iBlock *data_out);
+
 enum iDocumentWidgetSetUrlFlags {
     useCachedContentIfAvailable_DocumentWidgetSetUrlFlag = iBit(1),
     openedFromSidebar_DocumentWidgetSetUrlFlag = iBit(2),
diff --git a/src/ui/mediaui.c b/src/ui/mediaui.c
index aa45d73a..ac9475dd 100644
--- a/src/ui/mediaui.c
+++ b/src/ui/mediaui.c
@@ -28,6 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "paint.h"
 #include "util.h"
 #include "lang.h"
+#include "app.h"
 
 #include <the_Foundation/path.h>
 #include <the_Foundation/stringlist.h>
@@ -281,14 +282,28 @@ void draw_DownloadUI(const iDownloadUI *d, iPaint *p) {
 
 /*----------------------------------------------------------------------------------------------*/
 
+static iMenuItem action_FontpackUI_(const iFontpackUI *d) {
+    if (d->info.isInstalled) {
+        return (iMenuItem){ d->info.isDisabled ? "${media.fontpack.enable}"
+                                            : close_Icon " ${media.fontpack.disable}",
+            0, 0, format_CStr("media.fontpack.enable arg:%d", d->info.isDisabled) };
+    }
+    return (iMenuItem){ d->info.isInstalled ? close_Icon " ${media.fontpack.disable}"
+                                            : "${media.fontpack.install}",
+            0, 0,
+        d->info.isInstalled ? "media.fontpack.enable arg:0" : "media.fontpack.install" };
+}
+
 void init_FontpackUI(iFontpackUI *d, const iMedia *media, uint16_t mediaId, iRect bounds) {
     d->media   = media;
     d->mediaId = mediaId;
+    fontpackInfo_Media(d->media, (iMediaId){ fontpack_MediaType, d->mediaId }, &d->info);
     d->bounds  = bounds;
-    d->installRect.size = add_I2(measure_Text(uiLabel_FontId, "${media.fontpack.install}").bounds.size,
-                                 muli_I2(gap2_UI, 3));
-    d->installRect.pos.x = right_Rect(d->bounds) - gap_UI - d->installRect.size.x;
-    d->installRect.pos.y = mid_Rect(d->bounds).y - d->installRect.size.y / 2;
+    iMenuItem action = action_FontpackUI_(d);
+    d->buttonRect.size = add_I2(measure_Text(uiLabel_FontId, action.label).bounds.size,
+                                muli_I2(gap2_UI, 3));
+    d->buttonRect.pos.x = right_Rect(d->bounds) - gap_UI - d->buttonRect.size.x;
+    d->buttonRect.pos.y = mid_Rect(d->bounds).y - d->buttonRect.size.y / 2;
 }
 
 iBool processEvent_FontpackUI(iFontpackUI *d, const SDL_Event *ev) {
@@ -296,7 +311,12 @@ iBool processEvent_FontpackUI(iFontpackUI *d, const SDL_Event *ev) {
         case SDL_MOUSEBUTTONDOWN:
         case SDL_MOUSEBUTTONUP: {
             const iInt2 pos = init_I2(ev->button.x, ev->button.y);
-            if (contains_Rect(d->installRect, pos)) {
+            if (contains_Rect(d->buttonRect, pos)) {
+                if (ev->type == SDL_MOUSEBUTTONUP) {
+                    postCommandf_App("%s media:%p mediaid:%u packid:%s",
+                                     action_FontpackUI_(d).command,
+                                     d->media, d->mediaId, cstr_String(d->info.packId.id));
+                }
                 return iTrue;
             }
             break;
@@ -322,24 +342,22 @@ void draw_FontpackUI(const iFontpackUI *d, iPaint *p) {
     /* Draw a background box. */
     fillRect_Paint(p, d->bounds, uiBackground_ColorId);
     drawRect_Paint(p, d->bounds, uiSeparator_ColorId);
-    iFontpackMediaInfo info;
-    fontpackInfo_Media(d->media, (iMediaId){ fontpack_MediaType, d->mediaId }, &info);
     iInt2 pos = topLeft_Rect(d->bounds);
     const char *checks[] = { "\u2610", "\u2611" };
-    draw_Text(uiContentBold_FontId, pos, uiHeading_ColorId, "\"%s\" v%d",
-              cstr_String(info.packId.id), info.packId.version);
+    draw_Text(uiContentBold_FontId, pos,
+              d->info.isDisabled ? uiText_ColorId : uiHeading_ColorId, "\"%s\" v%d",
+              cstr_String(d->info.packId.id), d->info.packId.version);
     pos.y += lineHeight_Text(uiContentBold_FontId);
     draw_Text(uiLabelBold_FontId, pos, uiText_ColorId, "%.1f MB, %d fonts   %s %s   %s",
-              info.sizeInBytes / 1.0e6, size_StringList(info.names),
+              d->info.sizeInBytes / 1.0e6, size_StringList(d->info.names),
 //              checks[info.isValid], info.isValid ? "No errors" : "Errors detected",
-              checks[info.isInstalled], info.isInstalled ? "Installed" : "Not installed",
-              info.isReadOnly ? "Read-Only" : "");
+              checks[d->info.isInstalled], d->info.isInstalled ? "Installed" : "Not installed",
+              d->info.isReadOnly ? "Read-Only" : "");
     pos.y += lineHeight_Text(uiLabelBold_FontId);
-    iConstForEach(StringList, i, info.names) {
+    iConstForEach(StringList, i, d->info.names) {
         drawRange_Text(uiLabel_FontId, pos, uiText_ColorId, range_String(i.value));
         pos.y += lineHeight_Text(uiLabel_FontId);
     }
     /* Buttons. */
-    drawInlineButton_(p, d->installRect,
-                      "${media.fontpack.install}", uiLabel_FontId);
+    drawInlineButton_(p, d->buttonRect, action_FontpackUI_(d).label, uiLabel_FontId);
 }
diff --git a/src/ui/mediaui.h b/src/ui/mediaui.h
index 73de1994..03ea0afc 100644
--- a/src/ui/mediaui.h
+++ b/src/ui/mediaui.h
@@ -22,6 +22,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 #pragma once
 
+#include "../media.h"
+
 #include <the_Foundation/rect.h>
 #include <SDL_events.h>
 
@@ -46,8 +48,6 @@ void    draw_PlayerUI   (iPlayerUI *, iPaint *p);
 
 /*----------------------------------------------------------------------------------------------*/
 
-iDeclareType(DocumentWidget)
-iDeclareType(Media)
 iDeclareType(DownloadUI)
 
 struct Impl_DownloadUI {
@@ -67,8 +67,9 @@ iDeclareType(FontpackUI)
 struct Impl_FontpackUI {
     const iMedia *media;
     uint16_t mediaId;
+    iFontpackMediaInfo info;
     iRect bounds;
-    iRect installRect;
+    iRect buttonRect;
 };
 
 void    init_FontpackUI         (iFontpackUI *, const iMedia *media, uint16_t mediaId, iRect bounds);