Media and FontPacks (work in progress)

Saving this as the last point of progress. This direction is too complicated: Media needs to be a lot more sophisticated to allow dynamic and interactive media at the level of FontPacks. (A bit like Player handles audio playback.)

This will be reverted. FontPack management will happen using an another method.

4 files changed, 83 insertions, 18 deletions

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);