9 files changed, 122 insertions, 11 deletions

diff --git a/src/app.c b/src/app.c
index 488e7b42..cbd2b114 100644
--- a/src/app.c
+++ b/src/app.c
@@ -1,18 +1,20 @@
 #include "app.h"
+#include "bookmarks.h"
 #include "embedded.h"
 #include "gmcerts.h"
+#include "gmdocument.h"
 #include "gmutil.h"
 #include "history.h"
-#include "visited.h"
+#include "ui/color.h"
 #include "ui/command.h"
-#include "ui/window.h"
+#include "ui/documentwidget.h"
 #include "ui/inputwidget.h"
 #include "ui/labelwidget.h"
 #include "ui/sidebarwidget.h"
-#include "ui/documentwidget.h"
-#include "ui/util.h"
 #include "ui/text.h"
-#include "ui/color.h"
+#include "ui/util.h"
+#include "ui/window.h"
+#include "visited.h"
 
 #include <the_Foundation/commandline.h>
 #include <the_Foundation/file.h>
@@ -60,6 +62,7 @@ struct Impl_App {
     iBool        pendingRefresh;
     iGmCerts *   certs;
     iVisited *   visited;
+    iBookmarks * bookmarks;
     int          zoomPercent;
     int          tabEnum;
     /* Preferences: */
@@ -157,6 +160,7 @@ static const char *magicState_App_       = "lgL1";
 static const char *magicTabDocument_App_ = "tabd";
 
 static iBool loadState_App_(iApp *d) {
+    iUnused(d);
     iFile *f = iClob(newCStr_File(concatPath_CStr(dataDir_App_, stateFileName_App_)));
     if (open_File(f, readOnly_FileMode)) {
         char magic[4];
@@ -225,9 +229,11 @@ static void init_App_(iApp *d, int argc, char **argv) {
     d->zoomPercent      = 100;
     d->certs            = new_GmCerts(dataDir_App_);
     d->visited          = new_Visited();
+    d->bookmarks        = new_Bookmarks();
     d->tabEnum          = 0;
     loadPrefs_App_(d);
     load_Visited(d->visited, dataDir_App_);
+    load_Bookmarks(d->bookmarks, dataDir_App_);
 #if defined (iHaveLoadEmbed)
     /* Load the resources from a file. */ {
         if (!load_Embed(concatPath_CStr(cstr_String(execPath_App()), "../resources.bin"))) {
@@ -248,6 +254,8 @@ static void init_App_(iApp *d, int argc, char **argv) {
 static void deinit_App(iApp *d) {
     saveState_App_(d);
     savePrefs_App_(d);
+    save_Bookmarks(d->bookmarks, dataDir_App_);
+    delete_Bookmarks(d->bookmarks);
     save_Visited(d->visited, dataDir_App_);
     delete_Visited(d->visited);
     delete_GmCerts(d->certs);
@@ -407,6 +415,10 @@ iVisited *visited_App(void) {
     return app_.visited;
 }
 
+iBookmarks *bookmarks_App(void) {
+    return app_.bookmarks;
+}
+
 static iBool handlePrefsCommands_(iWidget *d, const char *cmd) {
     if (equal_Command(cmd, "prefs.dismiss") || equal_Command(cmd, "preferences")) {
         setUiScale_Window(get_Window(),
@@ -504,7 +516,7 @@ iBool handleCommand_App(const char *cmd) {
     }
     else if (equal_Command(cmd, "tabs.new")) {
         const iBool isDuplicate = argLabel_Command(cmd, "duplicate") != 0;
-        iDocumentWidget *newDoc = newTab_App(isDuplicate ? document_App() : NULL);
+        newTab_App(isDuplicate ? document_App() : NULL);
         if (!isDuplicate) {
             postCommand_App("navigate.home");
         }        
@@ -585,6 +597,15 @@ iBool handleCommand_App(const char *cmd) {
         refresh_App();
         return iTrue;
     }
+    else if (equal_Command(cmd, "bookmark.add")) {
+        iDocumentWidget *doc = document_App();
+        add_Bookmarks(d->bookmarks, url_DocumentWidget(doc),
+                      bookmarkTitle_DocumentWidget(doc),
+                      collectNew_String(),
+                      siteIcon_GmDocument(document_DocumentWidget(doc)));
+        postCommand_App("bookmarks.changed");
+        return iTrue;
+    }
     else {
         return iFalse;
     }
diff --git a/src/app.h b/src/app.h
index cf68fb5f..9a6306b9 100644
--- a/src/app.h
+++ b/src/app.h
@@ -5,6 +5,7 @@
 #include <the_Foundation/string.h>
 #include <the_Foundation/time.h>
 
+iDeclareType(Bookmarks)
 iDeclareType(DocumentWidget)
 iDeclareType(GmCerts)
 iDeclareType(Visited)
@@ -32,6 +33,7 @@ int         zoom_App            (void);
 
 iGmCerts *          certs_App           (void);
 iVisited *          visited_App         (void);
+iBookmarks *        bookmarks_App       (void);
 iDocumentWidget *   document_App        (void);
 iDocumentWidget *   document_Command    (const char *cmd);
 iDocumentWidget *   newTab_App          (const iDocumentWidget *duplicateOf);
diff --git a/src/bookmarks.c b/src/bookmarks.c
index babfc323..b023e90a 100644
--- a/src/bookmarks.c
+++ b/src/bookmarks.c
@@ -55,8 +55,17 @@ void load_Bookmarks(iBookmarks *d, const char *dirPath) {
         const iRangecc src = range_Block(collect_Block(readAll_File(f)));
         iRangecc line = iNullRange;
         while (nextSplit_Rangecc(&src, "\n", &line)) {
+            /* Skip empty lines. */ {
+                iRangecc ln = line;
+                trim_Rangecc(&ln);
+                if (isEmpty_Range(&ln)) {
+                    continue;
+                }
+            }
             iBookmark bm;
             init_Bookmark(&bm);
+            bm.icon = strtoul(line.start, NULL, 16);
+            line.start += 9;
             char *endPos;
             initSeconds_Time(&bm.when, strtod(line.start, &endPos));
             line.start = skipSpace_CStr(endPos);
@@ -77,20 +86,27 @@ void save_Bookmarks(const iBookmarks *d, const char *dirPath) {
         iString *str = collectNew_String();
         iConstForEach(Array, i, &d->bookmarks) {
             const iBookmark *bm = i.value;
-            format_String(str, "%lf %s\%s\n%s\n", seconds_Time(&bm->when), cstr_String(&bm->url),
-                          cstr_String(&bm->title), cstr_String(&bm->tags));
+            format_String(str,
+                          "%08x %lf %s\n%s\n%s\n",
+                          bm->icon,
+                          seconds_Time(&bm->when),
+                          cstr_String(&bm->url),
+                          cstr_String(&bm->title),
+                          cstr_String(&bm->tags));
             writeData_File(f, cstr_String(str), size_String(str));
         }
     }
     iRelease(f);
 }
 
-void add_Bookmarks(iBookmarks *d, const iString *url, const iString *title, const iString *tags) {
+void add_Bookmarks(iBookmarks *d, const iString *url, const iString *title, const iString *tags,
+                   iChar icon) {
     iBookmark bm;
     init_Bookmark(&bm);
     set_String(&bm.url, url);
     set_String(&bm.title, title);
     set_String(&bm.tags, tags);
+    bm.icon = icon;
     initCurrent_Time(&bm.when);
     pushBack_Array(&d->bookmarks, &bm);
 }
diff --git a/src/bookmarks.h b/src/bookmarks.h
index e32f6bef..2572e3b2 100644
--- a/src/bookmarks.h
+++ b/src/bookmarks.h
@@ -11,6 +11,7 @@ struct Impl_Bookmark {
     iString url;
     iString title;
     iString tags;
+    iChar icon;
     iTime when;
 };
 
@@ -21,6 +22,8 @@ void    clear_Bookmarks     (iBookmarks *);
 void    load_Bookmarks      (iBookmarks *, const char *dirPath);
 void    save_Bookmarks      (const iBookmarks *, const char *dirPath);
 
+void    add_Bookmarks       (iBookmarks *, const iString *url, const iString *title, const iString *tags, iChar icon);
+
 typedef iBool (*iBookmarksFilterFunc) (const iBookmark *);
 typedef int   (*iBookmarksCompareFunc)(const iBookmark **, const iBookmark **);
 
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index ff1c577a..7e4bdc73 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -313,6 +313,27 @@ static void updateVisible_DocumentWidget_(iDocumentWidget *d) {
     }
 }
 
+const iString *bookmarkTitle_DocumentWidget(const iDocumentWidget *d) {
+    iStringArray *title = iClob(new_StringArray());
+    if (!isEmpty_String(title_GmDocument(d->doc))) {
+        pushBack_StringArray(title, title_GmDocument(d->doc));
+    }
+    if (!isEmpty_String(d->titleUser)) {
+        pushBack_StringArray(title, d->titleUser);
+    }
+    else {
+        iUrl parts;
+        init_Url(&parts, d->mod.url);
+        if (!isEmpty_Range(&parts.host)) {
+            pushBackRange_StringArray(title, parts.host);
+        }
+    }
+    if (isEmpty_StringArray(title)) {
+        pushBackCStr_StringArray(title, "Blank Page");
+    }
+    return collect_String(joinCStr_StringArray(title, " \u2014 "));
+}
+
 static void updateWindowTitle_DocumentWidget_(const iDocumentWidget *d) {
     iLabelWidget *tabButton = tabPageButton_Widget(findWidget_App("doctabs"), d);
     if (!tabButton) {
diff --git a/src/ui/documentwidget.h b/src/ui/documentwidget.h
index 05b8b50f..98591901 100644
--- a/src/ui/documentwidget.h
+++ b/src/ui/documentwidget.h
@@ -18,6 +18,7 @@ iHistory *          history_DocumentWidget          (iDocumentWidget *);
 const iString *     url_DocumentWidget              (const iDocumentWidget *);
 iBool               isRequestOngoing_DocumentWidget (const iDocumentWidget *);
 const iGmDocument * document_DocumentWidget         (const iDocumentWidget *);
+const iString *     bookmarkTitle_DocumentWidget    (const iDocumentWidget *);
 
 void    setUrl_DocumentWidget           (iDocumentWidget *, const iString *url);
 void    setUrlFromCache_DocumentWidget  (iDocumentWidget *, const iString *url, iBool isFromCache);
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index ca10f0da..8108c797 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -2,6 +2,7 @@
 #include "labelwidget.h"
 #include "scrollwidget.h"
 #include "documentwidget.h"
+#include "bookmarks.h"
 #include "paint.h"
 #include "util.h"
 #include "command.h"
@@ -111,8 +112,23 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
             }
             break;
         }
-        case bookmarks_SidebarMode:
+        case bookmarks_SidebarMode: {
+            iConstForEach(PtrArray, i, list_Bookmarks(bookmarks_App(), NULL, NULL)) {
+                const iBookmark *bm = i.ptr;
+                iSidebarItem item;
+                init_SidebarItem(&item);
+                item.icon = bm->icon;
+                set_String(&item.url, &bm->url);
+                set_String(&item.label, &bm->title);
+                iDate date;
+                init_Date(&date, &bm->when);
+                iString *ds = format_Date(&date, "%Y %b %d");
+                set_String(&item.meta, ds);
+                delete_String(ds);
+                pushBack_Array(&d->items, &item);
+            }
             break;
+        }
         case history_SidebarMode:
             break;
         default:
@@ -230,6 +246,10 @@ static void itemClicked_SidebarWidget_(iSidebarWidget *d, size_t index) {
             postCommandf_App("document.goto loc:%p", head->text.start);
             break;
         }
+        case bookmarks_SidebarMode: {
+            postCommandf_App("open url:%s", cstr_String(&item->url));
+            break;
+        }
     }
 }
 
@@ -336,6 +356,9 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
             d->scrollY = 0;
             updateItems_SidebarWidget_(d);
         }
+        else if (equal_Command(cmd, "bookmarks.changed")) {
+            updateItems_SidebarWidget_(d);
+        }
     }
     if (ev->type == SDL_MOUSEMOTION) {
         const iInt2 mouse = init_I2(ev->motion.x, ev->motion.y);
@@ -407,6 +430,27 @@ static void draw_SidebarWidget_(const iSidebarWidget *d) {
                                         mid_Rect(itemRect).y - lineHeight_Text(font) / 2),
                                fg, range_String(&item->label));
             }
+            else if (d->mode == bookmarks_SidebarMode) {
+                const int fg =
+                    isHover ? (isPressing ? black_ColorId : white_ColorId) : gray75_ColorId;
+                iString str;
+                init_String(&str);
+                appendChar_String(&str, item->icon ? item->icon : 0x1f588);
+                const iRect iconArea = { pos, init_I2(10 * gap_UI, d->itemHeight) };
+                drawCentered_Text(uiBookmarkIcon_FontId,
+                                  iconArea,
+                                  iTrue,
+                                  isHover && isPressing ? black_ColorId : cyan_ColorId,
+                                  "%s",
+                                  cstr_String(&str));
+                deinit_String(&str);
+                iInt2 textPos = topRight_Rect(iconArea);
+                drawRange_Text(font, textPos, fg, range_String(&item->label));
+                drawRange_Text(font,
+                               addY_I2(textPos, lineHeight_Text(font)),
+                               isHover ? (isPressing ? black_ColorId : cyan_ColorId) : teal_ColorId,
+                               range_String(&item->meta));
+            }
             unsetClip_Paint(&p);
             pos.y += d->itemHeight;
         }
diff --git a/src/ui/sidebarwidget.h b/src/ui/sidebarwidget.h
index 4d002eee..1645207e 100644
--- a/src/ui/sidebarwidget.h
+++ b/src/ui/sidebarwidget.h
@@ -13,7 +13,7 @@ enum iSidebarMode {
 iDeclareWidgetClass(SidebarWidget)
 iDeclareObjectConstruction(SidebarWidget)
 
-void    setMode_SidebarWidget   (iSidebarWidget *, enum iSidebarMode mode);
+void                setMode_SidebarWidget   (iSidebarWidget *, enum iSidebarMode mode);
 
 enum iSidebarMode   mode_SidebarWidget      (const iSidebarWidget *);
 int                 width_SidebarWidget     (const iSidebarWidget *);
diff --git a/src/ui/window.c b/src/ui/window.c
index 112b44eb..4f59ef1a 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -72,6 +72,7 @@ static const iMenuItem navMenuItems[] = {
     { "Open Location...", SDLK_l, KMOD_PRIMARY, "focus.set id:url" },
     { "---", 0, 0, NULL },
     { "Copy Source Text", SDLK_c, KMOD_PRIMARY, "copy" },
+    { "Bookmark This Page", SDLK_d, KMOD_PRIMARY, "bookmark.add" },
     { "---", 0, 0, NULL },
     { "Toggle Sidebar", SDLK_s, KMOD_PRIMARY | KMOD_ALT, "sidebar.toggle" },
     { "Zoom In", SDLK_EQUALS, KMOD_PRIMARY, "zoom.delta arg:10" },
@@ -93,6 +94,8 @@ static const iMenuItem fileMenuItems[] = {
 
 static const iMenuItem editMenuItems[] = {
     { "Copy Source Text", SDLK_c, KMOD_PRIMARY, "copy" },
+    { "---", 0, 0, NULL },
+    { "Bookmark This Page", SDLK_d, KMOD_PRIMARY, "bookmark.add" },
 };
 
 static const iMenuItem viewMenuItems[] = {