X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/112ac1d33aa8f9b7f3d2f9542d15431f152b1d35..6497583aa07c62a5cfc5b9149f2e0ae813b596a4:/glib/gtype.lisp

diff --git a/glib/gtype.lisp b/glib/gtype.lisp
index ea24580..6b9d31e 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.32 2005-04-23 16:48:51 espen Exp $
+;; $Id: gtype.lisp,v 1.37 2006-02-02 17:56:09 espen Exp $
 
 (in-package "GLIB")
 
@@ -167,12 +167,18 @@
 (defun type-from-number (type-number &optional error)
   (multiple-value-bind (type found)
       (gethash type-number *type-number-to-lisp-type*)
-    (when (and error (not found))
+    (if found
+	type
       (let ((name (find-foreign-type-name type-number)))
-	(if name
-	    (error "Type number not registered: ~A (~A)" type-number name)
-	  (error "Invalid type number: ~A" type-number))))
-    type))
+	(cond
+	 ((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)))
+	 ((and error name)
+	  (error "Type number not registered: ~A (~A)" type-number name))
+	 ((and error)
+	  (error "Invalid type number: ~A" type-number)))))))
 
 (defbinding (find-foreign-type-name "g_type_name") (type) (copy-of string)
   ((find-type-number type t) type-number))
@@ -234,26 +240,67 @@
 		(substitute #\_ #\- (string-downcase type)))))
 
 
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (defclass type-info (struct)
+    ((class-size :allocation :alien :type (unsigned 16) :initarg :class-size)
+     (base-init :allocation :alien :type pointer)
+     (base-finalize :allocation :alien :type pointer)
+     (class-init :allocation :alien :type pointer)
+     (class-finalize :allocation :alien :type pointer)
+     (class-data :allocation :alien :type pointer)
+     (instance-size :allocation :alien :type (unsigned 16) 
+		    :initarg :instance-size)
+     (n-preallocs :allocation :alien :type (unsigned 16))
+     (instance-init :allocation :alien :type pointer)
+     (value-table :allocation :alien :type pointer))
+    (:metaclass struct-class)))
+
+(defbinding %type-register-static () type-number
+  (parent-type type-number)
+  (name string)
+  (info type-info)
+  (0 unsigned-int))
+
+(defun register-new-type (type parent &optional foreign-name)
+  (let ((parent-info (type-query parent)))
+    (with-slots ((parent-number type-number) class-size instance-size) parent-info
+      (let ((type-number 
+	     (%type-register-static 
+	      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))))
+
+
 
 ;;;; Metaclass for subclasses of ginstance
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defclass ginstance-class (proxy-class)
-    ()))
+    ((gtype :initarg :gtype :initform nil :reader ginstance-class-gtype))))
 
 
-(defmethod shared-initialize ((class ginstance-class) names &rest initargs &key name gtype)
-  (declare (ignore names))
-  (let* ((class-name (or name (class-name class)))
-	 (type-number 
+(defmethod finalize-inheritance ((class ginstance-class))
+  (call-next-method)
+  (let* ((class-name (class-name class))
+	 (super (most-specific-proxy-superclass class))
+	 (gtype (or 
+		 (first (ginstance-class-gtype class))
+		 (default-alien-type-name class-name)))
+	 (type-number
 	  (or 
 	   (find-type-number class-name)
-	   (register-type class-name 
-	     (or (first gtype) (default-type-init-name class-name))))))
-    (if (getf initargs :size)
-         (call-next-method)
-       (let ((size (type-instance-size type-number)))
-         (apply #'call-next-method class names :size (list size) initargs)))))
+	   (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))
+      (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)))))
 
 
 (defmethod validate-superclass ((class ginstance-class) (super standard-class))