X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/f2b5bd42f88cd51cb2479b2e6346bfa9e7abb9c3..6243c15e6c655e627b62121af3a3031dd985250d:/glib/gtype.lisp

diff --git a/glib/gtype.lisp b/glib/gtype.lisp
index 04a23ce..70f9eeb 100644
--- a/glib/gtype.lisp
+++ b/glib/gtype.lisp
@@ -1,5 +1,5 @@
 ;; Common Lisp bindings for GTK+ v2.0
-;; Copyright (C) 2000 Espen S. Johnsen <espejohn@online.no>
+;; Copyright (C) 2000-2001 Espen S. Johnsen <esj@stud.cs.uit.no>
 ;;
 ;; This library is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU Lesser General Public
@@ -15,631 +15,334 @@
 ;; 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: gtype.lisp,v 1.4 2000-09-04 22:04:24 espen Exp $
+;; $Id: gtype.lisp,v 1.19 2004-11-07 01:21:04 espen Exp $
 
 (in-package "GLIB")
 
 (use-prefix "g")
 
-
-;;;; 
+;; Initialize the glib type system
+(defbinding type-init () nil)
+(type-init)
 
 (deftype type-number () '(unsigned 32))
 
-(define-foreign ("g_type_name" alien-type-name) (type) (static string)
-  ((find-type-number type) type-number))
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (defclass type-query (struct)
+    ((type-number :allocation :alien :type type-number)
+     (name :allocation :alien :type string)
+     (class-size :allocation :alien :type unsigned-int)
+     (instance-size :allocation :alien :type unsigned-int))
+    (:metaclass struct-class)))
 
-(define-foreign %type-from-name () type-number
-  (name string))
 
-;(define-foreign type-parent () type-number
-;  (type type-number))
+(defbinding %type-query () nil
+  (type type-number)
+  (query type-query))
+
+(defun type-query (type)
+  (let ((query (make-instance 'type-query)))
+    (%type-query (find-type-number type t) query)
+    query))
 
-(define-foreign type-instance-size (type) int
-  ((find-type-number type) type-number))
+(defun type-instance-size (type)
+  (slot-value (type-query type) 'instance-size))
 
-(define-foreign type-create-instance (type) pointer
-  ((find-type-number type) type-number))
+(defun type-class-size (type)
+  (slot-value (type-query type) 'class-size))
 
-(define-foreign type-free-instance () nil
-  (instance pointer))
+(defbinding type-class-ref (type) pointer
+  ((find-type-number type t) type-number))
 
+(defbinding type-class-unref (type) nil
+  ((find-type-number type t) type-number))
+
+(defbinding type-class-peek (type) pointer
+  ((find-type-number type t) type-number))
+
+
+;;;; Mapping between lisp types and glib types
 
 (defvar *type-to-number-hash* (make-hash-table))
 (defvar *number-to-type-hash* (make-hash-table))
 
-(defun type-number-from-alien-name (name &optional (error t))
-  (if (string= name "invalid")
-      0
-    (let ((type-number (%type-from-name name)))
-      (cond
-       ((and (zerop type-number) error)
-	(error "Invalid alien type name: ~A" name))
-       ((zerop type-number) nil)
-       (t type-number)))))
-
-(defun (setf alien-type-name) (alien-name type)
-  (let ((type-name (ensure-type-name type))
-	(type-number (type-number-from-alien-name alien-name)))
-    (setf (gethash type-number *number-to-type-hash*) type-name)
-    (setf (gethash type-name *type-to-number-hash*) type-number)))
-
-(defun (setf find-type-number) (type-number type)
-  (setf (gethash (ensure-type-name type) *type-to-number-hash*) type-number))
-
-(defun find-type-number (type)
+(defun register-type (type id)
+  (let ((type-number
+	 (etypecase id
+	   (integer id)
+	   (string (find-type-number id t))
+	   (symbol (gethash id *type-to-number-hash*)))))
+    (setf (gethash type *type-to-number-hash*) type-number)
+    (unless (symbolp id)
+      (setf (gethash type-number *number-to-type-hash*) type))
+    type-number))
+
+(defbinding %type-from-name () type-number
+  (name string))
+
+(defun find-type-number (type &optional error)
   (etypecase type
     (integer type)
-    (symbol (gethash type *type-to-number-hash*))
-    (pcl::class (gethash (class-name type) *type-to-number-hash*))))
+    (string
+     (let ((type-number (%type-from-name type)))
+       (cond
+	((and (zerop type-number) error)
+	 (error "Invalid gtype name: ~A" type))
+	((zerop type-number) nil)
+	(t type-number))))
+    (symbol
+     (let ((type-number (gethash type *type-to-number-hash*)))
+       (or
+	type-number
+	(and error (error "Type not registered: ~A" type)))))
+    (pcl::class (find-type-number (class-name type) error))))
  
-(defun type-from-number (type-number)
-  (gethash type-number *number-to-type-hash*))
+(defun type-from-number (type-number &optional error)
+  (multiple-value-bind (type found)
+      (gethash type-number *number-to-type-hash*)
+    (when (and error (not found))
+      (let ((name (find-type-name type-number)))
+	(if name
+	    (error "Type number not registered: ~A (~A)" type-number name)
+	  (error "Invalid type number: ~A" type-number))))
+    type))
+
+(defun type-from-name (name)
+  (etypecase name
+    (string (type-from-number (find-type-number name t)))))
+
+(defbinding (find-type-name "g_type_name") (type) string
+  ((find-type-number type t) type-number))
 
 (defun type-number-of (object)
-  (find-type-number (type-of object)))
-
-
-
-;;;; Superclass for all metaclasses implementing some sort of virtual slots
+  (find-type-number (type-of object) t))
+
+(defun init-type (init)
+  (mapc
+   #'(lambda (fname)
+       (funcall (mkbinding fname 'type-number)))
+   (mklist init)))
+
+(defun %init-types-in-library (pathname prefix ignore)
+  (let ((process (ext:run-program
+		  "nm" (list "-D" (namestring (truename pathname)))
+		  :output :stream :wait nil))
+	(fnames ()))
+    (labels ((read-symbols ()
+	       (let ((line (read-line (ext:process-output process) nil)))
+		 (when line
+		   (let ((symbol (subseq line 11)))
+		     (when (and
+			    (> (length symbol) (length prefix))
+			    (string= prefix symbol :end2 (length prefix))
+			    (search "_get_type" symbol)
+			    (not (member symbol ignore :test #'string=)))
+		       (push symbol fnames)))
+		   (read-symbols)))))
+      (read-symbols)
+      (ext:process-close process)
+      `(init-type ',fnames))))
+
+(defmacro init-types-in-library (filename &key (prefix "") ignore)
+  (%init-types-in-library filename prefix ignore))
+
+
+
+;;;; Superclass for wrapping types in the glib type system
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
-  (defclass virtual-class (pcl::standard-class))
+  (defclass ginstance (proxy)
+    ((class :allocation :alien :type pointer))
+    (:metaclass proxy-class)))
 
-  (defclass direct-virtual-slot-definition (standard-direct-slot-definition)
-    ((location
-      :reader slot-definition-location
-      :initarg :location)))
-  
-  (defclass effective-virtual-slot-definition
-    (standard-effective-slot-definition)))
-  
-
-(defmethod direct-slot-definition-class ((class virtual-class) initargs)
-  (if (eq (getf initargs :allocation) :virtual)
-      (find-class 'direct-virtual-slot-definition)
-    (call-next-method)))
-
-
-(defmethod effective-slot-definition-class ((class virtual-class) initargs)
-  (if (eq (getf initargs :allocation) :virtual)
-      (find-class 'effective-virtual-slot-definition)
-    (call-next-method)))
-
-
-(defun %direct-slot-definitions-slot-value (slotds slot &optional default)
-  (let ((slotd
-	 (find-if
-	  #'(lambda (slotd)
-	      (and
-	       (slot-exists-p slotd slot)
-	       (slot-boundp slotd slot)))
-	  slotds)))
-    (if slotd
-	(slot-value slotd slot)
-      default)))
-  
-
-(defgeneric compute-virtual-slot-location (class slotd direct-slotds))
-
-(defmethod compute-virtual-slot-location
-    ((class virtual-class)
-     (slotd effective-virtual-slot-definition)
-     direct-slotds)
-    (let ((location
-	   (%direct-slot-definitions-slot-value direct-slotds 'location)))
-      (if (and location (symbolp location))
-	  (list location `(setf ,location))
-	location)))
-
-
-(defmethod compute-effective-slot-definition
-    ((class virtual-class) direct-slotds)
-  (let ((slotd (call-next-method)))
-    (when (typep slotd 'effective-virtual-slot-definition)
-      (setf
-       (slot-value slotd 'pcl::location)
-       (compute-virtual-slot-location class slotd direct-slotds)))
-    slotd))
-
-
-(defmethod slot-value-using-class
-    ((class virtual-class) (object standard-object)
-     (slotd effective-virtual-slot-definition))
-  (let ((reader (first (slot-definition-location slotd))))
-    (if reader
-	(funcall reader object)
-      (slot-unbound class object (slot-definition-name slotd)))))
-
-
-(defmethod slot-boundp-using-class
-    ((class virtual-class) (object standard-object)
-     (slotd effective-virtual-slot-definition))
-   (and (first (slot-definition-location slotd)) t))
-    
-
-
-(defmethod (setf slot-value-using-class)
-    (value (class virtual-class) (object standard-object)
-     (slotd effective-virtual-slot-definition))
-  (let ((writer (second (slot-definition-location slotd))))
-    (cond
-     ((null writer)
-      (error
-       "Can't set read-only slot ~A in ~A"
-       (slot-definition-name slotd)
-       object))
-     ((or (functionp writer) (symbolp writer))
-      (funcall writer value object)
-      object)
-     (t
-      (funcall (fdefinition writer) value object)
-      object))))
-	
-
-(defmethod validate-superclass
-    ((class virtual-class) (super pcl::standard-class))
-  t)
+(defun %type-of-ginstance (location)
+  (let ((class (sap-ref-sap location 0)))
+    (type-from-number (sap-ref-32 class 0))))
 
+(defmethod ensure-proxy-instance ((class ginstance-class) location)
+  (declare (ignore class))
+  (let ((class (find-class (%type-of-ginstance location))))
+    (if class
+	(make-instance class :location (reference-foreign class location))
+      ;; TODO: (make-instance 'ginstance ...)
+      location)))
 
 
-;;;; Superclass for wrapping of C structures
+;;;; Metaclass for subclasses of ginstance
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
-  (defclass alien-instance ()
-    ((location
-      :reader alien-instance-location
-      :type system-area-pointer)))
-
-  (defgeneric allocate-alien-storage (class))
-  (defgeneric reference-instance (object))
-  (defgeneric unreference-instance (object))
-  (defgeneric from-alien-initialize-instance (object &rest initargs))
-  (defgeneric instance-finalizer (object)))
-
+  (defclass ginstance-class (proxy-class)
+    ()))
 
-(internal *instance-cache*)
-(defvar *instance-cache* (make-hash-table :test #'eql))
 
-(defun cache-instance (object)
-  (setf
-   (gethash (system:sap-int (alien-instance-location object)) *instance-cache*)
-   (ext:make-weak-pointer object)))
+(defmethod shared-initialize ((class ginstance-class) names
+			      &rest initargs &key name alien-name)
+  (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)
+    (if (getf initargs :size)
+	(call-next-method)
+      (let ((size (type-instance-size type-number)))
+	(apply #'call-next-method class names :size (list size) initargs)))))
 
-(defun find-cached-instance (location)
-  (let ((ref (gethash (system:sap-int location) *instance-cache*)))
-    (when ref
-      (ext:weak-pointer-value ref))))
 
-(defun remove-cached-instance (location)
-  (remhash (system:sap-int location) *instance-cache*))
+(defmethod validate-superclass ((class ginstance-class) (super standard-class))
+  (subtypep (class-name super) 'ginstance))
 
 
-(defmethod initialize-instance :before ((instance alien-instance)
-					&rest initargs &key)
-  (declare (ignore initargs))
-  (setf
-   (slot-value instance 'location)
-   (allocate-alien-storage (class-of instance)))
-  (cache-instance instance)
-  (ext:finalize instance (instance-finalizer instance)))
+;;;; Registering fundamental types
 
+(register-type 'pointer "gpointer")
+(register-type 'char "gchar")
+(register-type 'unsigned-char "guchar")
+(register-type 'boolean "gboolean")
+(register-type 'fixnum "gint")
+(register-type 'int "gint")
+(register-type 'unsigned-int "guint")
+(register-type 'long "glong")
+(register-type 'unsigned-long "gulong")
+(register-type 'single-float "gfloat")
+(register-type 'double-float "gdouble")
+(register-type 'string "gchararray")
 
-(defmethod from-alien-initialize-instance ((instance alien-instance)
-					   &rest initargs &key location)
-  (declare (ignore initargs))
-  (setf (slot-value instance 'location) location)
-  (cache-instance instance))
 
+;;;; 
 
-(deftype-method translate-type-spec alien-instance (type-spec)
-  (declare (ignore type-spec))
-  (translate-type-spec 'pointer))
-
-(deftype-method size-of alien-instance (type-spec)
-  (declare (ignore type-spec))
-  (size-of 'pointer))
+(defvar *derivable-type-info* (make-hash-table))
 
+(defun register-derivable-type (type id expander)
+  (register-type type id)
+  (let ((type-number (register-type type id)))
+    (setf (gethash type-number *derivable-type-info*) expander)))
 
+(defun find-type-info (type)
+  (dolist (super (cdr (type-hierarchy type)))
+    (let ((info (gethash super *derivable-type-info*)))
+      (return-if info))))
 
-;;;; Metaclass used for subclasses of alien-instance
+(defun expand-type-definition (type options)
+  (let ((expander (find-type-info type)))
+    (funcall expander (find-type-number type t) options)))
 
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  (defclass alien-class (virtual-class)
-    ((size
-      :reader alien-class-size)))
-
-  (defclass direct-alien-slot-definition (direct-virtual-slot-definition)
-    ((allocation
-      :initform :alien)
-     (offset
-      :reader slot-definition-offset
-      :initarg :offset
-      :initform 0)))
-  
-  (defclass effective-alien-slot-definition (effective-virtual-slot-definition)
-    ((offset
-      :reader slot-definition-offset)))
-  
-  (defclass effective-virtual-alien-slot-definition
-    (effective-virtual-slot-definition))
- 
+(defbinding type-parent (type) type-number
+  ((find-type-number type t) type-number))
 
-  (defmethod alien-class-superclass ((class alien-class))
-    (find-if
-     #'(lambda (class)
-	 (subtypep (class-name class) 'alien-instance))
-     (pcl::class-direct-superclasses class)))
+(defun supertype (type)
+  (type-from-number (type-parent type)))
 
+(defbinding %type-interfaces (type) pointer
+  ((find-type-number type t) type-number)
+  (n-interfaces unsigned-int :out))
 
-  (defmethod shared-initialize ((class alien-class) names
-				&rest initargs &key size alien-name name)
-    (declare (ignore initargs))
-    (call-next-method)
+(defun type-interfaces (type)
+  (multiple-value-bind (array length) (%type-interfaces type)
+    (unwind-protect
+	(map-c-vector 'list #'identity array 'type-number length)
+      (deallocate-memory array))))
 
-    (when alien-name
-      (setf (alien-type-name (or name (class-name class))) (first alien-name)))
-    (when size
-      (setf (slot-value class 'size) (first size))))
-    
+(defun implements (type)
+  (mapcar #'type-from-number (type-interfaces type)))
 
-  (defmethod shared-initialize :after ((class alien-class) names
-				       &rest initargs &key)
-    (declare (ignore initargs names))
-    (let* ((super (alien-class-superclass class))
-	   (actual-size
-	    (if (eq (class-name super) 'alien-instance)
-		0
-	      (alien-class-size super))))
-      (dolist (slotd (class-slots class))
-	(when (eq (slot-definition-allocation slotd) :alien)
-	  (with-slots (offset type) slotd
-	    (setq actual-size (max actual-size (+ offset (size-of type)))))))
-      (cond
-       ((not (slot-boundp class 'size))
-	(setf (slot-value class 'size) actual-size))
-       ((> actual-size (slot-value class 'size))
-	(warn "The actual size of class ~A is lager than specified" class)))))
-
-
-  (defmethod direct-slot-definition-class ((class alien-class) initargs)
-    (case (getf initargs :allocation)
-      ((nil :alien) (find-class 'direct-alien-slot-definition))
-;      (:instance (error "Allocation :instance not allowed in class ~A" class))
-      (t (call-next-method))))
-
-
-  (defmethod effective-slot-definition-class ((class alien-class) initargs)
-    (case (getf initargs :allocation)
-      (:alien (find-class 'effective-alien-slot-definition))
-      (:virtual (find-class 'effective-virtual-alien-slot-definition))
-      (t (call-next-method))))
-  
+(defun type-hierarchy (type)
+  (let ((type-number (find-type-number type t)))
+    (unless (= type-number 0)
+      (cons type-number (type-hierarchy (type-parent type-number))))))
   
-  (defmethod compute-virtual-slot-location
-      ((class alien-class) (slotd effective-alien-slot-definition)
-       direct-slotds)
-    (with-slots (offset type) slotd
-      (setf offset (%direct-slot-definitions-slot-value direct-slotds 'offset))
-      (let ((reader (get-reader-function type))
-	    (writer (get-writer-function type))
-	    (destroy (get-destroy-function type)))
-	(list
-	 #'(lambda (object)
-	     (funcall reader (alien-instance-location object) offset))
-	 #'(lambda (value object)
-	     (let ((location (alien-instance-location object)))
-	       (funcall destroy location offset)
-	       (funcall writer value location offset)))))))
-	     
-  
-  (defmethod compute-virtual-slot-location
-      ((class alien-class)
-       (slotd effective-virtual-alien-slot-definition)
-       direct-slotds)
-    (let ((location (call-next-method)))
-      (if (or (stringp location) (consp location))
-	  (destructuring-bind (reader &optional writer) (mklist location)
-	    (with-slots (type) slotd
-              (list
-	       (if (stringp reader)
-		   (let* ((alien-type (translate-type-spec type))
-			  (alien
-			   (alien::%heap-alien
-			    (alien::make-heap-alien-info
-			     :type (alien::parse-alien-type
-				    `(function ,alien-type system-area-pointer))
-			     :sap-form (system:foreign-symbol-address reader))))
-			  (from-alien (get-from-alien-function type)))
-		     #'(lambda (object)
-			 (funcall
-			  from-alien
-			  (alien-funcall
-			   alien (alien-instance-location object)))))
-		 reader)
-	       (if (stringp writer)
-		   (let* ((alien-type (translate-type-spec type))
-			  (alien
-			   (alien::%heap-alien
-			    (alien::make-heap-alien-info
-			     :type (alien::parse-alien-type
-				    `(function
-				      void system-area-pointer ,alien-type))
-			     :sap-form (system:foreign-symbol-address writer))))
-			  (to-alien (get-to-alien-function type))
-			  (cleanup  (get-cleanup-function type)))
-		     #'(lambda (value object)
-			 (let ((alien-value (funcall to-alien value))
-			       (location (alien-instance-location object)))
-			   (alien-funcall alien location alien-value)
-			   (funcall cleanup alien-value))))
-		 writer))))
-	location)))
-
-
-  (defmethod compute-slots ((class alien-class))
-    ;; Translating the user supplied relative (to previous slot) offsets
-    ;; to absolute offsets.
-    ;; This code is broken and have to be fixed for real use.
-    (with-slots (direct-slots) class
-      (let* ((super (alien-class-superclass class))
-	     (slot-offset
-	      (if (eq (class-name super) 'alien-instance)
-		  0
-		(alien-class-size super))))
-	(dolist (slotd direct-slots)
-	  (when (eq (slot-definition-allocation slotd) :alien)
-	    (with-slots (offset type) slotd
-	      (setf
-	       offset (+ slot-offset offset)
-	       slot-offset (+ offset (size-of type)))))))
+(defbinding (type-is-p "g_type_is_a") (type super) boolean
+  ((find-type-number type) type-number)
+  ((find-type-number super) type-number))
+
+(defbinding %type-children () pointer
+  (type-number type-number)
+  (num-children unsigned-int :out))
+
+(defun map-subtypes (function type &optional prefix)
+  (let ((type-number (find-type-number type t)))
+    (multiple-value-bind (array length) (%type-children type-number)
+      (unwind-protect
+	  (map-c-vector
+	   'nil
+	   #'(lambda (type-number)
+	       (when (or
+		      (not prefix)
+		      (string-prefix-p prefix (find-type-name type-number)))
+		 (funcall function type-number))
+	       (map-subtypes function type-number prefix))
+	   array 'type-number length)
+	(deallocate-memory array)))))
+
+(defun find-types (prefix)
+  (let ((type-list nil))
+    (maphash
+     #'(lambda (type-number expander)
+	 (declare (ignore expander))
+	 (map-subtypes
+	  #'(lambda (type-number)
+	      (pushnew type-number type-list))
+	  type-number prefix))
+     *derivable-type-info*)
+    type-list))
+
+(defun %sort-types-topologicaly (unsorted)
+  (let ((sorted ()))
+    (loop while unsorted do
+      (dolist (type unsorted)
+	(let ((dependencies
+	       (append (rest (type-hierarchy type)) (type-interfaces type))))
+	  (cond
+	   ((null dependencies)
+	    (push type sorted)
+	    (setq unsorted (delete type unsorted)))
+	   (t
+	    (unless (dolist (dep dependencies)
+		      (when (find type (rest (type-hierarchy dep)))
+			(error "Cyclic type dependencie"))
+		      (return-if (find dep unsorted)))
+	      (push type sorted)
+	      (setq unsorted (delete type unsorted))))))))
+    (nreverse sorted)))
+
+
+(defun expand-type-definitions (prefix &optional args)
+ (flet ((type-options (type-number)
+	   (let ((name (find-type-name type-number)))
+	     (cdr (assoc name args :test #'string=)))))
+
+   (let ((type-list
+	  (delete-if
+	   #'(lambda (type-number)
+	       (let ((name (find-type-name type-number)))
+		 (or
+		  (getf (type-options type-number) :ignore)
+		  (find-if
+		   #'(lambda (options)
+		       (and
+			(string-prefix-p (first options) name)
+			(getf (cdr options) :ignore-prefix)
+			(not (some
+			      #'(lambda (exception)
+				  (string= name exception))
+			      (getf (cdr options) :except)))))
+		   args))))
+	   (find-types prefix))))
+             
+     (dolist (type-number type-list)
+       (let ((name (find-type-name type-number)))
+	 (register-type
+	  (getf (type-options type-number) :type (default-type-name name))
+	  type-number)))
     
-      ;; Reverse the direct slot definitions so the effective slots
-      ;; will be in correct order.
-      (setf direct-slots (reverse direct-slots))
-      ;; This nreverse caused me so much frustration that I leave it
-      ;; here just as a reminder of what not to do.
-;      (setf direct-slots (nreverse direct-slots))
-      )
-    (call-next-method))
-
-
-  (defmethod validate-superclass ((class alien-class)
-				  (super pcl::standard-class))
-     (subtypep (class-name super) 'alien-instance))
-
-  (defgeneric make-instance-from-alien (class location &rest initargs &key)))
-
-(defmethod make-instance-from-alien ((class symbol) location
-				     &rest initargs &key)
-  (apply #'make-instance-from-alien (find-class class) location initargs))
-
-(defmethod make-instance-from-alien ((class alien-class) location
-				     &rest initargs &key)
-  (let ((instance (allocate-instance class)))
-    (apply
-     #'from-alien-initialize-instance
-     instance :location location initargs)
-    instance))
-
-(defun ensure-alien-instance (class location &rest initargs)
-  (or
-   (find-cached-instance location)
-   (apply #'make-instance-from-alien class location initargs)))
-
-(defmethod allocate-alien-storage ((class alien-class))
-  (allocate-memory (alien-class-size class)))
-
-
-
-;;;; Superclass for wrapping structures with reference counting
-
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  (defclass alien-object (alien-instance)
-    ()
-    (:metaclass alien-class)
-    (:size 0)))
-
-(define-type-method-fun alien-ref (type-spec))
-(define-type-method-fun alien-unref (type-spec))
-
-(defmethod from-alien-initialize-instance ((object alien-object)
-					   &rest initargs &key)
-  (declare (ignore initargs))
-  (call-next-method)
-  (reference-instance object))
-
-(defmethod instance-finalizer ((object alien-object))
-  (let ((location (alien-instance-location object))
-	(unref (fdefinition (alien-unref (class-of object)))))
-    (declare (type system-area-pointer location) (type function unref))
-    #'(lambda ()
-	(remove-cached-instance location)
-	(funcall unref location))))
-
-(defmethod reference-instance ((object alien-object))
-  (funcall (alien-ref (class-of object)) object)
-  object)
-
-(defmethod unreference-instance ((object alien-object))
-  (funcall (alien-unref (class-of object)) object)
-  nil)
-
-(deftype-method translate-to-alien
-    alien-object (type-spec object &optional copy)
-  (if copy
-      `(,(alien-ref type-spec) ,object)
-    `(alien-instance-location ,object)))
-
-(deftype-method translate-from-alien
-    alien-object (type-spec location &optional alloc)
-  ;; Reference counted objects are always treated as if alloc were :reference
-  (declare (ignore alloc)) 
-  `(let ((location ,location))
-     (unless (null-pointer-p location)
-       (ensure-alien-instance ',type-spec location))))
-
-(deftype-method
-    cleanup-alien alien-object (type-spec sap &optional copied)
-  (when copied
-    `(let ((sap ,sap))
-       (unless (null-pointer-p sap)
-	 (,(alien-unref type-spec) sap)))))
-
-
-
-;;;; Superclass for wrapping of non-refcounted structures
-
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  (defclass alien-structure (alien-instance)
-    ((static
-      :allocation :instance
-      :reader alien-structure-static-p
-      :initform nil
-      :type boolean))
-    (:metaclass alien-class)
-    (:size 0)))
-
-(define-type-method-fun alien-copier (type-spec))
-(define-type-method-fun alien-deallocator (type-spec))
-
-(defmethod from-alien-initialize-instance ((structure alien-structure)
-					   &rest initargs &key static)
-  (declare (ignore initargs))
-  (call-next-method)
-  (setf (slot-value structure 'static) static))
-
-(defmethod instance-finalizer ((structure alien-structure))
-  (let ((location (alien-instance-location structure)))
-    (declare (type system-area-pointer location))
-    (if (alien-structure-static-p structure)
-	#'(lambda ()
-	    (remove-cached-instance location))
-      (let ((deallocator
-	     (fdefinition (alien-deallocator (class-of structure)))))
-	(declare (type function deallocator))
-	#'(lambda ()
-	    (remove-cached-instance location)
-	    (funcall deallocator location))))))
-
-
-(deftype-method alien-copier alien-structure (type-spec)
-  (declare (ignore type-spec))
-  'copy-memory)
-
-(deftype-method alien-deallocator alien-structure (type-spec)
-  (declare (ignore type-spec))
-  'deallocate-memory)
-
-(deftype-method translate-to-alien
-    alien-structure (type-spec object &optional copy)
-  `(let ((object ,object))
-     (if (and ,copy (not (alien-structure-static-p object)))
-	 (,(alien-copier type-spec)
-	  `(alien-instance-location object)
-	  ,(alien-class-size (find-class type-spec)))
-       (alien-instance-location object))))
-
-(deftype-method translate-from-alien
-    alien-structure (type-spec location &optional (alloc :reference))
-  `(let ((location ,location))
-     (unless (null-pointer-p location)
-       ,(ecase alloc
-	  (:copy `(ensure-alien-instance ',type-spec location))
-	  (:static `(ensure-alien-instance ',type-spec location :static t))
-	  (:reference
-	   `(ensure-alien-instance
-	     ',type-spec
-	     `(,(alien-copier type-spec)
-	       location ,(alien-class-size (find-class type-spec)))))))))
-
-(deftype-method cleanup-alien alien-structure (type-spec sap &optional copied)
-  (when copied
-    `(let ((sap ,sap))
-       (unless (or
-		(null-pointer-p sap)
-		(alien-structure-static-p (find-cached-instance sap)))
-	 (,(alien-deallocator type-spec) sap)))))
-
-
-
-;;;; Superclass for static structures such as gdk:visual
-
-(defclass static-structure (alien-structure)
-  ()
-  (:metaclass alien-class)
-  (:size 0))
-
-
-(defmethod from-alien-initialize-instance ((structure alien-structure)
-				      &rest initargs)
-  (declare (ignore initargs))
-  (call-next-method)
-  (setf (slot-value structure 'static) t))
-
-
-
-;;;; Superclass wrapping types in the glib type system
-
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  (defclass gtype (alien-object)
-    ()
-    (:metaclass alien-class)
-    (:size 4 #|(size-of 'pointer)|#)))
-
-
-(defun %alien-instance-type-number (location)
-  (let ((class (sap-ref-sap location 0)))
-    (sap-ref-unsigned class 0)))
-
-
-(deftype-method translate-from-alien gtype (type-spec location &optional alloc)
-  (declare (ignore type-spec alloc))
-  `(let ((location ,location))
-     (unless (null-pointer-p location)
-       (ensure-alien-instance
-	(type-from-number (%alien-instance-type-number location))
-	location))))
-
-
-
-;;;; Metaclass for subclasses of gtype-class
-
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  (defclass gtype-class (alien-class)))
-
-
-(defmethod shared-initialize ((class gtype-class) names
-			      &rest initargs &key name)
-  (declare (ignore initargs names))
-  (call-next-method)
-  (setf
-   (slot-value class 'size)
-   (type-instance-size (find-type-number (or name (class-name class))))))
-
-
-(defmethod validate-superclass
-    ((class gtype-class) (super pcl::standard-class))
-  (subtypep (class-name super) 'gtype))
-
+     `(progn
+	,@(mapcar
+	   #'(lambda (type)
+	       (expand-type-definition type (type-options type)))
+	   (%sort-types-topologicaly type-list))))))
 
-(defmethod allocate-alien-storage ((class gtype-class))
-  (type-create-instance (find-type-number class)))
+(defmacro define-types-by-introspection (prefix &rest args)
+  (expand-type-definitions prefix args))
 
 
-;;;; Initializing type numbers
 
-(setf (alien-type-name 'invalid) "invalid")
-(setf (alien-type-name 'char) "gchar")
-(setf (alien-type-name 'unsigned-char) "guchar")
-(setf (alien-type-name 'boolean) "gboolean")
-(setf (alien-type-name 'int) "gint")
-(setf (alien-type-name 'unsigned-int) "guint")
-(setf (alien-type-name 'long) "glong")
-(setf (alien-type-name 'unsigned-long) "gulong")
-(setf (alien-type-name 'enum) "GEnum")
-(setf (alien-type-name 'flags) "GFlags")
-(setf (alien-type-name 'single-float) "gfloat")
-(setf (alien-type-name 'double-float) "gdouble")
-(setf (alien-type-name 'string) "gstring")
-(setf (find-type-number 'fixnum) (find-type-number 'int))