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

SynEdit: Improve GetPhysicalCharWidths (reduce amount of mem re-allocations)

Browse Source
This commit is contained in:
Martin 2024-01-21 00:36:09 +01:00
parent 09b29a5e63
commit db688e717c
2 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
components/synedit/lazsynedittext.pas
View File

@ -144,7 +144,7 @@ type
FAdjustedPhysToLogOrigin: Integer;
FLines: TSynEditStrings;
FCurrentWidths: TPhysicalCharWidths;
FCurrentWidthsLen, FCurrentWidthsAlloc: Integer;
FCurrentWidthsLen, FCurrentWidthsAlloc, FCurrentWidthsShrinkCnt: Integer;
FCurrentLine: Integer;
FTextChangeStamp, FViewChangeStamp: Int64;
FUnAdjustedPhysToLogColOffs: Integer;
@ -345,6 +345,7 @@ type
// CharWidths
function GetPhysicalCharWidths(Index: Integer): TPhysicalCharWidths;
function GetPhysicalCharWidths(Line: PChar; LineLen, Index: Integer): TPhysicalCharWidths;
procedure GetPhysicalCharWidths(Index: Integer; var AResult: TPhysicalCharWidths; out ALen: Integer);
// Byte to Char
function LogicalToPhysicalPos(const p: TPoint): TPoint;
function LogicalToPhysicalCol(const Line: String;
@ -353,7 +354,7 @@ type
function PhysicalToLogicalPos(const p: TPoint): TPoint;
function PhysicalToLogicalCol(const Line: string;
Index, PhysicalPos: integer): integer; virtual; //deprecated;
property LogPhysConvertor :TSynLogicalPhysicalConvertor read FLogPhysConvertor;
property LogPhysConvertor :TSynLogicalPhysicalConvertor read FLogPhysConvertor write FLogPhysConvertor;
function TextToViewIndex(aTextIndex : TLineIdx) : TLineIdx; virtual;
function ViewToTextIndex(aViewIndex : TLineIdx) : TLineIdx; virtual;
@ -718,11 +719,15 @@ begin
//debugln(['**************** COMPUTING widths (grow): ', AIndex,' (',dbgs(Pointer(self)),') old-alloc=', FCurrentWidthsAlloc, ' new-len=',LineLen]);
SetLength(FCurrentWidths, LineLen);
FCurrentWidthsAlloc := LineLen;
FCurrentWidthsShrinkCnt := 0;
end
else if FCurrentWidthsAlloc > Max(Max(LineLen, FCurrentWidthsLen)*4, SYN_LP_MIN_ALLOC) then begin
//debugln(['**************** COMPUTING widths (shrink): ', AIndex,' (',dbgs(Pointer(self)),') old-alloc=', FCurrentWidthsAlloc, ' new-len=',LineLen]);
FCurrentWidthsAlloc := Max(Max(LineLen, FCurrentWidthsLen), SYN_LP_MIN_ALLOC) ;
SetLength(FCurrentWidths, FCurrentWidthsAlloc);
inc(FCurrentWidthsShrinkCnt);
if FCurrentWidthsShrinkCnt > 20 then begin
FCurrentWidthsAlloc := Max(Max(LineLen, FCurrentWidthsLen), SYN_LP_MIN_ALLOC) ;
SetLength(FCurrentWidths, FCurrentWidthsAlloc);
end;
//end
//else begin
// debugln(['**************** COMPUTING widths: ', AIndex,' (',dbgs(Pointer(self)),') alloc=',FCurrentWidthsAlloc]);
@ -1130,10 +1135,11 @@ end;
function TSynEditStrings.GetPhysicalCharWidths(Index: Integer): TPhysicalCharWidths;
var
s: string;
s: PChar;
ALen: Integer;
begin
s := Strings[Index];
Result := GetPhysicalCharWidths(PChar(s), length(s), Index);
s := GetPChar(Index, ALen);
Result := GetPhysicalCharWidths(s, ALen, Index);
end;
function TSynEditStrings.GetPhysicalCharWidths(Line: PChar; LineLen,
@ -1145,6 +1151,19 @@ begin
DoGetPhysicalCharWidths(Line, LineLen, Index, @Result[0]);
end;
procedure TSynEditStrings.GetPhysicalCharWidths(Index: Integer;
var AResult: TPhysicalCharWidths; out ALen: Integer);
var
s: PChar;
begin
s := GetPChar(Index, ALen);
if ALen = 0 then
exit;
if Length(AResult) < ALen then
SetLength(AResult, Length(s));
DoGetPhysicalCharWidths(s, ALen, Index, @AResult[0]);
end;
function TSynEditStrings.GetDisplayView: TLazSynDisplayView;
begin
Result := nil;

8
components/synedit/lazsyntextarea.pp
View File

@ -89,6 +89,7 @@ type
AMarkupManager: TSynEditMarkupManager;
AFirstCol, ALastCol: integer
);
procedure Finish;
procedure SetHighlighterTokensLine(ALine: TLineIdx; out ARealLine: TLineIdx);
function GetNextHighlighterTokenFromView(out ATokenInfo: TLazSynDisplayTokenInfoEx;
APhysEnd: Integer = -1;
@ -310,6 +311,11 @@ begin
FLastCol := ALastCol;
end;
procedure TLazSynPaintTokenBreaker.Finish;
begin
FCharWidths := nil;
end;
procedure TLazSynPaintTokenBreaker.SetHighlighterTokensLine(ALine: TLineIdx; out
ARealLine: TLineIdx);
var
@ -318,6 +324,7 @@ begin
FDisplayView.SetHighlighterTokensLine(ALine, ARealLine, LogLeftPos, FCurLineByteLen);
FCharWidths := FLinesView.GetPhysicalCharWidths(ARealLine);
FCharWidthsLen := Length(FCharWidths);
FLinesView.GetPhysicalCharWidths(ARealLine, FCharWidths, FCharWidthsLen);
FCurLineByteLen := FCurLineByteLen + LogLeftPos - 1;
FCurViewToken.TokenLength := 0;
@ -1894,6 +1901,7 @@ begin
end;
fMarkupManager.EndMarkup;
FTokenBreaker.Finish;
end;
end.