basic touchbarsupport

Author: wiomoc

runtime/menu.vim

@@ -1287,4 +1287,21 @@ if has("gui_macvim")
   macm Help.MacVim\ Website			action=openWebsite:
 endif
 
+if has("touchbar")
+  an TouchBar.Open			:browse confirm e<CR>
+  an <silent> TouchBar.Save		:if expand("%") == ""<Bar>browse confirm w<Bar>else<Bar>confirm w<Bar>endif<CR>
+  an TouchBar.SaveAll		:browse confirm wa<CR>
+
+  an TouchBar.-sep1-		<Nop>
+  an TouchBar.Undo			u
+  an TouchBar.Redo			<C-R>
+
+  an TouchBar.-sep2-		<Nop>
+  vnoremenu TouchBar.Cut		"+x
+  vnoremenu TouchBar.Copy		"+y
+  cnoremenu TouchBar.Copy		<C-Y>
+  nnoremenu TouchBar.Paste		"+gP
+  cnoremenu	TouchBar.Paste		<C-R>+
+endif
+
 " vim: set sw=2 :

src/MacVim/MMVimController.h

@@ -16,7 +16,7 @@
 
 
 @interface MMVimController : NSObject<NSToolbarDelegate,
-    NSOpenSavePanelDelegate>
+    NSOpenSavePanelDelegate, NSTouchBarDelegate>
 {
     unsigned            identifier;
     BOOL                isInitialized;
@@ -28,6 +28,11 @@
     // TODO: Move all toolbar code to window controller?
     NSToolbar           *toolbar;
     NSMutableDictionary *toolbarItemDict;
+	#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_12
+    NSTouchBar          *touchbar;
+    NSMutableDictionary *touchbarItemDict;
+    NSMutableArray      *touchbarItemOrder;
+	#endif
 
     int                 pid;
     NSString            *serverName;
@@ -65,4 +70,7 @@
 - (id)evaluateVimExpressionCocoa:(NSString *)expr
                      errorString:(NSString **)errstr;
 - (void)processInputQueue:(NSArray *)queue;
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_12
+- (NSTouchBar *)makeTouchBar;
+#endif
 @end

src/MacVim/MMVimController.m

@@ -129,7 +129,11 @@ - (id)initWithBackend:(id)backend pid:(int)processIdentifier
         [[MMWindowController alloc] initWithVimController:self];
     backendProxy = [backend retain];
     popupMenuItems = [[NSMutableArray alloc] init];
+	#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_12
     toolbarItemDict = [[NSMutableDictionary alloc] init];
+    touchbarItemDict = [[NSMutableDictionary alloc] init];
+    touchbarItemOrder = [[NSMutableArray alloc] init];
+	#endif
     pid = processIdentifier;
     creationDate = [[NSDate alloc] init];
 
@@ -178,6 +182,11 @@ - (void)dealloc
 
     [toolbarItemDict release];  toolbarItemDict = nil;
     [toolbar release];  toolbar = nil;
+	#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_12
+    [touchbarItemDict release];  touchbarItemDict = nil;
+    [touchbarItemOrder release];  touchbarItemOrder = nil;
+    [touchbar release];  touchbar = nil;
+	#endif
     [popupMenuItems release];  popupMenuItems = nil;
     [windowController release];  windowController = nil;
 
@@ -488,7 +497,25 @@ - (NSArray *)toolbarDefaultItemIdentifiers:(NSToolbar *)theToolbar
 {
     return nil;
 }
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_12
+- (NSTouchBar *)makeTouchBar
+{
+	    touchbar = [[NSTouchBar alloc] init];
+		touchbar.delegate = self;
+		touchbar.defaultItemIdentifiers = [NSArray arrayWithArray: touchbarItemOrder];
+	    return touchbar;
+}
+
+- (nullable NSTouchBarItem *)touchBar:(NSTouchBar *)touchBar makeItemForIdentifier:(NSTouchBarItemIdentifier)itemId
+{
+    NSTouchBarItem *item = [touchbarItemDict objectForKey:itemId];
+    if (!item) {
+        ASLogWarn(@"No touchbar item with id '%@'", itemId);
+    }
 
+    return item;
+}
+#endif
 @end // MMVimController
 
 
@@ -1087,7 +1114,10 @@ - (void)addMenuWithDescriptor:(NSArray *)desc atIndex:(int)idx
 
         return;
     }
-
+	#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_12
+    if ([rootName isEqual:@"TouchBar"])
+        return;
+	#endif
     // This is either a main menu item or a popup menu item.
     NSString *title = [desc lastObject];
     NSMenuItem *item = [[NSMenuItem alloc] init];
@@ -1138,7 +1168,13 @@ - (void)addMenuItemWithDescriptor:(NSArray *)desc
             [self addToolbarItemWithLabel:title tip:tip icon:icon atIndex:idx];
         return;
     }
-
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_12
+    if ([rootName isEqual:@"TouchBar"]) {
+        if (toolbar && [desc count] == 2)
+            [self addTouchbarItemWithLabel:title icon:icon atIndex:idx];
+        return;
+    }
+#endif
     NSMenu *parent = [self parentMenuForDescriptor:desc];
     if (!parent) {
         ASLogWarn(@"Menu item '%@' has no parent",
@@ -1201,7 +1237,16 @@ - (void)removeMenuItemWithDescriptor:(NSArray *)desc
         }
         return;
     }
-
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_12
+    if ([rootName isEqual:@"TouchBar"]){
+		if ([desc count] == 2) {
+		    [touchbarItemOrder removeObject:title];
+		    [touchbarItemDict removeObjectForKey:title];
+		    [windowController setTouchBar:nil];
+		}
+		return;
+	}
+#endif
     NSMenuItem *item = [self menuItemForDescriptor:desc];
     if (!item) {
         ASLogWarn(@"Failed to remove menu item, descriptor not found: %@",
@@ -1234,7 +1279,11 @@ - (void)enableMenuItemWithDescriptor:(NSArray *)desc state:(BOOL)on
             NSString *title = [desc lastObject];
             [[toolbar itemWithItemIdentifier:title] setEnabled:on];
         }
-    } else {
+    } else 
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_12
+	if (![rootName isEqual:@"TouchBar"]) 
+#endif
+	{
         // Use tag to set whether item is enabled or disabled instead of
         // calling setEnabled:.  This way the menus can autoenable themselves
         // but at the same time Vim can set if a menu is enabled whenever it
@@ -1312,7 +1361,53 @@ - (void)addToolbarItemWithLabel:(NSString *)label
 
     [toolbar insertItemWithItemIdentifier:label atIndex:idx];
 }
-
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_12
+- (void)addTouchbarItemWithLabel:(NSString *)label
+                           icon:(NSString *)icon
+                        atIndex:(int)idx
+{
+    // Check for separator items.
+    if (!label) {
+        label = NSTouchBarItemIdentifierFixedSpaceLarge;
+    } else if ([label length] >= 2 && [label hasPrefix:@"-"]
+                                   && [label hasSuffix:@"-"]) {
+        // The label begins and ends with '-'; decided which kind of separator
+        // item it is by looking at the prefix.
+        if ([label hasPrefix:@"-space"]) {
+            label = NSTouchBarItemIdentifierFixedSpaceSmall;
+        } else if ([label hasPrefix:@"-flexspace"]) {
+            label = NSTouchBarItemIdentifierFlexibleSpace;
+        } else {
+            label = NSTouchBarItemIdentifierFixedSpaceLarge;
+        }
+    } else {
+	NSButton* button = [NSButton buttonWithTitle:label target:windowController action:@selector(vimTouchbarItemAction:)];
+	NSCustomTouchBarItem *item =
+	    [[NSCustomTouchBarItem alloc] initWithIdentifier:label];
+    	NSImage *img = [NSImage imageNamed:icon];
+	
+    	if (!img) {
+        	img = [[[NSImage alloc] initByReferencingFile:icon] autorelease];
+        	if (!(img && [img isValid]))
+           		img = nil;
+    	}
+    	if (img) {
+	    [button setImage: img];
+	    //[button setImagePosition:NSImageLeft];
+	    [button setImagePosition:NSImageOnly]; 
+    	}
+	
+	[item setView:button];
+	[touchbarItemDict setObject:item forKey:label];
+    }
+	
+    int maxIdx = [touchbarItemOrder count];
+    if (maxIdx < idx) idx = maxIdx;
+    [touchbarItemOrder insertObject:label atIndex:idx];
+	
+    [windowController setTouchBar:nil];
+}
+#endif
 - (void)popupMenuWithDescriptor:(NSArray *)desc
                           atRow:(NSNumber *)row
                          column:(NSNumber *)col

src/MacVim/MMWindowController.m

@@ -909,6 +909,16 @@ - (IBAction)vimToolbarItemAction:(id)sender
     [vimController sendMessage:ExecuteMenuMsgID data:[attrs dictionaryAsData]];
 }
 
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_12
+- (IBAction)vimTouchbarItemAction:(id)sender
+{
+    NSArray *desc = [NSArray arrayWithObjects:@"TouchBar", [sender title], nil];
+    NSDictionary *attrs = [NSDictionary dictionaryWithObject:desc
+                                                      forKey:@"descriptor"];
+    [vimController sendMessage:ExecuteMenuMsgID data:[attrs dictionaryAsData]];
+}
+
+#endif
 - (IBAction)fontSizeUp:(id)sender
 {
     [[NSFontManager sharedFontManager] modifyFont:
@@ -1348,6 +1358,13 @@ - (void)runAfterWindowPresentedUsingBlock:(void (^)(void))block
     [afterWindowPresentedQueue addObject:[block copy]];
 }
 
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_12
+- (NSTouchBar *)makeTouchBar
+{
+	return [vimController makeTouchBar];
+}
+
+#endif
 @end // MMWindowController
 
 

src/evalfunc.c

@@ -6442,6 +6442,9 @@ f_has(typval_T *argvars, typval_T *rettv)
 #ifdef FEAT_TOOLBAR
 	"toolbar",
 #endif
+#ifdef FEAT_TOUCHBAR
+	"touchbar",
+#endif
 #ifdef FEAT_TRANSPARENCY
 	"transparency",
 #endif

src/feature.h

@@ -731,6 +731,10 @@
 #if defined(FEAT_TOOLBAR) && !defined(FEAT_MENU)
 # define FEAT_MENU
 #endif
+										
+#if defined(FEAT_TOOLBAR) && defined(FEAT_GUI_MACVIM) 
+# define FEAT_TOUCHBAR
+#endif
 
 /*
  * GUI tabline

src/menu.c

@@ -1835,7 +1835,11 @@ menu_is_child_of_popup(vimmenu_T *menu)
     int
 menu_is_toolbar(char_u *name)
 {
-    return (STRNCMP(name, "ToolBar", 7) == 0);
+    return (STRNCMP(name, "ToolBar", 7) == 0) 
+	#if defined(FEAT_TOUCHBAR) 
+	|| (STRNCMP(name, "TouchBar", 8) == 0)
+	#endif	
+	;
 }
 
 /*