4 files changed, 144 insertions, 68 deletions

diff --git a/src/ui/banner.c b/src/ui/banner.c
index d1ed470c..d95c853b 100644
--- a/src/ui/banner.c
+++ b/src/ui/banner.c
@@ -24,6 +24,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 #include "command.h"
 #include "documentwidget.h"
+#include "lang.h"
 #include "paint.h"
 #include "util.h"
 
@@ -32,17 +33,17 @@ iDeclareType(BannerItem)
 struct Impl_BannerItem {
     enum iBannerType type;
     enum iGmStatusCode code;
-    iString message;
+    iString text; /* Entire message in presentation form. */
     int height;
 };
 
 static void init_BannerItem(iBannerItem *d) {
-    init_String(&d->message);
+    init_String(&d->text);
     d->height = 0;
 }
 
 static void deinit_BannerItem(iBannerItem *d) {
-    deinit_String(&d->message);
+    deinit_String(&d->text);
 }
 
 /*----------------------------------------------------------------------------------------------*/
@@ -60,9 +61,20 @@ iDefineTypeConstruction(Banner)
 
 static void updateHeight_Banner_(iBanner *d) {
     d->rect.size.y = 0;
-    if (!isEmpty_String(&d->site)) { //} || !isEmpty_String(&d->icon)) {
+    if (!isEmpty_String(&d->site)) {
         d->rect.size.y += lineHeight_Text(banner_FontId) * 2;
     }
+    const size_t numItems = size_Array(&d->items);
+    if (numItems) {
+        const int outerPad = 2 * gap_UI;
+        const int innerPad = gap_UI;
+        iConstForEach(Array, i, &d->items) {
+            const iBannerItem *item = i.value;
+            d->rect.size.y += item->height;
+        }
+        d->rect.size.y += (numItems - 1) * innerPad;
+        d->rect.size.y += outerPad;
+    }
 }
 
 void init_Banner(iBanner *d) {
@@ -85,8 +97,18 @@ void setOwner_Banner(iBanner *d, iDocumentWidget *owner) {
     d->doc = owner;
 }
 
+static void updateItemHeight_Banner_(const iBanner *d, iBannerItem *item) {
+    item->height = measureWrapRange_Text(uiContent_FontId,
+                                         width_Rect(d->rect) - 6 * gap_UI,
+                                         range_String(&item->text))
+                       .bounds.size.y + 4 * gap_UI;
+}
+
 void setWidth_Banner(iBanner *d, int width) {
     d->rect.size.x = width;
+    iForEach(Array, i, &d->items) {
+        updateItemHeight_Banner_(d, i.value);
+    }
     updateHeight_Banner_(d);
 }
 
@@ -98,6 +120,10 @@ int height_Banner(const iBanner *d) {
     return d->rect.size.y;
 }
 
+size_t numItems_Banner(const iBanner *d) {
+    return size_Array(&d->items);
+}
+
 iBool contains_Banner(const iBanner *d, iInt2 coord) {
     return contains_Rect(d->rect, coord);
 }
@@ -127,7 +153,19 @@ void add_Banner(iBanner *d, enum iBannerType type, enum iGmStatusCode code, cons
     init_BannerItem(&item);
     item.type = type;
     item.code = code;
-    set_String(&item.message, message);
+    const iGmError *error = get_GmError(code);
+    if (error->icon) {
+        appendCStr_String(&item.text, escape_Color(tmBannerIcon_ColorId));
+        appendChar_String(&item.text, error->icon);
+        appendCStr_String(&item.text, restore_ColorEscape);
+    }
+    appendFormat_String(&item.text, "  \x1b[1m%s%s\x1b[0m \u2014 %s%s",
+                        escape_Color(tmBannerItemTitle_ColorId),
+                        !isEmpty_String(message) ? cstr_String(message) : error->title,
+                        escape_Color(tmBannerItemText_ColorId),
+                        error->info);
+    translate_Lang(&item.text);
+    updateItemHeight_Banner_(d, &item);
     pushBack_Array(&d->items, &item);
     updateHeight_Banner_(d);
 }
@@ -143,6 +181,53 @@ void remove_Banner(iBanner *d, enum iGmStatusCode code) {
     updateHeight_Banner_(d);
 }
 
+void draw_Banner(const iBanner *d) {
+    if (isEmpty_Banner(d)) {
+        return;
+    }
+    iRect  bounds = d->rect;
+    iInt2  pos    = addY_I2(topLeft_Rect(bounds), lineHeight_Text(banner_FontId) / 2);
+    iPaint p;
+    init_Paint(&p);
+//    drawRect_Paint(&p, bounds, red_ColorId);
+    /* Draw the icon. */
+    if (!isEmpty_String(&d->icon)) {
+        const int   font     = banner_FontId;
+        const iRect iconRect = visualBounds_Text(font, range_String(&d->icon));
+        drawRange_Text(font,
+                       addY_I2(pos, -mid_Rect(iconRect).y + lineHeight_Text(font) / 2),
+                       tmBannerIcon_ColorId,
+                       range_String(&d->icon));
+        pos.x += right_Rect(iconRect) + 3 * gap_Text;
+    }
+    /* Draw the site name. */
+    if (!isEmpty_String(&d->site)) {
+        drawRange_Text(banner_FontId, pos, tmBannerTitle_ColorId, range_String(&d->site));
+        pos.y += lineHeight_Text(banner_FontId) * 3 / 2;
+    }
+    else {
+        pos.y = top_Rect(bounds);
+    }
+    const int innerPad = gap_UI;
+    pos.x = left_Rect(bounds);
+    iConstForEach(Array, i, &d->items) {
+        const iBannerItem *item = i.value;
+        const iRect itemRect = { pos, init_I2(d->rect.size.x, item->height) };
+        fillRect_Paint(&p, itemRect, tmBannerItemBackground_ColorId);
+        drawRect_Paint(&p, itemRect, tmBannerItemFrame_ColorId);
+        setBaseAttributes_Text(uiContent_FontId, tmBannerItemText_ColorId);
+        iWrapText wt = {
+            .text = range_String(&item->text),
+            .maxWidth = width_Rect(itemRect) - 6 * gap_UI,
+            .mode = word_WrapTextMode
+        };
+        draw_WrapText(&wt, uiContent_FontId, add_I2(pos, init_I2(3 * gap_UI, 2 * gap_UI)),
+                      tmBannerItemText_ColorId);
+        pos.y += innerPad;
+    }
+    setBaseAttributes_Text(-1, -1);
+}
+
 iBool processEvent_Banner(iBanner *d, const SDL_Event *ev) {
     iWidget *w = as_Widget(d->doc);
     switch (ev->type) {
@@ -269,28 +354,3 @@ static void drawBannerRun_DrawContext_(iDrawContext *d, const iGmRun *run, iInt2
     deinit_String(&str);
 }
 #endif
-
-void draw_Banner(const iBanner *d) {
-    if (isEmpty_Banner(d)) {
-        return;
-    }
-    iRect  bounds = d->rect;
-    iInt2  pos    = addY_I2(topLeft_Rect(bounds), lineHeight_Text(banner_FontId) / 2);
-    iPaint p;
-    init_Paint(&p);
-//    drawRect_Paint(&p, bounds, red_ColorId);
-    /* Draw the icon. */
-    if (!isEmpty_String(&d->icon)) {
-        const int   font     = banner_FontId;
-        const iRect iconRect = visualBounds_Text(font, range_String(&d->icon));
-        drawRange_Text(font,
-                       addY_I2(pos, -mid_Rect(iconRect).y + lineHeight_Text(font) / 2),
-                       tmBannerIcon_ColorId,
-                       range_String(&d->icon));
-        pos.x += right_Rect(iconRect) + 3 * gap_Text;
-    }
-    /* Draw the site name. */
-    if (!isEmpty_String(&d->site)) {
-        drawRange_Text(banner_FontId, pos, tmBannerTitle_ColorId, range_String(&d->site));
-    }
-}
diff --git a/src/ui/banner.h b/src/ui/banner.h
index 2ee3a2bc..d652c85f 100644
--- a/src/ui/banner.h
+++ b/src/ui/banner.h
@@ -42,6 +42,7 @@ void    setWidth_Banner     (iBanner *, int width);
 void    setPos_Banner       (iBanner *, iInt2 pos);
 
 int     height_Banner       (const iBanner *);
+size_t  numItems_Banner     (const iBanner *);
 iBool   contains_Banner     (const iBanner *, iInt2 coord);
 
 iLocalDef iBool isEmpty_Banner(const iBanner *d) {
diff --git a/src/ui/color.h b/src/ui/color.h
index c9dff598..5e96c300 100644
--- a/src/ui/color.h
+++ b/src/ui/color.h
@@ -159,6 +159,11 @@ enum iColorId {
     tmGopherLinkTextHover_ColorId,
     tmGopherLinkDomain_ColorId,
     tmGopherLinkLastVisitDate_ColorId,
+    
+    tmBannerItemBackground_ColorId,
+    tmBannerItemFrame_ColorId,
+    tmBannerItemTitle_ColorId,
+    tmBannerItemText_ColorId,
 
     max_ColorId, /* note: GmRun packs color into limited number of bits */
     tmMax_ColorId = max_ColorId - tmFirst_ColorId
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 75da67a1..13a8dae7 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -538,9 +538,14 @@ static iRect documentBounds_DocumentWidget_(const iDocumentWidget *d) {
     if (d->flags & centerVertically_DocumentWidgetFlag) {
         const iInt2 docSize = addY_I2(size_GmDocument(d->doc),
                                       iMax(height_Widget(d->footerButtons), height_Widget(d->phoneToolbar)));
-        if (docSize.y < rect.size.y) {
-            /* Center vertically if short. There is one empty paragraph line's worth of margin
-               between the banner and the page contents. */
+        if (size_GmDocument(d->doc).y == 0) {
+            rect.pos.y = top_Rect(bounds) + height_Rect(bounds) / 2 -
+                documentTopPad_DocumentWidget_(d) - height_Banner(d->banner) / 2;
+            rect.size.y = 0;
+            wasCentered = iTrue;
+        }
+        else if (docSize.y < rect.size.y) {
+            /* Center vertically if page is short. */
             int offset = iMax(0, height_Rect(bounds) / 2
                               - documentTopPad_DocumentWidget_(d)
                               - height_Banner(d->banner)
@@ -1126,7 +1131,7 @@ static void replaceDocument_DocumentWidget_(iDocumentWidget *d, iGmDocument *new
 }
 
 static void updateBanner_DocumentWidget_(iDocumentWidget *d) {
-    clear_Banner(d->banner);
+    /* TODO: Set width. */
     setSite_Banner(d->banner, siteText_DocumentWidget_(d), siteIcon_GmDocument(d->doc));
 }
 
@@ -1197,21 +1202,22 @@ static void makeFooterButtons_DocumentWidget_(iDocumentWidget *d, const iMenuIte
 static void showErrorPage_DocumentWidget_(iDocumentWidget *d, enum iGmStatusCode code,
                                           const iString *meta) {
     /* TODO: No such thing as an "error page". It should be an empty page with an error banner. */
-#if 0
-    iString *src = collectNewCStr_String("# ");
+    iString *src = collectNew_String();
     const iGmError *msg = get_GmError(code);
-    appendChar_String(src, msg->icon ? msg->icon : 0x2327); /* X in a box */
-    appendFormat_String(src, " %s\n%s", msg->title, msg->info);
-    iBool useBanner = iTrue;
+  //  appendChar_String(src, msg->icon ? msg->icon : 0x2327); /* X in a box */
+    //appendFormat_String(src, " %s\n%s", msg->title, msg->info);
+//    iBool useBanner = iTrue;
+    destroy_Widget(d->footerButtons);
+    d->footerButtons = NULL;
     if (meta) {
         switch (code) {
             case schemeChangeRedirect_GmStatusCode:
             case tooManyRedirects_GmStatusCode:
-                appendFormat_String(src, "\n=> %s\n", cstr_String(meta));
+                appendFormat_String(src, "=> %s\n", cstr_String(meta));
                 break;
             case tlsFailure_GmStatusCode:
-                useBanner = iFalse; /* valid data wasn't received from host */
-                appendFormat_String(src, "\n\n>%s\n", cstr_String(meta));
+//                useBanner = iFalse; /* valid data wasn't received from host */
+//                appendFormat_String(src, ">%s\n", cstr_String(meta));
                 break;
             case tlsServerCertificateExpired_GmStatusCode:
                 makeFooterButtons_DocumentWidget_(
@@ -1236,12 +1242,12 @@ static void showErrorPage_DocumentWidget_(iDocumentWidget *d, enum iGmStatusCode
                 break;
             case failedToOpenFile_GmStatusCode:
             case certificateNotValid_GmStatusCode:
-                appendFormat_String(src, "\n\n%s", cstr_String(meta));
+//                appendFormat_String(src, "%s", cstr_String(meta));
                 break;
             case unsupportedMimeType_GmStatusCode: {
                 iString *key = collectNew_String();
                 toString_Sym(SDLK_s, KMOD_PRIMARY, key);
-                appendFormat_String(src, "\n```\n%s\n```\n", cstr_String(meta));
+//                appendFormat_String(src, "\n```\n%s\n```\n", cstr_String(meta));
                 const char *mtype = mediaTypeFromFileExtension_String(d->mod.url);
                 iArray items;
                 init_Array(&items, sizeof(iMenuItem));
@@ -1264,9 +1270,9 @@ static void showErrorPage_DocumentWidget_(iDocumentWidget *d, enum iGmStatusCode
                 break;
             }
             default:
-                if (!isEmpty_String(meta)) {
-                    appendFormat_String(src, "\n\n${error.server.msg}\n> %s", cstr_String(meta));
-                }
+//                if (!isEmpty_String(meta)) {
+//                    appendFormat_String(src, "\n\n${error.server.msg}\n> %s", cstr_String(meta));
+//                }
                 break;
         }
     }
@@ -1277,19 +1283,17 @@ static void showErrorPage_DocumentWidget_(iDocumentWidget *d, enum iGmStatusCode
                            { person_Icon " ${menu.identity.new}", newIdentity_KeyShortcut, "ident.new" } },
             2);
     }
-    /* Make a new document for the error page.*/ {
-        iGmDocument *errorDoc = new_GmDocument();
-        setUrl_GmDocument(errorDoc, d->mod.url);
-//        setBanner_GmDocument(errorDoc, useBanner ? bannerType_DocumentWidget_(d) : none_GmDocumentBanner);
-        
-        setFormat_GmDocument(errorDoc, gemini_SourceFormat);
-        replaceDocument_DocumentWidget_(d, errorDoc);
-        iRelease(errorDoc);
-    }
-    translate_Lang(src);
-#endif
+    /* Make a new document for the error page.*/
+    iGmDocument *errorDoc = new_GmDocument();
+    setUrl_GmDocument(errorDoc, d->mod.url);
+    setFormat_GmDocument(errorDoc, gemini_SourceFormat);
+    replaceDocument_DocumentWidget_(d, errorDoc);
+    iRelease(errorDoc);
+    clear_Banner(d->banner);
+    add_Banner(d->banner, error_BannerType, code, meta);
+//    translate_Lang(src);
     d->state = ready_RequestState;
-//    setSource_DocumentWidget(d, src);
+    setSource_DocumentWidget(d, src);
     updateTheme_DocumentWidget_(d);
     reset_SmoothScroll(&d->scrollY);
     init_Anim(&d->sideOpacity, 0);
@@ -1818,6 +1822,7 @@ static void updateFromCachedResponse_DocumentWidget_(iDocumentWidget *d, float n
         updateDocument_DocumentWidget_(d, resp, cachedDoc, iTrue);
 //        setCachedDocument_History(d->mod.history, d->doc,
 //                                  (d->flags & openedFromSidebar_DocumentWidgetFlag) != 0);
+        clear_Banner(d->banner);
         updateBanner_DocumentWidget_(d);
     }
     d->state = ready_RequestState;
@@ -2043,6 +2048,7 @@ static void checkResponse_DocumentWidget_(iDocumentWidget *d) {
     iGmResponse *resp = lockResponse_GmRequest(d->request);
     if (d->state == fetching_RequestState) {
         d->state = receivedPartialResponse_RequestState;
+        clear_Banner(d->banner);
         updateTrust_DocumentWidget_(d, resp);
         if (~d->certFlags & trusted_GmCertFlag &&
             isSuccess_GmStatusCode(statusCode) &&
@@ -4941,9 +4947,12 @@ static void draw_DocumentWidget_(const iDocumentWidget *d) {
     int         yTop             = docBounds.pos.y + viewPos_DocumentWidget_(d);
     const iBool isDocEmpty       = size_GmDocument(d->doc).y == 0;
     const iBool isTouchSelecting = (flags_Widget(w) & touchDrag_WidgetFlag) != 0;
-    if (!isDocEmpty) {
+    if (!isDocEmpty || !isEmpty_Banner(d->banner)) {
+        const int docBgColor = isDocEmpty ? tmBannerBackground_ColorId : tmBackground_ColorId;
         setClip_Paint(&ctx.paint, clipBounds);
-        draw_VisBuf(d->visBuf, init_I2(bounds.pos.x, yTop), ySpan_Rect(bounds));
+        if (!isDocEmpty) {
+            draw_VisBuf(d->visBuf, init_I2(bounds.pos.x, yTop), ySpan_Rect(bounds));
+        }
         /* Text markers. */
         if (!isEmpty_Range(&d->foundMark) || !isEmpty_Range(&d->selectMark)) {
             SDL_Renderer *render = renderer_Window(get_Window());
@@ -4980,23 +4989,24 @@ static void draw_DocumentWidget_(const iDocumentWidget *d) {
             fillRect_Paint(&ctx.paint,
                            (iRect){ bounds.pos, init_I2(bounds.size.x, yTop - top_Rect(bounds)) },
                            !isEmpty_Banner(d->banner) ? tmBannerBackground_ColorId
-                                                      : tmBackground_ColorId);
+                                                      : docBgColor);
         }
-        /* Banner. */ {
+        /* Banner. */
+        if (!isDocEmpty || numItems_Banner(d->banner) > 0) {
             /* Fill the part between the banner and the top of the document. */
             fillRect_Paint(&ctx.paint,
                            (iRect){ init_I2(left_Rect(bounds),
                                             top_Rect(docBounds) + viewPos_DocumentWidget_(d) -
                                                 documentTopPad_DocumentWidget_(d)),
                                     init_I2(bounds.size.x, documentTopPad_DocumentWidget_(d)) },
-                           tmBackground_ColorId);
+                           docBgColor);
             draw_Banner(d->banner);
         }
-        const int yBottom = yTop + size_GmDocument(d->doc).y + 1;
+        const int yBottom = yTop + size_GmDocument(d->doc).y;
         if (yBottom < bottom_Rect(bounds)) {
             fillRect_Paint(&ctx.paint,
                            init_Rect(bounds.pos.x, yBottom, bounds.size.x, bottom_Rect(bounds) - yBottom),
-                           tmBackground_ColorId);
+                           !isDocEmpty ? docBgColor : tmBannerBackground_ColorId);
         }
         unsetClip_Paint(&ctx.paint);
         drawSideElements_DocumentWidget_(d);
@@ -5016,9 +5026,9 @@ static void draw_DocumentWidget_(const iDocumentWidget *d) {
     drawChildren_Widget(w);
     if (d->flags & drawDownloadCounter_DocumentWidgetFlag && isRequestOngoing_DocumentWidget(d)) {
         const int font = uiLabelLarge_FontId;
-        const iInt2 sevenSegWidth = measureRange_Text(font, range_CStr("\U0001fbf0")).advance;
+        const iInt2 sevenSegWidth = measureRange_Text(font, range_CStr("\U0001fbf0")).bounds.size;
         drawSevenSegmentBytes_MediaUI(font,
-                                      add_I2(mid_Rect(docBounds),
+                                      add_I2(mid_Rect(bounds),
                                              init_I2(sevenSegWidth.x * 4.5f, -sevenSegWidth.y / 2)),
                                       uiTextStrong_ColorId, uiTextDim_ColorId,
                                       bodySize_GmRequest(d->request));