(error "Cannot initialize Gtk+"))
(foreign-free (mem-ref argv '(:pointer :string))))))
-(gtk-init)
+(at-init () (gtk-init))
-(defcfun gtk-test-register-all-types :void)
-
-(gtk-test-register-all-types)
+(defcfun gtk-main :void)
-(defcfun gtk-events-pending :boolean)
+#+thread-support
+(defvar *main-thread* nil)
-(defcfun gtk-main :void)
+#+thread-support
+(at-finalize ()
+ (when (and *main-thread* (bt:thread-alive-p *main-thread*))
+ (bt:destroy-thread *main-thread*)
+ (setf *main-thread* nil)))
#+thread-support
(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")))
+ (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"))))
+
+#+thread-support
+(defun join-main-thread ()
+ (when *main-thread*
+ (bt:join-thread *main-thread*)))
+
+#+thread-support
+(export 'join-main-thread)
#-thread-support
(defun ensure-gtk-main ()