Added new type methods for handling of C callback arguments

[clg] / glib / gtype.lisp

diff --git a/glib/gtype.lisp b/glib/gtype.lisp
index 7c36892..88fddcc 100644 (file)
--- 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.39 2006-02-05 15:38:57 espen Exp $
+;; $Id: gtype.lisp,v 1.44 2006-02-19 19:23:23 espen Exp $
 
 (in-package "GLIB")
 
@@ -69,7 +69,8 @@
 (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)))))
 
 
@@ -282,8 +283,16 @@
     ((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))))
+(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)
@@ -295,12 +304,28 @@
         (type-number
          (or 
           (find-type-number class-name)
-          (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))
+          (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))
+
+
+(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))
@@ -344,6 +369,13 @@
   ;; 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 callback-from-alien-form (form (type t) &rest args)
+  (apply #'from-alien-form form type args))
 
 (defmethod copy-from-alien-form (location (class ginstance-class) &rest args)
   (declare (ignore location class args))
@@ -355,7 +387,8 @@
 
 (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))))