X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=glib%2Fgobject.meta.lisp;h=e4fc5e3d8b8e1ed8b2710460a77f314a18f9f41d;hb=2da8ec51c87e16120d62969eb2468563e8caecef;hp=7f42613543953a381a658546a9f16dabcb67025a;hpb=fca774d3fbabdde5f5e5addd9a0b3f737bc2a708;p=cl-gtk2.git

diff --git a/glib/gobject.meta.lisp b/glib/gobject.meta.lisp
index 7f42613..e4fc5e3 100644
--- a/glib/gobject.meta.lisp
+++ b/glib/gobject.meta.lisp
@@ -9,21 +9,35 @@
                        :reader gobject-class-g-type-initializer)
    (interface-p :initform nil
                 :initarg :g-interface-p
-                :reader gobject-class-interface-p)))
+                :reader gobject-class-interface-p))
+  (:documentation "Metaclass for GObject-based classes."))
+
+(defun initialize-gobject-class-g-type (class)
+  (if (gobject-class-g-type-initializer class)
+      (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))))
+        (if (null initializer-fn-ptr)
+            (warn "Type initializer for class '~A' (GType '~A') is invalid: foreign symbol '~A'"
+                  (gobject-class-g-type-name class) (class-name class) (gobject-class-g-type-initializer class))
+            (progn
+              (when (g-type= +g-type-invalid+ type)
+                (warn "Declared GType name '~A' for class '~A' is invalid ('~A' returned 0)"
+                      (gobject-class-g-type-name class) (class-name class)
+                      (gobject-class-g-type-initializer class)))
+              (unless (g-type= (gobject-class-g-type-name class) type)
+                (warn "Declared GType name '~A' for class '~A' does not match actual GType name '~A'"
+                      (gobject-class-g-type-name class)
+                      (class-name class)
+                      (g-type-name type))))))
+      (unless (g-type-from-name (gobject-class-g-type-name class))
+        (warn "Declared GType name '~A' for class '~A' is invalid (g_type_name returned 0)"
+              (gobject-class-g-type-name class) (class-name class)))))
 
 (defmethod initialize-instance :after ((object gobject-class) &key &allow-other-keys)
   (register-object-type (gobject-class-g-type-name object) (class-name object))
-  (when (gobject-class-g-type-initializer object)
-    (let ((type (foreign-funcall-pointer (foreign-symbol-pointer (gobject-class-g-type-initializer object)) nil
-                                         g-type)))
-      (assert (/= +g-type-invalid+ type) nil "Declared GType name '~A' for class '~A' is invalid (g_type_name returned 0)"
-              (gobject-class-g-type-name object) (class-name object))
-      (assert (string= (gobject-class-g-type-name object)
-                       (g-type-name type))
-              nil "Declared GType name '~A' for class '~A' does not match actual GType name '~A'"
-              (gobject-class-g-type-name object)
-              (class-name object)
-              (g-type-name type)))))
+  (at-init (object) (initialize-gobject-class-g-type object)))
 
 (defclass gobject-direct-slot-definition (standard-direct-slot-definition)
   ((g-property-type :initform nil
@@ -171,6 +185,17 @@
          do (funcall fn object value))
       object)))
 
+(defun filter-initargs-by-class (class initargs)
+  (iter (with slots = (class-slots class))
+        (for (arg-name arg-value) on initargs by #'cddr)
+        (for slot = (find arg-name slots :key #'slot-definition-initargs :test 'member))
+        (unless (and slot (typep slot 'gobject-effective-slot-definition))
+          (nconcing (list arg-name arg-value)))))
+
+(defmethod initialize-instance ((instance g-object) &rest initargs &key &allow-other-keys)
+  (let ((filtered-initargs (filter-initargs-by-class (class-of instance) initargs)))
+    (apply #'call-next-method instance filtered-initargs)))
+
 (defmethod make-instance ((class gobject-class) &rest initargs &key pointer)
   (if pointer
       (progn
@@ -181,24 +206,26 @@
 
 (defmethod slot-boundp-using-class ((class gobject-class) object (slot gobject-property-effective-slot-definition))
   (handler-case
-      (progn (g-object-property-type object (gobject-property-effective-slot-definition-g-property-name slot) :assert-readable t) t)
+      (progn (g-object-property-type (pointer object) (gobject-property-effective-slot-definition-g-property-name slot) :assert-readable t) t)
     (property-unreadable-error () nil)))
 
 (defmethod slot-value-using-class ((class gobject-class) object (slot gobject-property-effective-slot-definition))
-  (g-object-call-get-property object
+  (g-object-call-get-property (pointer object)
                               (gobject-property-effective-slot-definition-g-property-name slot)
                               (gobject-effective-slot-definition-g-property-type slot)))
 
 (defmethod (setf slot-value-using-class) (new-value (class gobject-class) object (slot gobject-property-effective-slot-definition))
-  (g-object-call-set-property object
+  (g-object-call-set-property (pointer object)
                               (gobject-property-effective-slot-definition-g-property-name slot)
                               new-value
                               (gobject-effective-slot-definition-g-property-type slot)))
 
+(defmethod slot-boundp-using-class ((class gobject-class) object (slot gobject-fn-effective-slot-definition))
+  (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))
   (let ((fn (gobject-fn-effective-slot-definition-g-getter-fn slot)))
-    (when fn
-      (funcall fn object))))
+    (funcall fn object)))
 
 (defmethod (setf slot-value-using-class) (new-value (class gobject-class) object (slot gobject-fn-effective-slot-definition))
   (funcall (gobject-fn-effective-slot-definition-g-setter-fn slot) object new-value))