X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/fefc2058be7aeb252fed99dbe1413e2c3aee179f..6896c0f3344ff5cdf23bdd634a9413c782bdcbd7:/glib/ffi.lisp diff --git a/glib/ffi.lisp b/glib/ffi.lisp index 29dddd0..56fe1da 100644 --- a/glib/ffi.lisp +++ b/glib/ffi.lisp @@ -1,5 +1,5 @@ ;; Common Lisp bindings for GTK+ v2.0 -;; Copyright (C) 1999-2001 Espen S. Johnsen +;; Copyright (C) 1999-2005 Espen S. Johnsen ;; ;; This library is free software; you can redistribute it and/or ;; modify it under the terms of the GNU Lesser General Public @@ -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.15 2005-02-15 15:28:15 espen Exp $ +;; $Id: ffi.lisp,v 1.19 2005-04-17 21:49:19 espen Exp $ (in-package "GLIB") @@ -207,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)))) @@ -218,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 @@ -461,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)) @@ -480,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)) @@ -522,23 +546,32 @@ (declare (ignore type args)) `(let ((string ,string)) ;; Always copy strings to prevent seg fault due to GC + #+cmu (copy-memory (vector-sap (coerce string 'simple-base-string)) - (1+ (length string))))) + (1+ (length string))) + #+sbcl + (let ((utf8 (%deport-utf8-string string))) + (copy-memory (vector-sap utf8) (length utf8))))) (defmethod to-alien-function ((type (eql 'string)) &rest args) (declare (ignore type args)) #'(lambda (string) + #+cmu (copy-memory (vector-sap (coerce string 'simple-base-string)) - (1+ (length string))))) + (1+ (length string))) + #+sbcl + (let ((utf8 (%deport-utf8-string string))) + (copy-memory (vector-sap utf8) (length utf8))))) (defmethod from-alien-form (string (type (eql 'string)) &rest args) (declare (ignore type args)) `(let ((string ,string)) (unless (null-pointer-p string) (prog1 - (%naturalize-c-string string) + #+cmu(%naturalize-c-string string) + #+sbcl(%naturalize-utf8-string string) (deallocate-memory string))))) (defmethod from-alien-function ((type (eql 'string)) &rest args) @@ -546,7 +579,8 @@ #'(lambda (string) (unless (null-pointer-p string) (prog1 - (%naturalize-c-string string) + #+cmu(%naturalize-c-string string) + #+sbcl(%naturalize-utf8-string string) (deallocate-memory string))))) (defmethod cleanup-form (string (type (eql 'string)) &rest args) @@ -565,29 +599,35 @@ (declare (ignore type args)) `(let ((string ,string)) (unless (null-pointer-p string) - (%naturalize-c-string string)))) - + #+cmu(%naturalize-c-string string) + #+sbcl(%naturalize-utf8-string string)))) (defmethod copy-from-alien-function ((type (eql 'string)) &rest args) (declare (ignore type args)) #'(lambda (string) (unless (null-pointer-p string) - (%naturalize-c-string string)))) + #+cmu(%naturalize-c-string string) + #+sbcl(%naturalize-utf8-string string)))) (defmethod writer-function ((type (eql 'string)) &rest args) (declare (ignore type args)) #'(lambda (string location &optional (offset 0)) (assert (null-pointer-p (sap-ref-sap location offset))) (setf (sap-ref-sap location offset) + #+cmu (copy-memory (vector-sap (coerce string 'simple-base-string)) - (1+ (length string)))))) + (1+ (length string))) + #+sbcl + (let ((utf8 (%deport-utf8-string string))) + (copy-memory (vector-sap utf8) (length utf8)))))) (defmethod reader-function ((type (eql 'string)) &rest args) (declare (ignore type args)) #'(lambda (location &optional (offset 0)) (unless (null-pointer-p (sap-ref-sap location offset)) - (%naturalize-c-string (sap-ref-sap location offset))))) + #+cmu(%naturalize-c-string (sap-ref-sap location offset)) + #+sbcl(%naturalize-utf8-string (sap-ref-sap location offset))))) (defmethod destroy-function ((type (eql 'string)) &rest args) (declare (ignore type args)) @@ -600,6 +640,7 @@ (declare (ignore type args)) (values t nil)) + (defmethod alien-type ((type (eql 'pathname)) &rest args) (declare (ignore type args)) (alien-type 'string)) @@ -809,3 +850,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))