X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/cd859052dc7a17bbfa93df3c31b79fe730194047..4769576f381e72d2bc169a23e33b1c897f59e6e7:/glib/gtype.lisp

diff --git a/glib/gtype.lisp b/glib/gtype.lisp
index f4a3d60..add9c8e 100644
--- a/glib/gtype.lisp
+++ b/glib/gtype.lisp
@@ -1,5 +1,5 @@
 ;; Common Lisp bindings for GTK+ v2.x
-;; Copyright 2000-2005 Espen S. Johnsen <espen@users.sf.net>
+;; Copyright 2000-2006 Espen S. Johnsen <espen@users.sf.net>
 ;;
 ;; Permission is hereby granted, free of charge, to any person obtaining
 ;; a copy of this software and associated documentation files (the
@@ -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: gtype.lisp,v 1.36 2006-02-01 22:48:39 espen Exp $
+;; $Id: gtype.lisp,v 1.69 2009-02-10 15:16:34 espen Exp $
 
 (in-package "GLIB")
 
@@ -30,44 +30,49 @@ (use-prefix "g")
 (defbinding type-init () nil)
 (type-init)
 
-(deftype type-number () '(unsigned 32))
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (defbinding (bitsize-of-gtype "bitsize_of_gtype") () unsigned-int))
+
+(deftype type-number () `(unsigned-byte ,(bitsize-of-gtype)))
 
 (deftype gtype () 'symbol)
 
-(defmethod alien-type ((type (eql 'gtype)) &rest args)
-  (declare (ignore type args))
+(define-type-method alien-type ((type gtype))
+  (declare (ignore type))
   (alien-type 'type-number))
 
-(defmethod size-of ((type (eql 'gtype)) &rest args)
-  (declare (ignore type args))
+(define-type-method size-of ((type gtype) &key (inlined t))
+  (assert-inlined type inlined)
   (size-of 'type-number))
 
-(defmethod to-alien-form (gtype (type (eql 'gtype)) &rest args)
-  (declare (ignore type args))
+(define-type-method to-alien-form ((type gtype) gtype &optional copy-p)
+  (declare (ignore type copy-p))
   `(find-type-number ,gtype t)) 
 
-(defmethod to-alien-function ((type (eql 'gtype)) &rest args)
-  (declare (ignore type args))
+(define-type-method to-alien-function ((type gtype) &optional copy-p)
+  (declare (ignore type copy-p))
   #'(lambda (gtype)
       (find-type-number gtype t)))
 
-(defmethod from-alien-form (type-number (type (eql 'gtype)) &rest args)
-  (declare (ignore type args))
-  `(type-from-number ,type-number)) 
+(define-type-method from-alien-form ((type gtype) form &key ref)
+  (declare (ignore type ref))
+  `(type-from-number ,form))
 
-(defmethod from-alien-function ((type (eql 'gtype)) &rest args)
-  (declare (ignore type args))
+(define-type-method from-alien-function ((type gtype) &key ref)
+  (declare (ignore type ref))
   #'(lambda (type-number)
       (type-from-number type-number)))
 
-(defmethod writer-function ((type (eql 'gtype)) &rest args)
-  (declare (ignore type args))
+(define-type-method writer-function ((type gtype) &key temp (inlined t))
+  (declare (ignore temp))
+  (assert-inlined type inlined)
   (let ((writer (writer-function 'type-number)))
     #'(lambda (gtype location &optional (offset 0))
 	(funcall writer (find-type-number gtype t) location offset))))
 
-(defmethod reader-function ((type (eql 'gtype)) &rest args)
-  (declare (ignore type args))
+(define-type-method reader-function ((type gtype) &key ref (inlined t))
+  (declare (ignore ref))
+  (assert-inlined type inlined)
   (let ((reader (reader-function 'type-number)))
     #'(lambda (location &optional (offset 0))
 	(type-from-number (funcall reader location offset)))))
@@ -76,7 +81,7 @@ (defmethod reader-function ((type (eql 'gtype)) &rest args)
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defclass type-query (struct)
     ((type-number :allocation :alien :type type-number)
-     (name :allocation :alien :type string)
+     (name :allocation :alien :type (copy-of string))
      (class-size :allocation :alien :type unsigned-int)
      (instance-size :allocation :alien :type unsigned-int))
     (:metaclass struct-class)))
@@ -84,7 +89,7 @@   (defclass type-query (struct)
 
 (defbinding type-query (type) nil
   ((find-type-number type t) type-number)
-  ((make-instance 'type-query) type-query :return))
+  ((make-instance 'type-query) type-query :in/return))
 
 (defun type-instance-size (type)
   (slot-value (type-query type) 'instance-size))
@@ -95,17 +100,19 @@ (defun type-class-size (type)
 (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-unref () nil
+  (class pointer))
 
 (defbinding type-class-peek (type) pointer
   ((find-type-number type t) type-number))
 
 
+
 ;;;; Mapping between lisp types and glib types
 
 (defvar *registered-types* ())
 (defvar *registered-type-aliases* ())
+(defvar *registered-static-types* ())
 (defvar *lisp-type-to-type-number* (make-hash-table))
 (defvar *type-number-to-lisp-type* (make-hash-table))
 
@@ -118,15 +125,25 @@ (defun type-number-from-glib-name (name &optional (error-p t))
      ((not (zerop type-number)) type-number)
      (error-p (error "Invalid gtype name: ~A" name)))))
 
-(defun register-type (type id)
-  (pushnew (cons type id) *registered-types* :key #'car)
-  (let ((type-number 
-	 (typecase id
-	   (string (type-number-from-glib-name id))
-	   (symbol (funcall id)))))
-       (setf (gethash type *lisp-type-to-type-number*) type-number)
-       (setf (gethash type-number *type-number-to-lisp-type*) type)
-       type-number))
+(defun type-from-glib-name (name)
+  (type-from-number (type-number-from-glib-name name) t))
+
+(defun type-registered-p (type)
+  (nth-value 1 (gethash type *lisp-type-to-type-number*)))
+
+(defun register-type (type id &optional (error-p t))
+  (cond
+   ((type-registered-p type) (find-type-number type))
+   ((not id) (warn "Can't register type with no foreign id: ~A" type))
+   (t    
+    (pushnew (cons type id) *registered-types* :key #'car)
+    (let ((type-number 
+	   (typecase id
+	     (string (type-number-from-glib-name id error-p))
+	     (symbol (funcall id)))))
+      (setf (gethash type *lisp-type-to-type-number*) type-number)
+      (setf (gethash type-number *type-number-to-lisp-type*) type)
+      type-number))))
 
 (defun register-type-alias (type alias)
   (pushnew (cons type alias) *registered-type-aliases* :key #'car)
@@ -139,19 +156,20 @@ (defun reinitialize-all-types ()
   (clrhash *type-number-to-lisp-type*)
   (type-init) ; initialize the glib type system
   (mapc #'(lambda (type) 
-	    (register-type (car type) (cdr type)))
+	    (register-type (car type) (cdr type) nil))
 	*registered-types*)
+  (mapc #'(lambda (type) 
+	    (apply #'register-new-type type))
+	(reverse *registered-static-types*))
   (mapc #'(lambda (type) 
 	    (register-type-alias (car type) (cdr type)))
 	*registered-type-aliases*))
 
-(pushnew 'reinitialize-all-types 
-  #+cmu *after-save-initializations*
-  #+sbcl *init-hooks*)
-
 #+cmu
-(pushnew 'system::reinitialize-global-table ; we shouldn't have to do this?
- *after-save-initializations*)
+(asdf:install-init-hook 'system::reinitialize-global-table 
+ *after-save-initializations*) ; we shouldn't need to do this?
+(asdf:install-init-hook 'reinitialize-all-types)
+
 
 
 (defun find-type-number (type &optional error-p)
@@ -161,8 +179,13 @@ (defun find-type-number (type &optional error-p)
     (symbol
      (or
       (gethash type *lisp-type-to-type-number*)
+      (let ((class (find-class type nil)))
+	(when (and class (not (class-finalized-p class)))
+	  (finalize-inheritance class)
+	  (gethash type *lisp-type-to-type-number*)))
       (and error-p (error "Type not registered: ~A" type))))
-    (class (find-type-number (class-name type) error-p))))
+    (class 
+     (find-type-number (class-name type) error-p))))
  
 (defun type-from-number (type-number &optional error)
   (multiple-value-bind (type found)
@@ -186,45 +209,92 @@ (defbinding (find-foreign-type-name "g_type_name") (type) (copy-of string)
 (defun type-number-of (object)
   (find-type-number (type-of object) t))
 
+;; For #+(SBCL WIN32):
+;;   The first 2 lines of the output from "pexports" are:
+;;   LIBRARY XXX.dll
+;;   EXPORTS
+;;   We don't do anything to skip these 2 lines because they won't pass the
+;;   WHEN (AND ...) in the LOOP
+;;   - cph 19-May-2007
+
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defvar *type-initializers* ())
+
+  (defun library-filename (system library)
+  (let ((component (asdf:find-component (asdf:find-system system) library)))
+    (etypecase component
+      (asdf:shared-object 
+       (first (asdf:output-files (make-instance 'asdf:compile-op) component)))
+      (asdf:library (asdf:component-pathname component)))))
+
   (defun %find-types-in-library (pathname prefixes ignore)
-    (let ((process (run-program
-		    "/usr/bin/nm" (list "--defined-only" "-D" (namestring (truename pathname)))
-		    :output :stream :wait nil)))
+    (let ((outname (tmpname "types")))
       (unwind-protect
-	  (loop 
-	   as symbol = (let ((line (read-line (process-output process) nil)))
-			 (when line (subseq line 11)))			  
-	   while symbol
-	   when (and
-		 (> (length symbol) 9)
-		 (or 
-		  (not prefixes)
-		  (some #'(lambda (prefix)
-			    (and
-			     (> (length symbol) (length prefix))
-			     (string= prefix symbol :end2 (length prefix))))
-			(mklist prefixes)))
-		 (string= "_get_type" symbol :start2 (- (length symbol) 9))
-		 (not (member symbol ignore :test #'string=)))
-	   collect symbol)
-	(process-close process)))))
-
-
-(defmacro init-types-in-library (filename &key prefix ignore)
-  (let ((names (%find-types-in-library filename prefix ignore)))
+	  (let ((asdf::*verbose-out* nil))
+	    #-win32
+	    (asdf:run-shell-command "nm ~A ~A > ~A"
+	     #-darwin "--defined-only --dynamic --extern-only"
+	     #+darwin "-f -s __TEXT __text"
+	     (namestring (truename pathname)) outname)
+	    ;; Note about win32 port:
+	    ;;   1. (TRUENAME PATHNAME) will bomb.
+	    ;;   2. either
+	    ;;        pexports "d:\\whatever\\bin\\zlib1.dll"
+	    ;;      or
+	    ;;        pexports d:/whatever/bin/zlib1.dll
+	    ;;      anything else will bomb.  this is why ~S is used below.
+	    #+win32
+	    (asdf:run-shell-command "pexports ~S > ~A" 
+	     (namestring pathname) outname)
+
+	    (with-open-file (output outname)
+	      (loop 
+	       as line = (read-line output nil)
+	       as symbol = (when line
+			     #-win32
+			     (let ((pos (position #\space line :from-end t)))
+			       #-darwin(subseq line (1+ pos))
+			       #+darwin
+			       (when (char= (char line (1- pos)) #\T)
+				 (subseq line (+ pos 2))))
+			     #+win32
+			     (subseq line 0 (1- (length line))))
+	       while line
+	       when (and
+		     symbol (> (length symbol) 9)
+		     (not (char= (char symbol 0) #\_))
+		     (or 
+		      (not prefixes)
+		      (some #'(lambda (prefix)
+				(and
+				 (> (length symbol) (length prefix))
+				 (string= prefix symbol :end2 (length prefix))))
+		       (mklist prefixes)))
+		     (string= "_get_type" symbol :start2 (- (length symbol) 9))
+		     (not (member symbol ignore :test #'string=)))
+	       collect symbol)))
+	(delete-file outname)))))
+
+
+(defun car-eq-p (ob1 ob2)
+  (eq (car ob1) (car ob2)))
+
+(defmacro init-types-in-library (system library &key prefix ignore)
+  (let* ((filename (library-filename system library))
+	 (names (%find-types-in-library filename prefix ignore)))
     `(progn
-       ,@(mapcar #'(lambda (name)
-		     `(progn
-			(defbinding (,(intern name) ,name) () type-number)
-			(,(intern name))
-			(pushnew ',(intern name) *type-initializers*)))
-		 names))))
+       ,@(mapcar 
+	  #'(lambda (name)	      
+	      `(progn
+		 (defbinding (,(intern name) ,name) () type-number)
+		 (,(intern name))
+		 (pushnew (cons ',(intern name) ,filename) *type-initializers* 
+		  :test #'car-eq-p)))
+	  names))))
 
 (defun find-type-init-function (type-number)
   (loop
-   for type-init in *type-initializers*
+   for (type-init) in *type-initializers*
    when (= type-number (funcall type-init))
    do (return type-init)))
 
@@ -269,45 +339,68 @@ (defun register-new-type (type parent &optional foreign-name)
 	      parent-number
 	      (or foreign-name (default-alien-type-name type))
 	      (make-instance 'type-info :class-size class-size :instance-size instance-size))))
-       (setf (gethash type *lisp-type-to-type-number*) type-number)
-       (setf (gethash type-number *type-number-to-lisp-type*) type)
-       type-number))))
+	(pushnew (list type parent foreign-name) *registered-static-types* :key #'car)
+	(setf (gethash type *lisp-type-to-type-number*) type-number)
+	(setf (gethash type-number *type-number-to-lisp-type*) type)
+	type-number))))
 
 
 
 ;;;; Metaclass for subclasses of ginstance
 
+(defvar *referenced-ginstance-classes* ())
+
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defclass ginstance-class (proxy-class)
-    ((foreign-init))))
+    ((gtype :initarg :gtype :initform nil :reader ginstance-class-gtype))))
 
 
-(defmethod shared-initialize ((class ginstance-class) names &key name gtype)
-  (call-next-method)
-  (setf 
-   (slot-value class 'foreign-init) 
-   (or (first gtype) (default-type-init-name (or name (class-name class))))))
+(defun update-size (class)
+  (let ((type-number (find-type-number class)))
+    (cond
+     ((not (foreign-size-p class))
+      (setf (foreign-size class) (type-instance-size type-number)))
+     ((and 
+       (foreign-size-p class)
+       (not (= (type-instance-size type-number) (foreign-size class))))
+      (warn "Size mismatch for class ~A" class)))))
 
 
 (defmethod finalize-inheritance ((class ginstance-class))
+  (prog1
+      #+clisp(call-next-method)
+    (let* ((class-name (class-name class))
+	   (super (most-specific-proxy-superclass class))
+	   (gtype (or 
+		   (first (ginstance-class-gtype class))
+		   (default-alien-type-name class-name))))
+      (unless (type-registered-p class-name)
+	(type-class-ref
+	 (if (or (symbolp gtype) (type-number-from-glib-name gtype nil))
+	     (register-type class-name gtype)
+	   (register-new-type class-name (class-name super) gtype)))
+	(push class-name *referenced-ginstance-classes*))
+      #+nil
+      (when (and
+	     (supertype (find-type-number class))
+	     (not (eq (class-name super) (supertype (find-type-number class)))))
+	(warn "Super class mismatch between CLOS and GObject for ~A" 
+	      class-name)))
+    (update-size class))
+  #-clisp(call-next-method))
+
+(defun reinitialize-ginstance-classes ()
+  (mapc #'type-class-ref *referenced-ginstance-classes*))
+
+(asdf:install-init-hook 'reinitialize-ginstance-classes)
+
+
+
+(defmethod shared-initialize ((class ginstance-class) names &rest initargs)
+  (declare (ignore names initargs))
   (call-next-method)
-  (let* ((class-name (class-name class))
-	 (super (most-specific-proxy-superclass class))
-	 (foreign-init (slot-value class 'foreign-init))
-	 (type-number
-	  (or 
-	   (find-type-number class-name)
-	   (if (or 
-		(symbolp foreign-init)
-		(type-number-from-glib-name foreign-init nil))
-	       (register-type class-name foreign-init)
-	     (register-new-type class-name (class-name super) foreign-init)))))
-    (unless (eq (class-name super) (supertype type-number))
-      (warn "~A is the super type for ~A in the gobject type system."
-       (supertype type-number) class-name))
-
-    (unless (slot-boundp class 'size)
-      (setf (slot-value class 'size) (type-instance-size type-number)))))
+  (when (class-finalized-p class)
+    (update-size class)))
 
 
 (defmethod validate-superclass ((class ginstance-class) (super standard-class))
@@ -317,15 +410,23 @@ (defmethod validate-superclass ((class ginstance-class) (super standard-class))
 ;;;; Superclass for wrapping types in the glib type system
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
-  (defclass ginstance (proxy)
-    ((class :allocation :alien :type pointer))
-    (:metaclass proxy-class)))
+  (defclass ginstance (ref-counted-object)
+    (;(class :allocation :alien :type pointer :offset 0)
+     )
+    (:metaclass proxy-class)
+    (:size #.(size-of 'pointer))))
+
+(defun ref-type-number (location &optional offset)
+  (declare (ignore location offset)))
+
+(setf (symbol-function 'ref-type-number) (reader-function 'type-number))
 
 (defun %type-number-of-ginstance (location)
-  (let ((class (sap-ref-sap location 0)))
-    (sap-ref-32 class 0)))
+  (let ((class (ref-pointer location)))
+    (ref-type-number class)))
 
-(defmethod ensure-proxy-instance ((class ginstance-class) location)
+(defmethod make-proxy-instance :around ((class ginstance-class) location 
+					&rest initargs)
   (declare (ignore class))
   (let ((class (labels ((find-known-class (type-number)
 		          (or
@@ -333,23 +434,13 @@ (defmethod ensure-proxy-instance ((class ginstance-class) location)
 			   (unless (zerop type-number)
 			     (find-known-class (type-parent type-number))))))
 		 (find-known-class (%type-number-of-ginstance location)))))
+    ;; Note that changing the class argument must not alter "the
+    ;; ordered set of applicable methods" as specified in the
+    ;; Hyperspec
     (if class
-	(make-instance class :location (reference-foreign class location))
-      (error "Object at ~A has an unkown type number: ~A" 
-        location (%type-number-of-ginstance location)))))
-
-(defmethod copy-from-alien-form (location (class ginstance-class) &rest args)
-  (declare (ignore location class args))
-  (error "Doing copy-from-alien on a ref. counted class is most certainly an error, but if it really is what you want you should use REFERENCE-FOREIGN on the returned instance instead."))
-
-(defmethod copy-from-alien-function ((class ginstance-class) &rest args)
-  (declare (ignore class args))  
-  (error "Doing copy-from-alien on a ref. counted class is most certainly an error, but if it really is what you want you should use REFERENCE-FOREIGN on the returned instance instead."))
-
-(defmethod reader-function ((class ginstance-class) &rest args)
-  (declare (ignore args))
-  #'(lambda (location &optional (offset 0))
-      (ensure-proxy-instance class (sap-ref-sap location offset))))
+	(apply #'call-next-method class location initargs)
+      (error "Object at ~A has an unkown type number: ~A"
+       location (%type-number-of-ginstance location)))))
 
 
 ;;;; Registering fundamental types
@@ -367,8 +458,8 @@ (register-type 'long "glong")
 (register-type 'unsigned-long "gulong")
 (register-type 'single-float "gfloat")
 (register-type 'double-float "gdouble")
-(register-type 'pathname "gchararray")
 (register-type 'string "gchararray")
+(register-type-alias 'pathname 'string)
 
 
 ;;;; Introspection of type information
@@ -391,6 +482,7 @@ (defun expand-type-definition (type forward-p options)
   (let ((expander (first (find-type-info type))))
     (funcall expander (find-type-number type t) forward-p options)))
 
+
 (defbinding type-parent (type) type-number
   ((find-type-number type t) type-number))
 
@@ -450,88 +542,152 @@ (defun find-types (prefix)
      *derivable-type-info*)
     type-list))
 
-(defun find-type-dependencies (type)
-  (let ((list-dependencies (second (find-type-info type))))
-    (when list-dependencies
-      (funcall list-dependencies (find-type-number type t)))))
-
-(defun %sort-types-topologicaly (types)
-  (let ((partial-sorted
-	 (sort
-	  (mapcar 
-	   #'(lambda (type)
-	       (cons type (remove-if #'(lambda (dep)
-					 (not (find dep types)))
-				     (find-type-dependencies type))))
-	   types)
-	  #'(lambda (type1 type2) (type-is-p type2 type1)) :key #'car))
-	(sorted ()))
-
-    (loop
-     as tmp = partial-sorted then (or (rest tmp) partial-sorted)
-     while tmp
-     do (destructuring-bind (type . dependencies) (first tmp)
-	  (cond
-	   ((every #'(lambda (dep)
-		       (assoc dep sorted))
-		   dependencies)
-	    (push (cons type nil) sorted) ; no forward definition needed
-	    (setq partial-sorted (delete type partial-sorted :key #'first)))
-	   ((some #'(lambda (dep)
-		      (find type (find-type-dependencies dep)))
-		  dependencies)
-	    (push (cons type t) sorted) ; forward definition needed
-	    (setq partial-sorted (delete type partial-sorted :key #'first))))))
-    (nreverse sorted)))
-
-
-(defun expand-type-definitions (prefix &optional args)
+(defun find-type-dependencies (type &optional options)
+  (let ((find-dependencies (second (find-type-info type))))
+    (when find-dependencies
+      (remove-duplicates
+       (mapcar #'find-type-number
+        (funcall find-dependencies (find-type-number type t) options))))))
+
+
+;; The argument is a list where each elements is on the form 
+;; (type . dependencies). This function will not handle indirect
+;; dependencies and types depending on them selves.
+(defun sort-types-topologicaly (unsorted)
+  (flet ((depend-p (type1)
+           (find-if #'(lambda (type2)
+			(and
+			 ;; If a type depends a subtype it has to be
+			 ;; forward defined
+			 (not (type-is-p (car type2) (car type1)))
+			 (find (car type2) (cdr type1))))
+		    unsorted)))
+    (let ((sorted
+	   (loop
+	    while unsorted
+	    nconc (multiple-value-bind (sorted remaining)
+		      (delete-collect-if 
+		       #'(lambda (type)
+			   (or (not (cdr type)) (not (depend-p type))))
+		       unsorted)
+		    (cond
+		     ((not sorted)
+		      ;; We have a circular dependency which have to
+		      ;; be resolved
+		      (let ((selected
+			     (find-if 
+			      #'(lambda (type)			
+				  (every 
+				   #'(lambda (dep)
+				       (or
+					(not (type-is-p (car type) dep))
+					(not (find dep unsorted :key #'car))))
+				   (cdr type)))
+			      unsorted)))
+			(unless selected
+			  (error "Couldn't resolve circular dependency"))
+			(setq unsorted (delete selected unsorted))
+			(list selected)))
+		     (t
+		      (setq unsorted remaining)
+		      sorted))))))
+
+      ;; Mark types which have to be forward defined
+      (loop
+       for tmp on sorted
+       as (type . dependencies) = (first tmp)
+       collect (cons type (and
+			   dependencies
+			   (find-if #'(lambda (type)
+					(find (car type) dependencies))
+				    (rest tmp))
+			   t))))))
+
+
+(defun expand-type-definitions (type-list &optional args)
   (flet ((type-options (type-number)
 	   (let ((name (find-foreign-type-name type-number)))
 	     (cdr (assoc name args :test #'string=)))))
 
-   (let ((type-list
-	  (delete-if
-	   #'(lambda (type-number)
-	       (let ((name (find-foreign-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-foreign-type-name type-number)))
-	 (register-type
-	  (getf (type-options type-number) :type (default-type-name name))
-	  (register-type-as type-number))))
-
-     (let ((sorted-type-list (%sort-types-topologicaly type-list)))
-       `(progn
-	  ,@(mapcar
-	     #'(lambda (pair)
-		 (destructuring-bind (type . forward-p) pair
-		   (expand-type-definition type forward-p (type-options type))))
-	     sorted-type-list)
-	  ,@(mapcar
-	     #'(lambda (pair)
-		 (destructuring-bind (type . forward-p) pair
-		   (when forward-p
-		     (expand-type-definition type nil (type-options type)))))
-	     sorted-type-list))))))
+    (setq type-list
+     (delete-if
+      #'(lambda (type-number)
+	  (let ((name (find-foreign-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))))
+      type-list))
+
+    (dolist (type-number type-list)
+      (let ((name (find-foreign-type-name type-number)))
+	(register-type
+	 (getf (type-options type-number) :type (default-type-name name))
+	 (register-type-as type-number))))
+
+    ;; This is needed for some unknown reason to get type numbers right
+    (mapc #'find-type-dependencies type-list)
+
+    (let ((sorted-type-list 
+	   #+clisp (mapcar #'list type-list)
+	   #-clisp
+	   (sort-types-topologicaly 
+	    (mapcar 
+	     #'(lambda (type)
+		 (cons type (find-type-dependencies type (type-options type))))
+	     type-list))))
+      `(progn
+	 ,@(mapcar
+	    #'(lambda (pair)
+		(destructuring-bind (type . forward-p) pair
+		  (expand-type-definition type forward-p (type-options type))))
+	    sorted-type-list)
+	 ,@(mapcar
+	    #'(lambda (pair)
+		(destructuring-bind (type . forward-p) pair
+		  (when forward-p
+		    (expand-type-definition type nil (type-options type)))))
+	    sorted-type-list)))))
+
+(defun expand-types-with-prefix (prefix args)
+  (expand-type-definitions (find-types prefix) args))
+
+(defun expand-types-in-library (system library args)
+  (let* ((filename (library-filename system library))
+	 (types (loop 
+	         for (type-init . %filename) in *type-initializers*
+		 when (equal filename %filename)
+		 collect (funcall type-init))))
+    (expand-type-definitions types args)))
+
+(defun list-types-in-library (system library)
+  (let ((filename (library-filename system library)))
+    (loop 
+     for (type-init . %filename) in *type-initializers*
+     when (equal filename %filename)
+     collect type-init)))
 
 (defmacro define-types-by-introspection (prefix &rest args)
-  (expand-type-definitions prefix args))
+  (expand-types-with-prefix prefix args))
+
+(defexport define-types-by-introspection (prefix &rest args)
+  (list-autoexported-symbols (expand-types-with-prefix prefix args)))
+
+(defmacro define-types-in-library (system library &rest args)
+  (expand-types-in-library system library args))
+
+(defexport define-types-in-library (system library &rest args)
+  (list-autoexported-symbols (expand-types-in-library system library args)))
 
 
 ;;;; Initialize all non static types in GObject
 
-(init-types-in-library #.(concatenate 'string (pkg-config:pkg-variable "glib-2.0" "libdir") "/libgobject-2.0.so"))
+(init-types-in-library glib "libgobject-2.0")