-(defun ensure-gtk-main ()
- (unless (find "gtk main thread" (bt:all-threads) :test 'string= :key 'bt:thread-name)
- (bt:make-thread (lambda () (gtk:gtk-main)) :name "gtk main thread")))
+(progn
+ (defvar *main-thread* nil)
+ (defvar *main-thread-level* nil)
+ (defvar *main-thread-lock* (bt:make-lock "*main-thread* lock"))
+
+ (at-finalize ()
+ (when (and *main-thread* (bt:thread-alive-p *main-thread*))
+ (bt:destroy-thread *main-thread*)
+ (setf *main-thread* nil)))
+
+ (defun ensure-gtk-main ()
+ (bt:with-lock-held (*main-thread-lock*)
+ (when (and *main-thread* (not (bt:thread-alive-p *main-thread*)))
+ (setf *main-thread* nil))
+ (unless *main-thread*
+ (setf *main-thread* (bt:make-thread (lambda () (gtk-main)) :name "cl-gtk2 main thread")
+ *main-thread-level* 0))
+ (incf *main-thread-level*))
+ (values))
+
+ (defun join-gtk-main ()
+ (when *main-thread*
+ (bt:join-thread *main-thread*)))
+
+ (defun leave-gtk-main ()
+ (bt:with-lock-held (*main-thread-lock*)
+ (decf *main-thread-level*)
+ (when (zerop *main-thread-level*)
+ (gtk-main-quit)))))