X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/b7833c4c1c530c1607d009208360dec9f5b54b05..f413c2fba27e936c0755f0b7601c18d31af9b2d1:/glib/ginterface.lisp

diff --git a/glib/ginterface.lisp b/glib/ginterface.lisp
index 7225755..ff8bf16 100644
--- a/glib/ginterface.lisp
+++ b/glib/ginterface.lisp
@@ -15,7 +15,7 @@
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-;; $Id: ginterface.lisp,v 1.3 2004/10/31 00:56:29 espen Exp $
+;; $Id: ginterface.lisp,v 1.11 2005/03/11 19:13:05 espen Exp $
 
 (in-package "GLIB")
 
@@ -26,30 +26,10 @@
 (defclass ginterface ()
   ())
 
-(deftype-method translate-type-spec ginterface (type-spec)
-  (declare (ignore type-spec))
-  (translate-type-spec 'gobject))
-
-(deftype-method size-of ginterface (type-spec)
-  (declare (ignore type-spec))
-  (size-of 'gobject))
-
-(deftype-method translate-from-alien
-    ginterface (type-spec location &optional weak-ref)
-  (declare (ignore type-spec))
-  (translate-from-alien 'gobject location weak-ref))
-
-(deftype-method translate-to-alien
-    ginterface (type-spec instance &optional weak-ref)
-  (declare (ignore type-spec))
-  (translate-to-alien 'gobject instance weak-ref))
-
-
-
 ;;;; Metaclass for interfaces
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
-  (defclass ginterface-class (virtual-slot-class)
+  (defclass ginterface-class (virtual-slots-class)
     ()))
 
 (defmethod direct-slot-definition-class ((class ginterface-class) &rest initargs)
@@ -74,22 +54,60 @@
     (call-next-method)))
 
 
-(defmethod shared-initialize ((class ginterface-class) names
-			      &rest initargs &key name alien-name)
-  (declare (ignore initargs names))
+(defmethod shared-initialize ((class ginterface-class) names &key name gtype)
+  (declare (ignore names))
   (let* ((class-name (or name (class-name class)))
 	 (type-number
-	  (find-type-number
-	   (or (first alien-name) (default-alien-type-name class-name)) t)))
-    (register-type class-name type-number))
+	  (or
+	   (find-type-number class-name)
+	   (register-type class-name 
+	    (or (first gtype) (default-type-init-name class-name))))))
+;    (type-default-interface-ref type-number)
+    )
   (call-next-method))
 
 
-(defmethod validate-superclass
-    ((class ginterface-class) (super pcl::standard-class))
+(defmethod validate-superclass ((class ginterface-class) (super standard-class))
   (subtypep (class-name super) 'ginterface))
 
 
+(defmethod alien-type ((class ginterface-class) &rest args)
+  (declare (ignore class args))
+  (alien-type 'gobject))
+
+(defmethod size-of ((class ginterface-class) &rest args)
+  (declare (ignore class args))
+  (size-of 'gobject))
+
+(defmethod from-alien-form (location (class ginterface-class) &rest args)
+  (declare (ignore class args))
+  (from-alien-form location 'gobject))
+
+(defmethod from-alien-function ((class ginterface-class) &rest args)
+  (declare (ignore class args))
+  (from-alien-function 'gobject))
+
+(defmethod to-alien-form (instance (class ginterface-class) &rest args)
+  (declare (ignore class args))
+  (to-alien-form instance 'gobject))
+
+(defmethod to-alien-function ((class ginterface-class) &rest args)
+  (declare (ignore class args))
+  (to-alien-function 'gobject))
+
+(defmethod reader-function ((class ginterface-class) &rest args)
+  (declare (ignore class args))
+  (reader-function 'gobject))
+
+(defmethod writer-function ((class ginterface-class) &rest args)
+  (declare (ignore class args))
+  (writer-function 'gobject))
+
+(defmethod destroy-function ((class ginterface-class) &rest args)
+  (declare (ignore class args))
+  (destroy-function 'gobject))
+
+
 ;;;;
 
 
@@ -112,21 +130,28 @@
     (unwind-protect
 	 (multiple-value-bind (array length)
 	     (%object-interface-list-properties iface)
-	   (unwind-protect
-		(%map-params array length type-number inherited-p)
-	     (deallocate-memory array)))
+	   (unless (null-pointer-p array)
+	     (unwind-protect
+		 (%map-params array length type-number inherited-p)
+	       (deallocate-memory array))))
 ;      (type-default-interface-unref type-number)
       )))
 
 
-(defun expand-ginterface-type (type options &rest args)
+(defun expand-ginterface-type (type forward-p options &rest args)
   (declare (ignore args))
   (let ((class (type-from-number type))
-	(slots (getf options :slots)))    
+	(slots (getf options :slots))) 
     `(defclass ,class (,(supertype type))
-      ,(slot-definitions class (query-object-interface-properties type) slots)
+       ,(unless forward-p
+	  (slot-definitions class (query-object-interface-properties type) slots))
       (:metaclass ginterface-class)
-      (:alien-name ,(find-type-name type)))))
+      (:gtype ,(register-type-as type)))))
 
+(defun ginterface-dependencies (type)
+  (delete-duplicates 
+   (cons
+    (supertype type)
+    (mapcar #'param-value-type (query-object-interface-properties type)))))
 
-(register-derivable-type 'ginterface "GInterface" 'expand-ginterface-type)
+(register-derivable-type 'ginterface "GInterface" 'expand-ginterface-type 'ginterface-dependencies)