;; 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.43 2006-02-08 21:53:34 espen Exp $
(in-package "GLIB")
(defmethod reader-function ((type (eql 'gtype)) &rest args)
(declare (ignore type args))
(let ((reader (reader-function 'type-number)))
- #'(lambda (location &optional (offset 0))
+ #'(lambda (location &optional (offset 0) weak-p)
+ (declare (ignore weak-p))
(type-from-number (funcall reader location offset)))))
(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 (slot-boundp class 'size))
+ (setf (slot-value class 'size) (type-instance-size type-number)))
+ ((and
+ (slot-boundp class 'size)
+ (not (= (type-instance-size type-number) (slot-value class 'size))))
+ (warn "Size mismatch for class ~A" class)))))
(defmethod finalize-inheritance ((class ginstance-class))
(call-next-method)
(let* ((class-name (class-name class))
(super (most-specific-proxy-superclass class))
- (foreign-init (slot-value class 'foreign-init))
+ (gtype (or
+ (first (ginstance-class-gtype class))
+ (default-alien-type-name class-name)))
(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))
+ (let ((type-number
+ (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))))
+ (type-class-ref type-number)
+ type-number))))
+ (when (and
+ (supertype type-number)
+ (not (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))
+ (supertype type-number) class-name)))
+
+ (update-size class))
+
- (unless (slot-boundp class 'size)
- (setf (slot-value class 'size) (type-instance-size type-number)))))
+(defmethod shared-initialize ((class ginstance-class) names &rest initargs)
+ (declare (ignore initargs))
+ (call-next-method)
+ (when (class-finalized-p class)
+ (update-size class)))
(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
(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))
(defmethod reader-function ((class ginstance-class) &rest args)
(declare (ignore args))
- #'(lambda (location &optional (offset 0))
+ #'(lambda (location &optional (offset 0) weak-p)
+ (declare (ignore weak-p))
(ensure-proxy-instance class (sap-ref-sap location offset))))