9 files changed, 85 insertions, 32 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 73e2b8d4..262bbcb9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,6 +48,7 @@ option (ENABLE_MPG123           "Use mpg123 for decoding MPEG audio" ON)
 option (ENABLE_RELATIVE_EMBED   "Resources should always be found via relative path" OFF)
 option (ENABLE_RESIZE_DRAW      "Force window to redraw during resizing" ${DEFAULT_RESIZE_DRAW})
 option (ENABLE_RESOURCE_EMBED   "Embed resources inside the executable" OFF)
+option (ENABLE_WEBP             "Use libwebp to decode .webp images (via pkg-config)" ON)
 option (ENABLE_WINDOWPOS_FIX    "Set position after showing window (workaround for SDL bug)" OFF)
 option (ENABLE_X11_SWRENDER     "Use software rendering under X11" OFF)
 
@@ -315,6 +316,10 @@ if (ENABLE_MPG123 AND MPG123_FOUND)
     target_compile_definitions (app PUBLIC LAGRANGE_ENABLE_MPG123=1)
     target_link_libraries (app PUBLIC PkgConfig::MPG123)
 endif ()
+if (ENABLE_WEBP AND WEBP_FOUND)
+    target_compile_definitions (app PUBLIC LAGRANGE_ENABLE_WEBP=1)
+    target_link_libraries (app PUBLIC PkgConfig::WEBP)
+endif ()
 if (ENABLE_IDLE_SLEEP)
     target_compile_definitions (app PUBLIC LAGRANGE_ENABLE_IDLE_SLEEP=1)
 endif ()
diff --git a/Depends.cmake b/Depends.cmake
index ef95c9f4..86a1b47d 100644
--- a/Depends.cmake
+++ b/Depends.cmake
@@ -149,3 +149,4 @@ endif ()
 find_package (PkgConfig REQUIRED)
 pkg_check_modules (SDL2 REQUIRED sdl2)
 pkg_check_modules (MPG123 IMPORTED_TARGET libmpg123)
+pkg_check_modules (WEBP IMPORTED_TARGET libwebp)
diff --git a/README.md b/README.md
index 3d9df1db..13b3f9d2 100644
--- a/README.md
+++ b/README.md
@@ -88,6 +88,7 @@ Note that the `install` target also deploys an XDG .desktop file for launching t
 | `ENABLE_MPG123` | Use the mpg123 library for decoding MPEG audio files. |
 | `ENABLE_RELATIVE_EMBED` | Locate resources only in relation to the executable. Useful when any system/predefined directories are not supposed to be accessed, e.g., in the Windows portable build. |
 | `ENABLE_RESOURCE_EMBED` | Embed all resource files into the Lagrange executable instead of keeping them in a separate file that gets loaded at launch. Setting this **ON** makes it much slower to run CMake and to compile Lagrange. |
+| `ENABLE_WEBP` | Use libwebp to decode .webp images, if `pkg-config` can find the library. |
 | `ENABLE_WINDOWPOS_FIX` | Set correct window position after the window has already been shown. This may be necessary on some platforms to prevent the window from being restored to the wrong position. |
 | `ENABLE_X11_SWRENDER` | Default to software rendering when running under X11. By default Lagrange attempts to use the GPU for rendering the user interface. You can also use the `--sw` option at launch to force software rendering. |
 
diff --git a/res/about/version.gmi b/res/about/version.gmi
index 89e81047..5141a4b1 100644
--- a/res/about/version.gmi
+++ b/res/about/version.gmi
@@ -6,6 +6,10 @@
 ```
 # Release notes
 
+## 1.7
+* Added support for viewing WebP images. The libwebp library is an optional dependency and will be included in the build if found via pkg-config.
+* Added a footer action to view `application/octet-stream` content depending on recognized file extensions.
+
 ## 1.6.4
 * Local files containing UTF-8 text can be viewed regardless of their file extension.
 * Fixed input field cursor positioning and insertion problems around Emoji variation selectors.
diff --git a/src/gmdocument.c b/src/gmdocument.c
index 6ed628de..75f6f06b 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -240,7 +240,10 @@ static iRangecc addLink_GmDocument_(iGmDocument *d, iRangecc line, iGmLinkId *li
                 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, ".tga")  || endsWithCase_String(path, ".psd") ||                    
+#if defined (LAGRANGE_ENABLE_WEBP)
+                    endsWithCase_String(path, ".webp") ||
+#endif
                     endsWithCase_String(path, ".hdr")  || endsWithCase_String(path, ".pic")) {
                     link->flags |= imageFileExtension_GmLinkFlag;
                 }
diff --git a/src/gmutil.c b/src/gmutil.c
index 9bd74ee0..d547d27d 100644
--- a/src/gmutil.c
+++ b/src/gmutil.c
@@ -511,54 +511,64 @@ const iString *findContainerArchive_Path(const iString *path) {
     return NULL;
 }
 
-const char *mediaType_Path(const iString *path) {
-    if (endsWithCase_String(path, ".gmi") || endsWithCase_String(path, ".gemini")) {
+const char *mediaTypeFromFileExtension_String(const iString *d) {
+    if (endsWithCase_String(d, ".gmi") || endsWithCase_String(d, ".gemini")) {
         return "text/gemini; charset=utf-8";
     }
-    else if (endsWithCase_String(path, ".pem")) {
+    else if (endsWithCase_String(d, ".pem")) {
         return "application/x-pem-file";
     }
-    else if (endsWithCase_String(path, ".zip")) {
+    else if (endsWithCase_String(d, ".zip")) {
         return "application/zip";
     }
-    else if (endsWithCase_String(path, ".gpub")) {
+    else if (endsWithCase_String(d, ".gpub")) {
         return "application/gpub+zip";
     }
-    else if (endsWithCase_String(path, ".xml")) {
+    else if (endsWithCase_String(d, ".xml")) {
         return "text/xml";
     }
-    else if (endsWithCase_String(path, ".png")) {
+    else if (endsWithCase_String(d, ".png")) {
         return "image/png";
     }
-    else if (endsWithCase_String(path, ".jpg") || endsWithCase_String(path, ".jpeg")) {
+    else if (endsWithCase_String(d, ".webp")) {
+        return "image/webp";
+    }
+    else if (endsWithCase_String(d, ".jpg") || endsWithCase_String(d, ".jpeg")) {
         return "image/jpeg";
     }
-    else if (endsWithCase_String(path, ".gif")) {
+    else if (endsWithCase_String(d, ".gif")) {
         return "image/gif";
     }
-    else if (endsWithCase_String(path, ".wav")) {
+    else if (endsWithCase_String(d, ".wav")) {
         return "audio/wave";
     }
-    else if (endsWithCase_String(path, ".ogg")) {
+    else if (endsWithCase_String(d, ".ogg")) {
         return "audio/ogg";
     }
-    else if (endsWithCase_String(path, ".mp3")) {
+    else if (endsWithCase_String(d, ".mp3")) {
         return "audio/mpeg";
     }
-    else if (endsWithCase_String(path, ".mid")) {
+    else if (endsWithCase_String(d, ".mid")) {
         return "audio/midi";
     }
-    else if (endsWithCase_String(path, ".txt") ||
-             endsWithCase_String(path, ".md") ||
-             endsWithCase_String(path, ".c") ||
-             endsWithCase_String(path, ".h") ||
-             endsWithCase_String(path, ".cc") ||
-             endsWithCase_String(path, ".hh") ||
-             endsWithCase_String(path, ".cpp") ||
-             endsWithCase_String(path, ".hpp")) {
+    else if (endsWithCase_String(d, ".txt") ||
+             endsWithCase_String(d, ".md") ||
+             endsWithCase_String(d, ".c") ||
+             endsWithCase_String(d, ".h") ||
+             endsWithCase_String(d, ".cc") ||
+             endsWithCase_String(d, ".hh") ||
+             endsWithCase_String(d, ".cpp") ||
+             endsWithCase_String(d, ".hpp")) {
         return "text/plain";
     }
-    const char *mtype = "application/octet-stream";
+    return "application/octet-stream";
+}
+
+const char *mediaType_Path(const iString *path) {
+    const char *mtype = mediaTypeFromFileExtension_String(path);
+    if (iCmpStr(mtype, "application/octet-stream")) {
+        return mtype; /* extension recognized */
+    }
     /* If the file is reasonably small and looks like UTF-8, we'll display it as text/plain. */
     if (fileExists_FileInfo(path) && fileSize_FileInfo(path) <= 5000000) {
         iFile *f = new_File(path);
diff --git a/src/gmutil.h b/src/gmutil.h
index f8491781..3c10d45b 100644
--- a/src/gmutil.h
+++ b/src/gmutil.h
@@ -133,6 +133,7 @@ const iString * withSpacesEncoded_String(const iString *);
 const iString * canonicalUrl_String     (const iString *);
 
 const char *    mediaType_Path                      (const iString *path);
+const char *    mediaTypeFromFileExtension_String   (const iString *);
 iRangecc        mediaTypeWithoutParameters_Rangecc  (iRangecc mime);
 
 const iString * findContainerArchive_Path           (const iString *path);
diff --git a/src/media.c b/src/media.c
index eb4a8311..5240ab5d 100644
--- a/src/media.c
+++ b/src/media.c
@@ -30,6 +30,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "stb_image.h"
 #include "stb_image_resize.h"
 
+#if defined (LAGRANGE_ENABLE_WEBP)
+#   include <webp/decode.h>
+#endif
+
 #include <the_Foundation/file.h>
 #include <the_Foundation/ptrarray.h>
 #include <SDL_hints.h>
@@ -86,8 +90,16 @@ void deinit_GmImage(iGmImage *d) {
 void makeTexture_GmImage(iGmImage *d) {
     iBlock *data     = &d->partialData;
     d->numBytes      = size_Block(data);
-    uint8_t *imgData = stbi_load_from_memory(
-        constData_Block(data), size_Block(data), &d->size.x, &d->size.y, NULL, 4);
+    uint8_t *imgData = NULL;
+    if (cmp_String(&d->props.mime, "image/webp") == 0) {
+#if defined (LAGRANGE_ENABLE_WEBP)
+        imgData = WebPDecodeRGBA(constData_Block(data), size_Block(data), &d->size.x, &d->size.y);
+#endif        
+    }
+    else {
+        imgData = stbi_load_from_memory(
+            constData_Block(data), size_Block(data), &d->size.x, &d->size.y, NULL, 4);
+    }
     if (!imgData) {
         d->size    = zero_I2();
         d->texture = NULL;
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 3f655db5..83f38dee 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -1168,13 +1168,25 @@ static void showErrorPage_DocumentWidget_(iDocumentWidget *d, enum iGmStatusCode
                 iString *key = collectNew_String();
                 toString_Sym(SDLK_s, KMOD_PRIMARY, key);
                 appendFormat_String(src, "\n```\n%s\n```\n", cstr_String(meta));
-                makeFooterButtons_DocumentWidget_(
-                    d,
-                    (iMenuItem[]){ { translateCStr_Lang(download_Icon " " saveToDownloads_Label),
-                                     0,
-                                     0,
-                                     "document.save" } },
-                    1);
+                const char *mtype = mediaTypeFromFileExtension_String(d->mod.url);
+                iArray items;
+                init_Array(&items, sizeof(iMenuItem));
+                if (iCmpStr(mtype, "application/octet-stream")) {
+                    pushBack_Array(
+                        &items,
+                        &(iMenuItem){ translateCStr_Lang(format_CStr("View as \"%s\"", mtype)),
+                                      SDLK_RETURN,
+                                      0,
+                                      format_CStr("document.setmediatype mime:%s", mtype) });
+                }
+                pushBack_Array(
+                    &items,
+                    &(iMenuItem){ translateCStr_Lang(download_Icon " " saveToDownloads_Label),
+                                  0,
+                                  0,
+                                  "document.save" });
+                makeFooterButtons_DocumentWidget_(d, data_Array(&items), size_Array(&items));
+                deinit_Array(&items);
                 break;
             }
             default:
@@ -3176,6 +3188,10 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
              document_App() == d) {
         return handleSwipe_DocumentWidget_(d, cmd);
     }
+    else if (equal_Command(cmd, "document.setmediatype") && document_App() == d) {
+        setUrlAndSource_DocumentWidget(d, d->mod.url, string_Command(cmd, "mime"), &d->sourceContent);
+        return iTrue;
+    }
     return iFalse;
 }