Font update; ANSI color escapes; fixed URL update

Newer version of the Fira fonts, and added a separate UI font (Source Sans Pro).

The text renderer checks for the 4-bit ANSI color escapes for the setting the foreground color.

InputWidget supports paste from clipboard.

The navbar updates the current URL when the page has been loaded.

16 files changed, 153 insertions, 28 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index be56af23..0aaa2bb5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,6 +19,7 @@ set (EMBED_RESOURCES
     res/FiraSans-Bold.ttf
     res/FiraSans-LightItalic.ttf
     res/FiraMono-Regular.ttf
+    res/SourceSansPro-Regular.ttf
 )
 # if (UNIX AND NOT APPLE)
 #     list (APPEND EMBED_RESOURCES res/appicon-64.png)
diff --git a/res/FiraMono-Regular.ttf b/res/FiraMono-Regular.ttf
index c4f34328..59e1e1a1 100644
--- a/res/FiraMono-Regular.ttf
+++ b/res/FiraMono-Regular.ttf
diff --git a/res/FiraSans-Bold.ttf b/res/FiraSans-Bold.ttf
index 04830e7e..95e16602 100644
--- a/res/FiraSans-Bold.ttf
+++ b/res/FiraSans-Bold.ttf
diff --git a/res/FiraSans-LightItalic.ttf b/res/FiraSans-LightItalic.ttf
index 3d3cc107..4b4c3a22 100644
--- a/res/FiraSans-LightItalic.ttf
+++ b/res/FiraSans-LightItalic.ttf
diff --git a/res/FiraSans-Regular.ttf b/res/FiraSans-Regular.ttf
index a4e65638..d9fdc0e9 100644
--- a/res/FiraSans-Regular.ttf
+++ b/res/FiraSans-Regular.ttf
diff --git a/res/SourceSansPro-Regular.ttf b/res/SourceSansPro-Regular.ttf
new file mode 100644
index 00000000..d9344ce8
--- /dev/null
+++ b/res/SourceSansPro-Regular.ttf
diff --git a/src/gmdocument.c b/src/gmdocument.c
index 8355a0eb..6fde864a 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -151,7 +151,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
         header1_FontId,
         header2_FontId,
         header3_FontId,
-        default_FontId,
+        regular_FontId,
     };
     static const int colors[max_GmLineType] = {
         gray75_ColorId,
@@ -267,7 +267,13 @@ static void doLayout_GmDocument_(iGmDocument *d) {
             const char *contPos;
             run.bounds.size = tryAdvanceRange_Text(
                 run.font, runLine, isPreformat ? 0 : (d->size.x - run.bounds.pos.x), &contPos);
-            run.text = (iRangecc){ runLine.start, contPos };
+            if (contPos > runLine.start) {
+                run.text = (iRangecc){ runLine.start, contPos };
+            }
+            else {
+                run.text = runLine;
+                contPos = runLine.end;
+            }
             pushBack_Array(&d->layout, &run);
             runLine.start = contPos;
             trimStart_Rangecc(&runLine);
diff --git a/src/gmrequest.c b/src/gmrequest.c
index 2bda65e9..ce53abee 100644
--- a/src/gmrequest.c
+++ b/src/gmrequest.c
@@ -58,9 +58,9 @@ void deinit_GmRequest(iGmRequest *d) {
             iDisconnectObject(TlsRequest, d->req, finished, d);
             cancel_TlsRequest(d->req);
             d->state = finished_GmRequestState;
-            iRelease(d->req);
-            d->req = NULL;
         }
+        iRelease(d->req);
+        d->req = NULL;
     }
     unlock_Mutex(&d->mutex);
     delete_Audience(d->finished);
@@ -237,4 +237,8 @@ const iBlock *body_GmRequest(const iGmRequest *d) {
     return body;
 }
 
+const iString *url_GmRequest(const iGmRequest *d) {
+    return &d->url;
+}
+
 iDefineClass(GmRequest)
diff --git a/src/gmrequest.h b/src/gmrequest.h
index e7d5916b..b2cd339b 100644
--- a/src/gmrequest.h
+++ b/src/gmrequest.h
@@ -21,3 +21,4 @@ const char *        error_GmRequest         (const iGmRequest *); /* NULL if suc
 enum iGmStatusCode  status_GmRequest        (const iGmRequest *);
 const iString *     meta_GmRequest          (const iGmRequest *);
 const iBlock  *     body_GmRequest          (const iGmRequest *);
+const iString *     url_GmRequest           (const iGmRequest *);
diff --git a/src/ui/color.c b/src/ui/color.c
index d6a995c7..179006c1 100644
--- a/src/ui/color.c
+++ b/src/ui/color.c
@@ -1,5 +1,7 @@
 #include "color.h"
 
+#include <the_Foundation/string.h>
+
 static const iColor transparent_;
 
 iColor get_Color(int color) {
@@ -26,3 +28,65 @@ iColor get_Color(int color) {
     }
     return *clr;
 }
+
+iColor ansi_Color(iRangecc escapeSequence, int fallback) {
+    iColor clr = get_Color(fallback);
+    for (const char *ch = escapeSequence.start; ch < escapeSequence.end; ch++) {
+        char *endPtr;
+        unsigned long arg = strtoul(ch, &endPtr, 10);
+        ch = endPtr;
+        switch (arg) {
+            default:
+                break;
+            case 30:
+                clr = (iColor){ 0, 0, 0, 255 };
+                break;
+            case 31:
+                clr = (iColor){ 170, 0, 0, 255 };
+                break;
+            case 32:
+                clr = (iColor){ 0, 170, 0, 255 };
+                break;
+            case 33:
+                clr = (iColor){ 170, 85, 0, 255 };
+                break;
+            case 34:
+                clr = (iColor){ 0, 0, 170, 255 };
+                break;
+            case 35:
+                clr = (iColor){ 170, 0, 170, 255 };
+                break;
+            case 36:
+                clr = (iColor){ 0, 170, 170, 255 };
+                break;
+            case 37:
+                clr = (iColor){ 170, 170, 170, 255 };
+                break;
+            case 90:
+                clr = (iColor){ 85, 85, 85, 255 };
+                break;
+            case 91:
+                clr = (iColor){ 255, 85, 85, 255 };
+                break;
+            case 92:
+                clr = (iColor){ 85, 255, 85, 255 };
+                break;
+            case 93:
+                clr = (iColor){ 255, 255, 85, 255 };
+                break;
+            case 94:
+                clr = (iColor){ 85, 85, 255, 255 };
+                break;
+            case 95:
+                clr = (iColor){ 255, 85, 255, 255 };
+                break;
+            case 96:
+                clr = (iColor){ 85, 255, 255, 255 };
+                break;
+            case 97:
+                clr = (iColor){ 255, 255, 255, 255 };
+                break;
+        }
+    }
+    return clr;
+}
diff --git a/src/ui/color.h b/src/ui/color.h
index aeb57375..7587e213 100644
--- a/src/ui/color.h
+++ b/src/ui/color.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <the_Foundation/defs.h>
+#include <the_Foundation/range.h>
 
 enum iColorId {
     none_ColorId = -1,
@@ -48,3 +48,4 @@ struct Impl_Color {
 };
 
 iColor  get_Color   (int color);
+iColor  ansi_Color  (iRangecc escapeSequence, int fallback);
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 121ca7cf..2466675e 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -368,6 +368,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
         checkResponseCode_DocumentWidget_(d);
         d->state = ready_DocumentState;
         iReleasePtr(&d->request);
+        postCommandf_App("document.changed url:%s", cstr_String(d->url));
         return iTrue;
     }
     else if (isCommand_Widget(w, ev, "scroll.moved")) {
diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index b73fac9e..22b30616 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -3,6 +3,7 @@
 #include "util.h"
 
 #include <the_Foundation/array.h>
+#include <SDL_clipboard.h>
 #include <SDL_timer.h>
 
 static const int REFRESH_INTERVAL = 256;
@@ -132,6 +133,23 @@ void end_InputWidget(iInputWidget *d, iBool accept) {
     postCommand_Widget(w, "input.ended id:%s arg:%d", id, accept ? 1 : 0);
 }
 
+static void insertChar_InputWidget_(iInputWidget *d, iChar chr) {
+    if (d->mode == insert_InputMode) {
+        insert_Array(&d->text, d->cursor, &chr);
+        d->cursor++;
+    }
+    else if (d->maxLen == 0 || d->cursor < d->maxLen) {
+        if (d->cursor >= size_Array(&d->text)) {
+            resize_Array(&d->text, d->cursor + 1);
+        }
+        set_Array(&d->text, d->cursor++, &chr);
+        if (d->maxLen && d->cursor == d->maxLen) {
+            setFocus_Widget(NULL);
+        }
+    }
+    refresh_Widget(as_Widget(d));
+}
+
 static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
     iWidget *w = as_Widget(d);
     if (isCommand_Widget(w, ev, "focus.gained")) {
@@ -161,6 +179,20 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
     if (ev->type == SDL_KEYDOWN && isFocused_Widget(w)) {
         const int key  = ev->key.keysym.sym;
         const int mods = keyMods_Sym(ev->key.keysym.mod);
+        if (mods == KMOD_PRIMARY) {
+            switch (key) {
+                case 'v':
+                    if (SDL_HasClipboardText()) {
+                        char *text = SDL_GetClipboardText();
+                        iString *paste = collect_String(newCStr_String(text));
+                        SDL_free(text);
+                        iConstForEach(String, i, paste) {
+                            insertChar_InputWidget_(d, i.value);
+                        }
+                    }
+                    return iTrue;
+            }
+        }
         switch (key) {
             case SDLK_RETURN:
             case SDLK_KP_ENTER:
@@ -237,21 +269,9 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
     }
     else if (ev->type == SDL_TEXTINPUT && isFocused_Widget(w)) {
         const iString *uni = collectNewCStr_String(ev->text.text);
-        const iChar    chr = first_String(uni);
-        if (d->mode == insert_InputMode) {
-            insert_Array(&d->text, d->cursor, &chr);
-            d->cursor++;
-        }
-        else {
-            if (d->cursor >= size_Array(&d->text)) {
-                resize_Array(&d->text, d->cursor + 1);
-            }
-            set_Array(&d->text, d->cursor++, &chr);
-            if (d->maxLen && d->cursor == d->maxLen) {
-                setFocus_Widget(NULL);
-            }
+        iConstForEach(String, i, uni) {
+            insertChar_InputWidget_(d, i.value);
         }
-        refresh_Widget(w);
         return iTrue;
     }
     return processEvent_Widget(w, ev);
@@ -259,7 +279,7 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
 
 static void draw_InputWidget_(const iInputWidget *d) {
     const uint32_t time   = frameTime_Window(get_Window());
-    const iInt2 padding   = init_I2(3 * gap_UI, gap_UI);
+    const iInt2 padding   = init_I2(3 * gap_UI, gap_UI / 2);
     iRect       bounds    = adjusted_Rect(bounds_Widget(constAs_Widget(d)), padding, neg_I2(padding));
     const iBool isFocused = isFocused_Widget(constAs_Widget(d));
     const iBool isHover   = isHover_Widget(constAs_Widget(d)) &&
@@ -286,13 +306,19 @@ static void draw_InputWidget_(const iInputWidget *d) {
         }
         xOff = iMin(xOff, 0);
     }
-    draw_Text(d->font, addX_I2(topLeft_Rect(bounds), xOff), white_ColorId, cstr_String(&text));
+    const int yOff = (height_Rect(bounds) - lineHeight_Text(d->font)) / 2;
+    draw_Text(d->font,
+              add_I2(topLeft_Rect(bounds),
+                     init_I2(xOff, yOff)),
+              white_ColorId,
+              cstr_String(&text));
     clearClip_Paint(&p);
     /* Cursor blinking. */
     if (isFocused && (time & 256)) {
         const iInt2 prefixSize = advanceN_Text(d->font, cstr_String(&text), d->cursor);
-        const iInt2 curPos     = init_I2(xOff + left_Rect(bounds) + prefixSize.x, top_Rect(bounds));
-        const iRect curRect    = { curPos, addX_I2(emSize, 1) };
+        const iInt2 curPos = init_I2(xOff + left_Rect(bounds) + prefixSize.x,
+                                     yOff + top_Rect(bounds));
+        const iRect curRect = { curPos, addX_I2(emSize, 1) };
         iString     cur;
         if (d->cursor < size_Array(&d->text)) {
             initUnicodeN_String(&cur, constAt_Array(&d->text, d->cursor), 1);
diff --git a/src/ui/metrics.c b/src/ui/metrics.c
index 949daaff..3c4bfd75 100644
--- a/src/ui/metrics.c
+++ b/src/ui/metrics.c
@@ -2,7 +2,7 @@
 
 #include <the_Foundation/math.h>
 
-#define defaultFontSize_Metrics     20
+#define defaultFontSize_Metrics     18
 #define defaultGap_Metrics          4
 
 int   gap_UI      = defaultGap_Metrics;
diff --git a/src/ui/text.c b/src/ui/text.c
index 27c41396..f1c2c947 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -11,6 +11,7 @@
 #include <the_Foundation/file.h>
 #include <the_Foundation/hash.h>
 #include <the_Foundation/math.h>
+#include <the_Foundation/regexp.h>
 #include <the_Foundation/path.h>
 #include <the_Foundation/vec2.h>
 
@@ -89,12 +90,14 @@ struct Impl_Text {
     iInt2         cachePos;
     int           cacheRowHeight;
     SDL_Palette * grayscale;
+    iRegExp *     ansiEscape;
 };
 
 static iText text_;
 
 void init_Text(SDL_Renderer *render) {
     iText *d = &text_;
+    d->ansiEscape = new_RegExp("\\[([0-9;]+)m", 0);
     d->render = render;
     /* A grayscale palette for rasterized glyphs. */ {
         SDL_Color colors[256];
@@ -117,6 +120,7 @@ void init_Text(SDL_Renderer *render) {
     }
     /* Load the fonts. */ {
         const struct { const iBlock *ttf; int size; } fontData[max_FontId] = {
+            { &fontSourceSansProRegular_Embedded, fontSize_UI },
             { &fontFiraSansRegular_Embedded, fontSize_UI },
             { &fontFiraMonoRegular_Embedded, fontSize_UI * 0.866f },
             { &fontFiraMonoRegular_Embedded, fontSize_UI * 0.666f },
@@ -141,6 +145,7 @@ void deinit_Text(void) {
     }
     SDL_DestroyTexture(d->cache);
     d->render = NULL;
+    iRelease(d->ansiEscape);
 }
 
 static SDL_Surface *rasterizeGlyph_Font_(const iFont *d, iChar ch, float xShift) {
@@ -414,6 +419,20 @@ static iInt2 run_Font_(iFont *d, enum iRunMode mode, iRangecc text, size_t maxLe
     iChar prevCh = 0;
     for (const char *chPos = text.start; chPos != text.end; ) {
         iAssert(chPos < text.end);
+        if (*chPos == 0x1b) {
+            /* ANSI escape. */
+            chPos++;
+            iRegExpMatch m;
+            if (match_RegExp(text_.ansiEscape, chPos, text.end - chPos, &m)) {
+                if (mode == draw_RunMode) {
+                    /* Change the color. */
+                    const iColor clr = ansi_Color(capturedRange_RegExpMatch(&m, 1), gray75_ColorId);
+                    SDL_SetTextureColorMod(text_.cache, clr.r, clr.g, clr.b);
+                }
+                chPos = end_RegExpMatch(&m);
+                continue;
+            }
+        }
         iChar ch = nextChar_(&chPos, text.end);
         /* Special instructions. */ {
             if (ch == '\n') {
@@ -424,8 +443,8 @@ static iInt2 run_Font_(iFont *d, enum iRunMode mode, iRangecc text, size_t maxLe
             }
             if (ch == '\r') {
                 const iChar esc = nextChar_(&chPos, text.end);
-                const iColor clr = get_Color(esc - '0');
                 if (mode == draw_RunMode) {
+                    const iColor clr = get_Color(esc - '0');
                     SDL_SetTextureColorMod(text_.cache, clr.r, clr.g, clr.b);
                 }
                 prevCh = 0;
diff --git a/src/ui/text.h b/src/ui/text.h
index 2181fa34..be95e948 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -7,6 +7,7 @@
 
 enum iFontId {
     default_FontId,
+    regular_FontId,
     monospace_FontId,
     monospaceSmall_FontId,
     medium_FontId,
@@ -17,9 +18,11 @@ enum iFontId {
     hugeBold_FontId,
     max_FontId,
     /* UI fonts: */
-    uiInput_FontId = monospace_FontId,
+    uiLabel_FontId     = default_FontId,
+    uiShortcuts_FontId = default_FontId,
+    uiInput_FontId     = monospace_FontId,
     /* Document fonts: */
-    paragraph_FontId         = default_FontId,
+    paragraph_FontId         = regular_FontId,
     firstParagraph_FontId    = medium_FontId,
     preformatted_FontId      = monospace_FontId,
     preformattedSmall_FontId = monospaceSmall_FontId,
@@ -27,7 +30,6 @@ enum iFontId {
     header1_FontId           = hugeBold_FontId,
     header2_FontId           = largeBold_FontId,
     header3_FontId           = medium_FontId,
-    uiShortcuts_FontId       = default_FontId,
 };
 
 #define specialSymbol_Text  0x10