TEMP COMMIT

.gitignore

@@ -27,5 +27,3 @@ v2/pkg/parser/testproject/frontend/wails
 v2/test/kitchensink/frontend/public
 v2/test/kitchensink/build/darwin/desktop/kitchensink
 v2/test/kitchensink/frontend/package.json.md5
-/v2/internal/ffenestri/windows/test/cmake-build-debug/
-.idea/

CONTRIBUTORS.md

@@ -40,5 +40,4 @@ Wails is what it is because of the time and effort given by these great people.
   * [Balakrishna Prasad Ganne](https://github.com/aayush420)
   * [Charaf Rezrazi](https://github.com/Rezrazi)
   * [misitebao](https://github.com/misitebao)
-  * [Elie Grenon](https://github.com/DrunkenPoney)
-  * [Amaury Tobias Quiroz](https://github.com/amaury-tobias)
+  * [Elie Grenon](https://github.com/DrunkenPoney)

runtime/js/.eslintrc

@@ -3,12 +3,12 @@
         "browser": true,
         "es6": true,
         "amd": true,
-        "node": true
+        "node": true,
     },
     "extends": "eslint:recommended",
     "parserOptions": {
         "ecmaVersion": 2016,
-        "sourceType": "module"
+        "sourceType": "module",
     },
     "rules": {
         "indent": [

runtime/js/core/browser.js

@@ -26,7 +26,7 @@ export function OpenURL(url) {
  * Opens the given filename using the system's default file handler
  *
  * @export
- * @param {string} filename
+ * @param {sting} filename
  * @returns
  */
 export function OpenFile(filename) {

runtime/js/core/calls.js

@@ -62,7 +62,7 @@ if (window.crypto) {
 export function Call(bindingName, data, timeout) {
 
 	// Timeout infinite by default
-	if (timeout == null) {
+	if (timeout == null || timeout == undefined) {
 		timeout = 0;
 	}
 

runtime/js/core/ipc.js

@@ -45,7 +45,7 @@ function Invoke(message) {
  *
  * @export
  * @param {string} type
- * @param {Object} payload
+ * @param {string} payload
  * @param {string=} callbackID
  */
 export function SendMessage(type, payload, callbackID) {

runtime/js/runtime/.npmignore

@@ -1 +1 @@
-index.js
+bridge.js

scripts/build.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 echo "**** Checking if Wails passes unit tests ****"
-if ! go test ./lib/... ./runtime/... ./cmd/...
+if ! go test ./...
 then
     echo ""
     echo "ERROR: Unit tests failed!"

v2/cmd/wails/internal/commands/build/build.go

@@ -3,10 +3,8 @@ package build
 import (
 	"fmt"
 	"io"
-	"os"
 	"runtime"
 	"strings"
-	"text/tabwriter"
 	"time"
 
 	"github.com/leaanthony/clir"
@@ -24,6 +22,10 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
 
 	command := app.NewSubCommand("build", "Builds the application")
 
+	// Setup target type flag
+	description := "Type of application to build. Valid types: " + validTargetTypes.Join(",")
+	command.StringFlag("t", description, &outputType)
+
 	// Setup production flag
 	production := false
 	command.BoolFlag("production", "Build in production mode", &production)
@@ -35,41 +37,28 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
 	compilerCommand := "go"
 	command.StringFlag("compiler", "Use a different go compiler to build, eg go1.15beta1", &compilerCommand)
 
-	compress := false
-	command.BoolFlag("compress", "Compress final binary", &compress)
-
 	// Setup Platform flag
 	platform := runtime.GOOS
 	command.StringFlag("platform", "Platform to target", &platform)
 
-	// Verbosity
-	verbosity := 1
-	command.IntFlag("v", "Verbosity level (0 - silent, 1 - default, 2 - verbose)", &verbosity)
+	// Quiet Build
+	quiet := false
+	command.BoolFlag("q", "Suppress output to console", &quiet)
 
 	// ldflags to pass to `go`
 	ldflags := ""
 	command.StringFlag("ldflags", "optional ldflags", &ldflags)
 
-	// tags to pass to `go`
-	tags := ""
-	command.StringFlag("tags", "tags to pass to Go compiler (quoted and space separated)", &tags)
+	// Log to file
+	logFile := ""
+	command.StringFlag("l", "Log to file", &logFile)
 
 	// Retain assets
 	keepAssets := false
 	command.BoolFlag("k", "Keep generated assets", &keepAssets)
 
-	// Retain assets
-	outputFilename := ""
-	command.StringFlag("o", "Output filename", &outputFilename)
-
-	// Clean build directory
-	cleanBuildDirectory := false
-	command.BoolFlag("clean", "Clean the build directory before building", &cleanBuildDirectory)
-
 	command.Action(func() error {
 
-		quiet := verbosity == 0
-
 		// Create logger
 		logger := clilogger.New(w)
 		logger.Mute(quiet)
@@ -83,93 +72,28 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
 			app.PrintBanner()
 		}
 
+		task := fmt.Sprintf("Building %s Application", strings.Title(outputType))
+		logger.Println(task)
+		logger.Println(strings.Repeat("-", len(task)))
+
 		// Setup mode
 		mode := build.Debug
 		if production {
 			mode = build.Production
 		}
 
-		// Check platform
-		validPlatformArch := slicer.String([]string{
-			"darwin",
-			"darwin/amd64",
-			"darwin/arm64",
-			"darwin/universal",
-			//"linux/amd64",
-			//"linux/arm-7",
-			"windows",
-			"windows/amd64",
-		})
-		if !validPlatformArch.Contains(platform) {
-			return fmt.Errorf("platform %s is not supported", platform)
-		}
-
-		if compress && platform == "darwin/universal" {
-			println("Warning: compress flag unsupported for universal binaries. Ignoring.")
-			compress = false
-		}
-
-		// Tags
-		userTags := []string{}
-		for _, tag := range strings.Split(tags, " ") {
-			thisTag := strings.TrimSpace(tag)
-			if thisTag != "" {
-				userTags = append(userTags, thisTag)
-			}
-		}
-
 		// Create BuildOptions
 		buildOptions := &build.Options{
-			Logger:              logger,
-			OutputType:          outputType,
-			OutputFile:          outputFilename,
-			CleanBuildDirectory: cleanBuildDirectory,
-			Mode:                mode,
-			Pack:                pack,
-			LDFlags:             ldflags,
-			Compiler:            compilerCommand,
-			KeepAssets:          keepAssets,
-			Verbosity:           verbosity,
-			Compress:            compress,
-			UserTags:            userTags,
+			Logger:     logger,
+			OutputType: outputType,
+			Mode:       mode,
+			Pack:       pack,
+			Platform:   platform,
+			LDFlags:    ldflags,
+			Compiler:   compilerCommand,
+			KeepAssets: keepAssets,
 		}
 
-		// Calculate platform and arch
-		platformSplit := strings.Split(platform, "/")
-		buildOptions.Platform = platformSplit[0]
-		buildOptions.Arch = runtime.GOARCH
-		if len(platformSplit) == 2 {
-			buildOptions.Arch = platformSplit[1]
-		}
-
-		// Start a new tabwriter
-		w := new(tabwriter.Writer)
-		w.Init(os.Stdout, 8, 8, 0, '\t', 0)
-
-		buildModeText := "debug"
-		if production {
-			buildModeText = "production"
-		}
-
-		// Write out the system information
-		fmt.Fprintf(w, "\n")
-		fmt.Fprintf(w, "App Type: \t%s\n", buildOptions.OutputType)
-		fmt.Fprintf(w, "Platform: \t%s\n", buildOptions.Platform)
-		fmt.Fprintf(w, "Arch: \t%s\n", buildOptions.Arch)
-		fmt.Fprintf(w, "Compiler: \t%s\n", buildOptions.Compiler)
-		fmt.Fprintf(w, "Compress: \t%t\n", buildOptions.Compress)
-		fmt.Fprintf(w, "Build Mode: \t%s\n", buildModeText)
-		fmt.Fprintf(w, "Package: \t%t\n", buildOptions.Pack)
-		fmt.Fprintf(w, "Clean Build Dir: \t%t\n", buildOptions.CleanBuildDirectory)
-		fmt.Fprintf(w, "KeepAssets: \t%t\n", buildOptions.KeepAssets)
-		fmt.Fprintf(w, "LDFlags: \t\"%s\"\n", buildOptions.LDFlags)
-		fmt.Fprintf(w, "Tags: \t[%s]\n", strings.Join(buildOptions.UserTags, ","))
-		if len(buildOptions.OutputFile) > 0 {
-			fmt.Fprintf(w, "Output File: \t%s\n", buildOptions.OutputFile)
-		}
-		fmt.Fprintf(w, "\n")
-		w.Flush()
-
 		return doBuild(buildOptions)
 	})
 }

v2/cmd/wails/internal/commands/dev/dev.go

@@ -5,42 +5,33 @@ import (
 	"io"
 	"os"
 	"os/signal"
-	"path/filepath"
 	"runtime"
 	"strings"
 	"syscall"
 	"time"
 
-	"github.com/wailsapp/wails/v2/internal/colour"
-
 	"github.com/fsnotify/fsnotify"
 	"github.com/leaanthony/clir"
+	"github.com/leaanthony/slicer"
 	"github.com/wailsapp/wails/v2/internal/fs"
 	"github.com/wailsapp/wails/v2/internal/process"
 	"github.com/wailsapp/wails/v2/pkg/clilogger"
 	"github.com/wailsapp/wails/v2/pkg/commands/build"
 )
 
-func LogGreen(message string, args ...interface{}) {
-	text := fmt.Sprintf(message, args...)
-	println(colour.Green(text))
-}
-
-func LogRed(message string, args ...interface{}) {
-	text := fmt.Sprintf(message, args...)
-	println(colour.Red(text))
-}
-
-func LogDarkYellow(message string, args ...interface{}) {
-	text := fmt.Sprintf(message, args...)
-	println(colour.DarkYellow(text))
-}
-
 // AddSubcommand adds the `dev` command for the Wails application
 func AddSubcommand(app *clir.Cli, w io.Writer) error {
 
 	command := app.NewSubCommand("dev", "Development mode")
 
+	outputType := "desktop"
+
+	validTargetTypes := slicer.String([]string{"desktop", "hybrid", "server"})
+
+	// Setup target type flag
+	description := "Type of application to develop. Valid types: " + validTargetTypes.Join(",")
+	command.StringFlag("t", description, &outputType)
+
 	// Passthrough ldflags
 	ldflags := ""
 	command.StringFlag("ldflags", "optional ldflags", &ldflags)
@@ -51,17 +42,15 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 
 	// extensions to trigger rebuilds
 	extensions := "go"
-	command.StringFlag("e", "Extensions to trigger rebuilds (comma separated) eg go,js,css,html", &extensions)
-
-	// extensions to trigger rebuilds
-	showWarnings := false
-	command.BoolFlag("w", "Show warnings", &showWarnings)
-
-	loglevel := ""
-	command.StringFlag("loglevel", "Loglevel to use - Trace, Debug, Info, Warning, Error", &loglevel)
+	command.StringFlag("m", "Extensions to trigger rebuilds (comma separated) eg go,js,css,html", &extensions)
 
 	command.Action(func() error {
 
+		// Validate inputs
+		if !validTargetTypes.Contains(outputType) {
+			return fmt.Errorf("output type '%s' is not valid", outputType)
+		}
+
 		// Create logger
 		logger := clilogger.New(w)
 		app.PrintBanner()
@@ -75,6 +64,7 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 		defer watcher.Close()
 
 		var debugBinaryProcess *process.Process = nil
+		var buildFrontend bool = true
 		var extensionsThatTriggerARebuild = strings.Split(extensions, ",")
 
 		// Setup signal handler
@@ -85,13 +75,8 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 
 		// Do initial build
 		logger.Println("Building application for development...")
-		newProcess, err := restartApp(logger, "dev", ldflags, compilerCommand, debugBinaryProcess, loglevel)
-		if newProcess != nil {
-			debugBinaryProcess = newProcess
-		}
-		if err != nil {
-			return err
-		}
+		debugBinaryProcess = restartApp(logger, outputType, ldflags, compilerCommand, buildFrontend, debugBinaryProcess)
+
 		go debounce(100*time.Millisecond, watcher.Events, debounceQuit, func(event fsnotify.Event) {
 			// logger.Println("event: %+v", event)
 
@@ -104,7 +89,7 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 						if err != nil {
 							logger.Fatal("%s", err.Error())
 						}
-						LogGreen("[New Directory] Watching new directory: %s", event.Name)
+						logger.Println("Watching directory: %s", event.Name)
 					}
 				}
 				return
@@ -113,33 +98,38 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 			// Check for file writes
 			if event.Op&fsnotify.Write == fsnotify.Write {
 
+				// logger.Println("modified file: %s", event.Name)
 				var rebuild bool = false
 
 				// Iterate all file patterns
 				for _, pattern := range extensionsThatTriggerARebuild {
-					if strings.HasSuffix(event.Name, pattern) {
-						rebuild = true
+					rebuild = strings.HasSuffix(event.Name, pattern)
+					if err != nil {
+						logger.Fatal(err.Error())
+					}
+					if rebuild {
+						// Only build frontend when the file isn't a Go file
+						buildFrontend = !strings.HasSuffix(event.Name, "go")
 						break
 					}
 				}
 
 				if !rebuild {
-					if showWarnings {
-						LogDarkYellow("[File change] %s did not match extension list (%s)", event.Name, extensions)
-					}
+					logger.Println("Filename change: %s did not match extension list %s", event.Name, extensions)
 					return
 				}
 
-				LogGreen("[Attempting rebuild] %s updated", event.Name)
+				if buildFrontend {
+					logger.Println("Full rebuild triggered: %s updated", event.Name)
+				} else {
+					logger.Println("Partial build triggered: %s updated", event.Name)
+				}
 
 				// Do a rebuild
 
 				// Try and build the app
-				newBinaryProcess, err := restartApp(logger, "dev", ldflags, compilerCommand, debugBinaryProcess, loglevel)
-				if err != nil {
-					fmt.Printf("Error during build: %s", err.Error())
-					return
-				}
+				newBinaryProcess := restartApp(logger, outputType, ldflags, compilerCommand, buildFrontend, debugBinaryProcess)
+
 				// If we have a new process, save it
 				if newBinaryProcess != nil {
 					debugBinaryProcess = newBinaryProcess
@@ -149,28 +139,23 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 		})
 
 		// Get project dir
-		projectDir, err := os.Getwd()
+		dir, err := os.Getwd()
 		if err != nil {
 			return err
 		}
 
 		// Get all subdirectories
-		dirs, err := fs.GetSubdirectories(projectDir)
+		dirs, err := fs.GetSubdirectories(dir)
 		if err != nil {
 			return err
 		}
 
-		LogGreen("Watching (sub)/directory: %s", projectDir)
-
 		// Setup a watcher for non-node_modules directories
 		dirs.Each(func(dir string) {
 			if strings.Contains(dir, "node_modules") {
 				return
 			}
-			// Ignore build directory
-			if strings.HasPrefix(dir, filepath.Join(projectDir, "build")) {
-				return
-			}
+			logger.Println("Watching directory: %s", dir)
 			err = watcher.Add(dir)
 			if err != nil {
 				logger.Fatal(err.Error())
@@ -182,7 +167,7 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 		for quit == false {
 			select {
 			case <-quitChannel:
-				LogGreen("\nCaught quit")
+				println()
 				// Notify debouncer to quit
 				debounceQuit <- true
 				quit = true
@@ -197,7 +182,7 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 			}
 		}
 
-		LogGreen("Development mode exited")
+		logger.Println("Development mode exited")
 
 		return nil
 	})
@@ -224,15 +209,15 @@ exit:
 	}
 }
 
-func restartApp(logger *clilogger.CLILogger, outputType string, ldflags string, compilerCommand string, debugBinaryProcess *process.Process, loglevel string) (*process.Process, error) {
+func restartApp(logger *clilogger.CLILogger, outputType string, ldflags string, compilerCommand string, buildFrontend bool, debugBinaryProcess *process.Process) *process.Process {
 
-	appBinary, err := buildApp(logger, outputType, ldflags, compilerCommand)
+	appBinary, err := buildApp(logger, outputType, ldflags, compilerCommand, buildFrontend)
 	println()
 	if err != nil {
-		LogRed("Build error - continuing to run current version")
-		LogDarkYellow(err.Error())
-		return nil, nil
+		logger.Println("[ERROR] Build Failed: %s", err.Error())
+		return nil
 	}
+	logger.Println("Build new binary: %s", appBinary)
 
 	// Kill existing binary if need be
 	if debugBinaryProcess != nil {
@@ -248,7 +233,7 @@ func restartApp(logger *clilogger.CLILogger, outputType string, ldflags string,
 	// TODO: Generate `backend.js`
 
 	// Start up new binary
-	newProcess := process.NewProcess(logger, appBinary, "-loglevel", loglevel)
+	newProcess := process.NewProcess(logger, appBinary)
 	err = newProcess.Start()
 	if err != nil {
 		// Remove binary
@@ -259,13 +244,13 @@ func restartApp(logger *clilogger.CLILogger, outputType string, ldflags string,
 		logger.Fatal("Unable to start application: %s", err.Error())
 	}
 
-	return newProcess, nil
+	return newProcess
 }
 
-func buildApp(logger *clilogger.CLILogger, outputType string, ldflags string, compilerCommand string) (string, error) {
+func buildApp(logger *clilogger.CLILogger, outputType string, ldflags string, compilerCommand string, buildFrontend bool) (string, error) {
 
 	// Create random output file
-	outputFile := fmt.Sprintf("dev-%d", time.Now().Unix())
+	outputFile := fmt.Sprintf("debug-%d", time.Now().Unix())
 
 	// Create BuildOptions
 	buildOptions := &build.Options{
@@ -277,7 +262,7 @@ func buildApp(logger *clilogger.CLILogger, outputType string, ldflags string, co
 		LDFlags:        ldflags,
 		Compiler:       compilerCommand,
 		OutputFile:     outputFile,
-		IgnoreFrontend: true,
+		IgnoreFrontend: !buildFrontend,
 	}
 
 	return build.Build(buildOptions)

v2/cmd/wails/internal/commands/doctor/doctor.go

@@ -48,7 +48,9 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 
 		// Exit early if PM not found
 		if info.PM == nil {
+			fmt.Fprintf(w, "\n%s\t%s", "Package Manager:", "Not Found")
 			w.Flush()
+			println()
 			return nil
 		}
 		fmt.Fprintf(w, "%s\t%s\n", "Package Manager: ", info.PM.Name())

v2/cmd/wails/internal/commands/generate/generate.go

@@ -9,7 +9,7 @@ import (
 	"github.com/wailsapp/wails/v2/pkg/parser"
 )
 
-// AddSubcommand adds the `generate` command for the Wails application
+// AddSubcommand adds the `dev` command for the Wails application
 func AddSubcommand(app *clir.Cli, w io.Writer) error {
 
 	command := app.NewSubCommand("generate", "Code Generation Tools")
@@ -19,7 +19,7 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 
 	// Quiet Init
 	quiet := false
-	backendAPI.BoolFlag("q", "Suppress output to console", &quiet)
+	backendAPI.BoolFlag("q", "Supress output to console", &quiet)
 
 	backendAPI.Action(func() error {
 
@@ -85,4 +85,7 @@ func logPackage(pkg *parser.Package, logger *clilogger.CLILogger) {
 		}
 	}
 	logger.Println("")
+
+	// logger.Println("  Original Go Package Path:", pkg.Gopackage.PkgPath)
+	// logger.Println("  Original Go Package Path:", pkg.Gopackage.PkgPath)
 }

v2/cmd/wails/internal/commands/initialise/initialise.go

@@ -6,10 +6,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/wailsapp/wails/v2/cmd/wails/internal/commands/initialise/templates"
-
 	"github.com/leaanthony/clir"
 	"github.com/pkg/errors"
+	"github.com/wailsapp/wails/v2/internal/templates"
 	"github.com/wailsapp/wails/v2/pkg/clilogger"
 	"github.com/wailsapp/wails/v2/pkg/git"
 )

v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/main.tmpl.go

@@ -1,39 +0,0 @@
-package main
-
-import (
-	"log"
-
-	"github.com/wailsapp/wails/v2"
-	"github.com/wailsapp/wails/v2/pkg/logger"
-	"github.com/wailsapp/wails/v2/pkg/menu"
-	"github.com/wailsapp/wails/v2/pkg/options"
-	"github.com/wailsapp/wails/v2/pkg/options/mac"
-)
-
-func main() {
-
-	// Create application with options
-	app := NewBasic()
-
-	err := wails.Run(&options.App{
-		Title:         "{{.ProjectName}}",
-		Width:         800,
-		Height:        600,
-		DisableResize: true,
-		Mac: &mac.Options{
-			WebviewIsTransparent:          true,
-			WindowBackgroundIsTranslucent: true,
-			TitleBar:                      mac.TitleBarHiddenInset(),
-			Menu:                          menu.DefaultMacMenu(),
-		},
-		LogLevel: logger.DEBUG,
-		Startup:  app.startup,
-		Shutdown: app.shutdown,
-		Bind: []interface{}{
-			app,
-		},
-	})
-	if err != nil {
-		log.Fatal(err)
-	}
-}

v2/cmd/wails/internal/commands/initialise/templates/templates_test.go

@@ -1,46 +0,0 @@
-package templates
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/matryer/is"
-)
-
-func TestList(t *testing.T) {
-
-	is2 := is.New(t)
-	templates, err := List()
-	is2.NoErr(err)
-
-	println("Found these templates:")
-	for _, template := range templates {
-		fmt.Printf("%+v\n", template)
-	}
-}
-
-func TestShortname(t *testing.T) {
-
-	is2 := is.New(t)
-
-	template, err := getTemplateByShortname("vanilla")
-	is2.NoErr(err)
-
-	println("Found this template:")
-	fmt.Printf("%+v\n", template)
-}
-
-func TestInstall(t *testing.T) {
-
-	is2 := is.New(t)
-
-	options := &Options{
-		ProjectName:  "test",
-		TemplateName: "vanilla",
-		AuthorName:   "Lea Anthony",
-		AuthorEmail:  "lea.anthony@gmail.com",
-	}
-
-	err := Install(options)
-	is2.NoErr(err)
-}

v2/cmd/wails/internal/commands/update/update.go

@@ -1,164 +0,0 @@
-package update
-
-import (
-	"fmt"
-	"io"
-	"log"
-	"os"
-
-	"github.com/wailsapp/wails/v2/internal/shell"
-
-	"github.com/wailsapp/wails/v2/internal/github"
-
-	"github.com/leaanthony/clir"
-	"github.com/wailsapp/wails/v2/pkg/clilogger"
-)
-
-// AddSubcommand adds the `init` command for the Wails application
-func AddSubcommand(app *clir.Cli, w io.Writer, currentVersion string) error {
-
-	command := app.NewSubCommand("update", "Update the Wails CLI")
-	command.LongDescription(`This command allows you to update your version of the Wails CLI.`)
-
-	// Setup flags
-	var prereleaseRequired bool
-	command.BoolFlag("pre", "Update CLI to latest Prerelease", &prereleaseRequired)
-
-	var specificVersion string
-	command.StringFlag("version", "Install a specific version (Overrides other flags) of the CLI", &specificVersion)
-
-	command.Action(func() error {
-
-		// Create logger
-		logger := clilogger.New(w)
-
-		// Print banner
-		app.PrintBanner()
-		logger.Println("Checking for updates...")
-
-		var desiredVersion *github.SemanticVersion
-		var err error
-		var valid bool
-
-		if len(specificVersion) > 0 {
-			// Check if this is a valid version
-			valid, err = github.IsValidTag(specificVersion)
-			if err == nil {
-				if !valid {
-					err = fmt.Errorf("version '%s' is invalid", specificVersion)
-				} else {
-					desiredVersion, err = github.NewSemanticVersion(specificVersion)
-				}
-			}
-		} else {
-			if prereleaseRequired {
-				desiredVersion, err = github.GetLatestPreRelease()
-			} else {
-				desiredVersion, err = github.GetLatestStableRelease()
-			}
-		}
-		if err != nil {
-			return err
-		}
-		fmt.Println()
-
-		fmt.Println("    Current Version : " + currentVersion)
-
-		if len(specificVersion) > 0 {
-			fmt.Printf("    Desired Version : v%s\n", desiredVersion)
-		} else {
-			if prereleaseRequired {
-				fmt.Printf("  Latest Prerelease : v%s\n", desiredVersion)
-			} else {
-				fmt.Printf("     Latest Release : v%s\n", desiredVersion)
-			}
-		}
-
-		return updateToVersion(logger, desiredVersion, len(specificVersion) > 0, currentVersion)
-	})
-
-	return nil
-}
-
-func updateToVersion(logger *clilogger.CLILogger, targetVersion *github.SemanticVersion, force bool, currentVersion string) error {
-
-	var targetVersionString = "v" + targetVersion.String()
-
-	// Early exit
-	if targetVersionString == currentVersion {
-		logger.Println("Looks like you're up to date!")
-		return nil
-	}
-
-	var desiredVersion string
-
-	if !force {
-
-		compareVersion := currentVersion
-
-		currentVersion, err := github.NewSemanticVersion(compareVersion)
-		if err != nil {
-			return err
-		}
-
-		var success bool
-
-		// Release -> Pre-Release = Massage current version to prerelease format
-		if targetVersion.IsPreRelease() && currentVersion.IsRelease() {
-			testVersion, err := github.NewSemanticVersion(compareVersion + "-0")
-			if err != nil {
-				return err
-			}
-			success, _ = targetVersion.IsGreaterThan(testVersion)
-		}
-		// Pre-Release -> Release = Massage target version to prerelease format
-		if targetVersion.IsRelease() && currentVersion.IsPreRelease() {
-			// We are ok with greater than or equal
-			mainversion := currentVersion.MainVersion()
-			targetVersion, err = github.NewSemanticVersion(targetVersion.String())
-			if err != nil {
-				return err
-			}
-			success, _ = targetVersion.IsGreaterThanOrEqual(mainversion)
-		}
-
-		// Release -> Release = Standard check
-		if (targetVersion.IsRelease() && currentVersion.IsRelease()) ||
-			(targetVersion.IsPreRelease() && currentVersion.IsPreRelease()) {
-
-			success, _ = targetVersion.IsGreaterThan(currentVersion)
-		}
-
-		// Compare
-		if !success {
-			logger.Println("Error: The requested version is lower than the current version.")
-			logger.Println("If this is what you really want to do, use `wails update -version %s`", targetVersionString)
-			return nil
-		}
-
-		desiredVersion = "v" + targetVersion.String()
-
-	} else {
-		desiredVersion = "v" + targetVersion.String()
-	}
-
-	fmt.Println()
-	logger.Print("Installing Wails CLI " + desiredVersion + "...")
-
-	// Run command in non module directory
-	homeDir, err := os.UserHomeDir()
-	if err != nil {
-		log.Fatal("Cannot find home directory! Please file a bug report!")
-	}
-
-	sout, serr, err := shell.RunCommand(homeDir, "go", "get", "github.com/wailsapp/wails/v2/cmd/wails@"+desiredVersion)
-	if err != nil {
-		logger.Println("Failed.")
-		logger.Println(sout + `\n` + serr)
-		return err
-	}
-	fmt.Println()
-	logger.Println("Wails CLI updated to " + desiredVersion)
-
-	return nil
-}

v2/cmd/wails/main.go

@@ -1,13 +1,8 @@
 package main
 
 import (
-	"fmt"
 	"os"
 
-	"github.com/wailsapp/wails/v2/internal/colour"
-
-	"github.com/wailsapp/wails/v2/cmd/wails/internal/commands/update"
-
 	"github.com/leaanthony/clir"
 	"github.com/wailsapp/wails/v2/cmd/wails/internal/commands/build"
 	"github.com/wailsapp/wails/v2/cmd/wails/internal/commands/debug"
@@ -22,17 +17,11 @@ func fatal(message string) {
 	os.Exit(1)
 }
 
-func banner(_ *clir.Cli) string {
-	return fmt.Sprintf("%s %s", colour.Yellow("Wails CLI"), colour.DarkRed(version))
-}
-
 func main() {
 
 	var err error
 
-	app := clir.NewCli("Wails", "Go/HTML Appkit", version)
-
-	app.SetBannerFunction(banner)
+	app := clir.NewCli("Wails", "Go/HTML Application Framework", version)
 
 	build.AddBuildSubcommand(app, os.Stdout)
 	err = initialise.AddSubcommand(app, os.Stdout)
@@ -59,14 +48,8 @@ func main() {
 		fatal(err.Error())
 	}
 
-	err = update.AddSubcommand(app, os.Stdout, version)
-	if err != nil {
-		fatal(err.Error())
-	}
-
 	err = app.Run()
 	if err != nil {
 		println("\n\nERROR: " + err.Error())
-		os.Exit(1)
 	}
 }

v2/cmd/wails/version.go

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

v2/go.mod

@@ -1,30 +1,28 @@
 module github.com/wailsapp/wails/v2
 
-go 1.16
+go 1.15
 
 require (
-	github.com/Masterminds/semver v1.5.0
+	github.com/davecgh/go-spew v1.1.1
 	github.com/fatih/structtag v1.2.0
 	github.com/fsnotify/fsnotify v1.4.9
-	github.com/gorilla/websocket v1.4.1
 	github.com/imdario/mergo v0.3.11
 	github.com/jackmordaunt/icns v1.0.0
 	github.com/leaanthony/clir v1.0.4
-	github.com/leaanthony/debme v1.1.2
-	github.com/leaanthony/go-ansi-parser v1.0.1
-	github.com/leaanthony/gosod v1.0.1
+	github.com/leaanthony/gosod v0.0.4
 	github.com/leaanthony/slicer v1.5.0
 	github.com/matryer/is v1.4.0
 	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
+	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
 	github.com/olekukonko/tablewriter v0.0.4
 	github.com/pkg/errors v0.9.1
 	github.com/tdewolff/minify v2.3.6+incompatible
 	github.com/tdewolff/parse v2.3.4+incompatible // indirect
 	github.com/tdewolff/test v1.0.6 // indirect
-	github.com/wzshiming/ctc v1.2.3
 	github.com/xyproto/xpm v1.2.1
 	golang.org/x/net v0.0.0-20200822124328-c89045814202
 	golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c
 	golang.org/x/tools v0.0.0-20200902012652-d1954cc86c82
+	gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b // indirect
 	nhooyr.io/websocket v1.8.6
 )

v2/go.sum

@@ -1,6 +1,5 @@
-github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
-github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4=
 github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94=
@@ -10,6 +9,7 @@ github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
 github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14=
 github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
+github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
 github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
 github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
@@ -39,15 +39,13 @@ github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGn
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/klauspost/compress v1.10.3 h1:OP96hzwJVBIHYU52pVTI6CczrxPvrGfgqF9N5eTO0Q8=
 github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/leaanthony/clir v1.0.4 h1:Dov2y9zWJmZr7CjaCe86lKa4b5CSxskGAt2yBkoDyiU=
 github.com/leaanthony/clir v1.0.4/go.mod h1:k/RBkdkFl18xkkACMCLt09bhiZnrGORoxmomeMvDpE0=
-github.com/leaanthony/debme v1.1.1/go.mod h1:3V+sCm5tYAgQymvSOfYQ5Xx2JCr+OXiD9Jkw3otUjiA=
-github.com/leaanthony/debme v1.1.2 h1:dGeQuj0+xPIlDQzGIjmAU52+yRg85u5pWaaqrdLBjD0=
-github.com/leaanthony/debme v1.1.2/go.mod h1:3V+sCm5tYAgQymvSOfYQ5Xx2JCr+OXiD9Jkw3otUjiA=
-github.com/leaanthony/go-ansi-parser v1.0.1 h1:97v6c5kYppVsbScf4r/VZdXyQ21KQIfeQOk2DgKxGG4=
-github.com/leaanthony/go-ansi-parser v1.0.1/go.mod h1:7arTzgVI47srICYhvgUV4CGd063sGEeoSlych5yeSPM=
-github.com/leaanthony/gosod v1.0.1 h1:F+4c3DmEBfigi7oAswCV2RpQ+k4DcNbhuCZUGdBHacQ=
-github.com/leaanthony/gosod v1.0.1/go.mod h1:W8RyeSFBXu7RpIxPGEJfW4moSyGGEjlJMLV25wEbAdU=
+github.com/leaanthony/gosod v0.0.4 h1:v4hepo4IyL8E8c9qzDsvYcA0KGh7Npf8As74K5ibQpI=
+github.com/leaanthony/gosod v0.0.4/go.mod h1:nGMCb1PJfXwBDbOAike78jEYlpqge+xUKFf0iBKjKxU=
 github.com/leaanthony/slicer v1.5.0 h1:aHYTN8xbCCLxJmkNKiLB6tgcMARl4eWmH9/F+S/0HtY=
 github.com/leaanthony/slicer v1.5.0/go.mod h1:FwrApmf8gOrpzEWM2J/9Lh79tyq8KTX5AzRtwV7m4AY=
 github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
@@ -64,13 +62,17 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLD
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/olekukonko/tablewriter v0.0.4 h1:vHD/YYe1Wolo78koG299f7V/VAS08c6IpCLn+Ejf/w8=
 github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/tdewolff/minify v2.3.6+incompatible h1:2hw5/9ZvxhWLvBUnHE06gElGYz+Jv9R4Eys0XUzItYo=
 github.com/tdewolff/minify v2.3.6+incompatible/go.mod h1:9Ov578KJUmAWpS6NeZwRZyT56Uf6o3Mcz9CEsg8USYs=
@@ -82,10 +84,6 @@ github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
 github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
 github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
-github.com/wzshiming/ctc v1.2.3 h1:q+hW3IQNsjIlOFBTGZZZeIXTElFM4grF4spW/errh/c=
-github.com/wzshiming/ctc v1.2.3/go.mod h1:2tVAtIY7SUyraSk0JxvwmONNPFL4ARavPuEsg5+KA28=
-github.com/wzshiming/winseq v0.0.0-20200112104235-db357dc107ae h1:tpXvBXC3hpQBDCc9OojJZCQMVRAbT3TTdUMP8WguXkY=
-github.com/wzshiming/winseq v0.0.0-20200112104235-db357dc107ae/go.mod h1:VTAq37rkGeV+WOybvZwjXiJOicICdpLCN8ifpISjK20=
 github.com/xyproto/xpm v1.2.1 h1:trdvGjjWBsOOKzBBUPT6JvaIQM3acJEEYfbxN7M96wg=
 github.com/xyproto/xpm v1.2.1/go.mod h1:cMnesLsD0PBXLgjDfTDEaKr8XyTFsnP1QycSqRw7BiY=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -102,26 +100,33 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9 h1:L2auWcuQIvxz9xSEqzESnV/QN/gNRXNApHi3fYwl2w0=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200107162124-548cf772de50/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c h1:UIcGWL6/wpCfyGuJnRFJRurA+yj8RrW7Q6x2YMCXt6c=
 golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e h1:FDhOuMEY4JVRztM/gsbk+IKUQ8kj74bxZrgw87eMMVc=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200902012652-d1954cc86c82 h1:shxDsb9Dz27xzk3A0DxP0JuJnZMpKrdg8+E14eiUAX4=
 golang.org/x/tools v0.0.0-20200902012652-d1954cc86c82/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b h1:QRR6H1YWRnHb4Y/HeNFCTJLFVxaq6wH4YuVdsUOr75U=
+gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

v2/init.go

@@ -1,7 +0,0 @@
-// +build !windows
-
-package wails
-
-func Init() error {
-	return nil
-}

v2/init_windows.go

@@ -1,14 +0,0 @@
-package wails
-
-import (
-	"fmt"
-	"syscall"
-)
-
-func Init() error {
-	status, r, err := syscall.NewLazyDLL("user32.dll").NewProc("SetProcessDPIAware").Call()
-	if status == 0 {
-		return fmt.Errorf("exit status %d: %v %v", status, r, err)
-	}
-	return nil
-}

v2/internal/app/debug.go

@@ -2,40 +2,11 @@
 
 package app
 
-import (
-	"flag"
-	"strings"
-
-	"github.com/wailsapp/wails/v2/pkg/logger"
-)
-
 // Init initialises the application for a debug environment
 func (a *App) Init() error {
 	// Indicate debug mode
 	a.debug = true
-
-	if a.appType == "desktop" {
-		// Enable dev tools
-		a.options.DevTools = true
-	}
-
-	// Set log levels
-	loglevel := flag.String("loglevel", "debug", "Loglevel to use - Trace, Debug, Info, Warning, Error")
-	flag.Parse()
-	if len(*loglevel) > 0 {
-		switch strings.ToLower(*loglevel) {
-		case "trace":
-			a.logger.SetLogLevel(logger.TRACE)
-		case "info":
-			a.logger.SetLogLevel(logger.INFO)
-		case "warning":
-			a.logger.SetLogLevel(logger.WARNING)
-		case "error":
-			a.logger.SetLogLevel(logger.ERROR)
-		default:
-			a.logger.SetLogLevel(logger.DEBUG)
-		}
-	}
-
+	// Enable dev tools
+	a.options.DevTools = true
 	return nil
 }

v2/internal/app/default.go

@@ -1,4 +1,4 @@
-// +build !desktop,!hybrid,!server,!dev
+// +build !desktop,!hybrid,!server
 
 package app
 
@@ -8,9 +8,8 @@ package app
 // will be unknown and the application will not work as expected.
 
 import (
-	"os"
-
 	"github.com/wailsapp/wails/v2/internal/logger"
+	"os"
 
 	"github.com/wailsapp/wails/v2/pkg/options"
 )
@@ -39,3 +38,7 @@ func (a *App) Run() error {
 	os.Exit(1)
 	return nil
 }
+
+// Bind the dummy interface
+func (a *App) Bind(_ interface{}) {
+}

v2/internal/app/desktop.go

@@ -3,9 +3,6 @@
 package app
 
 import (
-	"context"
-	"sync"
-
 	"github.com/wailsapp/wails/v2/internal/binding"
 	"github.com/wailsapp/wails/v2/internal/ffenestri"
 	"github.com/wailsapp/wails/v2/internal/logger"
@@ -20,8 +17,6 @@ import (
 
 // App defines a Wails application structure
 type App struct {
-	appType string
-
 	window     *ffenestri.Application
 	servicebus *servicebus.ServiceBus
 	logger     *logger.Logger
@@ -29,13 +24,12 @@ type App struct {
 	options    *options.App
 
 	// Subsystems
-	log     *subsystem.Log
-	runtime *subsystem.Runtime
-	event   *subsystem.Event
-	//binding    *subsystem.Binding
+	log        *subsystem.Log
+	runtime    *subsystem.Runtime
+	event      *subsystem.Event
+	binding    *subsystem.Binding
 	call       *subsystem.Call
 	menu       *subsystem.Menu
-	url        *subsystem.URL
 	dispatcher *messagedispatcher.Dispatcher
 
 	menuManager *menumanager.Manager
@@ -85,15 +79,11 @@ func CreateApp(appoptions *options.App) (*App, error) {
 
 	window := ffenestri.NewApplicationWithConfig(appoptions, myLogger, menuManager)
 
-	// Create binding exemptions - Ugly hack. There must be a better way
-	bindingExemptions := []interface{}{appoptions.Startup, appoptions.Shutdown}
-
 	result := &App{
-		appType:          "desktop",
 		window:           window,
 		servicebus:       servicebus.New(myLogger),
 		logger:           myLogger,
-		bindings:         binding.NewBindings(myLogger, appoptions.Bind, bindingExemptions),
+		bindings:         binding.NewBindings(myLogger),
 		menuManager:      menuManager,
 		startupCallback:  appoptions.Startup,
 		shutdownCallback: appoptions.Shutdown,
@@ -113,10 +103,13 @@ func (a *App) Run() error {
 
 	var err error
 
-	// Setup a context
-	var subsystemWaitGroup sync.WaitGroup
-	parentContext := context.WithValue(context.Background(), "waitgroup", &subsystemWaitGroup)
-	ctx, cancel := context.WithCancel(parentContext)
+	// Setup signal handler
+	signalsubsystem, err := signal.NewManager(a.servicebus, a.logger)
+	if err != nil {
+		return err
+	}
+	a.signal = signalsubsystem
+	a.signal.Start()
 
 	// Start the service bus
 	a.servicebus.Debug()
@@ -125,7 +118,7 @@ func (a *App) Run() error {
 		return err
 	}
 
-	runtimesubsystem, err := subsystem.NewRuntime(ctx, a.servicebus, a.logger, a.startupCallback)
+	runtimesubsystem, err := subsystem.NewRuntime(a.servicebus, a.logger, a.startupCallback, a.shutdownCallback)
 	if err != nil {
 		return err
 	}
@@ -139,6 +132,17 @@ func (a *App) Run() error {
 	a.loglevelStore = a.runtime.GoRuntime().Store.New("wails:loglevel", a.options.LogLevel)
 	a.appconfigStore = a.runtime.GoRuntime().Store.New("wails:appconfig", a.options)
 
+	// Start the binding subsystem
+	bindingsubsystem, err := subsystem.NewBinding(a.servicebus, a.logger, a.bindings, a.runtime.GoRuntime())
+	if err != nil {
+		return err
+	}
+	a.binding = bindingsubsystem
+	err = a.binding.Start()
+	if err != nil {
+		return err
+	}
+
 	// Start the logging subsystem
 	log, err := subsystem.NewLog(a.servicebus, a.logger, a.loglevelStore)
 	if err != nil {
@@ -161,32 +165,19 @@ func (a *App) Run() error {
 		return err
 	}
 
-	if a.options.Mac.URLHandlers != nil {
-		// Start the url handler subsystem
-		url, err := subsystem.NewURL(a.servicebus, a.logger, a.options.Mac.URLHandlers)
-		if err != nil {
-			return err
-		}
-		a.url = url
-		err = a.url.Start()
-		if err != nil {
-			return err
-		}
-	}
-
 	// Start the eventing subsystem
-	eventsubsystem, err := subsystem.NewEvent(ctx, a.servicebus, a.logger)
+	event, err := subsystem.NewEvent(a.servicebus, a.logger)
 	if err != nil {
 		return err
 	}
-	a.event = eventsubsystem
+	a.event = event
 	err = a.event.Start()
 	if err != nil {
 		return err
 	}
 
 	// Start the menu subsystem
-	menusubsystem, err := subsystem.NewMenu(ctx, a.servicebus, a.logger, a.menuManager)
+	menusubsystem, err := subsystem.NewMenu(a.servicebus, a.logger, a.menuManager)
 	if err != nil {
 		return err
 	}
@@ -197,11 +188,11 @@ func (a *App) Run() error {
 	}
 
 	// Start the call subsystem
-	callSubsystem, err := subsystem.NewCall(ctx, a.servicebus, a.logger, a.bindings.DB(), a.runtime.GoRuntime())
+	call, err := subsystem.NewCall(a.servicebus, a.logger, a.bindings.DB(), a.runtime.GoRuntime())
 	if err != nil {
 		return err
 	}
-	a.call = callSubsystem
+	a.call = call
 	err = a.call.Start()
 	if err != nil {
 		return err
@@ -213,42 +204,23 @@ func (a *App) Run() error {
 		return err
 	}
 
-	// Setup signal handler
-	signalsubsystem, err := signal.NewManager(ctx, cancel, a.servicebus, a.logger)
-	if err != nil {
-		return err
-	}
-	a.signal = signalsubsystem
-	a.signal.Start()
-
-	err = a.window.Run(dispatcher, bindingDump, a.debug)
+	result := a.window.Run(dispatcher, bindingDump, a.debug)
 	a.logger.Trace("Ffenestri.Run() exited")
-	if err != nil {
-		return err
-	}
-
-	// Close down all the subsystems
-	a.logger.Trace("Cancelling subsystems")
-	cancel()
-	subsystemWaitGroup.Wait()
-
-	a.logger.Trace("Cancelling dispatcher")
-	dispatcher.Close()
-
-	// Close log
-	a.logger.Trace("Stopping log")
-	log.Close()
-
-	a.logger.Trace("Stopping Service bus")
 	err = a.servicebus.Stop()
 	if err != nil {
 		return err
 	}
 
-	// Shutdown callback
-	if a.shutdownCallback != nil {
-		a.shutdownCallback()
-	}
-
-	return nil
+	return result
+}
+
+// Bind a struct to the application by passing in
+// a pointer to it
+func (a *App) Bind(structPtr interface{}) {
+
+	// Add the struct to the bindings
+	err := a.bindings.Add(structPtr)
+	if err != nil {
+		a.logger.Fatal("Error during binding: " + err.Error())
+	}
 }

v2/internal/app/dev.go

@@ -1,244 +0,0 @@
-// +build dev
-
-package app
-
-import (
-	"context"
-	"sync"
-
-	"github.com/wailsapp/wails/v2/internal/bridge"
-	"github.com/wailsapp/wails/v2/internal/menumanager"
-
-	"github.com/wailsapp/wails/v2/pkg/options"
-
-	"github.com/wailsapp/wails/v2/internal/binding"
-	"github.com/wailsapp/wails/v2/internal/logger"
-	"github.com/wailsapp/wails/v2/internal/messagedispatcher"
-	"github.com/wailsapp/wails/v2/internal/runtime"
-	"github.com/wailsapp/wails/v2/internal/servicebus"
-	"github.com/wailsapp/wails/v2/internal/signal"
-	"github.com/wailsapp/wails/v2/internal/subsystem"
-)
-
-// App defines a Wails application structure
-type App struct {
-	appType string
-
-	servicebus *servicebus.ServiceBus
-	logger     *logger.Logger
-	signal     *signal.Manager
-	options    *options.App
-
-	// Subsystems
-	log     *subsystem.Log
-	runtime *subsystem.Runtime
-	event   *subsystem.Event
-	//binding    *subsystem.Binding
-	call       *subsystem.Call
-	menu       *subsystem.Menu
-	dispatcher *messagedispatcher.Dispatcher
-
-	menuManager *menumanager.Manager
-
-	// Indicates if the app is in debug mode
-	debug bool
-
-	// This is our binding DB
-	bindings *binding.Bindings
-
-	// Application Stores
-	loglevelStore  *runtime.Store
-	appconfigStore *runtime.Store
-
-	// Startup/Shutdown
-	startupCallback  func(*runtime.Runtime)
-	shutdownCallback func()
-
-	// Bridge
-	bridge *bridge.Bridge
-}
-
-// Create App
-func CreateApp(appoptions *options.App) (*App, error) {
-
-	// Merge default options
-	options.MergeDefaults(appoptions)
-
-	// Set up logger
-	myLogger := logger.New(appoptions.Logger)
-
-	// Create the menu manager
-	menuManager := menumanager.NewManager()
-
-	// Process the application menu
-	menuManager.SetApplicationMenu(options.GetApplicationMenu(appoptions))
-
-	// Process context menus
-	contextMenus := options.GetContextMenus(appoptions)
-	for _, contextMenu := range contextMenus {
-		menuManager.AddContextMenu(contextMenu)
-	}
-
-	// Process tray menus
-	trayMenus := options.GetTrayMenus(appoptions)
-	for _, trayMenu := range trayMenus {
-		menuManager.AddTrayMenu(trayMenu)
-	}
-
-	// Create binding exemptions - Ugly hack. There must be a better way
-	bindingExemptions := []interface{}{appoptions.Startup, appoptions.Shutdown}
-
-	result := &App{
-		appType:          "dev",
-		bindings:         binding.NewBindings(myLogger, appoptions.Bind, bindingExemptions),
-		logger:           myLogger,
-		servicebus:       servicebus.New(myLogger),
-		startupCallback:  appoptions.Startup,
-		shutdownCallback: appoptions.Shutdown,
-		bridge:           bridge.NewBridge(myLogger),
-		menuManager:      menuManager,
-	}
-
-	result.options = appoptions
-
-	// Initialise the app
-	err := result.Init()
-
-	return result, err
-
-}
-
-// Run the application
-func (a *App) Run() error {
-
-	var err error
-
-	// Setup a context
-	var subsystemWaitGroup sync.WaitGroup
-	parentContext := context.WithValue(context.Background(), "waitgroup", &subsystemWaitGroup)
-	ctx, cancel := context.WithCancel(parentContext)
-
-	// Start the service bus
-	a.servicebus.Debug()
-	err = a.servicebus.Start()
-	if err != nil {
-		return err
-	}
-
-	runtimesubsystem, err := subsystem.NewRuntime(ctx, a.servicebus, a.logger, a.startupCallback)
-	if err != nil {
-		return err
-	}
-	a.runtime = runtimesubsystem
-	err = a.runtime.Start()
-	if err != nil {
-		return err
-	}
-
-	// Application Stores
-	a.loglevelStore = a.runtime.GoRuntime().Store.New("wails:loglevel", a.options.LogLevel)
-	a.appconfigStore = a.runtime.GoRuntime().Store.New("wails:appconfig", a.options)
-
-	// Start the logging subsystem
-	log, err := subsystem.NewLog(a.servicebus, a.logger, a.loglevelStore)
-	if err != nil {
-		return err
-	}
-	a.log = log
-	err = a.log.Start()
-	if err != nil {
-		return err
-	}
-
-	// create the dispatcher
-	dispatcher, err := messagedispatcher.New(a.servicebus, a.logger)
-	if err != nil {
-		return err
-	}
-	a.dispatcher = dispatcher
-	err = dispatcher.Start()
-	if err != nil {
-		return err
-	}
-
-	// Start the eventing subsystem
-	eventsubsystem, err := subsystem.NewEvent(ctx, a.servicebus, a.logger)
-	if err != nil {
-		return err
-	}
-	a.event = eventsubsystem
-	err = a.event.Start()
-	if err != nil {
-		return err
-	}
-
-	// Start the menu subsystem
-	menusubsystem, err := subsystem.NewMenu(ctx, a.servicebus, a.logger, a.menuManager)
-	if err != nil {
-		return err
-	}
-	a.menu = menusubsystem
-	err = a.menu.Start()
-	if err != nil {
-		return err
-	}
-
-	// Start the call subsystem
-	callSubsystem, err := subsystem.NewCall(ctx, a.servicebus, a.logger, a.bindings.DB(), a.runtime.GoRuntime())
-	if err != nil {
-		return err
-	}
-	a.call = callSubsystem
-	err = a.call.Start()
-	if err != nil {
-		return err
-	}
-
-	// Dump bindings as a debug
-	bindingDump, err := a.bindings.ToJSON()
-	if err != nil {
-		return err
-	}
-
-	// Generate backend.js
-	a.bindings.GenerateBackendJS()
-
-	// Setup signal handler
-	signalsubsystem, err := signal.NewManager(ctx, cancel, a.servicebus, a.logger)
-	if err != nil {
-		return err
-	}
-	a.signal = signalsubsystem
-	a.signal.Start()
-
-	err = a.bridge.Run(dispatcher, a.menuManager, bindingDump, a.debug)
-	a.logger.Trace("Bridge.Run() exited")
-	if err != nil {
-		return err
-	}
-
-	// Close down all the subsystems
-	a.logger.Trace("Cancelling subsystems")
-	cancel()
-	subsystemWaitGroup.Wait()
-
-	a.logger.Trace("Cancelling dispatcher")
-	dispatcher.Close()
-
-	// Close log
-	a.logger.Trace("Stopping log")
-	log.Close()
-
-	a.logger.Trace("Stopping Service bus")
-	err = a.servicebus.Stop()
-	if err != nil {
-		return err
-	}
-
-	// Shutdown callback
-	if a.shutdownCallback != nil {
-		a.shutdownCallback()
-	}
-	return nil
-
-}

v2/internal/app/hybrid.go

@@ -75,7 +75,7 @@ func CreateApp(options *Options) *App {
 		webserver:  webserver.NewWebServer(myLogger),
 		servicebus: servicebus.New(myLogger),
 		logger:     myLogger,
-		bindings:   binding.NewBindings(myLogger, options.Bind),
+		bindings:   binding.NewBindings(myLogger),
 	}
 
 	// Initialise the app
@@ -192,3 +192,14 @@ func (a *App) Run() error {
 
 	return cli.Run()
 }
+
+// Bind a struct to the application by passing in
+// a pointer to it
+func (a *App) Bind(structPtr interface{}) {
+
+	// Add the struct to the bindings
+	err := a.bindings.Add(structPtr)
+	if err != nil {
+		a.logger.Fatal("Error during binding: " + err.Error())
+	}
+}

v2/internal/app/server.go

@@ -6,13 +6,10 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/wailsapp/wails/v2/pkg/options"
-
 	"github.com/leaanthony/clir"
 	"github.com/wailsapp/wails/v2/internal/binding"
 	"github.com/wailsapp/wails/v2/internal/logger"
 	"github.com/wailsapp/wails/v2/internal/messagedispatcher"
-	"github.com/wailsapp/wails/v2/internal/runtime"
 	"github.com/wailsapp/wails/v2/internal/servicebus"
 	"github.com/wailsapp/wails/v2/internal/subsystem"
 	"github.com/wailsapp/wails/v2/internal/webserver"
@@ -20,16 +17,12 @@ import (
 
 // App defines a Wails application structure
 type App struct {
-	appType string
-
 	binding *subsystem.Binding
 	call    *subsystem.Call
 	event   *subsystem.Event
 	log     *subsystem.Log
 	runtime *subsystem.Runtime
 
-	options *options.App
-
 	bindings   *binding.Bindings
 	logger     *logger.Logger
 	dispatcher *messagedispatcher.Dispatcher
@@ -37,40 +30,28 @@ type App struct {
 	webserver  *webserver.WebServer
 
 	debug bool
-
-	// Application Stores
-	loglevelStore  *runtime.Store
-	appconfigStore *runtime.Store
-
-	// Startup/Shutdown
-	startupCallback  func(*runtime.Runtime)
-	shutdownCallback func()
 }
 
 // Create App
-func CreateApp(appoptions *options.App) (*App, error) {
+func CreateApp(options *Options) *App {
+	options.mergeDefaults()
+	// We ignore the inputs (for now)
 
-	// Merge default options
-	options.MergeDefaults(appoptions)
-
-	// Set up logger
-	myLogger := logger.New(appoptions.Logger)
-	myLogger.SetLogLevel(appoptions.LogLevel)
+	// TODO: Allow logger output override on CLI
+	myLogger := logger.New(os.Stdout)
+	myLogger.SetLogLevel(logger.TRACE)
 
 	result := &App{
-		appType:          "server",
-		bindings:         binding.NewBindings(myLogger, options.Bind),
-		logger:           myLogger,
-		servicebus:       servicebus.New(myLogger),
-		webserver:        webserver.NewWebServer(myLogger),
-		startupCallback:  appoptions.Startup,
-		shutdownCallback: appoptions.Shutdown,
+		bindings:   binding.NewBindings(myLogger),
+		logger:     myLogger,
+		servicebus: servicebus.New(myLogger),
+		webserver:  webserver.NewWebServer(myLogger),
 	}
 
 	// Initialise app
 	result.Init()
 
-	return result, nil
+	return result
 }
 
 // Run the application
@@ -107,21 +88,8 @@ func (a *App) Run() error {
 		if debugMode {
 			a.servicebus.Debug()
 		}
-
-		// Start the runtime
-		runtime, err := subsystem.NewRuntime(a.servicebus, a.logger, a.startupCallback, a.shutdownCallback)
-		if err != nil {
-			return err
-		}
-		a.runtime = runtime
-		a.runtime.Start()
-
-		// Application Stores
-		a.loglevelStore = a.runtime.GoRuntime().Store.New("wails:loglevel", a.options.LogLevel)
-		a.appconfigStore = a.runtime.GoRuntime().Store.New("wails:appconfig", a.options)
-
 		a.servicebus.Start()
-		log, err := subsystem.NewLog(a.servicebus, a.logger, a.loglevelStore)
+		log, err := subsystem.NewLog(a.servicebus, a.logger)
 		if err != nil {
 			return err
 		}
@@ -134,6 +102,14 @@ func (a *App) Run() error {
 		a.dispatcher = dispatcher
 		a.dispatcher.Start()
 
+		// Start the runtime
+		runtime, err := subsystem.NewRuntime(a.servicebus, a.logger)
+		if err != nil {
+			return err
+		}
+		a.runtime = runtime
+		a.runtime.Start()
+
 		// Start the binding subsystem
 		binding, err := subsystem.NewBinding(a.servicebus, a.logger, a.bindings, runtime.GoRuntime())
 		if err != nil {
@@ -151,7 +127,7 @@ func (a *App) Run() error {
 		a.event.Start()
 
 		// Start the call subsystem
-		call, err := subsystem.NewCall(a.servicebus, a.logger, a.bindings.DB(), a.runtime.GoRuntime())
+		call, err := subsystem.NewCall(a.servicebus, a.logger, a.bindings.DB())
 		if err != nil {
 			return err
 		}
@@ -171,3 +147,14 @@ func (a *App) Run() error {
 
 	return cli.Run()
 }
+
+// Bind a struct to the application by passing in
+// a pointer to it
+func (a *App) Bind(structPtr interface{}) {
+
+	// Add the struct to the bindings
+	err := a.bindings.Add(structPtr)
+	if err != nil {
+		a.logger.Fatal("Error during binding: " + err.Error())
+	}
+}

v2/internal/binding/assets/package.json

@@ -1,11 +0,0 @@
-{
-  "name": "backend",
-  "version": "1.0.0",
-  "description": "Package to wrap backend method calls",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "",
-  "license": "ISC"
-}

v2/internal/binding/binding.go

@@ -2,53 +2,28 @@ package binding
 
 import (
 	"fmt"
-	"reflect"
-	"runtime"
 	"strings"
 
-	"github.com/leaanthony/slicer"
-
 	"github.com/wailsapp/wails/v2/internal/logger"
 )
 
 type Bindings struct {
-	db         *DB
-	logger     logger.CustomLogger
-	exemptions slicer.StringSlicer
+	db     *DB
+	logger logger.CustomLogger
 }
 
 // NewBindings returns a new Bindings object
-func NewBindings(logger *logger.Logger, structPointersToBind []interface{}, exemptions []interface{}) *Bindings {
-	result := &Bindings{
+func NewBindings(logger *logger.Logger) *Bindings {
+	return &Bindings{
 		db:     newDB(),
 		logger: logger.CustomLogger("Bindings"),
 	}
-
-	for _, exemption := range exemptions {
-		if exemptions == nil {
-			continue
-		}
-		name := runtime.FuncForPC(reflect.ValueOf(exemption).Pointer()).Name()
-		// Yuk yuk yuk! Is there a better way?
-		name = strings.TrimSuffix(name, "-fm")
-		result.exemptions.Add(name)
-	}
-
-	// Add the structs to bind
-	for _, ptr := range structPointersToBind {
-		err := result.Add(ptr)
-		if err != nil {
-			logger.Fatal("Error during binding: " + err.Error())
-		}
-	}
-
-	return result
 }
 
 // Add the given struct methods to the Bindings
 func (b *Bindings) Add(structPtr interface{}) error {
 
-	methods, err := b.getMethods(structPtr)
+	methods, err := getMethods(structPtr)
 	if err != nil {
 		return fmt.Errorf("cannot bind value to app: %s", err.Error())
 	}
@@ -61,6 +36,7 @@ func (b *Bindings) Add(structPtr interface{}) error {
 
 		// Add it as a regular method
 		b.db.AddMethod(packageName, structName, methodName, method)
+
 	}
 	return nil
 }

v2/internal/binding/boundMethod.go

@@ -30,9 +30,6 @@ func (b *BoundMethod) OutputCount() int {
 func (b *BoundMethod) ParseArgs(args []json.RawMessage) ([]interface{}, error) {
 
 	result := make([]interface{}, b.InputCount())
-	if len(args) != b.InputCount() {
-		return nil, fmt.Errorf("received %d arguments to method '%s', expected %d", len(args), b.Name, b.InputCount())
-	}
 	for index, arg := range args {
 		typ := b.Inputs[index].reflectType
 		inputValue := reflect.New(typ).Interface()

v2/internal/binding/generate.go

@@ -1,155 +0,0 @@
-package binding
-
-import (
-	"bytes"
-	_ "embed"
-	"fmt"
-	"log"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/wailsapp/wails/v2/internal/fs"
-
-	"github.com/leaanthony/slicer"
-)
-
-//go:embed assets/package.json
-var packageJSON []byte
-
-func (b *Bindings) GenerateBackendJS() {
-
-	store := b.db.store
-	var output bytes.Buffer
-
-	output.WriteString(`// @ts-check
-// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
-// This file is automatically generated. DO NOT EDIT
-
-const backend = {`)
-	output.WriteString("\n")
-
-	var sortedPackageNames slicer.StringSlicer
-	for packageName := range store {
-		sortedPackageNames.Add(packageName)
-	}
-	sortedPackageNames.Sort()
-	sortedPackageNames.Each(func(packageName string) {
-		packages := store[packageName]
-		output.WriteString(fmt.Sprintf("  \"%s\": {", packageName))
-		output.WriteString("\n")
-		var sortedStructNames slicer.StringSlicer
-		for structName := range packages {
-			sortedStructNames.Add(structName)
-		}
-		sortedStructNames.Sort()
-
-		sortedStructNames.Each(func(structName string) {
-			structs := packages[structName]
-			output.WriteString(fmt.Sprintf("    \"%s\": {", structName))
-			output.WriteString("\n")
-
-			var sortedMethodNames slicer.StringSlicer
-			for methodName := range structs {
-				sortedMethodNames.Add(methodName)
-			}
-			sortedMethodNames.Sort()
-
-			sortedMethodNames.Each(func(methodName string) {
-				methodDetails := structs[methodName]
-				output.WriteString("      /**\n")
-				output.WriteString("       * " + methodName + "\n")
-				var args slicer.StringSlicer
-				for count, input := range methodDetails.Inputs {
-					arg := fmt.Sprintf("arg%d", count+1)
-					args.Add(arg)
-					output.WriteString(fmt.Sprintf("       * @param {%s} %s - Go Type: %s\n", goTypeToJSDocType(input.TypeName), arg, input.TypeName))
-				}
-				returnType := "Promise"
-				returnTypeDetails := ""
-				if methodDetails.OutputCount() > 0 {
-					firstType := goTypeToJSDocType(methodDetails.Outputs[0].TypeName)
-					returnType += "<" + firstType
-					if methodDetails.OutputCount() == 2 {
-						secondType := goTypeToJSDocType(methodDetails.Outputs[1].TypeName)
-						returnType += "|" + secondType
-					}
-					returnType += ">"
-					returnTypeDetails = " - Go Type: " + methodDetails.Outputs[0].TypeName
-				} else {
-					returnType = "Promise<void>"
-				}
-				output.WriteString("       * @returns {" + returnType + "} " + returnTypeDetails + "\n")
-				output.WriteString("       */\n")
-				argsString := args.Join(", ")
-				output.WriteString(fmt.Sprintf("      \"%s\": (%s) => {", methodName, argsString))
-				output.WriteString("\n")
-				output.WriteString(fmt.Sprintf("        return window.backend.%s.%s.%s(%s);", packageName, structName, methodName, argsString))
-				output.WriteString("\n")
-				output.WriteString(fmt.Sprintf("      },"))
-				output.WriteString("\n")
-
-			})
-
-			output.WriteString(fmt.Sprintf("    }"))
-			output.WriteString("\n")
-		})
-
-		output.WriteString(fmt.Sprintf("  }\n"))
-		output.WriteString("\n")
-	})
-
-	output.WriteString(`};
-export default backend;`)
-	output.WriteString("\n")
-
-	// TODO: Make this configurable in wails.json
-	dirname, err := fs.RelativeToCwd("frontend/src/backend")
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	if !fs.DirExists(dirname) {
-		err := fs.MkDirs(dirname)
-		if err != nil {
-			log.Fatal(err)
-		}
-	}
-
-	packageJsonFile := filepath.Join(dirname, "package.json")
-	if !fs.FileExists(packageJsonFile) {
-		err := os.WriteFile(packageJsonFile, packageJSON, 0755)
-		if err != nil {
-			log.Fatal(err)
-		}
-	}
-
-	filename := filepath.Join(dirname, "index.js")
-	err = os.WriteFile(filename, output.Bytes(), 0755)
-	if err != nil {
-		log.Fatal(err)
-	}
-}
-
-func goTypeToJSDocType(input string) string {
-	switch true {
-	case input == "string":
-		return "string"
-	case input == "error":
-		return "Error"
-	case
-		strings.HasPrefix(input, "int"),
-		strings.HasPrefix(input, "uint"),
-		strings.HasPrefix(input, "float"):
-		return "number"
-	case input == "bool":
-		return "boolean"
-	case input == "[]byte":
-		return "string"
-	case strings.HasPrefix(input, "[]"):
-		arrayType := goTypeToJSDocType(input[2:])
-		return "Array.<" + arrayType + ">"
-	default:
-		return "any"
-	}
-}

v2/internal/binding/generate_test.go

@@ -1,87 +0,0 @@
-package binding
-
-import (
-	"testing"
-)
-
-func Test_goTypeToJSDocType(t *testing.T) {
-
-	tests := []struct {
-		name  string
-		input string
-		want  string
-	}{
-		{
-			name:  "string",
-			input: "string",
-			want:  "string",
-		},
-		{
-			name:  "error",
-			input: "error",
-			want:  "Error",
-		},
-		{
-			name:  "int",
-			input: "int",
-			want:  "number",
-		},
-		{
-			name:  "int32",
-			input: "int32",
-			want:  "number",
-		},
-		{
-			name:  "uint",
-			input: "uint",
-			want:  "number",
-		},
-		{
-			name:  "uint32",
-			input: "uint32",
-			want:  "number",
-		},
-		{
-			name:  "float32",
-			input: "float32",
-			want:  "number",
-		},
-		{
-			name:  "float64",
-			input: "float64",
-			want:  "number",
-		},
-		{
-			name:  "bool",
-			input: "bool",
-			want:  "boolean",
-		},
-		{
-			name:  "[]byte",
-			input: "[]byte",
-			want:  "string",
-		},
-		{
-			name:  "[]int",
-			input: "[]int",
-			want:  "Array.<number>",
-		},
-		{
-			name:  "[]bool",
-			input: "[]bool",
-			want:  "Array.<boolean>",
-		},
-		{
-			name:  "anything else",
-			input: "foo",
-			want:  "any",
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := goTypeToJSDocType(tt.input); got != tt.want {
-				t.Errorf("goTypeToJSDocType() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}

v2/internal/binding/reflect.go

@@ -23,7 +23,7 @@ func isStruct(value interface{}) bool {
 	return reflect.ValueOf(value).Kind() == reflect.Struct
 }
 
-func (b *Bindings) getMethods(value interface{}) ([]*BoundMethod, error) {
+func getMethods(value interface{}) ([]*BoundMethod, error) {
 
 	// Create result placeholder
 	var result []*BoundMethod
@@ -56,11 +56,6 @@ func (b *Bindings) getMethods(value interface{}) ([]*BoundMethod, error) {
 		fullMethodName := baseName + "." + methodName
 		method := structValue.MethodByName(methodName)
 
-		methodReflectName := runtime.FuncForPC(methodDef.Func.Pointer()).Name()
-		if b.exemptions.Contains(methodReflectName) {
-			continue
-		}
-
 		// Create new method
 		boundMethod := &BoundMethod{
 			Name:     fullMethodName,

v2/internal/bridge/bridge.go

@@ -1,113 +0,0 @@
-package bridge
-
-import (
-	"context"
-	"log"
-	"net/http"
-	"sync"
-
-	"github.com/wailsapp/wails/v2/internal/menumanager"
-
-	"github.com/wailsapp/wails/v2/internal/messagedispatcher"
-
-	"github.com/gorilla/websocket"
-	"github.com/wailsapp/wails/v2/internal/logger"
-)
-
-type Bridge struct {
-	upgrader websocket.Upgrader
-	server   *http.Server
-	myLogger *logger.Logger
-
-	bindings   string
-	dispatcher *messagedispatcher.Dispatcher
-
-	mu       sync.Mutex
-	sessions map[string]*session
-
-	ctx    context.Context
-	cancel context.CancelFunc
-
-	// Dialog client
-	dialog *messagedispatcher.DispatchClient
-
-	// Menus
-	menumanager *menumanager.Manager
-}
-
-func NewBridge(myLogger *logger.Logger) *Bridge {
-	result := &Bridge{
-		myLogger: myLogger,
-		upgrader: websocket.Upgrader{CheckOrigin: func(r *http.Request) bool { return true }},
-		sessions: make(map[string]*session),
-	}
-
-	myLogger.SetLogLevel(1)
-
-	ctx, cancel := context.WithCancel(context.Background())
-	result.ctx = ctx
-	result.cancel = cancel
-	result.server = &http.Server{Addr: ":34115"}
-	http.HandleFunc("/bridge", result.wsBridgeHandler)
-	return result
-}
-
-func (b *Bridge) Run(dispatcher *messagedispatcher.Dispatcher, menumanager *menumanager.Manager, bindings string, debug bool) error {
-
-	// Ensure we cancel the context when we shutdown
-	defer b.cancel()
-
-	b.bindings = bindings
-	b.dispatcher = dispatcher
-	b.menumanager = menumanager
-
-	// Setup dialog handler
-	dialogClient := NewDialogClient(b.myLogger)
-	b.dialog = dispatcher.RegisterClient(dialogClient)
-	dialogClient.dispatcher = b.dialog
-
-	b.myLogger.Info("Bridge mode started.")
-
-	err := b.server.ListenAndServe()
-	if err != nil && err != http.ErrServerClosed {
-		return err
-	}
-
-	return nil
-}
-
-func (b *Bridge) wsBridgeHandler(w http.ResponseWriter, r *http.Request) {
-	c, err := b.upgrader.Upgrade(w, r, nil)
-	if err != nil {
-		log.Print("upgrade:", err)
-		return
-	}
-
-	if err != nil {
-		http.Error(w, "Could not open websocket connection", http.StatusBadRequest)
-	}
-	b.myLogger.Info("Connection from frontend accepted [%s].", c.RemoteAddr().String())
-	b.startSession(c)
-
-}
-
-func (b *Bridge) startSession(conn *websocket.Conn) {
-
-	// Create a new session for this connection
-	s := newSession(conn, b.menumanager, b.bindings, b.dispatcher, b.myLogger, b.ctx)
-
-	// Setup the close handler
-	conn.SetCloseHandler(func(int, string) error {
-		b.myLogger.Info("Connection dropped [%s].", s.Identifier())
-		b.dispatcher.RemoveClient(s.client)
-		b.mu.Lock()
-		delete(b.sessions, s.Identifier())
-		b.mu.Unlock()
-		return nil
-	})
-
-	b.mu.Lock()
-	go s.start(len(b.sessions) == 0)
-	b.sessions[s.Identifier()] = s
-	b.mu.Unlock()
-}

v2/internal/bridge/client.go

@@ -1,133 +0,0 @@
-package bridge
-
-import (
-	"github.com/wailsapp/wails/v2/pkg/options/dialog"
-)
-
-type BridgeClient struct {
-	session *session
-
-	// Tray menu cache to send to reconnecting clients
-	messageCache chan string
-}
-
-func (b BridgeClient) DeleteTrayMenuByID(id string) {
-	b.session.sendMessage("TD" + id)
-}
-
-func NewBridgeClient() *BridgeClient {
-	return &BridgeClient{
-		messageCache: make(chan string, 100),
-	}
-}
-
-func (b BridgeClient) Quit() {
-	b.session.log.Info("Quit unsupported in Bridge mode")
-}
-
-func (b BridgeClient) NotifyEvent(message string) {
-	b.session.sendMessage("n" + message)
-	b.session.log.Info("NotifyEvent: %s", message)
-}
-
-func (b BridgeClient) CallResult(message string) {
-	b.session.sendMessage("c" + message)
-}
-
-func (b BridgeClient) OpenDialog(dialogOptions *dialog.OpenDialog, callbackID string) {
-	// Handled by dialog_client
-}
-
-func (b BridgeClient) SaveDialog(dialogOptions *dialog.SaveDialog, callbackID string) {
-	// Handled by dialog_client
-}
-
-func (b BridgeClient) MessageDialog(dialogOptions *dialog.MessageDialog, callbackID string) {
-	// Handled by dialog_client
-}
-
-func (b BridgeClient) WindowSetTitle(title string) {
-	b.session.log.Info("WindowSetTitle unsupported in Bridge mode")
-}
-
-func (b BridgeClient) WindowShow() {
-	b.session.log.Info("WindowShow unsupported in Bridge mode")
-}
-
-func (b BridgeClient) WindowHide() {
-	b.session.log.Info("WindowHide unsupported in Bridge mode")
-}
-
-func (b BridgeClient) WindowCenter() {
-	b.session.log.Info("WindowCenter unsupported in Bridge mode")
-}
-
-func (b BridgeClient) WindowMaximise() {
-	b.session.log.Info("WindowMaximise unsupported in Bridge mode")
-}
-
-func (b BridgeClient) WindowUnmaximise() {
-	b.session.log.Info("WindowUnmaximise unsupported in Bridge mode")
-}
-
-func (b BridgeClient) WindowMinimise() {
-	b.session.log.Info("WindowMinimise unsupported in Bridge mode")
-}
-
-func (b BridgeClient) WindowUnminimise() {
-	b.session.log.Info("WindowUnminimise unsupported in Bridge mode")
-}
-
-func (b BridgeClient) WindowPosition(x int, y int) {
-	b.session.log.Info("WindowPosition unsupported in Bridge mode")
-}
-
-func (b BridgeClient) WindowSize(width int, height int) {
-	b.session.log.Info("WindowSize unsupported in Bridge mode")
-}
-
-func (b BridgeClient) WindowSetMinSize(width int, height int) {
-	b.session.log.Info("WindowSetMinSize unsupported in Bridge mode")
-}
-
-func (b BridgeClient) WindowSetMaxSize(width int, height int) {
-	b.session.log.Info("WindowSetMaxSize unsupported in Bridge mode")
-}
-
-func (b BridgeClient) WindowFullscreen() {
-	b.session.log.Info("WindowFullscreen unsupported in Bridge mode")
-}
-
-func (b BridgeClient) WindowUnFullscreen() {
-	b.session.log.Info("WindowUnFullscreen unsupported in Bridge mode")
-}
-
-func (b BridgeClient) WindowSetColour(colour int) {
-	b.session.log.Info("WindowSetColour unsupported in Bridge mode")
-}
-
-func (b BridgeClient) DarkModeEnabled(callbackID string) {
-	b.session.log.Info("DarkModeEnabled unsupported in Bridge mode")
-}
-
-func (b BridgeClient) SetApplicationMenu(menuJSON string) {
-	b.session.log.Info("SetApplicationMenu unsupported in Bridge mode")
-}
-
-func (b BridgeClient) SetTrayMenu(trayMenuJSON string) {
-	b.session.sendMessage("TS" + trayMenuJSON)
-}
-
-func (b BridgeClient) UpdateTrayMenuLabel(trayMenuJSON string) {
-	b.session.sendMessage("TU" + trayMenuJSON)
-}
-
-func (b BridgeClient) UpdateContextMenu(contextMenuJSON string) {
-	b.session.log.Info("UpdateContextMenu unsupported in Bridge mode")
-}
-
-func newBridgeClient(session *session) *BridgeClient {
-	return &BridgeClient{
-		session: session,
-	}
-}

v2/internal/bridge/dialog_client.go

@@ -1,144 +0,0 @@
-package bridge
-
-import (
-	"fmt"
-	"os/exec"
-	"strconv"
-	"strings"
-
-	"github.com/wailsapp/wails/v2/internal/messagedispatcher"
-
-	"github.com/wailsapp/wails/v2/internal/logger"
-
-	"github.com/leaanthony/slicer"
-	"github.com/wailsapp/wails/v2/pkg/options/dialog"
-)
-
-type DialogClient struct {
-	dispatcher *messagedispatcher.DispatchClient
-	log        *logger.Logger
-}
-
-func (d *DialogClient) DeleteTrayMenuByID(id string) {
-}
-
-func NewDialogClient(log *logger.Logger) *DialogClient {
-	return &DialogClient{
-		log: log,
-	}
-}
-
-func (d *DialogClient) Quit() {
-}
-
-func (d *DialogClient) NotifyEvent(message string) {
-}
-
-func (d *DialogClient) CallResult(message string) {
-}
-
-func (d *DialogClient) OpenDialog(dialogOptions *dialog.OpenDialog, callbackID string) {
-}
-
-func (d *DialogClient) SaveDialog(dialogOptions *dialog.SaveDialog, callbackID string) {
-}
-
-func (d *DialogClient) MessageDialog(dialogOptions *dialog.MessageDialog, callbackID string) {
-
-	osa, err := exec.LookPath("osascript")
-	if err != nil {
-		d.log.Info("MessageDialog unavailable (osascript not found)")
-		return
-	}
-
-	var btns slicer.StringSlicer
-	defaultButton := ""
-	cancelButton := ""
-	for index, btn := range dialogOptions.Buttons {
-		btns.Add(strconv.Quote(btn))
-		if btn == dialogOptions.DefaultButton {
-			defaultButton = fmt.Sprintf("default button %d", index+1)
-		}
-		if btn == dialogOptions.CancelButton {
-			cancelButton = fmt.Sprintf("cancel button %d", index+1)
-		}
-	}
-	buttons := "{" + btns.Join(",") + "}"
-	script := fmt.Sprintf("display dialog \"%s\" buttons %s %s %s with title \"%s\"", dialogOptions.Message, buttons, defaultButton, cancelButton, dialogOptions.Title)
-	go func() {
-		out, err := exec.Command(osa, "-e", script).Output()
-		if err != nil {
-			// Assume user has pressed cancel button
-			if dialogOptions.CancelButton != "" {
-				d.dispatcher.DispatchMessage("DM" + callbackID + "|" + dialogOptions.CancelButton)
-				return
-			}
-			d.log.Error("Dialog had bad exit code. If this was a Cancel button, add 'CancelButton' to the dialog.MessageDialog struct. Error: %s", err.Error())
-			d.dispatcher.DispatchMessage("DM" + callbackID + "|error - check logs")
-			return
-		}
-
-		buttonPressed := strings.TrimSpace(strings.TrimPrefix(string(out), "button returned:"))
-		d.dispatcher.DispatchMessage("DM" + callbackID + "|" + buttonPressed)
-	}()
-}
-
-func (d *DialogClient) WindowSetTitle(title string) {
-}
-
-func (d *DialogClient) WindowShow() {
-}
-
-func (d *DialogClient) WindowHide() {
-}
-
-func (d *DialogClient) WindowCenter() {
-}
-
-func (d *DialogClient) WindowMaximise() {
-}
-
-func (d *DialogClient) WindowUnmaximise() {
-}
-
-func (d *DialogClient) WindowMinimise() {
-}
-
-func (d *DialogClient) WindowUnminimise() {
-}
-
-func (d *DialogClient) WindowPosition(x int, y int) {
-}
-
-func (d *DialogClient) WindowSize(width int, height int) {
-}
-
-func (d *DialogClient) WindowSetMinSize(width int, height int) {
-}
-
-func (d *DialogClient) WindowSetMaxSize(width int, height int) {
-}
-
-func (d *DialogClient) WindowFullscreen() {
-}
-
-func (d *DialogClient) WindowUnFullscreen() {
-}
-
-func (d *DialogClient) WindowSetColour(colour int) {
-}
-
-func (d *DialogClient) DarkModeEnabled(callbackID string) {
-}
-
-func (d *DialogClient) SetApplicationMenu(menuJSON string) {
-}
-
-func (d *DialogClient) SetTrayMenu(trayMenuJSON string) {
-}
-
-func (d *DialogClient) UpdateTrayMenuLabel(trayMenuJSON string) {
-}
-
-func (d *DialogClient) UpdateContextMenu(contextMenuJSON string) {
-}

v2/internal/bridge/session.go

@@ -1,162 +0,0 @@
-package bridge
-
-import (
-	"context"
-	_ "embed"
-	"log"
-	"runtime"
-	"time"
-
-	"github.com/wailsapp/wails/v2/internal/menumanager"
-
-	"github.com/wailsapp/wails/v2/internal/messagedispatcher"
-
-	"github.com/gorilla/websocket"
-	"github.com/wailsapp/wails/v2/internal/logger"
-)
-
-//go:embed darwin.js
-var darwinRuntime string
-
-// session represents a single websocket session
-type session struct {
-	bindings string
-	conn     *websocket.Conn
-	//eventManager interfaces.EventManager
-	log *logger.Logger
-	//ipc          interfaces.IPCManager
-
-	// Mutex for writing to the socket
-	shutdown  chan bool
-	writeChan chan []byte
-
-	done bool
-
-	// context
-	ctx context.Context
-
-	// client
-	client *messagedispatcher.DispatchClient
-
-	// Menus
-	menumanager *menumanager.Manager
-}
-
-func newSession(conn *websocket.Conn, menumanager *menumanager.Manager, bindings string, dispatcher *messagedispatcher.Dispatcher, logger *logger.Logger, ctx context.Context) *session {
-	result := &session{
-		conn:        conn,
-		bindings:    bindings,
-		log:         logger,
-		shutdown:    make(chan bool),
-		writeChan:   make(chan []byte, 100),
-		ctx:         ctx,
-		menumanager: menumanager,
-	}
-
-	result.client = dispatcher.RegisterClient(newBridgeClient(result))
-
-	return result
-
-}
-
-// Identifier returns a string identifier for the remote connection.
-// Taking the form of the client's <ip address>:<port>.
-func (s *session) Identifier() string {
-	if s.conn != nil {
-		return s.conn.RemoteAddr().String()
-	}
-	return ""
-}
-
-func (s *session) sendMessage(msg string) error {
-	if !s.done {
-		s.writeChan <- []byte(msg)
-	}
-	return nil
-}
-
-func (s *session) start(firstSession bool) {
-	s.log.SetLogLevel(1)
-	s.log.Info("Connected to frontend.")
-	go s.writePump()
-
-	var wailsRuntime string
-	switch runtime.GOOS {
-	case "darwin":
-		wailsRuntime = darwinRuntime
-	default:
-		log.Fatal("platform not supported")
-	}
-
-	bindingsMessage := "window.wailsbindings = `" + s.bindings + "`;"
-	s.log.Info(bindingsMessage)
-	bootstrapMessage := bindingsMessage + wailsRuntime
-
-	s.sendMessage("b" + bootstrapMessage)
-
-	// Send menus
-	traymenus, err := s.menumanager.GetTrayMenus()
-	if err != nil {
-		s.log.Error(err.Error())
-	}
-
-	for _, trayMenu := range traymenus {
-		s.sendMessage("TS" + trayMenu)
-	}
-
-	for {
-		messageType, buffer, err := s.conn.ReadMessage()
-		if messageType == -1 {
-			return
-		}
-		if err != nil {
-			s.log.Error("Error reading message: %v", err)
-			err = s.conn.Close()
-			return
-		}
-
-		message := string(buffer)
-
-		s.log.Debug("Got message: %#v\n", message)
-
-		// Dispatch message as normal
-		s.client.DispatchMessage(message)
-
-		if s.done {
-			break
-		}
-	}
-}
-
-// Shutdown
-func (s *session) Shutdown() {
-	s.conn.Close()
-	s.done = true
-	s.log.Info("session %v exit", s.Identifier())
-}
-
-// writePump pulls messages from the writeChan and sends them to the client
-// since it uses a channel to read the messages the socket is protected without locks
-func (s *session) writePump() {
-	s.log.Debug("Session %v - writePump start", s.Identifier())
-	defer s.log.Debug("Session %v - writePump shutdown", s.Identifier())
-	for {
-		select {
-		case <-s.ctx.Done():
-			s.Shutdown()
-			return
-		case msg, ok := <-s.writeChan:
-			s.conn.SetWriteDeadline(time.Now().Add(1 * time.Second))
-			if !ok {
-				s.log.Debug("writeChan was closed!")
-				s.conn.WriteMessage(websocket.CloseMessage, []byte{})
-				return
-			}
-
-			if err := s.conn.WriteMessage(websocket.TextMessage, msg); err != nil {
-				s.log.Debug(err.Error())
-				return
-			}
-		}
-	}
-}

v2/internal/colour/colour.go

@@ -1,89 +0,0 @@
-package colour
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/wzshiming/ctc"
-)
-
-func Col(col ctc.Color, text string) string {
-	return fmt.Sprintf("%s%s%s", col, text, ctc.Reset)
-}
-
-func Yellow(text string) string {
-	return Col(ctc.ForegroundBrightYellow, text)
-}
-
-func Red(text string) string {
-	return Col(ctc.ForegroundBrightRed, text)
-}
-
-func Blue(text string) string {
-	return Col(ctc.ForegroundBrightBlue, text)
-}
-
-func Green(text string) string {
-	return Col(ctc.ForegroundBrightGreen, text)
-}
-
-func Cyan(text string) string {
-	return Col(ctc.ForegroundBrightCyan, text)
-}
-
-func Magenta(text string) string {
-	return Col(ctc.ForegroundBrightMagenta, text)
-}
-
-func White(text string) string {
-	return Col(ctc.ForegroundBrightWhite, text)
-}
-
-func Black(text string) string {
-	return Col(ctc.ForegroundBrightBlack, text)
-}
-
-func DarkYellow(text string) string {
-	return Col(ctc.ForegroundYellow, text)
-}
-
-func DarkRed(text string) string {
-	return Col(ctc.ForegroundRed, text)
-}
-
-func DarkBlue(text string) string {
-	return Col(ctc.ForegroundBlue, text)
-}
-
-func DarkGreen(text string) string {
-	return Col(ctc.ForegroundGreen, text)
-}
-
-func DarkCyan(text string) string {
-	return Col(ctc.ForegroundCyan, text)
-}
-
-func DarkMagenta(text string) string {
-	return Col(ctc.ForegroundMagenta, text)
-}
-
-func DarkWhite(text string) string {
-	return Col(ctc.ForegroundWhite, text)
-}
-
-func DarkBlack(text string) string {
-	return Col(ctc.ForegroundBlack, text)
-}
-
-var rainbowCols = []func(string) string{Red, Yellow, Green, Cyan, Blue, Magenta}
-
-func Rainbow(text string) string {
-	var builder strings.Builder
-
-	for i := 0; i < len(text); i++ {
-		fn := rainbowCols[i%len(rainbowCols)]
-		builder.WriteString(fn(text[i : i+1]))
-	}
-
-	return builder.String()
-}

v2/internal/counter/counter.go

@@ -0,0 +1,40 @@
+package counter
+
+import "sync"
+
+type Counter struct {
+	initialValue uint64
+	value        uint64
+	lock         sync.Mutex
+}
+
+func NewCounter(initialValue uint64) *Counter {
+	return &Counter{
+		initialValue: initialValue,
+		value:        initialValue,
+	}
+}
+
+// SetValue sets the value to the given value
+func (c *Counter) SetValue(value uint64) {
+	c.lock.Lock()
+	c.value = value
+	c.lock.Unlock()
+}
+
+// Increment adds 1 to the counter and returns its value
+func (c *Counter) Increment() uint64 {
+	var result uint64
+	c.lock.Lock()
+	c.value++
+	result = c.value
+	c.lock.Unlock()
+	return result
+}
+
+// Reset the value to the initial value
+func (c *Counter) Reset() {
+	c.lock.Lock()
+	c.value = c.initialValue
+	c.lock.Unlock()
+}

v2/internal/deepcopy/LICENSE

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2014 Joel
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

v2/internal/deepcopy/deepcopy.go

@@ -1,125 +0,0 @@
-// deepcopy makes deep copies of things. A standard copy will copy the
-// pointers: deep copy copies the values pointed to.  Unexported field
-// values are not copied.
-//
-// Copyright (c)2014-2016, Joel Scoble (github.com/mohae), all rights reserved.
-// License: MIT, for more details check the included LICENSE file.
-package deepcopy
-
-import (
-	"reflect"
-	"time"
-)
-
-// Interface for delegating copy process to type
-type Interface interface {
-	DeepCopy() interface{}
-}
-
-// Iface is an alias to Copy; this exists for backwards compatibility reasons.
-func Iface(iface interface{}) interface{} {
-	return Copy(iface)
-}
-
-// Copy creates a deep copy of whatever is passed to it and returns the copy
-// in an interface{}.  The returned value will need to be asserted to the
-// correct type.
-func Copy(src interface{}) interface{} {
-	if src == nil {
-		return nil
-	}
-
-	// Make the interface a reflect.Value
-	original := reflect.ValueOf(src)
-
-	// Make a copy of the same type as the original.
-	cpy := reflect.New(original.Type()).Elem()
-
-	// Recursively copy the original.
-	copyRecursive(original, cpy)
-
-	// Return the copy as an interface.
-	return cpy.Interface()
-}
-
-// copyRecursive does the actual copying of the interface. It currently has
-// limited support for what it can handle. Add as needed.
-func copyRecursive(original, cpy reflect.Value) {
-	// check for implement deepcopy.Interface
-	if original.CanInterface() {
-		if copier, ok := original.Interface().(Interface); ok {
-			cpy.Set(reflect.ValueOf(copier.DeepCopy()))
-			return
-		}
-	}
-
-	// handle according to original's Kind
-	switch original.Kind() {
-	case reflect.Ptr:
-		// Get the actual value being pointed to.
-		originalValue := original.Elem()
-
-		// if  it isn't valid, return.
-		if !originalValue.IsValid() {
-			return
-		}
-		cpy.Set(reflect.New(originalValue.Type()))
-		copyRecursive(originalValue, cpy.Elem())
-
-	case reflect.Interface:
-		// If this is a nil, don't do anything
-		if original.IsNil() {
-			return
-		}
-		// Get the value for the interface, not the pointer.
-		originalValue := original.Elem()
-
-		// Get the value by calling Elem().
-		copyValue := reflect.New(originalValue.Type()).Elem()
-		copyRecursive(originalValue, copyValue)
-		cpy.Set(copyValue)
-
-	case reflect.Struct:
-		t, ok := original.Interface().(time.Time)
-		if ok {
-			cpy.Set(reflect.ValueOf(t))
-			return
-		}
-		// Go through each field of the struct and copy it.
-		for i := 0; i < original.NumField(); i++ {
-			// The Type's StructField for a given field is checked to see if StructField.PkgPath
-			// is set to determine if the field is exported or not because CanSet() returns false
-			// for settable fields.  I'm not sure why.  -mohae
-			if original.Type().Field(i).PkgPath != "" {
-				continue
-			}
-			copyRecursive(original.Field(i), cpy.Field(i))
-		}
-
-	case reflect.Slice:
-		if original.IsNil() {
-			return
-		}
-		// Make a new slice and copy each element.
-		cpy.Set(reflect.MakeSlice(original.Type(), original.Len(), original.Cap()))
-		for i := 0; i < original.Len(); i++ {
-			copyRecursive(original.Index(i), cpy.Index(i))
-		}
-
-	case reflect.Map:
-		if original.IsNil() {
-			return
-		}
-		cpy.Set(reflect.MakeMap(original.Type()))
-		for _, key := range original.MapKeys() {
-			originalValue := original.MapIndex(key)
-			copyValue := reflect.New(originalValue.Type()).Elem()
-			copyRecursive(originalValue, copyValue)
-			copyKey := Copy(key.Interface())
-			cpy.SetMapIndex(reflect.ValueOf(copyKey), copyValue)
-		}
-
-	default:
-		cpy.Set(original)
-	}
-}

v2/internal/ffenestri/LICENCES.md

@@ -1,11 +1,5 @@
 # 3rd Party Licenses
 
-## Webview
-Whilst not using the library directly, there is certainly some code that is inspired by or used from the webview library.
-
-Homepage: https://github.com/webview/webview
-License: https://github.com/webview/webview/blob/master/LICENSE
-
 ## vec
 Homepage: https://github.com/rxi/vec
 License: https://github.com/rxi/vec/blob/master/LICENSE
@@ -16,4 +10,8 @@ License: http://git.ozlabs.org/?p=ccan;a=blob;f=licenses/BSD-MIT;h=89de354795ec7
 
 ## hashmap
 Homepage: https://github.com/sheredom/hashmap.h
-License: https://github.com/sheredom/hashmap.h/blob/master/LICENSE
+License: https://github.com/sheredom/hashmap.h/blob/master/LICENSE
+
+## utf8.h
+Homepage: https://github.com/sheredom/utf8.h
+License: https://github.com/sheredom/utf8.h/blob/master/LICENSE

v2/internal/ffenestri/common.c

@@ -1,6 +1,3 @@
-// +build !windows
-
-
 //
 // Created by Lea Anthony on 6/1/21.
 //
@@ -41,21 +38,31 @@ int freeHashmapItem(void *const context, struct hashmap_element_s *const e) {
 const char* getJSONString(JsonNode *item, const char* key) {
     // Get key
     JsonNode *node = json_find_member(item, key);
-    const char *result = "";
+    const char *result = NULL;
     if ( node != NULL && node->tag == JSON_STRING) {
         result = node->string_;
     }
     return result;
 }
 
+const char* getJSONStringDefault(JsonNode *item, const char* key, const char* defaultValue) {
+    const char* result = getJSONString(item, key);
+    if ( result == NULL ) result = defaultValue;
+    return result;
+}
+
 void ABORT_JSON(JsonNode *node, const char* key) {
     ABORT("Unable to read required key '%s' from JSON: %s\n", key, json_encode(node));
 }
 
-const char* mustJSONString(JsonNode *node, const char* key) {
-    const char* result = getJSONString(node, key);
-    if ( result == NULL ) {
-        ABORT_JSON(node, key);
+const char* mustJSONString(JsonNode *item, const char* key) {
+    JsonNode *member = json_find_member(item, key);
+    if ( member == NULL ) {
+        ABORT_JSON(item, key);
+    }
+    const char *result = "";
+    if ( member != NULL && member->tag == JSON_STRING) {
+        result = member->string_;
     }
     return result;
 }
@@ -71,15 +78,23 @@ JsonNode* getJSONObject(JsonNode* node, const char* key) {
     return json_find_member(node, key);
 }
 
-bool getJSONBool(JsonNode *item, const char* key, bool *result) {
-    JsonNode *node = json_find_member(item, key);
-    if ( node != NULL && node->tag == JSON_BOOL) {
-        *result = node->bool_;
-        return true;
+bool getJSONBool(JsonNode *node, const char* key) {
+    JsonNode *result = json_find_member(node, key);
+    if ( result != NULL && result->tag == JSON_BOOL) {
+        return result->bool_;
     }
     return false;
 }
 
+int mustJSONInt(JsonNode *node, const char* key) {
+    JsonNode *result = json_find_member(node, key);
+    if ( result == NULL || result->tag != JSON_NUMBER) {
+        ABORT_JSON(result, key);
+    }
+
+    return (int) result->number_;
+}
+
 bool getJSONInt(JsonNode *item, const char* key, int *result) {
     JsonNode *node = json_find_member(item, key);
     if ( node != NULL && node->tag == JSON_NUMBER) {

v2/internal/ffenestri/common.h

@@ -5,6 +5,10 @@
 #ifndef COMMON_H
 #define COMMON_H
 
+#define OBJC_OLD_DISPATCH_PROTOTYPES 1
+#include <objc/objc-runtime.h>
+#include <CoreGraphics/CoreGraphics.h>
+
 #include <stdio.h>
 #include <stdarg.h>
 #include "string.h"
@@ -14,23 +18,45 @@
 
 #define STREQ(a,b) strcmp(a, b) == 0
 #define STREMPTY(string) strlen(string) == 0
-#define STRCOPY(a) concat(a, "")
+#define STRCOPY(str) (str == NULL ? NULL : concat(str, ""))
 #define STR_HAS_CHARS(input) input != NULL && strlen(input) > 0
-#define MEMFREE(input) free((void*)input); input = NULL;
+#define MEMFREE(input) if(input != NULL) { free((void*)input); input = NULL; }
 #define FREE_AND_SET(variable, value) if( variable != NULL ) { MEMFREE(variable); } variable = value
+#define NEW(struct) malloc(sizeof(struct));
+
+#define HASHMAP_INIT(hashmap, initialSize, name) \
+    if( 0 != hashmap_create((const unsigned)initialSize, &hashmap)) { \
+        ABORT("Not enough memory to allocate %s!\n", name);          \
+    }
+
+#define HASHMAP_PUT(hashmap, key, value) hashmap_put(&hashmap, key, strlen(key), value);
+#define HASHMAP_GET(hashmap, key) hashmap_get(&hashmap, key, strlen(key));
+#define HASHMAP_DESTROY(hashmap) hashmap_destroy(&hashmap);
+#define HASHMAP_SIZE(hashmap) hashmap_num_entries(&hashmap)
+#define HASHMAP_ITERATE(hashmap, function, context) if( hashmap_num_entries(&hashmap) > 0 ) { \
+        if (0!=hashmap_iterate_pairs(&hashmap, function, context)) { \
+            ABORT("failed to iterate hashmap entries!"); \
+        } \
+    }
+#define JSON_ADD_STRING(jsonObject, key, value) if( value != NULL ) { json_append_member(jsonObject, (char*)key, json_mkstring(value)); }
+#define JSON_ADD_NUMBER(jsonObject, key, value) json_append_member(jsonObject, (char*)key, json_mknumber(value));
+#define JSON_ADD_OBJECT(jsonObject, key, value) if( value != NULL ) { json_append_member(jsonObject, (char*)key, value); }
+#define JSON_ADD_BOOL(jsonObject, key, value) json_append_member(jsonObject, (char*)key, json_mkbool(value));
+#define JSON_ADD_ELEMENT(jsonObject, value) json_append_element(jsonObject, value);
 
 // Credit: https://stackoverflow.com/a/8465083
 char* concat(const char *string1, const char *string2);
 void ABORT(const char *message, ...);
-int freeHashmapItem(void *const context, struct hashmap_element_s *const e);
+int freeHashmapItem(void *context, struct hashmap_element_s *e);
 const char* getJSONString(JsonNode *item, const char* key);
+const char* getJSONStringDefault(JsonNode *item, const char* key, const char* defaultValue);
 const char* mustJSONString(JsonNode *node, const char* key);
 JsonNode* getJSONObject(JsonNode* node, const char* key);
 JsonNode* mustJSONObject(JsonNode *node, const char* key);
 
-bool getJSONBool(JsonNode *item, const char* key, bool *result);
+bool getJSONBool(JsonNode *item, const char* key);
 bool getJSONInt(JsonNode *item, const char* key, int *result);
-
+int mustJSONInt(JsonNode *node, const char* key);
 JsonNode* mustParseJSON(const char* JSON);
 
 #endif //ASSETS_C_COMMON_H

v2/internal/ffenestri/contextmenus_darwin.c

@@ -1,99 +1,99 @@
-////
-//// Created by Lea Anthony on 6/1/21.
+//////
+////// Created by Lea Anthony on 6/1/21.
+//////
 ////
 //
-
-#include "ffenestri_darwin.h"
-#include "common.h"
-#include "contextmenus_darwin.h"
-#include "menu_darwin.h"
-
-ContextMenu* NewContextMenu(const char* contextMenuJSON) {
-    ContextMenu* result = malloc(sizeof(ContextMenu));
-
-    JsonNode* processedJSON = json_decode(contextMenuJSON);
-    if( processedJSON == NULL ) {
-        ABORT("[NewTrayMenu] Unable to parse TrayMenu JSON: %s", contextMenuJSON);
-    }
-    // Save reference to this json
-    result->processedJSON = processedJSON;
-
-    result->ID = mustJSONString(processedJSON, "ID");
-    JsonNode* processedMenu = mustJSONObject(processedJSON, "ProcessedMenu");
-
-    result->menu = NewMenu(processedMenu);
-    result->nsmenu = NULL;
-    result->menu->menuType = ContextMenuType;
-    result->menu->parentData = result;
-    result->contextMenuData = NULL;
-    return result;
-}
-
-ContextMenu* GetContextMenuByID(ContextMenuStore* store, const char *contextMenuID) {
-    return (ContextMenu*)hashmap_get(&store->contextMenuMap, (char*)contextMenuID, strlen(contextMenuID));
-}
-
-void DeleteContextMenu(ContextMenu* contextMenu) {
-    // Free Menu
-    DeleteMenu(contextMenu->menu);
-
-    // Delete any context menu data we may have stored
-    if( contextMenu->contextMenuData != NULL ) {
-        MEMFREE(contextMenu->contextMenuData);
-    }
-
-    // Free JSON
-    if (contextMenu->processedJSON != NULL ) {
-        json_delete(contextMenu->processedJSON);
-        contextMenu->processedJSON = NULL;
-    }
-
-    // Free context menu
-    free(contextMenu);
-}
-
-int freeContextMenu(void *const context, struct hashmap_element_s *const e) {
-    DeleteContextMenu(e->data);
-    return -1;
-}
-
-void ShowContextMenu(ContextMenuStore* store, id mainWindow, const char *contextMenuID, const char *contextMenuData) {
-
-	// If no context menu ID was given, abort
-	if( contextMenuID == NULL ) {
-		return;
-	}
-
-	ContextMenu* contextMenu = GetContextMenuByID(store, contextMenuID);
-
-	// We don't need the ID now
-    MEMFREE(contextMenuID);
-
-    if( contextMenu == NULL ) {
-        // Free context menu data
-        if( contextMenuData != NULL ) {
-	        MEMFREE(contextMenuData);
-			return;
-		}
-	}
-
-    // We need to store the context menu data. Free existing data if we have it
-    // and set to the new value.
-    FREE_AND_SET(contextMenu->contextMenuData, contextMenuData);
-
-	// Grab the content view and show the menu
-	id contentView = msg_reg(mainWindow, s("contentView"));
-
-	// Get the triggering event
-	id menuEvent = msg_reg(mainWindow, s("currentEvent"));
-
-	if( contextMenu->nsmenu == NULL ) {
-        // GetMenu creates the NSMenu
-        contextMenu->nsmenu = GetMenu(contextMenu->menu);
-	}
-
-	// Show popup
-	((id(*)(id, SEL, id, id, id))objc_msgSend)(c("NSMenu"), s("popUpContextMenu:withEvent:forView:"), contextMenu->nsmenu, menuEvent, contentView);
-
-}
-
+//#include "ffenestri_darwin.h"
+//#include "common.h"
+//#include "contextmenus_darwin.h"
+//#include "menu_darwin.h"
+//
+//ContextMenu* NewContextMenu(const char* contextMenuJSON, struct TrayMenuStore *store) {
+//    ContextMenu* result = malloc(sizeof(ContextMenu));
+//
+//    JsonNode* processedJSON = json_decode(contextMenuJSON);
+//    if( processedJSON == NULL ) {
+//        ABORT("[NewTrayMenu] Unable to parse TrayMenu JSON: %s", contextMenuJSON);
+//    }
+//    // Save reference to this json
+//    result->processedJSON = processedJSON;
+//
+//    result->ID = mustJSONString(processedJSON, "ID");
+//    JsonNode* processedMenu = mustJSONObject(processedJSON, "ProcessedMenu");
+//
+////    result->menu = NewMenu(processedMenu);
+//    result->nsmenu = NULL;
+//    result->menu->menuType = ContextMenuType;
+//    result->menu->store = store;
+//    result->contextMenuData = NULL;
+//    return result;
+//}
+//
+//ContextMenu* GetContextMenuByID(ContextMenuStore* store, const char *contextMenuID) {
+//    return (ContextMenu*)hashmap_get(&store->contextMenuMap, (char*)contextMenuID, strlen(contextMenuID));
+//}
+//
+//void DeleteContextMenu(ContextMenu* contextMenu) {
+//    // Free Menu
+//    DeleteMenu(contextMenu->menu);
+//
+//    // Delete any context menu data we may have stored
+//    if( contextMenu->contextMenuData != NULL ) {
+//        MEMFREE(contextMenu->contextMenuData);
+//    }
+//
+//    // Free JSON
+//    if (contextMenu->processedJSON != NULL ) {
+//        json_delete(contextMenu->processedJSON);
+//        contextMenu->processedJSON = NULL;
+//    }
+//
+//    // Free context menu
+//    free(contextMenu);
+//}
+//
+//int freeContextMenu(void *const context, struct hashmap_element_s *const e) {
+//    DeleteContextMenu(e->data);
+//    return -1;
+//}
+//
+//void ShowContextMenu(ContextMenuStore* store, id mainWindow, const char *contextMenuID, const char *contextMenuData) {
+//
+//	// If no context menu ID was given, abort
+//	if( contextMenuID == NULL ) {
+//		return;
+//	}
+//
+//	ContextMenu* contextMenu = GetContextMenuByID(store, contextMenuID);
+//
+//	// We don't need the ID now
+//    MEMFREE(contextMenuID);
+//
+//    if( contextMenu == NULL ) {
+//        // Free context menu data
+//        if( contextMenuData != NULL ) {
+//	        MEMFREE(contextMenuData);
+//			return;
+//		}
+//	}
+//
+//    // We need to store the context menu data. Free existing data if we have it
+//    // and set to the new value.
+//    FREE_AND_SET(contextMenu->contextMenuData, contextMenuData);
+//
+//	// Grab the content view and show the menu
+//	id contentView = msg(mainWindow, s("contentView"));
+//
+//	// Get the triggering event
+//	id menuEvent = msg(mainWindow, s("currentEvent"));
+//
+////	if( contextMenu->nsmenu == NULL ) {
+////        // GetMenu creates the NSMenu
+////        contextMenu->nsmenu = GetMenu(contextMenu->menu);
+////	}
+//
+//	// Show popup
+//	msg(c("NSMenu"), s("popUpContextMenu:withEvent:forView:"), contextMenu->nsmenu, menuEvent, contentView);
+//
+//}
+//

v2/internal/ffenestri/contextmenus_darwin.h

@@ -1,33 +1,33 @@
+//////
+////// Created by Lea Anthony on 6/1/21.
+//////
 ////
-//// Created by Lea Anthony on 6/1/21.
-////
+//#ifndef CONTEXTMENU_DARWIN_H
+//#define CONTEXTMENU_DARWIN_H
 //
-#ifndef CONTEXTMENU_DARWIN_H
-#define CONTEXTMENU_DARWIN_H
-
-#include "json.h"
-#include "menu_darwin.h"
-#include "contextmenustore_darwin.h"
-
-typedef struct {
-    const char* ID;
-    id nsmenu;
-    Menu* menu;
-
-    JsonNode* processedJSON;
-
-    // Context menu data is given by the frontend when clicking a context menu.
-    // We send this to the backend when an item is selected
-	const char* contextMenuData;
-} ContextMenu;
-
-
-ContextMenu* NewContextMenu(const char* contextMenuJSON);
-
-ContextMenu* GetContextMenuByID( ContextMenuStore* store, const char *contextMenuID);
-void DeleteContextMenu(ContextMenu* contextMenu);
-int freeContextMenu(void *const context, struct hashmap_element_s *const e);
-
-void ShowContextMenu(ContextMenuStore* store, id mainWindow, const char *contextMenuID, const char *contextMenuData);
-
-#endif //CONTEXTMENU_DARWIN_H
+//#include "json.h"
+//#include "menu_darwin.h"
+//#include "contextmenustore_darwin.h"
+//
+//typedef struct {
+//    const char* ID;
+//    id nsmenu;
+//    Menu* menu;
+//
+//    JsonNode* processedJSON;
+//
+//    // Context menu data is given by the frontend when clicking a context menu.
+//    // We send this to the backend when an item is selected
+//	const char* contextMenuData;
+//} ContextMenu;
+//
+//
+//ContextMenu* NewContextMenu(const char* contextMenuJSON);
+//
+//ContextMenu* GetContextMenuByID( ContextMenuStore* store, const char *contextMenuID);
+//void DeleteContextMenu(ContextMenu* contextMenu);
+//int freeContextMenu(void *const context, struct hashmap_element_s *const e);
+//
+//void ShowContextMenu(ContextMenuStore* store, id mainWindow, const char *contextMenuID, const char *contextMenuData);
+//
+//#endif //CONTEXTMENU_DARWIN_H

v2/internal/ffenestri/contextmenustore_darwin.c

@@ -1,65 +1,65 @@
-
-#include "contextmenus_darwin.h"
-#include "contextmenustore_darwin.h"
-
-ContextMenuStore* NewContextMenuStore() {
-
-    ContextMenuStore* result = malloc(sizeof(ContextMenuStore));
-
-    // Allocate Context Menu Store
-    if( 0 != hashmap_create((const unsigned)4, &result->contextMenuMap)) {
-        ABORT("[NewContextMenus] Not enough memory to allocate contextMenuStore!");
-    }
-
-    return result;
-}
-
-void AddContextMenuToStore(ContextMenuStore* store, const char* contextMenuJSON) {
-    ContextMenu* newMenu = NewContextMenu(contextMenuJSON);
-
-    //TODO: check if there is already an entry for this menu
-    hashmap_put(&store->contextMenuMap, newMenu->ID, strlen(newMenu->ID), newMenu);
-}
-
-ContextMenu* GetContextMenuFromStore(ContextMenuStore* store, const char* menuID) {
-    // Get the current menu
-    return hashmap_get(&store->contextMenuMap, menuID, strlen(menuID));
-}
-
-void UpdateContextMenuInStore(ContextMenuStore* store, const char* menuJSON) {
-    ContextMenu* newContextMenu = NewContextMenu(menuJSON);
-
-    // Get the current menu
-    ContextMenu *currentMenu = GetContextMenuFromStore(store, newContextMenu->ID);
-    if ( currentMenu == NULL ) {
-        ABORT("Attempted to update unknown context menu with ID '%s'.", newContextMenu->ID);
-    }
-
-    hashmap_remove(&store->contextMenuMap, newContextMenu->ID, strlen(newContextMenu->ID));
-
-    // Save the status bar reference
-    DeleteContextMenu(currentMenu);
-
-    hashmap_put(&store->contextMenuMap, newContextMenu->ID, strlen(newContextMenu->ID), newContextMenu);
-
-}
-
-
-void DeleteContextMenuStore(ContextMenuStore* store) {
-
-    // Guard against NULLs
-    if( store == NULL ) {
-        return;
-    }
-
-    // Delete context menus
-    if( hashmap_num_entries(&store->contextMenuMap) > 0 ) {
-        if (0 != hashmap_iterate_pairs(&store->contextMenuMap, freeContextMenu, NULL)) {
-            ABORT("[DeleteContextMenuStore] Failed to release contextMenuStore entries!");
-        }
-    }
-
-    // Free context menu hashmap
-    hashmap_destroy(&store->contextMenuMap);
-
-}
+//
+//#include "contextmenus_darwin.h"
+//#include "contextmenustore_darwin.h"
+//
+//ContextMenuStore* NewContextMenuStore() {
+//
+//    ContextMenuStore* result = malloc(sizeof(ContextMenuStore));
+//
+//    // Allocate Context Menu Store
+//    if( 0 != hashmap_create((const unsigned)4, &result->contextMenuMap)) {
+//        ABORT("[NewContextMenus] Not enough memory to allocate contextMenuStore!");
+//    }
+//
+//    return result;
+//}
+//
+//void AddContextMenuToStore(ContextMenuStore* store, const char* contextMenuJSON) {
+//    ContextMenu* newMenu = NewContextMenu(contextMenuJSON);
+//
+//    //TODO: check if there is already an entry for this menu
+//    hashmap_put(&store->contextMenuMap, newMenu->ID, strlen(newMenu->ID), newMenu);
+//}
+//
+//ContextMenu* GetContextMenuFromStore(ContextMenuStore* store, const char* menuID) {
+//    // Get the current menu
+//    return hashmap_get(&store->contextMenuMap, menuID, strlen(menuID));
+//}
+//
+//void UpdateContextMenuInStore(ContextMenuStore* store, const char* menuJSON) {
+//    ContextMenu* newContextMenu = NewContextMenu(menuJSON);
+//
+//    // Get the current menu
+//    ContextMenu *currentMenu = GetContextMenuFromStore(store, newContextMenu->ID);
+//    if ( currentMenu == NULL ) {
+//        ABORT("Attempted to update unknown context menu with ID '%s'.", newContextMenu->ID);
+//    }
+//
+//    hashmap_remove(&store->contextMenuMap, newContextMenu->ID, strlen(newContextMenu->ID));
+//
+//    // Save the status bar reference
+//    DeleteContextMenu(currentMenu);
+//
+//    hashmap_put(&store->contextMenuMap, newContextMenu->ID, strlen(newContextMenu->ID), newContextMenu);
+//
+//}
+//
+//
+//void DeleteContextMenuStore(ContextMenuStore* store) {
+//
+//    // Guard against NULLs
+//    if( store == NULL ) {
+//        return;
+//    }
+//
+//    // Delete context menus
+//    if( hashmap_num_entries(&store->contextMenuMap) > 0 ) {
+//        if (0 != hashmap_iterate_pairs(&store->contextMenuMap, freeContextMenu, NULL)) {
+//            ABORT("[DeleteContextMenuStore] Failed to release contextMenuStore entries!");
+//        }
+//    }
+//
+//    // Free context menu hashmap
+//    hashmap_destroy(&store->contextMenuMap);
+//
+//}

v2/internal/ffenestri/contextmenustore_darwin.h

@@ -1,27 +1,27 @@
+////
+//// Created by Lea Anthony on 7/1/21.
+////
 //
-// Created by Lea Anthony on 7/1/21.
+//#ifndef CONTEXTMENUSTORE_DARWIN_H
+//#define CONTEXTMENUSTORE_DARWIN_H
 //
-
-#ifndef CONTEXTMENUSTORE_DARWIN_H
-#define CONTEXTMENUSTORE_DARWIN_H
-
-#include "common.h"
-
-typedef struct {
-
-    int dummy;
-
-    // This is our context menu store which keeps track
-    // of all instances of ContextMenus
-    struct hashmap_s contextMenuMap;
-
-} ContextMenuStore;
-
-ContextMenuStore* NewContextMenuStore();
-
-void DeleteContextMenuStore(ContextMenuStore* store);
-void UpdateContextMenuInStore(ContextMenuStore* store, const char* menuJSON);
-
-void AddContextMenuToStore(ContextMenuStore* store, const char* contextMenuJSON);
-
-#endif //CONTEXTMENUSTORE_DARWIN_H
+//#include "common.h"
+//
+//typedef struct {
+//
+//    int dummy;
+//
+//    // This is our context menu store which keeps track
+//    // of all instances of ContextMenus
+//    struct hashmap_s contextMenuMap;
+//
+//} ContextMenuStore;
+//
+//ContextMenuStore* NewContextMenuStore();
+//
+//void DeleteContextMenuStore(ContextMenuStore* store);
+//void UpdateContextMenuInStore(ContextMenuStore* store, const char* menuJSON);
+//
+//void AddContextMenuToStore(ContextMenuStore* store, const char* contextMenuJSON);
+//
+//#endif //CONTEXTMENUSTORE_DARWIN_H

v2/internal/ffenestri/effectstructs_windows.h

@@ -1,64 +0,0 @@
-// Credit: https://gist.github.com/ysc3839/b08d2bff1c7dacde529bed1d37e85ccf
-#pragma once
-
-typedef enum _WINDOWCOMPOSITIONATTRIB
-{
-	WCA_UNDEFINED = 0,
-	WCA_NCRENDERING_ENABLED = 1,
-	WCA_NCRENDERING_POLICY = 2,
-	WCA_TRANSITIONS_FORCEDISABLED = 3,
-	WCA_ALLOW_NCPAINT = 4,
-	WCA_CAPTION_BUTTON_BOUNDS = 5,
-	WCA_NONCLIENT_RTL_LAYOUT = 6,
-	WCA_FORCE_ICONIC_REPRESENTATION = 7,
-	WCA_EXTENDED_FRAME_BOUNDS = 8,
-	WCA_HAS_ICONIC_BITMAP = 9,
-	WCA_THEME_ATTRIBUTES = 10,
-	WCA_NCRENDERING_EXILED = 11,
-	WCA_NCADORNMENTINFO = 12,
-	WCA_EXCLUDED_FROM_LIVEPREVIEW = 13,
-	WCA_VIDEO_OVERLAY_ACTIVE = 14,
-	WCA_FORCE_ACTIVEWINDOW_APPEARANCE = 15,
-	WCA_DISALLOW_PEEK = 16,
-	WCA_CLOAK = 17,
-	WCA_CLOAKED = 18,
-	WCA_ACCENT_POLICY = 19,
-	WCA_FREEZE_REPRESENTATION = 20,
-	WCA_EVER_UNCLOAKED = 21,
-	WCA_VISUAL_OWNER = 22,
-	WCA_HOLOGRAPHIC = 23,
-	WCA_EXCLUDED_FROM_DDA = 24,
-	WCA_PASSIVEUPDATEMODE = 25,
-	WCA_USEDARKMODECOLORS = 26,
-	WCA_LAST = 27
-} WINDOWCOMPOSITIONATTRIB;
-
-typedef struct _WINDOWCOMPOSITIONATTRIBDATA
-{
-	WINDOWCOMPOSITIONATTRIB Attrib;
-	PVOID pvData;
-	SIZE_T cbData;
-} WINDOWCOMPOSITIONATTRIBDATA;
-
-typedef enum _ACCENT_STATE
-{
-	ACCENT_DISABLED = 0,
-	ACCENT_ENABLE_GRADIENT = 1,
-	ACCENT_ENABLE_TRANSPARENTGRADIENT = 2,
-	ACCENT_ENABLE_BLURBEHIND = 3,
-	ACCENT_ENABLE_ACRYLICBLURBEHIND = 4, // RS4 1803
-	ACCENT_ENABLE_HOSTBACKDROP = 5, // RS5 1809
- 	ACCENT_INVALID_STATE = 6
-} ACCENT_STATE;
-
-typedef struct _ACCENT_POLICY
-{
-	ACCENT_STATE AccentState;
-	DWORD AccentFlags;
-	DWORD GradientColor;
-	DWORD AnimationId;
-} ACCENT_POLICY;
-
-typedef BOOL (WINAPI *pfnGetWindowCompositionAttribute)(HWND, WINDOWCOMPOSITIONATTRIBDATA*);
-
-typedef BOOL (WINAPI *pfnSetWindowCompositionAttribute)(HWND, WINDOWCOMPOSITIONATTRIBDATA*);

v2/internal/ffenestri/ffenestri.go

@@ -1,29 +1,28 @@
 package ffenestri
 
 import (
+	"github.com/wailsapp/wails/v2/internal/menumanager"
 	"runtime"
 	"strings"
 	"unsafe"
 
-	"github.com/wailsapp/wails/v2/internal/menumanager"
-
 	"github.com/wailsapp/wails/v2/internal/logger"
 	"github.com/wailsapp/wails/v2/internal/messagedispatcher"
 	"github.com/wailsapp/wails/v2/pkg/options"
 )
 
 /*
+
 #cgo linux CFLAGS: -DFFENESTRI_LINUX=1
 #cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.0
 
 #cgo darwin CFLAGS: -DFFENESTRI_DARWIN=1
 #cgo darwin LDFLAGS: -framework WebKit -lobjc
 
-#cgo windows CXXFLAGS: -std=c++11
-#cgo windows,amd64 LDFLAGS: -L./windows/x64 -lwebview -lWebView2Loader -lgdi32 -lole32 -lShlwapi -luser32 -loleaut32
-
 #include <stdlib.h>
 #include "ffenestri.h"
+
+
 */
 import "C"
 
@@ -65,6 +64,14 @@ func NewApplicationWithConfig(config *options.App, logger *logger.Logger, menuMa
 	}
 }
 
+// NewApplication creates a new Application with the default config
+func NewApplication(logger *logger.Logger) *Application {
+	return &Application{
+		config: options.Default,
+		logger: logger.CustomLogger("Ffenestri"),
+	}
+}
+
 func (a *Application) freeMemory() {
 	for _, mem := range a.memory {
 		// fmt.Printf("Freeing memory: %+v\n", mem)
@@ -111,8 +118,7 @@ func (a *Application) Run(incomingDispatcher Dispatcher, bindings string, debug
 	fullscreen := a.bool2Cint(a.config.Fullscreen)
 	startHidden := a.bool2Cint(a.config.StartHidden)
 	logLevel := C.int(a.config.LogLevel)
-	hideWindowOnClose := a.bool2Cint(a.config.HideWindowOnClose)
-	app := C.NewApplication(title, width, height, resizable, devtools, fullscreen, startHidden, logLevel, hideWindowOnClose)
+	app := C.NewApplication(title, width, height, resizable, devtools, fullscreen, startHidden, logLevel)
 
 	// Save app reference
 	a.app = (*C.struct_Application)(app)
@@ -131,9 +137,9 @@ func (a *Application) Run(incomingDispatcher Dispatcher, bindings string, debug
 	C.SetDebug(app, a.bool2Cint(debug))
 
 	// TODO: Move frameless to Linux options
-	if a.config.Frameless {
-		C.DisableFrame(a.app)
-	}
+	// if a.config.Frameless {
+	// 	C.DisableFrame(a.app)
+	// }
 
 	if a.config.RGBA != 0 {
 		r, g, b, alpha := intToColour(a.config.RGBA)
@@ -165,7 +171,7 @@ func (a *Application) Run(incomingDispatcher Dispatcher, bindings string, debug
 		// Oh no! We couldn't initialise the application
 		a.logger.Fatal("Cannot initialise Application.")
 	}
-	//println("\n\n\n\n\n\nhererererer\n\n\n\n")
+
 	a.freeMemory()
 	return nil
 }

v2/internal/ffenestri/ffenestri.h

@@ -1,14 +1,10 @@
 #ifndef __FFENESTRI_H__
 #define __FFENESTRI_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <stdio.h>
 struct Application;
 
-extern struct Application *NewApplication(const char *title, int width, int height, int resizable, int devtools, int fullscreen, int startHidden, int logLevel, int hideWindowOnClose);
+extern struct Application *NewApplication(const char *title, int width, int height, int resizable, int devtools, int fullscreen, int startHidden, int logLevel);
 extern void SetMinWindowSize(struct Application*, int minWidth, int minHeight);
 extern void SetMaxWindowSize(struct Application*, int maxWidth, int maxHeight);
 extern void Run(struct Application*, int argc, char **argv);
@@ -34,22 +30,15 @@ extern void Fullscreen(struct Application*);
 extern void UnFullscreen(struct Application*);
 extern void ToggleFullscreen(struct Application*);
 extern void DisableFrame(struct Application*);
-extern void OpenDialog(struct Application*, char *callbackID, char *title, char *filters, char *defaultFilename, char *defaultDir, int allowFiles, int allowDirs, int allowMultiple, int showHiddenFiles, int canCreateDirectories, int resolvesAliases, int treatPackagesAsDirectories);
-extern void SaveDialog(struct Application*, char *callbackID, char *title, char *filters, char *defaultFilename, char *defaultDir, int showHiddenFiles, int canCreateDirectories, int treatPackagesAsDirectories);
-extern void MessageDialog(struct Application*, char *callbackID, char *type, char *title, char *message, char *icon, char *button1, char *button2, char *button3, char *button4, char *defaultButton, char *cancelButton);
-extern void DarkModeEnabled(struct Application*, char *callbackID);
+extern void OpenDialog(struct Application*, const char *callbackID, const char *title, const char *filters, const char *defaultFilename, const char *defaultDir, int allowFiles, int allowDirs, int allowMultiple, int showHiddenFiles, int canCreateDirectories, int resolvesAliases, int treatPackagesAsDirectories);
+extern void SaveDialog(struct Application*, const char *callbackID, const char *title, const char *filters, const char *defaultFilename, const char *defaultDir, int showHiddenFiles, int canCreateDirectories, int treatPackagesAsDirectories);
+extern void MessageDialog(struct Application*, const char *callbackID, const char *type, const char *title, const char *message, const char *icon, const char *button1, const char *button2, const char *button3, const char *button4, const char *defaultButton, const char *cancelButton);
+extern void DarkModeEnabled(struct Application*, const char *callbackID);
 extern void SetApplicationMenu(struct Application*, const char *);
 extern void AddTrayMenu(struct Application*, const char *menuTrayJSON);
 extern void SetTrayMenu(struct Application*, const char *menuTrayJSON);
-extern void DeleteTrayMenuByID(struct Application*, const char *id);
 extern void UpdateTrayMenuLabel(struct Application*, const char* JSON);
-extern void AddContextMenu(struct Application*, char *contextMenuJSON);
-extern void UpdateContextMenu(struct Application*, char *contextMenuJSON);
-extern void WebviewIsTransparent(struct Application*);
-extern void WindowBackgroundIsTranslucent(struct Application*);
-
-#ifdef __cplusplus
-}
-#endif
+extern void AddContextMenu(struct Application*, const char *contextMenuJSON);
+extern void UpdateContextMenu(struct Application*, const char *contextMenuJSON);
 
 #endif

v2/internal/ffenestri/ffenestri_client.go

@@ -1,14 +1,19 @@
 package ffenestri
 
 /*
+
+#cgo linux CFLAGS: -DFFENESTRI_LINUX=1
+#cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.0
+
+#include <stdlib.h>
 #include "ffenestri.h"
+
 */
 import "C"
 
 import (
-	"strconv"
-
 	"github.com/wailsapp/wails/v2/pkg/options/dialog"
+	"strconv"
 
 	"github.com/wailsapp/wails/v2/internal/logger"
 )
@@ -108,14 +113,6 @@ func (c *Client) WindowSize(width int, height int) {
 	C.SetSize(c.app.app, C.int(width), C.int(height))
 }
 
-func (c *Client) WindowSetMinSize(width int, height int) {
-	C.SetMinWindowSize(c.app.app, C.int(width), C.int(height))
-}
-
-func (c *Client) WindowSetMaxSize(width int, height int) {
-	C.SetMaxWindowSize(c.app.app, C.int(width), C.int(height))
-}
-
 // WindowSetColour sets the window colour
 func (c *Client) WindowSetColour(colour int) {
 	r, g, b, a := intToColour(colour)
@@ -202,7 +199,3 @@ func (c *Client) UpdateTrayMenuLabel(JSON string) {
 func (c *Client) UpdateContextMenu(contextMenuJSON string) {
 	C.UpdateContextMenu(c.app.app, c.app.string2CString(contextMenuJSON))
 }
-
-func (c *Client) DeleteTrayMenuByID(id string) {
-	C.DeleteTrayMenuByID(c.app.app, c.app.string2CString(id))
-}

v2/internal/ffenestri/ffenestri_darwin.go

@@ -2,7 +2,7 @@ package ffenestri
 
 /*
 #cgo darwin CFLAGS: -DFFENESTRI_DARWIN=1
-#cgo darwin LDFLAGS: -framework WebKit -framework CoreFoundation -lobjc
+#cgo darwin LDFLAGS: -framework WebKit -lobjc
 
 #include "ffenestri.h"
 #include "ffenestri_darwin.h"
@@ -48,9 +48,6 @@ func (a *Application) processPlatformSettings() error {
 		C.SetAppearance(a.app, a.string2CString(string(mac.Appearance)))
 	}
 
-	// Set activation policy
-	C.SetActivationPolicy(a.app, C.int(mac.ActivationPolicy))
-
 	// Check if the webview should be transparent
 	if mac.WebviewIsTransparent {
 		C.WebviewIsTransparent(a.app)
@@ -61,15 +58,15 @@ func (a *Application) processPlatformSettings() error {
 		C.WindowBackgroundIsTranslucent(a.app)
 	}
 
-	// Process menu
-	//applicationMenu := options.GetApplicationMenu(a.config)
-	applicationMenu := a.menuManager.GetApplicationMenuJSON()
-	if applicationMenu != "" {
-		C.SetApplicationMenu(a.app, a.string2CString(applicationMenu))
-	}
+	//// Process menu
+	////applicationMenu := options.GetApplicationMenu(a.config)
+	//applicationMenu := a.menuManager.GetApplicationMenuJSON()
+	//if applicationMenu != "" {
+	//	C.SetApplicationMenu(a.app, a.string2CString(applicationMenu))
+	//}
 
 	// Process tray
-	trays, err := a.menuManager.GetTrayMenus()
+	trays, err := a.menuManager.GetTrayMenusAsJSON()
 	if err != nil {
 		return err
 	}
@@ -79,21 +76,16 @@ func (a *Application) processPlatformSettings() error {
 		}
 	}
 
-	// Process context menus
-	contextMenus, err := a.menuManager.GetContextMenus()
-	if err != nil {
-		return err
-	}
-	if contextMenus != nil {
-		for _, contextMenu := range contextMenus {
-			C.AddContextMenu(a.app, a.string2CString(contextMenu))
-		}
-	}
-
-	// Process URL Handlers
-	if a.config.Mac.URLHandlers != nil {
-		C.HasURLHandlers(a.app)
-	}
+	//// Process context menus
+	//contextMenus, err := a.menuManager.GetContextMenus()
+	//if err != nil {
+	//	return err
+	//}
+	//if contextMenus != nil {
+	//	for _, contextMenu := range contextMenus {
+	//		C.AddContextMenu(a.app, a.string2CString(contextMenu))
+	//	}
+	//}
 
 	return nil
 }

v2/internal/ffenestri/ffenestri_darwin.h

@@ -6,56 +6,30 @@
 #define OBJC_OLD_DISPATCH_PROTOTYPES 1
 #include <objc/objc-runtime.h>
 #include <CoreGraphics/CoreGraphics.h>
-#include <CoreFoundation/CoreFoundation.h>
 #include "json.h"
 #include "hashmap.h"
 #include "stdlib.h"
 
-typedef struct {
-    long maj;
-    long min;
-    long patch;
-} OSVersion;
-
 // Macros to make it slightly more sane
 #define msg objc_msgSend
-#define msg_reg ((id(*)(id, SEL))objc_msgSend)
-#define msg_id ((id(*)(id, SEL, id))objc_msgSend)
-#define msg_id_id ((id(*)(id, SEL, id, id))objc_msgSend)
-#define msg_bool ((id(*)(id, SEL, BOOL))objc_msgSend)
-#define msg_int ((id(*)(id, SEL, int))objc_msgSend)
-#define msg_uint ((id(*)(id, SEL, unsigned int))objc_msgSend)
-#define msg_float ((id(*)(id, SEL, float))objc_msgSend)
-#define kInternetEventClass 'GURL'
-#define kAEGetURL 'GURL'
-#define keyDirectObject '----'
 
 #define c(str) (id)objc_getClass(str)
 #define s(str) sel_registerName(str)
 #define u(str) sel_getUid(str)
-#define str(input) ((id(*)(id, SEL, const char *))objc_msgSend)(c("NSString"), s("stringWithUTF8String:"), input)
-#define strunicode(input) ((id(*)(id, SEL, id, unsigned short))objc_msgSend)(c("NSString"), s("stringWithFormat:"), str("%C"), (unsigned short)input)
-#define cstr(input) (const char *)msg_reg(input, s("UTF8String"))
-#define url(input) msg_id(c("NSURL"), s("fileURLWithPath:"), str(input))
-#define ALLOC(classname) msg_reg(c(classname), s("alloc"))
-#define ALLOC_INIT(classname) msg_reg(msg_reg(c(classname), s("alloc")), s("init"))
+#define str(input) msg(c("NSString"), s("stringWithUTF8String:"), input)
+#define strunicode(input) msg(c("NSString"), s("stringWithFormat:"), str("%C"), (unsigned short)input)
+#define cstr(input) (const char *)msg(input, s("UTF8String"))
+#define url(input) msg(c("NSURL"), s("fileURLWithPath:"), str(input))
+#define RELEASE(input) if( input != NULL ) { msg(input, s("release")); }
 
-#if defined (__aarch64__)
-#define GET_FRAME(receiver) ((CGRect(*)(id, SEL))objc_msgSend)(receiver, s("frame"))
-#define GET_BOUNDS(receiver) ((CGRect(*)(id, SEL))objc_msgSend)(receiver, s("bounds"))
-#define GET_OSVERSION(receiver) ((OSVersion(*)(id, SEL))objc_msgSend)(processInfo, s("operatingSystemVersion"));
-#endif
-
-#if defined (__x86_64__)
+#define ALLOC(classname) msg(c(classname), s("alloc"))
+#define ALLOC_INIT(classname) msg(msg(c(classname), s("alloc")), s("init"))
 #define GET_FRAME(receiver) ((CGRect(*)(id, SEL))objc_msgSend_stret)(receiver, s("frame"))
 #define GET_BOUNDS(receiver) ((CGRect(*)(id, SEL))objc_msgSend_stret)(receiver, s("bounds"))
-#define GET_OSVERSION(receiver) ((OSVersion(*)(id, SEL))objc_msgSend_stret)(processInfo, s("operatingSystemVersion"));
-#endif
-
-#define GET_BACKINGSCALEFACTOR(receiver) ((CGFloat(*)(id, SEL))objc_msgSend)(receiver, s("backingScaleFactor"))
+#define GET_BACKINGSCALEFACTOR(receiver) ((CGFloat(*)(id, SEL))msg)(receiver, s("backingScaleFactor"))
 
 #define ON_MAIN_THREAD(str) dispatch( ^{ str; } )
-#define MAIN_WINDOW_CALL(str) msg_reg(app->mainWindow, s((str)))
+#define MAIN_WINDOW_CALL(str) msg(app->mainWindow, s((str)))
 
 #define NSBackingStoreBuffered 2
 
@@ -93,10 +67,6 @@ typedef struct {
 #define NSControlStateValueOff 0
 #define NSControlStateValueOn 1
 
-#define NSApplicationActivationPolicyRegular    0
-#define NSApplicationActivationPolicyAccessory  1
-#define NSApplicationActivationPolicyProhibited 2
-
 // Unbelievably, if the user swaps their button preference
 // then right buttons are reported as left buttons
 #define NSEventMaskLeftMouseDown 1 << 1
@@ -125,8 +95,6 @@ typedef struct {
 #define NSAlertSecondButtonReturn  1001
 #define NSAlertThirdButtonReturn   1002
 
-#define BrokenImage "iVBORw0KGgoAAAANSUhEUgAAABAAAAASCAMAAABl5a5YAAABj1BMVEWopan///+koqSWk5P9/v3///////////+AgACMiovz8/PB0fG9z+3i4+WysbGBfX1Erh80rACLiYqBxolEsDhHlDEbqQDDx+CNho7W1tj4+/bw+O3P5Mn4/f/W1tbK6sX////b2dn////////////8/Pz6+vro6Ojj4+P////G1PL////EzNydmp2cmZnd3eDF1PHs8v/o8P/Q3vrS3vfE0vCdmpqZkpr19/3N2vXI1vPH1fOgnqDg6frP3PbCytvHx8irqq6HhIZtuGtjnlZetU1Xs0NWskBNsi7w9v/d6P7w9P3S4Pzr8Pvl7PrY5PrU4PjQ3fjD1Ozo6Om30NjGzNi7ubm34K+UxKmbnaWXlJeUjpSPi4tppF1TtjxSsTf2+f7L2PTr7e3H2+3V7+q+0uXg4OPg4eLR1uG7z+Hg4ODGzODV2N7V1trP5dmxzs65vcfFxMWq0cKxxr+/vr+0s7apxbWaxrCv2qao05+dlp2Uuo2Dn4F8vIB6xnyAoHmAym9zqGpctENLryNFsgoblJpnAAAAKnRSTlP+hP7+5ZRmYgL+/f39/f39/f38/Pz8/Pv69+7j083My8GocnBPTTMWEgjxeITOAAABEklEQVQY0y3KZXuCYBiG4ceYuu7u3nyVAaKOMBBQ7O5Yd3f3fvheDnd9u8/jBkGwNxP6sjOWVQvY/ftrzfT6bd3yEhCnYZqiaYoKiwX/gXkFiHySTcUTLJMsZ9v8nQvgssWYOEKedKpcOO6CUXD5IlGEY5hLUbyDAAZ6HRf1bnkoavOsFQibg+Q4nuNYL+ON5PHD5nBaraRVyxnzGf6BJzUi2QQCQgMyk8tleL7dg1owpJ17D5IkvV100EingeOopPyo6vfAuXF+9hbDTknZCIaUoeK4efKwG4iT6xDewd7imGlid7gGwv37b6Oh9jwaTdOf/Tc1qH7UZVmuP6G5qZfBr9cAGNy4KiDd4tXIs7tS+QO9aUKvPAIKuQAAAABJRU5ErkJggg=="
-
 struct Application;
 int releaseNSObject(void *const context, struct hashmap_element_s *const e);
 void TitlebarAppearsTransparent(struct Application* app);
@@ -141,14 +109,5 @@ void WebviewIsTransparent(struct Application* app);
 void WindowBackgroundIsTranslucent(struct Application* app);
 void SetTray(struct Application* app, const char *, const char *, const char *);
 //void SetContextMenus(struct Application* app, const char *);
-void AddTrayMenu(struct Application* app, const char *);
-
-void SetActivationPolicy(struct Application* app, int policy);
-
-void* lookupStringConstant(id constantName);
-
-void HasURLHandlers(struct Application* app);
-
-id createImageFromBase64Data(const char *data, bool isTemplateImage);
 
 #endif

v2/internal/ffenestri/ffenestri_windows.cpp

@@ -1,620 +0,0 @@
-// Some code may be inspired by or directly used from Webview (c) zserge.
-// License included in README.md
-
-#include "ffenestri_windows.h"
-#include "wv2ComHandler_windows.h"
-#include <functional>
-#include <atomic>
-#include <Shlwapi.h>
-#include <locale>
-#include <codecvt>
-#include "windows/WebView2.h"
-#include "effectstructs_windows.h"
-#include <Shlobj.h>
-
-int debug = 0;
-DWORD mainThread;
-
-// --- Assets
-extern const unsigned char runtime;
-extern const unsigned char *defaultDialogIcons[];
-
-// dispatch will execute the given `func` pointer
-void dispatch(dispatchFunction func) {
-    PostThreadMessage(mainThread, WM_APP, 0, (LPARAM) new dispatchFunction(func));
-}
-
-LPWSTR cstrToLPWSTR(const char *cstr) {
-    int wchars_num = MultiByteToWideChar( CP_UTF8 , 0 , cstr , -1, NULL , 0 );
-    wchar_t* wstr = new wchar_t[wchars_num+1];
-    MultiByteToWideChar( CP_UTF8 , 0 , cstr , -1, wstr , wchars_num );
-    return wstr;
-}
-
-// Credit: https://stackoverflow.com/a/9842450
-char* LPWSTRToCstr(LPWSTR input) {
-    int length = WideCharToMultiByte(CP_UTF8, 0, input, -1, 0, 0, NULL, NULL);
-    char* output = new char[length];
-    WideCharToMultiByte(CP_UTF8, 0, input, -1, output , length, NULL, NULL);
-    return output;
-}
-
-struct Application *NewApplication(const char *title, int width, int height, int resizable, int devtools, int fullscreen, int startHidden, int logLevel, int hideWindowOnClose) {
-
-    // Create application
-    struct Application *result = (struct Application*)malloc(sizeof(struct Application));
-
-    result->window = nullptr;
-    result->webview = nullptr;
-    result->webviewController = nullptr;
-
-    result->title = title;
-    result->width = width;
-    result->height = height;
-    result->resizable = resizable;
-    result->devtools = devtools;
-    result->fullscreen = fullscreen;
-    result->startHidden = startHidden;
-    result->logLevel = logLevel;
-    result->hideWindowOnClose = hideWindowOnClose;
-    result->webviewIsTranparent = false;
-    result->windowBackgroundIsTranslucent = false;
-
-    // Min/Max Width/Height
-    result->minWidth = 0;
-    result->minHeight = 0;
-    result->maxWidth = 0;
-    result->maxHeight = 0;
-
-    // Default colour
-    result->backgroundColour.R = 255;
-    result->backgroundColour.G = 255;
-    result->backgroundColour.B = 255;
-    result->backgroundColour.A = 255;
-
-    // Have a frame by default
-    result->frame = 1;
-
-    // Capture Main Thread
-    mainThread = GetCurrentThreadId();
-
-    // Startup url
-    result->startupURL = nullptr;
-
-    return result;
-}
-
-void SetMinWindowSize(struct Application* app, int minWidth, int minHeight) {
-    app->minWidth = (LONG)minWidth;
-    app->minHeight = (LONG)minHeight;
-}
-
-void SetMaxWindowSize(struct Application* app, int maxWidth, int maxHeight) {
-    app->maxWidth = (LONG)maxWidth;
-    app->maxHeight = (LONG)maxHeight;
-}
-
-void SetBindings(struct Application *app, const char *bindings) {
-    std::string temp = std::string("window.wailsbindings = \"") + std::string(bindings) + std::string("\";");
-    app->bindings = new char[temp.length()+1];
-	memcpy(app->bindings, temp.c_str(), temp.length()+1);
-}
-
-void performShutdown(struct Application *app) {
-    if( app->startupURL != nullptr ) {
-        delete[] app->startupURL;
-    }
-    messageFromWindowCallback("WC");
-}
-
-void enableTranslucentBackground(struct Application *app) {
-    HMODULE hUser = GetModuleHandleA("user32.dll");
-    if (hUser)
-    {
-        pfnSetWindowCompositionAttribute setWindowCompositionAttribute = (pfnSetWindowCompositionAttribute)GetProcAddress(hUser, "SetWindowCompositionAttribute");
-        if (setWindowCompositionAttribute)
-        {
-            ACCENT_POLICY accent = { ACCENT_ENABLE_BLURBEHIND, 0, 0, 0 };
-            WINDOWCOMPOSITIONATTRIBDATA data;
-            data.Attrib = WCA_ACCENT_POLICY;
-            data.pvData = &accent;
-            data.cbData = sizeof(accent);
-            setWindowCompositionAttribute(app->window, &data);
-        }
-    }
-}
-
-LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) {
-
-    struct Application *app = (struct Application *)GetWindowLongPtr(hwnd, GWLP_USERDATA);
-
-    switch(msg) {
-
-        case WM_DESTROY: {
-            DestroyApplication(app);
-            break;
-        }
-        case WM_SIZE: {
-            if( app->webviewController != nullptr) {
-                RECT bounds;
-                GetClientRect(app->window, &bounds);
-                app->webviewController->put_Bounds(bounds);
-            }
-            break;
-        }
-        case WM_GETMINMAXINFO: {
-            // Exit early if this is called before the window is created.
-            if ( app == NULL ) {
-                return 0;
-            }
-
-            // get pixel density
-            HDC hDC = GetDC(NULL);
-            double DPIScaleX = GetDeviceCaps(hDC, 88)/96.0;
-            double DPIScaleY = GetDeviceCaps(hDC, 90)/96.0;
-            ReleaseDC(NULL, hDC);
-
-            RECT rcClient, rcWind;
-            POINT ptDiff;
-            GetClientRect(hwnd, &rcClient);
-            GetWindowRect(hwnd, &rcWind);
-
-            int widthExtra = (rcWind.right - rcWind.left) - rcClient.right;
-            int heightExtra = (rcWind.bottom - rcWind.top) - rcClient.bottom;
-
-            LPMINMAXINFO mmi = (LPMINMAXINFO) lParam;
-            if (app->minWidth > 0 && app->minHeight > 0) {
-                mmi->ptMinTrackSize.x = app->minWidth * DPIScaleX + widthExtra;
-                mmi->ptMinTrackSize.y = app->minHeight * DPIScaleY + heightExtra;
-            }
-            if (app->maxWidth > 0 && app->maxHeight > 0) {
-                mmi->ptMaxSize.x = app->maxWidth * DPIScaleX + widthExtra;
-                mmi->ptMaxSize.y = app->maxHeight * DPIScaleY + heightExtra;
-                mmi->ptMaxTrackSize.x = app->maxWidth * DPIScaleX + widthExtra;
-                mmi->ptMaxTrackSize.y = app->maxHeight * DPIScaleY + heightExtra;
-            }
-            return 0;
-        }
-        default:
-            return DefWindowProc(hwnd, msg, wParam, lParam);
-    }
-    return 0;
-}
-
-void init(struct Application *app, const char* js) {
-    LPCWSTR wjs = cstrToLPWSTR(js);
-    app->webview->AddScriptToExecuteOnDocumentCreated(wjs, nullptr);
-    delete[] wjs;
-}
-
-void execJS(struct Application* app, const char *script) {
-    LPWSTR s = cstrToLPWSTR(script);
-    app->webview->ExecuteScript(s, nullptr);
-    delete[] s;
-}
-
-void loadAssets(struct Application* app) {
-
-    // patch window.external.invoke
-    std::string initialCode = std::string("window.external={invoke:s=>window.chrome.webview.postMessage(s)};");
-
-    // Load bindings
-    initialCode += std::string(app->bindings);
-    delete[] app->bindings;
-
-    // Load runtime
-    initialCode += std::string((const char*)&runtime);
-
-    int index = 1;
-    while(1) {
-        // Get next asset pointer
-        const unsigned char *asset = assets[index];
-
-        // If we have no more assets, break
-        if (asset == 0x00) {
-            break;
-        }
-
-        initialCode += std::string((const char*)asset);
-        index++;
-    };
-
-    // Disable context menu if not in debug mode
-    if( debug != 1 ) {
-        initialCode += std::string("wails._.DisableDefaultContextMenu();");
-    }
-
-    initialCode += std::string("window.external.invoke('completed');");
-
-    // Keep a copy of the code
-    app->initialCode = new char[initialCode.length()+1];
-	memcpy(app->initialCode, initialCode.c_str(), initialCode.length()+1);
-
-    execJS(app, app->initialCode);
-
-    // Show app if we need to
-    if( app->startHidden == false ) {
-        Show(app);
-    }
-}
-
-// This is called when all our assets are loaded into the DOM
-void completed(struct Application* app) {
-    delete[] app->initialCode;
-    app->initialCode = nullptr;
-
-    if( app->startupURL == nullptr ) {
-        messageFromWindowCallback("SS");
-        return;
-    }
-    std::string readyMessage = std::string("SS") + std::string(app->startupURL);
-    messageFromWindowCallback(readyMessage.c_str());
-}
-
-
-//
-bool initWebView2(struct Application *app, int debugEnabled, messageCallback cb) {
-
-    debug = debugEnabled;
-
-    CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED);
-
-    std::atomic_flag flag = ATOMIC_FLAG_INIT;
-    flag.test_and_set();
-
-//    char currentExePath[MAX_PATH];
-//    GetModuleFileNameA(NULL, currentExePath, MAX_PATH);
-//    char *currentExeName = PathFindFileNameA(currentExePath);
-//    std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> wideCharConverter;
-//    auto exeName = wideCharConverter.from_bytes(currentExeName);
-//
-//    PWSTR path;
-//    HRESULT appDataResult = SHGetFolderPathAndSubDir(app->window, CSIDL_LOCAL_APPDATA, nullptr, SHGFP_TYPE_CURRENT, exeName.c_str(), path);
-//    if ( appDataResult == false ) {
-//        path = nullptr;
-//    }
-//
-
-    ICoreWebView2Controller *controller;
-    ICoreWebView2* webview;
-
-    HRESULT res = CreateCoreWebView2EnvironmentWithOptions(
-            nullptr, nullptr, nullptr,
-            new wv2ComHandler(app, app->window, cb,
-                                     [&](ICoreWebView2Controller *webviewController) {
-                                         controller = webviewController;
-                                         controller->get_CoreWebView2(&webview);
-                                         webview->AddRef();
-                                         flag.clear();
-                                     }));
-    if (res != S_OK) {
-        CoUninitialize();
-        return false;
-    }
-
-    MSG msg = {};
-    while (flag.test_and_set() && GetMessage(&msg, NULL, 0, 0)) {
-        TranslateMessage(&msg);
-        DispatchMessage(&msg);
-    }
-    app->webviewController = controller;
-    app->webview = webview;
-    // Resize WebView to fit the bounds of the parent window
-    RECT bounds;
-    GetClientRect(app->window, &bounds);
-    app->webviewController->put_Bounds(bounds);
-
-    // Callback hack
-    app->webview->AddScriptToExecuteOnDocumentCreated(L"window.chrome.webview.postMessage('I');", nullptr);
-    // Load the HTML
-    LPCWSTR html = (LPCWSTR) cstrToLPWSTR((char*)assets[0]);
-    app->webview->Navigate(html);
-
-	messageFromWindowCallback("Ej{\"name\":\"wails:launched\",\"data\":[]}");
-    return true;
-}
-
-void initialCallback(std::string message) {
-    printf("MESSAGE=%s\n", message);
-}
-
-void Run(struct Application* app, int argc, char **argv) {
-
-    WNDCLASSEX wc;
-    HINSTANCE hInstance = GetModuleHandle(NULL);
-    ZeroMemory(&wc, sizeof(WNDCLASSEX));
-    wc.cbSize = sizeof(WNDCLASSEX);
-    wc.style = CS_HREDRAW | CS_VREDRAW;
-    wc.hInstance = hInstance;
-    wc.lpszClassName = (LPCWSTR)"ffenestri";
-    wc.lpfnWndProc   = WndProc;
-
-    // TODO: Menu
-//    wc.lpszMenuName = nullptr;
-
-
-    // Process window resizable
-    DWORD windowStyle = WS_OVERLAPPEDWINDOW;
-    if (app->resizable == 0) {
-        windowStyle &= ~WS_MAXIMIZEBOX;
-        windowStyle &= ~WS_THICKFRAME;
-    }
-    if ( app->frame == 0 ) {
-        windowStyle = WS_POPUP;
-    }
-
-    RegisterClassEx(&wc);
-    app->window = CreateWindow((LPCWSTR)"ffenestri", (LPCWSTR)"", windowStyle, CW_USEDEFAULT,
-                                CW_USEDEFAULT, app->width, app->height, NULL, NULL,
-                                hInstance, NULL);
-
-    // Private setTitle as we're on the main thread
-    setTitle(app, app->title);
-
-    // Store application pointer in window handle
-    SetWindowLongPtr(app->window, GWLP_USERDATA, (LONG_PTR)app);
-
-    // Process whether window should show by default
-    int startVisibility = SW_SHOWNORMAL;
-    if ( app->startHidden == 1 ) {
-        startVisibility = SW_HIDE;
-    }
-
-    // TODO: Make configurable
-//    COREWEBVIEW2_COLOR wvColor;
-//    wvColor.A = 255;
-//    std::weak_ptr<ICoreWebView2Controller2> controller2 = app->webviewController->query<ICoreWebView2Controller2>();
-//    controller2->put_DefaultBackgroundColor(wvColor);
-
-    if( app->windowBackgroundIsTranslucent ) {
-        enableTranslucentBackground(app);
-    }
-
-    // private center() as we are on main thread
-    center(app);
-    ShowWindow(app->window, startVisibility);
-    UpdateWindow(app->window);
-    SetFocus(app->window);
-
-    // Add webview2
-    initWebView2(app, 1, initialCallback);
-
-    // Main event loop
-    MSG  msg;
-    BOOL res;
-    while ((res = GetMessage(&msg, NULL, 0, 0)) != -1) {
-      if (msg.hwnd) {
-        TranslateMessage(&msg);
-        DispatchMessage(&msg);
-        continue;
-      }
-      if (msg.message == WM_APP) {
-          dispatchFunction *f = (dispatchFunction*) msg.lParam;
-          (*f)();
-          delete(f);
-      } else if (msg.message == WM_QUIT) {
-        performShutdown(app);
-        return;
-      }
-    }
-}
-
-void DestroyApplication(struct Application* app) {
-    PostQuitMessage(0);
-}
-void SetDebug(struct Application* app, int flag) {
-    debug = flag;
-}
-
-void ExecJS(struct Application* app, const char *script) {
-    ON_MAIN_THREAD(
-        execJS(app, script);
-    );
-}
-
-void hide(struct Application* app) {
-    ShowWindow(app->window, SW_HIDE);
-}
-
-void Hide(struct Application* app) {
-    ON_MAIN_THREAD(
-        hide(app);
-    );
-}
-
-void show(struct Application* app) {
-    ShowWindow(app->window, SW_SHOW);
-}
-
-void Show(struct Application* app) {
-    ON_MAIN_THREAD(
-        show(app);
-    );
-}
-
-void center(struct Application* app) {
-
-    HMONITOR currentMonitor = MonitorFromWindow(app->window, MONITOR_DEFAULTTONEAREST);
-    MONITORINFO info = {0};
-    info.cbSize = sizeof(info);
-    GetMonitorInfoA(currentMonitor, &info);
-    RECT workRect = info.rcWork;
-    LONG screenMiddleW = (workRect.right - workRect.left) / 2;
-    LONG screenMiddleH = (workRect.bottom - workRect.top) / 2;
-    RECT winRect;
-    if (app->frame == 1) {
-        GetWindowRect(app->window, &winRect);
-    } else {
-        GetClientRect(app->window, &winRect);
-    }
-    LONG winWidth = winRect.right - winRect.left;
-    LONG winHeight = winRect.bottom - winRect.top;
-
-    LONG windowX = screenMiddleW - (winWidth / 2);
-    LONG windowY = screenMiddleH - (winHeight / 2);
-
-    SetWindowPos(app->window, HWND_TOP, windowX, windowY, winWidth, winHeight, SWP_NOSIZE);
-}
-
-void Center(struct Application* app) {
-    ON_MAIN_THREAD(
-        center(app);
-    );
-}
-
-UINT getWindowPlacement(struct Application* app) {
-    WINDOWPLACEMENT lpwndpl;
-    lpwndpl.length = sizeof(WINDOWPLACEMENT);
-    BOOL result = GetWindowPlacement(app->window, &lpwndpl);
-    if( result == 0 ) {
-        // TODO: Work out what this call failing means
-        return -1;
-    }
-    return lpwndpl.showCmd;
-}
-
-int isMaximised(struct Application* app) {
-    return getWindowPlacement(app) == SW_SHOWMAXIMIZED;
-}
-
-void maximise(struct Application* app) {
-    ShowWindow(app->window, SW_MAXIMIZE);
-}
-
-void Maximise(struct Application* app) {
-    ON_MAIN_THREAD(
-        maximise(app);
-    );
-}
-
-void unmaximise(struct Application* app) {
-    ShowWindow(app->window, SW_RESTORE);
-}
-
-void Unmaximise(struct Application* app) {
-    ON_MAIN_THREAD(
-        unmaximise(app);
-    );
-}
-
-
-void ToggleMaximise(struct Application* app) {
-    if(isMaximised(app)) {
-        return Unmaximise(app);
-    }
-    return Maximise(app);
-}
-
-int isMinimised(struct Application* app) {
-    return getWindowPlacement(app) == SW_SHOWMINIMIZED;
-}
-
-void minimise(struct Application* app) {
-    ShowWindow(app->window, SW_MINIMIZE);
-}
-
-void Minimise(struct Application* app) {
-    ON_MAIN_THREAD(
-        minimise(app);
-    );
-}
-
-void unminimise(struct Application* app) {
-    ShowWindow(app->window, SW_RESTORE);
-}
-
-void Unminimise(struct Application* app) {
-    ON_MAIN_THREAD(
-        unminimise(app);
-    );
-}
-
-void ToggleMinimise(struct Application* app) {
-    if(isMinimised(app)) {
-        return Unminimise(app);
-    }
-    return Minimise(app);
-}
-
-void SetColour(struct Application* app, int red, int green, int blue, int alpha) {
-// TBD
-}
-
-void SetSize(struct Application* app, int width, int height) {
-    // TBD
-}
-
-void setPosition(struct Application* app, int x, int y) {
-    // TBD
-}
-
-void SetPosition(struct Application* app, int x, int y) {
-//    ON_MAIN_THREAD(
-//        setPosition(app, x, y);
-//    );
-}
-
-void Quit(struct Application* app) {
-    DestroyWindow(app->window);
-}
-
-
-// Credit: https://stackoverflow.com/a/6693107
-void setTitle(struct Application* app, const char *title) {
-    LPCTSTR text = cstrToLPWSTR(title);
-    SetWindowText(app->window, text);
-    delete[] text;
-}
-
-void SetTitle(struct Application* app, const char *title) {
-    ON_MAIN_THREAD(
-        setTitle(app, title);
-    );
-}
-
-void Fullscreen(struct Application* app) {
-}
-
-void UnFullscreen(struct Application* app) {
-}
-
-void ToggleFullscreen(struct Application* app) {
-}
-
-void DisableFrame(struct Application* app) {
-    app->frame = 0;
-}
-
-// WebviewIsTransparent will make the webview transparent
-// revealing the window underneath
-void WebviewIsTransparent(struct Application *app) {
-	app->webviewIsTranparent = true;
-}
-
-void WindowBackgroundIsTranslucent(struct Application *app) {
-	app->windowBackgroundIsTranslucent = true;
-}
-
-
-void OpenDialog(struct Application* app, char *callbackID, char *title, char *filters, char *defaultFilename, char *defaultDir, int allowFiles, int allowDirs, int allowMultiple, int showHiddenFiles, int canCreateDirectories, int resolvesAliases, int treatPackagesAsDirectories) {
-}
-void SaveDialog(struct Application* app, char *callbackID, char *title, char *filters, char *defaultFilename, char *defaultDir, int showHiddenFiles, int canCreateDirectories, int treatPackagesAsDirectories) {
-}
-void MessageDialog(struct Application* app, char *callbackID, char *type, char *title, char *message, char *icon, char *button1, char *button2, char *button3, char *button4, char *defaultButton, char *cancelButton) {
-}
-void DarkModeEnabled(struct Application* app, char *callbackID) {
-}
-void SetApplicationMenu(struct Application* app, const char *applicationMenuJSON) {
-}
-void AddTrayMenu(struct Application* app, const char *menuTrayJSON) {
-}
-void SetTrayMenu(struct Application* app, const char *menuTrayJSON) {
-}
-void DeleteTrayMenuByID(struct Application* app, const char *id) {
-}
-void UpdateTrayMenuLabel(struct Application* app, const char* JSON) {
-}
-void AddContextMenu(struct Application* app, char *contextMenuJSON) {
-}
-void UpdateContextMenu(struct Application* app, char *contextMenuJSON) {
-}

v2/internal/ffenestri/ffenestri_windows.go

@@ -1,63 +0,0 @@
-package ffenestri
-
-import "C"
-
-/*
-
-#cgo windows CXXFLAGS: -std=c++11
-#cgo windows,amd64 LDFLAGS: -L./windows/x64 -lwebview -lWebView2Loader -lgdi32 -lole32 -lShlwapi -luser32 -loleaut32
-
-#include "ffenestri.h"
-
-*/
-import "C"
-
-func (a *Application) processPlatformSettings() error {
-
-	config := a.config.Windows
-
-	// Check if the webview should be transparent
-	if config.WebviewIsTransparent {
-		C.WebviewIsTransparent(a.app)
-	}
-
-	if config.WindowBackgroundIsTranslucent {
-		C.WindowBackgroundIsTranslucent(a.app)
-	}
-
-	//// Process menu
-	////applicationMenu := options.GetApplicationMenu(a.config)
-	//applicationMenu := a.menuManager.GetApplicationMenuJSON()
-	//if applicationMenu != "" {
-	//	C.SetApplicationMenu(a.app, a.string2CString(applicationMenu))
-	//}
-	//
-	//// Process tray
-	//trays, err := a.menuManager.GetTrayMenus()
-	//if err != nil {
-	//	return err
-	//}
-	//if trays != nil {
-	//	for _, tray := range trays {
-	//		C.AddTrayMenu(a.app, a.string2CString(tray))
-	//	}
-	//}
-	//
-	//// Process context menus
-	//contextMenus, err := a.menuManager.GetContextMenus()
-	//if err != nil {
-	//	return err
-	//}
-	//if contextMenus != nil {
-	//	for _, contextMenu := range contextMenus {
-	//		C.AddContextMenu(a.app, a.string2CString(contextMenu))
-	//	}
-	//}
-	//
-	//// Process URL Handlers
-	//if a.config.Mac.URLHandlers != nil {
-	//	C.HasURLHandlers(a.app)
-	//}
-
-	return nil
-}

v2/internal/ffenestri/ffenestri_windows.h

@@ -1,75 +0,0 @@
-
-#ifndef _FFENESTRI_WINDOWS_H
-#define _FFENESTRI_WINDOWS_H
-
-#define WIN32_LEAN_AND_MEAN
-#define UNICODE 1
-
-#include "ffenestri.h"
-#include <windows.h>
-#include <wingdi.h>
-#include <functional>
-#include <codecvt>
-#include "windows/WebView2.h"
-
-#include "assets.h"
-
-// TODO:
-//#include "userdialogicons.h"
-
-
-struct Application{
-    // Window specific
-    HWND window;
-    ICoreWebView2 *webview;
-    ICoreWebView2Controller* webviewController;
-
-    // Application
-    const char *title;
-    int width;
-    int height;
-    int resizable;
-    int devtools;
-    int fullscreen;
-    int startHidden;
-    int logLevel;
-    int hideWindowOnClose;
-    int minSizeSet;
-    LONG minWidth;
-    LONG minHeight;
-    int maxSizeSet;
-    LONG maxWidth;
-    LONG maxHeight;
-    int frame;
-    char *startupURL;
-    bool webviewIsTranparent;
-    bool windowBackgroundIsTranslucent;
-    COREWEBVIEW2_COLOR backgroundColour;
-
-    // placeholders
-    char* bindings;
-    char* initialCode;
-};
-
-#define ON_MAIN_THREAD(code) dispatch( [=]{ code; } )
-
-typedef std::function<void()> dispatchFunction;
-typedef std::function<void(const std::string)> messageCallback;
-typedef std::function<void(ICoreWebView2Controller *)> comHandlerCallback;
-
-void center(struct Application*);
-void setTitle(struct Application* app, const char *title);
-char* LPWSTRToCstr(LPWSTR input);
-
-// called when the DOM is ready
-void loadAssets(struct Application* app);
-
-// called when the application assets have been loaded into the DOM
-void completed(struct Application* app);
-
-// Callback
-extern "C" {
-    void messageFromWindowCallback(const char *);
-}
-
-#endif

v2/internal/ffenestri/json.c

@@ -1,5 +1,3 @@
-// +build !windows
-
 /*
   Copyright (C) 2011 Joseph A. Adams (joeyadams3.14159@gmail.com)
   All rights reserved.

v2/internal/ffenestri/menu.c

@@ -0,0 +1,276 @@
+//
+// Created by Lea Anthony on 18/1/21.
+//
+
+#include "menu.h"
+
+Menu* NewMenu(struct JsonNode* menuData, struct JsonNode* radioData, MenuManager* manager) {
+
+    if( menuData == NULL ) return NULL;
+    if( manager == NULL ) return NULL;
+
+    Menu *result = NEW(Menu);
+
+    // No label by default
+    result->label = STRCOPY(getJSONStringDefault(menuData, "l", ""));
+
+    // Setup platform specific menu data
+    SetupMenuPlatformData(result);
+
+    // Init menu item list
+    vec_init(&result->menuItems);
+
+    // Get the menu items
+    JsonNode* items = getJSONObject(menuData, "i");
+    if( items != NULL ) {
+
+        // Process the menu data
+        JsonNode *item;
+        json_foreach(item, items) {
+            const char *ID = mustJSONString(item, "I");
+            MenuItem *menuItem = HASHMAP_GET(manager->menuItems, ID);
+            if (menuItem == NULL) {
+                // Process each menu item
+                menuItem = processMenuItem(result, item, manager);
+
+                // Filter out separators
+                if (menuItem->ID != NULL) {
+                    HASHMAP_PUT(manager->menuItems, menuItem->ID, menuItem);
+                }
+            }
+            AddMenuItemToMenu(result, menuItem, manager);
+        }
+
+        if (radioData != NULL) {
+            // Iterate radio groups
+            JsonNode *radioGroup;
+            json_foreach(radioGroup, radioData) {
+                // Get item label
+                processRadioGroup(result, radioGroup, manager);
+            }
+        }
+    }
+
+    return result;
+}
+
+MenuItem* processMenuItem(Menu *menu, JsonNode *item, MenuManager *manager) {
+
+
+    // Get the role
+    const char *role = getJSONString(item, "r");
+    if( role != NULL ) {
+        // Roles override everything else
+//        return NewMenuItemForRole(role, menu, item, manager);
+    }
+
+    Menu* submenu = NULL;
+
+    // Check if this is a submenu
+//    JsonNode *submenuData = json_find_member(item, "S");
+//    if( submenuData != NULL ) {
+//        submenu = NewMenu(submenuData)
+//        // Get the label
+//        JsonNode *menuNameNode = json_find_member(item, "l");
+//        const char *name = "";
+//        if ( menuNameNode != NULL) {
+//            name = menuNameNode->string_;
+//        }
+//
+//        id thisMenuItem = createMenuItemNoAutorelease(str(name), NULL, "");
+//        id thisMenu = createMenu(str(name));
+//
+//        msg(thisMenuItem, s("setSubmenu:"), thisMenu);
+//        msg(parentMenu, s("addItem:"), thisMenuItem);
+//
+//        JsonNode *submenuItems = json_find_member(submenu, "i");
+//        // If we have no items, just return
+//        if ( submenuItems == NULL ) {
+//            return;
+//        }
+//
+//        // Loop over submenu items
+//        JsonNode *item;
+//        json_foreach(item, submenuItems) {
+//            // Get item label
+//            processMenuItem(menu, thisMenu, item);
+//        }
+//
+//        return;
+//    }
+
+
+    // Get the ID
+    const char *menuItemID = mustJSONString(item, "I");
+
+    // Get the label(s)
+    const char* label = getJSONStringDefault(item, "l", "");
+    const char* alternateLabel = getJSONString(item, "L");
+
+    bool checked = getJSONBool(item, "c");
+    bool hidden = getJSONBool(item, "h");
+    bool disabled = getJSONBool(item, "d");
+    const char* RGBA = getJSONString(item, "R");
+    const char* font = getJSONString(item, "F");
+    const char* image = getJSONString(item, "i");
+
+    int fontSize = 0;
+    getJSONInt(item, "F", &fontSize);
+
+    // Get the Accelerator
+    JsonNode *accelerator = json_find_member(item, "a");
+    const char *acceleratorKey = NULL;
+    const char **modifiers = NULL;
+
+    // If we have an accelerator
+    if( accelerator != NULL ) {
+        // Get the key
+        acceleratorKey = getJSONString(accelerator, "Key");
+        // Check if there are modifiers
+        JsonNode *modifiersList = json_find_member(accelerator, "Modifiers");
+        if ( modifiersList != NULL ) {
+            // Allocate an array of strings
+            int noOfModifiers = json_array_length(modifiersList);
+
+            // Do we have any?
+            if (noOfModifiers > 0) {
+                modifiers = malloc(sizeof(const char *) * (noOfModifiers + 1));
+                JsonNode *modifier;
+                int count = 0;
+                // Iterate the modifiers and save a reference to them in our new array
+                json_foreach(modifier, modifiersList) {
+                    // Get modifier name
+                    modifiers[count] = STRCOPY(modifier->string_);
+                    count++;
+                }
+                // Null terminate the modifier list
+                modifiers[count] = NULL;
+            }
+        }
+    }
+
+    // has callback?
+    bool hasCallback = getJSONBool(item, "C");
+
+    // Get the Type
+    const char *type = mustJSONString(item, "t");
+
+    MenuItem* menuItem;
+    enum MenuItemType menuItemType;
+    if( STREQ(type, "t")) {
+        menuItemType = Text;
+    }
+    else if ( STREQ(type, "s")) {
+        menuItemType = Separator;
+    }
+    else if ( STREQ(type, "c")) {
+        menuItemType = Checkbox;
+    }
+    else if ( STREQ(type, "r")) {
+        menuItemType = Radio;
+    } else {
+        menuItemType = -1;
+        ABORT("Unknown Menu Item type '%s'!", type);
+    }
+    menuItem = NewMenuItem(menuItemType, menuItemID, label, alternateLabel, disabled, hidden, checked, RGBA, font, fontSize, image, acceleratorKey, modifiers, hasCallback, submenu);
+    return menuItem;
+}
+
+void DeleteMenu(Menu* menu) {
+
+    // NULL guard
+    if( menu == NULL ) return;
+
+    // Delete the platform specific menu data
+    DeleteMenuPlatformData(menu);
+
+    // Clean up other data
+    MEMFREE(menu->label);
+
+    // Clear the menu items vector
+    vec_deinit(&menu->menuItems);
+}
+
+const char* MenuAsJSON(Menu* menu) {
+
+    if( menu == NULL ) return NULL;
+
+    JsonNode *jsonObject = json_mkobject();
+    JSON_ADD_STRING(jsonObject, "Label", menu->label);
+    return json_encode(jsonObject);
+}
+
+JsonNode* MenuAsJSONObject(Menu* menu) {
+
+    if( menu == NULL ) return NULL;
+
+    JsonNode *jsonObject = json_mkobject();
+    JSON_ADD_STRING(jsonObject, "Label", menu->label);
+    if( vec_size(&menu->menuItems) > 0 ) {
+        JsonNode* items = json_mkarray();
+        int i; MenuItem *menuItem;
+        vec_foreach(&menu->menuItems, menuItem, i) {
+            JSON_ADD_ELEMENT(items, MenuItemAsJSONObject(menuItem));
+        }
+        JSON_ADD_OBJECT(jsonObject, "Items", items);
+    }
+    return jsonObject;
+}
+
+
+void processRadioGroup(Menu *menu, JsonNode *radioGroup, MenuManager* manager) {
+
+    JsonNode *members = json_find_member(radioGroup, "Members");
+    JsonNode *member;
+
+    int groupLength = json_array_length(radioGroup);
+    // Allocate array
+    size_t arrayLength = sizeof(id)*(groupLength+1);
+    MenuItem* memberList[arrayLength];
+
+    // Build the radio group items
+    int count=0;
+    json_foreach(member, members) {
+        // Get menu by id
+        MenuItem* menuItem = HASHMAP_GET(manager->menuItems, (char*)member->string_);
+        // Save Member
+        memberList[count] = menuItem;
+        count = count + 1;
+    }
+    // Null terminate array
+    memberList[groupLength] = 0;
+
+    // Store the members
+    json_foreach(member, members) {
+        // Copy the memberList
+        char *newMemberList = (char *)malloc(arrayLength);
+        memcpy(newMemberList, memberList, arrayLength);
+        // add group to each member of group
+        HASHMAP_PUT(menu->radioGroups, member->string_, newMemberList);
+
+    }
+
+}
+
+void AddMenuItemToMenu(Menu* menu, MenuItem* menuItem, MenuManager* manager) {
+    vec_push(&menu->menuItems, menuItem);
+    PlatformAddMenuItemToMenu(menu, menuItem, manager);
+}
+
+// Creates a JSON message for the given menuItemID and data
+const char* CreateMenuClickedMessage(const char *menuItemID, const char *data) {
+
+    JsonNode *jsonObject = json_mkobject();
+    if (menuItemID == NULL ) {
+        ABORT("Item ID NULL for menu!!\n");
+    }
+    json_append_member(jsonObject, "i", json_mkstring(menuItemID));
+    if (data != NULL) {
+        json_append_member(jsonObject, "data", json_mkstring(data));
+    }
+    const char *payload = json_encode(jsonObject);
+    json_delete(jsonObject);
+    const char *result = concat("MC", payload);
+    MEMFREE(payload);
+    return result;
+}

v2/internal/ffenestri/menu.h

@@ -0,0 +1,178 @@
+//
+// Created by Lea Anthony on 18/1/21.
+//
+
+#ifndef MENU_H
+#define MENU_H
+
+#include "common.h"
+
+enum MenuItemType {Text = 0, Checkbox = 1, Radio = 2, Separator = 3};
+static const char *MenuItemTypeAsString[] = {
+        "Text", "Checkbox", "Radio", "Separator",
+};
+
+enum MenuType {ApplicationMenuType = 0, ContextMenuType = 1, TrayMenuType = 2};
+static const char *MenuTypeAsString[] = {
+        "ApplicationMenu", "ContextMenu", "TrayMenu",
+};
+
+
+
+typedef struct {
+
+    // Menu label
+    const char *label;
+
+    // A list of menuItem IDs that make up this menu
+    vec_void_t menuItems;
+
+    // The platform specific menu data
+    void *platformData;
+
+} Menu;
+
+typedef struct {
+
+    // ID of the tray
+    const char *ID;
+
+    // The tray label
+    const char *Label;
+
+    // The icon name
+    const char *Icon;
+
+    // The menu
+    Menu* Menu;
+
+    // Platform specific data
+    void* platformData;
+
+} TrayMenu;
+
+typedef struct {
+
+    Menu* menu;
+
+} ApplicationMenu;
+
+typedef struct {
+
+    const char* ID;
+
+    Menu* menu;
+
+} ContextMenu;
+
+typedef struct {
+
+    // This is our menu item map using the menuItem ID as a key
+    // map[string]*MenuItem
+    struct hashmap_s menuItems;
+
+    // This is our context menu map using the context menu ID as a key
+    // map[string]*ContextMenu
+    struct hashmap_s contextMenus;
+
+    // This is our tray menu map using the tray menu ID as a key
+    // map[string]*TrayMenu
+    struct hashmap_s trayMenus;
+
+    // Application Menu
+    Menu* applicationMenu;
+
+    // Context menu data
+    const char* contextMenuData;
+
+} MenuManager;
+
+
+typedef struct {
+    MenuManager* manager;
+    const char *menuItemID;
+    enum MenuItemType menuItemType;
+} MenuItemCallbackData;
+
+typedef struct {
+    const char *ID;
+    const char* label;
+    const char* alternateLabel;
+    bool disabled;
+    bool hidden;
+    const char* colour;
+    const char* font;
+    int fontSize;
+    const char* image;
+    bool checked;
+
+    // Keyboard shortcut
+    const char* acceleratorKey;
+    const char** modifiers;
+
+    // Type of menuItem
+    enum MenuItemType type;
+
+    // Indicates if the menuItem has a callback
+    bool hasCallback;
+
+    // The platform specific menu data
+    void* platformData;
+
+    // Submenu
+    Menu* submenu;
+
+    // Radio group for this item
+    vec_void_t radioGroup;
+
+    // Data for handling callbacks
+    MenuItemCallbackData *callbackData;
+
+} MenuItem;
+
+// MenuItem
+MenuItem* NewMenuItem(enum MenuItemType type, const char* ID, const char* label, const char* alternateLabel, bool disabled, bool hidden, bool checked, const char* colour, const char* font, int fontsize, const char* image, const char* acceleratorKey, const char** modifiers, bool hasCallback, Menu* submenu);
+void DeleteMenuItem(MenuItem* menuItem);
+JsonNode* MenuItemAsJSONObject(MenuItem* menuItem);
+
+// Menu
+Menu* NewMenu(JsonNode* menuData, JsonNode* radioData, MenuManager* menuManager);
+void DeleteMenu(Menu* menu);
+const char* MenuAsJSON(Menu* menu);
+JsonNode* MenuAsJSONObject(Menu* menu);
+void AddMenuItemToMenu(Menu* menu, MenuItem* menuItem, MenuManager* manager);
+MenuItem* processMenuItem(Menu *menu, JsonNode *item, MenuManager *manager);
+void processRadioGroup(Menu *menu, JsonNode *radioGroup, MenuManager* manager);
+
+// Tray
+TrayMenu* NewTrayMenu(JsonNode* trayJSON, MenuManager *manager);
+void DeleteTrayMenu(TrayMenu *trayMenu);
+const char* TrayMenuAsJSON(TrayMenu* menu);
+
+// MenuManager
+MenuManager* NewMenuManager();
+void DeleteMenuManager(MenuManager* manager);
+TrayMenu* AddTrayMenuToManager(MenuManager* manager, const char* trayMenuJSON);
+void ShowTrayMenus(MenuManager* manager);
+
+// Callbacks
+MenuItemCallbackData* NewMenuItemCallbackData(MenuManager *manager, const char* menuItemID, enum MenuItemType menuItemType);
+void DeleteMenuItemCallbackData(MenuItemCallbackData* callbackData);
+const char* CreateMenuClickedMessage(const char *menuItemID, const char *data);
+
+// Platform
+void SetupMenuPlatformData(Menu* menu);
+void DeleteMenuPlatformData(Menu* menu);
+void SetupMenuItemPlatformData(MenuItem* menuItem);
+void DeleteMenuItemPlatformData(MenuItem* menuItem);
+void SetupTrayMenuPlatformData(TrayMenu* menu);
+void DeleteTrayMenuPlatformData(TrayMenu* menu);
+void PlatformAddMenuItemToMenu(Menu *menu, MenuItem* menuItem, MenuManager* manager);
+void PlatformUpdateTrayIcon(TrayMenu *menu);
+
+// Platform specific methods
+void UnloadTrayIcons();
+void LoadTrayIcons();
+void ShowTrayMenu(TrayMenu* trayMenu);
+
+#endif //MENU_H

v2/internal/ffenestri/menu_darwin.h

@@ -1,117 +1,21 @@
 //
-// Created by Lea Anthony on 6/1/21.
+// Created by Lea Anthony on 18/1/21.
 //
 
-#ifndef MENU_DARWIN_H
-#define MENU_DARWIN_H
-
 #include "common.h"
-#include "ffenestri_darwin.h"
-
-enum MenuItemType {Text = 0, Checkbox = 1, Radio = 2};
-enum MenuType {ApplicationMenuType = 0, ContextMenuType = 1, TrayMenuType = 2};
-static const char *MenuTypeAsString[] = {
-        "ApplicationMenu", "ContextMenu", "TrayMenu",
-};
-
-typedef struct _NSRange {
-    unsigned long location;
-    unsigned long length;
-} NSRange;
-
-#define NSFontWeightUltraLight -0.8
-#define NSFontWeightThin -0.6
-#define NSFontWeightLight -0.4
-#define NSFontWeightRegular 0.0
-#define NSFontWeightMedium 0.23
-#define NSFontWeightSemibold 0.3
-#define NSFontWeightBold 0.4
-#define NSFontWeightHeavy 0.56
-#define NSFontWeightBlack 0.62
-
-extern void messageFromWindowCallback(const char *);
+#include "menu.h"
 
 typedef struct {
-
-    const char *title;
-
-    /*** Internal ***/
-
-    // The decoded version of the Menu JSON
-    JsonNode *processedMenu;
-
-    struct hashmap_s menuItemMap;
-    struct hashmap_s radioGroupMap;
-
-    // Vector to keep track of callback data memory
-    vec_void_t callbackDataCache;
-
-    // The NSMenu for this menu
-    id menu;
-
-    // The parent data, eg ContextMenuStore or Tray
-    void *parentData;
-
-    // The commands for the menu callbacks
-    const char *callbackCommand;
-
-    // This indicates if we are an Application Menu, tray menu or context menu
-    enum MenuType menuType;
-
-
-} Menu;
-
+    id Menu;
+} MacMenu;
 
 typedef struct {
-    id menuItem;
-    Menu *menu;
-    const char *menuID;
-    enum MenuItemType menuItemType;
-} MenuItemCallbackData;
+    id MenuItem;
+} MacMenuItem;
 
+typedef struct {
+    id statusBarItem;
+    int iconPosition;
+} MacTrayMenu;
 
-
-// NewMenu creates a new Menu struct, saving the given menu structure as JSON
-Menu* NewMenu(JsonNode *menuData);
-
-Menu* NewApplicationMenu(const char *menuAsJSON);
-MenuItemCallbackData* CreateMenuItemCallbackData(Menu *menu, id menuItem, const char *menuID, enum MenuItemType menuItemType);
-
-void DeleteMenu(Menu *menu);
-
-// Creates a JSON message for the given menuItemID and data
-const char* createMenuClickedMessage(const char *menuItemID, const char *data, enum MenuType menuType, const char *parentID);
-// Callback for text menu items
-void menuItemCallback(id self, SEL cmd, id sender);
-id processAcceleratorKey(const char *key);
-
-
-void addSeparator(id menu);
-id createMenuItemNoAutorelease( id title, const char *action, const char *key);
-
-id createMenuItem(id title, const char *action, const char *key);
-
-id addMenuItem(id menu, const char *title, const char *action, const char *key, bool disabled);
-
-id createMenu(id title);
-void createDefaultAppMenu(id parentMenu);
-void createDefaultEditMenu(id parentMenu);
-
-void processMenuRole(Menu *menu, id parentMenu, JsonNode *item);
-// This converts a string array of modifiers into the
-// equivalent MacOS Modifier Flags
-unsigned long parseModifiers(const char **modifiers);
-id processRadioMenuItem(Menu *menu, id parentmenu, const char *title, const char *menuid, bool disabled, bool checked, const char *acceleratorkey);
-
-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, bool alternate, JsonNode* styledLabel);
-void processMenuItem(Menu *menu, id parentMenu, JsonNode *item);
-void processMenuData(Menu *menu, JsonNode *menuData);
-
-void processRadioGroupJSON(Menu *menu, JsonNode *radioGroup);
-id GetMenu(Menu *menu);
-id createAttributedString(const char* title, const char* fontName, int fontSize, const char* RGBA);
-id createAttributedStringFromStyledLabel(JsonNode *styledLabel, const char* fontName, int fontSize);
-
-#endif //ASSETS_C_MENU_DARWIN_H
+void PlatformMenuItemCallback(id self, SEL cmd, id sender);

v2/internal/ffenestri/menu_darwin_old.c

@@ -0,0 +1,542 @@
+//
+// Created by Lea Anthony on 6/1/21.
+//
+
+#include "ffenestri_darwin.h"
+#include "menu_darwin_old.h"
+#include "contextmenus_darwin.h"
+#include "traymenustore_darwin.h"
+
+// NewMenu creates a new Menu struct, saving the given menu structure as JSON
+Menu* NewMenu(JsonNode *menuData, JsonNode *radioGroups, struct TrayMenuStore *store) {
+
+    Menu *result = malloc(sizeof(Menu));
+
+    // No title by default
+    result->title = "";
+
+    // Initialise menuCallbackDataCache
+    vec_init(&result->callbackDataCache);
+
+    // Allocate MenuItem Map
+    if( 0 != hashmap_create((const unsigned)16, &result->menuItemMap)) {
+        ABORT("[NewMenu] Not enough memory to allocate menuItemMap!");
+    }
+    // Allocate the Radio Group Map
+    if( 0 != hashmap_create((const unsigned)4, &result->radioGroupMap)) {
+        ABORT("[NewMenu] Not enough memory to allocate radioGroupMap!");
+    }
+
+    // Init other members
+    result->menu = NULL;
+    result->store = store;
+
+    // Process the menu
+    ProcessMenu(result, menuData, radioGroups);
+
+    return result;
+}
+
+Menu* NewApplicationMenu(const char *menuAsJSON, struct TrayMenuStore *store) {
+
+    // Parse the menu json
+    JsonNode *processedMenu = json_decode(menuAsJSON);
+    if( processedMenu == NULL ) {
+        // Parse error!
+        ABORT("Unable to parse Menu JSON: %s", menuAsJSON);
+    }
+
+    // TODO - fixup
+    Menu *result = NewMenu(processedMenu, NULL, store);
+    result->menuType = ApplicationMenuType;
+    return result;
+}
+
+//TODO: Put traymenu store in callback instead of menu as it'll never be null
+MenuItemCallbackData* CreateMenuItemCallbackData(Menu *menu, const char *menuItemID, enum MenuItemType menuItemType) {
+    MenuItemCallbackData* result = malloc(sizeof(MenuItemCallbackData));
+
+    result->store = menu->store;
+    result->menuItemID = STRCOPY(menuItemID);
+    result->menuItemType = menuItemType;
+
+    // Store reference to this so we can destroy later
+    vec_push(&menu->callbackDataCache, result);
+
+    return result;
+}
+
+
+
+void DeleteMenu(Menu *menu) {
+
+    if( menu == NULL ) {
+        return;
+    }
+
+    // Free menu item hashmap
+    hashmap_destroy(&menu->menuItemMap);
+
+    // Free radio group members
+    if( hashmap_num_entries(&menu->radioGroupMap) > 0 ) {
+        if (0 != hashmap_iterate_pairs(&menu->radioGroupMap, freeHashmapItem, NULL)) {
+            ABORT("[DeleteMenu] Failed to release radioGroupMap entries!");
+        }
+    }
+
+    // Free radio groups hashmap
+    hashmap_destroy(&menu->radioGroupMap);
+
+    // Release the callback cache memory
+    int i; MenuItemCallbackData *callback;
+    vec_foreach(&menu->callbackDataCache, callback, i) {
+            MEMFREE(callback->menuItemID);
+    }
+    vec_deinit(&menu->callbackDataCache);
+
+    // Free nsmenu if we have it
+    if ( menu->menu != NULL ) {
+        msg(menu->menu, s("release"));
+    }
+
+    free(menu);
+}
+
+
+
+
+
+
+void addSeparator(id menu) {
+    id item = msg(c("NSMenuItem"), s("separatorItem"));
+    msg(menu, s("addItem:"), item);
+}
+
+id createMenuItemNoAutorelease( id title, const char *action, const char *key) {
+    id item = ALLOC("NSMenuItem");
+    msg(item, s("initWithTitle:action:keyEquivalent:"), title, s(action), str(key));
+    return item;
+}
+
+id createMenuItem(id title, const char *action, const char *key) {
+    id item = ALLOC("NSMenuItem");
+    msg(item, s("initWithTitle:action:keyEquivalent:"), title, s(action), str(key));
+    msg(item, s("autorelease"));
+    return item;
+}
+
+id addMenuItem(id menu, const char *title, const char *action, const char *key, bool disabled) {
+    id item = createMenuItem(str(title), action, key);
+    msg(item, s("setEnabled:"), !disabled);
+    msg(menu, s("addItem:"), item);
+    return item;
+}
+
+id createMenu(id title) {
+    id menu = ALLOC("NSMenu");
+    msg(menu, s("initWithTitle:"), title);
+    msg(menu, s("setAutoenablesItems:"), NO);
+//  msg(menu, s("autorelease"));
+    return menu;
+}
+
+void createDefaultAppMenu(id parentMenu) {
+// App Menu
+    id appName = msg(msg(c("NSProcessInfo"), s("processInfo")), s("processName"));
+    id appMenuItem = createMenuItemNoAutorelease(appName, NULL, "");
+    id appMenu = createMenu(appName);
+
+    msg(appMenuItem, s("setSubmenu:"), appMenu);
+    msg(parentMenu, s("addItem:"), appMenuItem);
+
+    id title = msg(str("Hide "), s("stringByAppendingString:"), appName);
+    id item = createMenuItem(title, "hide:", "h");
+    msg(appMenu, s("addItem:"), item);
+
+    id hideOthers = addMenuItem(appMenu, "Hide Others", "hideOtherApplications:", "h", FALSE);
+    msg(hideOthers, s("setKeyEquivalentModifierMask:"), (NSEventModifierFlagOption | NSEventModifierFlagCommand));
+
+    addMenuItem(appMenu, "Show All", "unhideAllApplications:", "", FALSE);
+
+    addSeparator(appMenu);
+
+    title = msg(str("Quit "), s("stringByAppendingString:"), appName);
+    item = createMenuItem(title, "terminate:", "q");
+    msg(appMenu, s("addItem:"), item);
+}
+
+void createDefaultEditMenu(id parentMenu) {
+    // Edit Menu
+    id editMenuItem = createMenuItemNoAutorelease(str("Edit"), NULL, "");
+    id editMenu = createMenu(str("Edit"));
+
+    msg(editMenuItem, s("setSubmenu:"), editMenu);
+    msg(parentMenu, s("addItem:"), editMenuItem);
+
+    addMenuItem(editMenu, "Undo", "undo:", "z", FALSE);
+    addMenuItem(editMenu, "Redo", "redo:", "y", FALSE);
+    addSeparator(editMenu);
+    addMenuItem(editMenu, "Cut", "cut:", "x", FALSE);
+    addMenuItem(editMenu, "Copy", "copy:", "c", FALSE);
+    addMenuItem(editMenu, "Paste", "paste:", "v", FALSE);
+    addMenuItem(editMenu, "Select All", "selectAll:", "a", FALSE);
+}
+
+void processMenuRole(Menu *menu, id parentMenu, JsonNode *item) {
+    const char *roleName = item->string_;
+
+    if ( STREQ(roleName, "appMenu") ) {
+        createDefaultAppMenu(parentMenu);
+        return;
+    }
+    if ( STREQ(roleName, "editMenu")) {
+        createDefaultEditMenu(parentMenu);
+        return;
+    }
+    if ( STREQ(roleName, "hide")) {
+        addMenuItem(parentMenu, "Hide Window", "hide:", "h", FALSE);
+        return;
+    }
+    if ( STREQ(roleName, "hideothers")) {
+        id hideOthers = addMenuItem(parentMenu, "Hide Others", "hideOtherApplications:", "h", FALSE);
+        msg(hideOthers, s("setKeyEquivalentModifierMask:"), (NSEventModifierFlagOption | NSEventModifierFlagCommand));
+        return;
+    }
+    if ( STREQ(roleName, "unhide")) {
+        addMenuItem(parentMenu, "Show All", "unhideAllApplications:", "", FALSE);
+        return;
+    }
+    if ( STREQ(roleName, "front")) {
+        addMenuItem(parentMenu, "Bring All to Front", "arrangeInFront:", "", FALSE);
+        return;
+    }
+    if ( STREQ(roleName, "undo")) {
+        addMenuItem(parentMenu, "Undo", "undo:", "z", FALSE);
+        return;
+    }
+    if ( STREQ(roleName, "redo")) {
+        addMenuItem(parentMenu, "Redo", "redo:", "y", FALSE);
+        return;
+    }
+    if ( STREQ(roleName, "cut")) {
+        addMenuItem(parentMenu, "Cut", "cut:", "x", FALSE);
+        return;
+    }
+    if ( STREQ(roleName, "copy")) {
+        addMenuItem(parentMenu, "Copy", "copy:", "c", FALSE);
+        return;
+    }
+    if ( STREQ(roleName, "paste")) {
+        addMenuItem(parentMenu, "Paste", "paste:", "v", FALSE);
+        return;
+    }
+    if ( STREQ(roleName, "delete")) {
+        addMenuItem(parentMenu, "Delete", "delete:", "", FALSE);
+        return;
+    }
+    if( STREQ(roleName, "pasteandmatchstyle")) {
+        id pasteandmatchstyle = addMenuItem(parentMenu, "Paste and Match Style", "pasteandmatchstyle:", "v", FALSE);
+        msg(pasteandmatchstyle, s("setKeyEquivalentModifierMask:"), (NSEventModifierFlagOption | NSEventModifierFlagShift | NSEventModifierFlagCommand));
+    }
+    if ( STREQ(roleName, "selectall")) {
+        addMenuItem(parentMenu, "Select All", "selectAll:", "a", FALSE);
+        return;
+    }
+    if ( STREQ(roleName, "minimize")) {
+        addMenuItem(parentMenu, "Minimize", "miniaturize:", "m", FALSE);
+        return;
+    }
+    if ( STREQ(roleName, "zoom")) {
+        addMenuItem(parentMenu, "Zoom", "performZoom:", "", FALSE);
+        return;
+    }
+    if ( STREQ(roleName, "quit")) {
+        addMenuItem(parentMenu, "Quit (More work TBD)", "terminate:", "q", FALSE);
+        return;
+    }
+    if ( STREQ(roleName, "togglefullscreen")) {
+        addMenuItem(parentMenu, "Toggle Full Screen", "toggleFullScreen:", "f", FALSE);
+        return;
+    }
+
+}
+
+
+
+id processRadioMenuItem(Menu *menu, id parentmenu, const char *title, const char *menuItemID, bool disabled, bool checked, const char *acceleratorkey, bool hascallback) {
+    id item = ALLOC("NSMenuItem");
+
+    // Store the item in the menu item map
+//    hashmap_put(&menu->menuItemMap, (char*)menuItemID, strlen(menuItemID), item);
+
+    SaveMenuItemInStore((TrayMenuStore *) menu->store, menuItemID, item);
+
+    if( hascallback ) {
+        // Create a MenuItemCallbackData
+        MenuItemCallbackData *callback = CreateMenuItemCallbackData(menu, menuItemID, Radio);
+
+        id wrappedId = msg(c("NSValue"), s("valueWithPointer:"), callback);
+        msg(item, s("setRepresentedObject:"), wrappedId);
+    }
+
+
+    id key = processAcceleratorKey(acceleratorkey);
+
+    msg(item, s("initWithTitle:action:keyEquivalent:"), str(title), s("menuItemCallback:"), key);
+
+    msg(item, s("setEnabled:"), !disabled);
+    msg(item, s("autorelease"));
+    msg(item, s("setState:"), (checked ? NSControlStateValueOn : NSControlStateValueOff));
+
+    msg(parentmenu, s("addItem:"), item);
+    return item;
+
+}
+
+id processCheckboxMenuItem(Menu *menu, id parentmenu, const char *title, const char *menuItemID, bool disabled, bool checked, const char *key, bool hascallback) {
+
+    id item = ALLOC("NSMenuItem");
+
+    // Store the item in the menu item map
+//    hashmap_put(&menu->menuItemMap, (char*)menuItemID, strlen(menuItemID), item);
+    SaveMenuItemInStore((TrayMenuStore *) menu->store, menuItemID, item);
+
+    if( hascallback ) {
+        // Create a MenuItemCallbackData
+        MenuItemCallbackData *callback = CreateMenuItemCallbackData(menu, menuItemID, Checkbox);
+
+        id wrappedId = msg(c("NSValue"), s("valueWithPointer:"), callback);
+        msg(item, s("setRepresentedObject:"), wrappedId);
+    }
+
+    msg(item, s("initWithTitle:action:keyEquivalent:"), str(title), s("menuItemCallback:"), str(key));
+    msg(item, s("setEnabled:"), !disabled);
+    msg(item, s("autorelease"));
+    msg(item, s("setState:"), (checked ? NSControlStateValueOn : NSControlStateValueOff));
+    msg(parentmenu, s("addItem:"), item);
+    return item;
+}
+
+id processTextMenuItem(Menu *menu, id parentMenu, const char *title, const char *menuItemID, bool disabled, const char *acceleratorkey, const char **modifiers, bool hascallback) {
+    id item = ALLOC("NSMenuItem");
+
+    SaveMenuItemInStore((TrayMenuStore *) menu->store, menuItemID, item);
+
+    if( hascallback ) {
+        // Create a MenuItemCallbackData
+        MenuItemCallbackData *callback = CreateMenuItemCallbackData(menu, menuItemID, Text);
+
+        id wrappedId = msg(c("NSValue"), s("valueWithPointer:"), callback);
+        msg(item, s("setRepresentedObject:"), wrappedId);
+    }
+
+    id key = processAcceleratorKey(acceleratorkey);
+    msg(item, s("initWithTitle:action:keyEquivalent:"), str(title),
+        s("menuItemCallback:"), key);
+
+    msg(item, s("setEnabled:"), !disabled);
+    msg(item, s("autorelease"));
+
+    // Process modifiers
+    if( modifiers != NULL ) {
+        unsigned long modifierFlags = parseModifiers(modifiers);
+        msg(item, s("setKeyEquivalentModifierMask:"), modifierFlags);
+    }
+    msg(parentMenu, s("addItem:"), item);
+
+    return item;
+}
+
+void processMenuItem(Menu *menu, id parentMenu, JsonNode *item) {
+
+    // Check if this item is hidden and if so, exit early!
+    bool hidden = getJSONBool(item, "h");
+    if( hidden ) {
+        return;
+    }
+
+    // Get the role
+    JsonNode *role = json_find_member(item, "r");
+    if( role != NULL ) {
+        processMenuRole(menu, parentMenu, role);
+        return;
+    }
+
+    // Check if this is a submenu
+    JsonNode *submenu = json_find_member(item, "S");
+    if( submenu != NULL ) {
+        // Get the label
+        JsonNode *menuNameNode = json_find_member(item, "l");
+        const char *name = "";
+        if ( menuNameNode != NULL) {
+            name = menuNameNode->string_;
+        }
+
+        id thisMenuItem = createMenuItemNoAutorelease(str(name), NULL, "");
+        id thisMenu = createMenu(str(name));
+
+        msg(thisMenuItem, s("setSubmenu:"), thisMenu);
+        msg(parentMenu, s("addItem:"), thisMenuItem);
+
+        JsonNode *submenuItems = json_find_member(submenu, "i");
+        // If we have no items, just return
+        if ( submenuItems == NULL ) {
+            return;
+        }
+
+        // Loop over submenu items
+        JsonNode *item;
+        json_foreach(item, submenuItems) {
+            // Get item label
+            processMenuItem(menu, thisMenu, item);
+        }
+
+        return;
+    }
+
+    // This is a user menu. Get the common data
+    // Get the label
+    const char *label = getJSONString(item, "l");
+    if ( label == NULL) {
+        label = "(empty)";
+    }
+
+    const char *menuItemID = getJSONString(item, "I");
+    if ( menuItemID == NULL) {
+        menuItemID = "";
+    }
+
+    bool disabled = getJSONBool(item, "d");
+
+    // Get the Accelerator
+    JsonNode *accelerator = json_find_member(item, "a");
+    const char *acceleratorkey = NULL;
+    const char **modifiers = NULL;
+
+    // If we have an accelerator
+    if( accelerator != NULL ) {
+        // Get the key
+        acceleratorkey = getJSONString(accelerator, "Key");
+        // Check if there are modifiers
+        JsonNode *modifiersList = json_find_member(accelerator, "Modifiers");
+        if ( modifiersList != NULL ) {
+            // Allocate an array of strings
+            int noOfModifiers = json_array_length(modifiersList);
+
+            // Do we have any?
+            if (noOfModifiers > 0) {
+                modifiers = malloc(sizeof(const char *) * (noOfModifiers + 1));
+                JsonNode *modifier;
+                int count = 0;
+                // Iterate the modifiers and save a reference to them in our new array
+                json_foreach(modifier, modifiersList) {
+                    // Get modifier name
+                    modifiers[count] = modifier->string_;
+                    count++;
+                }
+                // Null terminate the modifier list
+                modifiers[count] = NULL;
+            }
+        }
+    }
+
+    // has callback?
+    bool hascallback = getJSONBool(item, "C");
+
+    // Get the Type
+    const char *type = mustJSONString(item, "t");
+
+    if( STREQ(type, "t")) {
+        processTextMenuItem(menu, parentMenu, label, menuItemID, disabled, acceleratorkey, modifiers, hascallback);
+    }
+    else if ( STREQ(type, "s")) {
+        addSeparator(parentMenu);
+    }
+    else if ( STREQ(type, "c")) {
+        // Get checked state
+        bool checked = getJSONBool(item, "c");
+
+        processCheckboxMenuItem(menu, parentMenu, label, menuItemID, disabled, checked, "", hascallback);
+    }
+    else if ( STREQ(type, "r")) {
+        // Get checked state
+        bool checked = getJSONBool(item, "c");
+
+        processRadioMenuItem(menu, parentMenu, label, menuItemID, disabled, checked, "", hascallback);
+    }
+
+
+    if ( modifiers != NULL ) {
+        free(modifiers);
+    }
+
+    return;
+}
+
+void processMenuData(Menu *menu, JsonNode *menuData) {
+    // Iterate items
+    JsonNode *item;
+    json_foreach(item, menuData) {
+        // Process each menu item
+        processMenuItem(menu, menu->menu, item);
+    }
+}
+
+void processRadioGroupJSON(Menu *menu, JsonNode *radioGroup) {
+
+    int groupLength;
+    getJSONInt(radioGroup, "Length", &groupLength);
+    JsonNode *members = json_find_member(radioGroup, "Members");
+    JsonNode *member;
+
+    // Allocate array
+    size_t arrayLength = sizeof(id)*(groupLength+1);
+    id memberList[arrayLength];
+
+    // Build the radio group items
+    int count=0;
+    json_foreach(member, members) {
+        // Get menu by id
+        id menuItem = (id)hashmap_get(&menu->menuItemMap, (char*)member->string_, strlen(member->string_));
+        // Save Member
+        memberList[count] = menuItem;
+        count = count + 1;
+    }
+    // Null terminate array
+    memberList[groupLength] = 0;
+
+    // Store the members
+    json_foreach(member, members) {
+        // Copy the memberList
+        char *newMemberList = (char *)malloc(arrayLength);
+        memcpy(newMemberList, memberList, arrayLength);
+        // add group to each member of group
+        hashmap_put(&menu->radioGroupMap, member->string_, strlen(member->string_), newMemberList);
+    }
+
+}
+
+id ProcessMenu(Menu *menu, JsonNode *menuData, JsonNode *radioGroups) {
+
+    // exit if we have no meny
+    if( menuData == NULL ) {
+        return NULL;
+    }
+
+    menu->menu = createMenu(str(""));
+
+    // Process the menu data
+    processMenuData(menu, menuData);
+
+    if( radioGroups != NULL ) {
+        // Iterate radio groups
+        JsonNode *radioGroup;
+        json_foreach(radioGroup, radioGroups) {
+            // Get item label
+            processRadioGroupJSON(menu, radioGroup);
+        }
+    }
+
+    return menu->menu;
+}
+

v2/internal/ffenestri/menu_darwin_old.h

@@ -0,0 +1,97 @@
+//
+// Created by Lea Anthony on 6/1/21.
+//
+
+#ifndef MENU_DARWIN_H
+#define MENU_DARWIN_H
+
+#include "common.h"
+#include "ffenestri_darwin.h"
+
+enum MenuItemType {Text = 0, Checkbox = 1, Radio = 2};
+enum MenuType {ApplicationMenuType = 0, ContextMenuType = 1, TrayMenuType = 2};
+static const char *MenuTypeAsString[] = {
+        "ApplicationMenu", "ContextMenu", "TrayMenu",
+};
+
+extern void messageFromWindowCallback(const char *);
+
+struct TrayMenuStore;
+
+typedef struct {
+
+    const char *title;
+
+    /*** Internal ***/
+
+    struct hashmap_s menuItemMap;
+    struct hashmap_s radioGroupMap;
+
+    // Vector to keep track of callback data memory
+    vec_void_t callbackDataCache;
+
+    // The NSMenu for this menu
+    id menu;
+
+    // A reference to the Menu store
+    struct TrayMenuStore *store;
+
+    // The commands for the menu callbacks
+    const char *callbackCommand;
+
+    // This indicates if we are an Application Menu, tray menu or context menu
+    enum MenuType menuType;
+
+
+} Menu;
+
+typedef struct {
+    struct TrayMenuStore *store;
+    Menu *menu;
+    const char *menuItemID;
+    enum MenuItemType menuItemType;
+} MenuItemCallbackData;
+
+// NewMenu creates a new Menu struct, saving the given menu structure as JSON
+Menu* NewMenu(JsonNode *menuData, JsonNode *radioGroups, struct TrayMenuStore *store);
+
+Menu* NewApplicationMenu(const char *menuAsJSON, struct TrayMenuStore *store);
+MenuItemCallbackData* CreateMenuItemCallbackData(Menu *menu, const char *menuItemID, enum MenuItemType menuItemType);
+
+void DeleteMenu(Menu *menu);
+
+// Creates a JSON message for the given menuItemID and data
+const char* createMenuClickedMessage(const char *menuItemID, const char *data);
+
+// Callback for text menu items
+void menuItemCallback(id self, SEL cmd, id sender);
+id processAcceleratorKey(const char *key);
+
+
+void addSeparator(id menu);
+id createMenuItemNoAutorelease( id title, const char *action, const char *key);
+
+id createMenuItem(id title, const char *action, const char *key);
+
+id addMenuItem(id menu, const char *title, const char *action, const char *key, bool disabled);
+
+id createMenu(id title);
+void createDefaultAppMenu(id parentMenu);
+void createDefaultEditMenu(id parentMenu);
+
+void processMenuRole(Menu *menu, id parentMenu, JsonNode *item);
+// This converts a string array of modifiers into the
+// equivalent MacOS Modifier Flags
+unsigned long parseModifiers(const char **modifiers);
+id processRadioMenuItem(Menu *menu, id parentmenu, const char *title, const char *menuid, bool disabled, bool checked, const char *acceleratorkey, bool hasCallback);
+
+id processCheckboxMenuItem(Menu *menu, id parentmenu, const char *title, const char *menuid, bool disabled, bool checked, const char *key, bool hasCallback);
+
+id processTextMenuItem(Menu *menu, id parentMenu, const char *title, const char *menuid, bool disabled, const char *acceleratorkey, const char **modifiers, bool hasCallback);
+
+void processMenuItem(Menu *menu, id parentMenu, JsonNode *item);
+void processMenuData(Menu *menu, JsonNode *menuData);
+
+void processRadioGroupJSON(Menu *menu, JsonNode *radioGroup) ;
+id ProcessMenu(Menu *menu, JsonNode *menuData, JsonNode *radioGroup);
+#endif //ASSETS_C_MENU_DARWIN_H

v2/internal/ffenestri/menu_item.c

@@ -0,0 +1,101 @@
+//
+// Created by Lea Anthony on 18/1/21.
+//
+
+#include "menu.h"
+
+MenuItem* NewMenuItem(enum MenuItemType type, const char* ID, const char* label, const char* alternateLabel, bool disabled, bool hidden, bool checked, const char* colour, const char* font, int fontsize, const char* image, const char* acceleratorKey, const char** modifiers, bool hasCallback, Menu* submenu) {
+
+    MenuItem *result = NEW(MenuItem);
+
+    // Setup
+    result->ID = STRCOPY(ID);
+    result->label = STRCOPY(label);
+    result->alternateLabel = STRCOPY(alternateLabel);
+    result->disabled = disabled;
+    result->hidden = hidden;
+    result->colour = STRCOPY(colour);
+    result->font = STRCOPY(font);
+    result->fontSize = fontsize;
+    result->image = STRCOPY(image);
+    result->acceleratorKey = STRCOPY(acceleratorKey);
+    result->modifiers = modifiers;
+    result->hasCallback = hasCallback;
+    result->type = type;
+    result->checked = checked;
+    result->submenu = submenu;
+
+    result->callbackData = NULL;
+
+    vec_init(&result->radioGroup);
+
+    SetupMenuItemPlatformData(result);
+
+    return result;
+}
+
+void DeleteMenuItem(MenuItem* menuItem) {
+
+    MEMFREE(menuItem->ID);
+    MEMFREE(menuItem->label);
+    MEMFREE(menuItem->alternateLabel);
+    MEMFREE(menuItem->colour);
+    MEMFREE(menuItem->font);
+    MEMFREE(menuItem->image);
+    MEMFREE(menuItem->acceleratorKey);
+
+    // Iterate the modifiers and free elements
+    if( menuItem->modifiers != NULL ) {
+        int i = 0;
+        const char *nextItem = menuItem->modifiers[0];
+        while (nextItem != NULL) {
+            MEMFREE(nextItem);
+            i++;
+            nextItem = menuItem->modifiers[i];
+        }
+        MEMFREE(menuItem->modifiers);
+    }
+
+    DeleteMenuItemCallbackData(menuItem->callbackData);
+
+    DeleteMenuItemPlatformData(menuItem);
+
+    MEMFREE(menuItem);
+}
+
+JsonNode* MenuItemAsJSONObject(MenuItem* menuItem) {
+
+    JsonNode* result = json_mkobject();
+    JSON_ADD_STRING(result, "ID", menuItem->ID);
+    JSON_ADD_STRING(result, "label", menuItem->label);
+    JSON_ADD_STRING(result, "alternateLabel", menuItem->alternateLabel);
+    JSON_ADD_BOOL(result, "disabled", menuItem->disabled);
+    JSON_ADD_BOOL(result, "hidden", menuItem->hidden);
+    JSON_ADD_STRING(result, "colour", menuItem->colour);
+    JSON_ADD_STRING(result, "font", menuItem->font);
+    JSON_ADD_NUMBER(result, "fontsize", menuItem->fontSize);
+    JSON_ADD_STRING(result, "image", menuItem->image);
+    JSON_ADD_STRING(result, "acceleratorKey", menuItem->acceleratorKey);
+    JSON_ADD_BOOL(result, "hasCallback", menuItem->hasCallback);
+    JSON_ADD_STRING(result, "type", MenuItemTypeAsString[menuItem->type]);
+    JSON_ADD_BOOL(result, "checked", menuItem->checked);
+    return result;
+}
+
+MenuItemCallbackData* NewMenuItemCallbackData(MenuManager *manager, const char* menuItemID, enum MenuItemType menuItemType) {
+    MenuItemCallbackData* result = NEW(MenuItemCallbackData);
+
+    result->manager = manager;
+    result->menuItemID = STRCOPY(menuItemID);
+    result->menuItemType = menuItemType;
+
+    return result;
+}
+
+void DeleteMenuItemCallbackData(MenuItemCallbackData* callbackData) {
+
+    if( callbackData == NULL ) return;
+
+    MEMFREE(callbackData->menuItemID);
+    MEMFREE(callbackData);
+}

v2/internal/ffenestri/menu_manager.c

@@ -0,0 +1,81 @@
+//
+// Created by Lea Anthony on 18/1/21.
+//
+
+#include "menu.h"
+
+MenuManager* NewMenuManager() {
+
+    MenuManager* result = malloc(sizeof(MenuManager));
+
+    // Allocate Hashmaps
+    HASHMAP_INIT(result->menuItems, 32, "menuItems");
+    HASHMAP_INIT(result->contextMenus, 4, "contextMenus");
+    HASHMAP_INIT(result->trayMenus, 4, "trayMenus");
+
+    // Initialise other data
+    result->applicationMenu = NULL;
+    result->contextMenuData = NULL;
+
+    return result;
+}
+
+int deleteTrayMenu(void *const context, struct hashmap_element_s *const e) {
+    DeleteTrayMenu(e->data);
+    return -1; // Remove from hashmap
+}
+
+int deleteMenuItem(void *const context, struct hashmap_element_s *const e) {
+    DeleteMenuItem(e->data);
+    return -1; // Remove from hashmap
+}
+
+void DeleteMenuManager(MenuManager* manager) {
+
+    // Iterate hashmaps and delete items
+    HASHMAP_ITERATE(manager->trayMenus, deleteTrayMenu, NULL);
+    HASHMAP_ITERATE(manager->menuItems, deleteMenuItem, NULL);
+
+    // Delete applicationMenu
+    DeleteMenu(manager->applicationMenu);
+
+    // Delete Hashmaps
+    HASHMAP_DESTROY(manager->trayMenus);
+    HASHMAP_DESTROY(manager->contextMenus);
+    HASHMAP_DESTROY(manager->menuItems);
+
+    // Delete context menu data
+    MEMFREE(manager->contextMenuData);
+}
+
+TrayMenu* AddTrayMenuToManager(MenuManager* manager, const char* trayMenuJSON) {
+
+    // Parse JSON
+    struct JsonNode* parsedJSON = mustParseJSON(trayMenuJSON);
+
+    // Get the ID
+    const char *ID = mustJSONString(parsedJSON, "I");
+
+    // Check if there is already an entry for this menu
+    TrayMenu* existingTrayMenu = HASHMAP_GET(manager->trayMenus, ID);
+    if ( existingTrayMenu != NULL ) {
+        json_delete(parsedJSON);
+        return existingTrayMenu;
+    }
+
+    // Create new menu
+    TrayMenu* newMenu = NewTrayMenu(parsedJSON, manager);
+    HASHMAP_PUT(manager->trayMenus, newMenu->ID, newMenu);
+
+    return newMenu;
+}
+
+int showTrayMenu(void *const context, struct hashmap_element_s *const e) {
+    ShowTrayMenu(e->data);
+    // 0 to retain element, -1 to delete.
+    return 0;
+}
+void ShowTrayMenus(MenuManager* manager) {
+    HASHMAP_ITERATE(manager->trayMenus, showTrayMenu, NULL);
+}
+

v2/internal/ffenestri/menu_tray.c

@@ -0,0 +1,69 @@
+//
+// Created by Lea Anthony on 18/1/21.
+//
+
+#include "menu.h"
+
+TrayMenu* NewTrayMenu(JsonNode* parsedJSON, MenuManager *manager) {
+
+    // NULL GUARD
+    if(parsedJSON == NULL) ABORT("[NewTrayMenu] parsedJSON == NULL");
+
+    // Create new tray menu
+    TrayMenu* result = NEW(TrayMenu);
+
+    // Initialise other data
+    result->ID = STRCOPY(mustJSONString(parsedJSON, "I"));
+    result->Label = STRCOPY(getJSONString(parsedJSON, "l"));
+    result->Icon = STRCOPY(getJSONString(parsedJSON, "i"));
+
+    // Process menu
+    struct JsonNode* menuJSON = getJSONObject(parsedJSON, "m");
+    struct JsonNode* radioJSON = getJSONObject(parsedJSON, "r");
+    result->Menu = NewMenu(menuJSON, radioJSON, manager);
+
+    // Setup platform data
+    SetupTrayMenuPlatformData(result);
+
+    return result;
+}
+
+void DeleteTrayMenu(TrayMenu *trayMenu) {
+
+    // NULL guard
+    if( trayMenu == NULL ) return;
+
+    // Free the strings
+    MEMFREE(trayMenu->ID);
+    MEMFREE(trayMenu->Label);
+    MEMFREE(trayMenu->Icon);
+
+    // Delete the menu
+    DeleteMenu(trayMenu->Menu);
+
+    // Delete the platform data
+    DeleteTrayMenuPlatformData(trayMenu);
+
+    // Free tray menu
+    MEMFREE(trayMenu);
+}
+
+const char* TrayMenuAsJSON(TrayMenu* menu) {
+
+    JsonNode *jsonObject = json_mkobject();
+    JSON_ADD_STRING(jsonObject, "ID", menu->ID);
+    JSON_ADD_STRING(jsonObject, "Label", menu->Label);
+    JSON_ADD_STRING(jsonObject, "Icon", menu->Icon);
+    JSON_ADD_OBJECT(jsonObject, "Menu", MenuAsJSONObject(menu->Menu));
+    return json_encode(jsonObject);
+}
+
+void UpdateTrayIcon(TrayMenu *trayMenu) {
+
+    // Exit early if NULL
+    if( trayMenu->Icon == NULL ) {
+        return;
+    }
+
+    PlatformUpdateTrayIcon(trayMenu);
+}

v2/internal/ffenestri/test_app/CMakeLists.txt

@@ -0,0 +1,25 @@
+cmake_minimum_required(VERSION 3.17)
+project(test_app)
+
+set(CMAKE_CXX_STANDARD 14)
+set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address -g")
+set (CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address -fsanitize=leak -g")
+
+add_executable(test_app test.c)
+add_library(menus STATIC ../menu_manager.c ../menu.c ../menu_tray.c ../menu_item.c )
+add_library(common STATIC ../common.c ../utf8.h)
+add_library(json STATIC ../json.c)
+add_library(vec STATIC ../vec.c)
+
+if( CMAKE_HOST_APPLE )
+    find_library(WEBKIT WebKit)
+    add_library(runtime STATIC ../runtime_darwin.c)
+    add_library(ffenestri STATIC ../ffenestri_darwin.c)
+    add_library(defaulticons STATIC ../defaultdialogicons_darwin.c)
+    add_library(platform STATIC ../menu_darwin.c)
+    target_link_libraries(test_app objc ${WEBKIT} ffenestri platform runtime)
+endif()
+
+target_link_libraries(test_app vec json common menus)
+include_directories(..)
+include_directories(.)

v2/internal/ffenestri/test_menumanager/CMakeLists.txt

@@ -0,0 +1,21 @@
+cmake_minimum_required(VERSION 3.17)
+project(test_menumanager)
+
+set(CMAKE_CXX_STANDARD 14)
+set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address -g")
+set (CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address -fsanitize=leak -g")
+
+add_executable(test_menumanager test.c minunit.h)
+add_library(menus STATIC ../menu_manager.c ../menu.c ../menu_tray.c ../menu_item.c)
+add_library(common STATIC ../common.c ../utf8.h)
+add_library(json STATIC ../json.c)
+add_library(vec STATIC ../vec.c)
+
+if( CMAKE_HOST_APPLE )
+    add_library(platform STATIC ../menu_darwin.c)
+    target_link_libraries(test_menumanager objc)
+endif()
+
+target_link_libraries(test_menumanager vec json common menus platform)
+include_directories(..)
+include_directories(.)

v2/internal/ffenestri/test_menumanager/minunit.LICENSE.txt

@@ -0,0 +1,20 @@
+Copyright (c) 2012 David Siñuela Pastor, siu.4coders@gmail.com
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

v2/internal/ffenestri/test_menumanager/minunit.h

@@ -0,0 +1,391 @@
+/*
+ * Copyright (c) 2012 David Siñuela Pastor, siu.4coders@gmail.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+#ifndef MINUNIT_MINUNIT_H
+#define MINUNIT_MINUNIT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if defined(_WIN32)
+#include <Windows.h>
+#if defined(_MSC_VER) && _MSC_VER < 1900
+  #define snprintf _snprintf
+  #define __func__ __FUNCTION__
+#endif
+
+#elif defined(__unix__) || defined(__unix) || defined(unix) || (defined(__APPLE__) && defined(__MACH__))
+
+/* Change POSIX C SOURCE version for pure c99 compilers */
+#if !defined(_POSIX_C_SOURCE) || _POSIX_C_SOURCE < 200112L
+#undef _POSIX_C_SOURCE
+#define _POSIX_C_SOURCE 200112L
+#endif
+
+#include <unistd.h>	/* POSIX flags */
+#include <time.h>	/* clock_gettime(), time() */
+#include <sys/time.h>	/* gethrtime(), gettimeofday() */
+#include <sys/resource.h>
+#include <sys/times.h>
+#include <string.h>
+
+#if defined(__MACH__) && defined(__APPLE__)
+#include <mach/mach.h>
+#include <mach/mach_time.h>
+#endif
+
+#if __GNUC__ >= 5 && !defined(__STDC_VERSION__)
+#define __func__ __extension__ __FUNCTION__
+#endif
+
+#else
+#error "Unable to define timers for an unknown OS."
+#endif
+
+#include <stdio.h>
+#include <math.h>
+
+/*  Maximum length of last message */
+#define MINUNIT_MESSAGE_LEN 1024
+/*  Accuracy with which floats are compared */
+#define MINUNIT_EPSILON 1E-12
+
+/*  Misc. counters */
+static int minunit_run = 0;
+static int minunit_assert = 0;
+static int minunit_fail = 0;
+static int minunit_status = 0;
+
+/*  Timers */
+static double minunit_real_timer = 0;
+static double minunit_proc_timer = 0;
+
+/*  Last message */
+static char minunit_last_message[MINUNIT_MESSAGE_LEN];
+
+/*  Test setup and teardown function pointers */
+static void (*minunit_setup)(void) = NULL;
+static void (*minunit_teardown)(void) = NULL;
+
+/*  Definitions */
+#define MU_TEST(method_name) static void method_name(void)
+#define MU_TEST_SUITE(suite_name) static void suite_name(void)
+
+#define MU__SAFE_BLOCK(block) do {\
+	block\
+} while(0)
+
+/*  Run test suite and unset setup and teardown functions */
+#define MU_RUN_SUITE(suite_name) MU__SAFE_BLOCK(\
+	suite_name();\
+	minunit_setup = NULL;\
+	minunit_teardown = NULL;\
+)
+
+/*  Configure setup and teardown functions */
+#define MU_SUITE_CONFIGURE(setup_fun, teardown_fun) MU__SAFE_BLOCK(\
+	minunit_setup = setup_fun;\
+	minunit_teardown = teardown_fun;\
+)
+
+/*  Test runner */
+#define MU_RUN_TEST(test) MU__SAFE_BLOCK(\
+	if (minunit_real_timer==0 && minunit_proc_timer==0) {\
+		minunit_real_timer = mu_timer_real();\
+		minunit_proc_timer = mu_timer_cpu();\
+	}\
+	if (minunit_setup) (*minunit_setup)();\
+	minunit_status = 0;\
+	test();\
+	minunit_run++;\
+	if (minunit_status) {\
+		minunit_fail++;\
+		printf("F");\
+		printf("\n%s\n", minunit_last_message);\
+	}\
+	fflush(stdout);\
+	if (minunit_teardown) (*minunit_teardown)();\
+)
+
+/*  Report */
+#define MU_REPORT() MU__SAFE_BLOCK(\
+	double minunit_end_real_timer;\
+	double minunit_end_proc_timer;\
+	printf("\n\n%d tests, %d assertions, %d failures\n", minunit_run, minunit_assert, minunit_fail);\
+	minunit_end_real_timer = mu_timer_real();\
+	minunit_end_proc_timer = mu_timer_cpu();\
+	printf("\nFinished in %.8f seconds (real) %.8f seconds (proc)\n\n",\
+		minunit_end_real_timer - minunit_real_timer,\
+		minunit_end_proc_timer - minunit_proc_timer);\
+)
+#define MU_EXIT_CODE minunit_fail
+
+/*  Assertions */
+#define mu_check(test) MU__SAFE_BLOCK(\
+	minunit_assert++;\
+	if (!(test)) {\
+		snprintf(minunit_last_message, MINUNIT_MESSAGE_LEN, "%s failed:\n\t%s:%d: %s", __func__, __FILE__, __LINE__, #test);\
+		minunit_status = 1;\
+		return;\
+	} else {\
+		printf(".");\
+	}\
+)
+
+#define mu_fail(message) MU__SAFE_BLOCK(\
+	minunit_assert++;\
+	snprintf(minunit_last_message, MINUNIT_MESSAGE_LEN, "%s failed:\n\t%s:%d: %s", __func__, __FILE__, __LINE__, message);\
+	minunit_status = 1;\
+	return;\
+)
+
+#define mu_assert(test, message) MU__SAFE_BLOCK(\
+	minunit_assert++;\
+	if (!(test)) {\
+		snprintf(minunit_last_message, MINUNIT_MESSAGE_LEN, "%s failed:\n\t%s:%d: %s", __func__, __FILE__, __LINE__, message);\
+		minunit_status = 1;\
+		return;\
+	} else {\
+		printf(".");\
+	}\
+)
+
+#define mu_assert_int_eq(expected, result) MU__SAFE_BLOCK(\
+	int minunit_tmp_e;\
+	int minunit_tmp_r;\
+	minunit_assert++;\
+	minunit_tmp_e = (expected);\
+	minunit_tmp_r = (result);\
+	if (minunit_tmp_e != minunit_tmp_r) {\
+		snprintf(minunit_last_message, MINUNIT_MESSAGE_LEN, "%s failed:\n\t%s:%d: %d expected but was %d", __func__, __FILE__, __LINE__, minunit_tmp_e, minunit_tmp_r);\
+		minunit_status = 1;\
+		return;\
+	} else {\
+		printf(".");\
+	}\
+)
+
+#define mu_assert_double_eq(expected, result) MU__SAFE_BLOCK(\
+	double minunit_tmp_e;\
+	double minunit_tmp_r;\
+	minunit_assert++;\
+	minunit_tmp_e = (expected);\
+	minunit_tmp_r = (result);\
+	if (fabs(minunit_tmp_e-minunit_tmp_r) > MINUNIT_EPSILON) {\
+		int minunit_significant_figures = 1 - log10(MINUNIT_EPSILON);\
+		snprintf(minunit_last_message, MINUNIT_MESSAGE_LEN, "%s failed:\n\t%s:%d: %.*g expected but was %.*g", __func__, __FILE__, __LINE__, minunit_significant_figures, minunit_tmp_e, minunit_significant_figures, minunit_tmp_r);\
+		minunit_status = 1;\
+		return;\
+	} else {\
+		printf(".");\
+	}\
+)
+
+#define mu_assert_string_eq(expected, result) MU__SAFE_BLOCK(\
+	const char* minunit_tmp_e = expected;\
+	const char* minunit_tmp_r = result;\
+	minunit_assert++;\
+	if (!minunit_tmp_e) {\
+		minunit_tmp_e = "<null pointer>";\
+	}\
+	if (!minunit_tmp_r) {\
+		minunit_tmp_r = "<null pointer>";\
+	}\
+	if(strcmp(minunit_tmp_e, minunit_tmp_r) != 0) {\
+		snprintf(minunit_last_message, MINUNIT_MESSAGE_LEN, "%s failed:\n\t%s:%d: '%s' expected but was '%s'", __func__, __FILE__, __LINE__, minunit_tmp_e, minunit_tmp_r);\
+		minunit_status = 1;\
+		return;\
+	} else {\
+		printf(".");\
+	}\
+)
+
+/*
+ * The following two functions were written by David Robert Nadeau
+ * from http://NadeauSoftware.com/ and distributed under the
+ * Creative Commons Attribution 3.0 Unported License
+ */
+
+/**
+ * Returns the real time, in seconds, or -1.0 if an error occurred.
+ *
+ * Time is measured since an arbitrary and OS-dependent start time.
+ * The returned real time is only useful for computing an elapsed time
+ * between two calls to this function.
+ */
+static double mu_timer_real(void)
+{
+#if defined(_WIN32)
+    /* Windows 2000 and later. ---------------------------------- */
+	LARGE_INTEGER Time;
+	LARGE_INTEGER Frequency;
+
+	QueryPerformanceFrequency(&Frequency);
+	QueryPerformanceCounter(&Time);
+
+	Time.QuadPart *= 1000000;
+	Time.QuadPart /= Frequency.QuadPart;
+
+	return (double)Time.QuadPart / 1000000.0;
+
+#elif (defined(__hpux) || defined(hpux)) || ((defined(__sun__) || defined(__sun) || defined(sun)) && (defined(__SVR4) || defined(__svr4__)))
+    /* HP-UX, Solaris. ------------------------------------------ */
+	return (double)gethrtime( ) / 1000000000.0;
+
+#elif defined(__MACH__) && defined(__APPLE__)
+    /* OSX. ----------------------------------------------------- */
+    static double timeConvert = 0.0;
+    if ( timeConvert == 0.0 )
+    {
+        mach_timebase_info_data_t timeBase;
+        (void)mach_timebase_info( &timeBase );
+        timeConvert = (double)timeBase.numer /
+                      (double)timeBase.denom /
+                      1000000000.0;
+    }
+    return (double)mach_absolute_time( ) * timeConvert;
+
+#elif defined(_POSIX_VERSION)
+    /* POSIX. --------------------------------------------------- */
+	struct timeval tm;
+#if defined(_POSIX_TIMERS) && (_POSIX_TIMERS > 0)
+	{
+		struct timespec ts;
+#if defined(CLOCK_MONOTONIC_PRECISE)
+		/* BSD. --------------------------------------------- */
+		const clockid_t id = CLOCK_MONOTONIC_PRECISE;
+#elif defined(CLOCK_MONOTONIC_RAW)
+		/* Linux. ------------------------------------------- */
+		const clockid_t id = CLOCK_MONOTONIC_RAW;
+#elif defined(CLOCK_HIGHRES)
+		/* Solaris. ----------------------------------------- */
+		const clockid_t id = CLOCK_HIGHRES;
+#elif defined(CLOCK_MONOTONIC)
+		/* AIX, BSD, Linux, POSIX, Solaris. ----------------- */
+		const clockid_t id = CLOCK_MONOTONIC;
+#elif defined(CLOCK_REALTIME)
+		/* AIX, BSD, HP-UX, Linux, POSIX. ------------------- */
+		const clockid_t id = CLOCK_REALTIME;
+#else
+		const clockid_t id = (clockid_t)-1;	/* Unknown. */
+#endif /* CLOCK_* */
+		if ( id != (clockid_t)-1 && clock_gettime( id, &ts ) != -1 )
+			return (double)ts.tv_sec +
+				(double)ts.tv_nsec / 1000000000.0;
+		/* Fall thru. */
+	}
+#endif /* _POSIX_TIMERS */
+
+	/* AIX, BSD, Cygwin, HP-UX, Linux, OSX, POSIX, Solaris. ----- */
+	gettimeofday( &tm, NULL );
+	return (double)tm.tv_sec + (double)tm.tv_usec / 1000000.0;
+#else
+	return -1.0;		/* Failed. */
+#endif
+}
+
+/**
+ * Returns the amount of CPU time used by the current process,
+ * in seconds, or -1.0 if an error occurred.
+ */
+static double mu_timer_cpu(void)
+{
+#if defined(_WIN32)
+    /* Windows -------------------------------------------------- */
+	FILETIME createTime;
+	FILETIME exitTime;
+	FILETIME kernelTime;
+	FILETIME userTime;
+
+	/* This approach has a resolution of 1/64 second. Unfortunately, Windows' API does not offer better */
+	if ( GetProcessTimes( GetCurrentProcess( ),
+		&createTime, &exitTime, &kernelTime, &userTime ) != 0 )
+	{
+		ULARGE_INTEGER userSystemTime;
+		memcpy(&userSystemTime, &userTime, sizeof(ULARGE_INTEGER));
+		return (double)userSystemTime.QuadPart / 10000000.0;
+	}
+
+#elif defined(__unix__) || defined(__unix) || defined(unix) || (defined(__APPLE__) && defined(__MACH__))
+    /* AIX, BSD, Cygwin, HP-UX, Linux, OSX, and Solaris --------- */
+
+#if defined(_POSIX_TIMERS) && (_POSIX_TIMERS > 0)
+    /* Prefer high-res POSIX timers, when available. */
+	{
+		clockid_t id;
+		struct timespec ts;
+#if _POSIX_CPUTIME > 0
+		/* Clock ids vary by OS.  Query the id, if possible. */
+		if ( clock_getcpuclockid( 0, &id ) == -1 )
+#endif
+#if defined(CLOCK_PROCESS_CPUTIME_ID)
+			/* Use known clock id for AIX, Linux, or Solaris. */
+			id = CLOCK_PROCESS_CPUTIME_ID;
+#elif defined(CLOCK_VIRTUAL)
+			/* Use known clock id for BSD or HP-UX. */
+			id = CLOCK_VIRTUAL;
+#else
+			id = (clockid_t)-1;
+#endif
+		if ( id != (clockid_t)-1 && clock_gettime( id, &ts ) != -1 )
+			return (double)ts.tv_sec +
+				(double)ts.tv_nsec / 1000000000.0;
+	}
+#endif
+
+#if defined(RUSAGE_SELF)
+    {
+        struct rusage rusage;
+        if ( getrusage( RUSAGE_SELF, &rusage ) != -1 )
+            return (double)rusage.ru_utime.tv_sec +
+                   (double)rusage.ru_utime.tv_usec / 1000000.0;
+    }
+#endif
+
+#if defined(_SC_CLK_TCK)
+    {
+        const double ticks = (double)sysconf( _SC_CLK_TCK );
+        struct tms tms;
+        if ( times( &tms ) != (clock_t)-1 )
+            return (double)tms.tms_utime / ticks;
+    }
+#endif
+
+#if defined(CLOCKS_PER_SEC)
+    {
+        clock_t cl = clock( );
+        if ( cl != (clock_t)-1 )
+            return (double)cl / (double)CLOCKS_PER_SEC;
+    }
+#endif
+
+#endif
+
+    return -1;		/* Failed. */
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* MINUNIT_MINUNIT_H */

v2/internal/ffenestri/test_menumanager/test.c

@@ -0,0 +1,71 @@
+//
+// Created by Lea Anthony on 12/1/21.
+//
+
+#include "minunit.h"
+#include "menu.h"
+
+#define empty "{\"I\":\"T1\"}"
+#define emptyExpected "{\"ID\":\"T1\",\"Label\":null,\"Icon\":null,\"Menu\":null}"
+#define labelOnly "{\"I\":\"T1\",\"l\":\"test\"}"
+#define labelOnlyExpected "{\"ID\":\"T1\",\"Label\":\"test\",\"Icon\":null,\"Menu\":null}"
+#define iconOnly "{\"I\":\"T1\",\"i\":\"svelte\"}"
+#define iconOnlyExpected "{\"ID\":\"T1\",\"Label\":null,\"Icon\":\"svelte\",\"Menu\":null}"
+#define iconLabel "{\"I\":\"T1\",\"l\":\"test\",\"i\":\"svelte\"}"
+#define iconLabelExpected "{\"ID\":\"T1\",\"Label\":\"test\",\"Icon\":\"svelte\",\"Menu\":null}"
+#define blankLabel "{\"I\":\"T1\"}"
+#define blankLabelExpected "{\"ID\":\"T1\",\"Label\":null,\"Icon\":null,\"Menu\":null}"
+#define blankMenu "{\"I\":\"T1\"}"
+#define blankMenuExpected "{\"ID\":\"T1\",\"Label\":null,\"Icon\":null,\"Menu\":null}"
+#define menuTextItem "{\"I\":\"T1\",\"l\":\"test\",\"m\":[{\"I\":\"1\",\"l\":\"test\",\"t\":\"t\"}]}"
+#define menuTextItemExpected "{\"ID\":\"T1\",\"Label\":\"test\",\"Icon\":null,\"Menu\":{\"Label\":\"\",\"Items\":[{\"ID\":\"1\",\"label\":\"test\",\"alternateLabel\":null,\"disabled\":false,\"hidden\":false,\"colour\":null,\"font\":null,\"fontsize\":0,\"image\":null,\"acceleratorKey\":null,\"hasCallback\":false,\"type\":\"Text\",\"checked\":false}]}}"
+#define checkboxItem "{\"I\":\"T1\",\"m\":[{\"I\":\"1\",\"l\":\"test\",\"t\":\"c\",\"c\":true}]}"
+#define checkboxItemExpected "{\"ID\":\"T1\",\"Label\":null,\"Icon\":null,\"Menu\":{\"Label\":\"\",\"Items\":[{\"ID\":\"1\",\"label\":\"test\",\"alternateLabel\":null,\"disabled\":false,\"hidden\":false,\"colour\":null,\"font\":null,\"fontsize\":0,\"image\":null,\"acceleratorKey\":null,\"hasCallback\":false,\"type\":\"Checkbox\",\"checked\":true}]}}"
+#define radioGroupItems "{\"I\":\"T1\",\"m\":[{\"I\":\"1\",\"l\":\"option 1\",\"t\":\"r\",\"c\":true},{\"I\":\"2\",\"l\":\"option 2\",\"t\":\"r\"},{\"I\":\"3\",\"l\":\"option 3\",\"t\":\"r\"}],\"r\":[{\"Members\":[\"1\",\"2\",\"3\"],\"Length\":3}]}"
+#define radioGroupItemsExpected ""
+#define callbackItem "{\"I\":\"T1\",\"m\":[{\"I\":\"1\",\"l\":\"Preferences\",\"t\":\"t\",\"C\":true}]}"
+#define callbackItemExpected ""
+
+const char* tests[] = {
+        empty, emptyExpected,
+        labelOnly, labelOnlyExpected,
+        iconOnly, iconOnlyExpected,
+        iconLabel, iconLabelExpected,
+        blankLabel, blankLabelExpected,
+        blankMenu, blankMenuExpected,
+        menuTextItem, menuTextItemExpected,
+        checkboxItem, checkboxItemExpected,
+        radioGroupItems, radioGroupItemsExpected,
+        callbackItem, callbackItemExpected,
+};
+
+MU_TEST(manager_creation) {
+    MenuManager* manager = NewMenuManager();
+    mu_assert(manager->applicationMenu == NULL, "app menu");
+    mu_assert(manager->contextMenuData == NULL, "context menu data");
+    mu_assert_int_eq(hashmap_num_entries(&manager->contextMenus), 0);
+    mu_assert_int_eq(hashmap_num_entries(&manager->trayMenus), 0);
+    mu_assert_int_eq(hashmap_num_entries(&manager->menuItems), 0);
+    DeleteMenuManager(manager);
+}
+
+MU_TEST(add_tray) {
+    for( int count = 0; count < sizeof(tests) / sizeof(tests[0]); count += 2 ) {
+        MenuManager* manager = NewMenuManager();
+        TrayMenu* tray = AddTrayMenu(manager, tests[count]);
+        const char* trayJSON = TrayMenuAsJSON(tray);
+        mu_assert_string_eq(tests[count+1], trayJSON);
+        DeleteMenuManager(manager);
+    }
+}
+
+MU_TEST_SUITE(test_suite) {
+    MU_RUN_TEST(manager_creation);
+    MU_RUN_TEST(add_tray);
+}
+
+int main(int argc, char *argv[]) {
+    MU_RUN_SUITE(test_suite);
+    MU_REPORT();
+    return MU_EXIT_CODE;
+}

v2/internal/ffenestri/traymenu_darwin.c

@@ -6,13 +6,11 @@
 #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;
 
-TrayMenu* NewTrayMenu(const char* menuJSON) {
+TrayMenu* NewTrayMenu(const char* menuJSON, struct TrayMenuStore* store) {
     TrayMenu* result = malloc(sizeof(TrayMenu));
 
 /*
@@ -23,39 +21,29 @@ TrayMenu* NewTrayMenu(const char* menuJSON) {
         ABORT("[NewTrayMenu] Unable to parse TrayMenu JSON: %s", menuJSON);
     }
 
-    // Save reference to this json
-    result->processedJSON = processedJSON;
-
     // TODO: Make this configurable
     result->trayIconPosition = NSImageLeft;
 
-    result->ID = mustJSONString(processedJSON, "ID");
-    result->label = mustJSONString(processedJSON, "Label");
-    result->icon = mustJSONString(processedJSON, "Image");
-    result->fontName = getJSONString(processedJSON, "FontName");
-    result->RGBA = getJSONString(processedJSON, "RGBA");
-    getJSONBool(processedJSON, "MacTemplateImage", &result->templateImage);
-    result->fontSize = 0;
-    getJSONInt(processedJSON, "FontSize", &result->fontSize);
-    result->tooltip = NULL;
-    result->tooltip = getJSONString(processedJSON, "Tooltip");
-    result->disabled = false;
-    getJSONBool(processedJSON, "Disabled", &result->disabled);
+    result->ID = STRCOPY(mustJSONString(processedJSON, "I"));
+    result->label = STRCOPY(getJSONString(processedJSON, "l"));
+    result->icon = STRCOPY(getJSONString(processedJSON, "i"));
+    result->menu = NULL;
 
-    result->styledLabel = getJSONObject(processedJSON, "StyledLabel");
+    JsonNode* menu = getJSONObject(processedJSON, "m");
+    if( menu != NULL ) {
 
-    // Create the menu
-    JsonNode* processedMenu = mustJSONObject(processedJSON, "ProcessedMenu");
-    result->menu = NewMenu(processedMenu);
+        JsonNode* radioGroups = getJSONObject(processedJSON, "r");
 
-    result->delegate = NULL;
+        // Create the menu
+        result->menu = NewMenu(menu, radioGroups, store);
+        result->menu->menuType = TrayMenuType;
+    }
 
     // Init tray status bar item
     result->statusbaritem = NULL;
 
-    // Set the menu type and store the tray ID in the parent data
-    result->menu->menuType = TrayMenuType;
-    result->menu->parentData = (void*) result->ID;
+    // Free JSON
+    json_delete(processedJSON);
 
     return result;
 }
@@ -65,30 +53,6 @@ void DumpTrayMenu(TrayMenu* trayMenu) {
 }
 
 
-void UpdateTrayLabel(TrayMenu *trayMenu, const char *label, const char *fontName, int fontSize, const char *RGBA, const char *tooltip, bool disabled, JsonNode *styledLabel) {
-
-    // Exit early if NULL
-    if( trayMenu->label == NULL ) {
-        return;
-    }
-    // Update button label
-    id statusBarButton = msg_reg(trayMenu->statusbaritem, s("button"));
-    id attributedString = NULL;
-    if( styledLabel != NULL) {
-        attributedString = createAttributedStringFromStyledLabel(styledLabel, fontName, fontSize);
-    } else {
-        attributedString = createAttributedString(label, fontName, fontSize, RGBA);
-    }
-
-    if( tooltip != NULL ) {
-        msg_id(statusBarButton, s("setToolTip:"), str(tooltip));
-    }
-
-    msg_bool(statusBarButton, s("setEnabled:"), !disabled);
-
-    msg_id(statusBarButton, s("setAttributedTitle:"), attributedString);
-}
-
 void UpdateTrayIcon(TrayMenu *trayMenu) {
 
     // Exit early if NULL
@@ -96,57 +60,45 @@ void UpdateTrayIcon(TrayMenu *trayMenu) {
         return;
     }
 
-    id statusBarButton = msg_reg(trayMenu->statusbaritem, s("button"));
+    id statusBarButton = msg(trayMenu->statusbaritem, s("button"));
 
     // Empty icon means remove it
     if( STREMPTY(trayMenu->icon) ) {
         // Remove image
-        msg_id(statusBarButton, s("setImage:"), NULL);
+        msg(statusBarButton, s("setImage:"), NULL);
         return;
     }
 
     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) {
-        trayImage = createImageFromBase64Data(trayMenu->icon, trayMenu->templateImage);
-    }
-
-    msg_int(statusBarButton, s("setImagePosition:"), trayMenu->trayIconPosition);
-    msg_id(statusBarButton, s("setImage:"), trayImage);
-
+    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
     if( trayMenu->statusbaritem == NULL ) {
-        id statusBar = msg_reg( c("NSStatusBar"), s("systemStatusBar") );
-        trayMenu->statusbaritem = ((id(*)(id, SEL, CGFloat))objc_msgSend)(statusBar, s("statusItemWithLength:"), NSVariableStatusItemLength);
-        msg_reg(trayMenu->statusbaritem, s("retain"));
+        id statusBar = msg( c("NSStatusBar"), s("systemStatusBar") );
+        trayMenu->statusbaritem = msg(statusBar, s("statusItemWithLength:"), NSVariableStatusItemLength);
+        msg(trayMenu->statusbaritem, s("retain"));
+
     }
 
-    id statusBarButton = msg_reg(trayMenu->statusbaritem, s("button"));
-    msg_uint(statusBarButton, s("setImagePosition:"), trayMenu->trayIconPosition);
+    id statusBarButton = msg(trayMenu->statusbaritem, s("button"));
+    msg(statusBarButton, s("setImagePosition:"), trayMenu->trayIconPosition);
+
     // Update the icon if needed
     UpdateTrayIcon(trayMenu);
 
     // Update the label if needed
-    UpdateTrayLabel(trayMenu, trayMenu->label, trayMenu->fontName, trayMenu->fontSize, trayMenu->RGBA, trayMenu->tooltip, trayMenu->disabled, trayMenu->styledLabel);
+    UpdateTrayLabel(trayMenu, trayMenu->label);
 
     // Update the menu
-    id menu = GetMenu(trayMenu->menu);
-    objc_setAssociatedObject(menu, "trayMenuID", str(trayMenu->ID), OBJC_ASSOCIATION_ASSIGN);
-
-	// Create delegate
-	id trayMenuDelegate = msg_reg((id)trayMenuDelegateClass, s("new"));
-	msg_id(menu, s("setDelegate:"), trayMenuDelegate);
-    objc_setAssociatedObject(trayMenuDelegate, "menu", menu, OBJC_ASSOCIATION_ASSIGN);
-
-    // Create menu delegate
-    trayMenu->delegate = trayMenuDelegate;
-
-    msg_id(trayMenu->statusbaritem, s("setMenu:"), menu);
+    if (trayMenu->menu != NULL ) {
+        msg(trayMenu->statusbaritem, s("setMenu:"), trayMenu->menu->menu);
+    }
 }
 
 // UpdateTrayMenuInPlace receives 2 menus. The current menu gets
@@ -159,18 +111,11 @@ void UpdateTrayMenuInPlace(TrayMenu* currentMenu, TrayMenu* newMenu) {
     // Set the new one
     currentMenu->menu = newMenu->menu;
 
-    // Delete the old JSON
-    json_delete(currentMenu->processedJSON);
-
-    // Set the new JSON
-    currentMenu->processedJSON = newMenu->processedJSON;
-
     // Copy the other data
-    currentMenu->ID = newMenu->ID;
-    currentMenu->label = newMenu->label;
-    currentMenu->styledLabel = newMenu->styledLabel;
+    currentMenu->ID = STRCOPY(newMenu->ID);
+    currentMenu->label = STRCOPY(newMenu->label);
     currentMenu->trayIconPosition = newMenu->trayIconPosition;
-    currentMenu->icon = newMenu->icon;
+    currentMenu->icon = STRCOPY(newMenu->icon);
 
 }
 
@@ -182,23 +127,19 @@ void DeleteTrayMenu(TrayMenu* trayMenu) {
     // Delete the menu
     DeleteMenu(trayMenu->menu);
 
-    // Free JSON
-    if (trayMenu->processedJSON != NULL ) {
-        json_delete(trayMenu->processedJSON);
-    }
+    // Free strings
+    MEMFREE(trayMenu->label);
+    MEMFREE(trayMenu->icon);
+    MEMFREE(trayMenu->ID);
 
     // Free the status item
     if ( trayMenu->statusbaritem != NULL ) {
-        id statusBar = msg_reg( c("NSStatusBar"), s("systemStatusBar") );
-        msg_id(statusBar, s("removeStatusItem:"), trayMenu->statusbaritem);
-        msg_reg(trayMenu->statusbaritem, s("release"));
+        id statusBar = msg( c("NSStatusBar"), s("systemStatusBar") );
+        msg(statusBar, s("removeStatusItem:"), trayMenu->statusbaritem);
+        msg(trayMenu->statusbaritem, s("release"));
         trayMenu->statusbaritem = NULL;
     }
 
-    if ( trayMenu->delegate != NULL ) {
-        msg_reg(trayMenu->delegate, s("release"));
-    }
-
     // Free the tray menu memory
     MEMFREE(trayMenu);
 }
@@ -228,21 +169,10 @@ void LoadTrayIcons() {
         int length = atoi((const char *)lengthAsString);
 
         // Create the icon and add to the hashmap
-        id imageData = ((id(*)(id, SEL, id, int))objc_msgSend)(c("NSData"), s("dataWithBytes:length:"), (id)data, length);
+        id imageData = msg(c("NSData"), s("dataWithBytes:length:"), data, length);
         id trayImage = ALLOC("NSImage");
-        msg_id(trayImage, s("initWithData:"), imageData);
+        msg(trayImage, s("initWithData:"), imageData);
         hashmap_put(&trayIconCache, (const char *)name, strlen((const char *)name), trayImage);
     }
 }
 
-void UnloadTrayIcons() {
-    // Release the tray cache images
-    if( hashmap_num_entries(&trayIconCache) > 0 ) {
-        if (0!=hashmap_iterate_pairs(&trayIconCache, releaseNSObject, NULL)) {
-            ABORT("failed to release hashmap entries!");
-        }
-    }
-
-    //Free radio groups hashmap
-    hashmap_destroy(&trayIconCache);
-}

v2/internal/ffenestri/traymenu_darwin.h

@@ -6,41 +6,26 @@
 #define TRAYMENU_DARWIN_H
 
 #include "common.h"
-#include "menu_darwin.h"
+#include "menu_darwin_old.h"
 
 typedef struct {
 
     const char *label;
     const char *icon;
     const char *ID;
-    const char *tooltip;
-
-    bool templateImage;
-    const char *fontName;
-    int fontSize;
-    const char *RGBA;
-
-    bool disabled;
 
     Menu* menu;
 
     id statusbaritem;
-    unsigned int trayIconPosition;
-
-    JsonNode* processedJSON;
-
-    JsonNode* styledLabel;
-
-    id delegate;
-
+    int trayIconPosition;
 } TrayMenu;
 
-TrayMenu* NewTrayMenu(const char *trayJSON);
+TrayMenu* NewTrayMenu(const char *trayJSON, struct TrayMenuStore* store);
 void DumpTrayMenu(TrayMenu* trayMenu);
 void ShowTrayMenu(TrayMenu* trayMenu);
 void UpdateTrayMenuInPlace(TrayMenu* currentMenu, TrayMenu* newMenu);
 void UpdateTrayIcon(TrayMenu *trayMenu);
-void UpdateTrayLabel(TrayMenu *trayMenu, const char *label, const char *fontName, int fontSize, const char *RGBA, const char *tooltip, bool disabled, JsonNode *styledLabel);
+void UpdateTrayLabel(TrayMenu *trayMenu, const char*);
 
 void LoadTrayIcons();
 void UnloadTrayIcons();

v2/internal/ffenestri/traymenustore_darwin.c

@@ -16,9 +16,9 @@ TrayMenuStore* NewTrayMenuStore() {
         ABORT("[NewTrayMenuStore] Not enough memory to allocate trayMenuMap!");
     }
 
-    if (pthread_mutex_init(&result->lock, NULL) != 0) {
-        printf("\n mutex init has failed\n");
-        exit(1);
+    // Allocate menu item store
+    if( 0 != hashmap_create((const unsigned)8, &result->menuItemMap)) {
+        ABORT("[NewTrayMenuStore] Not enough memory to allocate menuItemMap!");
     }
 
     return result;
@@ -30,19 +30,15 @@ int dumpTrayMenu(void *const context, struct hashmap_element_s *const e) {
 }
 
 void DumpTrayMenuStore(TrayMenuStore* store) {
-    pthread_mutex_lock(&store->lock);
     hashmap_iterate_pairs(&store->trayMenuMap, dumpTrayMenu, NULL);
-    pthread_mutex_unlock(&store->lock);
 }
 
 void AddTrayMenuToStore(TrayMenuStore* store, const char* menuJSON) {
+    TrayMenu* newMenu = NewTrayMenu(menuJSON, (struct TrayMenuStore *) store);
 
-    TrayMenu* newMenu = NewTrayMenu(menuJSON);
-
-    pthread_mutex_lock(&store->lock);
     //TODO: check if there is already an entry for this menu
     hashmap_put(&store->trayMenuMap, newMenu->ID, strlen(newMenu->ID), newMenu);
-    pthread_mutex_unlock(&store->lock);
+
 }
 
 int showTrayMenu(void *const context, struct hashmap_element_s *const e) {
@@ -52,13 +48,12 @@ int showTrayMenu(void *const context, struct hashmap_element_s *const e) {
 }
 
 void ShowTrayMenusInStore(TrayMenuStore* store) {
-    pthread_mutex_lock(&store->lock);
     if( hashmap_num_entries(&store->trayMenuMap) > 0 ) {
         hashmap_iterate_pairs(&store->trayMenuMap, showTrayMenu, NULL);
     }
-    pthread_mutex_unlock(&store->lock);
 }
 
+
 int freeTrayMenu(void *const context, struct hashmap_element_s *const e) {
     DeleteTrayMenu(e->data);
     return -1;
@@ -76,38 +71,33 @@ void DeleteTrayMenuStore(TrayMenuStore *store) {
     // Destroy tray menu map
     hashmap_destroy(&store->trayMenuMap);
 
-    pthread_mutex_destroy(&store->lock);
+    // Destroy menu item map
+    hashmap_destroy(&store->menuItemMap);
 }
 
 TrayMenu* GetTrayMenuFromStore(TrayMenuStore* store, const char* menuID) {
     // Get the current menu
-    pthread_mutex_lock(&store->lock);
-    TrayMenu* result = hashmap_get(&store->trayMenuMap, menuID, strlen(menuID));
-    pthread_mutex_unlock(&store->lock);
-    return result;
+    return hashmap_get(&store->trayMenuMap, menuID, strlen(menuID));
 }
 
 TrayMenu* MustGetTrayMenuFromStore(TrayMenuStore* store, const char* menuID) {
     // Get the current menu
-    pthread_mutex_lock(&store->lock);
     TrayMenu* result = hashmap_get(&store->trayMenuMap, menuID, strlen(menuID));
-    pthread_mutex_unlock(&store->lock);
-
     if (result == NULL ) {
         ABORT("Unable to find TrayMenu with ID '%s' in the TrayMenuStore!", menuID);
     }
     return result;
 }
 
-void DeleteTrayMenuInStore(TrayMenuStore* store, const char* ID) {
-
-    TrayMenu *menu = MustGetTrayMenuFromStore(store, ID);
-    pthread_mutex_lock(&store->lock);
-    hashmap_remove(&store->trayMenuMap, ID, strlen(ID));
-    pthread_mutex_unlock(&store->lock);
-    DeleteTrayMenu(menu);
+id GetMenuItemFromStore(TrayMenuStore* store, const char* menuItemID) {
+    return hashmap_get(&store->menuItemMap, menuItemID, strlen(menuItemID));
 }
 
+void SaveMenuItemInStore(TrayMenuStore* store, const char* menuItemID, id nsmenuitem) {
+    hashmap_put(&store->menuItemMap, menuItemID, strlen(menuItemID), nsmenuitem);
+}
+
+
 void UpdateTrayMenuLabelInStore(TrayMenuStore* store, const char* JSON) {
     // Parse the JSON
     JsonNode *parsedUpdate = mustParseJSON(JSON);
@@ -118,25 +108,12 @@ void UpdateTrayMenuLabelInStore(TrayMenuStore* store, const char* JSON) {
 
     // Check we have this menu
     TrayMenu *menu = MustGetTrayMenuFromStore(store, ID);
-
-    const char *fontName = getJSONString(parsedUpdate, "FontName");
-    const char *RGBA = getJSONString(parsedUpdate, "RGBA");
-    int fontSize = 0;
-    getJSONInt(parsedUpdate, "FontSize", &fontSize);
-    const char *tooltip = getJSONString(parsedUpdate, "Tooltip");
-    bool disabled = false;
-    getJSONBool(parsedUpdate, "Disabled", &disabled);
-
-    JsonNode *styledLabel = getJSONObject(parsedUpdate, "StyledLabel");
-
-    UpdateTrayLabel(menu, Label, fontName, fontSize, RGBA, tooltip, disabled, styledLabel);
-
+    UpdateTrayLabel(menu, Label);
 
 }
 
-void UpdateTrayMenuInStore(TrayMenuStore* store, const char* menuJSON) {
-    TrayMenu* newMenu = NewTrayMenu(menuJSON);
-//    DumpTrayMenu(newMenu);
+TrayMenu* UpdateTrayMenuInStore(TrayMenuStore* store, const char* menuJSON) {
+    TrayMenu* newMenu = NewTrayMenu(menuJSON, (struct TrayMenuStore *) store);
 
     // Get the current menu
     TrayMenu *currentMenu = GetTrayMenuFromStore(store, newMenu->ID);
@@ -144,22 +121,15 @@ void UpdateTrayMenuInStore(TrayMenuStore* store, const char* menuJSON) {
     // If we don't have a menu, we create one
     if ( currentMenu == NULL ) {
         // Store the new menu
-        pthread_mutex_lock(&store->lock);
         hashmap_put(&store->trayMenuMap, newMenu->ID, strlen(newMenu->ID), newMenu);
-        pthread_mutex_unlock(&store->lock);
 
-        // Show it
-        ShowTrayMenu(newMenu);
-        return;
+        return newMenu;
     }
-//    DumpTrayMenu(currentMenu);
 
     // Save the status bar reference
     newMenu->statusbaritem = currentMenu->statusbaritem;
 
-    pthread_mutex_lock(&store->lock);
     hashmap_remove(&store->trayMenuMap, newMenu->ID, strlen(newMenu->ID));
-    pthread_mutex_unlock(&store->lock);
 
     // Delete the current menu
     DeleteMenu(currentMenu->menu);
@@ -168,10 +138,13 @@ void UpdateTrayMenuInStore(TrayMenuStore* store, const char* menuJSON) {
     // Free the tray menu memory
     MEMFREE(currentMenu);
 
-    pthread_mutex_lock(&store->lock);
     hashmap_put(&store->trayMenuMap, newMenu->ID, strlen(newMenu->ID), newMenu);
-    pthread_mutex_unlock(&store->lock);
 
-    // Show the updated menu
-    ShowTrayMenu(newMenu);
+    return newMenu;
+
 }
+
+const char* GetContextMenuDataFromStore(TrayMenuStore *store) {
+    return store->contextMenuData;
+}
+

v2/internal/ffenestri/traymenustore_darwin.h

@@ -7,8 +7,6 @@
 
 #include "traymenu_darwin.h"
 
-#include <pthread.h>
-
 typedef struct {
 
 	int dummy;
@@ -17,20 +15,26 @@ typedef struct {
     // It maps tray IDs to TrayMenu*
     struct hashmap_s trayMenuMap;
 
-    pthread_mutex_t lock;
+    // This is our menu item map
+    // It maps menu Item IDs to NSMenuItems
+    struct hashmap_s menuItemMap;
+
+    const char* contextMenuData;
 
 } TrayMenuStore;
 
 TrayMenuStore* NewTrayMenuStore();
 
 void AddTrayMenuToStore(TrayMenuStore* store, const char* menuJSON);
-void UpdateTrayMenuInStore(TrayMenuStore* store, const char* menuJSON);
+TrayMenu* UpdateTrayMenuInStore(TrayMenuStore* store, const char* menuJSON);
 void ShowTrayMenusInStore(TrayMenuStore* store);
 void DeleteTrayMenuStore(TrayMenuStore* store);
 
-TrayMenu* GetTrayMenuByID(TrayMenuStore* store, const char* menuID);
+void SaveMenuItemInStore(TrayMenuStore* store, const char* menuItemID, id nsmenuitem);
 
+TrayMenu* GetTrayMenuFromStore(TrayMenuStore* store, const char* menuID);
+id GetMenuItemFromStore(TrayMenuStore* store, const char* menuItemID);
 void UpdateTrayMenuLabelInStore(TrayMenuStore* store, const char* JSON);
-void DeleteTrayMenuInStore(TrayMenuStore* store, const char* id);
+const char* GetContextMenuDataFromStore(TrayMenuStore *store);
 
 #endif //TRAYMENUSTORE_DARWIN_H

v2/internal/ffenestri/vec.c

@@ -1,6 +1,4 @@
-// +build !windows
-
-/**
+/** 
  * Copyright (c) 2014 rxi
  *
  * This library is free software; you can redistribute it and/or modify it

v2/internal/ffenestri/vec.h

@@ -1,4 +1,4 @@
-/**
+/** 
  * Copyright (c) 2014 rxi
  *
  * This library is free software; you can redistribute it and/or modify it
@@ -44,6 +44,8 @@
   ( vec_splice_(vec_unpack_(v), start, count),\
     (v)->length -= (count) )
 
+#define vec_size(v) \
+    (v)->length
 
 #define vec_swapsplice(v, start, count)\
   ( vec_swapsplice_(vec_unpack_(v), start, count),\

v2/internal/ffenestri/windows/EventToken.h

@@ -1,68 +0,0 @@
-
-
-/* this ALWAYS GENERATED file contains the definitions for the interfaces */
-
-
- /* File created by MIDL compiler version 8.01.0622 */
-/* @@MIDL_FILE_HEADING(  ) */
-
-
-
-/* verify that the <rpcndr.h> version is high enough to compile this file*/
-#ifndef __REQUIRED_RPCNDR_H_VERSION__
-#define __REQUIRED_RPCNDR_H_VERSION__ 500
-#endif
-
-/* verify that the <rpcsal.h> version is high enough to compile this file*/
-#ifndef __REQUIRED_RPCSAL_H_VERSION__
-#define __REQUIRED_RPCSAL_H_VERSION__ 100
-#endif
-
-#include "rpc.h"
-#include "rpcndr.h"
-
-#ifndef __RPCNDR_H_VERSION__
-#error this stub requires an updated version of <rpcndr.h>
-#endif /* __RPCNDR_H_VERSION__ */
-
-
-#ifndef __eventtoken_h__
-#define __eventtoken_h__
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-#pragma once
-#endif
-
-/* Forward Declarations */
-
-#ifdef __cplusplus
-extern "C"{
-#endif
-
-
-/* interface __MIDL_itf_eventtoken_0000_0000 */
-/* [local] */
-
-//  Microsoft Windows
-//  Copyright (c) Microsoft Corporation. All rights reserved.
-#pragma once
-typedef struct EventRegistrationToken
-    {
-    __int64 value;
-    } 	EventRegistrationToken;
-
-
-
-extern RPC_IF_HANDLE __MIDL_itf_eventtoken_0000_0000_v0_0_c_ifspec;
-extern RPC_IF_HANDLE __MIDL_itf_eventtoken_0000_0000_v0_0_s_ifspec;
-
-/* Additional Prototypes for ALL interfaces */
-
-/* end of Additional Prototypes */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-

v2/internal/ffenestri/windows/README.md

@@ -1 +0,0 @@
-These files were generated using the scripts in the [webview](https://github.com/webview/webview) project and compressed using UPX.

v2/internal/ffenestri/windows/test/CMakeLists.txt

@@ -1,7 +0,0 @@
-cmake_minimum_required(VERSION 3.19)
-project(test C)
-
-set(CMAKE_C_STANDARD 99)
-set(SOURCES ../../ffenestri_windows.cpp)
-
-add_executable(test ${SOURCES} main.c)

v2/internal/ffenestri/windows/test/compile.bat

@@ -1 +0,0 @@
-g++ main.c ..\..\ffenestri_windows.cpp -lgdi32 -std=c++11

v2/internal/ffenestri/windows/x64/x64.go

@@ -1,11 +0,0 @@
-// +build windows
-
-package x64
-
-import _ "embed"
-
-//go:embed webview.dll
-var WebView2 []byte
-
-//go:embed WebView2Loader.dll
-var WebView2Loader []byte

v2/internal/ffenestri/windows/x64/x64_stub.go

@@ -1,9 +0,0 @@
-// +build !windows
-
-// This is a stub to define the following even though they don't exist
-// on non-Windows systems.  Note: This is not the right way to handle this.
-package x64
-
-var WebView2 []byte
-
-var WebView2Loader []byte

v2/internal/ffenestri/wv2ComHandler_windows.h

@@ -1,103 +0,0 @@
-
-#ifndef WV2COMHANDLER_H
-#define WV2COMHANDLER_H
-
-#include "ffenestri_windows.h"
-#include "windows/WebView2.h"
-
-#include <locale>
-#include <codecvt>
-
-class wv2ComHandler
-        :   public ICoreWebView2CreateCoreWebView2EnvironmentCompletedHandler,
-            public ICoreWebView2CreateCoreWebView2ControllerCompletedHandler,
-            public ICoreWebView2WebMessageReceivedEventHandler,
-            public ICoreWebView2PermissionRequestedEventHandler
-{
-
-    struct Application *app;
-    HWND window;
-    messageCallback mcb;
-    comHandlerCallback cb;
-
-    public:
-        wv2ComHandler(struct Application *app, HWND window, messageCallback mcb, comHandlerCallback cb) {
-            this->app = app;
-            this->window = window;
-            this->mcb = mcb;
-            this->cb = cb;
-        }
-        ULONG STDMETHODCALLTYPE AddRef() { return 1; }
-        ULONG STDMETHODCALLTYPE Release() { return 1; }
-        HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, LPVOID *ppv) {
-          return S_OK;
-        }
-        HRESULT STDMETHODCALLTYPE Invoke(HRESULT res,
-                                         ICoreWebView2Environment *env) {
-          env->CreateCoreWebView2Controller(window, this);
-          return S_OK;
-        }
-        HRESULT STDMETHODCALLTYPE Invoke(HRESULT res,
-                                         ICoreWebView2Controller *controller) {
-          controller->AddRef();
-
-          ICoreWebView2 *webview;
-          ::EventRegistrationToken token;
-          controller->get_CoreWebView2(&webview);
-          webview->add_WebMessageReceived(this, &token);
-          webview->add_PermissionRequested(this, &token);
-
-          cb(controller);
-          return S_OK;
-        }
-
-        // This is called when JS posts a message back to webkit
-        HRESULT STDMETHODCALLTYPE Invoke(
-            ICoreWebView2 *sender, ICoreWebView2WebMessageReceivedEventArgs *args) {
-          LPWSTR message;
-          args->TryGetWebMessageAsString(&message);
-          if ( message == nullptr ) {
-            return S_OK;
-          }
-          const char *m = LPWSTRToCstr(message);
-
-          // check for internal messages
-          if (strcmp(m, "completed") == 0) {
-            completed(app);
-            return S_OK;
-          }
-
-          switch(m[0]) {
-
-          // Standard message for backend
-          case 'S':
-            printf("--> Message to backend: %s\n", &m[1]);
-            messageFromWindowCallback(&m[1]);
-            break;
-          // DOM Initialised
-        case 'I':
-            loadAssets(app);
-            break;
-
-          default:
-            printf("----> Unknown message type: %c\n", m[0]);
-          }
-          delete[] m;
-          return S_OK;
-        }
-        HRESULT STDMETHODCALLTYPE
-        Invoke(ICoreWebView2 *sender,
-               ICoreWebView2PermissionRequestedEventArgs *args) {
-                                                        printf("DDDDDDDDDDDD\n");
-
-          COREWEBVIEW2_PERMISSION_KIND kind;
-          args->get_PermissionKind(&kind);
-          if (kind == COREWEBVIEW2_PERMISSION_KIND_CLIPBOARD_READ) {
-            args->put_State(COREWEBVIEW2_PERMISSION_STATE_ALLOW);
-          }
-          return S_OK;
-        }
-
-};
-
-#endif

v2/internal/fs/fs.go

@@ -40,7 +40,7 @@ func Mkdir(dirname string) error {
 // Returns error on failure
 func MkDirs(fullPath string, mode ...os.FileMode) error {
 	var perms os.FileMode
-	perms = 0755
+	perms = 0700
 	if len(mode) == 1 {
 		perms = mode[0]
 	}
@@ -201,6 +201,10 @@ func GetSubdirectories(rootDir string) (*slicer.StringSlicer, error) {
 
 func DirIsEmpty(dir string) (bool, error) {
 
+	if !DirExists(dir) {
+		return false, fmt.Errorf("DirIsEmpty called with a non-existant directory: %s", dir)
+	}
+
 	// CREDIT: https://stackoverflow.com/a/30708914/8325411
 	f, err := os.Open(dir)
 	if err != nil {
@@ -239,7 +243,7 @@ func CopyDir(src string, dst string) (err error) {
 		return fmt.Errorf("destination already exists")
 	}
 
-	err = MkDirs(dst)
+	err = os.MkdirAll(dst, si.Mode())
 	if err != nil {
 		return
 	}

v2/internal/github/github.go

@@ -1,103 +0,0 @@
-package github
-
-import (
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"sort"
-	"strings"
-)
-
-// GetVersionTags gets the list of tags on the Wails repo
-// It returns a list of sorted tags in descending order
-func GetVersionTags() ([]*SemanticVersion, error) {
-
-	result := []*SemanticVersion{}
-	var err error
-
-	resp, err := http.Get("https://api.github.com/repos/wailsapp/wails/tags")
-	if err != nil {
-		return result, err
-	}
-	body, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return result, err
-	}
-
-	data := []map[string]interface{}{}
-	err = json.Unmarshal(body, &data)
-	if err != nil {
-		return result, err
-	}
-
-	// Convert tag data to Version structs
-	for _, tag := range data {
-		version := tag["name"].(string)
-		if !strings.HasPrefix(version, "v2") {
-			continue
-		}
-		semver, err := NewSemanticVersion(version)
-		if err != nil {
-			return result, err
-		}
-		result = append(result, semver)
-	}
-
-	// Reverse Sort
-	sort.Sort(sort.Reverse(SemverCollection(result)))
-
-	return result, err
-}
-
-// GetLatestStableRelease gets the latest stable release on GitHub
-func GetLatestStableRelease() (result *SemanticVersion, err error) {
-
-	tags, err := GetVersionTags()
-	if err != nil {
-		return nil, err
-	}
-
-	for _, tag := range tags {
-		if tag.IsRelease() {
-			return tag, nil
-		}
-	}
-
-	return nil, fmt.Errorf("no release tag found")
-}
-
-// GetLatestPreRelease gets the latest prerelease on GitHub
-func GetLatestPreRelease() (result *SemanticVersion, err error) {
-
-	tags, err := GetVersionTags()
-	if err != nil {
-		return nil, err
-	}
-
-	for _, tag := range tags {
-		if tag.IsPreRelease() {
-			return tag, nil
-		}
-	}
-
-	return nil, fmt.Errorf("no prerelease tag found")
-}
-
-// IsValidTag returns true if the given string is a valid tag
-func IsValidTag(tagVersion string) (bool, error) {
-	if tagVersion[0] == 'v' {
-		tagVersion = tagVersion[1:]
-	}
-	tags, err := GetVersionTags()
-	if err != nil {
-		return false, err
-	}
-
-	for _, tag := range tags {
-		if tag.String() == tagVersion {
-			return true, nil
-		}
-	}
-	return false, nil
-}