3 files changed, 55 insertions, 26 deletions

diff --git a/src/app.c b/src/app.c
index 8d037828..cff7c7d6 100644
--- a/src/app.c
+++ b/src/app.c
@@ -49,7 +49,7 @@ struct Impl_App {
     iWindow *    window;
     iSortedArray tickers;
     iBool        pendingRefresh;
-    iHistory     history;
+    iHistory *   history;
     /* Preferences: */
     iBool        retainWindowSize;
     float        uiScale;
@@ -146,9 +146,9 @@ static void init_App_(iApp *d, int argc, char **argv) {
     d->window           = NULL;
     d->retainWindowSize = iTrue;
     d->pendingRefresh   = iFalse;
-    init_History(&d->history);
+    d->history          = new_History();
     loadPrefs_App_(d);
-    load_History(&d->history, historyFileName_());
+    load_History(d->history, historyFileName_());
 #if defined (iHaveLoadEmbed)
     /* Load the resources from a file. */ {
         if (!load_Embed(
@@ -166,8 +166,8 @@ static void init_App_(iApp *d, int argc, char **argv) {
 
 static void deinit_App(iApp *d) {
     savePrefs_App_(d);
-    save_History(&d->history, historyFileName_());
-    deinit_History(&d->history);
+    save_History(d->history, historyFileName_());
+    delete_History(d->history);
     deinit_SortedArray(&d->tickers);
     delete_Window(d->window);
     d->window = NULL;
@@ -328,16 +328,16 @@ iBool handleCommand_App(const char *cmd) {
         if (!argLabel_Command(cmd, "history")) {
             if (argLabel_Command(cmd, "redirect")) {
                 /* Update in the history. */
-                iHistoryItem *item = item_History(&d->history);
+                iHistoryItem *item = item_History(d->history);
                 if (item) {
                     set_String(&item->url, url);
                 }
             }
             else {
-                addUrl_History(&d->history, url);
+                addUrl_History(d->history, url);
             }
         }
-        print_History(&d->history);
+        print_History(d->history);
         setUrl_DocumentWidget(findChild_Widget(root, "document"), url);
     }
     else if (equal_Command(cmd, "document.request.cancelled")) {
@@ -379,11 +379,11 @@ iBool handleCommand_App(const char *cmd) {
         return iFalse;
     }
     else if (equal_Command(cmd, "navigate.back")) {
-        goBack_History(&d->history);
+        goBack_History(d->history);
         return iTrue;
     }
     else if (equal_Command(cmd, "navigate.forward")) {
-        goForward_History(&d->history);
+        goForward_History(d->history);
         return iTrue;
     }
     else if (equal_Command(cmd, "navigate.home")) {
diff --git a/src/history.c b/src/history.c
index 94b88677..0bd23149 100644
--- a/src/history.c
+++ b/src/history.c
@@ -2,6 +2,7 @@
 #include "app.h"
 
 #include <the_Foundation/file.h>
+#include <the_Foundation/sortedarray.h>
 
 static const size_t maxSize_History_ = 5000;
 
@@ -14,12 +15,40 @@ void deinit_HistoryItem(iHistoryItem *d) {
     deinit_String(&d->url);
 }
 
+struct Impl_History {
+    iArray history;
+    size_t historyPos; /* zero at the latest item */
+    iSortedArray visitedUrls;
+};
+
+iDefineTypeConstruction(History)
+
+static int cmp_VisitedUrls_(const void *a, const void *b) {
+    const iHistoryItem *elem[2] = { a, b };
+    return cmpString_String(&elem[0]->url, &elem[1]->url);
+}
+
+static int cmpWhen_HistoryItem_(const void *old, const void *ins) {
+    const iHistoryItem *elem[2] = { old, ins };
+    const double tOld = seconds_Time(&elem[0]->when), tIns = seconds_Time(&elem[1]->when);
+    return tIns > tOld;
+}
+
+static void updateVisitedUrls_History_(iHistory *d) {
+    clear_SortedArray(&d->visitedUrls);
+    iConstForEach(Array, i, &d->history) {
+        insertIf_SortedArray(&d->visitedUrls, &i.value, cmpWhen_HistoryItem_);
+    }
+}
+
 void init_History(iHistory *d) {
     init_Array(&d->history, sizeof(iHistoryItem));
     d->historyPos = 0;
+    init_SortedArray(&d->visitedUrls, sizeof(const iHistoryItem *), cmp_VisitedUrls_);
 }
 
 void deinit_History(iHistory *d) {
+    deinit_SortedArray(&d->visitedUrls);
     clear_History(d);
     deinit_Array(&d->history);
 }
@@ -83,6 +112,10 @@ iHistoryItem *itemAtPos_History(iHistory *d, size_t pos) {
     return &value_Array(&d->history, size_Array(&d->history) - 1 - pos, iHistoryItem);
 }
 
+iHistoryItem *item_History(iHistory *d) {
+    return itemAtPos_History(d, d->historyPos);
+}
+
 const iString *url_History(iHistory *d, size_t pos) {
     const iHistoryItem *item = itemAtPos_History(d, pos);
     if (item) {
@@ -137,10 +170,15 @@ iBool goForward_History(iHistory *d) {
 }
 
 iTime urlVisitTime_History(const iHistory *d, const iString *url) {
-    iTime when;
-    iZap(when);
-
-    return when;
+    iHistoryItem item;
+    size_t pos;
+    iZap(item);
+    initCopy_String(&item.url, url);
+    if (locate_SortedArray(&d->visitedUrls, &(const void *){ &item }, &pos)) {
+        item.when = ((const iHistoryItem *) constAt_SortedArray(&d->visitedUrls, pos))->when;
+    }
+    deinit_String(&item.url);
+    return item.when;
 }
 
 void print_History(const iHistory *d) {
diff --git a/src/history.h b/src/history.h
index 15a179d6..786096f2 100644
--- a/src/history.h
+++ b/src/history.h
@@ -4,21 +4,15 @@
 #include <the_Foundation/string.h>
 #include <the_Foundation/time.h>
 
-iDeclareType(History)
 iDeclareType(HistoryItem)
+iDeclareTypeConstruction(HistoryItem)
 
 struct Impl_HistoryItem {
     iTime   when;
     iString url;
 };
 
-iDeclareTypeConstruction(HistoryItem)
-
-struct Impl_History {
-    iArray history;
-    size_t historyPos; /* zero at the latest item */
-};
-
+iDeclareType(History)
 iDeclareTypeConstruction(History)
 
 void    clear_History   (iHistory *);
@@ -27,14 +21,11 @@ void    load_History    (iHistory *, const iString *path);
 void    save_History    (const iHistory *, const iString *path);
 
 iHistoryItem *  itemAtPos_History   (iHistory *, size_t pos);
+iHistoryItem *  item_History        (iHistory *);
 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 *);