From 64d8fbf83765a429de43cd2e7b531b6cd34e5700 Mon Sep 17 00:00:00 2001 Message-Id: <64d8fbf83765a429de43cd2e7b531b6cd34e5700.1716547594.git.mdw@distorted.org.uk> From: Mark Wooding Date: Mon, 19 Feb 2007 13:49:15 +0000 Subject: [PATCH] Functions to access user data made generic Organization: Straylight/Edgeware From: espen --- glib/gobject.lisp | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/glib/gobject.lisp b/glib/gobject.lisp index 115a04c..1b47b0a 100644 --- a/glib/gobject.lisp +++ b/glib/gobject.lisp @@ -20,7 +20,7 @@ ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -;; $Id: gobject.lisp,v 1.54 2006-08-16 12:09:03 espen Exp $ +;; $Id: gobject.lisp,v 1.55 2007-02-19 13:49:15 espen Exp $ (in-package "GLIB") @@ -391,35 +391,40 @@ (defbinding object-thaw-notify () nil ;;;; User data +(defgeneric (setf user-data) (data object key)) +(defgeneric user-data (object key)) +(defgeneric user-data-p (object key)) +(defgeneric unset-user-data (object key)) + (defbinding %object-set-qdata-full () nil (object gobject) (id quark) - (data unsigned-long) + (data pointer-data) (destroy-marshal callback)) -(define-callback user-data-destroy-callback nil ((id unsigned-int)) +(define-callback user-data-destroy-callback nil ((id pointer-data)) (destroy-user-data id)) -(defun (setf user-data) (data object key) +(defmethod (setf user-data) (data (object gobject) key) (%object-set-qdata-full object (quark-intern key) (register-user-data data) user-data-destroy-callback) data) -(defbinding %object-get-qdata () unsigned-long +(defbinding %object-get-qdata () pointer-data (object gobject) (id quark)) -(defun user-data (object key) +(defmethod user-data ((object gobject) key) (find-user-data (%object-get-qdata object (quark-intern key)))) -(defun user-data-p (object key) +(defmethod user-data-p ((object gobject) key) (user-data-exists-p (%object-get-qdata object (quark-intern key)))) -(defbinding %object-steal-qdata () unsigned-long +(defbinding %object-steal-qdata () pointer-data (object gobject) (id quark)) -(defun unset-user-data (object key) +(defmethod unset-user-data ((object gobject) key) (destroy-user-data (%object-steal-qdata object (quark-intern key)))) -- [mdw]