X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/2950a1ba0607c7d8b09f50193b0b4f771df62976..7af3f90b04993dbb4bf7c28ecbf3777d9d09b55e:/glib/glib.lisp diff --git a/glib/glib.lisp b/glib/glib.lisp index d1d3746..8bbda64 100644 --- a/glib/glib.lisp +++ b/glib/glib.lisp @@ -1,21 +1,26 @@ -;; Common Lisp bindings for GTK+ v1.2.x -;; Copyright (C) 1999-2005 Espen S. Johnsen +;; Common Lisp bindings for GTK+ 2.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: glib.lisp,v 1.29 2005/04/18 10:34:51 espen Exp $ +;; $Id: glib.lisp,v 1.35 2006/02/19 22:34:28 espen Exp $ (in-package "GLIB") @@ -42,6 +47,23 @@ (defun copy-memory (from length &optional (to (allocate-memory length))) #+sbcl(system-area-ub8-copy from 0 to 0 length) to) +(defun clear-memory (from length) + #+cmu(system-area-fill 0 0 from 0 (* 8 length)) + #+sbcl(system-area-ub8-fill 0 from 0 length)) + +(defmacro with-allocated-memory ((var size) &body body) + (if (constantp size) + (let ((alien (make-symbol "ALIEN")) + (size (eval size))) + `(with-alien ((,alien (array #+sbcl(sb-alien:unsigned 8) #+cmu(alien:unsigned 8) ,size))) + (let ((,var (alien-sap ,alien))) + (clear-memory ,var ,size) + ,@body))) + `(let ((,var (allocate-memory ,size))) + (unwind-protect + (progn ,@body) + (deallocate-memory ,var))))) + ;;;; User data mechanism @@ -225,7 +247,8 @@ (defmethod writer-function ((type (eql 'glist)) &rest args) (defmethod reader-function ((type (eql 'glist)) &rest args) (declare (ignore type)) (destructuring-bind (element-type) args - #'(lambda (location &optional (offset 0)) + #'(lambda (location &optional (offset 0) weak-p) + (declare (ignore weak-p)) (unless (null-pointer-p (sap-ref-sap location offset)) (map-glist 'list #'identity (sap-ref-sap location offset) element-type))))) @@ -334,7 +357,8 @@ (defmethod writer-function ((type (eql 'gslist)) &rest args) (defmethod reader-function ((type (eql 'gslist)) &rest args) (declare (ignore type)) (destructuring-bind (element-type) args - #'(lambda (location &optional (offset 0)) + #'(lambda (location &optional (offset 0) weak-p) + (declare (ignore weak-p)) (unless (null-pointer-p (sap-ref-sap location offset)) (map-glist 'list #'identity (sap-ref-sap location offset) element-type))))) @@ -442,7 +466,7 @@ (defmethod copy-from-alien-form (c-vector (type (eql 'vector)) &rest args) (destructuring-bind (element-type &optional (length '*)) args (if (eq length '*) (error "Can't use vector of variable size as return type") - `(map-c-vector 'vector #'identity ,c-vector ',element-type ',length)))) + `(map-c-vector 'vector #'identity ,c-vector ',element-type ,length)))) (defmethod copy-from-alien-function ((type (eql 'vector)) &rest args) (declare (ignore type)) @@ -481,7 +505,8 @@ (defmethod reader-function ((type (eql 'vector)) &rest args) (destructuring-bind (element-type &optional (length '*)) args (if (eq length '*) (error "Can't create reader function for vector of variable size") - #'(lambda (location &optional (offset 0)) + #'(lambda (location &optional (offset 0) weak-p) + (declare (ignore weak-p)) (unless (null-pointer-p (sap-ref-sap location offset)) (map-c-vector 'vector #'identity (sap-ref-sap location offset) element-type length)))))) @@ -602,7 +627,8 @@ (defmethod reader-function ((type (eql 'null-terminated-vector)) &rest args) (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)) + #'(lambda (location &optional (offset 0) weak-p) + (declare (ignore weak-p)) (unless (null-pointer-p (sap-ref-sap location offset)) (map-0-vector 'vector #'identity (sap-ref-sap location offset) element-type))))) @@ -699,7 +725,8 @@ (defmethod writer-function ((type (eql 'counted-vector)) &rest args) (defmethod reader-function ((type (eql 'counted-vector)) &rest args) (declare (ignore type)) (destructuring-bind (element-type) args - #'(lambda (location &optional (offset 0)) + #'(lambda (location &optional (offset 0) weak-p) + (declare (ignore weak-p)) (unless (null-pointer-p (sap-ref-sap location offset)) (map-counted-vector 'vector #'identity (sap-ref-sap location offset) element-type)))))