When multithreading is supported, run gtk_main with Gdk threads lock acquired

diff --git a/gdk/gdk.threads.lisp b/gdk/gdk.threads.lisp
index fc13d8e..5be7743 100644 (file)
--- a/gdk/gdk.threads.lisp
+++ b/gdk/gdk.threads.lisp
@@ -9,6 +9,14 @@
 (defcfun gdk-threads-leave :void)
 (export 'gdk-threads-leave)
 
+(defmacro with-gdk-threads-lock (&body body)
+  `(progn
+     (gdk-threads-enter)
+     (unwind-protect
+          (progn ,@body)
+       (gdk-threads-leave))))
+(export 'with-gdk-threads-lock)
+
 ;; ignored:
 ;; void                gdk_threads_set_lock_functions      (GCallback enter_fn,
 ;;                                                          GCallback leave_fn);

diff --git a/gtk/gtk.main_loop_events.lisp b/gtk/gtk.main_loop_events.lisp
index 961b357..b26f147 100644 (file)
--- a/gtk/gtk.main_loop_events.lisp
+++ b/gtk/gtk.main_loop_events.lisp
@@ -19,7 +19,15 @@
 
 (at-init () (gtk-init))
 
-(defcfun gtk-main :void)
+(defcfun (%gtk-main "gtk_main") :void)
+
+#+thread-support
+(defun gtk-main ()
+  (with-gdk-threads-lock (%gtk-main)))
+
+#-thread-support
+(defun gtk-main ()
+  (%gtk-main))
 
 #+thread-support
 (defvar *main-thread* nil)