;; 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.37 2006-02-02 17:56:09 espen Exp $
+;; $Id: gtype.lisp,v 1.40 2006-02-06 11:52:24 espen Exp $
(in-package "GLIB")
((gtype :initarg :gtype :initform nil :reader ginstance-class-gtype))))
+(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))
(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))
-
- (unless (slot-boundp class 'size)
- (setf (slot-value class 'size) (type-instance-size type-number)))))
-
+ (supertype type-number) class-name))))
(defmethod validate-superclass ((class ginstance-class) (super standard-class))
(subtypep (class-name super) 'ginstance))
(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))