DocumentWidget: Bookmarking a wrapped link

Only the clicked part of the label text was used for the bookmark.

3 files changed, 14 insertions, 1 deletions

diff --git a/src/gmdocument.c b/src/gmdocument.c
index f8e5b8ad..bade99ce 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -47,6 +47,7 @@ iDeclareType(GmLink)
 struct Impl_GmLink {
     iString url;
     iRangecc urlRange; /* URL in the source */
+    iRangecc labelRange; /* label in the source */
     iRangecc labelIcon; /* special icon defined in the label text */
     iTime when;
     int flags;
@@ -55,6 +56,7 @@ struct Impl_GmLink {
 void init_GmLink(iGmLink *d) {
     init_String(&d->url);
     d->urlRange = iNullRange;
+    d->labelRange = iNullRange;
     iZap(d->when);
     d->flags = 0;
 }
@@ -235,6 +237,7 @@ static iRangecc addLink_GmDocument_(iGmDocument *d, iRangecc line, iGmLinkId *li
         *linkId = size_PtrArray(&d->links); /* index + 1 */
         iRangecc desc = capturedRange_RegExpMatch(&m, 2);
         trim_Rangecc(&desc);
+        link->labelRange = desc;
         link->labelIcon = iNullRange;
         if (!isEmpty_Range(&desc)) {
             line = desc; /* Just show the description. */
@@ -1522,6 +1525,14 @@ iRangecc linkUrlRange_GmDocument(const iGmDocument *d, iGmLinkId linkId) {
     return link->urlRange;
 }
 
+iRangecc linkLabel_GmDocument(const iGmDocument *d, iGmLinkId linkId) {
+    const iGmLink *link = link_GmDocument_(d, linkId);
+    if (isEmpty_Range(&link->labelRange)) {
+        return link->urlRange;
+    }
+    return link->labelRange;
+}
+
 int linkFlags_GmDocument(const iGmDocument *d, iGmLinkId linkId) {
     const iGmLink *link = link_GmDocument_(d, linkId);
     return link ? link->flags : 0;
diff --git a/src/gmdocument.h b/src/gmdocument.h
index 1909460f..98eef152 100644
--- a/src/gmdocument.h
+++ b/src/gmdocument.h
@@ -169,6 +169,7 @@ const char *    findLoc_GmDocument      (const iGmDocument *, iInt2 pos);
 const iGmRun *  findRunAtLoc_GmDocument (const iGmDocument *, const char *loc);
 const iString * linkUrl_GmDocument      (const iGmDocument *, iGmLinkId linkId);
 iRangecc        linkUrlRange_GmDocument (const iGmDocument *, iGmLinkId linkId);
+iRangecc        linkLabel_GmDocument    (const iGmDocument *, iGmLinkId linkId);
 iMediaId        linkImage_GmDocument    (const iGmDocument *, iGmLinkId linkId);
 iMediaId        linkAudio_GmDocument    (const iGmDocument *, iGmLinkId linkId);
 int             linkFlags_GmDocument    (const iGmDocument *, iGmLinkId linkId);
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index b0107a75..5d3aa3ba 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -2449,7 +2449,8 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                                   format_CStr("!open noproxy:1 url:%s", cstr_String(linkUrl)) } },
                             2);
                     }
-                    iString *linkLabel = collect_String(newRange_String(d->contextLink->text));
+                    iString *linkLabel = collectNewRange_String(
+                        linkLabel_GmDocument(d->doc, d->contextLink->linkId));
                     urlEncodeSpaces_String(linkLabel);
                     pushBackN_Array(&items,
                                     (iMenuItem[]){ { "---", 0, 0, NULL },