X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/b19bbc943eecd2655a0e3f32eefada102f51142f..9f321c754ae94a7573a18f0e8c24ce23add22c89:/gtk/gtkobject.lisp

diff --git a/gtk/gtkobject.lisp b/gtk/gtkobject.lisp
index bdc6c18..2444c08 100644
--- a/gtk/gtkobject.lisp
+++ b/gtk/gtkobject.lisp
@@ -20,28 +20,18 @@
 ;; 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.31 2006-02-15 09:47:42 espen Exp $
+;; $Id: gtkobject.lisp,v 1.41 2007-05-10 20:13:42 espen Exp $
 
 
 (in-package "GTK")
 
 
-;;;; Misc utils
-
-; (defun name-to-string (name)
-;   (substitute #\_ #\- (string-downcase (string name))))
-
-; (defun string-to-name (name &optional (package "KEYWORD"))
-;   (intern (substitute #\- #\_ (string-upcase name)) package))
-
-
-
 ;;;; 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.so"))
+		          "/libgtk-x11-2.0." asdf:*dso-extension*))
 
   (defclass %object (gobject)
     ()
@@ -60,7 +50,7 @@ (defmethod initialize-instance :around ((object %object) &rest initargs)
   (call-next-method)
   ;; Add a temorary reference which will be removed when the object is
   ;; sinked
-  (reference-foreign (class-of object) (foreign-location object))
+  (funcall (reference-function '%object) (foreign-location object))
   (%object-sink object))
 
 (defbinding %object-sink () nil
@@ -68,8 +58,6 @@ (defbinding %object-sink () nil
 
 ;;;; Main loop and event handling
 
-(declaim (inline events-pending-p main-iteration))
-
 (defbinding events-pending-p () boolean)
 
 (defbinding get-current-event () gdk:event)
@@ -90,7 +78,8 @@ (defun main-iterate-all (&rest args)
   (declare (ignore args))
   (loop
    while (events-pending-p)
-   do (main-iteration-do nil)))
+   do (main-iteration-do nil))
+  #+clisp 0)
 
 
 ;;;; Metaclass for child classes
@@ -98,103 +87,119 @@ (defun main-iterate-all (&rest args)
 (defvar *container-to-child-class-mappings* (make-hash-table))
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
-  (defclass child-class (virtual-slots-class)
+  (defclass container-child-class (virtual-slots-class)
     ())
 
   (defclass direct-child-slot-definition (direct-virtual-slot-definition)
     ((pname :reader slot-definition-pname :initarg :pname)))
 
   (defclass effective-child-slot-definition (effective-virtual-slot-definition)
-    ((pname :reader slot-definition-pname :initarg :pname)))
+    ((pname :reader slot-definition-pname :initarg :pname))))
 
 
-(defmethod shared-initialize ((class child-class) names &key container)
+(defmethod shared-initialize ((class container-child-class) names &key container)
+  (declare (ignore names))
   (call-next-method)
   (setf
    (gethash (find-class (first container)) *container-to-child-class-mappings*)
-    class))
-
-(defmethod direct-slot-definition-class ((class child-class) &rest initargs)
+    class)
+  #+clisp
+  (loop
+   for slotd in (class-direct-slots class)
+   when (typep slotd 'direct-child-slot-definition)
+   do (loop
+       for reader in (slot-definition-readers slotd)
+       do (add-reader-method class 
+	   (ensure-generic-function reader :lambda-list '(object)) 
+	   (slot-definition-name slotd)))
+      (loop
+       for writer in (slot-definition-writers slotd)
+       do (add-writer-method class 
+	   (ensure-generic-function writer :lambda-list '(value object)) 
+	   (slot-definition-name slotd)))))
+
+(defmethod direct-slot-definition-class ((class container-child-class) &rest initargs)
   (case (getf initargs :allocation)
     (:property (find-class 'direct-child-slot-definition))
     (t (call-next-method))))
 
-(defmethod effective-slot-definition-class ((class child-class) &rest initargs)
+(defmethod effective-slot-definition-class ((class container-child-class) &rest initargs)
   (case (getf initargs :allocation)
     (:property (find-class 'effective-child-slot-definition))
     (t (call-next-method))))
 
-(defmethod compute-effective-slot-definition-initargs ((class child-class) direct-slotds)
+(defmethod compute-effective-slot-definition-initargs ((class container-child-class) direct-slotds)
   (if (eq (slot-definition-allocation (first direct-slotds)) :property)
       (nconc 
        (list :pname (most-specific-slot-value direct-slotds 'pname))
-       ;; Need this to prevent type expansion in SBCL (>= 0.9.8)
-       (list :type (most-specific-slot-value direct-slotds 'type))
        (call-next-method))
     (call-next-method)))
 
-(progn
-  #+cmu(declaim (optimize (inhibit-warnings 3)))
-  #+sbcl(declaim (muffle-conditions compiler-note))
-  (defun %container-child-get-property (parent child pname gvalue))
-  (defun %container-child-set-property (parent child pname gvalue)))
-
-
-(defmethod initialize-internal-slot-functions ((slotd effective-child-slot-definition))
-  (let ((type (slot-definition-type slotd))
-	(pname (slot-definition-pname slotd)))
-    (setf 
-     (slot-value slotd 'getter)
-     #'(lambda (object)
-	 (with-slots (parent child) object	   
-	   (let ((gvalue (gvalue-new type)))
-	     (%container-child-get-property parent child pname gvalue)
-	     (unwind-protect
-		 (funcall (reader-function type) gvalue +gvalue-value-offset+)
-	       (gvalue-free gvalue t))))))
-    
-    (setf 
-     (slot-value slotd 'setter)
-     #'(lambda (value object)
-	 (with-slots (parent child) object	   
-	   (let ((gvalue (gvalue-new type)))
-	     (funcall (writer-function type) value gvalue +gvalue-value-offset+)
-	     (%container-child-set-property parent child pname gvalue)
-	     (gvalue-free gvalue t)
-	     value)))))
- 
-  (call-next-method)))
+(defmethod slot-readable-p ((slotd effective-child-slot-definition))
+  (declare (ignore slotd))
+  t)
 
+(defmethod compute-slot-reader-function ((slotd effective-child-slot-definition) &optional signal-unbound-p)
+  (declare (ignore signal-unbound-p))
+  (let* ((type (slot-definition-type slotd))
+	 (pname (slot-definition-pname slotd))
+	 (reader (reader-function type :ref :get)))
+    #'(lambda (object)
+	(with-slots (parent child) object	   
+	  (with-memory (gvalue +gvalue-size+)
+	    (glib::%gvalue-init gvalue (find-type-number type))
+	    (%container-child-get-property parent child pname gvalue)
+	    (funcall reader gvalue +gvalue-value-offset+))))))
+
+(defmethod slot-writable-p ((slotd effective-child-slot-definition))
+  (declare (ignore slotd))
+  t)
 
-(defmethod add-reader-method ((class child-class) generic-function slot-name)
+(defmethod compute-slot-writer-function ((slotd effective-child-slot-definition))
+  (let* ((type (slot-definition-type slotd))
+	 (pname (slot-definition-pname slotd))
+	 (writer (writer-function type :temp t))
+	 (destroy (destroy-function type :temp t)))
+    #'(lambda (value object)
+	(with-slots (parent child) object	   
+	  (with-memory (gvalue +gvalue-size+)
+	    (glib::%gvalue-init gvalue (find-type-number type))
+	    (funcall writer value gvalue +gvalue-value-offset+)
+	    (%container-child-set-property parent child pname gvalue)
+	    (funcall destroy gvalue +gvalue-value-offset+))
+	  value))))
+
+
+(defmethod add-reader-method ((class container-child-class) generic-function slot-name #?(sbcl>= 1 0 2)slot-documentation)
   (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 child-class) generic-function slot-name)
+(defmethod add-writer-method ((class container-child-class) generic-function slot-name #?(sbcl>= 1 0 2)slot-documentation)
   (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
 		    (setf (child-property-value widget slot-name) value))))))
 
 
-(defmethod validate-superclass ((class child-class) (super standard-class))
+(defmethod validate-superclass ((class container-child-class) (super standard-class))
   ;(subtypep (class-name super) 'container-child)
   t)
 
 
-(defclass container-child ()
+(defclass container-child (virtual-slots-object)
   ((parent :initarg :parent :type container)
    (child :initarg :child :type widget)))
 
@@ -227,8 +232,16 @@ (defun expand-container-type (type forward-p options)
 	 (defclass ,child-class (,(default-container-child-name super))
 	   ,(slot-definitions child-class 
 	     (query-container-class-child-properties type) nil)
-	   (:metaclass child-class)
+	   (:metaclass container-child-class)
 	   (:container ,class))))))
 
+(defun container-child-class (container-class)
+  (gethash container-class *container-to-child-class-mappings*))
+
+(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 'gobject-dependencies)
+(register-derivable-type 'container "GtkContainer" 'expand-container-type 'container-dependencies)