v2.0.0-alpha.47

v2/cmd/wails/version.go

@@ -1,3 +1,3 @@
 package main
 
-var version = "v2.0.0-alpha.42"
+var version = "v2.0.0-alpha.47"

v2/internal/ffenestri/ffenestri_darwin.c

@@ -24,6 +24,8 @@ struct hashmap_s dialogIconCache;
 // Dispatch Method
 typedef void (^dispatchMethod)(void);
 
+TrayMenuStore *TrayMenuStoreSingleton;
+
 // dispatch will execute the given `func` pointer
 void dispatch(dispatchMethod func) {
 	dispatch_async(dispatch_get_main_queue(), func);
@@ -55,6 +57,9 @@ void filelog(const char *message) {
     }
 }
 
+// The delegate class for tray menus
+Class trayMenuDelegateClass;
+
 // Utility function to visualise a hashmap
 void dumpHashmap(const char *name, struct hashmap_s *hashmap) {
   printf("%s = { ", name);
@@ -127,9 +132,6 @@ struct Application {
 	// Menu
 	Menu *applicationMenu;
 
-	// Tray
-    TrayMenuStore* trayMenuStore;
-
 	// Context Menus
 	ContextMenuStore *contextMenuStore;
 
@@ -477,7 +479,7 @@ void DestroyApplication(struct Application *app) {
 	}
 
     // Delete the tray menu store
-    DeleteTrayMenuStore(app->trayMenuStore);
+    DeleteTrayMenuStore(TrayMenuStoreSingleton);
 
     // Delete the context menu store
     DeleteContextMenuStore(app->contextMenuStore);
@@ -1044,7 +1046,7 @@ void AddTrayMenu(struct Application *app, const char *trayMenuJSON) {
     // Guard against calling during shutdown
     if( app->shuttingDown ) return;
 
-	AddTrayMenuToStore(app->trayMenuStore, trayMenuJSON);
+	AddTrayMenuToStore(TrayMenuStoreSingleton, trayMenuJSON);
 }
 
 void SetTrayMenu(struct Application *app, const char* trayMenuJSON) {
@@ -1053,13 +1055,13 @@ void SetTrayMenu(struct Application *app, const char* trayMenuJSON) {
     if( app->shuttingDown ) return;
 
     ON_MAIN_THREAD(
-        UpdateTrayMenuInStore(app->trayMenuStore, trayMenuJSON);
+        UpdateTrayMenuInStore(TrayMenuStoreSingleton, trayMenuJSON);
     );
 }
 
 void DeleteTrayMenuByID(struct Application *app, const char *id) {
     ON_MAIN_THREAD(
-        DeleteTrayMenuInStore(app->trayMenuStore, id);
+        DeleteTrayMenuInStore(TrayMenuStoreSingleton, id);
     );
 }
 
@@ -1068,7 +1070,7 @@ void UpdateTrayMenuLabel(struct Application* app, const char* JSON) {
     if( app->shuttingDown ) return;
 
     ON_MAIN_THREAD(
-        UpdateTrayMenuLabelInStore(app->trayMenuStore, JSON);
+        UpdateTrayMenuLabelInStore(TrayMenuStoreSingleton, JSON);
     );
 }
 
@@ -1164,7 +1166,7 @@ void getURL(id self, SEL selector, id event, id replyEvent) {
 
 
 void createDelegate(struct Application *app) {
-		// Define delegate
+    // Define delegate
 	Class delegateClass = objc_allocateClassPair((Class) c("NSObject"), "AppDelegate", 0);
 	bool resultAddProtoc = class_addProtocol(delegateClass, objc_getProtocol("NSApplicationDelegate"));
     class_addMethod(delegateClass, s("applicationShouldTerminateAfterLastWindowClosed:"), (IMP) no, "c@:@");
@@ -1661,6 +1663,35 @@ void processUserDialogIcons(struct Application *app) {
 
 }
 
+void TrayMenuWillOpen(id self, SEL selector, id menu) {
+    // Extract tray menu id from menu
+    id trayMenuIDStr = objc_getAssociatedObject(menu, "trayMenuID");
+    const char* trayMenuID = cstr(trayMenuIDStr);
+    const char *message = concat("Mo", trayMenuID);
+    messageFromWindowCallback(message);
+    MEMFREE(message);
+}
+
+void TrayMenuDidClose(id self, SEL selector, id menu) {
+    // Extract tray menu id from menu
+    id trayMenuIDStr = objc_getAssociatedObject(menu, "trayMenuID");
+    const char* trayMenuID = cstr(trayMenuIDStr);
+    const char *message = concat("Mc", trayMenuID);
+    messageFromWindowCallback(message);
+    MEMFREE(message);
+}
+
+void createTrayMenuDelegate() {
+    // Define delegate
+	trayMenuDelegateClass = objc_allocateClassPair((Class) c("NSObject"), "MenuDelegate", 0);
+	class_addProtocol(trayMenuDelegateClass, objc_getProtocol("NSMenuDelegate"));
+    class_addMethod(trayMenuDelegateClass, s("menuWillOpen:"), (IMP) TrayMenuWillOpen, "v@:@");
+	class_addMethod(trayMenuDelegateClass, s("menuDidClose:"), (IMP) TrayMenuDidClose, "v@:@");
+
+	// Script handler
+	objc_registerClassPair(trayMenuDelegateClass);
+}
+
 
 void Run(struct Application *app, int argc, char **argv) {
 
@@ -1673,6 +1704,9 @@ void Run(struct Application *app, int argc, char **argv) {
 	// Define delegate
 	createDelegate(app);
 
+	// Define tray delegate
+	createTrayMenuDelegate();
+
 	// Create the main window
 	createMainWindow(app);
 
@@ -1843,7 +1877,7 @@ void Run(struct Application *app, int argc, char **argv) {
 	}
 
 	// Setup initial trays
-    ShowTrayMenusInStore(app->trayMenuStore);
+    ShowTrayMenusInStore(TrayMenuStoreSingleton);
 
 	// Process dialog icons
 	processUserDialogIcons(app);
@@ -1920,7 +1954,7 @@ void* NewApplication(const char *title, int width, int height, int resizable, in
 	result->applicationMenu = NULL;
 
 	// Tray
-	result->trayMenuStore = NewTrayMenuStore();
+	TrayMenuStoreSingleton = NewTrayMenuStore();
 
 	// Context Menus
 	result->contextMenuStore = NewContextMenuStore();

v2/internal/ffenestri/menu_darwin.c

@@ -576,7 +576,7 @@ id processCheckboxMenuItem(Menu *menu, id parentmenu, const char *title, const c
     return item;
 }
 
-id processTextMenuItem(Menu *menu, id parentMenu, const char *title, const char *menuid, bool disabled, const char *acceleratorkey, const char **modifiers, const char* tooltip, const char* image, const char* fontName, int fontSize, const char* RGBA, bool templateImage) {
+id processTextMenuItem(Menu *menu, id parentMenu, const char *title, const char *menuid, bool disabled, const char *acceleratorkey, const char **modifiers, const char* tooltip, const char* image, const char* fontName, int fontSize, const char* RGBA, bool templateImage, bool alternate) {
     id item = ALLOC("NSMenuItem");
 
     // Create a MenuItemCallbackData
@@ -585,9 +585,13 @@ id processTextMenuItem(Menu *menu, id parentMenu, const char *title, const char
     id wrappedId = msg(c("NSValue"), s("valueWithPointer:"), callback);
     msg(item, s("setRepresentedObject:"), wrappedId);
 
-    id key = processAcceleratorKey(acceleratorkey);
+    if( !alternate ) {
-    msg(item, s("initWithTitle:action:keyEquivalent:"), str(title),
+        id key = processAcceleratorKey(acceleratorkey);
-        s("menuItemCallback:"), key);
+        msg(item, s("initWithTitle:action:keyEquivalent:"), str(title),
+            s("menuItemCallback:"), key);
+    } else {
+        msg(item, s("initWithTitle:action:keyEquivalent:"), str(title), s("menuItemCallback:"), str(""));
+    }
 
     if( tooltip != NULL ) {
         msg(item, s("setToolTip:"), str(tooltip));
@@ -663,10 +667,16 @@ id processTextMenuItem(Menu *menu, id parentMenu, const char *title, const char
     msg(item, s("autorelease"));
 
     // Process modifiers
-    if( modifiers != NULL ) {
+    if( modifiers != NULL && !alternate) {
         unsigned long modifierFlags = parseModifiers(modifiers);
         msg(item, s("setKeyEquivalentModifierMask:"), modifierFlags);
     }
+
+    // alternate
+    if( alternate ) {
+        msg(item, s("setAlternate:"), true);
+        msg(item, s("setKeyEquivalentModifierMask:"), NSEventModifierFlagOption);
+    }
     msg(parentMenu, s("addItem:"), item);
 
     return item;
@@ -727,6 +737,11 @@ void processMenuItem(Menu *menu, id parentMenu, JsonNode *item) {
         label = "(empty)";
     }
 
+
+    // Is this an alternate menu item?
+    bool alternate = false;
+    getJSONBool(item, "MacAlternate", &alternate);
+
     const char *menuid = getJSONString(item, "ID");
     if ( menuid == NULL) {
         menuid = "";
@@ -782,7 +797,7 @@ void processMenuItem(Menu *menu, id parentMenu, JsonNode *item) {
     if( type != NULL ) {
 
         if( STREQ(type->string_, "Text")) {
-            processTextMenuItem(menu, parentMenu, label, menuid, disabled, acceleratorkey, modifiers, tooltip, image, fontName, fontSize, RGBA, templateImage);
+            processTextMenuItem(menu, parentMenu, label, menuid, disabled, acceleratorkey, modifiers, tooltip, image, fontName, fontSize, RGBA, templateImage, alternate);
         }
         else if ( STREQ(type->string_, "Separator")) {
             addSeparator(parentMenu);

v2/internal/ffenestri/menu_darwin.h

@@ -105,7 +105,7 @@ id processRadioMenuItem(Menu *menu, id parentmenu, const char *title, const char
 
 id processCheckboxMenuItem(Menu *menu, id parentmenu, const char *title, const char *menuid, bool disabled, bool checked, const char *key);
 
-id processTextMenuItem(Menu *menu, id parentMenu, const char *title, const char *menuid, bool disabled, const char *acceleratorkey, const char **modifiers, const char* tooltip, const char* image, const char* fontName, int fontSize, const char* RGBA, bool templateImage);
+id processTextMenuItem(Menu *menu, id parentMenu, const char *title, const char *menuid, bool disabled, const char *acceleratorkey, const char **modifiers, const char* tooltip, const char* image, const char* fontName, int fontSize, const char* RGBA, bool templateImage, bool alternate);
 void processMenuItem(Menu *menu, id parentMenu, JsonNode *item);
 void processMenuData(Menu *menu, JsonNode *menuData);
 

v2/internal/ffenestri/traymenu_darwin.c

@@ -6,6 +6,8 @@
 #include "traymenu_darwin.h"
 #include "trayicons.h"
 
+extern Class trayMenuDelegateClass;
+
 // A cache for all our tray menu icons
 // Global because it's a singleton
 struct hashmap_s trayIconCache;
@@ -35,6 +37,8 @@ TrayMenu* NewTrayMenu(const char* menuJSON) {
     // Create the menu
     result->menu = NewMenu(processedMenu);
 
+    result->delegate = NULL;
+
     // Init tray status bar item
     result->statusbaritem = NULL;
 
@@ -78,12 +82,20 @@ void UpdateTrayIcon(TrayMenu *trayMenu) {
     }
 
     id trayImage = hashmap_get(&trayIconCache, trayMenu->icon, strlen(trayMenu->icon));
+
+    // If we don't have the image in the icon cache then assume it's base64 encoded image data
+    if (trayImage == NULL) {
+        id data = ALLOC("NSData");
+        id imageData = msg(data, s("initWithBase64EncodedString:options:"), str(trayMenu->icon), 0);
+        trayImage = ALLOC("NSImage");
+        msg(trayImage, s("initWithData:"), imageData);
+    }
+
     msg(statusBarButton, s("setImagePosition:"), trayMenu->trayIconPosition);
     msg(statusBarButton, s("setImage:"), trayImage);
+
 }
 
-
-
 void ShowTrayMenu(TrayMenu* trayMenu) {
 
     // Create a status bar item if we don't have one
@@ -91,7 +103,6 @@ void ShowTrayMenu(TrayMenu* trayMenu) {
         id statusBar = msg( c("NSStatusBar"), s("systemStatusBar") );
         trayMenu->statusbaritem = msg(statusBar, s("statusItemWithLength:"), NSVariableStatusItemLength);
         msg(trayMenu->statusbaritem, s("retain"));
-
     }
 
     id statusBarButton = msg(trayMenu->statusbaritem, s("button"));
@@ -105,6 +116,16 @@ void ShowTrayMenu(TrayMenu* trayMenu) {
 
     // Update the menu
     id menu = GetMenu(trayMenu->menu);
+    objc_setAssociatedObject(menu, "trayMenuID", str(trayMenu->ID), OBJC_ASSOCIATION_ASSIGN);
+
+	// Create delegate
+	id trayMenuDelegate = msg((id)trayMenuDelegateClass, s("new"));
+	msg(menu, s("setDelegate:"), trayMenuDelegate);
+	objc_setAssociatedObject(trayMenuDelegate, "menu", menu, OBJC_ASSOCIATION_ASSIGN);
+
+    // Create menu delegate
+    trayMenu->delegate = trayMenuDelegate;
+
     msg(trayMenu->statusbaritem, s("setMenu:"), menu);
 }
 
@@ -153,6 +174,10 @@ void DeleteTrayMenu(TrayMenu* trayMenu) {
         trayMenu->statusbaritem = NULL;
     }
 
+    if ( trayMenu->delegate != NULL ) {
+        msg(trayMenu->delegate, s("release"));
+    }
+
     // Free the tray menu memory
     MEMFREE(trayMenu);
 }

v2/internal/ffenestri/traymenu_darwin.h

@@ -21,6 +21,8 @@ typedef struct {
 
     JsonNode* processedJSON;
 
+    id delegate;
+
 } TrayMenu;
 
 TrayMenu* NewTrayMenu(const char *trayJSON);

v2/internal/ffenestri/traymenustore_darwin.h

@@ -5,6 +5,8 @@
 #ifndef TRAYMENUSTORE_DARWIN_H
 #define TRAYMENUSTORE_DARWIN_H
 
+#include "traymenu_darwin.h"
+
 #include <pthread.h>
 
 typedef struct {
@@ -26,6 +28,8 @@ void UpdateTrayMenuInStore(TrayMenuStore* store, const char* menuJSON);
 void ShowTrayMenusInStore(TrayMenuStore* store);
 void DeleteTrayMenuStore(TrayMenuStore* store);
 
+TrayMenu* GetTrayMenuByID(TrayMenuStore* store, const char* menuID);
+
 void UpdateTrayMenuLabelInStore(TrayMenuStore* store, const char* JSON);
 void DeleteTrayMenuInStore(TrayMenuStore* store, const char* id);
 

v2/internal/menumanager/processedMenu.go

@@ -37,6 +37,7 @@ type ProcessedMenuItem struct {
 	// Image - base64 image data
 	Image            string `json:",omitempty"`
 	MacTemplateImage bool   `json:", omitempty"`
+	MacAlternate     bool   `json:", omitempty"`
 
 	// Tooltip
 	Tooltip string `json:",omitempty"`
@@ -60,6 +61,7 @@ func NewProcessedMenuItem(menuItemMap *MenuItemMap, menuItem *menu.MenuItem) *Pr
 		FontName:         menuItem.FontName,
 		Image:            menuItem.Image,
 		MacTemplateImage: menuItem.MacTemplateImage,
+		MacAlternate:     menuItem.MacAlternate,
 		Tooltip:          menuItem.Tooltip,
 	}
 

v2/internal/menumanager/traymenu.go

@@ -29,6 +29,7 @@ type TrayMenu struct {
 	menuItemMap   *MenuItemMap
 	menu          *menu.Menu
 	ProcessedMenu *WailsMenu
+	trayMenu      *menu.TrayMenu
 }
 
 func (t *TrayMenu) AsJSON() (string, error) {
@@ -46,6 +47,7 @@ func NewTrayMenu(trayMenu *menu.TrayMenu) *TrayMenu {
 		Icon:        trayMenu.Icon,
 		menu:        trayMenu.Menu,
 		menuItemMap: NewMenuItemMap(),
+		trayMenu:    trayMenu,
 	}
 
 	result.menuItemMap.AddMenu(trayMenu.Menu)
@@ -54,6 +56,28 @@ func NewTrayMenu(trayMenu *menu.TrayMenu) *TrayMenu {
 	return result
 }
 
+func (m *Manager) OnTrayMenuOpen(id string) {
+	trayMenu, ok := m.trayMenus[id]
+	if !ok {
+		return
+	}
+	if trayMenu.trayMenu.OnOpen == nil {
+		return
+	}
+	go trayMenu.trayMenu.OnOpen()
+}
+
+func (m *Manager) OnTrayMenuClose(id string) {
+	trayMenu, ok := m.trayMenus[id]
+	if !ok {
+		return
+	}
+	if trayMenu.trayMenu.OnClose == nil {
+		return
+	}
+	go trayMenu.trayMenu.OnClose()
+}
+
 func (m *Manager) AddTrayMenu(trayMenu *menu.TrayMenu) (string, error) {
 	newTrayMenu := NewTrayMenu(trayMenu)
 

v2/internal/messagedispatcher/message/menu.go

@@ -32,6 +32,14 @@ func menuMessageParser(message string) (*parsedMessage, error) {
 		callbackid := message[2:]
 		topic = "menu:clicked"
 		data = callbackid
+	case 'o':
+		callbackid := message[2:]
+		topic = "menu:ontrayopen"
+		data = callbackid
+	case 'c':
+		callbackid := message[2:]
+		topic = "menu:ontrayclose"
+		data = callbackid
 	default:
 		return nil, fmt.Errorf("invalid menu message: %s", message)
 	}

v2/internal/subsystem/menu.go

@@ -77,6 +77,12 @@ func (m *Menu) Start() error {
 				splitTopic := strings.Split(menuMessage.Topic(), ":")
 				menuMessageType := splitTopic[1]
 				switch menuMessageType {
+				case "ontrayopen":
+					trayID := menuMessage.Data().(string)
+					m.menuManager.OnTrayMenuOpen(trayID)
+				case "ontrayclose":
+					trayID := menuMessage.Data().(string)
+					m.menuManager.OnTrayMenuClose(trayID)
 				case "clicked":
 					if len(splitTopic) != 2 {
 						m.logger.Error("Received clicked message with invalid topic format. Expected 2 sections in topic, got %s", splitTopic)

v2/internal/subsystem/url.go

@@ -68,6 +68,10 @@ func (u *URL) Start() error {
 				u.wg.Done()
 				return
 			case urlMessage := <-u.urlChannel:
+				// Guard against nil messages
+				if urlMessage == nil {
+					continue
+				}
 				messageType := strings.TrimPrefix(urlMessage.Topic(), "url:")
 				switch messageType {
 				case "handler":

v2/pkg/menu/keys/keys.go

@@ -30,7 +30,8 @@ var modifierMap = map[string]Modifier{
 }
 
 func parseModifier(text string) (*Modifier, error) {
-	result, valid := modifierMap[text]
+	lowertext := strings.ToLower(text)
+	result, valid := modifierMap[lowertext]
 	if !valid {
 		return nil, fmt.Errorf("'%s' is not a valid modifier", text)
 	}

v2/pkg/menu/menuitem.go

@@ -39,9 +39,12 @@ type MenuItem struct {
 	// Image - base64 image data
 	Image string
 
-	// MacTemplateImage indicates that on a mac, this image is a template image
+	// MacTemplateImage indicates that on a Mac, this image is a template image
 	MacTemplateImage bool
 
+	// MacAlternate indicates that this item is an alternative to the previous menu item
+	MacAlternate bool
+
 	// Tooltip
 	Tooltip string
 

v2/pkg/menu/tray.go

@@ -14,4 +14,10 @@ type TrayMenu struct {
 
 	// Menu is the initial menu we wish to use for the tray
 	Menu *Menu
+
+	// OnOpen is called when the Menu is opened
+	OnOpen func()
+
+	// OnClose is called when the Menu is closed
+	OnClose func()
 }