1 files changed, 116 insertions, 71 deletions

diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index da377ac2..8a96961a 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -412,19 +412,25 @@ static void updateItemsWithFlags_SidebarWidget_(iSidebarWidget *d, iBool keepAct
                 setOutline_LabelWidget(child_Widget(d->actions, 1), d->feedsMode != all_FeedsMode);
                 setOutline_LabelWidget(child_Widget(d->actions, 2), d->feedsMode != unread_FeedsMode);
             }
-            d->menu = makeMenu_Widget(
-                as_Widget(d),
-                (iMenuItem[]){ { openTab_Icon " ${feeds.entry.newtab}", 0, 0, "feed.entry.opentab" },
-                               { circle_Icon " ${feeds.entry.markread}", 0, 0, "feed.entry.toggleread" },
-                               { bookmark_Icon " ${feeds.entry.bookmark}", 0, 0, "feed.entry.bookmark" },
-                               { "---", 0, 0, NULL },
-                               { page_Icon " ${feeds.entry.openfeed}", 0, 0, "feed.entry.openfeed" },
-                               { edit_Icon " ${feeds.edit}", 0, 0, "feed.entry.edit" },
-                               { whiteStar_Icon " " uiTextCaution_ColorEscape "${feeds.unsubscribe}", 0, 0, "feed.entry.unsubscribe" },
-                               { "---", 0, 0, NULL },
-                               { check_Icon " ${feeds.markallread}", SDLK_a, KMOD_SHIFT, "feeds.markallread" },
-                               { reload_Icon " ${feeds.refresh}", SDLK_r, KMOD_PRIMARY | KMOD_SHIFT, "feeds.refresh" } },
-                10);
+            const iMenuItem menuItems[] = {
+                { openTab_Icon " ${menu.opentab}", 0, 0, "feed.entry.open newtab:1" },
+                { openTabBg_Icon " ${menu.opentab.background}", 0, 0, "feed.entry.open newtab:2" },
+#if defined (iPlatformDesktop)
+                { openWindow_Icon " ${menu.openwindow}", 0, 0, "feed.entry.open newwindow:1" },
+#endif
+                { "---", 0, 0, NULL },
+                { circle_Icon " ${feeds.entry.markread}", 0, 0, "feed.entry.toggleread" },
+                { bookmark_Icon " ${feeds.entry.bookmark}", 0, 0, "feed.entry.bookmark" },
+                { "${menu.copyurl}", 0, 0, "feed.entry.copy" },
+                { "---", 0, 0, NULL },
+                { page_Icon " ${feeds.entry.openfeed}", 0, 0, "feed.entry.openfeed" },
+                { edit_Icon " ${feeds.edit}", 0, 0, "feed.entry.edit" },
+                { whiteStar_Icon " " uiTextCaution_ColorEscape "${feeds.unsubscribe}", 0, 0, "feed.entry.unsubscribe" },
+                { "---", 0, 0, NULL },
+                { check_Icon " ${feeds.markallread}", SDLK_a, KMOD_SHIFT, "feeds.markallread" },
+                { reload_Icon " ${feeds.refresh}", SDLK_r, KMOD_PRIMARY | KMOD_SHIFT, "feeds.refresh" }
+            };
+            d->menu = makeMenu_Widget(as_Widget(d), menuItems, iElemCount(menuItems));
             d->modeMenu = makeMenu_Widget(
                 as_Widget(d),
                 (iMenuItem[]){
@@ -487,26 +493,29 @@ static void updateItemsWithFlags_SidebarWidget_(iSidebarWidget *d, iBool keepAct
                 addItem_ListWidget(d->list, item);
                 iRelease(item);
             }
-            d->menu = makeMenu_Widget(
-                as_Widget(d),
-                (iMenuItem[]){ { openTab_Icon " ${menu.opentab}", 0, 0, "bookmark.open newtab:1" },
-                               { openTabBg_Icon " ${menu.opentab.background}", 0, 0, "bookmark.open newtab:2" },
-                               { "---", 0, 0, NULL },
-                               { edit_Icon " ${menu.edit}", 0, 0, "bookmark.edit" },
-                               { copy_Icon " ${menu.dup}", 0, 0, "bookmark.dup" },
-                               { "${menu.copyurl}", 0, 0, "bookmark.copy" },
-                               { "---", 0, 0, NULL },
-                               { "", 0, 0, "bookmark.tag tag:subscribed" },
-                               { "", 0, 0, "bookmark.tag tag:homepage" },
-                               { "", 0, 0, "bookmark.tag tag:remotesource" },
-                               { "---", 0, 0, NULL },
-                               { delete_Icon " " uiTextCaution_ColorEscape "${bookmark.delete}", 0, 0, "bookmark.delete" },
-                               { "---", 0, 0, NULL },
-                               { add_Icon " ${menu.newfolder}", 0, 0, "bookmark.addfolder" },
-                               { upDownArrow_Icon " ${menu.sort.alpha}", 0, 0, "bookmark.sortfolder" },
-                               { "---", 0, 0, NULL },
-                               { reload_Icon " ${bookmarks.reload}", 0, 0, "bookmarks.reload.remote" } },
-               17);
+            const iMenuItem menuItems[] = {
+                { openTab_Icon " ${menu.opentab}", 0, 0, "bookmark.open newtab:1" },
+                { openTabBg_Icon " ${menu.opentab.background}", 0, 0, "bookmark.open newtab:2" },
+#if defined (iPlatformDesktop)
+                { openWindow_Icon " ${menu.openwindow}", 0, 0, "bookmark.open newwindow:1" },
+#endif
+                { "---", 0, 0, NULL },
+                { edit_Icon " ${menu.edit}", 0, 0, "bookmark.edit" },
+                { copy_Icon " ${menu.dup}", 0, 0, "bookmark.dup" },
+                { "${menu.copyurl}", 0, 0, "bookmark.copy" },
+                { "---", 0, 0, NULL },
+                { "", 0, 0, "bookmark.tag tag:subscribed" },
+                { "", 0, 0, "bookmark.tag tag:homepage" },
+                { "", 0, 0, "bookmark.tag tag:remotesource" },
+                { "---", 0, 0, NULL },
+                { delete_Icon " " uiTextCaution_ColorEscape "${bookmark.delete}", 0, 0, "bookmark.delete" },
+                { "---", 0, 0, NULL },
+                { folder_Icon " ${menu.newfolder}", 0, 0, "bookmark.addfolder" },
+                { upDownArrow_Icon " ${menu.sort.alpha}", 0, 0, "bookmark.sortfolder" },
+                { "---", 0, 0, NULL },
+                { reload_Icon " ${bookmarks.reload}", 0, 0, "bookmarks.reload.remote" }
+            };
+            d->menu = makeMenu_Widget(as_Widget(d), menuItems, iElemCount(menuItems));
             d->modeMenu = makeMenu_Widget(
                 as_Widget(d),
                 (iMenuItem[]){ { bookmark_Icon " ${menu.page.bookmark}", SDLK_d, KMOD_PRIMARY, "bookmark.add" },
@@ -520,7 +529,7 @@ static void updateItemsWithFlags_SidebarWidget_(iSidebarWidget *d, iBool keepAct
                 addActionButton_SidebarWidget_(d, "${sidebar.action.bookmarks.newfolder}",
                                                "bookmarks.addfolder", !d->isEditing ? hidden_WidgetFlag : 0);
                 addChildFlags_Widget(d->actions, iClob(new_Widget()), expand_WidgetFlag);
-                iLabelWidget *btn = addActionButton_SidebarWidget_(d,
+                addActionButton_SidebarWidget_(d,
                     d->isEditing ? "${sidebar.close}" : "${sidebar.action.bookmarks.edit}",
                     "sidebar.bookmarks.edit", 0);
             }
@@ -568,16 +577,21 @@ static void updateItemsWithFlags_SidebarWidget_(iSidebarWidget *d, iBool keepAct
                 addItem_ListWidget(d->list, item);
                 iRelease(item);
             }
-            d->menu = makeMenu_Widget(
-                as_Widget(d),
-                (iMenuItem[]){
-                    { "${menu.copyurl}", 0, 0, "history.copy" },
-                    { bookmark_Icon " ${sidebar.entry.bookmark}", 0, 0, "history.addbookmark" },
-                    { "---", 0, 0, NULL },
-                    { close_Icon " ${menu.forgeturl}", 0, 0, "history.delete" },
-                    { "---", 0, 0, NULL },
-                    { delete_Icon " " uiTextCaution_ColorEscape "${history.clear}", 0, 0, "history.clear confirm:1" },
-                }, 6);
+            const iMenuItem menuItems[] = {
+                { openTab_Icon " ${menu.opentab}", 0, 0, "history.open newtab:1" },
+                { openTabBg_Icon " ${menu.opentab.background}", 0, 0, "history.open newtab:2" },
+#if defined (iPlatformDesktop)
+                { openWindow_Icon " ${menu.openwindow}", 0, 0, "history.open newwindow:1" },
+#endif
+                { "---" },
+                { bookmark_Icon " ${sidebar.entry.bookmark}", 0, 0, "history.addbookmark" },
+                { "${menu.copyurl}", 0, 0, "history.copy" },
+                { "---", 0, 0, NULL },
+                { close_Icon " ${menu.forgeturl}", 0, 0, "history.delete" },
+                { "---", 0, 0, NULL },
+                { delete_Icon " " uiTextCaution_ColorEscape "${history.clear}", 0, 0, "history.clear confirm:1" },                
+            };
+            d->menu = makeMenu_Widget(as_Widget(d), menuItems, iElemCount(menuItems));
             d->modeMenu = makeMenu_Widget(
                 as_Widget(d),
                 (iMenuItem[]){
@@ -981,7 +995,7 @@ static void itemClicked_SidebarWidget_(iSidebarWidget *d, iSidebarItem *item, si
         }
         case feeds_SidebarMode: {
             postCommandString_Root(get_Root(),
-                feedEntryOpenCommand_String(&item->url, openTabMode_Sym(modState_Keys())));
+                feedEntryOpenCommand_String(&item->url, openTabMode_Sym(modState_Keys()), 0));
             break;
         }
         case bookmarks_SidebarMode:
@@ -1641,11 +1655,20 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
         else if (startsWith_CStr(cmd, "feed.entry.") && d->mode == feeds_SidebarMode) {
             const iSidebarItem *item = d->contextItem;
             if (item) {
-                if (isCommand_Widget(w, ev, "feed.entry.opentab")) {
-                    postCommandString_Root(get_Root(), feedEntryOpenCommand_String(&item->url, 1));
+                if (isCommand_Widget(w, ev, "feed.entry.open")) {
+                    const char *cmd = command_UserEvent(ev);
+                    postCommandString_Root(
+                        get_Root(),
+                        feedEntryOpenCommand_String(&item->url,
+                                                    argLabel_Command(cmd, "newtab"),
+                                                    argLabel_Command(cmd, "newwindow")));
                     return iTrue;
                 }
-                if (isCommand_Widget(w, ev, "feed.entry.toggleread")) {
+                else if (isCommand_Widget(w, ev, "feed.entry.copy")) {
+                    SDL_SetClipboardText(cstr_String(&item->url));
+                    return iTrue;
+                }
+                else if (isCommand_Widget(w, ev, "feed.entry.toggleread")) {
                     iVisited *vis = visited_App();
                     const iString *url = urlFragmentStripped_String(&item->url);
                     if (containsUrl_Visited(vis, url)) {
@@ -1657,7 +1680,7 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                     postCommand_App("visited.changed");
                     return iTrue;
                 }
-                if (isCommand_Widget(w, ev, "feed.entry.bookmark")) {
+                else if (isCommand_Widget(w, ev, "feed.entry.bookmark")) {
                     makeBookmarkCreation_Widget(&item->url, &item->label, item->icon);
                     if (deviceType_App() == desktop_AppDeviceType) {
                         postCommand_App("focus.set id:bmed.title");
@@ -1706,6 +1729,18 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
             }
             return iTrue;
         }
+        else if (isCommand_Widget(w, ev, "history.open")) {
+            const iSidebarItem *item = d->contextItem;
+            if (item && !isEmpty_String(&item->url)) {
+                const char *cmd = command_UserEvent(ev);
+                postCommand_Widget(d,
+                                   "!open newtab:%d newwindow:%d url:%s",
+                                   argLabel_Command(cmd, "newtab"),
+                                   argLabel_Command(cmd, "newwindow"),
+                                   cstr_String(&item->url));
+            }
+            return iTrue;
+        }
         else if (isCommand_Widget(w, ev, "history.copy")) {
             const iSidebarItem *item = d->contextItem;
             if (item && !isEmpty_String(&item->url)) {
@@ -2156,28 +2191,38 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
                                    : uiTextDim_ColorId;
             iUrl parts;
             init_Url(&parts, &d->label);
-            const iBool isAbout  = equalCase_Rangecc(parts.scheme, "about");
-            const iBool isGemini = equalCase_Rangecc(parts.scheme, "gemini");
-            draw_Text(font,
-                      add_I2(topLeft_Rect(itemRect),
-                             init_I2(3 * gap_UI, (itemHeight - lineHeight_Text(font)) / 2)),
-                      fg,
-                      "%s%s%s%s%s%s%s%s",
-                      isGemini ? "" : cstr_Rangecc(parts.scheme),
-                      isGemini  ? ""
-                      : isAbout ? ":"
-                                : "://",
-                      escape_Color(isHover ? (isPressing ? uiTextPressed_ColorId
-                                                         : uiTextFramelessHover_ColorId)
-                                           : uiTextStrong_ColorId),
-                      cstr_Rangecc(parts.host),
-                      escape_Color(fg),
-                      cstr_Rangecc(parts.path),
-                      !isEmpty_Range(&parts.query) ? escape_Color(isPressing ? uiTextPressed_ColorId
-                                                                  : isHover  ? uiText_ColorId
-                                                                             : uiAnnotation_ColorId)
-                                                   : "",
-                      !isEmpty_Range(&parts.query) ? cstr_Rangecc(parts.query) : "");
+            const iBool isAbout    = equalCase_Rangecc(parts.scheme, "about");
+            const iBool isGemini   = equalCase_Rangecc(parts.scheme, "gemini");
+            const iBool isData     = equalCase_Rangecc(parts.scheme, "data");
+            const int   queryColor = isPressing ? uiTextPressed_ColorId
+                                     : isHover  ? uiText_ColorId
+                                                : uiAnnotation_ColorId;
+            const iInt2 textPos =
+                add_I2(topLeft_Rect(itemRect),
+                       init_I2(3 * gap_UI, (itemHeight - lineHeight_Text(font)) / 2));
+            if (isData) {
+                drawRange_Text(
+                    font, textPos, fg, range_String(prettyDataUrl_String(&d->label, queryColor)));
+            }
+            else {
+                draw_Text(
+                    font,
+                    textPos,
+                    fg,
+                    "%s%s%s%s%s%s%s%s",
+                    isGemini ? "" : cstr_Rangecc(parts.scheme),
+                    isGemini  ? ""
+                    : isAbout ? ":"
+                              : "://",
+                    escape_Color(isHover ? (isPressing ? uiTextPressed_ColorId
+                                                       : uiTextFramelessHover_ColorId)
+                                         : uiTextStrong_ColorId),
+                    cstr_Rangecc(parts.host),
+                    escape_Color(fg),
+                    cstr_Rangecc(parts.path),
+                    !isEmpty_Range(&parts.query) ? escape_Color(queryColor) : "",
+                    !isEmpty_Range(&parts.query) ? cstr_Rangecc(parts.query) : "");
+            }
         }
         iEndCollect();
     }