Try to add more tab-bar support on macos

1 files changed, 316 insertions, 0 deletions

diff --git a/src/nsmenu.m b/src/nsmenu.m
index 817f8cff184..223561b9730 100644
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -993,6 +993,322 @@ ns_menu_show (struct frame *f, int x, int y, int menuflags,
 
 /* ==========================================================================
 
+    Tabbar: externally-called functions
+
+   ========================================================================== */
+
+void
+free_frame_tab_bar (struct frame *f)
+/* --------------------------------------------------------------------------
+    Under NS we just hide the tabbar until it might be needed again.
+   -------------------------------------------------------------------------- */
+{
+  EmacsView *view = FRAME_NS_VIEW (f);
+
+  NSTRACE ("free_frame_tab_bar");
+
+  block_input ();
+  view->wait_for_tab_bar = NO;
+
+  /* Note: This triggers an animation, which calls windowDidResize
+     repeatedly.  */
+  f->output_data.ns->in_animation = 1;
+  [[view tabbar] setVisible: NO];
+  f->output_data.ns->in_animation = 0;
+
+  unblock_input ();
+}
+
+void
+update_frame_tab_bar (struct frame *f)
+/* --------------------------------------------------------------------------
+    Update tabbar contents.
+   -------------------------------------------------------------------------- */
+{
+  int i, k = 0;
+  EmacsView *view = FRAME_NS_VIEW (f);
+  EmacsTabbar *tabbar = [view tabbar];
+  int oldh;
+
+  NSTRACE ("update_frame_tab_bar");
+
+  if (view == nil || tabbar == nil) return;
+  block_input ();
+
+  oldh = FRAME_TABBAR_HEIGHT (f);
+
+#ifdef NS_IMPL_COCOA
+  [tabbar clearActive];
+#else
+  [tabbar clearAll];
+#endif
+
+  /* Update EmacsTabbar as in GtkUtils, build items list.  */
+  for (i = 0; i < f->n_tab_bar_items; ++i)
+    {
+#define TABPROP(IDX) AREF (f->tab_bar_items, \
+                           i * TAB_BAR_ITEM_NSLOTS + (IDX))
+
+      BOOL enabled_p = !NILP (TABPROP (TAB_BAR_ITEM_ENABLED_P));
+      int idx;
+      ptrdiff_t img_id;
+      struct image *img;
+      Lisp_Object image;
+      Lisp_Object helpObj;
+      const char *helpText;
+
+      /* Check if this is a separator.  */
+      if (EQ (TABPROP (TAB_BAR_ITEM_TYPE), Qt))
+        {
+          /* Skip separators.  Newer macOS don't show them, and on
+             GNUstep they are wide as a button, thus overflowing the
+             tabbar most of the time.  */
+          continue;
+        }
+
+      /* If image is a vector, choose the image according to the
+         button state.  */
+      image = TABPROP (TAB_BAR_ITEM_IMAGES);
+      if (VECTORP (image))
+        {
+          /* NS tabbar auto-computes disabled and selected images.  */
+          idx = TAB_BAR_IMAGE_ENABLED_SELECTED;
+          eassert (ASIZE (image) >= idx);
+          image = AREF (image, idx);
+        }
+      else
+        {
+          idx = -1;
+        }
+      helpObj = TABPROP (TAB_BAR_ITEM_HELP);
+      if (NILP (helpObj))
+        helpObj = TABPROP (TAB_BAR_ITEM_CAPTION);
+      helpText = NILP (helpObj) ? "" : SSDATA (helpObj);
+
+      /* Ignore invalid image specifications.  */
+      if (!valid_image_p (image))
+        {
+          /* Don't log anything, GNUS makes invalid images all the time.  */
+          continue;
+        }
+
+      img_id = lookup_image (f, image);
+      img = IMAGE_FROM_ID (f, img_id);
+      prepare_image_for_display (f, img);
+
+      if (img->load_failed_p || img->pixmap == nil)
+        {
+          NSLog (@"Could not prepare tabbar image for display.");
+          continue;
+        }
+
+      [tabbar addDisplayItemWithImage: img->pixmap
+                                   idx: k++
+                                   tag: i
+                              helpText: helpText
+                               enabled: enabled_p];
+#undef TABPROP
+    }
+
+  if (![tabbar isVisible])
+    {
+      f->output_data.ns->in_animation = 1;
+      [tabbar setVisible: YES];
+      f->output_data.ns->in_animation = 0;
+    }
+
+#ifdef NS_IMPL_COCOA
+  if ([tabbar changed])
+    {
+      /* Inform app that tabbar has changed.  */
+      NSDictionary *dict = [tabbar configurationDictionary];
+      NSMutableDictionary *newDict = [dict mutableCopy];
+      NSEnumerator *keys = [[dict allKeys] objectEnumerator];
+      id key;
+      while ((key = [keys nextObject]) != nil)
+        {
+          NSObject *val = [dict objectForKey: key];
+          if ([val isKindOfClass: [NSArray class]])
+            {
+              [newDict setObject:
+                         [tabbar tabbarDefaultItemIdentifiers: tabbar]
+                          forKey: key];
+              break;
+            }
+        }
+      [tabbar setConfigurationFromDictionary: newDict];
+      [newDict release];
+    }
+#endif
+
+  if (oldh != FRAME_TABBAR_HEIGHT (f))
+    [view updateFrameSize:YES];
+  if (view->wait_for_tab_bar && FRAME_TABBAR_HEIGHT (f) > 0)
+    {
+      view->wait_for_tab_bar = NO;
+      [view setNeedsDisplay: YES];
+    }
+
+  unblock_input ();
+}
+
+
+/* ==========================================================================
+
+    Tabbar: class implementation
+
+   ========================================================================== */
+
+@implementation EmacsTabbar
+
+- (instancetype)initForView: (EmacsView *)view withIdentifier: (NSString *)identifier
+{
+  NSTRACE ("[EmacsTabbar initForView: withIdentifier:]");
+
+  self = [super initWithIdentifier: identifier];
+  emacsView = view;
+  [self setDisplayMode: NSTabbarDisplayModeIconOnly];
+  [self setSizeMode: NSTabbarSizeModeSmall];
+  [self setDelegate: self];
+  identifierToItem = [[NSMutableDictionary alloc] initWithCapacity: 10];
+  activeIdentifiers = [[NSMutableArray alloc] initWithCapacity: 8];
+  prevIdentifiers = nil;
+  prevEnablement = enablement = 0L;
+  return self;
+}
+
+- (void)dealloc
+{
+  NSTRACE ("[EmacsTabbar dealloc]");
+
+  [prevIdentifiers release];
+  [activeIdentifiers release];
+  [identifierToItem release];
+  [super dealloc];
+}
+
+- (void) clearActive
+{
+  NSTRACE ("[EmacsTabbar clearActive]");
+
+  [prevIdentifiers release];
+  prevIdentifiers = [activeIdentifiers copy];
+  [activeIdentifiers removeAllObjects];
+  prevEnablement = enablement;
+  enablement = 0L;
+}
+
+- (void) clearAll
+{
+  NSTRACE ("[EmacsTabbar clearAll]");
+
+  [self clearActive];
+  while ([[self items] count] > 0)
+    [self removeItemAtIndex: 0];
+}
+
+- (BOOL) changed
+{
+  NSTRACE ("[EmacsTabbar changed]");
+
+  return [activeIdentifiers isEqualToArray: prevIdentifiers] &&
+    enablement == prevEnablement ? NO : YES;
+}
+
+- (void) addDisplayItemWithImage: (EmacsImage *)img
+                             idx: (int)idx
+                             tag: (int)tag
+                        helpText: (const char *)help
+                         enabled: (BOOL)enabled
+{
+  NSTRACE ("[EmacsTabbar addDisplayItemWithImage: ...]");
+
+  /* 1) come up w/identifier */
+  NSString *identifier
+    = [NSString stringWithFormat: @"%lu", (unsigned long)[img hash]];
+  [activeIdentifiers addObject: identifier];
+
+  /* 2) create / reuse item */
+  NSTabbarItem *item = [identifierToItem objectForKey: identifier];
+  if (item == nil)
+    {
+      item = [[[NSTabbarItem alloc] initWithItemIdentifier: identifier]
+               autorelease];
+      [item setImage: img];
+      [item setTabTip: [NSString stringWithUTF8String: help]];
+      [item setTarget: emacsView];
+      [item setAction: @selector (tabbarClicked:)];
+      [identifierToItem setObject: item forKey: identifier];
+    }
+
+#ifdef NS_IMPL_GNUSTEP
+  [self insertItemWithItemIdentifier: identifier atIndex: idx];
+#endif
+
+  [item setTag: tag];
+  [item setEnabled: enabled];
+
+  /* 3) update state */
+  enablement = (enablement << 1) | (enabled == YES);
+}
+
+/* This overrides super's implementation, which automatically sets
+   all items to enabled state (for some reason).  */
+- (void)validateVisibleItems
+{
+  NSTRACE ("[EmacsTabbar validateVisibleItems]");
+}
+
+
+/* delegate methods */
+
+- (NSTabbarItem *)tabbar: (NSTabbar *)tabbar
+      itemForItemIdentifier: (NSString *)itemIdentifier
+  willBeInsertedIntoTabbar: (BOOL)flag
+{
+  NSTRACE ("[EmacsTabbar tabbar: ...]");
+
+  /* Look up NSTabbarItem by identifier and return...  */
+  return [identifierToItem objectForKey: itemIdentifier];
+}
+
+- (NSArray *)tabbarDefaultItemIdentifiers: (NSTabbar *)tabbar
+{
+  NSTRACE ("[EmacsTabbar tabbarDefaultItemIdentifiers:]");
+
+  /* Return entire set.  */
+  return activeIdentifiers;
+}
+
+/* for configuration palette (not yet supported) */
+- (NSArray *)tabbarAllowedItemIdentifiers: (NSTabbar *)tabbar
+{
+  NSTRACE ("[EmacsTabbar tabbarAllowedItemIdentifiers:]");
+
+  /* return entire set...  */
+  return activeIdentifiers;
+  //return [identifierToItem allKeys];
+}
+
+- (void)setVisible:(BOOL)shown
+{
+  NSTRACE ("[EmacsTabbar setVisible:%d]", shown);
+
+  [super setVisible:shown];
+}
+
+
+/* optional and unneeded */
+/* - tabbarWillAddItem: (NSNotification *)notification { } */
+/* - tabbarDidRemoveItem: (NSNotification *)notification { } */
+/* - (NSArray *)tabbarSelectableItemIdentifiers: (NSTabbar *)tabbar */
+
+@end  /* EmacsTabbar */
+
+
+
+/* ==========================================================================
+
     Toolbar: externally-called functions
 
    ========================================================================== */