2 files changed, 18 insertions, 1 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cd1a3733..46d418e8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -198,10 +198,11 @@ elseif (UNIX AND NOT APPLE)
 Name=Lagrange
 Comment=${PROJECT_DESCRIPTION}
 Categories=Network
-Exec=${CMAKE_INSTALL_PREFIX}/bin/lagrange
+Exec=${CMAKE_INSTALL_PREFIX}/bin/lagrange %U
 Terminal=false
 Type=Application
 Icon=fi.skyjake.lagrange
+MimeType=x-scheme-handler/gemini;
 ")
     install (TARGETS app DESTINATION bin)
     install (FILES ${desktop} DESTINATION share/applications)
diff --git a/src/app.c b/src/app.c
index 03e9b036..f5294cb0 100644
--- a/src/app.c
+++ b/src/app.c
@@ -339,6 +339,22 @@ static void init_App_(iApp *d, int argc, char **argv) {
             postCommandString_App(i.value);
         }
     }
+    /* URLs from the command line. */ {
+        iBool newTab = iFalse;
+        for (size_t i = 1; i < size_StringList(args_CommandLine(&d->args)); i++) {
+            const iString *arg = constAt_StringList(args_CommandLine(&d->args), i);
+            const iBool    isKnownScheme =
+                startsWithCase_String(arg, "gemini:") || startsWithCase_String(arg, "file:") ||
+                startsWithCase_String(arg, "data:")   || startsWithCase_String(arg, "about:");
+            if (isKnownScheme || fileExists_FileInfo(arg)) {
+                postCommandf_App("open newtab:%d url:%s%s",
+                                 newTab,
+                                 isKnownScheme ? "" : "file://",
+                                 cstr_String(arg));
+                newTab = iTrue;
+            }
+        }
+    }
 }
 
 static void deinit_App(iApp *d) {