X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/7e29d6b19cbf0c04adde1c688b9392a1387e958e..495de443353781c7782407ec96a6ad6698d5c11f:/glib/ffi.lisp diff --git a/glib/ffi.lisp b/glib/ffi.lisp index 385a7c4..728b643 100644 --- a/glib/ffi.lisp +++ b/glib/ffi.lisp @@ -1,21 +1,26 @@ -;; Common Lisp bindings for GTK+ v2.0 -;; Copyright (C) 1999-2001 Espen S. Johnsen +;; Common Lisp bindings for GTK+ v2.x +;; Copyright 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 -;; 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: ffi.lisp,v 1.18 2005-03-13 18:06:51 espen Exp $ +;; $Id: ffi.lisp,v 1.22 2006-02-06 11:49:50 espen Exp $ (in-package "GLIB") @@ -184,7 +189,10 @@ (%heap-alien (make-heap-alien-info :type (parse-alien-type ftype #+sbcl nil) - :sap-form (foreign-symbol-address name)))) + :sap-form (let ((address (foreign-symbol-address name))) + (etypecase address + (integer (int-sap address)) + (system-area-pointer address)))))) (translate-arguments (mapcar #'to-alien-function arg-types)) (translate-return-value (from-alien-function return-type)) (cleanup-arguments (mapcar #'cleanup-function arg-types))) @@ -263,6 +271,7 @@ (def-type-method writer-function ()) (def-type-method reader-function ()) +(def-type-method weak-reader-function ()) (def-type-method destroy-function ()) (def-type-method unbound-value () @@ -339,6 +348,9 @@ (defmethod copy-from-alien-function ((type t) &rest args) (apply #'from-alien-function type args)) +(defmethod weak-reader-function ((type symbol) &rest args) + (apply #'reader-function type args)) + (defmethod alien-type ((type (eql 'signed-byte)) &rest args) (declare (ignore type)) @@ -546,23 +558,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) @@ -570,7 +591,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) @@ -589,29 +611,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)) @@ -624,6 +652,7 @@ (declare (ignore type args)) (values t nil)) + (defmethod alien-type ((type (eql 'pathname)) &rest args) (declare (ignore type args)) (alien-type 'string))