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

Conflicts:
	src/auto/configure
	src/eval.c
	src/feature.h
	src/misc1.c
	src/normal.c

Author: splhack

src/MacVim/MMBackend.m

@@ -2100,6 +2100,8 @@ - (void)handleInputEvent:(int)msgid data:(NSData *)data
         [self setImState:YES];
     } else if (DeactivatedImMsgID == msgid) {
         [self setImState:NO];
+    } else if (BackingPropertiesChangedMsgID == msgid) {
+        [self redrawScreen];
     } else {
         ASLogWarn(@"Unknown message received (msgid=%d)", msgid);
     }

src/MacVim/MMCoreTextView.h

@@ -38,6 +38,7 @@
     unsigned                    maxlen;
     CGGlyph                     *glyphs;
     CGSize                      *advances;
+    NSMutableArray              *fontCache;
 
     // These are used in MMCoreTextView+ToolTip.m
     id trackingRectOwner_;              // (not retained)

src/MacVim/MMCoreTextView.m

@@ -125,6 +125,7 @@ - (id)initWithFrame:(NSRect)frame
     antialias = YES;
 
     drawData = [[NSMutableArray alloc] init];
+    fontCache = [[NSMutableArray alloc] init];
 
     helper = [[MMTextViewHelper alloc] init];
     [helper setTextView:self];
@@ -142,6 +143,7 @@ - (void)dealloc
     [defaultBackgroundColor release];  defaultBackgroundColor = nil;
     [defaultForegroundColor release];  defaultForegroundColor = nil;
     [drawData release];  drawData = nil;
+    [fontCache release];  fontCache = nil;
 
     [helper setTextView:nil];
     [helper release];  helper = nil;
@@ -291,6 +293,8 @@ - (void)setFont:(NSFont *)newFont
     cellSize.height = linespace + defaultLineHeightForFont(font);
 
     fontDescent = ceil(CTFontGetDescent(fontRef));
+
+    [fontCache removeAllObjects];
 }
 
 - (void)setWideFont:(NSFont *)newFont
@@ -986,15 +990,42 @@ - (void)batchDrawData:(NSData *)data
 #endif
 }
 
+   static CTFontRef
+lookupFont(NSMutableArray *fontCache, const unichar *chars,
+           CTFontRef currFontRef)
+{
+    // See if font in cache can draw at least one character
+    NSUInteger i;
+    for (i = 0; i < [fontCache count]; ++i) {
+        NSFont *font = [fontCache objectAtIndex:i];
+        CGGlyph glyphs[1];
+
+        if (CTFontGetGlyphsForCharacters((CTFontRef)font, chars, glyphs, 1))
+            return (CTFontRef)[font retain];
+    }
+
+    // Ask Core Text for a font (can be *very* slow, which is why we cache
+    // fonts in the first place)
+    CFRange r = { 0, 1 };
+    CFStringRef strRef = CFStringCreateWithCharacters(NULL, chars, 1);
+    CTFontRef newFontRef = CTFontCreateForString(currFontRef, strRef, r);
+    CFRelease(strRef);
+
+    if (newFontRef)
+        [fontCache addObject:(NSFont *)newFontRef];
+
+    return newFontRef;
+}
+
     static void
 recurseDraw(const unichar *chars, CGGlyph *glyphs, CGSize *advances,
             UniCharCount length, CGContextRef context, CTFontRef fontRef,
-            float x, float y)
+            float x, float y, NSMutableArray *fontCache)
 {
-    CGFontRef cgFontRef = CTFontCopyGraphicsFont(fontRef, NULL);
 
     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);
@@ -1019,9 +1050,11 @@ - (void)batchDrawData:(NSData *)data
             }
 
             int count = g-glyphs;
+            CGFontRef cgFontRef = CTFontCopyGraphicsFont(fontRef, NULL);
             CGContextSetFont(context, cgFontRef);
             CGContextSetTextPosition(context, x0, y);
             CGContextShowGlyphsWithAdvances(context, glyphs, advances, count);
+            CGFontRelease(cgFontRef);
         } else {
             // Skip past as many consecutive chars as possible which cannot be
             // drawn in the current font.
@@ -1034,18 +1067,12 @@ - (void)batchDrawData:(NSData *)data
 
             // Figure out which font to draw these chars with.
             UniCharCount count = c - chars;
-            CFRange r = { 0, count };
-            CFStringRef strRef = CFStringCreateWithCharactersNoCopy(
-                    NULL, chars, count, kCFAllocatorNull);
-            CTFontRef newFontRef = CTFontCreateForString(fontRef, strRef, r);
-            CFRelease(strRef);
-            if (!newFontRef) {
-                CGFontRelease(cgFontRef);
+            CTFontRef newFontRef = lookupFont(fontCache, chars, fontRef);
+            if (!newFontRef)
                 return;
-            }
 
             recurseDraw(chars, glyphs, advances, count, context, newFontRef,
-                        x0, y);
+                        x0, y, fontCache);
 
             CFRelease(newFontRef);
         }
@@ -1055,8 +1082,6 @@ - (void)batchDrawData:(NSData *)data
         advances = a;
         x0 = x;
     }
-
-    CGFontRelease(cgFontRef);
 }
 
 - (void)drawString:(const UniChar *)chars length:(UniCharCount)length
@@ -1167,7 +1192,7 @@ - (void)drawString:(const UniChar *)chars length:(UniCharCount)length
     }
 
     recurseDraw(chars, glyphs, advances, length, context, fontRef, x,
-                y+fontDescent);
+                y+fontDescent, fontCache);
 
     CFRelease(fontRef);
     CGContextRestoreGState(context);
@@ -1251,7 +1276,6 @@ - (void)drawInsertionPointAtRow:(int)row column:(int)col shape:(int)shape
 {
     CGContextRef context = [[NSGraphicsContext currentContext] graphicsPort];
     NSRect rect = [self rectForRow:row column:col numRows:1 numColumns:1];
-    CGRect clipRect = *(CGRect *)&rect;
 
     CGContextSaveGState(context);
 
@@ -1272,18 +1296,16 @@ - (void)drawInsertionPointAtRow:(int)row column:(int)col shape:(int)shape
     // over into adjacent display cells and it may look ugly.
     CGContextSetShouldAntialias(context, NO);
 
-    // Even though antialiasing is disabled and we adjust the rect to fit
-    // inside the display cell it still happens on Retina displays (only) that
-    // the cursor bleeds over into the neighboring cells.  To work around this
-    // issue we enable clipping.
-    CGContextClipToRect(context, clipRect);
-
     if (MMInsertionPointHollow == shape) {
         // When stroking a rect its size is effectively 1 pixel wider/higher
         // than we want so make it smaller to avoid having it bleed over into
         // the adjacent display cell.
+        // We also have to shift the rect by half a point otherwise it will be
+        // partially drawn outside its bounds on a Retina display.
         rect.size.width -= 1;
         rect.size.height -= 1;
+        rect.origin.x += 0.5;
+        rect.origin.y += 0.5;
 
         CGContextSetRGBStrokeColor(context, RED(color), GREEN(color),
                                    BLUE(color), ALPHA(color));

src/MacVim/MMWindowController.m

@@ -1002,6 +1002,11 @@ - (void)windowDidResize:(id)sender
     [vimView setFrameSize:[self contentSize]];
 }
 
+- (void)windowDidChangeBackingProperties:(NSNotification *)notification
+{
+    [vimController sendMessage:BackingPropertiesChangedMsgID data:nil];
+}
+
 // This is not an NSWindow delegate method, our custom MMWindow class calls it
 // instead of the usual windowWillUseStandardFrame:defaultFrame:.
 - (IBAction)zoom:(id)sender

src/MacVim/MacVim.h

@@ -194,6 +194,7 @@ enum {
     SetTooltipDelayMsgID,
     GestureMsgID,
     AddToMRUMsgID,
+    BackingPropertiesChangedMsgID,
     LastMsgID   // NOTE: MUST BE LAST MESSAGE IN ENUM!
 };
 

src/MacVim/MacVim.m

@@ -101,6 +101,7 @@
     "SetTooltipDelayMsgID",
     "GestureMsgID",
     "AddToMRUMsgID",
+    "BackingPropertiesChangedMsgID",
     "END OF MESSAGE IDs"     // NOTE: Must be last!
 };
 

src/MacVim/gui_macvim.m

@@ -961,12 +961,12 @@
 #if defined(FEAT_EVAL) || defined(PROTO)
 /*
  * Return the name of font "font" in allocated memory.
- * TODO: use 'font' instead of 'name'?
  */
     char_u *
 gui_mch_get_fontname(GuiFont font, char_u *name)
 {
-    return name ? vim_strsave(name) : NULL;
+    return font ? [(NSString *)font vimStringSave]
+                : (name ? vim_strsave(name) : NULL);
 }
 #endif
 

src/eval.c

@@ -11349,7 +11349,14 @@ f_getchar(argvars, rettv)
 	rettv->vval.v_string = vim_strsave(temp);
 
 #ifdef FEAT_MOUSE
-	if (is_mouse_key(n))
+	if (is_mouse_key(n)
+# ifdef FEAT_GUI_MACVIM
+		|| n == K_SWIPELEFT
+		|| n == K_SWIPERIGHT
+		|| n == K_SWIPEUP
+		|| n == K_SWIPEDOWN
+# endif
+	   )
 	{
 	    int		row = mouse_row;
 	    int		col = mouse_col;

src/feature.h

@@ -639,7 +639,7 @@
  * Multibyte support doesn't work on z/OS Unix currently.
  */
 #if (defined(FEAT_NORMAL) || defined(FEAT_GUI_GTK) || defined(FEAT_ARABIC) \
-        || defined(FEAT_GUI_MACVIM)) \
+	|| defined(FEAT_GUI_MACVIM)) \
 	&& !defined(FEAT_MBYTE) && !defined(WIN16) \
 	&& SIZEOF_INT >= 4 && !defined(EBCDIC)
 # define FEAT_MBYTE

src/misc1.c

@@ -3319,15 +3319,7 @@ is_mouse_key(c)
 	|| c == K_X1RELEASE
 	|| c == K_X2MOUSE
 	|| c == K_X2DRAG
-	|| c == K_X2RELEASE
-# ifdef FEAT_GUI_MACVIM
-	|| n == K_SWIPELEFT
-	|| n == K_SWIPERIGHT
-	|| n == K_SWIPEUP
-	|| n == K_SWIPEDOWN
-# endif
-	;
-
+	|| c == K_X2RELEASE;
 }
 #endif
 
@@ -3422,7 +3414,13 @@ get_keystroke()
 #ifdef FEAT_GUI
 		    || n == K_VER_SCROLLBAR
 		    || n == K_HOR_SCROLLBAR
-#endif
+# endif
+# ifdef FEAT_GUI_MACVIM
+		    || n == K_SWIPELEFT
+		    || n == K_SWIPERIGHT
+		    || n == K_SWIPEUP
+		    || n == K_SWIPEDOWN
+# endif
 	       )
 	    {
 		if (buf[1] == KS_MODIFIER)