X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/74821f759d3bf3cfdd55aac54a8f0b5bde6289b6..6d0c1491fd35bbf2d9f405d0708d3cbc51fb1d16:/glib/gobject.lisp

diff --git a/glib/gobject.lisp b/glib/gobject.lisp
index f908b12..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.52 2006-04-25 22:10:36 espen Exp $
+;; $Id: gobject.lisp,v 1.55 2007-02-19 13:49:15 espen Exp $
 
 (in-package "GLIB")
 
@@ -63,15 +63,6 @@
   ())
 
 
-(defmethod slot-readable-p ((slotd standard-effective-slot-definition))
-  (declare (ignore slotd))
-  t)
-
-(defmethod slot-writable-p ((slotd standard-effective-slot-definition))
-  (declare (ignore slotd))
-  t)
-
-
 (defbinding %object-ref () pointer
   (location pointer))
 
@@ -149,41 +140,44 @@
 (defvar *ignore-setting-construct-only-property* nil)
 (declaim (special *ignore-setting-construct-only-property*))
 
-(defmethod compute-slot-reader-function ((slotd effective-property-slot-definition))
-  (if (slot-readable-p slotd)
-      (let* ((type (slot-definition-type slotd))
-	     (pname (slot-definition-pname slotd))
-	     (reader (reader-function type :ref :get)))
-	#'(lambda (object)
-	    (with-memory (gvalue +gvalue-size+)
-	      (%gvalue-init gvalue (find-type-number type))
-	      (%object-get-property object pname gvalue)
-	      (funcall reader gvalue +gvalue-value-offset+))))
+(defmethod compute-slot-reader-function ((slotd effective-property-slot-definition) &optional signal-unbound-p)
+  (declare (ignore signal-unbound-p))
+  (let* ((type (slot-definition-type slotd))
+	 (pname (slot-definition-pname slotd))
+	 (reader (reader-function type :ref :get)))
+    #'(lambda (object)
+	(with-memory (gvalue +gvalue-size+)
+	  (%gvalue-init gvalue (find-type-number type))
+	  (%object-get-property object pname gvalue)
+	  (funcall reader gvalue +gvalue-value-offset+)))))
+
+(defmethod compute-slot-writer-function :around ((slotd effective-property-slot-definition))
+  (if (construct-only-property-p slotd)
+      #'(lambda (value object)
+	  (declare (ignore value object))
+	  (unless *ignore-setting-construct-only-property*
+	    (error 'unwritable-slot :name (slot-definition-name slotd) :instance object)))
     (call-next-method)))
 
 (defmethod compute-slot-writer-function ((slotd effective-property-slot-definition))
-  (cond
-   ((slot-writable-p slotd)
-    (let* ((type (slot-definition-type slotd))
-	   (pname (slot-definition-pname slotd))
-	   (writer (writer-function type :temp t))
-	   (destroy (destroy-function type :temp t)))
-      #'(lambda (value object)
-	  (with-memory (gvalue +gvalue-size+)
-	    (%gvalue-init gvalue (find-type-number type))
-	    (funcall writer value gvalue +gvalue-value-offset+)
-	    (%object-set-property object pname gvalue)
-	    (funcall destroy gvalue +gvalue-value-offset+))
-	  value)))
-
-   ((construct-only-property-p slotd)
+  (let* ((type (slot-definition-type slotd))
+	 (pname (slot-definition-pname slotd))
+	 (writer (writer-function type :temp t))
+	 (destroy (destroy-function type :temp t)))
     #'(lambda (value object)
-	(declare (ignore value object))
-	(unless *ignore-setting-construct-only-property*
-	  (error 'unwritable-slot :name (slot-definition-name slotd) :instance object))))
-   ((call-next-method))))
+	(with-memory (gvalue +gvalue-size+)
+	  (%gvalue-init gvalue (find-type-number type))
+	  (funcall writer value gvalue +gvalue-value-offset+)
+	  (%object-set-property object pname gvalue)
+	  (funcall destroy gvalue +gvalue-value-offset+))
+	value)))
+
+(defmethod slot-readable-p ((slotd effective-user-data-slot-definition))
+  (declare (ignore slotd))
+  t)
 
-(defmethod compute-slot-reader-function ((slotd effective-user-data-slot-definition))
+(defmethod compute-slot-reader-function ((slotd effective-user-data-slot-definition) &optional signal-unbound-p)
+  (declare (ignore signal-unbound-p))
   (let ((slot-name (slot-definition-name slotd)))
     #'(lambda (object)
 	(user-data object slot-name))))
@@ -193,6 +187,10 @@
     #'(lambda (object)
 	(user-data-p object slot-name))))
 
+(defmethod slot-writable-p ((slotd effective-user-data-slot-definition))
+  (declare (ignore slotd))
+  t)
+
 (defmethod compute-slot-writer-function ((slotd effective-user-data-slot-definition))
   (let ((slot-name (slot-definition-name slotd)))
     #'(lambda (value object)
@@ -393,35 +391,40 @@
 
 ;;;; 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))))