Emoji!

Author: splhack

src/MacVim/MMBackend.m

@@ -998,9 +998,11 @@ - (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

@@ -38,7 +38,9 @@
     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

@@ -150,6 +150,7 @@ - (void)dealloc
 
     if (glyphs) { free(glyphs); glyphs = NULL; }
     if (advances) { free(advances); advances = NULL; }
+    if (positions) { free(positions); positions = NULL; }
 
     [super dealloc];
 }
@@ -307,7 +308,23 @@ - (void)setWideFont:(NSFont *)newFont
         // NOTE: No need to set point size etc. since this is taken from the
         // regular font when drawing.
         [fontWide release];
-        fontWide = [newFont retain];
+
+        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];
+        }
     }
 }
 
@@ -1017,19 +1034,60 @@ - (void)batchDrawData:(NSData *)data
     return newFontRef;
 }
 
+    static UniCharCount
+gatherGlyphs(CGGlyph glyphs[], UniCharCount count)
+{
+    // Gather scattered glyphs that was happended by Surrogate pair chars
+    UniCharCount glyphLength = 0;
+    NSUInteger pos = NSIntegerMax;
+    NSUInteger i;
+    for (i = 0; i < count; ++i) {
+        if (glyphs[i] == 0) {
+            pos = i;
+        } else {
+            ++glyphLength;
+            if (pos != NSIntegerMax)
+                glyphs[pos++] = glyphs[i];
+        }
+    }
+    return glyphLength;
+}
+
+    static void
+drawGlyphs(CTFontRef fontRef, const CGGlyph glyphs[], const CGSize advances[],
+           CGPoint positions[], size_t count, CGContextRef context)
+{
+    CGAffineTransform matrix =
+        CGAffineTransformInvert(CGContextGetTextMatrix(context));
+    positions[0] = CGPointZero;
+    NSUInteger i;
+    for (i = 1; i < count; ++i) {
+        CGSize advance = CGSizeApplyAffineTransform(advances[i - 1], matrix);
+        positions[i].x = positions[i - 1].x + advance.width;
+        positions[i].y = positions[i - 1].y + advance.height;
+    }
+    CTFontDrawGlyphs(fontRef, glyphs, positions, count, context);
+}
+
     static void
 recurseDraw(const unichar *chars, CGGlyph *glyphs, CGSize *advances,
-            UniCharCount length, CGContextRef context, CTFontRef fontRef,
-            float x, float y, NSMutableArray *fontCache)
+            CGPoint *positions, UniCharCount length, CGContextRef context,
+            CTFontRef fontRef, float x, float y, NSMutableArray *fontCache,
+            BOOL emojiEnabled)
 {
 
     if (CTFontGetGlyphsForCharacters(fontRef, chars, glyphs, length)) {
         // All chars were mapped to glyphs, so draw all at once and return.
-        CGFontRef cgFontRef = CTFontCopyGraphicsFont(fontRef, NULL);
-        CGContextSetFont(context, cgFontRef);
         CGContextSetTextPosition(context, x, y);
-        CGContextShowGlyphsWithAdvances(context, glyphs, advances, length);
-        CGFontRelease(cgFontRef);
+        if (emojiEnabled) {
+            length = gatherGlyphs(glyphs, length);
+            drawGlyphs(fontRef, glyphs, advances, positions, length, context);
+        } else {
+            CGFontRef cgFontRef = CTFontCopyGraphicsFont(fontRef, NULL);
+            CGContextSetFont(context, cgFontRef);
+            CGContextShowGlyphsWithAdvances(context, glyphs, advances, length);
+            CGFontRelease(cgFontRef);
+        }
         return;
     }
 
@@ -1042,25 +1100,45 @@ - (void)batchDrawData:(NSData *)data
             // Draw as many consecutive glyphs as possible in the current font
             // (if a glyph is 0 that means it does not exist in the current
             // font).
+            BOOL surrogatePair = NO;
             while (*g && g < glyphsEnd) {
-                ++g;
-                ++c;
+                if (emojiEnabled && CFStringIsSurrogateHighCharacter(*c)) {
+                    surrogatePair = YES;
+                    g += 2;
+                    c += 2;
+                } else {
+                    ++g;
+                    ++c;
+                }
                 x += a->width;
                 ++a;
             }
 
             int count = g-glyphs;
-            CGFontRef cgFontRef = CTFontCopyGraphicsFont(fontRef, NULL);
-            CGContextSetFont(context, cgFontRef);
             CGContextSetTextPosition(context, x0, y);
-            CGContextShowGlyphsWithAdvances(context, glyphs, advances, count);
-            CGFontRelease(cgFontRef);
+            if (emojiEnabled) {
+                if (surrogatePair)
+                    count = gatherGlyphs(glyphs, count);
+                drawGlyphs(fontRef,
+                    glyphs, advances, positions, count, context);
+            } else {
+                CGFontRef cgFontRef = CTFontCopyGraphicsFont(fontRef, NULL);
+                CGContextSetFont(context, cgFontRef);
+                CGContextShowGlyphsWithAdvances(
+                    context, glyphs, advances, count);
+                CGFontRelease(cgFontRef);
+            }
         } else {
             // Skip past as many consecutive chars as possible which cannot be
             // drawn in the current font.
             while (0 == *g && g < glyphsEnd) {
-                ++g;
-                ++c;
+                if (emojiEnabled && CFStringIsSurrogateHighCharacter(*c)) {
+                    g += 2;
+                    c += 2;
+                } else {
+                    ++g;
+                    ++c;
+                }
                 x += a->width;
                 ++a;
             }
@@ -1071,8 +1149,8 @@ - (void)batchDrawData:(NSData *)data
             if (!newFontRef)
                 return;
 
-            recurseDraw(chars, glyphs, advances, count, context, newFontRef,
-                        x0, y, fontCache);
+            recurseDraw(chars, glyphs, advances, positions, count, context,
+                        newFontRef, x0, y, fontCache, emojiEnabled);
 
             CFRelease(newFontRef);
         }
@@ -1160,8 +1238,10 @@ - (void)drawString:(const UniChar *)chars length:(UniCharCount)length
     if (length > maxlen) {
         if (glyphs) free(glyphs);
         if (advances) free(advances);
+        if (positions) free(positions);
         glyphs = (CGGlyph*)malloc(length*sizeof(CGGlyph));
         advances = (CGSize*)calloc(length, sizeof(CGSize));
+        positions = (CGPoint*)calloc(length, sizeof(CGPoint));
         maxlen = length;
     }
 
@@ -1191,8 +1271,8 @@ - (void)drawString:(const UniChar *)chars length:(UniCharCount)length
         }
     }
 
-    recurseDraw(chars, glyphs, advances, length, context, fontRef, x,
-                y+fontDescent, fontCache);
+    recurseDraw(chars, glyphs, advances, positions, length, context, fontRef, x,
+                y+fontDescent, fontCache, emojiEnabled);
 
     CFRelease(fontRef);
     CGContextRestoreGState(context);

src/MacVim/MMVimController.h

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

src/MacVim/MMVimController.m

@@ -221,6 +221,11 @@ - (void)setIsPreloading:(BOOL)yn
     isPreloading = yn;
 }
 
+- (BOOL)emojiEnabled
+{
+    return emojiEnabled;
+}
+
 - (BOOL)hasModifiedBuffer
 {
     return hasModifiedBuffer;
@@ -693,6 +698,7 @@ - (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];
@@ -710,6 +716,7 @@ - (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
@@ -1662,3 +1669,4 @@ - (void)beginSheetModalForWindow:(NSWindow *)window
 
     return NO;
 }
+

src/Makefile

@@ -2568,7 +2568,7 @@ objects/fold.o: fold.c
 objects/getchar.o: getchar.c
 	$(CCC) -o $@ getchar.c
 
-objects/guess.o: guess.c
+objects/guess.o: guess.c guess_tab.c
 	$(CCC) -o $@ guess.c
 
 objects/hardcopy.o: hardcopy.c

src/mbyte.c

@@ -1273,9 +1273,7 @@ utf_char2cells(c)
 	{0xfe68, 0xfe6b},
 	{0xff01, 0xff60},
 	{0xffe0, 0xffe6},
-	{0x1f200, 0x1f200},
-	{0x1f210, 0x1f231},
-	{0x1f240, 0x1f248},
+	{0x10000, 0x1fffd},
 	{0x20000, 0x2fffd},
 	{0x30000, 0x3fffd}
     };

src/option.c

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

src/option.h

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