GmDocument: Basic indents; bullets; bold font

6 files changed, 100 insertions, 30 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8498cd6e..c9b342d5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,7 @@ pkg_check_modules (SDL2 REQUIRED sdl2)
 message (STATUS "Preparing embedded resources...")
 set (EMBED_RESOURCES 
     res/FiraSans-Regular.ttf
+    res/FiraSans-Bold.ttf
     res/FiraSans-LightItalic.ttf
     res/FiraMono-Regular.ttf
 )
diff --git a/res/FiraSans-Bold.ttf b/res/FiraSans-Bold.ttf
new file mode 100644
index 00000000..04830e7e
--- /dev/null
+++ b/res/FiraSans-Bold.ttf
diff --git a/src/gmdocument.c b/src/gmdocument.c
index 67dcf555..0a47c924 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -1,6 +1,7 @@
 #include "gmdocument.h"
 #include "ui/color.h"
 #include "ui/text.h"
+#include "ui/metrics.h"
 #include <the_Foundation/array.h>
 
 struct Impl_GmDocument {
@@ -48,6 +49,12 @@ static enum iGmLineType lineType_Rangecc_(const iRangecc *line) {
     return text_GmLineType;
 }
 
+static void trimLine_Rangecc_(iRangecc *line, enum iGmLineType type) {
+    static const unsigned int skip[max_GmLineType] = { 0, 2, 3, 1, 1, 2, 3 };
+    line->start += skip[type];
+    trim_Rangecc(line);
+}
+
 static void doLayout_GmDocument_(iGmDocument *d) {
     if (d->size.x <= 0 || isEmpty_String(&d->source)) {
         return;
@@ -57,7 +64,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
     iInt2 pos = zero_I2();
     const iRangecc content = range_String(&d->source);
     iRangecc line = iNullRange;
-    const int fonts[max_GmLineType] = {
+    static const int fonts[max_GmLineType] = {
         paragraph_FontId,
         paragraph_FontId,
         preformatted_FontId,
@@ -66,15 +73,49 @@ static void doLayout_GmDocument_(iGmDocument *d) {
         header2_FontId,
         header3_FontId
     };
+    static const int indents[max_GmLineType] = {
+        4, 10, 4, 10, 0, 0, 0
+    };
+    static const char *bullet = "\u2022";
+    iRangecc preAltText = iNullRange;
     while (nextSplit_Rangecc(&content, "\n", &line)) {
-        enum iGmLineType type = lineType_Rangecc_(&line);
+        int indent = 0;
         iGmRun run;
-        run.text = line;
-        run.font = fonts[type];
         run.color = white_ColorId;
-        run.bounds.pos = pos;
-        run.bounds.size = advanceN_Text(run.font, line.start, size_Range(&line));
         run.linkId = 0;
+        if (!isPreformat) {
+            enum iGmLineType type = lineType_Rangecc_(&line);
+            if (type == preformatted_GmLineType) {
+                isPreformat = iTrue;
+                trimLine_Rangecc_(&line, type);
+                preAltText = line;
+                /* TODO: store and link the alt text to this run */
+                continue;
+            }
+            trimLine_Rangecc_(&line, type);
+            run.font = fonts[type];
+            indent = indents[type];
+            if (type == bullet_GmLineType) {
+                run.bounds.pos = addX_I2(pos, indent * gap_UI);
+                run.bounds.size = advance_Text(run.font, bullet);
+                run.bounds.pos.x -= 4 * gap_UI - run.bounds.size.x / 2;
+                run.text = (iRangecc){ bullet, bullet + strlen(bullet) };
+                pushBack_Array(&d->layout, &run);
+            }
+        }
+        else {
+            if (startsWithSc_Rangecc(&line, "```", &iCaseSensitive)) {
+                isPreformat = iFalse;
+                preAltText = iNullRange;
+                continue;
+            }
+            run.font = preformatted_FontId;
+            indent = indents[preformatted_GmLineType];
+        }
+        run.text = line;
+        run.bounds.pos = pos;
+        run.bounds.size = advanceRange_Text(run.font, line);
+        adjustEdges_Rect(&run.bounds, 0, 0, 0, indent * gap_UI);
         pushBack_Array(&d->layout, &run);
         pos.y += run.bounds.size.y;
     }
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 7318e4cb..a2cf0a8f 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -1,6 +1,7 @@
 #include "documentwidget.h"
 #include "paint.h"
 #include "util.h"
+#include "app.h"
 #include "../gemini.h"
 #include "../gmdocument.h"
 
@@ -116,6 +117,7 @@ static void requestFinished_DocumentWidget_(iAnyObject *obj) {
     iReleaseLater(d->request);
     d->request = NULL;
     fflush(stdout);
+    postRefresh_App();
 }
 
 static void fetch_DocumentWidget_(iDocumentWidget *d) {
@@ -128,9 +130,9 @@ static void fetch_DocumentWidget_(iDocumentWidget *d) {
         iFile *f = new_File(collect_String(newRange_String(url.path)));
         if (open_File(f, readOnly_FileMode)) {
             setBlock_String(d->newSource, collect_Block(readAll_File(f)));
+            postRefresh_App();
         }
         iRelease(f);
-        d->state = ready_DocumentState;
         return;
     }
     d->request = new_TlsRequest();
@@ -163,6 +165,14 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
     if (isResize_UserEvent(ev)) {
         setWidth_GmDocument(d->doc, documentWidth_DocumentWidget_(d));
     }
+    if (ev->type == SDL_KEYDOWN) {
+        const int mods = keyMods_Sym(ev->key.keysym.mod);
+        const int key = ev->key.keysym.sym;
+        if (mods == KMOD_PRIMARY && key == 'r') {
+            fetch_DocumentWidget_(d);
+            return iTrue;
+        }
+    }
     return processEvent_Widget(w, ev);
 }
 
diff --git a/src/ui/text.c b/src/ui/text.c
index 59ea00dd..a01de2ce 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -115,15 +115,13 @@ void init_Text(SDL_Renderer *render) {
     /* Load the fonts. */ {
         const struct { const iBlock *ttf; int size; } fontData[max_FontId] = {
             { &fontFiraSansRegular_Embedded, fontSize_UI },
-            { &fontFiraSansRegular_Embedded, fontSize_UI },
             { &fontFiraMonoRegular_Embedded, fontSize_UI },
-            { &fontFiraSansRegular_Embedded, fontSize_UI },
             { &fontFiraSansRegular_Embedded, fontSize_UI * 1.5f },
-            { &fontFiraMonoRegular_Embedded, fontSize_UI },
             { &fontFiraSansLightItalic_Embedded, fontSize_UI },
-            { &fontFiraSansRegular_Embedded, fontSize_UI * 2.0f },
-            { &fontFiraSansRegular_Embedded, fontSize_UI * 1.75f },
-            { &fontFiraSansRegular_Embedded, fontSize_UI * 1.5f },
+            { &fontFiraSansBold_Embedded, fontSize_UI },
+            { &fontFiraSansBold_Embedded, fontSize_UI * 1.5f },
+            { &fontFiraSansBold_Embedded, fontSize_UI * 1.75f },
+            { &fontFiraSansBold_Embedded, fontSize_UI * 2.0f },
         };
         iForIndices(i, fontData) {
             init_Font(&d->fonts[i], fontData[i].ttf, fontData[i].size);
@@ -171,6 +169,7 @@ iLocalDef SDL_Rect sdlRect_(const iRect rect) {
     return (SDL_Rect){ rect.pos.x, rect.pos.y, rect.size.x, rect.size.y };
 }
 
+#if 0
 static void fillTriangle_(SDL_Surface *surface, const SDL_Rect *rect, int dir) {
     const uint32_t color = 0xffffffff;
     SDL_LockSurface(surface);
@@ -201,6 +200,7 @@ static void fillTriangle_(SDL_Surface *surface, const SDL_Rect *rect, int dir) {
     }
     SDL_UnlockSurface(surface);
 }
+#endif
 
 static void cache_Font_(iFont *d, iGlyph *glyph) {
     iText *txt = &text_;
@@ -452,6 +452,15 @@ iInt2 advanceN_Text(int fontId, const char *text, size_t n) {
     return init_I2(advance, lineHeight_Text(fontId));
 }
 
+iInt2 advanceRange_Text(int fontId, iRangecc text) {
+    /* TODO: Rangecc should be the default for runs; no need to copy here */
+    iString str;
+    initRange_String(&str, text);
+    const iInt2 metrics = advance_Text(fontId, cstr_String(&str));
+    deinit_String(&str);
+    return metrics;
+}
+
 static void draw_Text_(int fontId, iInt2 pos, int color, const char *text) {
     iText *d = &text_;
     const iColor clr = get_Color(color & mask_ColorId);
diff --git a/src/ui/text.h b/src/ui/text.h
index 85cd39cf..9bf69c80 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -7,17 +7,25 @@
 
 enum iFontId {
     default_FontId,
-    uiShortcuts_FontId,
-    uiInput_FontId,
+    monospace_FontId,
+    medium_FontId,
+    italic_FontId,
+    bold_FontId,
+    mediumBold_FontId,
+    largeBold_FontId,
+    hugeBold_FontId,
+    max_FontId,
+    /* UI fonts: */
+    uiInput_FontId = monospace_FontId,
     /* Document fonts: */
-    paragraph_FontId,
-    firstParagraph_FontId,
-    preformatted_FontId,
-    quote_FontId,
-    header1_FontId,
-    header2_FontId,
-    header3_FontId,
-    max_FontId
+    paragraph_FontId      = default_FontId,
+    firstParagraph_FontId = medium_FontId,
+    preformatted_FontId   = monospace_FontId,
+    quote_FontId          = italic_FontId,
+    header1_FontId        = hugeBold_FontId,
+    header2_FontId        = largeBold_FontId,
+    header3_FontId        = mediumBold_FontId,
+    uiShortcuts_FontId    = default_FontId,
 };
 
 #define specialSymbol_Text  0x10
@@ -29,14 +37,15 @@ enum iSpecialSymbol {
 void    init_Text           (SDL_Renderer *);
 void    deinit_Text         (void);
 
-int     lineHeight_Text     (int font);
-iInt2   measure_Text        (int font, const char *text);
-iInt2   advance_Text        (int font, const char *text);
-iInt2   advanceN_Text       (int font, const char *text, size_t n); /* `n` in characters */
+int     lineHeight_Text     (int fontId);
+iInt2   measure_Text        (int fontId, const char *text);
+iInt2   advance_Text        (int fontId, const char *text);
+iInt2   advanceN_Text       (int fontId, const char *text, size_t n); /* `n` in characters */
+iInt2   advanceRange_Text   (int fontId, iRangecc text);
 
-void    draw_Text           (int font, iInt2 pos, int color, const char *text, ...); /* negative pos to switch alignment */
-void    drawString_Text     (int font, iInt2 pos, int color, const iString *text);
-void    drawCentered_Text   (int font, iRect rect, int color, const char *text, ...);
+void    draw_Text           (int fontId, iInt2 pos, int color, const char *text, ...); /* negative pos to switch alignment */
+void    drawString_Text     (int fontId, iInt2 pos, int color, const iString *text);
+void    drawCentered_Text   (int fontId, iRect rect, int color, const char *text, ...);
 
 SDL_Texture *   glyphCache_Text     (void);