1 files changed, 45 insertions, 50 deletions

diff --git a/src/app.c b/src/app.c
index c0c0c47e..9c1ec7a4 100644
--- a/src/app.c
+++ b/src/app.c
@@ -94,17 +94,20 @@ struct Impl_App {
     iTime        lastDropTime; /* for detecting drops of multiple items */
     /* Preferences: */
     iBool        commandEcho; /* --echo */
-    iBool        retainWindowSize;
+    iBool        forceSoftwareRender; /* --sw */
     iRect        initialWindowRect;
+    iPrefs       prefs;
+#if 0
+    iBool        retainWindowSize;
     float        uiScale;
     int          zoomPercent;
     iBool        forceWrap;
-    iBool        forceSoftwareRender;
     enum iColorTheme theme;
     iBool        useSystemTheme;
     iString      gopherProxy;
     iString      httpProxy;
     iString      downloadDir;
+#endif
 };
 
 static iApp app_;
@@ -134,8 +137,8 @@ const iString *dateStr_(const iDate *date) {
 static iString *serializePrefs_App_(const iApp *d) {
     iString *str = new_String();
     const iSidebarWidget *sidebar = findWidget_App("sidebar");
-    appendFormat_String(str, "window.retain arg:%d\n", d->retainWindowSize);
-    if (d->retainWindowSize) {
+    appendFormat_String(str, "window.retain arg:%d\n", d->prefs.retainWindowSize);
+    if (d->prefs.retainWindowSize) {
         int w, h, x, y;
         SDL_GetWindowSize(d->window->win, &w, &h);
         SDL_GetWindowPosition(d->window->win, &x, &y);
@@ -153,17 +156,17 @@ static iString *serializePrefs_App_(const iApp *d) {
     if (isVisible_Widget(sidebar)) {
         appendCStr_String(str, "sidebar.toggle\n");
     }
-    if (d->forceWrap) {
+    if (d->prefs.forceLineWrap) {
         appendFormat_String(str, "forcewrap.toggle\n");
     }
     appendFormat_String(str, "sidebar.mode arg:%d\n", mode_SidebarWidget(sidebar));
     appendFormat_String(str, "uiscale arg:%f\n", uiScale_Window(d->window));
-    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));
-    appendFormat_String(str, "downloads path:%s\n", cstr_String(&d->downloadDir));
+    appendFormat_String(str, "zoom.set arg:%d\n", d->prefs.zoomPercent);
+    appendFormat_String(str, "theme.set arg:%d auto:1\n", d->prefs.theme);
+    appendFormat_String(str, "ostheme arg:%d\n", d->prefs.useSystemTheme);
+    appendFormat_String(str, "proxy.gopher address:%s\n", cstr_String(&d->prefs.gopherProxy));
+    appendFormat_String(str, "proxy.http address:%s\n", cstr_String(&d->prefs.httpProxy));
+    appendFormat_String(str, "downloads path:%s\n", cstr_String(&d->prefs.downloadDir));
     return str;
 }
 
@@ -299,24 +302,18 @@ static void init_App_(iApp *d, int argc, char **argv) {
     d->lastTickerTime    = SDL_GetTicks();
     d->elapsedSinceLastTicker = 0;
     d->commandEcho       = checkArgument_CommandLine(&d->args, "echo") != NULL;
+    d->forceSoftwareRender = checkArgument_CommandLine(&d->args, "sw") != NULL;
     d->initialWindowRect = init_Rect(-1, -1, 900, 560);
-    d->theme             = dark_ColorTheme;
-    d->useSystemTheme    = iTrue;
+    init_Prefs(&d->prefs);
+    setCStr_String(&d->prefs.downloadDir, downloadDir_App_);
     d->running           = iFalse;
     d->window            = NULL;
-    d->retainWindowSize  = iTrue;
     d->pendingRefresh    = iFalse;
-    d->zoomPercent       = 100;
-    d->forceWrap         = iFalse;
-    d->forceSoftwareRender = checkArgument_CommandLine(&d->args, "sw") != NULL;
     d->certs             = new_GmCerts(dataDir_App_);
     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);
-    initCStr_String(&d->downloadDir, downloadDir_App_);
-    setThemePalette_Color(d->theme);
+    setThemePalette_Color(d->prefs.theme);
 #if defined (iPlatformApple)
     setupApplication_MacOS();
 #endif
@@ -390,9 +387,7 @@ static void init_App_(iApp *d, int argc, char **argv) {
 static void deinit_App(iApp *d) {
     saveState_App_(d);
     savePrefs_App_(d);
-    deinit_String(&d->downloadDir);
-    deinit_String(&d->httpProxy);
-    deinit_String(&d->gopherProxy);
+    deinit_Prefs(&d->prefs);
     save_Bookmarks(d->bookmarks, dataDir_App_);
     delete_Bookmarks(d->bookmarks);
     save_Visited(d->visited, dataDir_App_);
@@ -414,7 +409,7 @@ const iString *dataDir_App(void) {
 }
 
 const iString *downloadDir_App(void) {
-    return collect_String(cleaned_Path(&app_.downloadDir));
+    return collect_String(cleaned_Path(&app_.prefs.downloadDir));
 }
 
 const iString *debugInfo_App(void) {
@@ -538,12 +533,12 @@ uint32_t elapsedSinceLastTicker_App(void) {
     return app_.elapsedSinceLastTicker;
 }
 
-int zoom_App(void) {
-    return app_.zoomPercent;
+const iPrefs *prefs_App(void) {
+    return &app_.prefs;
 }
 
 iBool forceLineWrap_App(void) {
-    return app_.forceWrap;
+    return app_.prefs.forceLineWrap;
 }
 
 iBool forceSoftwareRender_App(void) {
@@ -559,16 +554,16 @@ iBool forceSoftwareRender_App(void) {
 }
 
 enum iColorTheme colorTheme_App(void) {
-    return app_.theme;
+    return app_.prefs.theme;
 }
 
 const iString *schemeProxy_App(iRangecc scheme) {
     iApp *d = &app_;
     if (equalCase_Rangecc(scheme, "gopher")) {
-        return &d->gopherProxy;
+        return &d->prefs.gopherProxy;
     }
     if (equalCase_Rangecc(scheme, "http") || equalCase_Rangecc(scheme, "https")) {
-        return &d->httpProxy;
+        return &d->prefs.httpProxy;
     }
     return NULL;
 }
@@ -801,11 +796,11 @@ static iBool handleIdentityCreationCommands_(iWidget *dlg, const char *cmd) {
 iBool handleCommand_App(const char *cmd) {
     iApp *d = &app_;
     if (equal_Command(cmd, "window.retain")) {
-        d->retainWindowSize = arg_Command(cmd);
+        d->prefs.retainWindowSize = arg_Command(cmd);
         return iTrue;
     }
     else if (equal_Command(cmd, "downloads")) {
-        setCStr_String(&d->downloadDir, suffixPtr_Command(cmd, "path"));
+        setCStr_String(&d->prefs.downloadDir, suffixPtr_Command(cmd, "path"));
         return iTrue;
     }
     else if (equal_Command(cmd, "open")) {
@@ -813,8 +808,8 @@ iBool handleCommand_App(const char *cmd) {
         iUrl parts;
         init_Url(&parts, url);
         if (equalCase_Rangecc(parts.scheme, "mailto") ||
-            (isEmpty_String(&d->httpProxy) && (equalCase_Rangecc(parts.scheme, "http") ||
-                                               equalCase_Rangecc(parts.scheme, "https")))) {
+            (isEmpty_String(&d->prefs.httpProxy) && (equalCase_Rangecc(parts.scheme, "http") ||
+                                                     equalCase_Rangecc(parts.scheme, "https")))) {
             openInDefaultBrowser_App(url);
             return iTrue;
         }
@@ -905,9 +900,9 @@ iBool handleCommand_App(const char *cmd) {
     else if (equal_Command(cmd, "preferences")) {
         iWidget *dlg = makePreferences_Widget();
         updatePrefsThemeButtons_(dlg);
-        setText_InputWidget(findChild_Widget(dlg, "prefs.downloads"), &d->downloadDir);
-        setToggle_Widget(findChild_Widget(dlg, "prefs.ostheme"), d->useSystemTheme);
-        setToggle_Widget(findChild_Widget(dlg, "prefs.retainwindow"), d->retainWindowSize);
+        setText_InputWidget(findChild_Widget(dlg, "prefs.downloads"), &d->prefs.downloadDir);
+        setToggle_Widget(findChild_Widget(dlg, "prefs.ostheme"), d->prefs.useSystemTheme);
+        setToggle_Widget(findChild_Widget(dlg, "prefs.retainwindow"), d->prefs.retainWindowSize);
         setText_InputWidget(findChild_Widget(dlg, "prefs.uiscale"),
                             collectNewFormat_String("%g", uiScale_Window(d->window)));
         setText_InputWidget(findChild_Widget(dlg, "prefs.proxy.http"),
@@ -943,8 +938,8 @@ iBool handleCommand_App(const char *cmd) {
     }
     else if (equal_Command(cmd, "zoom.set")) {
         setFreezeDraw_Window(get_Window(), iTrue); /* no intermediate draws before docs updated */
-        d->zoomPercent = arg_Command(cmd);
-        setContentFontSize_Text((float) d->zoomPercent / 100.0f);
+        d->prefs.zoomPercent = arg_Command(cmd);
+        setContentFontSize_Text((float) d->prefs.zoomPercent / 100.0f);
         postCommand_App("font.changed");
         postCommand_App("window.unfreeze");
         return iTrue;
@@ -952,17 +947,17 @@ iBool handleCommand_App(const char *cmd) {
     else if (equal_Command(cmd, "zoom.delta")) {
         setFreezeDraw_Window(get_Window(), iTrue); /* no intermediate draws before docs updated */
         int delta = arg_Command(cmd);
-        if (d->zoomPercent < 100 || (delta < 0 && d->zoomPercent == 100)) {
+        if (d->prefs.zoomPercent < 100 || (delta < 0 && d->prefs.zoomPercent == 100)) {
             delta /= 2;
         }
-        d->zoomPercent = iClamp(d->zoomPercent + delta, 50, 200);
-        setContentFontSize_Text((float) d->zoomPercent / 100.0f);
+        d->prefs.zoomPercent = iClamp(d->prefs.zoomPercent + delta, 50, 200);
+        setContentFontSize_Text((float) d->prefs.zoomPercent / 100.0f);
         postCommand_App("font.changed");
         postCommand_App("window.unfreeze");
         return iTrue;
     }
     else if (equal_Command(cmd, "forcewrap.toggle")) {
-        d->forceWrap = !d->forceWrap;
+        d->prefs.forceLineWrap = !d->prefs.forceLineWrap;
         updateSize_DocumentWidget(document_App());
         return iTrue;
     }
@@ -1002,20 +997,20 @@ iBool handleCommand_App(const char *cmd) {
     }
     else if (equal_Command(cmd, "theme.set")) {
         const int isAuto = argLabel_Command(cmd, "auto");
-        d->theme = arg_Command(cmd);
+        d->prefs.theme = arg_Command(cmd);
         if (!isAuto) {
             postCommand_App("ostheme arg:0");
         }
-        setThemePalette_Color(d->theme);
+        setThemePalette_Color(d->prefs.theme);
         postCommandf_App("theme.changed auto:%d", isAuto);
         return iTrue;
     }
     else if (equal_Command(cmd, "ostheme")) {
-        d->useSystemTheme = arg_Command(cmd);
+        d->prefs.useSystemTheme = arg_Command(cmd);
         return iTrue;
     }
     else if (equal_Command(cmd, "os.theme.changed")) {
-        if (d->useSystemTheme) {
+        if (d->prefs.useSystemTheme) {
             const int dark     = argLabel_Command(cmd, "dark");
             const int contrast = argLabel_Command(cmd, "contrast");
             postCommandf_App("theme.set arg:%d auto:1",
@@ -1025,11 +1020,11 @@ iBool handleCommand_App(const char *cmd) {
         return iFalse;
     }
     else if (equal_Command(cmd, "proxy.gopher")) {
-        setCStr_String(&d->gopherProxy, suffixPtr_Command(cmd, "address"));
+        setCStr_String(&d->prefs.gopherProxy, suffixPtr_Command(cmd, "address"));
         return iTrue;
     }
     else if (equal_Command(cmd, "proxy.http")) {
-        setCStr_String(&d->httpProxy, suffixPtr_Command(cmd, "address"));
+        setCStr_String(&d->prefs.httpProxy, suffixPtr_Command(cmd, "address"));
         return iTrue;
     }
     else {