From ef0301f1feddc591d9307e07a867e099b2e4272e Mon Sep 17 00:00:00 2001
From: Justin Bedo <cu@cua0.org>
Date: Thu, 21 Aug 2025 11:29:44 +1000
Subject: split lines on \r

Hack around progress bars etc.
---
 jterm.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'jterm.hs')

diff --git a/jterm.hs b/jterm.hs
index fdb0d98..8091f81 100644
--- a/jterm.hs
+++ b/jterm.hs
@@ -411,7 +411,7 @@ handleEvent buffer display win bgcolour fgcolour linecolour selcolour font event
       redraw
     T toAppend -> do
       let noesc = stripAnsiEscapeCodes toAppend
-          expandedTabs = T.intercalate "\n" $ map expandTabs $ T.splitOn "\n" noesc
+          expandedTabs = T.intercalate "\n" $ map expandTabs $ concatMap (T.splitOn "\n") $ concatMap (T.splitOn "\r") $ T.splitOn "\r\n" noesc
           cl = ptycursor b & linePos
           linePos p = content b & R.splitAt p & fst & R.lengthAsPosition & posLine
       delins' True (ptycursor b) (ptycursor b) $ R.fromText expandedTabs
@@ -510,7 +510,7 @@ handleEvent buffer display win bgcolour fgcolour linecolour selcolour font event
         go x = mconcat x
 
 watch :: Pty -> IO HandledEvent
-watch h = T . T.filter (/= '\r') . T.pack . B.toString <$> readPty h
+watch h = T . T.pack . B.toString <$> readPty h
 
 main :: IO ()
 main = do
-- 
cgit v1.2.3