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

SynEdit: Fixed new text painter. Tabs that expanded to a width of 1 were incorrectly painted. Issue #0023316

Browse Source 
git-svn-id: trunk@39279 -
This commit is contained in:
martin 2012-11-14 22:44:46 +00:00
parent 911299e0ea
commit f0f98b8cad
1 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
components/synedit/lazsyntextarea.pp
View File

@ -24,9 +24,11 @@ type
PhysicalClipEnd: Integer; // 1 based - PaintEnd PhysicalClipEnd: Integer; // 1 based - PaintEnd
RtlInfo: TLazSynDisplayRtlInfo; RtlInfo: TLazSynDisplayRtlInfo;
RtlExpandedExtraBytes: Integer; // tab and space expansion RtlExpandedExtraBytes: Integer; // tab and space expansion
RtlHasTabs: Boolean;
RtlHasDoubleWidth: Boolean; RtlHasDoubleWidth: Boolean;
ExpandedExtraBytes: Integer; // tab and space expansion ExpandedExtraBytes: Integer; // tab and space expansion
HasTabs: Boolean; // ExtraWidth may still be 0
HasDoubleWidth: Boolean; HasDoubleWidth: Boolean;
NextPos: TLazSynDisplayTokenBound; // Next toxen, may be BIDI NextPos: TLazSynDisplayTokenBound; // Next toxen, may be BIDI
@ -64,6 +66,7 @@ type
FCurViewRtlPhysStart, FCurViewRtlPhysEnd: integer; FCurViewRtlPhysStart, FCurViewRtlPhysEnd: integer;
FCurViewRtlLogStart, FCurViewRtlLogEnd: integer; FCurViewRtlLogStart, FCurViewRtlLogEnd: integer;
FCurViewRtlExpExtraBytes: Integer; // tab and space expansion for entire RTL run FCurViewRtlExpExtraBytes: Integer; // tab and space expansion for entire RTL run
FCurViewRtlHasTabs: Boolean;
FCurViewRtlHasDoubleWidth: Boolean; FCurViewRtlHasDoubleWidth: Boolean;
FNextMarkupPhysPos, FNextMarkupLogPos: Integer; FNextMarkupPhysPos, FNextMarkupLogPos: Integer;
@ -384,6 +387,7 @@ begin
FMarkupTokenAttr.Background := FBackgroundColor; FMarkupTokenAttr.Background := FBackgroundColor;
ATokenInfo.ExpandedExtraBytes := 0; ATokenInfo.ExpandedExtraBytes := 0;
ATokenInfo.HasTabs := False;
ATokenInfo.HasDoubleWidth := False; // TODO: True, but needs charwidth for painter ATokenInfo.HasDoubleWidth := False; // TODO: True, but needs charwidth for painter
end end
else begin else begin
@ -574,7 +578,7 @@ function TLazSynPaintTokenBreaker.GetNextHighlighterTokenFromView(out
var var
RtlRunPhysWidth, TabExtra, i, j: Integer; RtlRunPhysWidth, TabExtra, i, j: Integer;
pcw: TPhysicalCharWidth; pcw: TPhysicalCharWidth;
HasDouble: Boolean; HasTabs, HasDouble: Boolean;
c: Char; c: Char;
begin begin
FCurViewRtlLogStart := ALogicIdx; FCurViewRtlLogStart := ALogicIdx;
@ -583,6 +587,7 @@ function TLazSynPaintTokenBreaker.GetNextHighlighterTokenFromView(out
RtlRunPhysWidth := 0; RtlRunPhysWidth := 0;
i := 0; i := 0;
HasDouble := False; HasDouble := False;
HasTabs := False;
TabExtra := 0; // Extra bytes needed for expanded Tab/Space(utf8 visible space/dot) TabExtra := 0; // Extra bytes needed for expanded Tab/Space(utf8 visible space/dot)
j := (pcw and PCWMask); j := (pcw and PCWMask);
// must go over token bounds // must go over token bounds
@ -592,8 +597,10 @@ function TLazSynPaintTokenBreaker.GetNextHighlighterTokenFromView(out
if j <> 0 then begin if j <> 0 then begin
c := (FCurViewToken.TokenStart + i)^; c := (FCurViewToken.TokenStart + i)^;
if c = #9 then if c = #9 then begin
inc(TabExtra, j-1 + FTabExtraByteCount) HasTabs := True;
inc(TabExtra, j-1 + FTabExtraByteCount);
end
else else
if j > 1 then if j > 1 then
HasDouble := True; HasDouble := True;
@ -618,6 +625,7 @@ function TLazSynPaintTokenBreaker.GetNextHighlighterTokenFromView(out
FCurViewScannerPhysCharPos := FCurViewRtlPhysEnd; FCurViewScannerPhysCharPos := FCurViewRtlPhysEnd;
FCurViewScannerPos.Physical := FCurViewRtlPhysEnd; FCurViewScannerPos.Physical := FCurViewRtlPhysEnd;
FCurViewRtlExpExtraBytes := TabExtra; FCurViewRtlExpExtraBytes := TabExtra;
FCurViewRtlHasTabs := HasTabs;
FCurViewRtlHasDoubleWidth := HasDouble; FCurViewRtlHasDoubleWidth := HasDouble;
end; end;
@ -650,7 +658,7 @@ var
PrevLogicIdx, PrevPhysPos: Integer; PrevLogicIdx, PrevPhysPos: Integer;
PhysTokenStop: Integer; PhysTokenStop: Integer;
TabExtra: Integer; TabExtra: Integer;
HasDouble: Boolean; HasTabs, HasDouble: Boolean;
begin begin
while True do begin while True do begin
Result := MaybeFetchToken; // Get token from View/Highlighter Result := MaybeFetchToken; // Get token from View/Highlighter
@ -688,6 +696,7 @@ begin
PrevLogicIdx := LogicIdx; PrevLogicIdx := LogicIdx;
PrevPhysPos := PhysPos; PrevPhysPos := PhysPos;
HasDouble := False; HasDouble := False;
HasTabs := False;
TabExtra := 0; // Extra bytes needed for expanded Tab/Space(utf8 visible space/dot) TabExtra := 0; // Extra bytes needed for expanded Tab/Space(utf8 visible space/dot)
i := 0; i := 0;
@ -705,8 +714,10 @@ begin
inc(PhysPos, j); inc(PhysPos, j);
if j <> 0 then begin if j <> 0 then begin
c := (FCurViewToken.TokenStart + i)^; c := (FCurViewToken.TokenStart + i)^;
if c = #9 then if c = #9 then begin
inc(TabExtra, j-1 + FTabExtraByteCount) HasTabs := True;
inc(TabExtra, j-1 + FTabExtraByteCount);
end
else else
if j > 1 then if j > 1 then
HasDouble := True; HasDouble := True;
@ -747,6 +758,7 @@ begin
ATokenInfo.Attr := FCurViewAttr; ATokenInfo.Attr := FCurViewAttr;
ATokenInfo.ExpandedExtraBytes := TabExtra; ATokenInfo.ExpandedExtraBytes := TabExtra;
ATokenInfo.HasTabs := HasTabs;
ATokenInfo.HasDoubleWidth := HasDouble; ATokenInfo.HasDoubleWidth := HasDouble;
assert(ATokenInfo.StartPos.Offset >= 0, 'FCurViewScannerPos.Offset >= 0'); assert(ATokenInfo.StartPos.Offset >= 0, 'FCurViewScannerPos.Offset >= 0');
assert(ATokenInfo.EndPos.Offset <= 0, 'FCurViewToken.EndPos.Offset <= 0'); assert(ATokenInfo.EndPos.Offset <= 0, 'FCurViewToken.EndPos.Offset <= 0');
@ -809,6 +821,7 @@ begin
PrevLogicIdx := LogicIdx; PrevLogicIdx := LogicIdx;
PrevPhysPos := PhysPos; PrevPhysPos := PhysPos;
HasDouble := False; HasDouble := False;
HasTabs := False;
TabExtra := 0; // Extra bytes needed for expanded Tab/Space(utf8 visible space/dot) TabExtra := 0; // Extra bytes needed for expanded Tab/Space(utf8 visible space/dot)
i := 0; i := 0;
@ -826,8 +839,10 @@ begin
dec(PhysPos, j); dec(PhysPos, j);
if j <> 0 then begin if j <> 0 then begin
c := (FCurViewToken.TokenStart + i)^; c := (FCurViewToken.TokenStart + i)^;
if c = #9 then if c = #9 then begin
inc(TabExtra, j-1 + FTabExtraByteCount) HasTabs := True;
inc(TabExtra, j-1 + FTabExtraByteCount);
end
else else
if j > 1 then if j > 1 then
HasDouble := True; HasDouble := True;
@ -866,10 +881,12 @@ begin
ATokenInfo.RtlInfo.LogFirst := FCurViewRtlLogStart + 1; ATokenInfo.RtlInfo.LogFirst := FCurViewRtlLogStart + 1;
ATokenInfo.RtlInfo.LogLast := FCurViewRtlLogEnd + 1; ATokenInfo.RtlInfo.LogLast := FCurViewRtlLogEnd + 1;
ATokenInfo.RtlExpandedExtraBytes := FCurViewRtlExpExtraBytes; ATokenInfo.RtlExpandedExtraBytes := FCurViewRtlExpExtraBytes;
ATokenInfo.RtlHasTabs := FCurViewRtlHasTabs;
ATokenInfo.RtlHasDoubleWidth := FCurViewRtlHasDoubleWidth; ATokenInfo.RtlHasDoubleWidth := FCurViewRtlHasDoubleWidth;
ATokenInfo.Attr := FCurViewAttr; ATokenInfo.Attr := FCurViewAttr;
ATokenInfo.ExpandedExtraBytes := TabExtra; ATokenInfo.ExpandedExtraBytes := TabExtra;
ATokenInfo.HasTabs := HasTabs;
ATokenInfo.HasDoubleWidth := HasDouble; ATokenInfo.HasDoubleWidth := HasDouble;
assert(ATokenInfo.StartPos.Offset >= 0, 'FCurViewScannerPos.Offset >= 0'); assert(ATokenInfo.StartPos.Offset >= 0, 'FCurViewScannerPos.Offset >= 0');
assert(ATokenInfo.EndPos.Offset <= 0, 'FCurViewToken.EndPos.Offset <= 0'); assert(ATokenInfo.EndPos.Offset <= 0, 'FCurViewToken.EndPos.Offset <= 0');
@ -1464,10 +1481,11 @@ var
ATokenInfo.StartPos.Logical := ATokenInfo.RtlInfo.LogFirst; ATokenInfo.StartPos.Logical := ATokenInfo.RtlInfo.LogFirst;
ATokenInfo.ExpandedExtraBytes := ATokenInfo.RtlExpandedExtraBytes; ATokenInfo.ExpandedExtraBytes := ATokenInfo.RtlExpandedExtraBytes;
ATokenInfo.HasTabs := ATokenInfo.RtlHasTabs;
ATokenInfo.HasDoubleWidth := ATokenInfo.RtlHasDoubleWidth; ATokenInfo.HasDoubleWidth := ATokenInfo.RtlHasDoubleWidth;
end; end;
NeedExpansion := ATokenInfo.ExpandedExtraBytes > 0; NeedExpansion := (ATokenInfo.ExpandedExtraBytes > 0) or (ATokenInfo.HasTabs);
NeedTransform := FTextDrawer.NeedsEto or ATokenInfo.HasDoubleWidth or NeedExpansion; NeedTransform := FTextDrawer.NeedsEto or ATokenInfo.HasDoubleWidth or NeedExpansion;
Len := ATokenInfo.Tk.TokenLength; Len := ATokenInfo.Tk.TokenLength;
if (not ATokenInfo.RtlInfo.IsRtl) or (LineBufferRtlLogPos <> ATokenInfo.RtlInfo.LogFirst) then if (not ATokenInfo.RtlInfo.IsRtl) or (LineBufferRtlLogPos <> ATokenInfo.RtlInfo.LogFirst) then