6 files changed, 44 insertions, 16 deletions

diff --git a/src/app.c b/src/app.c
index 5bce7b19..da14f06c 100644
--- a/src/app.c
+++ b/src/app.c
@@ -94,6 +94,7 @@ struct Impl_App {
     iRect        initialWindowRect;
     float        uiScale;
     int          zoomPercent;
+    iBool        forceWrap;
     enum iColorTheme theme;
     iBool        useSystemTheme;
     iString      gopherProxy;
@@ -146,6 +147,9 @@ static iString *serializePrefs_App_(const iApp *d) {
     if (isVisible_Widget(constAs_Widget(sidebar))) {
         appendCStr_String(str, "sidebar.toggle\n");
     }
+    if (d->forceWrap) {
+        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);
@@ -281,6 +285,7 @@ static void init_App_(iApp *d, int argc, char **argv) {
     d->retainWindowSize  = iTrue;
     d->pendingRefresh    = iFalse;
     d->zoomPercent       = 100;
+    d->forceWrap         = iFalse;
     d->certs             = new_GmCerts(dataDir_App_);
     d->visited           = new_Visited();
     d->bookmarks         = new_Bookmarks();
@@ -431,6 +436,10 @@ int zoom_App(void) {
     return app_.zoomPercent;
 }
 
+iBool isLineWrapForced_App(void) {
+    return app_.forceWrap;
+}
+
 enum iColorTheme colorTheme_App(void) {
     return app_.theme;
 }
@@ -793,6 +802,11 @@ iBool handleCommand_App(const char *cmd) {
         postCommand_App("window.unfreeze");
         return iTrue;
     }
+    else if (equal_Command(cmd, "forcewrap.toggle")) {
+        d->forceWrap = !d->forceWrap;
+        updateSize_DocumentWidget(document_App());
+        return iTrue;
+    }
     else if (equal_Command(cmd, "bookmark.add")) {
         iDocumentWidget *doc = document_App();
         makeBookmarkCreation_Widget(url_DocumentWidget(doc),
diff --git a/src/app.h b/src/app.h
index 3d4808bc..1cf9f8a8 100644
--- a/src/app.h
+++ b/src/app.h
@@ -56,6 +56,7 @@ iBool       isRefreshPending_App        (void);
 uint32_t    elapsedSinceLastTicker_App  (void); /* milliseconds */
 
 int                 zoom_App            (void);
+iBool               isLineWrapForced_App(void);
 enum iColorTheme    colorTheme_App      (void);
 const iString *     schemeProxy_App     (iRangecc scheme);
 
diff --git a/src/gmdocument.c b/src/gmdocument.c
index 924eee32..e4ae03a8 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -104,6 +104,7 @@ struct Impl_GmDocument {
     iString source;
     iString url; /* for resolving relative links */
     iString localHost;
+    int forceBreakWidth; /* force breaks on very long preformatted lines */
     iInt2 size;
     iArray layout; /* contents of source, laid out in document space */
     iPtrArray links;
@@ -506,12 +507,11 @@ static void doLayout_GmDocument_(iGmDocument *d) {
             }
             run.bounds.pos = addX_I2(pos, indent * gap_Text);
             const char *contPos;
-            const int avail = d->size.x - run.bounds.pos.x;
-            const iInt2 dims =
-                tryAdvance_Text(run.font, runLine, isPreformat ? 0 : avail, &contPos);
+            const int   avail = (isPreformat ? d->forceBreakWidth : 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;
-            run.visBounds = run.bounds;
+            run.visBounds     = run.bounds;
             run.visBounds.size.x = dims.x;
             if (contPos > runLine.start) {
                 run.text = (iRangecc){ runLine.start, contPos };
@@ -866,7 +866,8 @@ void setFormat_GmDocument(iGmDocument *d, enum iGmDocumentFormat format) {
     d->format = format;
 }
 
-void setWidth_GmDocument(iGmDocument *d, int width) {
+void setWidth_GmDocument(iGmDocument *d, int width, int forceBreakWidth) {
+    d->forceBreakWidth = forceBreakWidth;
     d->size.x = width;
     doLayout_GmDocument_(d); /* TODO: just flag need-layout and do it later */
 }
@@ -939,11 +940,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) {
+void setSource_GmDocument(iGmDocument *d, const iString *source, int width, int forceBreakWidth) {
     set_String(&d->source, source);
     normalize_GmDocument(d);
-    setWidth_GmDocument(d, width);
-    /* TODO: just flag need-layout and do it later */
+    setWidth_GmDocument(d, width, forceBreakWidth); /* re-do layout */
 }
 
 void setImage_GmDocument(iGmDocument *d, iGmLinkId linkId, const iString *mime, const iBlock *data) {
diff --git a/src/gmdocument.h b/src/gmdocument.h
index b6c1c6ab..e3c21097 100644
--- a/src/gmdocument.h
+++ b/src/gmdocument.h
@@ -94,9 +94,9 @@ enum iGmDocumentFormat {
 
 void    setThemeSeed_GmDocument (iGmDocument *, const iBlock *seed);
 void    setFormat_GmDocument    (iGmDocument *, enum iGmDocumentFormat format);
-void    setWidth_GmDocument     (iGmDocument *, int width);
+void    setWidth_GmDocument     (iGmDocument *, int width, int forceBreakWidth);
 void    setUrl_GmDocument       (iGmDocument *, const iString *url);
-void    setSource_GmDocument    (iGmDocument *, const iString *source, int width);
+void    setSource_GmDocument    (iGmDocument *, const iString *source, int width, int forceBreakWidth);
 void    setImage_GmDocument     (iGmDocument *, iGmLinkId linkId, const iString *mime, const iBlock *data);
 
 void    reset_GmDocument        (iGmDocument *); /* free images */
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 437e9468..2ccdc416 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -296,6 +296,15 @@ static iRect documentBounds_DocumentWidget_(const iDocumentWidget *d) {
     return rect;
 }
 
+static int forceBreakWidth_DocumentWidget_(const iDocumentWidget *d) {
+    if (isLineWrapForced_App()) {
+        const iRect bounds    = bounds_Widget(constAs_Widget(d));
+        const iRect docBounds = documentBounds_DocumentWidget_(d);
+        return right_Rect(bounds) - left_Rect(docBounds) - gap_UI * d->pageMargin;
+    }
+    return 0;
+}
+
 iLocalDef int documentToWindowY_DocumentWidget_(const iDocumentWidget *d, int docY) {
     return docY - d->scrollY + documentBounds_DocumentWidget_(d).pos.y;
 }
@@ -488,7 +497,8 @@ static void invalidate_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));
+    setSource_GmDocument(
+        d->doc, source, documentWidth_DocumentWidget_(d), forceBreakWidth_DocumentWidget_(d));
     d->foundMark   = iNullRange;
     d->selectMark  = iNullRange;
     d->hoverLink   = NULL;
@@ -1021,8 +1031,10 @@ static void allocVisBuffer_DocumentWidget_(const iDocumentWidget *d) {
 }
 
 void updateSize_DocumentWidget(iDocumentWidget *d) {
-    setWidth_GmDocument(d->doc, documentWidth_DocumentWidget_(d));
+    setWidth_GmDocument(
+        d->doc, documentWidth_DocumentWidget_(d), forceBreakWidth_DocumentWidget_(d));
     updateVisible_DocumentWidget_(d);
+    invalidate_DocumentWidget_(d);
 }
 
 static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd) {
@@ -1030,9 +1042,9 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
     if (equal_Command(cmd, "window.resized") || equal_Command(cmd, "font.changed")) {
         const iGmRun *mid = middleRun_DocumentWidget_(d);
         const char *midLoc = (mid ? mid->text.start : NULL);
-        setWidth_GmDocument(d->doc, documentWidth_DocumentWidget_(d));
+        setWidth_GmDocument(
+            d->doc, documentWidth_DocumentWidget_(d), forceBreakWidth_DocumentWidget_(d));
         scroll_DocumentWidget_(d, 0);
-        updateVisible_DocumentWidget_(d);
         if (midLoc) {
             mid = findRunAtLoc_GmDocument(d->doc, midLoc);
             if (mid) {
@@ -1055,8 +1067,7 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
             /* Set palette for our document. */
             updateTheme_DocumentWidget_(d);
             updateTrust_DocumentWidget_(d, NULL);
-            setWidth_GmDocument(d->doc, documentWidth_DocumentWidget_(d));
-            updateVisible_DocumentWidget_(d);
+            updateSize_DocumentWidget(d);
         }
         updateWindowTitle_DocumentWidget_(d);
         allocVisBuffer_DocumentWidget_(d);
diff --git a/src/ui/window.c b/src/ui/window.c
index b7b4a8fd..66f1c513 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -141,6 +141,8 @@ 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" }
 };
 
 static const iMenuItem helpMenuItems[] = {