averello/macvim-mirror
1
0
Fork 0
mirror of https://github.com/macvim-dev/macvim.git synced 2026-06-07 15:37:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix relative positioning once ligatures come into play.

Browse Source
This commit is contained in:
René Köcher
2015-07-12 15:54:05 +02:00
parent 1497587763
commit 207d162fb7
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/MacVim/MMCoreTextView.m
+10 -2
View File
@@ -1029,7 +1029,7 @@ lookupFont(NSMutableArray *fontCache, const unichar *chars, UniCharCount count,
}
static void
ligatureGlyphsForChars(const unichar *chars, CGGlyph *glyphs, UniCharCount *length, CTFontRef font )
ligatureGlyphsForChars(const unichar *chars, CGGlyph *glyphs, CGPoint *positions, UniCharCount *length, CTFontRef font )
{
/* CoreText has no simple wait of retrieving a ligature for a set of UniChars.
* The way proposed on the CoreText ML is to convert the text to an attributed
@@ -1048,6 +1048,8 @@ ligatureGlyphsForChars(const unichar *chars, CGGlyph *glyphs, UniCharCount *leng
NSAttributedString *attrText = [[NSAttributedString alloc] initWithString:text
attributes:attrs];
CGPoint refPos = positions[0];
CTLineRef line = CTLineCreateWithAttributedString((CFAttributedStringRef)attrText);
UniCharCount offset = 0;
@@ -1065,6 +1067,7 @@ ligatureGlyphsForChars(const unichar *chars, CGGlyph *glyphs, UniCharCount *leng
CFRange range = CFRangeMake(0, count);
CTRunGetGlyphs(run, range, &glyphs[offset]);
CTRunGetPositions(run, range, &positions[offset]);
offset += count;
if(offset >= *length) {
@@ -1072,6 +1075,11 @@ ligatureGlyphsForChars(const unichar *chars, CGGlyph *glyphs, UniCharCount *leng
break;
}
}
// fixup relative positioning
for( CFIndex i = 0; i < offset; ++i ) {
positions[i].x += refPos.x;
positions[i].y += refPos.y;
}
// as ligatures combine characters it is required to adjust the
// original length value
*length = offset;
@@ -1086,7 +1094,7 @@ recurseDraw(const unichar *chars, CGGlyph *glyphs, CGPoint *positions,
// All chars were mapped to glyphs, so draw all at once and return.
if (useLigatures) {
memset(glyphs, 0, sizeof(CGGlyph) * length);
ligatureGlyphsForChars(chars, glyphs, &length, fontRef);
ligatureGlyphsForChars(chars, glyphs, positions, &length, fontRef);
}
CGFontRef cgFontRef = CTFontCopyGraphicsFont(fontRef, NULL);