8 files changed, 135 insertions, 62 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 {
diff --git a/src/app.h b/src/app.h
index 75d9b48c..db22230e 100644
--- a/src/app.h
+++ b/src/app.h
@@ -28,6 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include <the_Foundation/string.h>
 #include <the_Foundation/time.h>
 
+#include "prefs.h"
 #include "ui/color.h"
 
 iDeclareType(Bookmarks)
@@ -58,7 +59,7 @@ void        refresh_App                 (void);
 iBool       isRefreshPending_App        (void);
 uint32_t    elapsedSinceLastTicker_App  (void); /* milliseconds */
 
-int                 zoom_App            (void);
+const iPrefs *      prefs_App           (void);
 iBool               forceLineWrap_App   (void);
 iBool               forceSoftwareRender_App(void);
 enum iColorTheme    colorTheme_App      (void);
diff --git a/src/gmdocument.c b/src/gmdocument.c
index 39c45c80..0129db64 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -331,6 +331,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
     static const char *globe    = "\U0001f310";
     static const char *quote    = "\u201c";
     const float midRunSkip = 0; /*0.120f;*/ /* extra space between wrapped text/quote lines */
+    const iPrefs *prefs = prefs_App();
     clear_Array(&d->layout);
     clearLinks_GmDocument_(d);
     clear_Array(&d->headings);
@@ -341,7 +342,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
     const iRangecc   content       = range_String(&d->source);
     iRangecc         contentLine   = iNullRange;
     iInt2            pos           = zero_I2();
-    iBool            isFirstText   = isGemini;
+    iBool            isFirstText   = isGemini && prefs->bigFirstParagraph;
     iBool            addQuoteIcon  = iTrue;
     iBool            isPreformat   = iFalse;
     iRangecc         preAltText    = iNullRange;
@@ -650,9 +651,11 @@ void reset_GmDocument(iGmDocument *d) {
 }
 
 void setThemeSeed_GmDocument(iGmDocument *d, const iBlock *seed) {
-    const float        saturationLevel = 1.0f; /* TODO: user setting */
-    const iBool        isLightMode = isLight_ColorTheme(colorTheme_App());
-    const iBool        isDarkMode  = !isLightMode;
+    const iPrefs *     prefs = prefs_App();
+    enum iGmDocumentTheme theme =
+        (isDark_ColorTheme(colorTheme_App()) ? prefs->docThemeDark : prefs->docThemeLight);
+//    const iBool        isLightMode =  isLight_ColorTheme(colorTheme_App());
+//    const iBool        isDarkMode  = !isLightMode;
     static const iChar siteIcons[] = {
         0x203b,  0x2042,  0x205c,  0x2182,  0x25ed,  0x2600,  0x2601,  0x2604,  0x2605,  0x2606,
         0x265c,  0x265e,  0x2690,  0x2691,  0x2693,  0x2698,  0x2699,  0x26f0,  0x270e,  0x2728,
@@ -662,7 +665,7 @@ void setThemeSeed_GmDocument(iGmDocument *d, const iBlock *seed) {
         0x1f533, 0x1f657, 0x1f659, 0x1f665, 0x1f668, 0x1f66b, 0x1f78b, 0x1f796, 0x1f79c,
     };
     /* Default colors. */ {
-        if (isDarkMode) {
+        if (theme == colorfulDark_GmDocumentTheme) {
             const iHSLColor base = { 200, 0, 0.15f, 1.0f };
             setHsl_Color(tmBackground_ColorId, base);
             set_Color(tmParagraph_ColorId, get_Color(gray75_ColorId));
@@ -784,7 +787,7 @@ void setThemeSeed_GmDocument(iGmDocument *d, const iBlock *seed) {
         //            printf("background: %d %f %f\n", (int) base.hue, base.sat, base.lum);
         //            printf("isDarkBgSat: %d\n", isDarkBgSat);
 
-        if (isDarkMode) {
+        if (theme == colorfulDark_GmDocumentTheme) {
             iHSLColor base    = { hues[primIndex],
                                   0.8f * (d->themeSeed >> 24) / 255.0f,
                                   0.06f + 0.09f * ((d->themeSeed >> 5) & 0x7) / 7.0f,
@@ -836,7 +839,7 @@ void setThemeSeed_GmDocument(iGmDocument *d, const iBlock *seed) {
         /* Adjust colors based on light/dark mode. */
         for (int i = tmFirst_ColorId; i < max_ColorId; i++) {
             iHSLColor color = hsl_Color(get_Color(i));
-            if (isLightMode) {
+            if (theme == white_GmDocumentTheme) {
 #if 0
                 if (isLink_ColorId(i)) continue;
                 color.lum = 1.0f - color.lum; /* All colors invert lightness. */
@@ -894,7 +897,7 @@ void setThemeSeed_GmDocument(iGmDocument *d, const iBlock *seed) {
                 }
             }
             /* Modify overall saturation. */
-            color.sat *= saturationLevel;
+            color.sat *= prefs->saturation;
             setHsl_Color(i, color);
         }
     }
diff --git a/src/gmdocument.h b/src/gmdocument.h
index b453fba9..b16df677 100644
--- a/src/gmdocument.h
+++ b/src/gmdocument.h
@@ -35,6 +35,11 @@ iDeclareType(GmImageInfo)
 iDeclareType(GmHeading)
 iDeclareType(GmRun)
 
+enum iGmDocumentTheme {
+    colorfulDark_GmDocumentTheme,
+    white_GmDocumentTheme,
+};
+
 typedef uint16_t iGmLinkId;
 
 enum iGmLinkFlags {
diff --git a/src/prefs.c b/src/prefs.c
new file mode 100644
index 00000000..d773acbd
--- /dev/null
+++ b/src/prefs.c
@@ -0,0 +1,23 @@
+#include "prefs.h"
+
+void init_Prefs(iPrefs *d) {
+    d->theme             = dark_ColorTheme;
+    d->useSystemTheme    = iTrue;
+    d->retainWindowSize  = iTrue;
+    d->zoomPercent       = 100;
+    d->forceLineWrap     = iFalse;
+    d->lineWidth         = 40;
+    d->bigFirstParagraph = iTrue;
+    d->docThemeDark      = colorfulDark_GmDocumentTheme;
+    d->docThemeLight     = white_GmDocumentTheme;
+    d->saturation        = 1.0f;
+    init_String(&d->gopherProxy);
+    init_String(&d->httpProxy);
+    init_String(&d->downloadDir);
+}
+
+void deinit_Prefs(iPrefs *d) {
+    deinit_String(&d->gopherProxy);
+    deinit_String(&d->httpProxy);
+    deinit_String(&d->downloadDir);
+}
diff --git a/src/prefs.h b/src/prefs.h
new file mode 100644
index 00000000..d4e300ec
--- /dev/null
+++ b/src/prefs.h
@@ -0,0 +1,29 @@
+#pragma once
+#include <the_Foundation/string.h>
+
+#include "ui/color.h"
+#include "gmdocument.h"
+
+/* User preferences */
+
+iDeclareType(Prefs)
+
+struct Impl_Prefs {
+    iBool retainWindowSize;
+    float uiScale;
+    int zoomPercent;
+    iBool useSystemTheme;
+    enum iColorTheme theme;
+    iString gopherProxy;
+    iString httpProxy;
+    iString downloadDir;
+    /* Content */
+    int lineWidth;
+    iBool bigFirstParagraph;
+    iBool forceLineWrap;
+    enum iGmDocumentTheme docThemeDark;
+    enum iGmDocumentTheme docThemeLight;
+    float saturation;
+};
+
+iDeclareTypeConstruction(Prefs)
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 735a7214..69dde8c7 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -243,10 +243,11 @@ static void resetSmoothScroll_DocumentWidget_(iDocumentWidget *d) {
 }
 
 static int documentWidth_DocumentWidget_(const iDocumentWidget *d) {
-    const iWidget *w = constAs_Widget(d);
-    const iRect bounds = bounds_Widget(w);
+    const iWidget *w      = constAs_Widget(d);
+    const iRect    bounds = bounds_Widget(w);
+    const iPrefs * prefs  = prefs_App();
     return iMini(bounds.size.x - gap_UI * d->pageMargin * 2,
-                 fontSize_UI * 40 * zoom_App() / 100); /* TODO: Add user preference .*/
+                 fontSize_UI * prefs->lineWidth * prefs->zoomPercent / 100);
 }
 
 static iRect documentBounds_DocumentWidget_(const iDocumentWidget *d) {
diff --git a/src/ui/util.c b/src/ui/util.c
index bdc1c813..52107d81 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -878,6 +878,22 @@ iWidget *makePreferences_Widget(void) {
         addChild_Widget(headings, iClob(makeHeading_Widget("UI scale factor:")));
         setId_Widget(addChild_Widget(values, iClob(new_InputWidget(8))), "prefs.uiscale");
     }
+    /* Layout. */ {
+        appendTwoColumnPage_(tabs, "Layout", &headings, &values);
+        addChild_Widget(headings, iClob(makeHeading_Widget("Line width:")));
+        addChild_Widget(values, iClob(new_LabelWidget("Normal", 0, 0, NULL)));
+        addChild_Widget(headings, iClob(makeHeading_Widget("First paragaph:")));
+        addChild_Widget(values, iClob(new_LabelWidget("Emphasized", 0, 0, NULL)));
+    }
+    /* Colors. */ {
+        appendTwoColumnPage_(tabs, "Colors", &headings, &values);
+        addChild_Widget(headings, iClob(makeHeading_Widget("Saturation:")));
+        addChild_Widget(values, iClob(new_LabelWidget("Full", 0, 0, 0)));
+        addChild_Widget(headings, iClob(makeHeading_Widget("Dark theme:")));
+        addChild_Widget(values, iClob(new_LabelWidget("Colorful", 0, 0, 0)));
+        addChild_Widget(headings, iClob(makeHeading_Widget("Light theme:")));
+        addChild_Widget(values, iClob(new_LabelWidget("White", 0, 0, 0)));
+    }
     /* Proxies. */ {
         appendTwoColumnPage_(tabs, "Proxies", &headings, &values);
         addChild_Widget(headings, iClob(makeHeading_Widget("Gopher proxy:")));