X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/4d83a8a641bfaeb0d858fbf37524f3d3b9b81a6e..a666b391b604d3afe86079e064e648d9062430ef:/glib/glib.lisp

diff --git a/glib/glib.lisp b/glib/glib.lisp
index 8817459..43eb8bc 100644
--- a/glib/glib.lisp
+++ b/glib/glib.lisp
@@ -1,382 +1,490 @@
-;; Common Lisp bindings for GTK+ v1.2.x
-;; Copyright (C) 1999 Espen S. Johnsen <espejohn@online.no>
+;; Common Lisp bindings for GTK+ 2.x
+;; Copyright 1999-2005 Espen S. Johnsen <espen@users.sf.net>
 ;;
-;; This library is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU Lesser General Public
-;; License as published by the Free Software Foundation; either
-;; version 2 of the License, or (at your option) any later version.
+;; Permission is hereby granted, free of charge, to any person obtaining
+;; a copy of this software and associated documentation files (the
+;; "Software"), to deal in the Software without restriction, including
+;; without limitation the rights to use, copy, modify, merge, publish,
+;; distribute, sublicense, and/or sell copies of the Software, and to
+;; permit persons to whom the Software is furnished to do so, subject to
+;; the following conditions:
 ;;
-;; This library is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;; Lesser General Public License for more details.
+;; The above copyright notice and this permission notice shall be
+;; included in all copies or substantial portions of the Software.
 ;;
-;; You should have received a copy of the GNU Lesser General Public
-;; License along with this library; if not, write to the Free Software
-;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+;; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+;; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+;; IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+;; CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-;; $Id: glib.lisp,v 1.13 2004-10-27 14:58:59 espen Exp $
+;; $Id: glib.lisp,v 1.44 2008-10-08 18:11:12 espen Exp $
 
 
 (in-package "GLIB")
 
 (use-prefix "g")
 
-;(load-shared-library "libglib-2.0")
+#-sb-thread
+(progn
+  (defun make-mutex ()
+    nil)
+  
+  (defmacro with-mutex ((mutex) &body body)
+    (declare (ignore mutex))
+    `(progn ,@body)))
+
 
 ;;;; Memory management
 
-(defbinding (allocate-memory "g_malloc0") () pointer
-  (size unsigned-long))
+(deftype gsize () 'unsigned-int)
 
-(defbinding (reallocate-memory "g_realloc") () pointer
-  (address pointer)
-  (size unsigned-long))
+(defbinding malloc0 () pointer
+  (size gsize))
 
-(defbinding (deallocate-memory "g_free") () nil
+(defbinding free () nil
   (address pointer))
-;(defun deallocate-memory (address)
-;  (declare (ignore address)))
-
-(defun copy-memory (from length &optional (to (allocate-memory length)))
-  (kernel:system-area-copy from 0 to 0 (* 8 length))
-  to)
 
+(setf *memory-allocator* #'malloc0)
+(setf *memory-deallocator* #'free)
 
-;;;; User data mechanism
+(defbinding (reallocate-memory "g_realloc") () pointer
+  (address pointer)
+  (size gsize))
 
-(internal *user-data* *user-data-count*)
+(defbinding (slice-alloc "g_slice_alloc0") () pointer
+  (block-size gsize))
 
-(declaim (fixnum *user-data-count*))
+;;;; User data is a mechanism to store references to lisp objects in
+;;;; foreign code
 
-(defvar *destroy-notify* (system:foreign-symbol-address "destroy_notify"))
+(defvar *user-data-lock* (make-mutex))
 (defvar *user-data* (make-hash-table))
-(defvar *user-data-count* 0)
+(defvar *user-data-next-id* 1)
 
 (defun register-user-data (object &optional destroy-function)
   (check-type destroy-function (or null symbol function))
-  (incf *user-data-count*)
-  (setf
-   (gethash *user-data-count* *user-data*)
-   (cons object destroy-function))
-  *user-data-count*)
+  (with-mutex (*user-data-lock*)
+    (setf
+     (gethash *user-data-next-id* *user-data*)
+     (cons object destroy-function))
+    (1- (incf *user-data-next-id*))))
 
 (defun find-user-data (id)
   (check-type id fixnum)
-  (multiple-value-bind (user-data p) (gethash id *user-data*)
-    (values (car user-data) p)))
+  (with-mutex (*user-data-lock*)
+    (multiple-value-bind (user-data p) (gethash id *user-data*)
+      (values (car user-data) p))))
+
+(defun user-data-exists-p (id)
+  (nth-value 1 (find-user-data id)))
+
+(defun update-user-data (id object)
+  (check-type id fixnum)
+  (with-mutex (*user-data-lock*)
+    (multiple-value-bind (user-data exists-p) (gethash id *user-data*)
+      (cond
+       ((not exists-p) (error "User data id ~A does not exist" id))
+       (t 
+	(when (cdr user-data)
+	  (funcall (cdr user-data) (car user-data)))
+	(setf (car user-data) object))))))
 
 (defun destroy-user-data (id)
   (check-type id fixnum)
-  (let ((user-data (gethash id *user-data*)))
-    (when (cdr user-data)
-      (funcall (cdr user-data) (car user-data))))
-  (remhash id *user-data*))
+  (with-mutex (*user-data-lock*)
+    (multiple-value-bind (user-data exists-p) (gethash id *user-data*)
+      (cond
+;       ((not exists-p) (error "User data id ~A does not exist" id))
+       (t
+	(when (cdr user-data)
+	  (funcall (cdr user-data) (car user-data)))
+	(remhash id *user-data*))))))
+
+(defun take-user-data (id)
+  (check-type id fixnum)
+  (multiple-value-bind (user-data exists-p) (gethash id *user-data*)
+    (cond
+      ((not exists-p) (error "User data id ~A does not exist" id))
+      (t 
+	(when (cdr user-data)
+	  (funcall (cdr user-data) (car user-data)))
+	(remhash id *user-data*)
+	(car user-data)))))
 
+(defmacro with-user-data ((var object) &body body)
+  `(let ((,var (register-user-data ,object)))
+     (unwind-protect
+	  ,@body
+       (destroy-user-data ,var))))
 
 
-;;;; Quarks
+(deftype user-data-id () 'pointer-data)
 
-(internal *quark-counter* *quark-from-object* *quark-to-object*)
 
-(deftype quark () 'unsigned)
+;;;; Quarks
 
-;(defbinding %quark-get-reserved () quark)
+(deftype quark () 'unsigned)
 
 (defbinding %quark-from-string () quark
   (string string))
 
-(defvar *quark-counter* 0)
-
-(defun %quark-get-reserved ()
-  ;; The string is just a dummy
-  (%quark-from-string (format nil "#@£$%&-quark-~D" (incf *quark-counter*))))
-
-(defvar *quark-from-object* (make-hash-table))
-(defvar *quark-to-object* (make-hash-table))
-
-(defun quark-from-object (object &key (test #'eq))
-  (let ((hash-code (sxhash object)))
-    (or
-     (assoc-ref object (gethash hash-code *quark-from-object*) :test test)
-     (let ((quark (%quark-get-reserved)))
-       (setf
-	(gethash hash-code *quark-from-object*)
-	(append
-	 (gethash hash-code *quark-from-object*)
-	 (list (cons object quark))))
-       (setf (gethash quark *quark-to-object*) object)
-       quark))))
-
-(defun quark-to-object (quark) 
-  (gethash quark *quark-to-object*))
-  
-(defun remove-quark (quark)
-  (let* ((object (gethash quark *quark-to-object*))
-	 (hash-code (sxhash object)))
-    (remhash quark *quark-to-object*)
-    (unless (setf
-	     (gethash hash-code *quark-from-object*)
-	     (assoc-delete object (gethash hash-code *quark-from-object*)))
-      (remhash hash-code *quark-from-object*))))
+(defun quark-intern (object)
+  (etypecase object
+    (quark object)
+    (string (%quark-from-string object))
+    (symbol (%quark-from-string (format nil "clg-~A:~A" 
+				 (package-name (symbol-package object)) 
+				 object)))))
 
+(defbinding quark-to-string () (static string)
+  (quark quark))
 
 
 ;;;; Linked list (GList)
 
-(deftype glist (type) `(or (null (cons ,type list))))
-
-(defbinding (%glist-append-unsigned "g_list_append") () pointer
-  (glist pointer)
-  (data unsigned))
+(deftype glist (type) 
+  `(or null (cons ,type list)))
 
-(defbinding (%glist-append-signed "g_list_append") () pointer
-  (glist pointer)
-  (data signed))
+(defbinding (%glist-prepend "g_list_prepend") () pointer
+  (glist (or null pointer))
+  (nil null))
 
-(defbinding (%glist-append-sap "g_list_append") () pointer
-  (glist pointer)
-  (data pointer))
+(defbinding (%glist-reverse "g_list_reverse") () pointer
+  (glist (or null pointer)))
 
-(defmacro glist-append (glist value type-spec)
-  (ecase (first (mklist (translate-type-spec type-spec)))
-    (unsigned `(%glist-append-unsigned ,glist ,value))
-    (signed `(%glist-append-signed ,glist ,value))
-    (system-area-pointer `(%glist-append-sap ,glist ,value))))
-
-(defmacro glist-data (glist type-spec)
-  (ecase (first (mklist (translate-type-spec type-spec)))
-    (unsigned `(sap-ref-unsigned ,glist 0))
-    (signed `(sap-ref-signed ,glist 0))
-    (system-area-pointer `(sap-ref-sap ,glist 0))))
+(defun make-glist (element-type list &optional temp-p)
+  (let ((writer (if (functionp element-type)
+		    element-type
+		  (writer-function element-type :temp temp-p))))
+    (loop
+     for element in list
+     as glist = (%glist-prepend nil) then (%glist-prepend glist)
+     do (funcall writer element glist)
+     finally (return (%glist-reverse glist)))))
 
 (defun glist-next (glist)
   (unless (null-pointer-p glist)
-    (sap-ref-sap glist +size-of-sap+)))
+    (ref-pointer glist #.(size-of 'pointer))))
   
+;; Also used for gslists
+(defun map-glist (seqtype function glist element-type &optional (ref :read))
+  (let ((reader (if (functionp element-type)
+		    element-type
+		  (reader-function element-type :ref ref))))
+    (case seqtype 
+     ((nil)
+      (loop
+       as element = glist then (glist-next element)
+       until (null-pointer-p element)
+       do (funcall function (funcall reader element))))
+     (list
+      (loop
+       as element = glist then (glist-next element)
+       until (null-pointer-p element)
+       collect (funcall function (funcall reader element))))
+     (t
+      (coerce 
+       (loop
+	as element = glist then (glist-next element)
+	until (null-pointer-p element)
+	collect (funcall function (funcall reader element)))
+       seqtype)))))
+
 (defbinding (glist-free "g_list_free") () nil
   (glist pointer))
 
-(deftype-method translate-type-spec glist (type-spec)
-  (declare (ignore type-spec))
-  (translate-type-spec 'pointer))
+(defun destroy-glist (glist element-type &optional temp-p)
+  (let ((destroy (if (functionp element-type)
+		     element-type
+		   (destroy-function element-type :temp temp-p))))
+    (loop
+     as element = glist then (glist-next element)
+     until (null-pointer-p element)
+     do (funcall destroy element)))
+  (glist-free glist))
+
+(define-type-method alien-type ((type glist))
+  (declare (ignore type))
+  (alien-type 'pointer))
 
-(deftype-method size-of glist (type-spec)
-  (declare (ignore type-spec))
+(define-type-method argument-type ((type glist))
+  'list)
+
+(define-type-method return-type ((type glist))
+  'list)
+
+(define-type-method size-of ((type glist) &key inlined)
+  (assert-not-inlined type inlined)
   (size-of 'pointer))
 
-(deftype-method translate-to-alien glist (type-spec list &optional weak-ref)
-  (declare (ignore weak-ref))
-  (let* ((element-type (second (type-expand-to 'glist type-spec)))
-	 (element (translate-to-alien element-type 'element)))
-    `(let ((glist (make-pointer 0))) 
-       (dolist (element ,list glist)
-	 (setq glist (glist-append glist ,element ,element-type))))))
-
-(deftype-method translate-from-alien
-    glist (type-spec glist &optional weak-ref)
-  (let ((element-type (second (type-expand-to 'glist type-spec))))
-    `(let ((glist ,glist)
-	   (list nil))
-       (do ((tmp glist (glist-next tmp)))
-	   ((null-pointer-p tmp))
-	 (push
-	  ,(translate-from-alien
-	    element-type `(glist-data tmp ,element-type) weak-ref)
-	  list))
-       ,(unless weak-ref
-	  '(glist-free glist))
-       (nreverse list))))
-
-(deftype-method cleanup-alien glist (type-spec glist &optional weak-ref)
-  (when weak-ref
-    (unreference-alien type-spec glist)))
-
-(deftype-method unreference-alien glist (type-spec glist)
-  (let ((element-type (second (type-expand-to 'glist type-spec))))
-    `(let ((glist ,glist))
-       (unless (null-pointer-p glist)
-	 ,(unless (atomic-type-p element-type)
-	    `(do ((tmp glist (glist-next tmp)))
-		 ((null-pointer-p tmp))
-	       ,(unreference-alien
-		 element-type `(glist-data tmp ,element-type))))
-	 (glist-free glist)))))
+(define-type-method type-alignment ((type glist) &key inlined)
+  (assert-not-inlined type inlined)
+  (type-alignment 'pointer))
+
+(define-type-method alien-arg-wrapper ((type glist) var list style form &optional copy-in-p)
+  (destructuring-bind (element-type) (rest (type-expand-to 'glist type))
+    (cond
+      ((and (in-arg-p style) (not (out-arg-p style)))
+       `(with-pointer (,var (make-glist ',element-type ,list ,(not copy-in-p)))
+	  (unwind-protect
+	      ,form
+	    ,(unless copy-in-p
+	       `(destroy-glist ,var ',element-type t)))))
+      ((and (in-arg-p style) (out-arg-p style))
+       (let ((glist (make-symbol "GLIST")))
+	 `(with-pointer (,glist (make-glist ',element-type ,list ,(not copy-in-p)))
+            (with-pointer (,var ,glist)		      
+	      (unwind-protect
+		  ,form
+		,(unless copy-in-p
+		   `(destroy-glist ,glist ',element-type t)))))))
+      ((and (out-arg-p style) (not (in-arg-p style)))
+       `(with-pointer (,var)
+	  ,form)))))
+
+(define-type-method to-alien-form ((type glist) list &optional copy-p)
+  (declare (ignore copy-p))
+  (destructuring-bind (element-type) (rest (type-expand-to 'glist type))
+    `(make-glist ',element-type ,list)))
+
+(define-type-method to-alien-function ((type glist) &optional copy-p)
+  (destructuring-bind (element-type) (rest (type-expand-to 'glist type))
+    (values
+     #'(lambda (list)
+	 (make-glist element-type list (not copy-p)))
+     (unless copy-p
+       #'(lambda (list glist)
+	   (declare (ignore list))
+	   (destroy-glist glist element-type t))))))
+
+(define-type-method from-alien-form ((type glist) form &key (ref :free))
+  (destructuring-bind (element-type) (rest (type-expand-to 'glist type))
+    `(let ((glist ,form))
+       (unwind-protect
+	   (map-glist 'list #'identity glist ',element-type 
+	    ,(ecase ref (:free :get) ((:static :temp) :peek) (:copy :read)))
+	 ,(when (eq ref :free)
+	    `(destroy-glist glist ',element-type))))))
+
+(define-type-method from-alien-function ((type glist) &key (ref :free))
+  (destructuring-bind (element-type) (rest (type-expand-to 'glist type))
+    (ecase ref
+      (:free 
+       #'(lambda (glist)
+	   (prog1
+	       (map-glist 'list #'identity glist element-type :get)
+	     (glist-free glist))))
+      (:copy
+       #'(lambda (glist)
+	   (map-glist 'list #'identity glist element-type :read)))
+      ((:static :temp)
+       #'(lambda (glist)
+	   (map-glist 'list #'identity glist element-type :peek))))))
+
+(define-type-method writer-function ((type glist) &key temp inlined)
+  (assert-not-inlined type inlined)
+  (let ((element-type (second (type-expand-to 'glist type))))
+    #'(lambda (list location &optional (offset 0))
+	(setf 
+	 (ref-pointer location offset)
+	 (make-glist element-type list temp)))))
+
+(define-type-method reader-function ((type glist) &key (ref :read) inlined)
+  (assert-not-inlined type inlined)
+  (let ((element-type (second (type-expand-to 'glist type))))
+    (ecase ref
+      ((:read :peek)
+       #'(lambda (location &optional (offset 0))
+	   (unless (null-pointer-p (ref-pointer location offset))
+	     (map-glist 'list #'identity (ref-pointer location offset) element-type ref))))
+      (:get
+       #'(lambda (location &optional (offset 0))
+	   (unless (null-pointer-p (ref-pointer location offset))
+	     (prog1
+		 (map-glist 'list #'identity (ref-pointer location offset) element-type :get)
+	       (glist-free (ref-pointer location offset))
+	       (setf (ref-pointer location offset) (make-pointer 0)))))))))
+
+(define-type-method destroy-function ((type glist) &key temp inlined)
+  (assert-not-inlined type inlined)
+  (let ((element-type (second (type-expand-to 'glist type))))
+    #'(lambda (location &optional (offset 0))
+	(unless (null-pointer-p (ref-pointer location offset))
+	  (destroy-glist (ref-pointer location offset) element-type temp)
+	  (setf (ref-pointer location offset) (make-pointer 0))))))
+
+(define-type-method copy-function ((type glist) &key inlined)
+  (assert-not-inlined type inlined)
+  (destructuring-bind (element-type) (rest (type-expand-to 'glist type))
+    (let ((copy-element (copy-function element-type)))
+      #'(lambda (from to &optional (offset 0))
+	  (unless (null-pointer-p (ref-pointer from offset))
+	    (loop
+	     as from-list = (ref-pointer from offset) then (glist-next from-list)
+	     as to-list = (%glist-prepend nil) then (%glist-prepend to-list)
+	     do (funcall copy-element from-list to-list)
+	     while (glist-next from-list)
+	     finally (setf (ref-pointer to offset) (%glist-reverse to-list))))))))
 
 
 ;;;; Single linked list (GSList)
 
-(deftype gslist (type) `(or (null (cons ,type list))))
+(deftype gslist (type) `(or null (cons ,type list)))
 
-(defbinding (%gslist-prepend-unsigned "g_slist_prepend") () pointer
+(defbinding (%gslist-prepend "g_slist_prepend") () pointer
   (gslist pointer)
-  (data unsigned))
+  (nil null))
 
-(defbinding (%gslist-prepend-signed "g_slist_prepend") () pointer
-  (gslist pointer)
-  (data signed))
+(defbinding (%gslist-append "g_slist_append") () pointer
+  (glist (or null pointer))
+  (nil null))
 
-(defbinding (%gslist-prepend-sap "g_slist_prepend") () pointer
-  (gslist pointer)
-  (data pointer))
 
-(defmacro gslist-prepend (gslist value type-spec)
-  (ecase (first (mklist (translate-type-spec type-spec)))
-    (unsigned `(%gslist-prepend-unsigned ,gslist ,value))
-    (signed `(%gslist-prepend-signed ,gslist ,value))
-    (system-area-pointer `(%gslist-prepend-sap ,gslist ,value))))
-  
+(defun make-gslist (element-type list &optional temp-p)
+  (let ((writer (if (functionp element-type)
+		    element-type
+		  (writer-function element-type :temp temp-p))))
+    (loop
+     for element in (reverse list)
+     as gslist = (%gslist-prepend (make-pointer 0)) then (%gslist-prepend gslist)
+     do (funcall writer element gslist)
+     finally (return gslist))))
+
 (defbinding (gslist-free "g_slist_free") () nil
   (gslist pointer))
 
-(deftype-method translate-type-spec gslist (type-spec)
-  (declare (ignore type-spec))
-  (translate-type-spec 'pointer))
+(defun destroy-gslist (gslist element-type &optional temp-p)
+  (loop
+   with destroy = (destroy-function element-type :temp temp-p)
+   as element = gslist then (glist-next element)
+   until (null-pointer-p element)
+   do (funcall destroy element 0))
+  (gslist-free gslist))
 
-(deftype-method size-of gslist (type-spec)
-  (declare (ignore type-spec))
-  (size-of 'pointer))
+(define-type-method alien-type ((type gslist))
+  (declare (ignore type))
+  (alien-type 'pointer))
+
+(define-type-method argument-type ((type gslist))
+  'list)
+
+(define-type-method return-type ((type gslist))
+  'list)
 
-(deftype-method translate-to-alien gslist (type-spec list &optional weak-ref)
-  (declare (ignore weak-ref))
-  (let* ((element-type (second (type-expand-to 'gslist type-spec)))
-	 (element (translate-to-alien element-type 'element)))
-    `(let ((gslist (make-pointer 0))) 
-       (dolist (element (reverse ,list) gslist)
-	 (setq gslist (gslist-prepend gslist ,element ,element-type))))))
-
-(deftype-method translate-from-alien
-    gslist (type-spec gslist &optional weak-ref)
-  (let ((element-type (second (type-expand-to 'gslist type-spec))))
-    `(let ((gslist ,gslist)
-	   (list nil))
-       (do ((tmp gslist (glist-next tmp)))
-	   ((null-pointer-p tmp))
-	 (push
-	  ,(translate-from-alien
-	    element-type `(glist-data tmp ,element-type) weak-ref)
-	  list))
-       ,(unless weak-ref
-	  '(gslist-free gslist))
-       (nreverse list))))
-
-(deftype-method cleanup-alien gslist (type-spec gslist &optional weak-ref)
-  (when weak-ref
-    (unreference-alien type-spec gslist)))
-
-(deftype-method unreference-alien gslist (type-spec gslist)
-  (let ((element-type (second (type-expand-to 'gslist type-spec))))
-    `(let ((gslist ,gslist))
-       (unless (null-pointer-p gslist)
-	 ,(unless (atomic-type-p element-type)
-	    `(do ((tmp gslist (glist-next tmp)))
-		 ((null-pointer-p tmp))
-	       ,(unreference-alien
-		 element-type `(glist-data tmp ,element-type))))
-	 (gslist-free gslist)))))
-
-
-
-;;; Vector
-
-(defvar *magic-end-of-array* (allocate-memory 1))
-
-(deftype-method translate-type-spec vector (type-spec)
-  (declare (ignore type-spec))
-  (translate-type-spec 'pointer))
-
-(deftype-method size-of vector (type-spec)
-  (declare (ignore type-spec))
+(define-type-method size-of ((type gslist) &key inlined)
+  (assert-not-inlined type inlined)
   (size-of 'pointer))
 
-(deftype-method translate-to-alien vector (type-spec vector &optional weak-ref)
-  (declare (ignore weak-ref))
-  (destructuring-bind (element-type &optional (length '*))
-      (cdr (type-expand-to 'vector type-spec))
-    (let* ((element-size (size-of element-type))
-	   (size (cond
-		  ((not (eq length '*))
-		   (* element-size length))
-		  ((not (atomic-type-p element-type))
-		   `(* ,element-size (1+ (length vector))))
-		  (t
-		   `(* ,element-size (length vector))))))
-	  
-      `(let ((vector ,vector))
-	 (let ((c-vector (allocate-memory ,size)))
-	   (dotimes (i ,(if (eq length '*) '(length vector) length))
-	     (setf
-	      (,(sap-ref-fname element-type) c-vector (* i ,element-size))
-	      ,(translate-to-alien element-type '(aref vector i))))
-	   ,(when (and
-		   (eq length '*)
-		   (not (atomic-type-p element-type)))
-	      `(setf
-		(sap-ref-sap c-vector (* (length vector) ,element-size))
-		*magic-end-of-array*))
-	   c-vector)))))
-
-(deftype-method translate-from-alien
-    vector (type-spec c-array &optional weak-ref)
-  (destructuring-bind (element-type &optional (length '*))
-      (cdr (type-expand-to 'vector type-spec))
-    (when (eq length '*)
-      (error "Can't use vectors of variable length as return type"))
-    (let ((element-size (size-of element-type)))
-      `(let ((c-array ,c-array)
-	     (vector (make-array ,length :element-type ',element-type)))
-	 (dotimes (i ,length)
-	   (setf
-	    (aref vector i)
-	    ,(translate-from-alien
-	      element-type
-	      `(,(sap-ref-fname element-type) c-array (* i ,element-size))
-	      weak-ref)))
-	 ,(unless weak-ref
-	    '(deallocate-memory c-vector))
-	 vector))))
-	 
-
-(deftype-method cleanup-alien vector (type-spec c-vector &optional weak-ref)
-  (when weak-ref
-    (unreference-alien type-spec c-vector)))
-
-(deftype-method unreference-alien vector (type-spec c-vector)
-  (destructuring-bind (element-type &optional (length '*))
-      (cdr (type-expand-to 'vector type-spec))
-    `(let ((c-vector ,c-vector))
-       (unless (null-pointer-p c-vector)
-	 ,(unless (atomic-type-p element-type)
-	    (let ((element-size (size-of element-type)))
-	      (if (not (eq length '*))
-		  `(dotimes (i ,length)
-		     (unreference-alien
-		      element-type (sap-ref-sap c-vector (* i ,element-size))))
-		`(do ((offset 0 (+ offset ,element-size)))
-		      ((sap=
-			(sap-ref-sap c-vector offset)
-			*magic-end-of-array*))
-		     ,(unreference-alien
-		       element-type '(sap-ref-sap c-vector offset))))))
-	 (deallocate-memory c-vector)))))
-
-
-(defun map-c-array (seqtype function location element-type length)
-  (let ((reader (intern-reader-function element-type))
-	(size (size-of element-type)))
-    (case seqtype 
-     ((nil)
-      (dotimes (i length)
-	(funcall function (funcall reader location (* i size)))))
-     (list
-      (let ((list nil))
-	(dotimes (i length)
-	  (push (funcall function (funcall reader location (* i size))) list))
-	(nreverse list)))
-     (t
-      (let ((sequence (make-sequence seqtype length)))
-	(dotimes (i length)
-	  (setf
-	   (elt sequence i)
-	   (funcall function (funcall reader location (* i size)))))
-	sequence)))))
+(define-type-method type-alignment ((type gslist) &key inlined)
+  (assert-not-inlined type inlined)
+  (type-alignment 'pointer))
+
+(define-type-method alien-arg-wrapper ((type gslist) var list style form &optional copy-in-p)
+  (destructuring-bind (element-type) (rest (type-expand-to 'gslist type))
+    (cond
+      ((and (in-arg-p style) (not (out-arg-p style)))
+       `(with-pointer (,var (make-gslist ',element-type ,list ,(not copy-in-p)))
+	  (unwind-protect
+	      ,form
+	    ,(unless copy-in-p
+	       `(destroy-gslist ,var ',element-type t)))))
+      ((and (in-arg-p style) (out-arg-p style))
+       (let ((gslist (make-symbol "GSLIST")))
+	 `(with-pointer (,gslist (make-gslist ',element-type ,list ,(not copy-in-p)))
+            (with-pointer (,var ,gslist)		      
+	      (unwind-protect
+		  ,form
+		,(unless copy-in-p
+		   `(destroy-gslist ,gslist ',element-type t)))))))
+      ((and (out-arg-p style) (not (in-arg-p style)))
+       `(with-pointer (,var)
+	  ,form)))))
+
+(define-type-method to-alien-form ((type gslist) list &optional copy-p)
+  (declare (ignore copy-p))
+  (destructuring-bind (element-type) (rest (type-expand-to 'gslist type))
+    `(make-gslist ',element-type ,list)))
+
+(define-type-method to-alien-function ((type gslist) &optional copy-p)
+  (destructuring-bind (element-type) (rest (type-expand-to 'gslist type))
+    (values
+     #'(lambda (list)
+	 (make-gslist element-type list (not copy-p)))
+     (unless copy-p
+       #'(lambda (list gslist)
+	   (declare (ignore list))
+	   (destroy-gslist gslist element-type t))))))
+
+(define-type-method from-alien-form ((type gslist) form &key (ref :free))
+  (destructuring-bind (element-type) (rest (type-expand-to 'gslist type))
+    `(let ((gslist ,form))
+       (unwind-protect
+	   (map-glist 'list #'identity gslist ',element-type
+	    ,(ecase ref (:free :get) ((:static :temp) :peek) (:copy :read)))
+	 ,(when (eq ref :free)
+	    `(destroy-gslist gslist ',element-type))))))
+
+(define-type-method from-alien-function ((type gslist)  &key (ref :free))
+  (destructuring-bind (element-type) (rest (type-expand-to 'gslist type))
+    (ecase ref
+      (:free 
+       #'(lambda (glist)
+	   (prog1
+	       (map-glist 'list #'identity glist element-type :get)
+	     (gslist-free glist))))
+      (:copy
+       #'(lambda (glist)
+	   (map-glist 'list #'identity glist element-type :read)))
+      ((:static :temp)
+       #'(lambda (glist)
+	   (map-glist 'list #'identity glist element-type :peek))))))
+
+(define-type-method writer-function ((type gslist) &key temp inlined)
+  (assert-not-inlined type inlined)
+  (destructuring-bind (element-type) (rest (type-expand-to 'gslist type))
+    (let ((element-writer (writer-function element-type :temp temp)))
+      #'(lambda (list location &optional (offset 0))
+	  (setf 
+	   (ref-pointer location offset)
+	   (make-gslist element-writer list))))))
+
+(define-type-method reader-function ((type gslist) &key (ref :read) inlined)
+  (assert-not-inlined type inlined)
+  (let ((element-type (second (type-expand-to 'gslist type))))
+    (ecase ref
+      ((:read :peek)
+       #'(lambda (location &optional (offset 0))
+	   (unless (null-pointer-p (ref-pointer location offset))
+	     (map-glist 'list #'identity (ref-pointer location offset) element-type ref))))
+      (:get
+       #'(lambda (location &optional (offset 0))
+	   (unless (null-pointer-p (ref-pointer location offset))
+	     (prog1
+		 (map-glist 'list #'identity (ref-pointer location offset) element-type :get)
+	       (gslist-free (ref-pointer location offset))
+	       (setf (ref-pointer location offset) (make-pointer 0)))))))))
+
+(define-type-method destroy-function ((type gslist) &key temp inlined)
+  (assert-not-inlined type inlined)
+  (let ((element-type (second (type-expand-to 'gslist type))))
+    #'(lambda (location &optional (offset 0))
+	(unless (null-pointer-p (ref-pointer location offset))
+	  (destroy-gslist (ref-pointer location offset) element-type temp)
+	  (setf (ref-pointer location offset) (make-pointer 0))))))
+
+(define-type-method copy-function ((type gslist) &key inlined)
+  (assert-not-inlined type inlined)
+  (destructuring-bind (element-type) (rest (type-expand-to 'gslist type))
+    (let ((copy-element (copy-function element-type)))
+      #'(lambda (from to &optional (offset 0))
+	  (unless (null-pointer-p (ref-pointer from offset))
+	    (loop
+	     as from-list = (ref-pointer from offset) 
+	                    then (glist-next from-list)
+	     as to-list = (setf (ref-pointer to offset) (%gslist-append nil)) 
+	                  then (%gslist-append to-list)
+	     do (funcall copy-element from-list to-list)
+	     while (glist-next from-list)))))))