4 files changed, 62 insertions, 4 deletions

diff --git a/src/app.c b/src/app.c
index 7a170aa4..6071fb6f 100644
--- a/src/app.c
+++ b/src/app.c
@@ -96,6 +96,8 @@ struct Impl_App {
     int          zoomPercent;
     enum iColorTheme theme;
     iBool        useSystemTheme;
+    iString      gopherProxy;
+    iString      httpProxy;
 };
 
 static iApp app_;
@@ -149,6 +151,8 @@ static iString *serializePrefs_App_(const iApp *d) {
     appendFormat_String(str, "zoom.set arg:%d\n", d->zoomPercent);
     appendFormat_String(str, "theme.set arg:%d auto:1\n", d->theme);
     appendFormat_String(str, "ostheme arg:%d\n", d->useSystemTheme);
+    appendFormat_String(str, "proxy.gopher address:%s\n", cstr_String(&d->gopherProxy));
+    appendFormat_String(str, "proxy.http address:%s\n", cstr_String(&d->httpProxy));
     return str;
 }
 
@@ -281,6 +285,8 @@ static void init_App_(iApp *d, int argc, char **argv) {
     d->visited           = new_Visited();
     d->bookmarks         = new_Bookmarks();
     d->tabEnum           = 0; /* generates unique IDs for tab pages */
+    init_String(&d->gopherProxy);
+    init_String(&d->httpProxy);
     setThemePalette_Color(d->theme);
     loadPrefs_App_(d);
     load_Visited(d->visited, dataDir_App_);
@@ -427,6 +433,17 @@ enum iColorTheme colorTheme_App(void) {
     return app_.theme;
 }
 
+const iString *schemeProxy_App(iRangecc scheme) {
+    iApp *d = &app_;
+    if (equalCase_Rangecc(scheme, "gopher")) {
+        return &d->gopherProxy;
+    }
+    if (equalCase_Rangecc(scheme, "http") || equalCase_Rangecc(scheme, "https")) {
+        return &d->httpProxy;
+    }
+    return NULL;
+}
+
 int run_App(int argc, char **argv) {
     init_App_(&app_, argc, argv);
     const int rc = run_App_(&app_);
@@ -515,11 +532,14 @@ static iBool handlePrefsCommands_(iWidget *d, const char *cmd) {
                          isSelected_Widget(findChild_Widget(d, "prefs.retainwindow")));
         postCommandf_App("ostheme arg:%d",
                          isSelected_Widget(findChild_Widget(d, "prefs.ostheme")));
+        postCommandf_App("proxy.http address:%s",
+                         cstr_String(text_InputWidget(findChild_Widget(d, "prefs.proxy.http"))));
+        postCommandf_App("proxy.gopher address:%s",
+                         cstr_String(text_InputWidget(findChild_Widget(d, "prefs.proxy.gopher"))));
         destroy_Widget(d);
         return iTrue;
     }
     else if (equal_Command(cmd, "prefs.ostheme.changed")) {
-        //setToggle_Widget(findChild_Widget(d, "prefs.ostheme"), arg_Command(cmd));
         postCommandf_App("ostheme arg:%d", arg_Command(cmd));
     }
     else if (equal_Command(cmd, "theme.changed")) {        
@@ -739,6 +759,10 @@ iBool handleCommand_App(const char *cmd) {
         setToggle_Widget(findChild_Widget(dlg, "prefs.retainwindow"), d->retainWindowSize);
         setText_InputWidget(findChild_Widget(dlg, "prefs.uiscale"),
                             collectNewFormat_String("%g", uiScale_Window(d->window)));
+        setText_InputWidget(findChild_Widget(dlg, "prefs.proxy.http"),
+                            schemeProxy_App(range_CStr("http")));
+        setText_InputWidget(findChild_Widget(dlg, "prefs.proxy.gopher"),
+                            schemeProxy_App(range_CStr("gopher")));
         setCommandHandler_Widget(dlg, handlePrefsCommands_);
     }
     else if (equal_Command(cmd, "navigate.home")) {
@@ -802,6 +826,14 @@ iBool handleCommand_App(const char *cmd) {
         }
         return iFalse;
     }
+    else if (equal_Command(cmd, "proxy.gopher")) {
+        setCStr_String(&d->gopherProxy, suffixPtr_Command(cmd, "address"));
+        return iTrue;
+    }
+    else if (equal_Command(cmd, "proxy.http")) {
+        setCStr_String(&d->httpProxy, suffixPtr_Command(cmd, "address"));
+        return iTrue;
+    }
     else {
         return iFalse;
     }
diff --git a/src/app.h b/src/app.h
index 09c60c0f..3d4808bc 100644
--- a/src/app.h
+++ b/src/app.h
@@ -57,6 +57,7 @@ uint32_t    elapsedSinceLastTicker_App  (void); /* milliseconds */
 
 int                 zoom_App            (void);
 enum iColorTheme    colorTheme_App      (void);
+const iString *     schemeProxy_App     (iRangecc scheme);
 
 iGmCerts *          certs_App           (void);
 iVisited *          visited_App         (void);
diff --git a/src/gmrequest.c b/src/gmrequest.c
index 391c7e89..24732650 100644
--- a/src/gmrequest.c
+++ b/src/gmrequest.c
@@ -402,6 +402,9 @@ void submit_GmRequest(iGmRequest *d) {
     init_Url(&url, &d->url);
     /* Check for special schemes. */
     /* TODO: If this were a library, these could be handled via callbacks. */
+    /* TODO: Handle app's configured proxies and these via the same mechanism. */
+    const iString *host = collect_String(newRange_String(url.host));
+    uint16_t       port = toInt_String(collect_String(newRange_String(url.port)));
     if (equalCase_Rangecc(url.scheme, "about")) {
         const iBlock *src = aboutPageSource_(url.path);
         if (src) {
@@ -487,6 +490,19 @@ void submit_GmRequest(iGmRequest *d) {
         iNotifyAudience(d, finished, GmRequestFinished);
         return;
     }
+    else if (schemeProxy_App(url.scheme)) {
+        /* User has configured a proxy server for this scheme. */
+        const iString *proxy = schemeProxy_App(url.scheme);
+        if (contains_String(proxy, ':')) {
+            const size_t cpos = indexOf_String(proxy, ':');
+            port = atoi(cstr_String(proxy) + cpos + 1);
+            host = collect_String(newCStrN_String(cstr_String(proxy), cpos));
+        }
+        else {
+            host = proxy;
+            port = 0;
+        }
+    }
     d->state = receivingHeader_GmRequestState;
     d->req = new_TlsRequest();
     const iGmIdentity *identity = identityForUrl_GmCerts(d->certs, &d->url);
@@ -495,11 +511,10 @@ void submit_GmRequest(iGmRequest *d) {
     }
     iConnect(TlsRequest, d->req, readyRead, d, readIncoming_GmRequest_);
     iConnect(TlsRequest, d->req, finished, d, requestFinished_GmRequest_);
-    uint16_t port = toInt_String(collect_String(newRange_String(url.port)));
     if (port == 0) {
         port = 1965; /* default Gemini port */
     }
-    setUrl_TlsRequest(d->req, collect_String(newRange_String(url.host)), port);
+    setUrl_TlsRequest(d->req, host, port);
     setContent_TlsRequest(d->req,
                           utf8_String(collectNewFormat_String("%s\r\n", cstr_String(&d->url))));
     submit_TlsRequest(d->req);
diff --git a/src/ui/util.c b/src/ui/util.c
index 6aa6ccc9..dfe364a5 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -755,8 +755,18 @@ iWidget *makePreferences_Widget(void) {
     addChild_Widget(values, iClob(makeToggle_Widget("prefs.retainwindow")));
     addChild_Widget(headings, iClob(makeHeading_Widget("UI scale factor:")));
     setId_Widget(addChild_Widget(values, iClob(new_InputWidget(8))), "prefs.uiscale");
+    addChild_Widget(headings, iClob(makeHeading_Widget(uiHeading_ColorEscape "Proxies")));
+    addChild_Widget(values, iClob(makeHeading_Widget("")));
+    addChild_Widget(headings, iClob(makeHeading_Widget("HTTP proxy:")));
+    setId_Widget(addChild_Widget(values, iClob(new_InputWidget(0))), "prefs.proxy.http");
+    addChild_Widget(headings, iClob(makeHeading_Widget("Gopher proxy:")));
+    setId_Widget(addChild_Widget(values, iClob(new_InputWidget(0))), "prefs.proxy.gopher");
     arrange_Widget(dlg);
-//    as_Widget(songDir)->rect.size.x = dlg->rect.size.x - headings->rect.size.x;
+    /* Text input widths. */ {
+        const int inputWidth = width_Rect(page->rect) - width_Rect(headings->rect);
+        as_Widget(findChild_Widget(values, "prefs.proxy.http"))->rect.size.x = inputWidth;
+        as_Widget(findChild_Widget(values, "prefs.proxy.gopher"))->rect.size.x = inputWidth;
+    }
     iWidget *div = new_Widget(); {
         setFlags_Widget(div, arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag, iTrue);
         addChild_Widget(div, iClob(new_LabelWidget("Dismiss", SDLK_ESCAPE, 0, "prefs.dismiss")));