Merge pull request #129 from macvim-dev/feature/macligatures_option

splhack · splhack · commit 837dff42cece · 2015-11-13T14:41:54.000-08:00
Add macligatures option
diff --git a/src/MacVim/English.lproj/Preferences.nib/designable.nib b/src/MacVim/English.lproj/Preferences.nib/designable.nib
diff --git a/src/MacVim/English.lproj/Preferences.nib/keyedobjects.nib b/src/MacVim/English.lproj/Preferences.nib/keyedobjects.nib
diff --git a/src/MacVim/MMAppController.m b/src/MacVim/MMAppController.m
@@ -208,7 +208,6 @@ + (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,
@@ -1227,27 +1226,6 @@ - (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=%hhd", 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/MMAtsuiTextView.h b/src/MacVim/MMAtsuiTextView.h
@@ -73,6 +73,7 @@ enum { MMMaxCellsPerChar = 2 };
 - (void)setPreEditRow:(int)row column:(int)col;
 - (void)setMouseShape:(int)shape;
 - (void)setAntialias:(BOOL)state;
+- (void)setLigatures:(BOOL)state;
 - (void)setImControl:(BOOL)enable;
 - (void)activateIm:(BOOL)enable;
 - (void)checkImState;
diff --git a/src/MacVim/MMAtsuiTextView.m b/src/MacVim/MMAtsuiTextView.m
@@ -361,6 +361,11 @@ - (void)setAntialias:(BOOL)state
     antialias = state;
 }
 
+- (void)setLigatures:(BOOL)state
+{
+    // ONLY in Core Text!
+}
+
 - (void)setImControl:(BOOL)enable
 {
     [helper setImControl:enable];
diff --git a/src/MacVim/MMBackend.h b/src/MacVim/MMBackend.h
@@ -136,6 +136,7 @@ extern NSTimeInterval MMBalloonEvalInternalDelay;
 - (void)setFullScreenBackgroundColor:(int)color;
 
 - (void)setAntialias:(BOOL)antialias;
+- (void)setLigatures:(BOOL)ligatures;
 
 #ifdef BLUR_TRANSPARENCY
 - (void)setBlurRadius:(int)radius;
diff --git a/src/MacVim/MMBackend.m b/src/MacVim/MMBackend.m
@@ -1180,6 +1180,13 @@ - (void)setAntialias:(BOOL)antialias
     [self queueMessage:msgid data:nil];
 }
 
+- (void)setLigatures:(BOOL)ligatures
+{
+    int msgid = ligatures ? EnableLigaturesMsgID : DisableLigaturesMsgID;
+
+    [self queueMessage:msgid data:nil];
+}
+
 #ifdef BLUR_TRANSPARENCY
 
 - (void)setBlurRadius:(int)radius
diff --git a/src/MacVim/MMCoreTextView.h b/src/MacVim/MMCoreTextView.h
@@ -31,7 +31,7 @@
 
     float                       fontDescent;
     BOOL                        antialias;
-    BOOL                        useLigatures;
+    BOOL                        ligatures;
     NSMutableArray              *drawData;
 
     MMTextViewHelper            *helper;
@@ -79,6 +79,7 @@
 - (void)setPreEditRow:(int)row column:(int)col;
 - (void)setMouseShape:(int)shape;
 - (void)setAntialias:(BOOL)state;
+- (void)setLigatures:(BOOL)state;
 - (void)setImControl:(BOOL)enable;
 - (void)activateIm:(BOOL)enable;
 - (void)checkImState;
diff --git a/src/MacVim/MMCoreTextView.m b/src/MacVim/MMCoreTextView.m
@@ -132,17 +132,7 @@ - (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; }
-    }
+    ligatures = NO;
     return self;
 }
 
@@ -387,6 +377,11 @@ - (void)setAntialias:(BOOL)state
     antialias = state;
 }
 
+- (void)setLigatures:(BOOL)state
+{
+    ligatures = state;
+}
+
 - (void)setImControl:(BOOL)enable
 {
     [helper setImControl:enable];
@@ -1371,7 +1366,7 @@ - (void)drawString:(const UniChar *)chars length:(UniCharCount)length
     }
 
     CGContextSetTextPosition(context, x, y+fontDescent);
-    recurseDraw(chars, glyphs, positions, length, context, fontRef, fontCache, useLigatures);
+    recurseDraw(chars, glyphs, positions, length, context, fontRef, fontCache, ligatures);
 
     CFRelease(fontRef);
     CGContextRestoreGState(context);
diff --git a/src/MacVim/MMTextView.h b/src/MacVim/MMTextView.h
@@ -20,6 +20,7 @@
     int                 insertionPointShape;
     int                 insertionPointFraction;
     BOOL                antialias;
+    BOOL                ligatures;
     NSRect              *invertRects;
     int                 numInvertRects;
 
@@ -32,6 +33,7 @@
 - (void)performBatchDrawWithData:(NSData *)data;
 - (void)setMouseShape:(int)shape;
 - (void)setAntialias:(BOOL)antialias;
+- (void)setLigatures:(BOOL)ligatures;
 - (void)setImControl:(BOOL)enable;
 - (void)activateIm:(BOOL)enable;
 - (void)checkImState;
diff --git a/src/MacVim/MMTextView.m b/src/MacVim/MMTextView.m
@@ -307,6 +307,11 @@ - (void)setAntialias:(BOOL)state
     antialias = state;
 }
 
+- (void)setLigatures:(BOOL)state
+{
+    ligatures = state;
+}
+
 - (void)setImControl:(BOOL)enable
 {
     [helper setImControl:enable];
diff --git a/src/MacVim/MMVimController.m b/src/MacVim/MMVimController.m
@@ -801,6 +801,12 @@ - (void)handleMessage:(int)msgid data:(NSData *)data
         [[[windowController vimView] textView] setAntialias:YES];
     } else if (DisableAntialiasMsgID == msgid) {
         [[[windowController vimView] textView] setAntialias:NO];
+    } else if (EnableLigaturesMsgID == msgid) {
+        [[[windowController vimView] textView] setLigatures:YES];
+        [self sendMessage:BackingPropertiesChangedMsgID data:nil];
+    } else if (DisableLigaturesMsgID == msgid) {
+        [[[windowController vimView] textView] setLigatures:NO];
+        [self sendMessage:BackingPropertiesChangedMsgID data:nil];
     } else if (SetVimStateMsgID == msgid) {
         NSDictionary *dict = [NSDictionary dictionaryWithData:data];
         if (dict) {
diff --git a/src/MacVim/MacVim.h b/src/MacVim/MacVim.h
@@ -211,6 +211,8 @@ enum {
     AddToMRUMsgID,
     BackingPropertiesChangedMsgID,
     SetBlurRadiusMsgID,
+    EnableLigaturesMsgID,
+    DisableLigaturesMsgID,
     LastMsgID   // NOTE: MUST BE LAST MESSAGE IN ENUM!
 };
 
@@ -277,7 +279,6 @@ 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
@@ -101,6 +101,8 @@
     "AddToMRUMsgID",
     "BackingPropertiesChangedMsgID",
     "SetBlurRadiusMsgID",
+    "EnableLigaturesMsgID",
+    "DisableLigaturesMsgID",
     "END OF MESSAGE IDs"     // NOTE: Must be last!
 };
 
@@ -117,7 +119,6 @@
 NSString *MMAutosaveRowsKey    = @"MMAutosaveRows";
 NSString *MMAutosaveColumnsKey = @"MMAutosaveColumns";
 NSString *MMRendererKey	       = @"MMRenderer";
-NSString *MMRendererLigaturesSupportKey = @"MMRendererLigaturesSupport";
 
 // Vim find pasteboard type (string contains Vim regex patterns)
 NSString *VimFindPboardType = @"VimFindPboardType";
diff --git a/src/MacVim/gui_macvim.m b/src/MacVim/gui_macvim.m
@@ -1783,6 +1783,11 @@
     [[MMBackend sharedInstance] setAntialias:antialias];
 }
 
+    void
+gui_macvim_set_ligatures(int ligatures)
+{
+    [[MMBackend sharedInstance] setLigatures:ligatures];
+}
 
     void
 gui_macvim_wait_for_startup()
diff --git a/src/option.c b/src/option.c
@@ -344,6 +344,7 @@ static int	p_lisp;
 static int	p_ml;
 static int	p_ma;
 #ifdef FEAT_GUI_MACVIM
+static int      p_macligatures;
 static int	p_mmta;
 #endif
 static int	p_mod;
@@ -1828,6 +1829,11 @@ static struct vimoption
     {"macatsui",    NULL,   P_BOOL|P_VI_DEF|P_RCLR,
 			    (char_u *)&p_macatsui, PV_NONE,
 			    {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
+#endif
+#ifdef FEAT_GUI_MACVIM
+    {"macligatures", NULL,  P_BOOL|P_VI_DEF,
+			    (char_u *)&p_macligatures, PV_NONE,
+			    {(char_u *)FALSE, (char_u *)0L}},
 #endif
     {"macmeta",	    "mmta", P_BOOL|P_VI_DEF,
 #ifdef FEAT_GUI_MACVIM
@@ -8189,6 +8195,13 @@ set_bool_option(opt_idx, varp, value, opt_flags)
     }
 #endif
 
+#if defined(FEAT_GUI_MACVIM)
+    else if ((int *)varp == &p_macligatures)
+    {
+        gui_macvim_set_ligatures(p_macligatures);
+    }
+#endif
+
     /* when 'textauto' is set or reset also change 'fileformats' */
     else if ((int *)varp == &p_ta)
 	set_string_option_direct((char_u *)"ffs", -1,
diff --git a/src/proto/gui_macvim.pro b/src/proto/gui_macvim.pro
@@ -207,6 +207,7 @@ void gui_mch_fuopt_update(void);
 void gui_macvim_update_modified_flag();
 void gui_macvim_add_to_find_pboard(char_u *pat);
 void gui_macvim_set_antialias(int antialias);
+void gui_macvim_set_ligatures(int ligatures);
 
 #ifdef BLUR_TRANSPARENCY
 void gui_macvim_set_blur(int blur);

Original file line number	Diff line number	Diff line change
`@@ -361,6 +361,11 @@ - (void)setAntialias:(BOOL)state`
`361`	`361`	`antialias = state;`
`362`	`362`	`}`
`363`	`363`
	`364`	`+- (void)setLigatures:(BOOL)state`
	`365`	`+{`
	`366`	`+ // ONLY in Core Text!`
	`367`	`+}`
	`368`	`+`
`364`	`369`	`- (void)setImControl:(BOOL)enable`
`365`	`370`	`{`
`366`	`371`	`[helper setImControl:enable];`