5 files changed, 46 insertions, 18 deletions

diff --git a/src/gmdocument.c b/src/gmdocument.c
index 5da654c4..3dbef514 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -119,9 +119,10 @@ static iRangecc addLink_GmDocument_(iGmDocument *d, iRangecc line, iGmLinkId *li
     if (matchRange_RegExp(pattern, line, &m)) {
         iGmLink *link = new_GmLink();
         setRange_String(&link->url, capturedRange_RegExpMatch(&m, 1));
-        /* Check the host. */ {
+        /* Check the URL. */ {
             iUrl parts;
             init_Url(&parts, &link->url);
+            /* Host name. */
             if (!isEmpty_Range(&parts.host) &&
                 !equalCase_Rangecc(&parts.host, cstr_String(&d->localHost))) {
                 link->flags |= remote_GmLinkFlag;
@@ -138,6 +139,21 @@ static iRangecc addLink_GmDocument_(iGmDocument *d, iRangecc line, iGmLinkId *li
             else if (equalCase_Rangecc(&parts.protocol, "file")) {
                 link->flags |= file_GmLinkFlag;
             }
+            /* Check the file name extension, if present. */
+            if (!isEmpty_Range(&parts.path)) {
+                iString *path = newRange_String(parts.path);
+                if (endsWithCase_String(path, ".gif")  || endsWithCase_String(path, ".jpg") ||
+                    endsWithCase_String(path, ".jpeg") || endsWithCase_String(path, ".png") ||
+                    endsWithCase_String(path, ".tga")  || endsWithCase_String(path, ".psd") ||
+                    endsWithCase_String(path, ".hdr")  || endsWithCase_String(path, ".pic")) {
+                    link->flags |= imageFileExtension_GmLinkFlag;
+                }
+                else if (endsWithCase_String(path, ".mp3") || endsWithCase_String(path, ".wav") ||
+                         endsWithCase_String(path, ".mid")) {
+                    link->flags |= audioFileExtension_GmLinkFlag;
+                }
+                delete_String(path);
+            }
         }
         pushBack_PtrArray(&d->links, link);
         *linkId = size_PtrArray(&d->links); /* index + 1 */
diff --git a/src/gmdocument.h b/src/gmdocument.h
index d834f9d6..c671eaaf 100644
--- a/src/gmdocument.h
+++ b/src/gmdocument.h
@@ -10,11 +10,13 @@ iDeclareType(GmRun)
 typedef uint16_t iGmLinkId;
 
 enum iGmLinkFlags {
-    userFriendly_GmLinkFlag = 0x1,
-    remote_GmLinkFlag       = 0x2,
-    http_GmLinkFlag         = 0x4,
-    gopher_GmLinkFlag       = 0x8,
-    file_GmLinkFlag         = 0x10,
+    userFriendly_GmLinkFlag       = 0x1,
+    remote_GmLinkFlag             = 0x2,
+    http_GmLinkFlag               = 0x4,
+    gopher_GmLinkFlag             = 0x8,
+    file_GmLinkFlag               = 0x10,
+    imageFileExtension_GmLinkFlag = 0x20,
+    audioFileExtension_GmLinkFlag = 0x40,
 };
 
 struct Impl_GmRun {
diff --git a/src/gmutil.c b/src/gmutil.c
index dbaf8759..1a8d469f 100644
--- a/src/gmutil.c
+++ b/src/gmutil.c
@@ -5,10 +5,10 @@
 #include <the_Foundation/object.h>
 
 void init_Url(iUrl *d, const iString *text) {
-    iRegExp *pattern =
+    iRegExp *absPat =
         new_RegExp("(.+)://([^/:?]*)(:[0-9]+)?([^?]*)(\\?.*)?", caseInsensitive_RegExpOption);
     iRegExpMatch m;
-    if (matchString_RegExp(pattern, text, &m)) {
+    if (matchString_RegExp(absPat, text, &m)) {
         d->protocol = capturedRange_RegExpMatch(&m, 1);
         d->host     = capturedRange_RegExpMatch(&m, 2);
         d->port     = capturedRange_RegExpMatch(&m, 3);
@@ -20,9 +20,16 @@ void init_Url(iUrl *d, const iString *text) {
         d->query = capturedRange_RegExpMatch(&m, 5);
     }
     else {
+        /* Must be a relative path. */
         iZap(*d);
+        iRegExp *relPat = new_RegExp("([^?]*)(\\?.*)?", 0);
+        if (matchString_RegExp(relPat, text, &m)) {
+            d->path  = capturedRange_RegExpMatch(&m, 1);
+            d->query = capturedRange_RegExpMatch(&m, 2);
+        }
+        iRelease(relPat);
     }
-    iRelease(pattern);
+    iRelease(absPat);
 }
 
 void urlEncodeSpaces_String(iString *d) {
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index b681c2c8..10af43f3 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -730,18 +730,21 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
 //        desc = cstrFormat_String("\u2192 %s", cstr_String(collect_String(newRange_String(parts.protocol))));
         const iString *host = collect_String(newRange_String(parts.host));
         fg = linkColor_GmDocument(doc, linkId);
-        if (!isEmpty_String(host) && flags & userFriendly_GmLinkFlag) {
-//        int descWidth = measure_Text(default_FontId, cstr_String(host)).x + gap_UI;
+        const iBool showHost = (!isEmpty_String(host) && flags & userFriendly_GmLinkFlag);
+        const iBool showImage = (flags & imageFileExtension_GmLinkFlag) != 0;
+        const iBool showAudio = (flags & audioFileExtension_GmLinkFlag) != 0;
+        if (flags & (imageFileExtension_GmLinkFlag | audioFileExtension_GmLinkFlag) || showHost) {
             iRect linkRect = moved_Rect(run->visBounds, origin);
-//        linkRect.size.x += descWidth;
-//        fillRect_Paint(&d->paint, linkRect, teal_ColorId);
             drawAlign_Text(default_FontId,
-//                           init_I2(right_Rect(d->bounds), top_Rect(linkRect)),
                            topRight_Rect(linkRect),
                            fg - 1,
                            left_Alignment,
-                           " \u2014 %s",
-                           cstr_String(host));
+                           " \u2014%s%s\r%c%s",
+                           showHost ? " " : "",
+                           showHost ? cstr_String(host) : "",
+                           showImage || showAudio ? '0' + fg : ('0' + fg - 1),
+                           showImage ? " View Image \U0001f5bc"
+                                     : showAudio ? " Play Audio \U0001f3b5" : "");
         }
     }
     const iInt2 visPos = add_I2(run->visBounds.pos, origin);
diff --git a/src/ui/window.c b/src/ui/window.c
index ad2aced8..a7291320 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -204,8 +204,8 @@ static void setupUserInterface_Window(iWindow *d) {
         iInputWidget *input = new_InputWidget(0);
         setId_Widget(addChildFlags_Widget(searchBar, iClob(input), expand_WidgetFlag),
                      "find.input");
-        addChild_Widget(searchBar, iClob(new_LabelWidget("Next", 'g', KMOD_PRIMARY, "find.next")));
-        addChild_Widget(searchBar, iClob(new_LabelWidget("Previous", 'g', KMOD_PRIMARY | KMOD_SHIFT, "find.prev")));
+        addChild_Widget(searchBar, iClob(new_LabelWidget(" \U0001f86b ", 'g', KMOD_PRIMARY, "find.next")));
+        addChild_Widget(searchBar, iClob(new_LabelWidget(" \U0001f869 ", 'g', KMOD_PRIMARY | KMOD_SHIFT, "find.prev")));
         addChild_Widget(searchBar, iClob(new_LabelWidget("\u00d7", SDLK_ESCAPE, 0, "find.close")));
     }