Added *REENTRANT-MAIN-ITERATION* to control if MAIN-ITERATE-ALL can be

[clg] / gtk / gtkobject.lisp

diff --git a/gtk/gtkobject.lisp b/gtk/gtkobject.lisp
index 1869e9af0b309d86c61aae3fdbc6130acbb4f8fc..7d57bfdc004692940f481ef498eb07fbd94f3623 100644 (file)
--- a/gtk/gtkobject.lisp
+++ b/gtk/gtkobject.lisp
@@ -20,7 +20,7 @@
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-;; $Id: gtkobject.lisp,v 1.38 2006-08-31 09:08:23 espen Exp $
+;; $Id: gtkobject.lisp,v 1.46 2008-03-04 16:03:38 espen Exp $
 
 
 (in-package "GTK")
@@ -29,9 +29,7 @@ (in-package "GTK")
 ;;;; Superclass for the gtk class hierarchy
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
-  (init-types-in-library 
-   #.(concatenate 'string (pkg-config:pkg-variable "gtk+-2.0" "libdir") 
-                         "/libgtk-x11-2.0." asdf:*dso-extension*))
+  (init-types-in-library gtk "libgtk-2.0")
 
   (defclass %object (gobject)
     ()
@@ -58,6 +56,9 @@ (defbinding %object-sink () nil
 
 ;;;; Main loop and event handling
 
+(defparameter *reentrant-main-iteration* t)
+(defvar *running-main-iteration* nil)
+
 (defbinding events-pending-p () boolean)
 
 (defbinding get-current-event () gdk:event)
@@ -76,12 +77,27 @@ (defbinding main-iteration-do (&optional (blocking t)) boolean
 
 (defun main-iterate-all (&rest args)
   (declare (ignore args))
-  (loop
-   while (events-pending-p)
-   do (main-iteration-do nil))
+  (unless (and (not *reentrant-main-iteration*) *running-main-iteration*)
+    (let ((*running-main-iteration* t))
+      (loop
+       while (events-pending-p)
+       do (main-iteration-do nil))))
   #+clisp 0)
 
 
+(define-callback fd-source-callback-marshal nil 
+    ((callback-id unsigned-int) (fd unsigned-int))
+  (glib::invoke-source-callback callback-id fd))
+
+(defbinding (input-add "gtk_input_add_full") (fd condition function) unsigned-int
+  (fd unsigned-int)
+  (condition gdk:input-condition)
+  (fd-source-callback-marshal callback)
+  (nil null)
+  ((register-callback-function function) unsigned-long)
+  (user-data-destroy-callback callback))
+
+
 ;;;; Metaclass for child classes
  
 (defvar *container-to-child-class-mappings* (make-hash-table))
@@ -170,22 +186,24 @@ (defmethod compute-slot-writer-function ((slotd effective-child-slot-definition)
          value))))
 
 
-(defmethod add-reader-method ((class container-child-class) generic-function slot-name)
+(defmethod add-reader-method ((class container-child-class) generic-function slot-name #?(sbcl>= 1 0 2)slot-documentation #?(sbcl>= 1 0 14)source-location)
   (add-method
    generic-function
    (make-instance 'standard-method
     :specializers (list (find-class 'widget))
     :lambda-list '(widget)
+    :documentation (or #?(sbcl>= 1 0 2)slot-documentation "automatically generated reader method")
     :function #'(lambda (args next-methods)
                  (declare (ignore next-methods))
                  (child-property-value (first args) slot-name)))))
 
-(defmethod add-writer-method ((class container-child-class) generic-function slot-name)
+(defmethod add-writer-method ((class container-child-class) generic-function slot-name #?(sbcl>= 1 0 2)slot-documentation #?(sbcl>= 1 0 14)source-location)
   (add-method
    generic-function
    (make-instance 'standard-method
     :specializers (list (find-class t) (find-class 'widget))
     :lambda-list '(value widget)
+    :documentation (or #?(sbcl>= 1 0 2)slot-documentation "automatically generated reader method")
     :function #'(lambda (args next-methods)
                  (declare (ignore next-methods))
                  (destructuring-bind (value widget) args
@@ -233,7 +251,33 @@     (defclass ,child-class (,(default-container-child-name super))
           (:metaclass container-child-class)
           (:container ,class))))))
 
-(defun container-class-child-class (container-class)
+(defun container-child-class (container-class)
   (gethash container-class *container-to-child-class-mappings*))
 
-(register-derivable-type 'container "GtkContainer" 'expand-container-type 'gobject-dependencies)
+(defun container-dependencies (type options)
+  (delete-duplicates 
+   (append
+    (gobject-dependencies type options)
+    (mapcar #'param-value-type (query-container-class-child-properties type)))))
+
+(register-derivable-type 'container "GtkContainer" 'expand-container-type 'container-dependencies)
+
+
+(defmacro define-callback-setter (name arg return-type &rest rest-args)
+  (let ((callback (gensym)))
+    (if arg
+       `(progn 
+          (define-callback-marshal ,callback ,return-type 
+            ,(cons arg rest-args))
+          (defbinding ,name () nil
+            ,arg
+            (,callback callback)
+            (function user-callback)
+            (user-data-destroy-callback callback)))
+      `(progn 
+        (define-callback-marshal ,callback ,return-type ,rest-args)
+        (defbinding ,name () nil
+          (,callback callback)
+          (function user-callback)
+          (user-data-destroy-callback callback))))))
+