Merge pull request #321 from tkonolige/master

splhack · web-flow · commit 6959bce946f1 · 2017-03-23T10:20:08.000-07:00
Added columnspace
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
@@ -1700,6 +1700,16 @@ A jump table for the options with a short description can be found at |Q_op|.
 		:set columns=9999
 <	Minimum value is 12, maximum value is 10000.
 
+						*'columnspace'* *'csp'*
+'columnspace' 'csp'	number	(default 0)
+			global
+			{not in Vi}
+			{only in the MacVim GUI}
+	Number of pixel columns inserted between characters.  With some fonts
+  there can be too much room between characters.  Then it makes sense
+  to set 'columnspace' to a negative value.  This may cause display
+  problems though!
+
 					*'comments'* *'com'* *E524* *E525*
 'comments' 'com'	string	(default
 				"s1:/*,mb:*,ex:*/,://,b:#,:%,:XCOMM,n:>,fb:-")
diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt
@@ -645,6 +645,7 @@ Short explanation of each option:		*option-list*
 'cmdwinheight'	  'cwh'     height of the command-line window
 'colorcolumn'	  'cc'	    columns to highlight
 'columns'	  'co'	    number of columns in the display
+'columnspace'	  'csp'     number of pixel columns to use between characters
 'comments'	  'com'     patterns that can start a comment line
 'commentstring'   'cms'     template for comments; used for fold marker
 'compatible'	  'cp'	    behave Vi-compatible as much as possible
diff --git a/runtime/optwin.vim b/runtime/optwin.vim
@@ -638,6 +638,8 @@ if has("gui")
   endif
   call append("$", "linespace\tnumber of pixel lines to use between characters")
   call append("$", " \tset lsp=" . &lsp)
+  call append("$", "columnspace\tnumber of pixel columns to use between characters")
+  call append("$", " \tset csp=" . &csp)
   if has("balloon_eval")
     call append("$", "balloondelay\tdelay in milliseconds before a balloon may pop up")
     call append("$", " \tset bdlay=" . &bdlay)
diff --git a/src/MacVim/MMBackend.h b/src/MacVim/MMBackend.h
@@ -123,6 +123,7 @@ extern NSTimeInterval MMBalloonEvalInternalDelay;
 - (void)startBlink;
 - (void)stopBlink;
 - (void)adjustLinespace:(int)linespace;
+- (void)adjustColumnspace:(int)columnspace;
 - (void)activate;
 - (void)setPreEditRow:(int)row column:(int)col;
 
diff --git a/src/MacVim/MMBackend.m b/src/MacVim/MMBackend.m
@@ -1095,6 +1095,13 @@ - (void)adjustLinespace:(int)linespace
     [self queueMessage:AdjustLinespaceMsgID data:data];
 }
 
+- (void)adjustColumnspace:(int)columnspace
+{
+    NSMutableData *data = [NSMutableData data];
+    [data appendBytes:&columnspace length:sizeof(int)];
+    [self queueMessage:AdjustColumnspaceMsgID data:data];
+}
+
 - (void)activate
 {
     [self queueMessage:ActivateMsgID data:nil];
diff --git a/src/MacVim/MMCoreTextView.h b/src/MacVim/MMCoreTextView.h
@@ -22,6 +22,7 @@
     NSFont                      *font;
     NSFont                      *fontWide;
     float                       linespace;
+    float                       columnspace;
 
     // From NSTextView
     NSSize                      insetSize;
diff --git a/src/MacVim/MMCoreTextView.m b/src/MacVim/MMCoreTextView.m
@@ -311,7 +311,7 @@ - (void)setFont:(NSFont *)newFont
     // only render at integer sizes.  Hence, we restrict the cell width to
     // an integer here, otherwise the window width and the actual text
     // width will not match.
-    cellSize.width = ceil(em * cellWidthMultiplier);
+    cellSize.width = columnspace + ceil(em * cellWidthMultiplier);
     cellSize.height = linespace + defaultLineHeightForFont(font);
 
     fontDescent = ceil(CTFontGetDescent(fontRef));
@@ -372,6 +372,17 @@ - (void)setLinespace:(float)newLinespace
     cellSize.height = linespace + defaultLineHeightForFont(font);
 }
 
+- (void)setColumnspace:(float)newColumnspace
+{
+    columnspace = newColumnspace;
+
+    double em = round(defaultAdvanceForFont(font));
+    float cellWidthMultiplier = [[NSUserDefaults standardUserDefaults]
+            floatForKey:MMCellWidthMultiplierKey];
+
+    cellSize.width = columnspace + ceil(em * cellWidthMultiplier);
+}
+
 
 
 
diff --git a/src/MacVim/MMTextStorage.h b/src/MacVim/MMTextStorage.h
@@ -41,6 +41,7 @@ typedef struct {
     NSColor                     *defaultForegroundColor;
     NSSize                      cellSize;
     float                       linespace;
+    float                       columnspace;
 #if MM_USE_ROW_CACHE
     MMRowCacheEntry             *rowCache;
 #endif
@@ -59,7 +60,9 @@ typedef struct {
 - (int)actualRows;
 - (int)actualColumns;
 - (float)linespace;
+- (float)columnspace;
 - (void)setLinespace:(float)newLinespace;
+- (void)setColumnspace:(float)newColumnspace;
 - (void)getMaxRows:(int*)rows columns:(int*)cols;
 - (void)setMaxRows:(int)rows columns:(int)cols;
 - (void)drawString:(NSString *)string atRow:(int)row column:(int)col
diff --git a/src/MacVim/MMTextStorage.m b/src/MacVim/MMTextStorage.m
@@ -202,6 +202,11 @@ - (float)linespace
     return linespace;
 }
 
+- (float)columnspace
+{
+    return columnspace;
+}
+
 - (void)setLinespace:(float)newLinespace
 {
     NSLayoutManager *lm = [[self layoutManagers] objectAtIndex:0];
@@ -221,6 +226,25 @@ - (void)setLinespace:(float)newLinespace
     cellSize.height = linespace + [lm defaultLineHeightForFont:font];
 }
 
+- (void)setColumnspace:(float)newColumnspace
+{
+    NSLayoutManager *lm = [[self layoutManagers] objectAtIndex:0];
+    if (!lm) {
+        ASLogWarn(@"No layout manager available");
+        return;
+    }
+
+    columnspace = newColumnspace;
+
+    float em = [@"m" sizeWithAttributes:
+            [NSDictionary dictionaryWithObject:font
+                                        forKey:NSFontAttributeName]].width;
+    float cellWidthMultiplier = [[NSUserDefaults standardUserDefaults]
+            floatForKey:MMCellWidthMultiplierKey];
+
+    cellSize.width = columnspace + ceilf(em * cellWidthMultiplier);
+}
+
 - (void)getMaxRows:(int*)rows columns:(int*)cols
 {
     if (rows) *rows = maxRows;
@@ -662,6 +686,7 @@ - (void)setFont:(NSFont*)newFont
         NSLayoutManager *lm = [[self layoutManagers] objectAtIndex:0];
         if (lm) {
             cellSize.height = linespace + [lm defaultLineHeightForFont:font];
+            cellSize.width = columnspace + ceilf(em * cellWidthMultiplier);
         } else {
             // Should never happen, set some bogus value for cell height.
             ASLogWarn(@"No layout manager available");
diff --git a/src/MacVim/MMTextView.h b/src/MacVim/MMTextView.h
@@ -49,6 +49,7 @@
 - (void)setWideFont:(NSFont *)newFont;
 - (NSSize)cellSize;
 - (void)setLinespace:(float)newLinespace;
+- (void)setColumnspace:(float)newColumnspace;
 - (int)maxRows;
 - (int)maxColumns;
 - (void)getMaxRows:(int*)rows columns:(int*)cols;
diff --git a/src/MacVim/MMTextView.m b/src/MacVim/MMTextView.m
@@ -362,6 +362,11 @@ - (void)setLinespace:(float)newLinespace
     return [(MMTextStorage*)[self textStorage] setLinespace:newLinespace];
 }
 
+- (void)setColumnspace:(float)newColumnspace
+{
+    return [(MMTextStorage*)[self textStorage] setColumnspace:newColumnspace];
+}
+
 - (int)maxRows
 {
     MMTextStorage *ts = (MMTextStorage *)[self textStorage];
diff --git a/src/MacVim/MMVimController.m b/src/MacVim/MMVimController.m
@@ -762,6 +762,11 @@ - (void)handleMessage:(int)msgid data:(NSData *)data
         int linespace = *((int*)bytes);
 
         [windowController adjustLinespace:linespace];
+    } else if (AdjustColumnspaceMsgID == msgid) {
+        const void *bytes = [data bytes];
+        int columnspace = *((int*)bytes);
+
+        [windowController adjustColumnspace:columnspace];
     } else if (ActivateMsgID == msgid) {
         [NSApp activateIgnoringOtherApps:YES];
         [[windowController window] makeKeyAndOrderFront:self];
diff --git a/src/MacVim/MMWindowController.h b/src/MacVim/MMWindowController.h
@@ -77,6 +77,7 @@
 - (void)showToolbar:(BOOL)on size:(int)size mode:(int)mode;
 - (void)setMouseShape:(int)shape;
 - (void)adjustLinespace:(int)linespace;
+- (void)adjustColumnspace:(int)columnspace;
 - (void)liveResizeWillStart;
 - (void)liveResizeDidEnd;
 
diff --git a/src/MacVim/MMWindowController.m b/src/MacVim/MMWindowController.m
@@ -660,6 +660,14 @@ - (void)adjustLinespace:(int)linespace
     }
 }
 
+- (void)adjustColumnspace:(int)columnspace
+{
+    if (vimView && [vimView textView]) {
+        [[vimView textView] setColumnspace:(float)columnspace];
+        shouldMaximizeWindow = shouldResizeVimView = YES;
+    }
+}
+
 - (void)liveResizeWillStart
 {
     if (!setupDone) return;
diff --git a/src/MacVim/MacVim.h b/src/MacVim/MacVim.h
@@ -210,6 +210,7 @@ enum {
     MouseMovedMsgID,
     SetMouseShapeMsgID,
     AdjustLinespaceMsgID,
+    AdjustColumnspaceMsgID,
     ActivateMsgID,
     SetServerNameMsgID,
     EnterFullScreenMsgID,
diff --git a/src/MacVim/MacVim.m b/src/MacVim/MacVim.m
@@ -64,6 +64,7 @@
     "MouseMovedMsgID",
     "SetMouseShapeMsgID",
     "AdjustLinespaceMsgID",
+    "AdjustColumnspaceMsgID",
     "ActivateMsgID",
     "SetServerNameMsgID",
     "EnterFullScreenMsgID",
diff --git a/src/MacVim/gui_macvim.m b/src/MacVim/gui_macvim.m
@@ -252,6 +252,7 @@
     // Ensure 'linespace' option is passed along to MacVim in case it was set
     // in [g]vimrc.
     gui_mch_adjust_charheight();
+    gui_mch_adjust_charwidth();
 
     if (!MMNoMRU && GARGCOUNT > 0) {
         // Add files passed on command line to MRU.
@@ -1405,6 +1406,17 @@
 }
 
 
+/*
+ * Adjust gui.char_width (after 'columnspace' was changed).
+ */
+    int
+gui_mch_adjust_charwidth(void)
+{
+    [[MMBackend sharedInstance] adjustColumnspace:p_columnspace];
+    return OK;
+}
+
+
     void
 gui_mch_beep(void)
 {
diff --git a/src/gui_mac.c b/src/gui_mac.c
@@ -3509,7 +3509,7 @@ gui_mch_init_font(char_u *font_name, int fontset)
     GetFontInfo(&font_info);
 
     gui.char_ascent = font_info.ascent;
-    gui.char_width  = CharWidth('_');
+    gui.char_width  = p_columnspace + CharWidth('_');
     gui.char_height = font_info.ascent + font_info.descent + p_linespace;
 
 #ifdef USE_ATSUI_DRAWING
@@ -3534,6 +3534,16 @@ gui_mch_adjust_charheight(void)
     return OK;
 }
 
+/*
+ * Adjust gui.char_width (after 'columnspace' was changed).
+ */
+    int
+gui_mch_adjust_charwidth(void)
+{
+    gui.char_width  = p_columnspace + CharWidth('_');
+    return OK;
+}
+
 /*
  * Get a font structure for highlighting.
  */
diff --git a/src/option.c b/src/option.c
@@ -855,6 +855,13 @@ static struct vimoption options[] =
     {"columns",	    "co",   P_NUM|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RCLR,
 			    (char_u *)&Columns, PV_NONE,
 			    {(char_u *)80L, (char_u *)0L} SCRIPTID_INIT},
+    {"columnspace",   "csp",  P_NUM|P_VI_DEF|P_RCLR,
+#ifdef FEAT_GUI
+			    (char_u *)&p_columnspace, PV_NONE,
+#else
+			    (char_u *)NULL, PV_NONE,
+#endif
+			    {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
     {"comments",    "com",  P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA
 							  |P_NODUP|P_CURSWANT,
 #ifdef FEAT_COMMENTS
@@ -8985,6 +8992,16 @@ set_num_option(
     }
 #endif
 
+#ifdef FEAT_GUI
+    else if (pp == &p_columnspace)
+    {
+	/* Recompute gui.char_width and resize the Vim window to keep the
+	 * same number of columns. */
+	if (gui.in_use && gui_mch_adjust_charwidth() == OK)
+	    gui_set_shellsize(FALSE, FALSE, RESIZE_HOR);
+    }
+#endif
+
 #ifdef FEAT_FOLDING
     /* 'foldlevel' */
     else if (pp == &curwin->w_p_fdl)
diff --git a/src/option.h b/src/option.h
@@ -623,6 +623,7 @@ EXTERN char_u	*p_lm;		/* 'langmenu' */
 #endif
 #ifdef FEAT_GUI
 EXTERN long	p_linespace;	/* 'linespace' */
+EXTERN long	p_columnspace;	/* 'columnspace' */
 #endif
 #ifdef FEAT_LISP
 EXTERN char_u	*p_lispwords;	/* 'lispwords' */
diff --git a/src/proto/gui_macvim.pro b/src/proto/gui_macvim.pro
@@ -82,6 +82,8 @@ gui_mch_init_font(char_u *font_name, int fontset);
 gui_mch_set_font(GuiFont font);
     int
 gui_mch_adjust_charheight(void);
+    int
+gui_mch_adjust_charwidth(void);
     void
 gui_mch_beep(void);
     char_u *

Original file line number	Diff line number	Diff line change
`@@ -1095,6 +1095,13 @@ - (void)adjustLinespace:(int)linespace`
`1095`	`1095`	`[self queueMessage:AdjustLinespaceMsgID data:data];`
`1096`	`1096`	`}`
`1097`	`1097`
	`1098`	`+- (void)adjustColumnspace:(int)columnspace`
	`1099`	`+{`
	`1100`	`+ NSMutableData *data = [NSMutableData data];`
	`1101`	`+ [data appendBytes:&columnspace length:sizeof(int)];`
	`1102`	`+ [self queueMessage:AdjustColumnspaceMsgID data:data];`
	`1103`	`+}`
	`1104`	`+`
`1098`	`1105`	`- (void)activate`
`1099`	`1106`	`{`
`1100`	`1107`	`[self queueMessage:ActivateMsgID data:nil];`