;; 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.16 2002-03-24 12:56:03 espen Exp $
+;; $Id: gtype.lisp,v 1.21 2004-11-19 13:02:51 espen Exp $
(in-package "GLIB")
(use-prefix "g")
-;;;;
+;; Initialize the glib type system
+(defbinding type-init () nil)
+(type-init)
(deftype type-number () '(unsigned 32))
+(deftype gtype () 'symbol)
+
+(defmethod alien-type ((type (eql 'gtype)) &rest args)
+ (declare (ignore type args))
+ (alien-type 'type-number))
+
+(defmethod size-of ((type (eql 'gtype)) &rest args)
+ (declare (ignore type args))
+ (size-of 'type-number))
+
+(defmethod to-alien-form (gtype (type (eql 'gtype)) &rest args)
+ (declare (ignore type args))
+ `(find-type-number ,gtype t))
+
+(defmethod to-alien-function ((type (eql 'gtype)) &rest args)
+ (declare (ignore type args))
+ #'(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 t))
+
+(defmethod from-alien-function ((type (eql 'gtype)) &rest args)
+ (declare (ignore type args))
+ #'(lambda (type-number)
+ (type-from-number type-number t)))
+
+(defmethod writer-function ((type (eql 'gtype)) &rest args)
+ (declare (ignore type))
+ (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))
+ (let ((reader (reader-function 'type-number)))
+ #'(lambda (location &optional (offset 0))
+ (type-from-number (funcall reader location offset) t))))
+
+
(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 proxy-class)))
+ (:metaclass struct-class)))
-(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))
+(defbinding type-query (type) nil
+ ((find-type-number type t) type-number)
+ ((make-instance 'type-query) type-query :return))
(defun type-instance-size (type)
(slot-value (type-query type) 'instance-size))
(let ((type-number
(etypecase id
(integer id)
- (string (find-type-number id t)))))
+ (string (find-type-number id t))
+ (symbol (gethash id *type-to-number-hash*)))))
(setf (gethash type *type-to-number-hash*) type-number)
- (setf (gethash type-number *number-to-type-hash*) type)
+ (unless (symbolp id)
+ (setf (gethash type-number *number-to-type-hash*) type))
type-number))
(defbinding %type-from-name () type-number
(let ((type-number (%type-from-name type)))
(cond
((and (zerop type-number) error)
- (error "Invalid alien type name: ~A" type))
+ (error "Invalid gtype name: ~A" type))
((zerop type-number) nil)
(t type-number))))
(symbol
(etypecase name
(string (type-from-number (find-type-number name t)))))
-(defbinding (find-type-name "g_type_name") (type) string
+(defbinding (find-type-name "g_type_name") (type) (copy-of string)
((find-type-number type t) type-number))
(defun type-number-of (object)
(funcall (mkbinding fname 'type-number)))
(mklist init)))
-(defun %init-types-in-library (pathname ignore)
+(defun %init-types-in-library (pathname prefix ignore)
(let ((process (ext:run-program
"nm" (list "-D" (namestring (truename pathname)))
:output :stream :wait 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)))
(ext:process-close process)
`(init-type ',fnames))))
-(defmacro init-types-in-library (filename &key ignore)
- (%init-types-in-library
- (format nil "~A/~A" *gtk-library-path* filename) ignore))
+(defmacro init-types-in-library (filename &key (prefix "") ignore)
+ (%init-types-in-library filename prefix ignore))
(defun %type-of-ginstance (location)
(let ((class (sap-ref-sap location 0)))
- (type-from-number (sap-ref-unsigned class 0))))
+ (type-from-number (sap-ref-32 class 0))))
-(deftype-method translate-from-alien
- ginstance (type-spec location &optional weak-ref)
- (declare (ignore type-spec))
- `(let ((location ,location))
- (unless (null-pointer-p location)
- (ensure-proxy-instance
- (%type-of-ginstance location) location ,weak-ref))))
+(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)))
+(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))))
;;;; Metaclass for subclasses of ginstance
(eval-when (:compile-toplevel :load-toplevel :execute)
- (defclass ginstance-class (proxy-class)))
+ (defclass ginstance-class (proxy-class)
+ ()))
(defmethod shared-initialize ((class ginstance-class) names
- &rest initargs &key name alien-name
- size ref unref)
- (declare (ignore initargs 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)
- (let ((size (or size (type-instance-size type-number))))
- (declare (special size))
- (call-next-method)))
-
- (when ref
- (let ((ref (mkbinding (first ref) 'pointer 'pointer)))
- (setf
- (slot-value class 'copy)
- #'(lambda (type location)
- (declare (ignore type))
- (funcall ref location)))))
- (when unref
- (let ((unref (mkbinding (first unref) 'nil 'pointer)))
- (setf
- (slot-value class 'free)
- #'(lambda (type location)
- (declare (ignore type))
- (funcall unref location))))))
-
-
-(defmethod validate-superclass
- ((class ginstance-class) (super pcl::standard-class))
+ (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))
(defun type-interfaces (type)
(multiple-value-bind (array length) (%type-interfaces type)
(unwind-protect
- (map-c-array 'list #'identity array 'type-number length)
+ (map-c-vector 'list #'identity array 'type-number length)
(deallocate-memory array))))
(defun implements (type)
(let ((type-number (find-type-number type t)))
(multiple-value-bind (array length) (%type-children type-number)
(unwind-protect
- (map-c-array
+ (map-c-vector
'nil
#'(lambda (type-number)
(when (or
~mdw / clg / blobdiff