From e8a7dd0b8788f14b2ecc04ecaef8e77e4d2b68e1 Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Mon, 30 Jun 2014 21:21:55 -0400 Subject: Converted the Mac OS X backend to use uitask() instead of uitask chan func(). --- uitask_darwin.go | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'uitask_darwin.go') diff --git a/uitask_darwin.go b/uitask_darwin.go index 754418c..5932cac 100644 --- a/uitask_darwin.go +++ b/uitask_darwin.go @@ -14,30 +14,25 @@ import ( // #include "objc_darwin.h" import "C" -var uitask chan func() +// can be run from any thread +// will wait for return; see delegateuitask_darwin.m +func uitask(f func()) { + C.douitask(appDelegate, unsafe.Pointer(&f)) +} func ui(main func()) error { runtime.LockOSThread() - uitask = make(chan func()) - err := initCocoa() if err != nil { return err } - // Cocoa must run on the first thread created by the program, so we run our dispatcher on another thread instead - go func() { - for f := range uitask { - C.douitask(appDelegate, unsafe.Pointer(&f)) - } - }() - go func() { main() - uitask <- func() { + uitask(func() { C.breakMainLoop() - } + }) }() C.cocoaMainLoop() -- cgit v1.2.3