paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-06 17:18:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Debugger: Prevent console output from adding linefeeds. Issue #0036898

Browse Source 
git-svn-id: trunk@63132 -
This commit is contained in:
martin 2020-05-10 15:57:42 +00:00
parent e0156207ac
commit 69cd1abf4a
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
debugger/pseudoterminaldlg.pp
View File

@ -71,6 +71,7 @@ type
fRowsPerScreen: integer;
fColsPerRow: integer;
fFirstLine: integer;
FMemoEndsInEOL: Boolean;
procedure getCharHeightAndWidth(consoleFont: TFont; out h, w: word);
procedure consoleSizeChanged;
protected
@ -364,6 +365,7 @@ const
var
lineLimit, numLength, i: integer;
buffer: TStringList;
TextEndsInEOL: Boolean;
(* Translate C0 control codes to "control pictures", and optionally C1 codes
@ -755,6 +757,7 @@ begin
(* "interesting" behavior once the amount of text causes it to start scrolling *)
(* so having an intermediate that can be inspected might be useful. *)
TextEndsInEOL := (AText <> '') and (AText[Length(AText)-1] in [#10]);
buffer := TStringList.Create;
try
buffer.Text := AText; (* Decides what line breaks it wants to swallow *)
@ -776,13 +779,21 @@ begin
buffer[i] := PadLeft(IntToStr(fFirstLine), numLength) + ' ' + buffer[i];
fFirstLine += 1
end;
if RadioGroupRight.ItemIndex = 3 then (* Expand hex line-by-line in reverse *)
if RadioGroupRight.ItemIndex = 3 then begin (* Expand hex line-by-line in reverse *)
for i := buffer.Count - 1 downto 0 do
expandAsHex(buffer, i, numLength);
FMemoEndsInEOL := True;
end;
(* Add the buffered text to the visible control(s), and clean up. *)
Memo1.Lines.AddStrings(buffer)
if (not FMemoEndsInEOL) and (Memo1.Lines.Count > 0) and (AText <> '') then begin
Memo1.Lines[Memo1.Lines.Count-1] := Memo1.Lines[Memo1.Lines.Count-1] + buffer[0];
buffer.Delete(0);
end;
if (AText <> '') then
Memo1.Lines.AddStrings(buffer);
FMemoEndsInEOL := TextEndsInEOL;
finally
buffer.Free;
Memo1.Lines.EndUpdate