;; 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.21 2004-11-19 13:02:51 espen Exp $
+;; $Id: gtype.lisp,v 1.27 2005-03-06 17:26:23 espen Exp $
(in-package "GLIB")
(defmethod from-alien-form (type-number (type (eql 'gtype)) &rest args)
(declare (ignore type args))
- `(type-from-number ,type-number t))
+ `(type-from-number ,type-number))
(defmethod from-alien-function ((type (eql 'gtype)) &rest args)
(declare (ignore type args))
#'(lambda (type-number)
- (type-from-number type-number t)))
+ (type-from-number type-number)))
(defmethod writer-function ((type (eql 'gtype)) &rest args)
- (declare (ignore type))
+ (declare (ignore type args))
(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))
+ (declare (ignore type args))
(let ((reader (reader-function 'type-number)))
#'(lambda (location &optional (offset 0))
- (type-from-number (funcall reader location offset) t))))
+ (type-from-number (funcall reader location offset)))))
(eval-when (:compile-toplevel :load-toplevel :execute)
;;;; Mapping between lisp types and glib types
-(defvar *type-to-number-hash* (make-hash-table))
-(defvar *number-to-type-hash* (make-hash-table))
-
-(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))
+(defvar *registered-types* ())
+(defvar *registered-type-aliases* ())
+(defvar *lisp-type-to-type-number* (make-hash-table))
+(defvar *type-number-to-lisp-type* (make-hash-table))
(defbinding %type-from-name () type-number
(name string))
-(defun find-type-number (type &optional error)
+(defun type-number-from-glib-name (name &optional (error-p t))
+ (let ((type-number (%type-from-name name)))
+ (cond
+ ((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 register-type-alias (type alias)
+ (pushnew (cons type alias) *registered-type-aliases* :key #'car)
+ (setf
+ (gethash type *lisp-type-to-type-number*)
+ (find-type-number alias t)))
+
+(defun reinitialize-all-types ()
+ (clrhash *lisp-type-to-type-number*)
+ (clrhash *type-number-to-lisp-type*)
+ (type-init) ; initialize the glib type system
+ (mapc #'(lambda (type)
+ (register-type (car type) (cdr type)))
+ *registered-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*)
+
+
+(defun find-type-number (type &optional error-p)
(etypecase type
(integer type)
- (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))))
+ (string (type-number-from-glib-name type error-p))
(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))))
+ (or
+ (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))))
(defun type-from-number (type-number &optional error)
(multiple-value-bind (type found)
- (gethash type-number *number-to-type-hash*)
+ (gethash type-number *type-number-to-lisp-type*)
(when (and error (not found))
- (let ((name (find-type-name type-number)))
+ (let ((name (find-foreign-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) (copy-of string)
+(defbinding (find-foreign-type-name "g_type_name") (type) (copy-of string)
((find-type-number type t) type-number))
(defun type-number-of (object)
(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))))
+(eval-when (:compile-toplevel :load-toplevel :execute)
+ (defvar *type-initializers* ())
+ (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)))
+ (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)
- (%init-types-in-library filename prefix ignore))
+ (let ((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))))
+
+(defun find-type-init-function (type-number)
+ (or
+ (loop
+ for type-init in *type-initializers*
+ when (= type-number (funcall type-init))
+ do (return type-init))
+ (error "Can't find init function for type number ~D" type-number)))
+
+(defun default-type-init-name (type)
+ (find-symbol (format nil "~A_~A_get_type"
+ (package-prefix *package*)
+ (substitute #\_ #\- (string-downcase type)))))
+
+
+
+;;;; Metaclass for subclasses of ginstance
+
+(eval-when (:compile-toplevel :load-toplevel :execute)
+ (defclass ginstance-class (proxy-class)
+ ()))
+
+
+(defmethod shared-initialize ((class ginstance-class) names &key name gtype)
+ (declare (ignore names))
+ (let* ((class-name (or name (class-name class)))
+ (type-number
+ (or
+ (find-type-number class-name)
+ (register-type class-name
+ (or (first gtype) (default-type-init-name class-name))))))
+ (call-next-method)
+ (when (slot-boundp class 'size)
+ (setf (slot-value class 'size) (type-instance-size type-number)))))
+(defmethod validate-superclass ((class ginstance-class) (super standard-class))
+ (subtypep (class-name super) 'ginstance))
+
;;;; Superclass for wrapping types in the glib type system
(ensure-proxy-instance class (sap-ref-sap location offset))))
-;;;; Metaclass for subclasses of ginstance
-
-(eval-when (:compile-toplevel :load-toplevel :execute)
- (defclass ginstance-class (proxy-class)
- ()))
-
-
-(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)))))
-
-
-(defmethod validate-superclass ((class ginstance-class) (super standard-class))
- (subtypep (class-name super) 'ginstance))
-
-
;;;; Registering fundamental types
+(register-type 'nil "void")
(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-alias 'fixnum 'int)
(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 'pathname "gchararray")
(register-type 'string "gchararray")
-;;;;
+;;;; Introspection of type information
(defvar *derivable-type-info* (make-hash-table))
-(defun register-derivable-type (type id expander)
+(defun register-derivable-type (type id expander &optional dependencies)
(register-type type id)
(let ((type-number (register-type type id)))
- (setf (gethash type-number *derivable-type-info*) expander)))
+ (setf
+ (gethash type-number *derivable-type-info*)
+ (list expander dependencies))))
(defun find-type-info (type)
(dolist (super (cdr (type-hierarchy type)))
(let ((info (gethash super *derivable-type-info*)))
(return-if info))))
-(defun expand-type-definition (type options)
- (let ((expander (find-type-info type)))
- (funcall expander (find-type-number type t) options)))
+(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))
#'(lambda (type-number)
(when (or
(not prefix)
- (string-prefix-p prefix (find-type-name type-number)))
+ (string-prefix-p prefix (find-foreign-type-name type-number)))
(funcall function type-number))
(map-subtypes function type-number prefix))
array 'type-number length)
*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))))
+(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
- ((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))))))))
+ ((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)
- (flet ((type-options (type-number)
- (let ((name (find-type-name type-number)))
+ (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-type-name type-number)))
+ (let ((name (find-foreign-type-name type-number)))
(or
(getf (type-options type-number) :ignore)
(find-if
(getf (cdr options) :except)))))
args))))
(find-types prefix))))
-
+
(dolist (type-number type-list)
- (let ((name (find-type-name type-number)))
+ (let ((name (find-foreign-type-name type-number)))
(register-type
(getf (type-options type-number) :type (default-type-name name))
- type-number)))
-
- `(progn
- ,@(mapcar
- #'(lambda (type)
- (expand-type-definition type (type-options type)))
- (%sort-types-topologicaly type-list))))))
+ (find-type-init-function 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))))))
(defmacro define-types-by-introspection (prefix &rest args)
(expand-type-definitions prefix 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"))
~mdw / clg / blobdiff