5 files changed, 71 insertions, 2 deletions

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[] = {