X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/7e531ed54c9e67aa5a6f181dfe85c54ec7e5176c..c96c452a4938c33e24bb9736810b0c7bd9e7940d:/glib/glib.lisp?ds=inline

diff --git a/glib/glib.lisp b/glib/glib.lisp
index 20fbc89..8eccedb 100644
--- a/glib/glib.lisp
+++ b/glib/glib.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: glib.lisp,v 1.24 2005-01-30 14:26:41 espen Exp $
+;; $Id: glib.lisp,v 1.27 2005-02-14 00:44:26 espen Exp $
 
 
 (in-package "GLIB")
@@ -38,7 +38,9 @@ (defbinding (deallocate-memory "g_free") () nil
 ;;   (declare (ignore address)))
 
 (defun copy-memory (from length &optional (to (allocate-memory length)))
-  (kernel:system-area-copy from 0 to 0 (* 8 length))
+  (;#+cmu kernel:system-area-copy 
+   ;#+sbcl sb-impl::system-area-copy 
+   system-area-copy from 0 to 0 (* 8 length))
   to)
 
 
@@ -305,7 +307,7 @@ (defmethod copy-from-alien-form (gslist (type (eql 'gslist)) &rest args)
   (destructuring-bind (element-type) args
     `(map-glist 'list #'identity ,gslist ',element-type)))
 
-(defmethod from-alien-function ((type (eql 'gslist)) &rest args)
+(defmethod copy-from-alien-function ((type (eql 'gslist)) &rest args)
   (declare (ignore type))
   (destructuring-bind (element-type) args
     #'(lambda (gslist)
@@ -487,3 +489,104 @@ (defmethod destroy-function ((type (eql 'vector)) &rest args)
 	    (destroy-c-vector 
 	     (sap-ref-sap location offset) element-type length)
 	    (setf (sap-ref-sap location offset) (make-pointer 0)))))))
+
+
+;;;; Null terminated vector
+
+(defun make-0-vector (type content &optional location)
+  (let* ((size-of-type (size-of type))
+	 (location (or 
+		    location 
+		    (allocate-memory (* size-of-type (1+ (length content))))))
+	 (writer (writer-function type)))
+    (etypecase content
+      (vector
+       (loop
+	for element across content
+	as offset = 0 then (+ offset size-of-type)
+	do (funcall writer element location offset)
+	finally (setf (sap-ref-sap location offset) (make-pointer 0))))
+      (list
+       (loop
+	for element in content
+	as offset = 0 then (+ offset size-of-type)
+	do (funcall writer element location offset)
+	finally (setf (sap-ref-sap location (+ offset size-of-type)) (make-pointer 0)))))
+    location))
+
+
+(defun map-0-vector (seqtype function location element-type)
+  (let ((reader (reader-function element-type))
+	(size-of-element (size-of element-type)))
+    (case seqtype 
+     ((nil)
+      (loop
+       as offset = 0 then (+ offset size-of-element)
+       until (null-pointer-p (sap-ref-sap location offset))
+       do (funcall function (funcall reader location offset))))
+     (list
+      (loop
+       as offset = 0 then (+ offset size-of-element)
+       until (null-pointer-p (sap-ref-sap location offset))
+       collect (funcall function (funcall reader location offset))))
+     (t
+      (coerce 
+       (loop
+	as offset = 0 then (+ offset size-of-element)
+	until (null-pointer-p (sap-ref-sap location offset))
+	collect (funcall function (funcall reader location offset)))
+       seqtype)))))
+
+
+(defun destroy-0-vector (location element-type)
+  (loop
+   with destroy = (destroy-function element-type)
+   with element-size = (size-of element-type)
+   as offset = 0 then (+ offset element-size)
+   until (null-pointer-p (sap-ref-sap location offset))
+   do (funcall destroy location offset))
+  (deallocate-memory location))
+
+
+(defmethod alien-type ((type (eql 'null-terminated-vector)) &rest args)
+  (declare (ignore type args))
+  (alien-type 'pointer))
+
+(defmethod size-of ((type (eql 'null-terminated-vector)) &rest args)
+  (declare (ignore type args))
+  (alien-type 'pointer))
+
+(defmethod writer-function ((type (eql 'null-terminated-vector)) &rest args)
+  (declare (ignore type))
+  (destructuring-bind (element-type) args
+    (unless (eq (alien-type element-type) (alien-type 'pointer))
+      (error "Elements in null-terminated vectors need to be of pointer types"))
+    #'(lambda (vector location &optional (offset 0))
+	(setf 
+	 (sap-ref-sap location offset)
+	 (make-0-vector element-type vector)))))
+
+(defmethod reader-function ((type (eql 'null-terminated-vector)) &rest args)
+  (declare (ignore type))
+  (destructuring-bind (element-type) args
+    (unless (eq (alien-type element-type) (alien-type 'pointer))
+      (error "Elements in null-terminated vectors need to be of pointer types"))
+    #'(lambda (location &optional (offset 0))
+	(unless (null-pointer-p (sap-ref-sap location offset))
+	  (map-0-vector 'vector #'identity (sap-ref-sap location offset) 
+	   element-type)))))
+
+(defmethod destroy-function ((type (eql 'null-terminated-vector)) &rest args)
+  (declare (ignore type))
+  (destructuring-bind (element-type) args
+    (unless (eq (alien-type element-type) (alien-type 'pointer))
+      (error "Elements in null-terminated vectors need to be of pointer types"))
+    #'(lambda (location &optional (offset 0))
+	  (unless (null-pointer-p (sap-ref-sap location offset))
+	    (destroy-0-vector 
+	     (sap-ref-sap location offset) element-type)
+	    (setf (sap-ref-sap location offset) (make-pointer 0))))))
+
+(defmethod unbound-value ((type (eql 'null-terminated-vector)) &rest args)
+  (declare (ignore type args))
+  (values t nil))