Cleanup: Removed (hidden) preformatted wrap option

8 files changed, 13 insertions, 43 deletions

diff --git a/src/app.c b/src/app.c
index 5d22c1dc..7a48bead 100644
--- a/src/app.c
+++ b/src/app.c
@@ -105,21 +105,10 @@ struct Impl_App {
     iBool        isFinishedLaunching;
     iTime        lastDropTime; /* for detecting drops of multiple items */
     /* Preferences: */
-    iBool        commandEcho; /* --echo */
+    iBool        commandEcho;         /* --echo */
     iBool        forceSoftwareRender; /* --sw */
     iRect        initialWindowRect;
     iPrefs       prefs;
-#if 0
-    iBool        retainWindowSize;
-    float        uiScale;
-    int          zoomPercent;
-    iBool        forceWrap;
-    enum iColorTheme theme;
-    iBool        useSystemTheme;
-    iString      gopherProxy;
-    iString      httpProxy;
-    iString      downloadDir;
-#endif
 };
 
 static iApp app_;
@@ -172,9 +161,6 @@ static iString *serializePrefs_App_(const iApp *d) {
     if (isVisible_Widget(sidebar)) {
         appendCStr_String(str, "sidebar.toggle\n");
     }
-    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, "prefs.dialogtab arg:%d\n", d->prefs.dialogTab);
@@ -617,10 +603,6 @@ const iPrefs *prefs_App(void) {
     return &app_.prefs;
 }
 
-iBool forceLineWrap_App(void) {
-    return app_.prefs.forceLineWrap;
-}
-
 iBool forceSoftwareRender_App(void) {
     if (app_.forceSoftwareRender) {
         return iTrue;
@@ -985,11 +967,6 @@ iBool handleCommand_App(const char *cmd) {
         d->prefs.loadImageInsteadOfScrolling = arg_Command(cmd);
         return iTrue;
     }
-    else if (equal_Command(cmd, "forcewrap.toggle")) {
-        d->prefs.forceLineWrap = !d->prefs.forceLineWrap;
-        updateSize_DocumentWidget(document_App());
-        return iTrue;
-    }
     else if (equal_Command(cmd, "theme.set")) {
         const int isAuto = argLabel_Command(cmd, "auto");
         d->prefs.theme = arg_Command(cmd);
diff --git a/src/app.h b/src/app.h
index 9c4bb669..05341523 100644
--- a/src/app.h
+++ b/src/app.h
@@ -60,7 +60,6 @@ iBool       isRefreshPending_App        (void);
 uint32_t    elapsedSinceLastTicker_App  (void); /* milliseconds */
 
 const iPrefs *      prefs_App           (void);
-iBool               forceLineWrap_App   (void);
 iBool               forceSoftwareRender_App(void);
 enum iColorTheme    colorTheme_App      (void);
 const iString *     schemeProxy_App     (iRangecc scheme);
diff --git a/src/gmdocument.c b/src/gmdocument.c
index fd7804fa..2f3a006f 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -64,7 +64,6 @@ struct Impl_GmDocument {
     iString   source;
     iString   url; /* for resolving relative links */
     iString   localHost;
-    int       forceBreakWidth; /* force breaks on very long preformatted lines */
     iBool     siteBannerEnabled;
     iInt2     size;
     iArray    layout; /* contents of source, laid out in document space */
@@ -510,7 +509,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
             }
             run.bounds.pos = addX_I2(pos, indent * gap_Text);
             const char *contPos;
-            const int   avail = (isPreformat ? d->forceBreakWidth : d->size.x) - run.bounds.pos.x;
+            const int   avail = d->size.x - run.bounds.pos.x;
             const iInt2 dims  = tryAdvance_Text(run.font, runLine, avail, &contPos);
             run.bounds.size.x = iMax(avail, dims.x); /* Extends to the right edge for selection. */
             run.bounds.size.y = dims.y;
@@ -1073,8 +1072,7 @@ void setSiteBannerEnabled_GmDocument(iGmDocument *d, iBool siteBannerEnabled) {
     d->siteBannerEnabled = siteBannerEnabled;
 }
 
-void setWidth_GmDocument(iGmDocument *d, int width, int forceBreakWidth) {
-    d->forceBreakWidth = forceBreakWidth;
+void setWidth_GmDocument(iGmDocument *d, int width) {
     d->size.x = width;
     doLayout_GmDocument_(d); /* TODO: just flag need-layout and do it later */
 }
@@ -1159,10 +1157,10 @@ void setUrl_GmDocument(iGmDocument *d, const iString *url) {
     setRange_String(&d->localHost, parts.host);
 }
 
-void setSource_GmDocument(iGmDocument *d, const iString *source, int width, int forceBreakWidth) {
+void setSource_GmDocument(iGmDocument *d, const iString *source, int width) {
     set_String(&d->source, source);
     normalize_GmDocument(d);
-    setWidth_GmDocument(d, width, forceBreakWidth); /* re-do layout */
+    setWidth_GmDocument(d, width); /* re-do layout */
 }
 
 void render_GmDocument(const iGmDocument *d, iRangei visRangeY, iGmDocumentRenderFunc render,
diff --git a/src/gmdocument.h b/src/gmdocument.h
index 5234f890..c2a4b272 100644
--- a/src/gmdocument.h
+++ b/src/gmdocument.h
@@ -80,6 +80,7 @@ enum iGmRunFlags {
     endOfLine_GmRunFlag   = iBit(3),
     siteBanner_GmRunFlag  = iBit(4), /* area reserved for the site banner */
     quoteBorder_GmRunFlag = iBit(5),
+    wide_GmRunFlag        = iBit(6), /* horizontally scrollable */
 };
 
 struct Impl_GmRun {
@@ -108,10 +109,10 @@ enum iGmDocumentFormat {
 void    setThemeSeed_GmDocument (iGmDocument *, const iBlock *seed);
 void    setFormat_GmDocument    (iGmDocument *, enum iGmDocumentFormat format);
 void    setSiteBannerEnabled_GmDocument(iGmDocument *, iBool siteBannerEnabled);
-void    setWidth_GmDocument     (iGmDocument *, int width, int forceBreakWidth);
+void    setWidth_GmDocument     (iGmDocument *, int width);
 void    redoLayout_GmDocument   (iGmDocument *);
 void    setUrl_GmDocument       (iGmDocument *, const iString *url);
-void    setSource_GmDocument    (iGmDocument *, const iString *source, int width, int forceBreakWidth);
+void    setSource_GmDocument    (iGmDocument *, const iString *source, int width);
 
 void    reset_GmDocument        (iGmDocument *); /* free images */
 
diff --git a/src/prefs.c b/src/prefs.c
index dc2bd601..574e07d0 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -39,7 +39,6 @@ void init_Prefs(iPrefs *d) {
     d->monospaceGopher   = iFalse;
     d->lineWidth         = 40;
     d->bigFirstParagraph = iTrue;
-    d->forceLineWrap     = iFalse;
     d->quoteIcon         = iTrue;
     d->docThemeDark      = colorfulDark_GmDocumentTheme;
     d->docThemeLight     = white_GmDocumentTheme;
diff --git a/src/prefs.h b/src/prefs.h
index a3993629..3f4f534f 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -58,7 +58,6 @@ struct Impl_Prefs {
     iBool            monospaceGopher;
     int              lineWidth;
     iBool            bigFirstParagraph;
-    iBool            forceLineWrap;
     iBool            quoteIcon;
     /* Colors */
     enum iGmDocumentTheme docThemeDark;
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index ef856558..c82e823d 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -317,6 +317,7 @@ static iRect siteBannerRect_DocumentWidget_(const iDocumentWidget *d) {
     return moved_Rect(banner->visBounds, origin);
 }
 
+#if 0
 static int forceBreakWidth_DocumentWidget_(const iDocumentWidget *d) {
     if (equalCase_Rangecc(urlScheme_String(d->mod.url), "gopher")) {
         return documentWidth_DocumentWidget_(d);
@@ -328,6 +329,7 @@ static int forceBreakWidth_DocumentWidget_(const iDocumentWidget *d) {
     }
     return 0;
 }
+#endif
 
 static iInt2 documentPos_DocumentWidget_(const iDocumentWidget *d, iInt2 pos) {
     return addY_I2(sub_I2(pos, topLeft_Rect(documentBounds_DocumentWidget_(d))),
@@ -691,8 +693,7 @@ static void updateOutline_DocumentWidget_(iDocumentWidget *d) {
 
 static void setSource_DocumentWidget_(iDocumentWidget *d, const iString *source) {
     setUrl_GmDocument(d->doc, d->mod.url);
-    setSource_GmDocument(
-        d->doc, source, documentWidth_DocumentWidget_(d), forceBreakWidth_DocumentWidget_(d));
+    setSource_GmDocument(d->doc, source, documentWidth_DocumentWidget_(d));
     d->foundMark       = iNullRange;
     d->selectMark      = iNullRange;
     d->hoverLink       = NULL;
@@ -1354,8 +1355,7 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         const char *midLoc = (mid ? mid->text.start : NULL);
         /* Alt/Option key may be involved in window size changes. */
         iChangeFlags(d->flags, showLinkNumbers_DocumentWidgetFlag, iFalse);
-        setWidth_GmDocument(
-            d->doc, documentWidth_DocumentWidget_(d), forceBreakWidth_DocumentWidget_(d));
+        setWidth_GmDocument(d->doc, documentWidth_DocumentWidget_(d));
         scroll_DocumentWidget_(d, 0);
         if (midLoc) {
             mid = findRunAtLoc_GmDocument(d->doc, midLoc);
@@ -2948,8 +2948,7 @@ iBool isRequestOngoing_DocumentWidget(const iDocumentWidget *d) {
 }
 
 void updateSize_DocumentWidget(iDocumentWidget *d) {
-    setWidth_GmDocument(
-        d->doc, documentWidth_DocumentWidget_(d), forceBreakWidth_DocumentWidget_(d));
+    setWidth_GmDocument(d->doc, documentWidth_DocumentWidget_(d));
     updateSideIconBuf_DocumentWidget_(d);
     updateOutline_DocumentWidget_(d);
     updateVisible_DocumentWidget_(d);
diff --git a/src/ui/window.c b/src/ui/window.c
index 906e1084..c0afe266 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -155,8 +155,6 @@ static const iMenuItem viewMenuItems_[] = {
     { "Zoom In", SDLK_EQUALS, KMOD_PRIMARY, "zoom.delta arg:10" },
     { "Zoom Out", SDLK_MINUS, KMOD_PRIMARY, "zoom.delta arg:-10" },
     { "Reset Zoom", SDLK_0, KMOD_PRIMARY, "zoom.set arg:100" },
-    { "---", 0, 0, NULL },
-    { "Wrap Preformatted", 0, 0, "forcewrap.toggle" } /* TODO: remove this; should scroll preformatted */
 };
 
 static iMenuItem bookmarksMenuItems_[] = {