From a4d1118b5f3bf242b3bfa2c984a32d86e72d9b5a Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Mon, 21 Jun 2021 21:32:40 +0000
Subject: [PATCH] Quark: handle all line endings

git-svn-id: svn://kolibrios.org@8913 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/cmm/quark/prepare_page.h | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/programs/cmm/quark/prepare_page.h b/programs/cmm/quark/prepare_page.h
index b8886c4ba0..5f775a8de8 100644
--- a/programs/cmm/quark/prepare_page.h
+++ b/programs/cmm/quark/prepare_page.h
@@ -9,8 +9,6 @@ void Parse()
 {
 dword ptr;
 int line_end;
-dword line_length = 0;
-dword line_start = textbuf.p;
 
 	list.count=0;
 	selection.cancel();
@@ -21,21 +19,24 @@ dword line_start = textbuf.p;
 
 	for (ptr = textbuf.p;    ptr < textbuf.p + textbuf.len;    ptr++)
 	{
-		line_length += list.font_w;
-		if (line_length + 30 >= list.w) || (ESBYTE[ptr] == '\n')
+		if (ptr - lines.get_last() * list.font_w + 16 >= list.w)
 		{
-			//if (ESBYTE[ptr+1] == '\r') ptr++;
-			
 			//searching a 'white' for a normal word-break
-			for(line_end = ptr; line_end != line_start; line_end--)
-			{
-				if (__isWhite(ESBYTE[line_end])) { ptr=line_end+1; break; }
+			for(line_end = ptr; line_end != lines.get_last(); line_end--) 			{
+				if (__isWhite(ESBYTE[line_end])) { 
+					ptr = line_end + 1; 
+					break;
+				}
 			}
-			line_length = ptr - line_start * list.font_w;
 			list.count++;
 			lines.add(ptr);
-			line_start = ptr;
-			line_length = 0;
+		} else if (ESBYTE[ptr] == '\x0D') {
+			if (ESBYTE[ptr+1] == '\x0A') ptr++;
+			list.count++;
+			lines.add(ptr+1);
+		} else if (ESBYTE[ptr] == '\x0A') {
+			list.count++;
+			lines.add(ptr+1);
 		}
 	}
 	lines.add(ptr);