Removed libdir path in calls to INIT-TYPES-IN-LIBRARY

[clg] / glib / gboxed.lisp

diff --git a/glib/gboxed.lisp b/glib/gboxed.lisp
index 664414ac3d8f4ce7bf0ebaed5d3a9119941a43a1..cfcaa2e8f7d256aff7cedc56199c9cbc6e946dee 100644 (file)
--- 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.3 2001/05/11 16:04:33 espen Exp $
+;; $Id: gboxed.lisp,v 1.6 2001/10/21 22:02:01 espen Exp $
 
 (in-package "GLIB")
 
@@ -39,24 +39,24 @@ (defbinding %boxed-free (type location) nil
 ;;;; Metaclass for boxed classes
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
-  (defclass boxed-class (proxy-class)))
+  (defclass boxed-class (proxy-class))
 
 
-(defmethod shared-initialize ((class boxed-class) names
-                             &rest initargs &key name alien-name)
-  (declare (ignore initargs names))
-  (call-next-method)
+  (defmethod shared-initialize ((class boxed-class) names
+                               &rest initargs &key name alien-name)
+    (declare (ignore initargs 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)))
-        (type-number
-         (find-type-number
-          (or (first alien-name) (default-alien-type-name class-name)))))
-    (register-type class-name type-number)))
 
-
-(defmethod validate-superclass
+  (defmethod validate-superclass
     ((class boxed-class) (super pcl::standard-class))
-  (subtypep (class-name super) 'boxed))
+    (subtypep (class-name super) 'boxed)))
 
 
 ;;;; 
@@ -67,4 +67,35 @@ (defun expand-boxed-type (type-number &optional slots)
      (:metaclass boxed-class)
      (:alien-name ,(find-type-name type-number))))
 
-(register-derivable-type 'boxed "GBoxed" :expand 'expand-boxed-type)
+(register-derivable-type 'boxed "GBoxed" '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)))
+