Dismissing document warnings; Banner hover

The warning about terminal emulation can be dismissed on site-specific basis.

Banner items show a hover frame (like buttons) to indicate they can be clicked.

2 files changed, 58 insertions, 16 deletions

diff --git a/src/ui/banner.c b/src/ui/banner.c
index e817f1bb..cb30d8c5 100644
--- a/src/ui/banner.c
+++ b/src/ui/banner.c
@@ -56,6 +56,8 @@ struct Impl_Banner {
     iString icon;
     int siteHeight;
     iArray items;
+    iBool isHover;
+    size_t hoverIndex;
     iBool isClick;
 };
 
@@ -91,6 +93,8 @@ void init_Banner(iBanner *d) {
     init_String(&d->icon);
     init_Array(&d->items, sizeof(iBannerItem));
     d->isClick = iFalse;
+    d->isHover = iFalse;
+    d->hoverIndex = iInvalidPos;
 }
 
 void deinit_Banner(iBanner *d) {
@@ -222,7 +226,12 @@ void draw_Banner(const iBanner *d) {
         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);
+        drawRect_Paint(&p,
+                       itemRect,
+                       item->type == warning_BannerType && d->isHover &&
+                               d->hoverIndex == index_ArrayConstIterator(&i)
+                           ? tmBannerItemText_ColorId
+                           : tmBannerItemFrame_ColorId);
         setBaseAttributes_Text(uiContent_FontId, tmBannerItemText_ColorId);
         iWrapText wt = {
             .text = range_String(&item->text),
@@ -251,11 +260,22 @@ static size_t itemAtCoord_Banner_(const iBanner *d, iInt2 coord) {
 iBool processEvent_Banner(iBanner *d, const SDL_Event *ev) {
     iWidget *w = as_Widget(d->doc);
     switch (ev->type) {
-        case SDL_MOUSEMOTION:
-            if (contains_Rect(d->rect, init_I2(ev->motion.x, ev->motion.y))) {
+        case SDL_MOUSEMOTION: {
+            const iInt2 coord = init_I2(ev->motion.x, ev->motion.y);
+            const iBool isInside = contains_Rect(d->rect, coord);
+            if (isInside) {
                 setCursor_Window(window_Widget(w), SDL_SYSTEM_CURSOR_HAND);
             }
+            if (isInside ^ d->isHover) {
+                d->isHover = isInside;
+            }
+            const size_t at = d->isHover ? itemAtCoord_Banner_(d, coord) : iInvalidPos;
+            if (at != d->hoverIndex) {
+                d->hoverIndex = at;
+                refresh_Widget(w);
+            }
             break;
+        }
         case SDL_MOUSEBUTTONDOWN:
         case SDL_MOUSEBUTTONUP:
             /* Clicking on the top/side banner navigates to site root. */
@@ -276,6 +296,7 @@ iBool processEvent_Banner(iBanner *d, const SDL_Event *ev) {
                         }
                         else {
                             const iBannerItem *item = constAt_Array(&d->items, index);
+                            d->isHover = iFalse;
                             if (item->type == error_BannerType) {
                                 postCommand_Widget(d->doc, "document.info");
                             }
@@ -285,17 +306,23 @@ iBool processEvent_Banner(iBanner *d, const SDL_Event *ev) {
                                         postCommandf_App("open newtab:1 url:about:fonts");
                                         break;
                                     case ansiEscapes_GmStatusCode:
-                                        makeQuestion_Widget(uiHeading_ColorEscape "${heading.dismiss.warning}",
-                                                            format_Lang("${dlg.dismiss.ansi}",
-                                                                        format_CStr(uiTextStrong_ColorEscape "%s"
-                                                                                    restore_ColorEscape, cstr_Rangecc(urlHost_String(url_DocumentWidget(d->doc))))),
-                                                            (iMenuItem[]){ { "${cancel}" },
-                                            { uiTextAction_ColorEscape "${dlg.dismiss.warning}",
-                                                SDLK_RETURN, 0,
-                                                format_CStr("document.dismiss warning:%d",
-                                                            ansiEscapes_GmDocumentWarning)
-                                            }
-                                        }, 2);
+                                        makeQuestion_Widget(
+                                            uiHeading_ColorEscape "${heading.dismiss.warning}",
+                                            format_Lang(
+                                                "${dlg.dismiss.ansi}",
+                                                format_CStr(uiTextStrong_ColorEscape
+                                                            "%s" restore_ColorEscape,
+                                                            cstr_Rangecc(urlHost_String(
+                                                                url_DocumentWidget(d->doc))))),
+                                            (iMenuItem[]){
+                                                { "${cancel}" },
+                                                { uiTextAction_ColorEscape "${dlg.dismiss.warning}",
+                                                  SDLK_RETURN,
+                                                  0,
+                                                  format_CStr("!document.dismiss warning:%d ptr:%p",
+                                                              ansiEscapes_GmDocumentWarning,
+                                                              d->doc) } },
+                                            2);
                                         break;
                                     default:
                                         postCommand_Widget(d->doc, "document.info");
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 755cec6a..7e7a2983 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -47,6 +47,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "root.h"
 #include "mediaui.h"
 #include "scrollwidget.h"
+#include "sitespec.h"
 #include "touch.h"
 #include "translation.h"
 #include "uploadwidget.h"
@@ -1798,11 +1799,14 @@ static void cacheDocumentGlyphs_DocumentWidget_(const iDocumentWidget *d) {
 }
 
 static void addBannerWarnings_DocumentWidget_(iDocumentWidget *d) {
-    if (warnings_GmDocument(d->doc) & missingGlyphs_GmDocumentWarning) {
+    const int dismissed = value_SiteSpec(collectNewRange_String(urlRoot_String(d->mod.url)),
+                                         dismissWarnings_SiteSpecKey);
+    const int warnings = warnings_GmDocument(d->doc) & ~dismissed;
+    if (warnings & missingGlyphs_GmDocumentWarning) {
         add_Banner(d->banner, warning_BannerType, missingGlyphs_GmStatusCode, NULL);
         /* TODO: List one or more of the missing characters and/or their Unicode blocks? */
     }
-    if (warnings_GmDocument(d->doc) & ansiEscapes_GmDocumentWarning) {
+    if (warnings & ansiEscapes_GmDocumentWarning) {
         add_Banner(d->banner, warning_BannerType, ansiEscapes_GmStatusCode, NULL);
     }
 }
@@ -3383,6 +3387,17 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
     else if (equal_Command(cmd, "document.autoreload.set") && document_App() == d) {
         d->mod.reloadInterval = arg_Command(cmd);
     }
+    else if (equalWidget_Command(cmd, w, "document.dismiss")) {
+        const iString *site = collectNewRange_String(urlRoot_String(d->mod.url));
+        const int dismissed = value_SiteSpec(site, dismissWarnings_SiteSpecKey);
+        const int arg = argLabel_Command(cmd, "warning");
+        setValue_SiteSpec(site, dismissWarnings_SiteSpecKey, dismissed | arg);
+        if (arg == ansiEscapes_GmDocumentWarning) {
+            remove_Banner(d->banner, ansiEscapes_GmStatusCode);
+            refresh_Widget(w);
+        }
+        return iTrue;
+    }
     else if (startsWith_CStr(cmd, "pinch.") && document_Command(cmd) == d) {
         return handlePinch_DocumentWidget_(d, cmd);
     }