Moved History to its own type

8 files changed, 226 insertions, 147 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 43260264..5048360e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,6 +42,8 @@ set (SOURCES
     src/gmrequest.h
     src/gmutil.c
     src/gmutil.h
+    src/history.c
+    src/history.h
     src/stb_image.h
     src/stb_truetype.h
     # User interface:
diff --git a/src/app.c b/src/app.c
index 2629ff84..8d037828 100644
--- a/src/app.c
+++ b/src/app.c
@@ -1,5 +1,6 @@
 #include "app.h"
 #include "embedded.h"
+#include "history.h"
 #include "ui/command.h"
 #include "ui/window.h"
 #include "ui/inputwidget.h"
@@ -29,21 +30,6 @@
 #endif
 
 iDeclareType(App)
-iDeclareType(HistoryItem)
-
-struct Impl_HistoryItem {
-    iTime   when;
-    iString url;
-};
-
-void init_HistoryItem(iHistoryItem *d) {
-    initCurrent_Time(&d->when);
-    init_String(&d->url);
-}
-
-void deinit_HistoryItem(iHistoryItem *d) {
-    deinit_String(&d->url);
-}
 
 #if defined (iPlatformApple)
 static const char *dataDir_App_ = "~/Library/Application Support/fi.skyjake.Lagrange";
@@ -57,16 +43,13 @@ static const char *dataDir_App_ = "~/.config/lagrange";
 static const char *prefsFileName_App_   = "prefs.cfg";
 static const char *historyFileName_App_ = "history.txt";
 
-static const size_t historyMax_App_ = 100;
-
 struct Impl_App {
     iCommandLine args;
     iBool        running;
     iWindow *    window;
     iSortedArray tickers;
     iBool        pendingRefresh;
-    iArray       history;
-    size_t       historyPos; /* zero at the latest item */
+    iHistory     history;
     /* Preferences: */
     iBool        retainWindowSize;
     float        uiScale;
@@ -156,71 +139,16 @@ static void savePrefs_App_(const iApp *d) {
     delete_String(cfg);
 }
 
-static void saveHistory_App_(const iApp *d) {
-    iFile *f = new_File(historyFileName_());
-    if (open_File(f, writeOnly_FileMode | text_FileMode)) {
-        iString *line = new_String();
-        iConstForEach(Array, i, &d->history) {
-            const iHistoryItem *item = i.value;
-            iDate date;
-            init_Date(&date, &item->when);
-            format_String(line,
-                          "%04d-%02d-%02dT%02d:%02d:%02d %s\n",
-                          date.year,
-                          date.month,
-                          date.day,
-                          date.hour,
-                          date.minute,
-                          date.second,
-                          cstr_String(&item->url));
-            writeData_File(f, cstr_String(line), size_String(line));
-        }
-        delete_String(line);
-    }
-    iRelease(f);
-}
-
-static void loadHistory_App_(iApp *d) {
-    iFile *f = new_File(historyFileName_());
-    if (open_File(f, readOnly_FileMode | text_FileMode)) {
-        iString *src = newBlock_String(collect_Block(readAll_File(f)));
-        const iRangecc range = range_String(src);
-        iRangecc line = iNullRange;
-        while (nextSplit_Rangecc(&range, "\n", &line)) {
-            int y, m, D, H, M, S;
-            sscanf(line.start, "%04d-%02d-%02dT%02d:%02d:%02d", &y, &m, &D, &H, &M, &S);
-            if (!y) break;
-            iHistoryItem item;
-            init_HistoryItem(&item);
-            init_Time(
-                &item.when,
-                &(iDate){ .year = y, .month = m, .day = D, .hour = H, .minute = M, .second = S });
-            initCStrN_String(&item.url, line.start + 20, size_Range(&line) - 20);
-            pushBack_Array(&d->history, &item);
-        }
-        delete_String(src);
-    }
-    iRelease(f);
-}
-
-static void clearHistory_App_(iApp *d) {
-    iForEach(Array, i, &d->history) {
-        deinit_HistoryItem(i.value);
-    }
-    clear_Array(&d->history);
-}
-
 static void init_App_(iApp *d, int argc, char **argv) {
     init_CommandLine(&d->args, argc, argv);
     init_SortedArray(&d->tickers, sizeof(iTicker), cmp_Ticker_);
-    init_Array(&d->history, sizeof(iHistoryItem));
-    d->historyPos       = 0;
     d->running          = iFalse;
     d->window           = NULL;
     d->retainWindowSize = iTrue;
     d->pendingRefresh   = iFalse;
+    init_History(&d->history);
     loadPrefs_App_(d);
-    loadHistory_App_(d);
+    load_History(&d->history, historyFileName_());
 #if defined (iHaveLoadEmbed)
     /* Load the resources from a file. */ {
         if (!load_Embed(
@@ -238,9 +166,8 @@ static void init_App_(iApp *d, int argc, char **argv) {
 
 static void deinit_App(iApp *d) {
     savePrefs_App_(d);
-    saveHistory_App_(d);
-    clearHistory_App_(d);
-    deinit_Array(&d->history);
+    save_History(&d->history, historyFileName_());
+    deinit_History(&d->history);
     deinit_SortedArray(&d->tickers);
     delete_Window(d->window);
     d->window = NULL;
@@ -393,32 +320,6 @@ static iBool handlePrefsCommands_(iWidget *d, const char *cmd) {
     return iFalse;
 }
 
-static iHistoryItem *historyItem_App_(iApp *d, size_t pos) {
-    if (isEmpty_Array(&d->history)) return NULL;
-    return &value_Array(&d->history, size_Array(&d->history) - 1 - pos, iHistoryItem);
-}
-
-static const iString *historyUrl_App_(iApp *d, size_t pos) {
-    const iHistoryItem *item = historyItem_App_(d, pos);
-    if (item) {
-        return &item->url;
-    }
-    return collectNew_String();
-}
-
-static void printHistory_App_(const iApp *d) {
-#if 0
-    iConstForEach(Array, i, &d->history) {
-        const size_t idx = index_ArrayConstIterator(&i);
-        printf("%s[%zu]: %s\n",
-               d->historyPos == size_Array(&d->history) - idx - 1 ? "->" : "  ",
-               idx,
-               cstr_String(&((const iHistoryItem *) i.value)->url));
-    }
-    fflush(stdout);
-#endif
-}
-
 iBool handleCommand_App(const char *cmd) {
     iApp *d = &app_;
     iWidget *root = d->window->root;
@@ -427,37 +328,16 @@ iBool handleCommand_App(const char *cmd) {
         if (!argLabel_Command(cmd, "history")) {
             if (argLabel_Command(cmd, "redirect")) {
                 /* Update in the history. */
-                iHistoryItem *item = historyItem_App_(d, d->historyPos);
+                iHistoryItem *item = item_History(&d->history);
                 if (item) {
                     set_String(&item->url, url);
                 }
             }
             else {
-                /* Cut the trailing history items. */
-                if (d->historyPos > 0) {
-                    for (size_t i = 0; i < d->historyPos - 1; i++) {
-                        deinit_HistoryItem(historyItem_App_(d, i));
-                    }
-                    removeN_Array(
-                        &d->history, size_Array(&d->history) - d->historyPos, iInvalidSize);
-                    d->historyPos = 0;
-                }
-                /* Insert new item. */
-                const iHistoryItem *lastItem = historyItem_App_(d, 0);
-                if (!lastItem || cmpString_String(&lastItem->url, url) != 0) {
-                    iHistoryItem item;
-                    init_HistoryItem(&item);
-                    set_String(&item.url, url);
-                    pushBack_Array(&d->history, &item);
-                    /* Don't make it too long. */
-                    if (size_Array(&d->history) > historyMax_App_) {
-                        deinit_HistoryItem(front_Array(&d->history));
-                        remove_Array(&d->history, 0);
-                    }
-                }
+                addUrl_History(&d->history, url);
             }
         }
-        printHistory_App_(d);
+        print_History(&d->history);
         setUrl_DocumentWidget(findChild_Widget(root, "document"), url);
     }
     else if (equal_Command(cmd, "document.request.cancelled")) {
@@ -499,19 +379,11 @@ iBool handleCommand_App(const char *cmd) {
         return iFalse;
     }
     else if (equal_Command(cmd, "navigate.back")) {
-        if (d->historyPos < size_Array(&d->history) - 1) {
-            d->historyPos++;
-            postCommandf_App("open history:1 url:%s",
-                             cstr_String(historyUrl_App_(d, d->historyPos)));
-        }
+        goBack_History(&d->history);
         return iTrue;
     }
     else if (equal_Command(cmd, "navigate.forward")) {
-        if (d->historyPos > 0) {
-            d->historyPos--;
-            postCommandf_App("open history:1 url:%s",
-                             cstr_String(historyUrl_App_(d, d->historyPos)));
-        }
+        goForward_History(&d->history);
         return iTrue;
     }
     else if (equal_Command(cmd, "navigate.home")) {
diff --git a/src/app.h b/src/app.h
index af0b6134..43de8b5a 100644
--- a/src/app.h
+++ b/src/app.h
@@ -3,6 +3,7 @@
 /* Application core: event loop, base event processing, audio synth. */
 
 #include <the_Foundation/string.h>
+#include <the_Foundation/time.h>
 
 iDeclareType(Window)
 
@@ -20,11 +21,12 @@ const iString *execPath_App     (void);
 
 int         run_App             (int argc, char **argv);
 void        processEvents_App   (enum iAppEventMode mode);
+iBool       handleCommand_App   (const char *cmd);
 void        refresh_App         (void);
 
+iTime       urlVisitTime_App    (const iString *url);
 iAny *      findWidget_App      (const char *id);
 void        addTicker_App       (void (*ticker)(iAny *), iAny *context);
-
 void        postRefresh_App     (void);
 void        postCommand_App     (const char *command);
 void        postCommandf_App    (const char *command, ...);
@@ -32,5 +34,3 @@ void        postCommandf_App    (const char *command, ...);
 iLocalDef void postCommandString_App(const iString *command) {
     postCommand_App(cstr_String(command));
 }
-
-iBool       handleCommand_App   (const char *cmd);
diff --git a/src/gmdocument.h b/src/gmdocument.h
index c353c733..4997398b 100644
--- a/src/gmdocument.h
+++ b/src/gmdocument.h
@@ -20,6 +20,7 @@ enum iGmLinkFlags {
     imageFileExtension_GmLinkFlag = iBit(6),
     audioFileExtension_GmLinkFlag = iBit(7),
     content_GmLinkFlag            = iBit(8), /* content visible below */
+    visited_GmLinkFlag            = iBit(9), /* in the history */
 };
 
 iDeclareType(GmImageInfo)
diff --git a/src/history.c b/src/history.c
new file mode 100644
index 00000000..94b88677
--- /dev/null
+++ b/src/history.c
@@ -0,0 +1,158 @@
+#include "history.h"
+#include "app.h"
+
+#include <the_Foundation/file.h>
+
+static const size_t maxSize_History_ = 5000;
+
+void init_HistoryItem(iHistoryItem *d) {
+    initCurrent_Time(&d->when);
+    init_String(&d->url);
+}
+
+void deinit_HistoryItem(iHistoryItem *d) {
+    deinit_String(&d->url);
+}
+
+void init_History(iHistory *d) {
+    init_Array(&d->history, sizeof(iHistoryItem));
+    d->historyPos = 0;
+}
+
+void deinit_History(iHistory *d) {
+    clear_History(d);
+    deinit_Array(&d->history);
+}
+
+void save_History(const iHistory *d, const iString *path) {
+    iFile *f = new_File(path);
+    if (open_File(f, writeOnly_FileMode | text_FileMode)) {
+        iString *line = new_String();
+        iConstForEach(Array, i, &d->history) {
+            const iHistoryItem *item = i.value;
+            iDate date;
+            init_Date(&date, &item->when);
+            format_String(line,
+                          "%04d-%02d-%02dT%02d:%02d:%02d %s\n",
+                          date.year,
+                          date.month,
+                          date.day,
+                          date.hour,
+                          date.minute,
+                          date.second,
+                          cstr_String(&item->url));
+            writeData_File(f, cstr_String(line), size_String(line));
+        }
+        delete_String(line);
+    }
+    iRelease(f);
+}
+
+void load_History(iHistory *d, const iString *path) {
+    iFile *f = new_File(path);
+    if (open_File(f, readOnly_FileMode | text_FileMode)) {
+        iString *src = newBlock_String(collect_Block(readAll_File(f)));
+        const iRangecc range = range_String(src);
+        iRangecc line = iNullRange;
+        while (nextSplit_Rangecc(&range, "\n", &line)) {
+            int y, m, D, H, M, S;
+            sscanf(line.start, "%04d-%02d-%02dT%02d:%02d:%02d", &y, &m, &D, &H, &M, &S);
+            if (!y) break;
+            iHistoryItem item;
+            init_HistoryItem(&item);
+            init_Time(
+                &item.when,
+                &(iDate){ .year = y, .month = m, .day = D, .hour = H, .minute = M, .second = S });
+            initRange_String(&item.url, (iRangecc){ line.start + 20, line.end });
+            pushBack_Array(&d->history, &item);
+        }
+        delete_String(src);
+    }
+    iRelease(f);
+}
+
+void clear_History(iHistory *d) {
+    iForEach(Array, i, &d->history) {
+        deinit_HistoryItem(i.value);
+    }
+    clear_Array(&d->history);
+}
+
+iHistoryItem *itemAtPos_History(iHistory *d, size_t pos) {
+    if (isEmpty_Array(&d->history)) return NULL;
+    return &value_Array(&d->history, size_Array(&d->history) - 1 - pos, iHistoryItem);
+}
+
+const iString *url_History(iHistory *d, size_t pos) {
+    const iHistoryItem *item = itemAtPos_History(d, pos);
+    if (item) {
+        return &item->url;
+    }
+    return collectNew_String();
+}
+
+void addUrl_History(iHistory *d, const iString *url ){
+    /* Cut the trailing history items. */
+    if (d->historyPos > 0) {
+        for (size_t i = 0; i < d->historyPos - 1; i++) {
+            deinit_HistoryItem(itemAtPos_History(d, i));
+        }
+        removeN_Array(
+            &d->history, size_Array(&d->history) - d->historyPos, iInvalidSize);
+        d->historyPos = 0;
+    }
+    /* Insert new item. */
+    const iHistoryItem *lastItem = itemAtPos_History(d, 0);
+    if (!lastItem || cmpString_String(&lastItem->url, url) != 0) {
+        iHistoryItem item;
+        init_HistoryItem(&item);
+        set_String(&item.url, url);
+        pushBack_Array(&d->history, &item);
+        /* Don't make it too long. */
+        if (size_Array(&d->history) > maxSize_History_) {
+            deinit_HistoryItem(front_Array(&d->history));
+            remove_Array(&d->history, 0);
+        }
+    }
+}
+
+iBool goBack_History(iHistory *d) {
+    if (d->historyPos < size_Array(&d->history) - 1) {
+        d->historyPos++;
+        postCommandf_App("open history:1 url:%s",
+                         cstr_String(url_History(d, d->historyPos)));
+        return iTrue;
+    }
+    return iFalse;
+}
+
+iBool goForward_History(iHistory *d) {
+    if (d->historyPos > 0) {
+        d->historyPos--;
+        postCommandf_App("open history:1 url:%s",
+                         cstr_String(url_History(d, d->historyPos)));
+        return iTrue;
+    }
+    return iFalse;
+}
+
+iTime urlVisitTime_History(const iHistory *d, const iString *url) {
+    iTime when;
+    iZap(when);
+
+    return when;
+}
+
+void print_History(const iHistory *d) {
+#if 0
+    iConstForEach(Array, i, &d->history) {
+        const size_t idx = index_ArrayConstIterator(&i);
+        printf("%s[%zu]: %s\n",
+               d->historyPos == size_Array(&d->history) - idx - 1 ? "->" : "  ",
+               idx,
+               cstr_String(&((const iHistoryItem *) i.value)->url));
+    }
+    fflush(stdout);
+#endif
+}
+
diff --git a/src/history.h b/src/history.h
new file mode 100644
index 00000000..15a179d6
--- /dev/null
+++ b/src/history.h
@@ -0,0 +1,41 @@
+#pragma once
+
+#include <the_Foundation/array.h>
+#include <the_Foundation/string.h>
+#include <the_Foundation/time.h>
+
+iDeclareType(History)
+iDeclareType(HistoryItem)
+
+struct Impl_HistoryItem {
+    iTime   when;
+    iString url;
+};
+
+iDeclareTypeConstruction(HistoryItem)
+
+struct Impl_History {
+    iArray history;
+    size_t historyPos; /* zero at the latest item */
+};
+
+iDeclareTypeConstruction(History)
+
+void    clear_History   (iHistory *);
+
+void    load_History    (iHistory *, const iString *path);
+void    save_History    (const iHistory *, const iString *path);
+
+iHistoryItem *  itemAtPos_History   (iHistory *, size_t pos);
+const iString * url_History         (iHistory *, size_t pos);
+iTime           urlVisitTime_History(const iHistory *, const iString *url);
+void            print_History       (const iHistory *);
+
+iLocalDef iHistoryItem *item_History(iHistory *d) {
+    return itemAtPos_History(d, d->historyPos);
+}
+
+void    addUrl_History      (iHistory *, const iString *url);
+
+iBool   goBack_History      (iHistory *);
+iBool   goForward_History   (iHistory *);
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index e908f090..52628143 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -903,10 +903,10 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
     /* Text markers. */
     fillRange_DrawContext_(d, run, teal_ColorId, d->widget->foundMark, &d->inFoundMark);
     fillRange_DrawContext_(d, run, brown_ColorId, d->widget->selectMark, &d->inSelectMark);
-    if (run->linkId) {
-        fg = linkColor_GmDocument(doc, run->linkId);
-        if (isHover && ~linkFlags_GmDocument(doc, run->linkId) & content_GmLinkFlag) {
-            fg = white_ColorId;
+    if (run->linkId && !isEmpty_Rect(run->bounds)) {
+        fg = white_ColorId;
+        if (isHover || linkFlags_GmDocument(doc, run->linkId) & content_GmLinkFlag) {
+            fg = linkColor_GmDocument(doc, run->linkId);
         }
     }
     drawString_Text(run->font, visPos, fg, &text);
diff --git a/src/ui/text.c b/src/ui/text.c
index 12255fdb..ad1c37c8 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -298,6 +298,11 @@ static iChar nextChar_(const char **chPos, const char *end) {
 
 int enableHalfPixelGlyphs_Text = iTrue;
 
+iLocalDef iBool isWrapBoundary_(iChar a, iChar b) {
+    if (b == '/' || b == '-') return iTrue;
+    return !isSpace_Char(a) && isSpace_Char(b);
+}
+
 static iInt2 run_Font_(iFont *d, enum iRunMode mode, iRangecc text, size_t maxLen, iInt2 pos,
                        int xposLimit, const char **continueFrom_out, int *runAdvance_out) {
     iInt2 size = zero_I2();
@@ -364,7 +369,7 @@ static iInt2 run_Font_(iFont *d, enum iRunMode mode, iRangecc text, size_t maxLe
         }
         xpos += glyph->advance;
         xposMax = iMax(xposMax, xpos);
-        if (mode == measureNoWrap_RunMode || (!isSpace_Char(prevCh) && isSpace_Char(ch))) {
+        if (mode == measureNoWrap_RunMode || isWrapBoundary_(prevCh, ch)) {
             lastWordEnd = chPos;
         }
         /* Check the next character. */