Merge branch 'master' of git://github.com/b4winckler/macvim

Conflicts:
	src/MacVim/Info.plist
	src/MacVim/MMCoreTextView.h
	src/MacVim/MMCoreTextView.m
	src/MacVim/gui_macvim.m
	src/auto/configure
	src/os_mac.h

Author: splhack

src/MacVim/Info.plist

@@ -1232,7 +1232,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>20131023</string>
+	<string>20131125</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>

src/MacVim/MMCoreTextView.m

@@ -149,7 +149,6 @@ - (void)dealloc
     [helper release];  helper = nil;
 
     if (glyphs) { free(glyphs); glyphs = NULL; }
-    if (advances) { free(advances); advances = NULL; }
     if (positions) { free(positions); positions = NULL; }
 
     [super dealloc];
@@ -1054,47 +1053,29 @@ - (void)batchDrawData:(NSData *)data
 }
 
     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,
-            CGPoint *positions, UniCharCount length, CGContextRef context,
-            CTFontRef fontRef, float x, float y, NSMutableArray *fontCache,
-            BOOL emojiEnabled)
+recurseDraw(const unichar *chars, CGGlyph *glyphs, CGPoint *positions,
+            UniCharCount length, CGContextRef context, CTFontRef fontRef,
+            NSMutableArray *fontCache, BOOL emojiEnabled)
 {
 
     if (CTFontGetGlyphsForCharacters(fontRef, chars, glyphs, length)) {
         // All chars were mapped to glyphs, so draw all at once and return.
         CGContextSetTextPosition(context, x, y);
         if (emojiEnabled) {
             length = gatherGlyphs(glyphs, length);
-            drawGlyphs(fontRef, glyphs, advances, positions, length, context);
+            CTFontDrawGlyphs(fontRef, glyphs, positions, length, context);
         } else {
             CGFontRef cgFontRef = CTFontCopyGraphicsFont(fontRef, NULL);
             CGContextSetFont(context, cgFontRef);
-            CGContextShowGlyphsWithAdvances(context, glyphs, advances, length);
+            CGContextShowGlyphsAtPositions(context, glyphs, positions, length);
             CGFontRelease(cgFontRef);
         }
         return;
     }
 
     CGGlyph *glyphsEnd = glyphs+length, *g = glyphs;
-    CGSize *a = advances;
+    CGPoint *p = positions;
     const unichar *c = chars;
-    float x0 = x;
     while (glyphs < glyphsEnd) {
         if (*g) {
             // Draw as many consecutive glyphs as possible in the current font
@@ -1106,26 +1087,25 @@ - (void)batchDrawData:(NSData *)data
                     surrogatePair = YES;
                     g += 2;
                     c += 2;
+                    p += 2;
                 } else {
                     ++g;
                     ++c;
+                    ++p;
                 }
-                x += a->width;
-                ++a;
             }
 
             int count = g-glyphs;
             CGContextSetTextPosition(context, x0, y);
             if (emojiEnabled) {
                 if (surrogatePair)
                     count = gatherGlyphs(glyphs, count);
-                drawGlyphs(fontRef,
-                    glyphs, advances, positions, count, context);
+                CTFontDrawGlyphs(fontRef, glyphs, positions, count, context);
             } else {
                 CGFontRef cgFontRef = CTFontCopyGraphicsFont(fontRef, NULL);
                 CGContextSetFont(context, cgFontRef);
-                CGContextShowGlyphsWithAdvances(
-                    context, glyphs, advances, count);
+                CGContextShowGlyphsAtPositions(context, glyphs, positions,
+                                               count);
                 CGFontRelease(cgFontRef);
             }
         } else {
@@ -1135,12 +1115,12 @@ - (void)batchDrawData:(NSData *)data
                 if (emojiEnabled && CFStringIsSurrogateHighCharacter(*c)) {
                     g += 2;
                     c += 2;
+                    p += 2;
                 } else {
                     ++g;
                     ++c;
+                    ++p;
                 }
-                x += a->width;
-                ++a;
             }
 
             // Figure out which font to draw these chars with.
@@ -1149,16 +1129,15 @@ - (void)batchDrawData:(NSData *)data
             if (!newFontRef)
                 return;
 
-            recurseDraw(chars, glyphs, advances, positions, count, context,
-                        newFontRef, x0, y, fontCache, emojiEnabled);
+            recurseDraw(chars, glyphs, positions, count, context, newFontRef,
+                        fontCache, emojiEnabled);
 
             CFRelease(newFontRef);
         }
 
         chars = c;
         glyphs = g;
-        advances = a;
-        x0 = x;
+        positions = p;
     }
 }
 
@@ -1237,10 +1216,8 @@ - (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;
     }
@@ -1250,9 +1227,13 @@ - (void)drawString:(const UniChar *)chars length:(UniCharCount)length
     CGContextSetRGBFillColor(context, RED(fg), GREEN(fg), BLUE(fg), ALPHA(fg));
     CGContextSetFontSize(context, [font pointSize]);
 
+    // Calculate position of each glyph relative to (x,y).
     NSUInteger i;
-    for (i = 0; i < length; ++i)
-        advances[i].width = w;
+    float xrel = 0;
+    for (i = 0; i < length; ++i) {
+        positions[i].x = xrel;
+        xrel += w;
+    }
 
     CTFontRef fontRef = (CTFontRef)(flags & DRAW_WIDE ? [fontWide retain]
                                                       : [font retain]);
@@ -1271,7 +1252,8 @@ - (void)drawString:(const UniChar *)chars length:(UniCharCount)length
         }
     }
 
-    recurseDraw(chars, glyphs, advances, positions, length, context, fontRef, x,
+    CGContextSetTextPosition(context, x, y+fontDescent);
+    recurseDraw(chars, glyphs, positions, length, context, fontRef, fontCache,
                 y+fontDescent, fontCache, (flags & DRAW_WIDE) && emojiEnabled);
 
     CFRelease(fontRef);

src/MacVim/MacVim.xcodeproj/project.pbxproj

@@ -736,7 +736,7 @@
 			buildSettings = {
 				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 71;
+				CURRENT_PROJECT_VERSION = 72;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
@@ -769,7 +769,7 @@
 			buildSettings = {
 				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 71;
+				CURRENT_PROJECT_VERSION = 72;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",

src/MacVim/gui_macvim.m

@@ -1825,12 +1825,21 @@ void gui_macvim_get_window_layout(int *count, int *layout)
     }
 }
 
+void *gui_macvim_new_autoreleasepool()
+{
+    return (void *)[[NSAutoreleasePool alloc] init];
+}
+
+void gui_macvim_release_autoreleasepool(void *pool)
+{
+    [(id)pool release];
+}
+
 void gui_macvim_set_proportional_font(int proportional_font)
 {
     [[MMBackend sharedInstance] setProportionalFont:proportional_font];
 }
 
-
 // -- Client/Server ---------------------------------------------------------
 
 #ifdef MAC_CLIENTSERVER

src/main.c

@@ -23,10 +23,6 @@
 # include <limits.h>
 #endif
 
-#ifdef FEAT_GUI_MACVIM
-#include <objc/objc-runtime.h>  /* for objc_*() and sel_*() */
-#endif
-
 /* Maximum number of commands from + or -c arguments. */
 #define MAX_ARG_CMDS 10
 
@@ -180,9 +176,7 @@ main
     // Cocoa needs an NSAutoreleasePool in place or it will leak memory.
     // This particular pool will hold autorelease objects created during
     // initialization.
-    id autoreleasePool = objc_msgSend(objc_msgSend(
-            objc_getClass("NSAutoreleasePool"),sel_getUid("alloc")
-            ), sel_getUid("init"));
+    void *autoreleasePool = gui_macvim_new_autoreleasepool();
 #endif
 
     /*
@@ -1066,13 +1060,11 @@ vim_main2(int argc UNUSED, char **argv UNUSED)
 #ifdef FEAT_GUI_MACVIM
     // The autorelease pool might have filled up quite a bit during
     // initialization, so purge it before entering the main loop.
-    objc_msgSend(autoreleasePool, sel_getUid("release"));
+    gui_macvim_release_autoreleasepool(autoreleasePool);
 
     // The main loop sets up its own autorelease pool, but to be safe we still
     // realloc this one here.
-    autoreleasePool = objc_msgSend(objc_msgSend(
-            objc_getClass("NSAutoreleasePool"),sel_getUid("alloc")
-            ), sel_getUid("init"));
+    autoreleasePool = gui_macvim_new_autoreleasepool();
 #endif
 
     /*
@@ -1081,7 +1073,7 @@ vim_main2(int argc UNUSED, char **argv UNUSED)
     main_loop(FALSE, FALSE);
 
 #ifdef FEAT_GUI_MACVIM
-    objc_msgSend(autoreleasePool, sel_getUid("release"));
+    gui_macvim_release_autoreleasepool(autoreleasePool);
 #endif
 
     return 0;
@@ -1152,9 +1144,7 @@ main_loop(cmdwin, noexmode)
 #ifdef FEAT_GUI_MACVIM
         // Cocoa needs an NSAutoreleasePool in place or it will leak memory.
         // This particular pool gets released once every loop.
-        id autoreleasePool = objc_msgSend(objc_msgSend(
-                objc_getClass("NSAutoreleasePool"),sel_getUid("alloc")
-                ), sel_getUid("init"));
+        void *autoreleasePool = gui_macvim_new_autoreleasepool();
 #endif
 
 	if (stuff_empty())
@@ -1404,7 +1394,7 @@ main_loop(cmdwin, noexmode)
 #ifdef FEAT_GUI_MACVIM
         // TODO! Make sure there are no continue statements that will cause
         // this not to be called or MacVim will leak memory!
-        objc_msgSend(autoreleasePool, sel_getUid("release"));
+        gui_macvim_release_autoreleasepool(autoreleasePool);
 #endif
     }
 }

src/os_unix.h

@@ -563,7 +563,9 @@ int mch_rename __ARGS((const char *src, const char *dest));
 # endif
 #endif
 
-#define HAVE_DUP		/* have dup() */
+#ifndef HAVE_DUP
+# define HAVE_DUP		/* have dup() */
+#endif
 #define HAVE_ST_MODE		/* have stat.st_mode */
 
 /* We have three kinds of ACL support. */

src/proto/gui_macvim.pro

@@ -247,3 +247,6 @@ gui_mch_register_sign(char_u *signfile);
 
     void
 gui_mch_destroy_sign(void *sign);
+
+void *gui_macvim_new_autoreleasepool();
+void gui_macvim_release_autoreleasepool(void *pool);