X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/1ea49abfbc5c39f9da9534d012de529c1185916d..4f805161e70cf5f9a07a8e20d819b4abe436022a:/glib/ffi.lisp

diff --git a/glib/ffi.lisp b/glib/ffi.lisp
index 6797b39..385a7c4 100644
--- a/glib/ffi.lisp
+++ b/glib/ffi.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: ffi.lisp,v 1.14 2005-02-14 17:49:17 espen Exp $
+;; $Id: ffi.lisp,v 1.18 2005-03-13 18:06:51 espen Exp $
 
 (in-package "GLIB")
 
@@ -128,9 +128,10 @@
 	     (alien-parameters `(addr ,var))
 	     (alien-bindings
 	      `(,var ,declaration
-		,(if (eq style :in-out)
-		     (to-alien-form expr type)
-		   (make-pointer 0))))
+		,@(cond 
+		   ((eq style :in-out) (list (to-alien-form expr type)))
+		   ((eq declaration 'system-area-pointer) 
+		    (list '(make-pointer 0))))))
 	     (return-values (from-alien-form var type)))
 	    ((eq style :return)
 	     (alien-types declaration)
@@ -206,10 +207,14 @@
 			  `(,name ,(alien-type type))))
 		    args))
        ,(to-alien-form 
-	 `(let (,@(mapcar #'(lambda (arg)
-			      (destructuring-bind (name type) arg
-				`(,name ,(from-alien-form name type))))
-			  args))
+	 `(let (,@(delete nil
+		     (mapcar #'(lambda (arg)
+				 (destructuring-bind (name type) arg
+				   (let ((from-alien 
+					  (from-alien-form name type)))
+				     (unless (eq name from-alien)
+				       `(,name ,from-alien)))))
+		      args)))
 	    ,@body)
 	 return-type))))
 
@@ -217,6 +222,8 @@
 (defun callback (af)
   (sb-alien:alien-function-sap af))
 
+#+sbcl
+(deftype callback () 'sb-alien:alien-function)
 
 ;;;; Definitons and translations of fundamental types
 
@@ -460,6 +467,15 @@
   (declare (ignore type args))
   +size-of-float+)
 
+(defmethod to-alien-form (form (type (eql 'single-float)) &rest args)
+  (declare (ignore type args))
+  `(coerce ,form 'single-float))
+
+(defmethod to-alien-function ((type (eql 'single-float)) &rest args)
+  (declare (ignore type args))
+  #'(lambda (number)
+      (coerce number 'single-float)))
+
 (defmethod writer-function ((type (eql 'single-float)) &rest args)
   (declare (ignore type args))
   #'(lambda (value location &optional (offset 0))
@@ -479,6 +495,15 @@
   (declare (ignore type args))
   +size-of-double+)
 
+(defmethod to-alien-form (form (type (eql 'double-float)) &rest args)
+  (declare (ignore type args))
+  `(coerce ,form 'double-float))
+
+(defmethod to-alien-function ((type (eql 'double-float)) &rest args)
+  (declare (ignore type args))
+  #'(lambda (number)
+      (coerce number 'double-float)))
+
 (defmethod writer-function ((type (eql 'double-float)) &rest args)
   (declare (ignore type args))
   #'(lambda (value location &optional (offset 0))
@@ -808,3 +833,56 @@
 (defmethod writer-function ((type (eql 'copy-of)) &rest args)
   (declare (ignore type))
   (writer-function (first args)))
+
+
+(defmethod alien-type ((type (eql 'callback)) &rest args)
+  (declare (ignore type args))
+  (alien-type 'pointer))
+
+(defmethod size-of ((type (eql 'callback)) &rest args)
+  (declare (ignore type args))
+  (size-of 'pointer))
+
+(defmethod to-alien-form (callback (type (eql 'callback)) &rest args)
+  (declare (ignore type args))
+  #+cmu `(callback ,callback)
+  #+sbcl `(sb-alien:alien-function-sap ,callback))
+
+(defmethod to-alien-function ((type (eql 'callback)) &rest args)
+  (declare (ignore type args))
+  #+cmu #'(lambda (callback) (callback callback))
+  #+sbcl #'sb-alien:alien-function-sap)
+
+#+cmu
+(defun find-callback (pointer)
+  (find pointer alien::*callbacks* :key #'callback-trampoline :test #'sap=))
+
+(defmethod from-alien-form (pointer (type (eql 'callback)) &rest args)
+  (declare (ignore type args))
+  #+cmu  `(find-callback ,pointer)
+  #+sbcl `(sb-alien::%find-alien-function ,pointer))
+
+(defmethod from-alien-function ((type (eql 'callback)) &rest args)
+  (declare (ignore type args))
+  #+cmu  #'find-callback
+  #+sbcl #'sb-alien::%find-alien-function)
+
+(defmethod writer-function ((type (eql 'callback)) &rest args)
+  (declare (ignore type args))
+  (let ((writer (writer-function 'pointer))
+	(to-alien (to-alien-function 'callback)))
+    #'(lambda (callback location &optional (offset 0))
+	(funcall writer (funcall to-alien callback) location offset))))
+
+(defmethod reader-function ((type (eql 'callback)) &rest args)
+  (declare (ignore type args))
+  (let ((reader (reader-function 'pointer))
+	(from-alien (from-alien-function 'callback)))
+  #'(lambda (location &optional (offset 0))
+      (let ((pointer (funcall reader location offset)))
+	(unless (null-pointer-p pointer)
+	  (funcall from-alien pointer))))))
+
+(defmethod unbound-value ((type (eql 'callback)) &rest args)
+  (declare (ignore type args))
+  (values t nil))