X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/2b481386c12c8841f9135b384bd563446c71a64f..69ade5a6dbf7af5c2255d13739c2ce603a772f95:/glib/gboxed.lisp

diff --git a/glib/gboxed.lisp b/glib/gboxed.lisp
index 41f6243..8e621aa 100644
--- a/glib/gboxed.lisp
+++ b/glib/gboxed.lisp
@@ -15,20 +15,22 @@
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-;; $Id: gboxed.lisp,v 1.12 2004-11-07 21:41:35 espen Exp $
+;; $Id: gboxed.lisp,v 1.18 2005-03-11 10:56:58 espen Exp $
 
 (in-package "GLIB")
 
 
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  (init-types-in-library #.(concatenate 'string
-			  (pkg-config:pkg-variable "glib-2.0" "libdir")
-			  "/libgobject-2.0.so")))
-
 (defclass boxed (struct)
   ()
   (:metaclass struct-class))
 
+(defmethod instance-finalizer ((instance boxed))
+  (let ((location (proxy-location instance))
+	(type-number (type-number-of instance)))
+    #'(lambda ()
+	(remove-cached-instance location)
+	(%boxed-free type-number location))))
+
 
 ;;;; Metaclass for boxed classes
 
@@ -40,40 +42,37 @@
     (subtypep (class-name super) 'boxed)))
 
 
-(defmethod shared-initialize ((class boxed-class) names
-			      &rest initargs &key name alien-name)
-  (declare (ignore initargs names))
+(defmethod shared-initialize ((class boxed-class) names &key name gtype)
+  (declare (ignore names))
   (call-next-method)
-  
-  (let* ((class-name (or name (class-name class)))
-	 (type-number
-	  (find-type-number
-	   (or (first alien-name) (default-alien-type-name class-name)))))
-    (register-type class-name type-number)))
-
+  (let ((class-name (or name (class-name class))))
+    (unless (find-type-number class-name)
+      (register-type class-name 
+       (or (first gtype) (default-type-init-name class-name))))))
 
-(defbinding %boxed-copy (type location) pointer
-  ((find-type-number type) type-number)
+(defbinding %boxed-copy () pointer
+  (type-number type-number)
   (location pointer))
 
-(defbinding %boxed-free (type location) nil
-  ((find-type-number type) type-number)
+(defbinding %boxed-free () nil
+  (type-number type-number)
   (location pointer))
 
 (defmethod reference-foreign ((class boxed-class) location)
-  (%boxed-copy (class-name class) location))
+  (%boxed-copy (find-type-number class) location))
 
 (defmethod unreference-foreign ((class boxed-class) location)
-  (%boxed-free (class-name class) location))
+  (%boxed-free (find-type-number class) location))
 
 
 ;;;; 
 
-(defun expand-boxed-type (type-number &optional slots)
+(defun expand-boxed-type (type-number forward-p slots)
   `(defclass ,(type-from-number type-number) (boxed)
-     ,slots
+     ,(unless forward-p
+	slots)
      (:metaclass boxed-class)
-     (:alien-name ,(find-type-name type-number))))
+     (:gtype ,(register-type-as type-number))))
 
 (register-derivable-type 'boxed "GBoxed" 'expand-boxed-type)
 
@@ -107,3 +106,9 @@
 ;;   (when weak-ref
 ;;     (unreference-alien type-spec c-string)))
 
+
+
+;;;; NULL terminated vector of strings
+
+(deftype strings () '(null-terminated-vector string))
+(register-type 'strings '|g_strv_get_type|)