diff options
| author | mitchell <unknown> | 2018-05-05 11:52:27 -0400 |
|---|---|---|
| committer | mitchell <unknown> | 2018-05-05 11:52:27 -0400 |
| commit | 93462d87c3c8f398d5900be84349f29cb088d849 (patch) | |
| tree | 631eb19ad8d818e262f4988139d96709b4ee8cd5 /cocoa | |
| parent | 156c3f0e53ea2a7f932f6079cb122c2cf66fb3df (diff) | |
| download | scintilla-mirror-93462d87c3c8f398d5900be84349f29cb088d849.tar.gz | |
Backport: Feature [feature-requests:#1211]. Use pre-computed table for UTF8BytesOfLead.
Friendlier treatment of invalid UTF-8. Add tests for UniConversion handling invalid UTF-8. Simplify UTF8Classify tests.
Backport of changeset 6643:ebbb4e5aaf93.
Diffstat (limited to 'cocoa')
| -rw-r--r-- | cocoa/PlatCocoa.mm | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/cocoa/PlatCocoa.mm b/cocoa/PlatCocoa.mm index ea4149d97..ab9d449a0 100644 --- a/cocoa/PlatCocoa.mm +++ b/cocoa/PlatCocoa.mm @@ -31,6 +31,7 @@ #include "StringCopy.h" #include "XPM.h" +#include "UniConversion.h" #import "ScintillaView.h" #import "ScintillaCocoa.h" @@ -923,18 +924,6 @@ void SurfaceImpl::DrawTextTransparent(PRectangle rc, Font &font_, XYPOSITION yba textLayout->draw(rc.left, ybase); } -static size_t utf8LengthFromLead(unsigned char uch) { - if (uch >= (0x80 + 0x40 + 0x20 + 0x10)) { - return 4; - } else if (uch >= (0x80 + 0x40 + 0x20)) { - return 3; - } else if (uch >= (0x80)) { - return 2; - } else { - return 1; - } -} - //-------------------------------------------------------------------------------------------------- void SurfaceImpl::MeasureWidths(Font &font_, const char *s, int len, XYPOSITION *positions) @@ -952,10 +941,10 @@ void SurfaceImpl::MeasureWidths(Font &font_, const char *s, int len, XYPOSITION const unsigned char *us = reinterpret_cast<const unsigned char *>(s); int i=0; while (ui<fit) { - size_t lenChar = utf8LengthFromLead(us[i]); - size_t codeUnits = (lenChar < 4) ? 1 : 2; + const unsigned int byteCount = UTF8BytesOfLead[us[i]]; + const int codeUnits = UTF16LengthFromUTF8ByteCount(byteCount); CGFloat xPosition = CTLineGetOffsetForStringIndex(mLine, ui+codeUnits, NULL); - for (unsigned int bytePos=0; (bytePos<lenChar) && (i<len); bytePos++) { + for (unsigned int bytePos=0; (bytePos<byteCount) && (i<len); bytePos++) { positions[i++] = static_cast<XYPOSITION>(xPosition); } ui += codeUnits; |