30 files changed, 30 insertions, 9 deletions

diff --git a/po/en.po b/po/en.po
index aae67ff0..aa557043 100644
--- a/po/en.po
+++ b/po/en.po
@@ -1429,6 +1429,10 @@ msgstr "Collapse preformatted:"
 msgid "prefs.bookmarks.addbottom"
 msgstr "Add bookmarks to bottom:"
 
+# User preference that controls whether image data embedded in Data URLs gets automatically displayed when a page is loaded.
+msgid "prefs.dataurl.openimages"
+msgstr "Open images in Data URLs:"
+
 # User preference that controls whether index.gmi pages get automatically opened when browsing the contents of a directory inside a compressed archive.
 msgid "prefs.archive.openindex"
 msgstr "Open archive indices:"
diff --git a/res/lang/cs.bin b/res/lang/cs.bin
index a14c5cf4..f3f2a060 100644
--- a/res/lang/cs.bin
+++ b/res/lang/cs.bin
diff --git a/res/lang/de.bin b/res/lang/de.bin
index 8dd9d478..0f918bfb 100644
--- a/res/lang/de.bin
+++ b/res/lang/de.bin
diff --git a/res/lang/en.bin b/res/lang/en.bin
index dd3389ef..727258d1 100644
--- a/res/lang/en.bin
+++ b/res/lang/en.bin
diff --git a/res/lang/eo.bin b/res/lang/eo.bin
index c65c893c..f68ac15d 100644
--- a/res/lang/eo.bin
+++ b/res/lang/eo.bin
diff --git a/res/lang/es.bin b/res/lang/es.bin
index a0f2a07f..1d09138c 100644
--- a/res/lang/es.bin
+++ b/res/lang/es.bin
diff --git a/res/lang/es_MX.bin b/res/lang/es_MX.bin
index e83f92e2..d3efe8fe 100644
--- a/res/lang/es_MX.bin
+++ b/res/lang/es_MX.bin
diff --git a/res/lang/fi.bin b/res/lang/fi.bin
index f390cdca..24e2a905 100644
--- a/res/lang/fi.bin
+++ b/res/lang/fi.bin
diff --git a/res/lang/fr.bin b/res/lang/fr.bin
index c268b356..c644fab8 100644
--- a/res/lang/fr.bin
+++ b/res/lang/fr.bin
diff --git a/res/lang/gl.bin b/res/lang/gl.bin
index 04311f53..e93d1eb7 100644
--- a/res/lang/gl.bin
+++ b/res/lang/gl.bin
diff --git a/res/lang/hu.bin b/res/lang/hu.bin
index 28ba0e48..5bfe37eb 100644
--- a/res/lang/hu.bin
+++ b/res/lang/hu.bin
diff --git a/res/lang/ia.bin b/res/lang/ia.bin
index 27e3ba71..4b0b9bc3 100644
--- a/res/lang/ia.bin
+++ b/res/lang/ia.bin
diff --git a/res/lang/ie.bin b/res/lang/ie.bin
index 244ade42..b69fd2a4 100644
--- a/res/lang/ie.bin
+++ b/res/lang/ie.bin
diff --git a/res/lang/isv.bin b/res/lang/isv.bin
index 8c177e99..0cbd0f67 100644
--- a/res/lang/isv.bin
+++ b/res/lang/isv.bin
diff --git a/res/lang/nl.bin b/res/lang/nl.bin
index 2bdf4a71..82d13774 100644
--- a/res/lang/nl.bin
+++ b/res/lang/nl.bin
diff --git a/res/lang/pl.bin b/res/lang/pl.bin
index 129d34da..9d13a9e2 100644
--- a/res/lang/pl.bin
+++ b/res/lang/pl.bin
diff --git a/res/lang/ru.bin b/res/lang/ru.bin
index ac407168..6a09521d 100644
--- a/res/lang/ru.bin
+++ b/res/lang/ru.bin
diff --git a/res/lang/sk.bin b/res/lang/sk.bin
index 099f0ccf..9532ca17 100644
--- a/res/lang/sk.bin
+++ b/res/lang/sk.bin
diff --git a/res/lang/sr.bin b/res/lang/sr.bin
index e550a05a..58828fea 100644
--- a/res/lang/sr.bin
+++ b/res/lang/sr.bin
diff --git a/res/lang/tok.bin b/res/lang/tok.bin
index 2bf27e86..0c4f6123 100644
--- a/res/lang/tok.bin
+++ b/res/lang/tok.bin
diff --git a/res/lang/tr.bin b/res/lang/tr.bin
index 6bd0c26c..f62d0968 100644
--- a/res/lang/tr.bin
+++ b/res/lang/tr.bin
diff --git a/res/lang/uk.bin b/res/lang/uk.bin
index 520f6c97..bbc10575 100644
--- a/res/lang/uk.bin
+++ b/res/lang/uk.bin
diff --git a/res/lang/zh_Hans.bin b/res/lang/zh_Hans.bin
index 81ea7de6..3a34d15d 100644
--- a/res/lang/zh_Hans.bin
+++ b/res/lang/zh_Hans.bin
diff --git a/res/lang/zh_Hant.bin b/res/lang/zh_Hant.bin
index 029551c7..f0ac2727 100644
--- a/res/lang/zh_Hant.bin
+++ b/res/lang/zh_Hant.bin
diff --git a/src/app.c b/src/app.c
index a2ada36e..d1e3870a 100644
--- a/src/app.c
+++ b/src/app.c
@@ -280,6 +280,7 @@ static iString *serializePrefs_App_(const iApp *d) {
         { "prefs.collapsepreonload", &d->prefs.collapsePreOnLoad },
         { "prefs.hoverlink", &d->prefs.hoverLink },
         { "prefs.bookmarks.addbottom", &d->prefs.addBookmarksToBottom },
+        { "prefs.dataurl.openimages", &d->prefs.openDataUrlImagesOnLoad },
         { "prefs.archive.openindex", &d->prefs.openArchiveIndexPages },
         { "prefs.font.warnmissing", &d->prefs.warnAboutMissingGlyphs },
         { "prefs.blink", &d->prefs.blinkingCursor },
@@ -2729,6 +2730,10 @@ iBool handleCommand_App(const char *cmd) {
         postRefresh_App();
         return iTrue;
     }
+    else if (equal_Command(cmd, "prefs.dataurl.openimages.changed")) {
+        d->prefs.openDataUrlImagesOnLoad = arg_Command(cmd) != 0;
+        return iTrue;
+    }
     else if (equal_Command(cmd, "prefs.archive.openindex.changed")) {
         d->prefs.openArchiveIndexPages = arg_Command(cmd) != 0;
         return iTrue;
@@ -3096,6 +3101,7 @@ iBool handleCommand_App(const char *cmd) {
         setToggle_Widget(findChild_Widget(dlg, "prefs.hidetoolbarscroll"), d->prefs.hideToolbarOnScroll);
         setToggle_Widget(findChild_Widget(dlg, "prefs.bookmarks.addbottom"), d->prefs.addBookmarksToBottom);
         setToggle_Widget(findChild_Widget(dlg, "prefs.font.warnmissing"), d->prefs.warnAboutMissingGlyphs);
+        setToggle_Widget(findChild_Widget(dlg, "prefs.dataurl.openimages"), d->prefs.openDataUrlImagesOnLoad);
         setToggle_Widget(findChild_Widget(dlg, "prefs.archive.openindex"), d->prefs.openArchiveIndexPages);
         setToggle_Widget(findChild_Widget(dlg, "prefs.ostheme"), d->prefs.useSystemTheme);
         setToggle_Widget(findChild_Widget(dlg, "prefs.customframe"), d->prefs.customFrame);
diff --git a/src/gmdocument.c b/src/gmdocument.c
index 5cae4138..a3e233f3 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -334,7 +334,7 @@ static iRangecc addLink_GmDocument_(iGmDocument *d, iRangecc line, iGmLinkId *li
         setRange_String(&link->url, link->urlRange);
         set_String(&link->url, canonicalUrl_String(absoluteUrl_String(&d->url, &link->url)));
         /* If invalid, disregard the link. */
-        if (size_String(&link->url) > prefs_App()->maxUrlSize ||
+        if ((d->format == gemini_SourceFormat && size_String(&link->url) > prefs_App()->maxUrlSize) ||
             (startsWithCase_String(&link->url, "about:command")
              /* this is a special internal page that allows submitting UI events */
              && !d->enableCommandLinks)) {
@@ -371,7 +371,11 @@ static iRangecc addLink_GmDocument_(iGmDocument *d, iRangecc line, iGmLinkId *li
             }
             else if (equalCase_Rangecc(parts.scheme, "data")) {
                 setScheme_GmLink_(link, data_GmLinkScheme);
-                if (startsWith_Rangecc(parts.path, "image/")) {
+                if (startsWith_Rangecc(parts.path, "image/png") ||
+                    startsWith_Rangecc(parts.path, "image/jpg") ||
+                    startsWith_Rangecc(parts.path, "image/jpeg") ||
+                    startsWith_Rangecc(parts.path, "image/webp") ||
+                    startsWith_Rangecc(parts.path, "image/gif")) {
                     link->flags |= imageFileExtension_GmLinkFlag;
                 }
             }
diff --git a/src/prefs.c b/src/prefs.c
index cd86bf60..08355a6a 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -66,11 +66,12 @@ void init_Prefs(iPrefs *d) {
     d->smoothScrollSpeed[keyboard_ScrollType] = 13;
     d->smoothScrollSpeed[mouse_ScrollType]    = 13;
     d->loadImageInsteadOfScrolling = iFalse;
-    d->collapsePreOnLoad      = iFalse;
-    d->openArchiveIndexPages  = iTrue;
-    d->addBookmarksToBottom   = iTrue;
-    d->warnAboutMissingGlyphs = iTrue;
-    d->decodeUserVisibleURLs  = iTrue;
+    d->openDataUrlImagesOnLoad = iFalse;
+    d->collapsePreOnLoad       = iFalse;
+    d->openArchiveIndexPages   = iTrue;
+    d->addBookmarksToBottom    = iTrue;
+    d->warnAboutMissingGlyphs  = iTrue;
+    d->decodeUserVisibleURLs   = iTrue;
     d->maxCacheSize      = 10;
     d->maxMemorySize     = 200;
     d->maxUrlSize        = 8192;
diff --git a/src/prefs.h b/src/prefs.h
index 25bf56c4..59c36a16 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -75,6 +75,7 @@ enum iPrefsBool {
     hoverLink_PrefsBool,
     smoothScrolling_PrefsBool,
     loadImageInsteadOfScrolling_PrefsBool,
+    openDataUrlImagesOnLoad_PrefsBool,
     collapsePreOnLoad_PrefsBool,
     openArchiveIndexPages_PrefsBool,
     
@@ -128,6 +129,7 @@ struct Impl_Prefs {
             iBool hoverLink;
             iBool smoothScrolling;
             iBool loadImageInsteadOfScrolling;
+            iBool openDataUrlImagesOnLoad;
             iBool collapsePreOnLoad;
             iBool openArchiveIndexPages;
             
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 6513fc33..293e4507 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -2411,8 +2411,9 @@ static const char *zipPageHeading_(const iRangecc mime) {
 
 static void postProcessRequestContent_DocumentWidget_(iDocumentWidget *d, iBool isCached) {
     iWidget *w = as_Widget(d);
-    /* Embedded images in data links should be shown immediately as they are already fetched
-       data that is part of the document. */ {
+    /* Embedded images in data links can be shown immediately as they are already fetched
+       data that is part of the document. */
+    if (prefs_App()->openDataUrlImagesOnLoad) {
         iGmDocument *doc = d->view.doc;
         for (size_t linkId = 1; ; linkId++) {
             const int      linkFlags = linkFlags_GmDocument(doc, linkId);
diff --git a/src/ui/util.c b/src/ui/util.c
index 53ee8fda..b9f37476 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -2497,6 +2497,7 @@ iWidget *makePreferences_Widget(void) {
             { "input id:prefs.searchurl url:1 noheading:1" },
             { "padding" },
             { "toggle id:prefs.bookmarks.addbottom" },
+            { "toggle id:prefs.dataurl.openimages" },
             { "toggle id:prefs.archive.openindex" },
             { "radio device:1 id:prefs.pinsplit", 0, 0, (const void *) pinSplitItems },
             { "padding" },
@@ -2569,6 +2570,7 @@ iWidget *makePreferences_Widget(void) {
         const iMenuItem networkPanelItems[] = {
             { "title id:heading.prefs.network" },
             { "toggle id:prefs.decodeurls" },
+            { "input id:prefs.urlsize maxlen:10 selectall:1" },
             { "padding" },
             { "input id:prefs.cachesize maxlen:4 selectall:1 unit:mb" },
             { "input id:prefs.memorysize maxlen:4 selectall:1 unit:mb" },
@@ -2643,6 +2645,7 @@ iWidget *makePreferences_Widget(void) {
         addDialogPadding_(headings, values);
         addDialogToggle_(headings, values, "${prefs.hoverlink}", "prefs.hoverlink");
         addDialogToggle_(headings, values, "${prefs.bookmarks.addbottom}", "prefs.bookmarks.addbottom");
+        addDialogToggle_(headings, values, "${prefs.dataurl.openimages}", "prefs.dataurl.openimages");
         addDialogToggle_(headings, values, "${prefs.archive.openindex}", "prefs.archive.openindex");
         if (deviceType_App() != phone_AppDeviceType) {
             addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.pinsplit}")));