diff options
| -rw-r--r-- | link_darwin_amd64.go (renamed from AAA_GOFILES/link_darwin_amd64.go) | 2 | ||||
| -rw-r--r-- | main.go (renamed from AAA_GOFILES/main.go) | 24 |
2 files changed, 9 insertions, 17 deletions
diff --git a/AAA_GOFILES/link_darwin_amd64.go b/link_darwin_amd64.go index 687a62a..ef9c2e5 100644 --- a/AAA_GOFILES/link_darwin_amd64.go +++ b/link_darwin_amd64.go @@ -2,6 +2,6 @@ package ui -// #cgo CFLAGS: -mmacosx-version-min=10.8 -DMACOSX_DEPLOYMENT_TARGET=10.8 +// #cgo CFLAGS: -mmacosx-version-min=10.8 // #cgo LDFLAGS: ${SRCDIR}/libui_darwin_amd64.a -framework Foundation -framework AppKit -mmacosx-version-min=10.8 import "C" diff --git a/AAA_GOFILES/main.go b/main.go index dd1443a..1ba6d05 100644 --- a/AAA_GOFILES/main.go +++ b/main.go @@ -10,18 +10,9 @@ import ( ) // #include "ui.h" -// extern void doQueued(void *); +// extern void doQueueMain(void *); // extern int doOnShouldQuit(void *); -// /* I forgot how dumb cgo is... ./main.go:73: cannot use _Cgo_ptr(_Cfpvar_fp_doQueued) (type unsafe.Pointer) as type *[0]byte in argument to _Cfunc_uiQueueMain */ -// /* I'm pretty sure this worked before... */ -// static inline void realQueueMain(void *x) -// { -// uiQueueMain(doQueued, x); -// } -// static inline void realOnShouldQuit(void) -// { -// uiOnShouldQuit(doOnShouldQuit, NULL); -// } +// extern int doOnTimer(void *); import "C" // make sure main() runs on the first thread created by the OS @@ -48,8 +39,7 @@ func Main(f func()) error { C.uiFreeInitError(estr) return err } - // set up OnShouldQuit() - C.realOnShouldQuit() + C.uiOnShouldQuit(C.doOnShouldQuit, nil) QueueMain(f) C.uiMain() return nil @@ -98,11 +88,11 @@ func QueueMain(f func()) { } } qmmap[n] = f - C.realQueueMain(unsafe.Pointer(n)) + C.uiQueueMain(C.doQueueMain, unsafe.Pointer(n)) } -//export doQueued -func doQueued(nn unsafe.Pointer) { +//export doQueueMain +func doQueueMain(nn unsafe.Pointer) { qmlock.Lock() n := uintptr(nn) @@ -136,3 +126,5 @@ func doOnShouldQuit(unused unsafe.Pointer) C.int { } return frombool(shouldQuitFunc()) } + +// TODO Timer? |