X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=gtk%2Fgtk.misc.lisp;h=19c97208dfd4c90eb18647d8ad91498c93464990;hb=bd6107b4baeadf2e895ac82f8c977ca3c0c5ad3a;hp=81dd06d5003059938d847e09b47fa4d5b1bd8481;hpb=9f7be1143bc6087d6eb607a12f99b062663b33dd;p=cl-gtk2.git

diff --git a/gtk/gtk.misc.lisp b/gtk/gtk.misc.lisp
index 81dd06d..19c9720 100644
--- a/gtk/gtk.misc.lisp
+++ b/gtk/gtk.misc.lisp
@@ -19,11 +19,40 @@
   (g-idle-add-full priority
                    (callback call-from-main-loop-callback)
                    (allocate-stable-pointer function)
-                   (callback stable-pointer-free-destroy-notify-callback)))
+                   (callback stable-pointer-free-destroy-notify-callback))
+  (ensure-gtk-main))
 
 (export 'call-from-gtk-main-loop)
 
+(defcallback call-timeout-from-main-loop-callback :boolean
+    ((data :pointer))
+  (restart-case
+      (progn (funcall (get-stable-pointer-value data)))
+    (return-from-callback () nil)))
+
+(defun gtk-main-add-timeout (milliseconds function &key (priority +g-priority-default+))
+  (g-timeout-add-full priority milliseconds
+                      (callback call-timeout-from-main-loop-callback)
+                      (allocate-stable-pointer function)
+                      (callback stable-pointer-free-destroy-notify-callback)))
+
+(export 'gtk-main-add-timeout)
+
 (defmacro within-main-loop (&body body)
   `(call-from-gtk-main-loop (lambda () ,@body)))
 
-(export 'within-main-loop)
\ No newline at end of file
+(export 'within-main-loop)
+
+#+thread-support
+(defmacro with-main-loop (&body body)
+  `(progn
+     (ensure-gtk-main)
+     (within-main-loop ,@body)))
+
+#-thread-support
+(defmacro with-main-loop (&body body)
+  `(progn
+     ,@body
+     (ensure-gtk-main)))
+
+(export 'with-main-loop)
\ No newline at end of file