diff --git a/src/MacVim/English.lproj/Preferences.nib/designable.nib b/src/MacVim/English.lproj/Preferences.nib/designable.nib
index 8a7b8adefa..61719b6784 100644
--- a/src/MacVim/English.lproj/Preferences.nib/designable.nib
+++ b/src/MacVim/English.lproj/Preferences.nib/designable.nib
@@ -1,1719 +1,321 @@
-
-
-
- 1050
- 12A269
- 2549
- 1187
- 624.00
-
-
- NSButton
- NSButtonCell
- NSCustomObject
- NSCustomView
- NSMatrix
- NSMenu
- NSMenuItem
- NSPopUpButton
- NSPopUpButtonCell
- NSTextField
- NSTextFieldCell
- NSUserDefaultsController
-
-
- com.apple.InterfaceBuilder.CocoaPlugin
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- IBCocoaFramework
-
- YES
- 3
-
- {11, 11}
- {10, 3}
- {15, 15}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ This applies to files opened from the Finder (e.g. by double-clicking on a file or by dragging a file onto the MacVim dock icon) or from external programs such as Xcode.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ New windows open instantaneously with Quickstart enabled but they may not have the latest runtime files sourced. If you modify your runtime files (e.g files inside the ~/.vim directory) then you may need to disable and re-enable Quickstart to ensure that the next window you open will pick up on those changes.
+
+
+
+
+
+
+
+
+
+
+
+ Selecting this option will increase rendering performance but double-tapping with three fingers to look up words will no longer work.
+
+
+
+
+
+
+
+
+
+
+ Selecting this option will enable full support for displaying font ligatures. Using this with a non-proportional font may result in layout issues.
+
+
+
+
+
+
+
+
+
+
+
+
+ This option causes marked text to be rendered like normal text which is very convenient when using a complex input method (e.g. Kotoeri). However, it has some known limitations which may be circumvented by disabling this option (e.g. mapping to "dead keys" may not work). Note that without this option the Core Text renderer will not draw marked text at all.
+
+
+
+
+
+
+
+
+
+
+
+ You may want to disable this option when using multiple monitors since the native full-screen support renders secondary monitors useless.
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/MacVim/English.lproj/Preferences.nib/keyedobjects.nib b/src/MacVim/English.lproj/Preferences.nib/keyedobjects.nib
index 993915f03e..b019497a60 100644
Binary files a/src/MacVim/English.lproj/Preferences.nib/keyedobjects.nib and b/src/MacVim/English.lproj/Preferences.nib/keyedobjects.nib differ
diff --git a/src/MacVim/MMAppController.m b/src/MacVim/MMAppController.m
index 8cb1b370e3..454d3ab0df 100644
--- a/src/MacVim/MMAppController.m
+++ b/src/MacVim/MMAppController.m
@@ -208,6 +208,7 @@ + (void)initialize
[NSNumber numberWithBool:NO], MMNoFontSubstitutionKey,
[NSNumber numberWithBool:YES], MMLoginShellKey,
[NSNumber numberWithInt:2], MMRendererKey,
+ [NSNumber numberWithBool:NO], MMRendererLigaturesSupportKey,
[NSNumber numberWithInt:MMUntitledWindowAlways],
MMUntitledWindowKey,
[NSNumber numberWithBool:NO], MMTexturedWindowKey,
@@ -1225,6 +1226,27 @@ - (IBAction)atsuiButtonClicked:(id)sender
[self rebuildPreloadCache];
}
+- (IBAction)ligaturesButtonClicked:(id)sender
+{
+ ASLogDebug(@"Toggle CoreText ligatures");
+ BOOL enable = ([sender state] == NSOnState);
+
+ // Update the user default MMRendererLigaturesSupport and synchronize the
+ // change so that any new Vim process will pick up on the changed setting.
+ CFPreferencesSetAppValue(
+ (CFStringRef)MMRendererLigaturesSupportKey,
+ (CFPropertyListRef)[NSNumber numberWithBool:enable],
+ kCFPreferencesCurrentApplication);
+ CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication);
+
+ ASLogInfo(@"Use ligatures=%ld", enable);
+
+ // This action is called when the user clicks the "enable support for ligatures"
+ // button in the advanced preferences pane.
+ [self rebuildPreloadCache];
+}
+
+
- (IBAction)loginShellButtonClicked:(id)sender
{
ASLogDebug(@"Toggle login shell option");
diff --git a/src/MacVim/MMCoreTextView.h b/src/MacVim/MMCoreTextView.h
index 489ae87142..f572caab43 100644
--- a/src/MacVim/MMCoreTextView.h
+++ b/src/MacVim/MMCoreTextView.h
@@ -31,6 +31,7 @@
float fontDescent;
BOOL antialias;
+ BOOL useLigatures;
NSMutableArray *drawData;
MMTextViewHelper *helper;
diff --git a/src/MacVim/MMCoreTextView.m b/src/MacVim/MMCoreTextView.m
index 32d8496cf4..bf0245701e 100644
--- a/src/MacVim/MMCoreTextView.m
+++ b/src/MacVim/MMCoreTextView.m
@@ -132,6 +132,17 @@ - (id)initWithFrame:(NSRect)frame
[self registerForDraggedTypes:[NSArray arrayWithObjects:
NSFilenamesPboardType, NSStringPboardType, nil]];
+ // Check if ligatures should be used or not
+ {
+ Boolean val;
+ Boolean keyValid;
+ val = CFPreferencesGetAppBooleanValue((CFStringRef)MMRendererLigaturesSupportKey,
+ kCFPreferencesCurrentApplication,
+ &keyValid);
+
+ useLigatures = NO;
+ if(keyValid) { useLigatures = val; }
+ }
return self;
}
@@ -1017,14 +1028,75 @@ - (void)batchDrawData:(NSData *)data
return newFontRef;
}
+ static void
+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
+ * string, create a CTLine from it and retrieve the Glyphs from the CTRuns in it.
+ */
+ NSString *text = [NSString stringWithCharacters:chars
+ length:*length];
+
+ NSDictionary *attrs = [NSDictionary dictionaryWithObjectsAndKeys:
+ (id)font, kCTFontAttributeName,
+ // 2 - full ligatures including rare
+ [NSNumber numberWithInteger: 2], kCTLigatureAttributeName,
+ nil
+ ];
+
+ NSAttributedString *attrText = [[NSAttributedString alloc] initWithString:text
+ attributes:attrs];
+
+ CGPoint refPos = positions[0];
+
+ CTLineRef line = CTLineCreateWithAttributedString((CFAttributedStringRef)attrText);
+
+ UniCharCount offset = 0;
+ NSArray *glyphRuns = (NSArray*)CTLineGetGlyphRuns(line);
+
+ for (id item in glyphRuns) {
+ CTRunRef run = (CTRunRef)item;
+ CFIndex count = CTRunGetGlyphCount(run);
+
+ if(count > 0) {
+ if(count - offset > *length) {
+ count = (*length) - offset;
+ }
+ }
+
+ CFRange range = CFRangeMake(0, count);
+ CTRunGetGlyphs(run, range, &glyphs[offset]);
+ CTRunGetPositions(run, range, &positions[offset]);
+
+ offset += count;
+ if(offset >= *length) {
+ // don't copy more glyphs then there is space for
+ 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;
+}
+
static void
recurseDraw(const unichar *chars, CGGlyph *glyphs, CGPoint *positions,
UniCharCount length, CGContextRef context, CTFontRef fontRef,
- NSMutableArray *fontCache)
+ NSMutableArray *fontCache, BOOL useLigatures)
{
-
if (CTFontGetGlyphsForCharacters(fontRef, chars, glyphs, length)) {
// All chars were mapped to glyphs, so draw all at once and return.
+ if (useLigatures) {
+ memset(glyphs, 0, sizeof(CGGlyph) * length);
+ ligatureGlyphsForChars(chars, glyphs, positions, &length, fontRef);
+ }
+
CGFontRef cgFontRef = CTFontCopyGraphicsFont(fontRef, NULL);
CGContextSetFont(context, cgFontRef);
CGContextShowGlyphsAtPositions(context, glyphs, positions, length);
@@ -1077,7 +1149,7 @@ - (void)batchDrawData:(NSData *)data
}
recurseDraw(chars, glyphs, positions, attemptedCount, context,
- fallback, fontCache);
+ fallback, fontCache, useLigatures);
// If only a portion of the invalid range was rendered above,
// the remaining range needs to be attempted by subsequent
@@ -1201,7 +1273,7 @@ - (void)drawString:(const UniChar *)chars length:(UniCharCount)length
}
CGContextSetTextPosition(context, x, y+fontDescent);
- recurseDraw(chars, glyphs, positions, length, context, fontRef, fontCache);
+ recurseDraw(chars, glyphs, positions, length, context, fontRef, fontCache, useLigatures);
CFRelease(fontRef);
CGContextRestoreGState(context);
diff --git a/src/MacVim/MacVim.h b/src/MacVim/MacVim.h
index 82d83ee735..6531534e0c 100644
--- a/src/MacVim/MacVim.h
+++ b/src/MacVim/MacVim.h
@@ -274,6 +274,7 @@ extern NSString *MMNoWindowKey;
extern NSString *MMAutosaveRowsKey;
extern NSString *MMAutosaveColumnsKey;
extern NSString *MMRendererKey;
+extern NSString *MMRendererLigaturesSupportKey;
enum {
MMRendererDefault = 0,
diff --git a/src/MacVim/MacVim.m b/src/MacVim/MacVim.m
index f210c72ea6..f1311f4262 100644
--- a/src/MacVim/MacVim.m
+++ b/src/MacVim/MacVim.m
@@ -116,6 +116,7 @@
NSString *MMAutosaveRowsKey = @"MMAutosaveRows";
NSString *MMAutosaveColumnsKey = @"MMAutosaveColumns";
NSString *MMRendererKey = @"MMRenderer";
+NSString *MMRendererLigaturesSupportKey = @"MMRendererLigaturesSupport";
// Vim find pasteboard type (string contains Vim regex patterns)
NSString *VimFindPboardType = @"VimFindPboardType";