X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/cd859052dc7a17bbfa93df3c31b79fe730194047..a7d19b2a6d3e11b28842476b80ef68d81fb6b8ac:/glib/gtype.lisp

diff --git a/glib/gtype.lisp b/glib/gtype.lisp
index f4a3d60..d4a4921 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.36 2006-02-01 22:48:39 espen Exp $
+;; $Id: gtype.lisp,v 1.47 2006-02-26 15:30:01 espen Exp $
 
 (in-package "GLIB")
 
@@ -34,42 +34,43 @@ (deftype type-number () '(unsigned 32))
 
 (deftype gtype () 'symbol)
 
-(defmethod alien-type ((type (eql 'gtype)) &rest args)
-  (declare (ignore type args))
+(define-type-method alien-type ((type gtype))
+  (declare (ignore type))
   (alien-type 'type-number))
 
-(defmethod size-of ((type (eql 'gtype)) &rest args)
-  (declare (ignore type args))
+(define-type-method size-of ((type gtype))
+  (declare (ignore type))
   (size-of 'type-number))
 
-(defmethod to-alien-form (gtype (type (eql 'gtype)) &rest args)
-  (declare (ignore type args))
+(define-type-method to-alien-form ((type gtype) gtype)
+  (declare (ignore type))
   `(find-type-number ,gtype t)) 
 
-(defmethod to-alien-function ((type (eql 'gtype)) &rest args)
-  (declare (ignore type args))
+(define-type-method to-alien-function ((type gtype))
+  (declare (ignore type))
   #'(lambda (gtype)
       (find-type-number gtype t)))
 
-(defmethod from-alien-form (type-number (type (eql 'gtype)) &rest args)
-  (declare (ignore type args))
+(define-type-method from-alien-form ((type gtype) type-number)
+  (declare (ignore type))
   `(type-from-number ,type-number)) 
 
-(defmethod from-alien-function ((type (eql 'gtype)) &rest args)
-  (declare (ignore type args))
+(define-type-method from-alien-function ((type gtype))
+  (declare (ignore type))
   #'(lambda (type-number)
       (type-from-number type-number)))
 
-(defmethod writer-function ((type (eql 'gtype)) &rest args)
-  (declare (ignore type args))
+(define-type-method writer-function ((type gtype))
+  (declare (ignore type))
   (let ((writer (writer-function 'type-number)))
     #'(lambda (gtype location &optional (offset 0))
 	(funcall writer (find-type-number gtype t) location offset))))
 
-(defmethod reader-function ((type (eql 'gtype)) &rest args)
-  (declare (ignore type args))
+(define-type-method reader-function ((type gtype))
+  (declare (ignore type))
   (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 @@ (defbinding type-class-peek (type) pointer
 
 (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 @@ (defun register-new-type (type parent &optional foreign-name)
 	      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))))
 
 
 
@@ -279,35 +282,52 @@ (defun register-new-type (type parent &optional foreign-name)
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defclass ginstance-class (proxy-class)
-    ((foreign-init))))
+    ((gtype :initarg :gtype :initform nil :reader ginstance-class-gtype))))
 
 
-(defmethod shared-initialize ((class ginstance-class) names &key name gtype)
-  (call-next-method)
-  (setf 
-   (slot-value class 'foreign-init) 
-   (or (first gtype) (default-type-init-name (or name (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)
   (let* ((class-name (class-name class))
 	 (super (most-specific-proxy-superclass class))
-	 (foreign-init (slot-value class 'foreign-init))
+	 (gtype (or 
+		 (first (ginstance-class-gtype class))
+		 (default-alien-type-name class-name)))
 	 (type-number
 	  (or 
 	   (find-type-number class-name)
-	   (if (or 
-		(symbolp foreign-init)
-		(type-number-from-glib-name foreign-init nil))
-	       (register-type class-name foreign-init)
-	     (register-new-type class-name (class-name super) foreign-init)))))
-    (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))
+	   (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 "Super class mismatch between CLOS and GObject for ~A"
+       class-name)))
+  
+  (update-size class))
+
 
-    (unless (slot-boundp class 'size)
-      (setf (slot-value class 'size) (type-instance-size type-number)))))
+(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))
@@ -318,14 +338,16 @@ (defmethod validate-superclass ((class ginstance-class) (super standard-class))
 
 (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
@@ -333,23 +355,39 @@ (defmethod ensure-proxy-instance ((class ginstance-class) location)
 			   (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)))))
-
-(defmethod copy-from-alien-form (location (class ginstance-class) &rest args)
-  (declare (ignore location class args))
+	(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)
+
+(define-type-method copy-from-alien-form ((type ginstance) location)
+  (declare (ignore location type))
   (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."))
 
-(defmethod copy-from-alien-function ((class ginstance-class) &rest args)
-  (declare (ignore class args))  
+(define-type-method copy-from-alien-function ((type ginstance))
+  (declare (ignore type))  
   (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."))
 
-(defmethod reader-function ((class ginstance-class) &rest args)
-  (declare (ignore args))
-  #'(lambda (location &optional (offset 0))
-      (ensure-proxy-instance class (sap-ref-sap location offset))))
+(define-type-method reader-function ((type ginstance))
+  #'(lambda (location &optional (offset 0) weak-p)
+      (declare (ignore weak-p))
+      (ensure-proxy-instance type (sap-ref-sap location offset))))
 
 
 ;;;; Registering fundamental types