From c5581746a0cc4672cdd436eb8fa8a5ffd56e46f0 Mon Sep 17 00:00:00 2001
From: martin <laz.git@mfriebe.de>
Date: Fri, 13 Feb 2009 21:11:20 +0000
Subject: [PATCH] SynEdit: Fix bug #11752. If using a non utf8 font (gtk1)
 certain sequences of chars would be rendered wrong

git-svn-id: trunk@18674 -
---
 components/synedit/synedit.pp | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/components/synedit/synedit.pp b/components/synedit/synedit.pp
index 52effe66e9..6648941be7 100644
--- a/components/synedit/synedit.pp
+++ b/components/synedit/synedit.pp
@@ -3022,6 +3022,17 @@ var
     LastFSX, LastFEX: integer;
   procedure DrawHiLightMarkupToken(attr: TSynHighlighterAttributes;
     sToken: PChar; nTokenByteLen: integer);
+
+    function CharToByteLen(aCharLen: Integer) : Integer;
+    begin
+      if not UseUTF8 then exit(aCharLen);
+      Result := UTF8CharToByteIndex(sToken, nTokenByteLen, aCharLen);
+      if Result < 0 then begin
+        debugln('ERROR: Could not convert CharLen (',dbgs(aCharLen),') to byteLen (maybe invalid UTF8?)',' len ',dbgs(nTokenByteLen),' Line ',dbgs(CurLine),' PhysPos ',dbgs(CurPhysPos));
+        Result := aCharLen;
+      end;
+    end;
+
   var
     DefaultFGCol, DefaultBGCol, DefaultFCCol: TColor;
     DefaultStyle: TFontStyles;
@@ -3039,7 +3050,6 @@ var
     PhysicalStartPos := CurPhysPos;
     len := nTokenByteLen;
     TokenCharLen := ExpandSpecialChars(sToken, nTokenByteLen, PhysicalStartPos);
-//    TokenCharLen := UTF8Length(sToken, nTokenByteLen); // XXX TODO
     CurLogIndex := CurLogIndex + len;
     // Prepare position for next token
     inc(CurPhysPos, TokenCharLen);
@@ -3048,11 +3058,7 @@ var
     // Remove any Part of the Token that is before FirstCol
     if PhysicalStartPos < FirstCol then begin
       SubCharLen := FirstCol - PhysicalStartPos;
-      len := UTF8CharToByteIndex(sToken, nTokenByteLen, SubCharLen);
-      if len < 0 then begin
-        debugln('ERROR: Could not find PhysStart in token (maybe invalid UTF8?',' len ',dbgs(nTokenByteLen),' Line ',dbgs(CurLine),' PhysPos ',dbgs(CurPhysPos));
-        exit;
-      end;
+      len := CharToByteLen(SubCharLen);
       dec(TokenCharLen, SubCharLen);
       inc(PhysicalStartPos, SubCharLen);
       dec(nTokenByteLen, len);
@@ -3063,11 +3069,7 @@ var
     SubCharLen := PhysicalStartPos + TokenCharLen - (LastCol + 1);
     if SubCharLen > 0 then begin
       dec(TokenCharLen, SubCharLen);
-      nTokenByteLen := UTF8CharToByteIndex(sToken, nTokenByteLen, TokenCharLen);
-      if nTokenByteLen < 0 then begin
-        debugln('ERROR: Could not find PhysEnd in token (maybe invalid UTF8?',' len ',dbgs(nTokenByteLen),' Line ',dbgs(CurLine),' PhysPos ',dbgs(CurPhysPos));
-        exit;
-      end;
+      nTokenByteLen := CharToByteLen(TokenCharLen);
     end;
 
     if Assigned(attr) then
@@ -3100,11 +3102,7 @@ var
         SubCharLen:=1;
       end;
 
-      SubTokenByteLen := UTF8CharToByteIndex(sToken,nTokenByteLen,SubCharLen);
-      if SubTokenByteLen < 0 then begin
-        debugln('ERROR: Can not find ByteLen for SubToken ',dbgs(SubCharLen),' len ',dbgs(nTokenByteLen),' Line ',dbgs(CurLine),' PhysPos ',dbgs(CurPhysPos));
-        SubTokenByteLen := nTokenByteLen; // Draw the rest
-      end;
+      SubTokenByteLen := CharToByteLen(SubCharLen);
       PhysicalEndPos:= PhysicalStartPos + SubCharLen - 1;
 
       // Calculate Markup