X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/92a07e637d009189bcadeae5d1ef9e9634c8d9ec..348f82de73817cdaaa2ef8ee45a287af492c696a:/glib/gtype.lisp?ds=sidebyside

diff --git a/glib/gtype.lisp b/glib/gtype.lisp
index 783a6a7..0637c0b 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.35 2006-02-01 17:46:11 espen Exp $
+;; $Id: gtype.lisp,v 1.42 2006-02-06 22:58:35 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)))))
 
 
@@ -171,7 +172,7 @@
 	type
       (let ((name (find-foreign-type-name type-number)))
 	(cond
-	 ((and name (type-number-from-glib-name name nil))
+	 ((and name (not (= (type-number-from-glib-name name nil) type-number)))
 	  ;; This is a hack because GdkEvent seems to be registered
 	  ;; multiple times
 	  (type-from-number (type-number-from-glib-name name)))
@@ -279,26 +280,35 @@
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defclass ginstance-class (proxy-class)
-    ()))
+    ((gtype :initarg :gtype :initform nil :reader ginstance-class-gtype))))
 
 
-(defmethod shared-initialize :after ((class ginstance-class) names &key name gtype)
-  (let* ((class-name (or name (class-name class)))
+(defmethod compute-foreign-size ((class ginstance-class))
+  (type-instance-size (find-type-number (class-name class))))
+
+(defmethod finalize-inheritance ((class ginstance-class))
+  (call-next-method)
+  (let* ((class-name (class-name class))
 	 (super (most-specific-proxy-superclass class))
-	 (foreign-name (or (first gtype) (default-type-init-name class-name)))
-	 (type-number 
+	 (gtype (or 
+		 (first (ginstance-class-gtype class))
+		 (default-alien-type-name class-name)))
+	 (type-number
 	  (or 
 	   (find-type-number class-name)
-	   (if (type-number-from-glib-name foreign-name nil)
-	       (register-type class-name foreign-name)
-	     (register-new-type class-name (class-name super) foreign-name)))))
-    (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))
-
-    (unless (slot-boundp class 'size)
-      (setf (slot-value class 'size) (type-instance-size type-number)))))
-
+       (supertype type-number) class-name))))
 
 (defmethod validate-superclass ((class ginstance-class) (super standard-class))
   (subtypep (class-name super) 'ginstance))
@@ -308,14 +318,16 @@
 
 (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
@@ -323,10 +335,26 @@
 			   (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)))))
+	(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)
 
 (defmethod copy-from-alien-form (location (class ginstance-class) &rest args)
   (declare (ignore location class args))
@@ -338,7 +366,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))))