paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-13 12:29:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ wide and combining character support when determining the cursor position in TInputLine

Browse Source 
git-svn-id: branches/unicodekvm@48796 -
This commit is contained in:
nickysn 2021-02-24 06:38:29 +00:00
parent c63534af48
commit 1c9fb8ec7d
1 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
packages/fv/src/dialogs.inc
View File

@ -208,6 +208,7 @@ TYPE
PROCEDURE HandleEvent (Var Event: TEvent); Virtual;
PRIVATE
FUNCTION CanScroll (Delta: Sw_Integer): Boolean;
FUNCTION ScreenCurPos: Sw_Integer;
END;
PInputLine = ^TInputLine;
@ -1470,7 +1471,7 @@ BEGIN
R := Size.X - 2;
if L < R then
MoveChar(B[L + 1], #0, GetColor(3), R - L);
SetCursor(CurPos - FirstPos + 1, 0);
SetCursor(ScreenCurPos - FirstPos + 1, 0);
end;
WriteLine(0, 0, Size.X, Size.Y, B);
end;
@ -1484,7 +1485,7 @@ BEGIN
If (State AND sfFocused <> 0) Then
Begin { Focused window }
Cursor.Y:=0;
Cursor.X:=CurPos-FirstPos+1;
Cursor.X:=ScreenCurPos-FirstPos+1;
ResetCursor;
end;
END;
@ -1860,6 +1861,31 @@ BEGIN
End Else CanScroll := False; { Zero so no scroll }
END;
{$ifdef FV_UNICODE}
FUNCTION TInputLine.ScreenCurPos: Sw_Integer;
VAR EGC: Sw_String; StrPos, ScrPos: Sw_Integer;
BEGIN
StrPos := 0;
ScrPos := 0;
for EGC in TUnicodeStringExtendedGraphemeClustersEnumerator.Create(Data) do
begin
if (StrPos + Length(EGC)) > CurPos then
begin
Result := ScrPos;
exit;
end;
Inc(StrPos, Length(EGC));
Inc(ScrPos, StrWidth(EGC));
end;
Result := CurPos - Length(Data) + ScrPos;
END;
{$else FV_UNICODE}
FUNCTION TInputLine.ScreenCurPos: Sw_Integer;
BEGIN
Result := CurPos;
END;
{$endif FV_UNICODE}
{+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++}
{ TButton OBJECT METHODS }
{+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++}