4 files changed, 63 insertions, 10 deletions

diff --git a/src/app.c b/src/app.c
index e0fe66df..e22ee494 100644
--- a/src/app.c
+++ b/src/app.c
@@ -599,6 +599,18 @@ static void communicateWithRunningInstance_App_(iApp *d, iProcessId instance,
 }
 #endif /* defined (LAGRANGE_ENABLE_IPC) */
 
+static iBool hasCommandLineOpenableScheme_(const iRangecc uri) {
+    static const char *schemes[] = {
+        "gemini:", "gopher:", "finger:", "file:", "data:", "about:"
+    };
+    iForIndices(i, schemes) {
+        if (startsWithCase_Rangecc(uri, schemes[i])) {
+            return iTrue;
+        }
+    }
+    return iFalse;
+}
+
 static void init_App_(iApp *d, int argc, char **argv) {
     init_CommandLine(&d->args, argc, argv);
     /* Where was the app started from? We ask SDL first because the command line alone is
@@ -633,6 +645,7 @@ static void init_App_(iApp *d, int argc, char **argv) {
         defineValues_CommandLine(&d->args, "go-home", 0);
         defineValues_CommandLine(&d->args, "help", 0);
         defineValues_CommandLine(&d->args, listTabUrls_CommandLineOption, 0);
+        defineValues_CommandLine(&d->args, openUrlOrSearch_CommandLineOption, 1);
         defineValuesN_CommandLine(&d->args, "new-tab", 0, 1);
         defineValues_CommandLine(&d->args, "sw", 0);
         defineValues_CommandLine(&d->args, "version;V", 0);
@@ -652,14 +665,11 @@ static void init_App_(iApp *d, int argc, char **argv) {
             const iRangecc arg = i.entry;
             if (i.argType == value_CommandLineArgType) {
                 /* URLs and file paths accepted. */
-                const iBool isKnownScheme =
-                    startsWithCase_Rangecc(arg, "gemini:") || startsWithCase_Rangecc(arg, "gopher:") ||
-                    startsWithCase_Rangecc(arg, "finger:") || startsWithCase_Rangecc(arg, "file:")   ||
-                    startsWithCase_Rangecc(arg, "data:")   || startsWithCase_Rangecc(arg, "about:");
-                if (isKnownScheme || fileExistsCStr_FileInfo(cstr_Rangecc(arg))) {
+                const iBool isOpenable = hasCommandLineOpenableScheme_(arg);
+                if (isOpenable || fileExistsCStr_FileInfo(cstr_Rangecc(arg))) {
                     iString *decUrl =
-                        isKnownScheme ? urlDecodeExclude_String(collectNewRange_String(arg), "/?#:")
-                                      : makeFileUrl_String(collectNewRange_String(arg));
+                        isOpenable ? urlDecodeExclude_String(collectNewRange_String(arg), "/?#:")
+                                   : makeFileUrl_String(collectNewRange_String(arg));
                     pushBack_StringList(openCmds,
                                         collectNewFormat_String(
                                             "open newtab:1 url:%s", cstr_String(decUrl)));
@@ -670,6 +680,19 @@ static void init_App_(iApp *d, int argc, char **argv) {
                     terminate_App_(1);
                 }
             }
+            else if (equal_CommandLineConstIterator(&i, openUrlOrSearch_CommandLineOption)) {
+                const iCommandLineArg *arg = iClob(argument_CommandLineConstIterator(&i));
+                const iString *input = value_CommandLineArg(arg, 0);
+                if (startsWith_String(input, "//")) {
+                    input = collectNewFormat_String("gemini:%s", cstr_String(input));
+                }
+                if (hasCommandLineOpenableScheme_(range_String(input))) {
+                    input = collect_String(urlDecodeExclude_String(input, "/?#:"));
+                }
+                pushBack_StringList(
+                    openCmds,
+                    collectNewFormat_String("search newtab:1 query:%s", cstr_String(input)));
+            }
             else if (!isDefined_CommandLine(&d->args, collectNewRange_String(i.entry))) {
                 fprintf(stderr, "Unknown option: %s\n", cstr_Rangecc(arg));
                 terminate_App_(1);
@@ -2126,6 +2149,20 @@ iBool handleCommand_App(const char *cmd) {
         }
         return iTrue;
     }
+    else if (equal_Command(cmd, "search")) {
+        const int newTab = argLabel_Command(cmd, "newtab");
+        const iString *query = collect_String(suffix_Command(cmd, "query"));
+        if (!isLikelyUrl_String(query)) {
+            const iString *url = searchQueryUrl_App(query);
+            if (!isEmpty_String(url)) {
+                postCommandf_App("open newtab:%d url:%s", newTab, cstr_String(url));
+            }
+        }
+        else {
+            postCommandf_App("open newtab:%d url:%s", newTab, cstr_String(query));
+        }
+        return iTrue;
+    }
     else if (equal_Command(cmd, "open")) {
         iString *url = collectNewCStr_String(suffixPtr_Command(cmd, "url"));
         const iBool noProxy = argLabel_Command(cmd, "noproxy");
diff --git a/src/app.h b/src/app.h
index 0fb6be29..918cd396 100644
--- a/src/app.h
+++ b/src/app.h
@@ -42,7 +42,8 @@ iDeclareType(Visited)
 iDeclareType(Window)
 
 /* Command line options strings. */
-#define listTabUrls_CommandLineOption   "list-tab-urls;L"
+#define listTabUrls_CommandLineOption       "list-tab-urls;L"
+#define openUrlOrSearch_CommandLineOption   "url-or-search;u"
 
 enum iAppDeviceType {
     desktop_AppDeviceType,
diff --git a/src/gmutil.c b/src/gmutil.c
index 2c9ba4eb..3ca93901 100644
--- a/src/gmutil.c
+++ b/src/gmutil.c
@@ -262,7 +262,20 @@ void urlEncodePath_String(iString *d) {
     delete_String(encoded);
 }
 
-static iBool isSupportedUrlScheme_Rangecc_(iRangecc scheme) {
+iBool isKnownScheme_Rangecc(iRangecc scheme) {
+    if (isKnownUrlScheme_Rangecc(scheme)) {
+        return iTrue;
+    }
+    static const char *uriSchemes[] = { "about", "data" };
+    iForIndices(i, uriSchemes) {
+        if (equalCase_Rangecc(scheme, uriSchemes[i])) {
+            return iTrue;
+        }
+    }    
+    return iFalse;
+}
+
+iBool isKnownUrlScheme_Rangecc(iRangecc scheme) {
     static const char *schemes[] = { "gemini", "gopher", "finger", "http", "https", "file" };
     iForIndices(i, schemes) {
         if (equalCase_Rangecc(scheme, schemes[i])) {
@@ -277,7 +290,7 @@ const iString *absoluteUrl_String(const iString *d, const iString *urlMaybeRelat
     iUrl rel;
     init_Url(&orig, d);
     init_Url(&rel, urlMaybeRelative);
-    if (!isEmpty_Range(&rel.scheme) && !isSupportedUrlScheme_Rangecc_(rel.scheme) &&
+    if (!isEmpty_Range(&rel.scheme) && !isKnownUrlScheme_Rangecc(rel.scheme) &&
         isEmpty_Range(&rel.host)) {
         /* Probably not an URL, so we can't make this absolute. */
         return urlMaybeRelative;
diff --git a/src/gmutil.h b/src/gmutil.h
index 09d333e7..e7ff7cc5 100644
--- a/src/gmutil.h
+++ b/src/gmutil.h
@@ -110,6 +110,8 @@ iRangecc        urlUser_String          (const iString *);
 iRangecc        urlRoot_String          (const iString *);
 const iString * absoluteUrl_String      (const iString *, const iString *urlMaybeRelative);
 iBool           isLikelyUrl_String      (const iString *);
+iBool           isKnownScheme_Rangecc   (iRangecc scheme); /* any URI scheme */
+iBool           isKnownUrlScheme_Rangecc(iRangecc scheme); /* URL schemes only */
 void            punyEncodeDomain_Rangecc(iRangecc domain, iString *encoded_out);
 void            punyEncodeUrlHost_String(iString *absoluteUrl);
 void            stripDefaultUrlPort_String(iString *);