Merge branch 'master' of github.com:splhack/macvim

Author: splhack

src/MacVim/MMBackend.m

@@ -998,11 +998,9 @@ - (void)setFont:(GuiFont)font wide:(BOOL)wide
     }
 
     int len = [fontName lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
-    int emojiEnabled = vim_strchr(p_go, GO_EMOJI) != NULL;
     NSMutableData *data = [NSMutableData data];
     [data appendBytes:&size length:sizeof(float)];
     [data appendBytes:&len length:sizeof(int)];
-    [data appendBytes:&emojiEnabled length:sizeof(int)];
 
     if (len > 0)
         [data appendBytes:[fontName UTF8String] length:len];

src/MacVim/MMCoreTextView.h

@@ -37,10 +37,8 @@
 
     unsigned                    maxlen;
     CGGlyph                     *glyphs;
-    CGSize                      *advances;
     CGPoint                     *positions;
     NSMutableArray              *fontCache;
-    BOOL                        emojiEnabled;
 
     // These are used in MMCoreTextView+ToolTip.m
     id trackingRectOwner_;              // (not retained)

src/MacVim/MMCoreTextView.m

@@ -308,22 +308,17 @@ - (void)setWideFont:(NSFont *)newFont
         // regular font when drawing.
         [fontWide release];
 
-        emojiEnabled = [[self vimController] emojiEnabled];
-        if (emojiEnabled) {
-            // Use 'Apple Color Emoji' font for rendering emoji
-            CGFloat size = [newFont pointSize];
-            NSFontDescriptor *emojiDesc = [NSFontDescriptor
-                fontDescriptorWithName:@"Apple Color Emoji" size:size];
-            NSFontDescriptor *newFontDesc = [newFont fontDescriptor];
-            NSDictionary *attrs = [NSDictionary
-                dictionaryWithObject:[NSArray arrayWithObject:newFontDesc]
-                              forKey:NSFontCascadeListAttribute];
-            NSFontDescriptor *desc =
-                [emojiDesc fontDescriptorByAddingAttributes:attrs];
-            fontWide = [[NSFont fontWithDescriptor:desc size:size] retain];
-        } else {
-            fontWide = [newFont retain];
-        }
+        // Use 'Apple Color Emoji' font for rendering emoji
+        CGFloat size = [newFont pointSize];
+        NSFontDescriptor *emojiDesc = [NSFontDescriptor
+            fontDescriptorWithName:@"Apple Color Emoji" size:size];
+        NSFontDescriptor *newFontDesc = [newFont fontDescriptor];
+        NSDictionary *attrs = [NSDictionary
+            dictionaryWithObject:[NSArray arrayWithObject:newFontDesc]
+                          forKey:NSFontCascadeListAttribute];
+        NSFontDescriptor *desc =
+            [emojiDesc fontDescriptorByAddingAttributes:attrs];
+        fontWide = [[NSFont fontWithDescriptor:desc size:size] retain];
     }
 }
 
@@ -1052,20 +1047,13 @@ - (void)batchDrawData:(NSData *)data
     static void
 recurseDraw(const unichar *chars, CGGlyph *glyphs, CGPoint *positions,
             UniCharCount length, CGContextRef context, CTFontRef fontRef,
-            NSMutableArray *fontCache, BOOL emojiEnabled)
+            NSMutableArray *fontCache)
 {
 
     if (CTFontGetGlyphsForCharacters(fontRef, chars, glyphs, length)) {
         // All chars were mapped to glyphs, so draw all at once and return.
-        if (emojiEnabled) {
-            length = gatherGlyphs(glyphs, length);
-            CTFontDrawGlyphs(fontRef, glyphs, positions, length, context);
-        } else {
-            CGFontRef cgFontRef = CTFontCopyGraphicsFont(fontRef, NULL);
-            CGContextSetFont(context, cgFontRef);
-            CGContextShowGlyphsAtPositions(context, glyphs, positions, length);
-            CGFontRelease(cgFontRef);
-        }
+        length = gatherGlyphs(glyphs, length);
+        CTFontDrawGlyphs(fontRef, glyphs, positions, length, context);
         return;
     }
 
@@ -1079,7 +1067,7 @@ - (void)batchDrawData:(NSData *)data
             // font).
             BOOL surrogatePair = NO;
             while (*g && g < glyphsEnd) {
-                if (emojiEnabled && CFStringIsSurrogateHighCharacter(*c)) {
+                if (CFStringIsSurrogateHighCharacter(*c)) {
                     surrogatePair = YES;
                     g += 2;
                     c += 2;
@@ -1091,22 +1079,14 @@ - (void)batchDrawData:(NSData *)data
             }
 
             int count = g-glyphs;
-            if (emojiEnabled) {
-                if (surrogatePair)
-                    count = gatherGlyphs(glyphs, count);
-                CTFontDrawGlyphs(fontRef, glyphs, positions, count, context);
-            } else {
-                CGFontRef cgFontRef = CTFontCopyGraphicsFont(fontRef, NULL);
-                CGContextSetFont(context, cgFontRef);
-                CGContextShowGlyphsAtPositions(context, glyphs, positions,
-                                               count);
-                CGFontRelease(cgFontRef);
-            }
+            if (surrogatePair)
+                count = gatherGlyphs(glyphs, count);
+            CTFontDrawGlyphs(fontRef, glyphs, positions, count, context);
         } else {
             // Skip past as many consecutive chars as possible which cannot be
             // drawn in the current font.
             while (0 == *g && g < glyphsEnd) {
-                if (emojiEnabled && CFStringIsSurrogateHighCharacter(*c)) {
+                if (CFStringIsSurrogateHighCharacter(*c)) {
                     g += 2;
                     c += 2;
                 } else {
@@ -1123,7 +1103,7 @@ - (void)batchDrawData:(NSData *)data
                 return;
 
             recurseDraw(chars, glyphs, positions, count, context, newFontRef,
-                        fontCache, emojiEnabled);
+                        fontCache);
 
             CFRelease(newFontRef);
         }
@@ -1246,8 +1226,7 @@ - (void)drawString:(const UniChar *)chars length:(UniCharCount)length
     }
 
     CGContextSetTextPosition(context, x, y+fontDescent);
-    recurseDraw(chars, glyphs, positions, length, context, fontRef, fontCache,
-                (flags & DRAW_WIDE) && emojiEnabled);
+    recurseDraw(chars, glyphs, positions, length, context, fontRef, fontCache);
 
     CFRelease(fontRef);
     CGContextRestoreGState(context);

src/MacVim/MMVimController.h

@@ -38,7 +38,6 @@
     BOOL                isPreloading;
     NSDate              *creationDate;
     BOOL                hasModifiedBuffer;
-    BOOL                emojiEnabled;
 }
 
 - (id)initWithBackend:(id)backend pid:(int)processIdentifier;
@@ -69,5 +68,4 @@
 - (id)evaluateVimExpressionCocoa:(NSString *)expr
                      errorString:(NSString **)errstr;
 - (void)processInputQueue:(NSArray *)queue;
-- (BOOL)emojiEnabled;
 @end

src/MacVim/MMVimController.m

@@ -221,11 +221,6 @@ - (void)setIsPreloading:(BOOL)yn
     isPreloading = yn;
 }
 
-- (BOOL)emojiEnabled
-{
-    return emojiEnabled;
-}
-
 - (BOOL)hasModifiedBuffer
 {
     return hasModifiedBuffer;
@@ -698,7 +693,6 @@ - (void)handleMessage:(int)msgid data:(NSData *)data
         const void *bytes = [data bytes];
         float size = *((float*)bytes);  bytes += sizeof(float);
         int len = *((int*)bytes);  bytes += sizeof(int);
-        emojiEnabled = *((int*)bytes);  bytes += sizeof(int);
         NSString *name = [[NSString alloc]
                 initWithBytes:(void*)bytes length:len
                      encoding:NSUTF8StringEncoding];
@@ -716,7 +710,6 @@ - (void)handleMessage:(int)msgid data:(NSData *)data
         const void *bytes = [data bytes];
         float size = *((float*)bytes);  bytes += sizeof(float);
         int len = *((int*)bytes);  bytes += sizeof(int);
-        emojiEnabled = *((int*)bytes);  bytes += sizeof(int);
         if (len > 0) {
             NSString *name = [[NSString alloc]
                     initWithBytes:(void*)bytes length:len
@@ -1669,4 +1662,3 @@ - (void)beginSheetModalForWindow:(NSWindow *)window
 
     return NO;
 }
-

src/option.c

@@ -1370,7 +1370,7 @@ static struct vimoption
 # if defined(UNIX) && !defined(MACOS)
 			    {(char_u *)"aegimrLtT", (char_u *)0L}
 # elif defined(FEAT_GUI_MACVIM)
-			    {(char_u *)"eEgmrL", (char_u *)0L}
+			    {(char_u *)"egmrL", (char_u *)0L}
 # else
 			    {(char_u *)"egmrLtT", (char_u *)0L}
 # endif

src/option.h

@@ -237,8 +237,7 @@
 #define GO_FOOTER	'F'		/* add footer */
 #define GO_VERTICAL	'v'		/* arrange dialog buttons vertically */
 #define GO_NOCAPTION	'C'		/* remove caption bar */
-#define GO_EMOJI	'E'		/* use emoji */
-#define GO_ALL		"aAbcCeEfFghilmMprtTv" /* all possible flags for 'go' */
+#define GO_ALL		"aAbcCefFghilmMprtTv" /* all possible flags for 'go' */
 
 /* flags for 'comments' option */
 #define COM_NEST	'n'		/* comments strings nest */