X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/4a64c16d900f59a4e6b1ac57fc8658f6faabbcfc..5de2b5f6a587aff7590db74f3aa7eb622cd8904c:/glib/gtype.lisp?ds=inline

diff --git a/glib/gtype.lisp b/glib/gtype.lisp
index 2498302..866b437 100644
--- 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.40 2006-02-06 11:52:24 espen Exp $
+;; $Id: gtype.lisp,v 1.46 2006-02-19 22:25:31 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)))))
 
 
@@ -106,6 +107,7 @@
 
 (defvar *registered-types* ())
 (defvar *registered-type-aliases* ())
+(defvar *registered-static-types* ())
 (defvar *lisp-type-to-type-number* (make-hash-table))
 (defvar *type-number-to-lisp-type* (make-hash-table))
 
@@ -269,9 +271,10 @@
 	      parent-number
 	      (or foreign-name (default-alien-type-name type))
 	      (make-instance 'type-info :class-size class-size :instance-size instance-size))))
-       (setf (gethash type *lisp-type-to-type-number*) type-number)
-       (setf (gethash type-number *type-number-to-lisp-type*) type)
-       type-number))))
+	(pushnew (list type parent foreign-name) *registered-static-types* :key #'car)
+	(setf (gethash type *lisp-type-to-type-number*) type-number)
+	(setf (gethash type-number *type-number-to-lisp-type*) type)
+	type-number))))
 
 
 
@@ -282,8 +285,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 +306,29 @@
 	 (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))
   (subtypep (class-name super) 'ginstance))
@@ -348,6 +376,10 @@
   ;; A ginstance should never be invalidated since it is ref counted
   nil)
 
+(defmethod callback-from-alien-form (form (class ginstance-class) &rest args)
+  (declare (ignore args))
+  (from-alien-form form class))
+
 (defmethod copy-from-alien-form (location (class ginstance-class) &rest args)
   (declare (ignore location class args))
   (error "Doing copy-from-alien on a ref. counted class is most certainly an error, but if it really is what you want you should use REFERENCE-FOREIGN on the returned instance instead."))
@@ -358,7 +390,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))))