Bug fix

[clg] / glib / gboxed.lisp

diff --git a/glib/gboxed.lisp b/glib/gboxed.lisp
index caf5fb478d8281d41be3ae7c9fd905ea7cdd4f5d..ceae18fcb21d9883198d94731bb8d082a543244c 100644 (file)
--- 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
 
 ;; 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.11 2004-11-06 21:39:58 espen Exp $
+;; $Id: gboxed.lisp,v 1.16 2005-02-14 00:44:26 espen Exp $

 
 (in-package "GLIB")
 
 
 
 (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 (proxy)
+(defclass boxed (struct)

   ()
   (:metaclass struct-class))
 
   ()
   (: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
 
 
 ;;;; Metaclass for boxed classes
 


@@ -52,26 +54,27 @@ (defmethod shared-initialize ((class boxed-class) names
     (register-type class-name type-number)))
 
 
     (register-type class-name type-number)))
 
 

-(defbinding %boxed-copy (type location) pointer
-  ((find-type-number type) type-number)
+(defbinding %boxed-copy () pointer
+  (type-number type-number)

   (location pointer))
 
   (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)
   (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)
 
 (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)
   `(defclass ,(type-from-number type-number) (boxed)

-     ,slots
+     ,(unless forward-p
+       slots)

      (:metaclass boxed-class)
      (:alien-name ,(find-type-name type-number))))
 
      (:metaclass boxed-class)
      (:alien-name ,(find-type-name type-number))))
 


@@ -107,3 +110,9 @@ (register-derivable-type 'boxed "GBoxed" 'expand-boxed-type)
 ;;   (when weak-ref
 ;;     (unreference-alien type-spec c-string)))
 
 ;;   (when weak-ref
 ;;     (unreference-alien type-spec c-string)))
 

+
+
+;;;; NULL terminated vector of strings
+
+(deftype strings () '(null-terminated-vector string))
+(register-type 'strings "GStrv")