X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/15cbdefc81be2567a4a0b348a277652a5bb9e6fa..4a64c16d900f59a4e6b1ac57fc8658f6faabbcfc:/glib/gtype.lisp diff --git a/glib/gtype.lisp b/glib/gtype.lisp index afc1f62..2498302 100644 --- a/glib/gtype.lisp +++ b/glib/gtype.lisp @@ -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.33 2006-01-31 14:02:51 espen Exp $ +;; $Id: gtype.lisp,v 1.40 2006-02-06 11:52:24 espen Exp $ (in-package "GLIB") @@ -167,12 +167,18 @@ (defun find-type-number (type &optional error-p) (defun type-from-number (type-number &optional error) (multiple-value-bind (type found) (gethash type-number *type-number-to-lisp-type*) - (when (and error (not found)) + (if found + type (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)) + (cond + ((and name (not (= (type-number-from-glib-name name nil) type-number))) + ;; This is a hack because GdkEvent seems to be registered + ;; multiple times + (type-from-number (type-number-from-glib-name name))) + ((and error name) + (error "Type number not registered: ~A (~A)" type-number name)) + ((and error) + (error "Invalid type number: ~A" type-number))))))) (defbinding (find-foreign-type-name "g_type_name") (type) (copy-of string) ((find-type-number type t) type-number)) @@ -250,18 +256,18 @@ (defclass type-info (struct) (:metaclass struct-class))) (defbinding %type-register-static () type-number - (parent-type gtype) + (parent-type type-number) (name string) (info type-info) (0 unsigned-int)) -(defun register-new-type (type parent) +(defun register-new-type (type parent &optional foreign-name) (let ((parent-info (type-query parent))) (with-slots ((parent-number type-number) class-size instance-size) parent-info (let ((type-number (%type-register-static parent-number - (default-alien-type-name type) + (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) @@ -273,22 +279,28 @@ (default-alien-type-name type) (eval-when (:compile-toplevel :load-toplevel :execute) (defclass ginstance-class (proxy-class) - ())) + ((gtype :initarg :gtype :initform nil :reader ginstance-class-gtype)))) -(defmethod shared-initialize ((class ginstance-class) names &rest initargs &key name gtype) - (declare (ignore names)) - (let* ((class-name (or name (class-name class))) - (type-number +(defmethod compute-foreign-size ((class ginstance-class)) + (type-instance-size (find-type-number (class-name class)))) + +(defmethod finalize-inheritance ((class ginstance-class)) + (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))) + (type-number (or (find-type-number class-name) - (register-type class-name - (or (first gtype) (default-type-init-name class-name)))))) - (if (getf initargs :size) - (call-next-method) - (let ((size (type-instance-size type-number))) - (apply #'call-next-method class names :size (list size) initargs))))) - + (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))))) + (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)))) (defmethod validate-superclass ((class ginstance-class) (super standard-class)) (subtypep (class-name super) 'ginstance)) @@ -298,14 +310,16 @@ (defmethod validate-superclass ((class ginstance-class) (super standard-class)) (eval-when (:compile-toplevel :load-toplevel :execute) (defclass ginstance (proxy) - ((class :allocation :alien :type pointer)) - (:metaclass proxy-class))) + (;(class :allocation :alien :type pointer :offset 0) + ) + (:metaclass proxy-class) + (:size #.(size-of 'pointer)))) (defun %type-number-of-ginstance (location) (let ((class (sap-ref-sap location 0))) (sap-ref-32 class 0))) -(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 @@ -313,10 +327,26 @@ (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 chancing 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))))) + (apply #'call-next-method class location initargs) + (error "Object at ~A has an unkown type number: ~A" + location (%type-number-of-ginstance location))))) + +(defmethod make-proxy-instance ((class ginstance-class) location &rest initargs) + (declare (ignore initargs)) + (reference-foreign class location) + ;; Since we make an explicit reference to the foreign object, we + ;; always have to release it when the proxy is garbage collected + ;; and therefor ignore the weak-p argument. + (call-next-method class location :weak nil)) + +(defmethod invalidate-instance ((instance ginstance)) + (declare (ignore instance)) + ;; A ginstance should never be invalidated since it is ref counted + nil) (defmethod copy-from-alien-form (location (class ginstance-class) &rest args) (declare (ignore location class args))