X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/7479d92c2e0ee576d0d376bbbbb72a9dcb948e4b..4de90d1003ebaa951a5b1473b5304e563be7c0c0:/glib/gboxed.lisp

diff --git a/glib/gboxed.lisp b/glib/gboxed.lisp
index e2dac5c..11a0f80 100644
--- a/glib/gboxed.lisp
+++ b/glib/gboxed.lisp
@@ -15,7 +15,7 @@
 ;; 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.2 2001-04-30 11:25:25 espen Exp $
+;; $Id: gboxed.lisp,v 1.4 2001-05-29 15:46:17 espen Exp $
 
 (in-package "GLIB")
 
@@ -23,45 +23,16 @@
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defclass boxed (proxy)
     ()
-    (:metaclass proxy-class)))
-
-(defmethod initialize-proxy ((boxed boxed) &rest initargs
-			     &key location weak-ref)
-  (declare (ignore initargs))
-  (setf
-   (slot-value boxed 'location)
-   (if weak-ref
-       (%boxed-copy (find-type-number (class-of boxed)) location)
-     location))
-  (call-next-method))
-
-(defmethod instance-finalizer ((boxed boxed))
-  (let ((location (proxy-location boxed))
-	(type-number (find-type-number (class-of boxed))))
-    (declare (type system-area-pointer location))
-    #'(lambda ()
-	(%boxed-free type-number location)
-	(remove-cached-instance location))))
-
-
-(deftype-method translate-to-alien boxed (type-spec boxed &optional weak-ref)
-  (if weak-ref
-      `(proxy-location ,boxed)
-    `(let ((boxed ,boxed))
-       (%boxed-copy
-	(find-type-number type-spec)
-	(proxy-location boxed)))))
-
-(deftype-method unreference-alien boxed (type-spec c-struct)
-  `(%boxed-free ,(find-type-number type-spec) ,c-struct))
-
-
-(defbinding %boxed-copy () pointer
-  (type type-number)
+    (:metaclass proxy-class)
+    (:copy %boxed-copy)
+    (:free %boxed-free)))
+
+(defbinding %boxed-copy (type location) pointer
+  ((find-type-number type) type-number)
   (location pointer))
 
-(defbinding %boxed-free () nil
-  (type type-number)
+(defbinding %boxed-free (type location) nil
+  ((find-type-number type) type-number)
   (location pointer))
 
 
@@ -72,29 +43,15 @@
 
 
 (defmethod shared-initialize ((class boxed-class) names
-			      &rest initargs
-			      &key name alien-name type-init)
+			      &rest initargs &key name alien-name)
   (declare (ignore initargs names))
   (call-next-method)
 
   (let* ((class-name (or name (class-name class)))
 	 (type-number
-	  (cond
-	   ((and alien-name type-init)
-	    (error
-	     "Specify either :type-init or :alien-name for class ~A"
-	     class-name))
-	   (alien-name (type-number-from-alien-name (first alien-name)))
-	   (type-init (funcall (mkbinding (first type-init) 'type-number)))
-	   (t
-	    (or
-	     (type-number-from-alien-name
-	      (default-alien-type-name class-name) nil)
-	     (funcall
-	      (mkbinding
-	       (default-alien-fname (format nil "~A_get_type" class-name))
-	       'type-number)))))))
-    (setf (find-type-number class) type-number)))
+	  (find-type-number
+	   (or (first alien-name) (default-alien-type-name class-name)))))
+    (register-type class-name type-number)))
 
 
 (defmethod validate-superclass
@@ -102,6 +59,43 @@
   (subtypep (class-name super) 'boxed))
 
 
-;;;; Initializing type numbers
+;;;; 
+
+(defun expand-boxed-type (type-number &optional slots)
+  `(defclass ,(type-from-number type-number) (boxed)
+     ,slots
+     (:metaclass boxed-class)
+     (:alien-name ,(find-type-name type-number))))
+
+(register-derivable-type 'boxed "GBoxed" :expand 'expand-boxed-type)
+
+;;;; Special boxed types
+
+(defclass gstring (boxed)
+  ()
+  (:metaclass boxed-class)
+  (:alien-name "GString"))
+
+(deftype-method translate-from-alien
+    gstring (type-spec location &optional weak-ref)
+  `(let ((location ,location))
+     (unless (null-pointer-p location)
+       (prog1
+	   (c-call::%naturalize-c-string location)
+	 ,(unless weak-ref
+	    (unreference-alien type-spec location))))))
+
+(deftype-method translate-to-alien
+    gstring (type-spec string &optional weak-ref)
+  (declare (ignore type-spec weak-ref))
+  `(let ((string ,string))
+     ;; Always copy strings to prevent seg fault due to GC
+     (funcall
+      ',(proxy-class-copy (find-class type-spec))
+      ',type-spec
+      (make-pointer (1+ (kernel:get-lisp-obj-address string))))))
+
+(deftype-method cleanup-alien gstring (type-spec c-string &optional weak-ref)
+  (when weak-ref
+    (unreference-alien type-spec c-string)))
 
-(setf (alien-type-name 'boxed) "GBoxed")