diff options
| -rw-r--r-- | uitask_unix.go | 35 |
1 files changed, 34 insertions, 1 deletions
diff --git a/uitask_unix.go b/uitask_unix.go index 3ea7617..1567ca3 100644 --- a/uitask_unix.go +++ b/uitask_unix.go @@ -6,6 +6,7 @@ package ui import ( "fmt" + "unsafe" ) // #cgo pkg-config: gtk+-3.0 @@ -14,13 +15,14 @@ import ( // static inline gboolean our_quit_callback(gpointer data) // { // gtk_main_quit(); -// return FALSE; /* remove from idle handler (not like it matters) */ +// return FALSE; /* remove from idle handler queue (not like it matters) */ // } // /* I would call gdk_threads_add_idle() directly from ui() but cgo whines, so; trying to access our_quit_callback() in any way other than a call would cause _cgo_main.c to complain too */ // static inline void signalQuit(void) // { // gdk_threads_add_idle(our_quit_callback, NULL); // } +// extern gboolean our_post_callback(gpointer); import "C" func uiinit() error { @@ -41,3 +43,34 @@ func ui() { C.gtk_main() } + +// we DO need to worry about keeping data alive here +// so we do the posting in a new goroutine that waits instead + +type uipostmsg struct { + w *Window + data interface{} + done chan struct{} +} + +//export our_post_callback +func our_post_callback(xmsg C.gpointer) C.gboolean { + msg := (*uipostmsg)(unsafe.Pointer(xmsg)) + msg.w.sysData.post(msg.data) + msg.done <- struct{}{} + return C.FALSE // remove from idle handler queue +} + +func uipost(w *Window, data interface{}) { + go func() { + msg := &uipostmsg{ + w: w, + data: data, + done: make(chan struct{}), + } + C.gdk_threads_add_idle(C.GSourceFunc(C.our_post_callback), + C.gpointer(unsafe.Pointer(msg))) + <-msg.done + close(msg.done) + }() +} |