From 2120ff3efa071f7f0c9458703b553e0135660fa2 Mon Sep 17 00:00:00 2001
From: Jason Hood <jadoxa@yahoo.com.au>
Date: Sun, 24 Dec 2017 23:44:26 +1000
Subject: [PATCH] Fix CR

Having CR go back to the beginning of a wrapped line is not a good idea
when it's followed by LF.
---
 ANSI.c | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/ANSI.c b/ANSI.c
index 16cc8c6..4d50e25 100644
--- a/ANSI.c
+++ b/ANSI.c
@@ -688,9 +688,9 @@ void FlushBuffer( void )
       // width) and contains sufficient lines.
       GetConsoleScreenBufferInfo( hConOut, &Info );
       if (WIN.Right - WIN.Left + 1 != WIDTH ||
-	  BOTTOM - TOP < 2 * nCharInBuffer % WIDTH)
+	  BOTTOM - TOP < 2 * nCharInBuffer / WIDTH)
       {
-	HEIGHT = 2 * nCharInBuffer % WIDTH + 1;
+	HEIGHT = 2 * nCharInBuffer / WIDTH + 1;
 	SetConsoleScreenBufferSize( hConWrap, Info.dwSize );
       }
       // Put the cursor on the top line, in the same column.
@@ -896,8 +896,9 @@ void PushBuffer( WCHAR c )
       if (nl)
 	MoveDown( TRUE );
     }
+    return;
   }
-  else if (c == '\r')
+  if (nCharInBuffer > 0 && ChBuffer[nCharInBuffer-1] == '\r')
   {
     FlushBuffer();
     if (nWrapped)
@@ -908,12 +909,9 @@ void PushBuffer( WCHAR c )
       if (pState->tb_margins && CUR.Y < TOP) CUR.Y = TOP;
       set_pos( LEFT, CUR.Y );
     }
-    else
-      ChBuffer[nCharInBuffer++] = c;
   }
-  else if (c == '\b')
+  if (c == '\b')
   {
-    BOOL bs = FALSE;
     FlushBuffer();
     if (nWrapped)
     {
@@ -924,20 +922,15 @@ void PushBuffer( WCHAR c )
 	CUR.Y--;
 	SetConsoleCursorPos( hConOut, CUR );
 	--nWrapped;
-	bs = TRUE;
+	return;
       }
     }
-    if (!bs)
-      ChBuffer[nCharInBuffer++] = c;
-  }
-  else
-  {
-    if (shifted && c >= FIRST_G1 && c <= LAST_G1)
-      c = G1[c-FIRST_G1];
-    ChBuffer[nCharInBuffer] = c;
-    if (++nCharInBuffer == BUFFER_SIZE)
-      FlushBuffer();
   }
+  if (shifted && c >= FIRST_G1 && c <= LAST_G1)
+    c = G1[c-FIRST_G1];
+  ChBuffer[nCharInBuffer] = c;
+  if (++nCharInBuffer == BUFFER_SIZE)
+    FlushBuffer();
 }
 
 //-----------------------------------------------------------------------------