Changeset 421 for trunk/Components/RichTextView.PAS

Timestamp:

Mar 1, 2019, 8:09:20 PM (6 years ago)

Author:

ataylor

Message:

DBCS character boundary detection for cursor positioning logic.

File:

• trunk/Components/RichTextView.PAS (modified) (12 diffs)

trunk/Components/RichTextView.PAS

@@ -87 +87 @@
     FCursorRow: longint;
     FCursorOffset: longint;
+
+    FCursorMoveRight: boolean;    // ALT - TRUE if cursor is moving to the right
 
     FSelectionStart: longint;
@@ -460 +462 @@
 Procedure TRichTextView.SetSelectionStartInternal( SelectionStart: longint );
 var
+  Line:   longint;     // ALT
   Offset: longint;     // ALT
 begin
@@ -470 +473 @@
       ClearSelection;
 
-  // ALT
-  Offset := FCursorOffset;
-  MoveToCharacterBoundary( FText, SelectionStart, FCursorOffset, Offset, FLayout.Codepage, false );
+// Should already be ensured by this point?
+//  FLayout.FindCharacterBoundary( FText, SelectionStart, false );    // ALT
 
   FSelectionStart := SelectionStart;
@@ -485 +487 @@
   StartRedrawLine: longint;
   EndRedrawLine: longint;
-  Offset: longint;         // ALT
+  Offset: longint;          // ALT
+  Line:   longint;          // ALT
   OldClip: TRect;
 begin
@@ -491 +494 @@
     exit;
 
-  // ALT
-  Offset := FCursorOffset;
-  MoveToCharacterBoundary( FText, SelectionEnd, FCursorOffset, Offset, FLayout.Codepage, false );
+// Should already be ensured by this point?
+//  FLayout.FindCharacterBoundary( FText, SelectionEnd, false );      // ALT
 
   if FSelectionStart = -1 then
@@ -955 +957 @@
                                Offset,
                                Link );
+
 end;
 
@@ -1257 +1260 @@
   // ALT - move to nearest character boundary
   Index := FLayout.GetCharIndex( Line.Text ) + FCursorOffset;
-  RowStart := FLayout.GetCharIndex( Line.Text );
-  MoveToCharacterBoundary( FText, Index, FCursorOffset, RowStart, FLayout.Codepage, false );
+
+  FLayout.FindCharacterBoundary( FText, Index, FCursorMoveRight );
+  FCursorOffset := FLayout.GetOffsetFromCharIndex( Index, CursorRow );
+  FCursorMoveRight := false;
+  // ALT
 
   FLayout.GetXFromOffset( FCursorOffset, CursorRow, X );
@@ -1998 +2004 @@
   Row: longint;
 begin
+  FCursorMoveRight := false;    // ALT
+
   if SelectionSet then
   begin
@@ -2037 +2045 @@
                                            PreserveSelection: boolean );
 var
-//  P: PChar;                 // ALT
-//  NextP: PChar;             // ALT
-//  Element: TTextElement;    // ALT
-//  InsideDBC: boolean;       // ALT
   RowStart: longint;        // ALT
   MoveRight: boolean;       // ALT
@@ -2048 +2052 @@
 
   Index := FLayout.GetCharIndex( FLayout.FLines[ Row ].Text ) + Offset;
-
-// ALT
-{
-  if ( Offset > 0 ) and
-     ( FLayout.Codepage in [ 932, 936, 942, 943, 949, 950, 1381, 1386 ]) then
-  begin
-    RowStart := FLayout.GetCharIndex( FLayout.FLines[ Row ].Text );
-    P := FText + RowStart;
-    InsideDBC := false;
-    while RowStart < Index do
-    begin
-      Element := ExtractNextTextElement( P, NextP );
-      CheckSpecialElementType( Element.Character, Element.ElementType, InsideDBC, FLayout.Codepage );
-      P := NextP;
-      inc( RowStart );
-    end;
-    Element := ExtractNextTextElement( P, NextP );
-    CheckSpecialElementType( Element.Character, Element.ElementType, InsideDBC, FLayout.Codepage );
-    if InsideDBC then
-    begin
-      dec( Index );
-      dec( Offset );
-    end;
-  end;
-}
-
   RowStart := FLayout.GetCharIndex( FLayout.FLines[ Row ].Text );
 
-  // ALT
-  if Offset = ( FCursorOffset + 1 ) then
-    MoveRight := true
-  else
-    MoveRight := false;
-  MoveToCharacterBoundary( FText, Index, Offset, RowStart, FLayout.Codepage, MoveRight );
-
-  FCursorOffset := Offset;
+  Offset := FLayout.FindCharacterBoundary( FText, Index, FCursorMoveRight );  // ALT
+  FCursorOffset := FLayout.GetOffsetFromCharIndex( Index, Row );
   FCursorRow := Row;
 
@@ -2106 +2078 @@
   Line: TLayoutLine;
 begin
+  FCursorMoveRight := true;
   P := FText + CursorIndex;
 
@@ -2423 +2396 @@
 begin
   CursorVisible := FSelectionStart <> -1;
+  FCursorMoveRight := false;
 
   Case KeyCode of