(let* ((initializer-fn-ptr (foreign-symbol-pointer (gobject-class-g-type-initializer class)))
(type (when initializer-fn-ptr
(foreign-funcall-pointer initializer-fn-ptr nil
- g-type))))
+ g-type-designator))))
(if (null initializer-fn-ptr)
(warn "Type initializer for class '~A' (GType '~A') is invalid: foreign symbol '~A'"
(gobject-class-direct-g-type-name class) (class-name class) (gobject-class-g-type-initializer class))
(progn
- (when (g-type= +g-type-invalid+ type)
+ (when (eq (gtype +g-type-invalid+) type)
(warn "Declared GType name '~A' for class '~A' is invalid ('~A' returned 0)"
(gobject-class-direct-g-type-name class) (class-name class)
(gobject-class-g-type-initializer class)))
- (unless (g-type= (gobject-class-direct-g-type-name class) type)
+ (unless (eq (gtype (gobject-class-direct-g-type-name class)) type)
(warn "Declared GType name '~A' for class '~A' does not match actual GType name '~A'"
(gobject-class-direct-g-type-name class)
(class-name class)
- (g-type-name type))))))
- (unless (g-type-from-name (gobject-class-direct-g-type-name class))
+ (gtype-name type))))))
+ (when (zerop (gtype-id (gtype (gobject-class-direct-g-type-name class))))
(warn "Declared GType name '~A' for class '~A' is invalid (g_type_name returned 0)"
(gobject-class-direct-g-type-name class) (class-name class)))))
+(defun filter-from-initargs (initargs removed-key)
+ (loop
+ for (key value) on initargs by #'cddr
+ unless (eq key removed-key)
+ collect key and collect value))
+
+(defun initargs-have-base-in-superclass (initargs base-class)
+ (let ((d-s (getf initargs :direct-superclasses)))
+ (loop
+ for class in d-s
+ thereis (subtypep class base-class))))
+
+(defun compute-new-initargs-for-metaclass (initargs base-class)
+ (if (initargs-have-base-in-superclass initargs base-class)
+ initargs
+ (append (filter-from-initargs initargs :direct-superclasses)
+ (list :direct-superclasses
+ (append (getf initargs :direct-superclasses)
+ (list (find-class base-class)))))))
+
+(defmethod initialize-instance :around ((class gobject-class) &rest initargs)
+ (apply #'call-next-method class (compute-new-initargs-for-metaclass initargs 'g-object)))
+
+(defmethod reinitialize-instance :around ((class gobject-class) &rest initargs &key (direct-superclasses nil d-s-p) &allow-other-keys)
+ (declare (ignore direct-superclasses))
+ (if d-s-p
+ (apply #'call-next-method class (compute-new-initargs-for-metaclass initargs 'g-object))
+ (call-next-method)))
+
(defmethod initialize-instance :after ((object gobject-class) &key &allow-other-keys)
(when (gobject-class-direct-g-type-name object)
(register-object-type (gobject-class-direct-g-type-name object) (class-name object))
(at-init (object) (initialize-gobject-class-g-type object))))
(defmethod finalize-inheritance :after ((class gobject-class))
+ (iter (for superclass in (class-direct-superclasses class))
+ (unless (class-finalized-p superclass) (finalize-inheritance superclass)))
(setf (gobject-class-g-type-name class)
(or (gobject-class-direct-g-type-name class)
(let ((gobject-superclass (iter (for superclass in (class-direct-superclasses class))
(defmethod validate-superclass ((class gobject-class) (superclass standard-class))
t)
-(defmethod compute-class-precedence-list ((class gobject-class))
- (let ((classes (call-next-method)))
- (if (member (find-class 'g-object) classes)
- classes
- `(,class ,(find-class 'g-object) ,@(rest classes)))))
-
-(defmethod direct-slot-definition-class ((class gobject-class) &rest initargs &key allocation)
+(defmethod direct-slot-definition-class ((class gobject-class) &rest initargs &key allocation &allow-other-keys)
(declare (ignore initargs))
(case allocation
- (:gobject-property 'gobject-property-direct-slot-definition)
- (:gobject-fn 'gobject-fn-direct-slot-definition)
+ (:gobject-property (find-class 'gobject-property-direct-slot-definition))
+ (:gobject-fn (find-class 'gobject-fn-direct-slot-definition))
(otherwise (call-next-method))))
-(defmethod effective-slot-definition-class ((class gobject-class) &rest initargs &key allocation)
+(defvar *e-s-d* nil)
+
+(defmethod effective-slot-definition-class ((class gobject-class) &rest initargs)
(declare (ignore initargs))
- (case allocation
- (:gobject-property 'gobject-property-effective-slot-definition)
- (:gobject-fn 'gobject-fn-effective-slot-definition)
- (otherwise (call-next-method))))
+ (or *e-s-d* (call-next-method)))
(defmethod compute-effective-slot-definition ((class gobject-class) name direct-slots)
- (let ((effective-slot (call-next-method)))
+ (let ((effective-slot (let ((*e-s-d* (loop
+ for slot in direct-slots
+ when (typep slot 'gobject-direct-slot-definition)
+ return (etypecase slot
+ (gobject-property-direct-slot-definition (find-class 'gobject-property-effective-slot-definition))
+ (gobject-fn-direct-slot-definition (find-class 'gobject-fn-effective-slot-definition))))))
+ (call-next-method))))
(when (typep effective-slot 'gobject-effective-slot-definition)
(let ((allocation (loop
for direct-slot in direct-slots
(gobject-fn-effective-slot-definition-g-getter-fn effective-slot)
(and property-getter
(if (stringp property-getter)
- (compile nil `(lambda (object)
- (foreign-funcall ,property-getter
- g-object object
- ,property-type)))
+ (compile nil (if (foreign-symbol-pointer property-getter)
+ `(lambda (object)
+ (foreign-funcall ,property-getter
+ g-object object
+ ,property-type))
+ `(lambda (object)
+ (declare (ignore object))
+ (error "Property getter ~A is not available" ,property-getter))
+ ))
property-getter))
(gobject-fn-effective-slot-definition-g-setter-fn effective-slot)
(and property-setter
(if (stringp property-setter)
- (compile nil `(lambda (object new-value)
- (foreign-funcall ,property-setter
- g-object object
- ,property-type new-value
- :void)))
+ (compile nil (if (foreign-symbol-pointer property-setter)
+ `(lambda (object new-value)
+ (foreign-funcall ,property-setter
+ g-object object
+ ,property-type new-value
+ :void))
+ `(lambda (object)
+ (declare (ignore object))
+ (error "Property setter ~A is not avaiable" ,property-setter))))
property-setter)))))))
effective-slot))
(defmethod make-instance ((class gobject-class) &rest initargs &key pointer)
(log-for :subclass "(make-instance ~A ~{~A~^ ~})~%" class initargs)
+ (ensure-finalized class)
(let ((*currently-making-object-p* t))
(if pointer
(progn
(defmethod slot-boundp-using-class ((class gobject-class) object (slot gobject-property-effective-slot-definition))
(handler-case
- (and (pointer object)
+ (and (slot-boundp object 'pointer)
+ (pointer object)
(progn (g-object-property-type (pointer object) (gobject-property-effective-slot-definition-g-property-name slot) :assert-readable t) t))
(property-unreadable-error () nil)))
new-value)
(defmethod slot-boundp-using-class ((class gobject-class) object (slot gobject-fn-effective-slot-definition))
- (and (pointer object)
+ (and (slot-boundp object 'pointer)
+ (pointer object)
(not (null (gobject-fn-effective-slot-definition-g-getter-fn slot)))))
(defmethod slot-value-using-class ((class gobject-class) object (slot gobject-fn-effective-slot-definition))
new-value)
(defmethod slot-boundp-using-class ((class gobject-class) object (slot gobject-effective-slot-definition))
- t)
+ (slot-boundp object 'pointer))
(defmethod slot-makunbound-using-class ((class gobject-class) object (slot gobject-effective-slot-definition))
+ (declare (ignore object))
nil)
projects / cl-gtk2.git / blobdiff