Treat Gopher as an unsupported protocol

5 files changed, 25 insertions, 14 deletions

diff --git a/src/app.c b/src/app.c
index a76e135b..9a8e78ae 100644
--- a/src/app.c
+++ b/src/app.c
@@ -612,13 +612,14 @@ enum iColorTheme colorTheme_App(void) {
 
 const iString *schemeProxy_App(iRangecc scheme) {
     iApp *d = &app_;
+    const iString *proxy = NULL;
     if (equalCase_Rangecc(scheme, "gopher")) {
-        return &d->prefs.gopherProxy;
+        proxy = &d->prefs.gopherProxy;
     }
     if (equalCase_Rangecc(scheme, "http") || equalCase_Rangecc(scheme, "https")) {
-        return &d->prefs.httpProxy;
+        proxy = &d->prefs.httpProxy;
     }
-    return NULL;
+    return !isEmpty_String(proxy) ? proxy : NULL;
 }
 
 int run_App(int argc, char **argv) {
@@ -884,15 +885,7 @@ static iBool handleIdentityCreationCommands_(iWidget *dlg, const char *cmd) {
 }
 
 iBool willUseProxy_App(const iRangecc scheme) {
-    iApp *d = &app_;
-    if (!isEmpty_String(&d->prefs.httpProxy) && (equalCase_Rangecc(scheme, "http") ||
-                                                 equalCase_Rangecc(scheme, "https"))) {
-        return iTrue;
-    }
-    if (!isEmpty_String(&d->prefs.gopherProxy) && equalCase_Rangecc(scheme, "gopher")) {
-        return iTrue;
-    }
-    return iFalse;
+    return schemeProxy_App(scheme) != NULL;
 }
 
 iBool handleCommand_App(const char *cmd) {
@@ -1203,6 +1196,10 @@ iBool handleCommand_App(const char *cmd) {
         save_Bookmarks(d->bookmarks, dataDir_App_);
         return iFalse;
     }
+    else if (equal_Command(cmd, "visited.changed")) {
+        save_Visited(d->visited, dataDir_App_);
+        return iFalse;
+    }
     else if (equal_Command(cmd, "ident.new")) {
         iWidget *dlg = makeIdentityCreation_Widget();
         setCommandHandler_Widget(dlg, handleIdentityCreationCommands_);
diff --git a/src/gmdocument.c b/src/gmdocument.c
index 50733252..4e8b5ace 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -235,12 +235,14 @@ static void clearLinks_GmDocument_(iGmDocument *d) {
     clear_PtrArray(&d->links);
 }
 
+#if 0
 static iBool isGopher_GmDocument_(const iGmDocument *d) {
     return equalCase_Rangecc(urlScheme_String(&d->url), "gopher");
 }
+#endif
 
 static void doLayout_GmDocument_(iGmDocument *d) {
-    const iBool isGemini = !isGopher_GmDocument_(d);
+    const iBool isGemini = iTrue; // !isGopher_GmDocument_(d);
     /* TODO: Collect these parameters into a GmTheme. */
     const int fonts[max_GmLineType] = {
         isGemini ? paragraph_FontId : preformatted_FontId,
@@ -1081,7 +1083,7 @@ static void normalize_GmDocument(iGmDocument *d) {
     iRangecc src = range_String(&d->source);
     iRangecc line = iNullRange;
     iBool isPreformat = iFalse;
-    if (d->format == plainText_GmDocumentFormat || isGopher_GmDocument_(d)) {
+    if (d->format == plainText_GmDocumentFormat) { // || isGopher_GmDocument_(d)) {
         isPreformat = iTrue; /* Cannot be turned off. */
     }
     const int preTabWidth = 4; /* TODO: user-configurable parameter */
diff --git a/src/gmrequest.c b/src/gmrequest.c
index f15d80f1..a83a7666 100644
--- a/src/gmrequest.c
+++ b/src/gmrequest.c
@@ -534,6 +534,12 @@ void submit_GmRequest(iGmRequest *d) {
             port = 0;
         }
     }
+    else if (!equalCase_Rangecc(url.scheme, "gemini")) {
+        d->resp.statusCode = unsupportedProtocol_GmStatusCode;
+        d->state = finished_GmRequestState;
+        iNotifyAudience(d, finished, GmRequestFinished);
+        return;
+    }
     d->state = receivingHeader_GmRequestState;
     d->req = new_TlsRequest();
     const iGmIdentity *identity = identityForUrl_GmCerts(d->certs, &d->url);
diff --git a/src/gmutil.c b/src/gmutil.c
index 6166efd6..369aaaf1 100644
--- a/src/gmutil.c
+++ b/src/gmutil.c
@@ -236,6 +236,11 @@ static const struct {
       { 0x1f47d, /* alien */
         "Unsupported Content Type",
         "The received content cannot be viewed with this application." } },
+    { unsupportedProtocol_GmStatusCode,
+      { 0x1f61e, /* disappointed */
+        "Unsupported Protocol",
+        "The requested protocol is not supported by this application." },
+    },
     { invalidHeader_GmStatusCode,
       { 0x1f4a9, /* pile of poo */
         "Invalid Header",
diff --git a/src/gmutil.h b/src/gmutil.h
index 6778465a..e7022cfa 100644
--- a/src/gmutil.h
+++ b/src/gmutil.h
@@ -37,6 +37,7 @@ enum iGmStatusCode {
     tooManyRedirects_GmStatusCode,
     invalidHeader_GmStatusCode,
     unsupportedMimeType_GmStatusCode,
+    unsupportedProtocol_GmStatusCode,
     failedToOpenFile_GmStatusCode,
     unknownStatusCode_GmStatusCode,
     invalidLocalResource_GmStatusCode,