3 files changed, 32 insertions, 0 deletions

diff --git a/src/gmdocument.c b/src/gmdocument.c
index 0d008181..54b7ad56 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -40,6 +40,7 @@ iDeclareType(GmLink)
 struct Impl_GmLink {
     iString url;
     iRangecc urlRange; /* URL in the source */
+    iRangecc labelIcon; /* special icon defined in the label text */
     iTime when;
     int flags;
 };
@@ -227,9 +228,24 @@ 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->labelIcon = iNullRange;
         if (!isEmpty_Range(&desc)) {
             line = desc; /* Just show the description. */
             link->flags |= humanReadable_GmLinkFlag;
+            /* Check for a custom icon. */
+            if (link->flags & gemini_GmLinkFlag && ~link->flags & remote_GmLinkFlag) {
+                iChar icon = 0;
+                int len = 0;
+                if ((len = decodeBytes_MultibyteChar(desc.start, size_Range(&desc), &icon)) > 0) {
+                    if (desc.start + len < desc.end && (isSymbol_Char(icon) || isEmoji_Char(icon)) &&
+                        !isFitzpatrickType_Char(icon)) {
+                        link->flags |= iconFromLabel_GmLinkFlag;
+                        link->labelIcon = (iRangecc){ desc.start, desc.start + len };
+                        line.start += len;
+                        line.start = skipSpace_CStr(line.start);
+                    }
+                }
+            }
         }
         else {
             line = capturedRange_RegExpMatch(&m, 1); /* Show the URL. */
@@ -520,6 +536,10 @@ static void doLayout_GmDocument_(iGmDocument *d) {
                                              : link->flags & mailto_GmLinkFlag ? envelope
                                              : link->flags & remote_GmLinkFlag ? globe
                                                                                : arrow);
+            /* Custom link icon is shown on local Gemini links only. */
+            if (!isEmpty_Range(&link->labelIcon)) {
+                icon.text = link->labelIcon;
+            }
             icon.font = regular_FontId;
             if (link->flags & remote_GmLinkFlag) {
                 icon.visBounds.pos.x -= gap_Text / 2;
@@ -1450,6 +1470,10 @@ enum iColorId linkColor_GmDocument(const iGmDocument *d, iGmLinkId linkId, enum
             if (isUnsupported) {
                 return tmBadLink_ColorId;
             }
+            if (link->flags & iconFromLabel_GmLinkFlag) {
+                return link->flags & visited_GmLinkFlag ? tmLinkTextHover_ColorId
+                                                        : tmLinkText_ColorId;
+            }
             if (link->flags & visited_GmLinkFlag) {
                 return link->flags & www_GmLinkFlag ? tmHypertextLinkIconVisited_ColorId
                        : link->flags & gopherOrFinger_GmLinkFlag ? tmGopherLinkIconVisited_ColorId
diff --git a/src/gmdocument.h b/src/gmdocument.h
index 16127ea3..92f62ba4 100644
--- a/src/gmdocument.h
+++ b/src/gmdocument.h
@@ -69,6 +69,7 @@ enum iGmLinkFlags {
     visited_GmLinkFlag            = iBit(14), /* in the history */
     permanent_GmLinkFlag          = iBit(15), /* content cannot be dismissed; media link */
     query_GmLinkFlag              = iBit(16), /* Gopher query link */
+    iconFromLabel_GmLinkFlag      = iBit(17), /* use an Emoji/special character from label */
 };
 
 struct Impl_GmHeading {
diff --git a/src/ui/text.h b/src/ui/text.h
index acce286b..d57c2c62 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -140,6 +140,13 @@ iLocalDef iBool isEmoji_Char(iChar c) {
     return (c >= 0x1f300 && c < 0x1f700) || (c >= 0x1f7e0 && c <= 0x1f7eb) ||
            (c >= 0x1f900 && c <= 0x1f9ff);
 }
+iLocalDef iBool isDingbats_Char(iChar c) {
+    return c >= 0x2702 && c <= 0x27b0;
+}
+iLocalDef iBool isSymbol_Char(iChar c) {
+    return (c == 0x2218 || c == 0x2219) || (c >= 0x1f680 && c <= 0x1f6c0) ||
+           (c >= 0x2300 && c <= 0x26ff);
+}
 
 #define emojiVariationSelector_Char     ((iChar) 0xfe0f)