X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/2176a9c737407c97be00bab66df443f0685f1058..e59b159786355b542f5036b1b40247666fe195f2:/glib/gobject.lisp

diff --git a/glib/gobject.lisp b/glib/gobject.lisp
index 4005672..68ee82c 100644
--- a/glib/gobject.lisp
+++ b/glib/gobject.lisp
@@ -1,21 +1,26 @@
-;; Common Lisp bindings for GTK+ v2.0
-;; Copyright (C) 2000-2001 Espen S. Johnsen <esj@stud.cs.uit.no>
+;; Common Lisp bindings for GTK+ v2.x
+;; Copyright 2000-2006 Espen S. Johnsen <espen@users.sf.net>
 ;;
-;; 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: gobject.lisp,v 1.19 2004-11-07 15:58:08 espen Exp $
+;; $Id: gobject.lisp,v 1.59 2008-11-04 03:22:23 espen Exp $
 
 (in-package "GLIB")
 
@@ -23,25 +28,48 @@ (in-package "GLIB")
 ;;;; Metaclass used for subclasses of gobject
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
+;;   (push :debug-ref-counting *features*)
   (defclass gobject-class (ginstance-class)
-    ())
+    ((instance-slots-p :initform nil :reader instance-slots-p
+      :documentation "Non NIL if the class has slots with instance allocation")))
 
-  (defmethod validate-superclass ((class gobject-class)
-				(super pcl::standard-class))
+  (defmethod validate-superclass ((class gobject-class) (super standard-class))
 ;  (subtypep (class-name super) 'gobject)
     t))
 
+(defmethod slot-unbound (metaclass (class gobject-class) (slot (eql 'ref)))
+  (assert (class-direct-superclasses class))
+  (setf (slot-value class 'ref) 
+   #?-(pkg-exists-p "glib-2.0" :atleast-version "2.10.0") '%object-ref
+   #?(pkg-exists-p "glib-2.0" :atleast-version "2.10.0")
+   ;; We do this hack instead of creating a new metaclass to avoid
+   ;; breaking backward compatibility
+   (if (subtypep (class-name class) 'initially-unowned)
+       '%object-ref-sink
+     '%object-ref)))
+
+(defmethod slot-unbound (metaclass (class gobject-class) (slot (eql 'unref)))
+  (setf (slot-value class 'unref) '%object-unref))
+
+
 (defclass direct-property-slot-definition (direct-virtual-slot-definition)
   ((pname :reader slot-definition-pname :initarg :pname)
-   (readable :initform t :reader slot-readable-p :initarg :readable)
-   (writable :initform t :reader slot-writable-p :initarg :writable)
-   (construct :initform nil :initarg :construct)))
+   (readable :reader slot-readable-p :initarg :readable)
+   (writable :reader slot-writable-p :initarg :writable)
+   (construct-only :initarg :construct-only :reader construct-only-property-p)))
 
 (defclass effective-property-slot-definition (effective-virtual-slot-definition)
   ((pname :reader slot-definition-pname :initarg :pname)
-   (readable :reader slot-readable-p :initarg :readable)
-   (writable :reader slot-writable-p :initarg :writable)
-   (construct :initarg :construct)));)
+   (readable :initform t :reader slot-readable-p :initarg :readable)
+   (writable :initform t :reader slot-writable-p :initarg :writable)
+   (construct-only :initform nil :initarg :construct-only :reader construct-only-property-p)))
+
+(defclass direct-user-data-slot-definition (direct-virtual-slot-definition)
+  ())
+
+(defclass effective-user-data-slot-definition (effective-virtual-slot-definition)
+  ())
+
 
 (defbinding %object-ref () pointer
   (location pointer))
@@ -49,13 +77,38 @@ (defbinding %object-ref () pointer
 (defbinding %object-unref () nil
   (location pointer))
 
-(defmethod reference-foreign ((class gobject-class) location)
-  (declare (ignore class))
-  (%object-ref location))
-
-(defmethod unreference-foreign ((class gobject-class) location)
-  (declare (ignore class))
-  (%object-unref location))
+#?(pkg-exists-p "glib-2.0" :atleast-version "2.8.0")
+(progn
+  (define-callback toggle-ref-callback nil
+      ((data pointer) (location pointer) (last-ref-p boolean))
+    (declare (ignore data))
+    #+debug-ref-counting
+    (if last-ref-p
+	(format t "Object at 0x~8,'0X has no foreign references~%" (pointer-address location))
+      (format t "Foreign reference added to object at 0x~8,'0X~%" (pointer-address location)))
+    (if last-ref-p
+	(cache-instance (find-cached-instance location) t)
+      (cache-instance (find-cached-instance location) nil)))
+
+  (defbinding %object-add-toggle-ref (location) pointer
+    (location pointer)
+    (toggle-ref-callback callback)
+    (nil null))
+
+  (defbinding %object-remove-toggle-ref (location) pointer
+    (location pointer)
+    (toggle-ref-callback callback)
+    (nil null)))
+
+#+debug-ref-counting
+(progn
+  (define-callback weak-ref-callback nil ((data pointer) (location pointer))
+    (format t "Object at 0x~8,'0X (~A) being finalized~%" (pointer-address location) (type-from-number (%type-number-of-ginstance location))))
+  
+  (defbinding %object-weak-ref (location) pointer
+    (location pointer)
+    (weak-ref-callback callback)
+    (nil null)))
 
 
 ; (defbinding object-class-install-param () nil
@@ -74,150 +127,253 @@ (defun signal-name-to-string (name)
 (defmethod direct-slot-definition-class ((class gobject-class) &rest initargs)
   (case (getf initargs :allocation)
     (:property (find-class 'direct-property-slot-definition))
+    (:user-data (find-class 'direct-user-data-slot-definition))
     (t (call-next-method))))
 
 (defmethod effective-slot-definition-class ((class gobject-class) &rest initargs)
   (case (getf initargs :allocation)
     (:property (find-class 'effective-property-slot-definition))
+    (:user-data (find-class 'effective-user-data-slot-definition))
     (t (call-next-method))))
 
 (defmethod compute-effective-slot-definition-initargs ((class gobject-class) direct-slotds)
-  (if (eq (most-specific-slot-value direct-slotds 'allocation) :property)
-      (nconc 
-       (list :pname (signal-name-to-string 
-		     (most-specific-slot-value direct-slotds 'pname))
-	     :readable (most-specific-slot-value direct-slotds 'readable)
-	     :writable (most-specific-slot-value direct-slotds 'writable)
-	     :construct (most-specific-slot-value direct-slotds 'construct))
+  (if (eq (slot-definition-allocation (first direct-slotds)) :property)
+      (nconc
+       (compute-most-specific-initargs direct-slotds
+        '(pname construct-only readable writable))
        (call-next-method))
     (call-next-method)))
 
 
-(defmethod initialize-internal-slot-functions ((slotd effective-property-slot-definition))
+(defvar *ignore-setting-construct-only-property* nil)
+(declaim (special *ignore-setting-construct-only-property*))
+
+(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))
-	 (type-number (find-type-number type)))
-    (unless (slot-boundp slotd 'reader-function)
-      (setf 
-       (slot-value slotd 'reader-function)
-       (if (slot-readable-p slotd)
-	   (let () ;(reader (reader-function (type-from-number type-number))))
-	     #'(lambda (object)
-		 (let ((gvalue (gvalue-new type-number)))
-		   (%object-get-property object pname gvalue)
-		   (unwind-protect
-			(funcall #|reader|# (reader-function (type-from-number type-number))  gvalue +gvalue-value-offset+)
-		     (gvalue-free gvalue t)))))
-	   #'(lambda (value object)
-	       (error "Slot is not readable: ~A" (slot-definition-name slotd))))))
-    
-    (unless (slot-boundp slotd 'writer-function)
-      (setf 
-       (slot-value slotd 'writer-function)
-       (if (slot-writable-p slotd)
-	   (let ();; (writer (writer-function (type-from-number type-number)))
-;; 		 (destroy (destroy-function (type-from-number type-number))))
-	     #'(lambda (value object)
-		 (let ((gvalue (gvalue-new type-number)))
-		   (funcall #|writer|# (writer-function (type-from-number type-number)) value gvalue +gvalue-value-offset+)
-		   (%object-set-property object pname gvalue)
-;		   (funcall #|destroy|#(destroy-function (type-from-number type-number)) gvalue +gvalue-value-offset+)
-		   (gvalue-free gvalue t)
-		   value)))
- 	   #'(lambda (value object)
- 	       (error "Slot is not writable: ~A" (slot-definition-name slotd))))))
-    
-    (unless (slot-boundp slotd 'boundp-function)
-      (setf 
-       (slot-value slotd 'boundp-function)
-       #'(lambda (object)
-	   (declare (ignore object))
-	   t))))
-  (call-next-method))
+	 (get-reader (reader-function type :ref :get))
+	 (peek-reader (reader-function type :ref :peek)))
+    #'(lambda (object)
+	(with-memory (gvalue +gvalue-size+)
+	  (%gvalue-init gvalue (find-type-number type))
+	  (%object-get-property object pname gvalue)
+	  (if (gvalue-static-p gvalue)
+	      (funcall peek-reader gvalue +gvalue-value-offset+)
+	    (funcall get-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))
+	  (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))
+  (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)))
+
+(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) &optional signal-unbound-p)
+  (declare (ignore signal-unbound-p))
+  (let ((slot-name (slot-definition-name slotd)))
+    #'(lambda (object)
+	(user-data object slot-name))))
+
+(defmethod compute-slot-boundp-function ((slotd effective-user-data-slot-definition))
+  (let ((slot-name (slot-definition-name slotd)))
+    #'(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)
+	(setf (user-data object slot-name) value))))
+
+(defmethod compute-slot-makunbound-function ((slotd effective-user-data-slot-definition))
+  (let ((slot-name (slot-definition-name slotd)))
+    #'(lambda (object)
+	(unset-user-data object slot-name))))
+
+(defmethod compute-slots :around ((class gobject-class))
+  (let ((slots (call-next-method)))
+    (when (some #'(lambda (slotd)
+		    (and
+		     (eq (slot-definition-allocation slotd) :instance)
+		     (not (typep slotd 'effective-special-slot-definition))))
+		slots)
+      (setf (slot-value class 'instance-slots-p) t))
+    slots))
 
 
 ;;;; Super class for all classes in the GObject type hierarchy
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defclass gobject (ginstance)
-    ()
+    (#+debug-ref-counting
+     (ref-count :allocation :alien :type int :reader ref-count))
     (:metaclass gobject-class)
-    (:alien-name "GObject")))
+    (:gtype "GObject")))
 
+#+debug-ref-counting
 (defmethod print-object ((instance gobject) stream)
   (print-unreadable-object (instance stream :type t :identity nil)
-    (if (slot-boundp instance 'location)
-	(format stream "at 0x~X" (sap-int (proxy-location instance)))
-      (write-string "(destroyed)" stream))))
-
-
-(defmethod initialize-instance ((object gobject) &rest initargs)
-  ;; Extract initargs which we should pass directly to the GObeject
-  ;; constructor
-  (let* ((slotds (class-slots (class-of object)))
-	 (args (loop 
-		as tmp = initargs then (cddr tmp) while tmp
-		as key = (first tmp)
-		as value = (second tmp)
-		as slotd = (find-if
-			    #'(lambda (slotd)
-				(member key (slot-definition-initargs slotd)))
-			    slotds)
-		when (and (typep slotd 'effective-property-slot-definition)
-			  (slot-value slotd 'construct))
-		collect (progn 
-			  (remf initargs key)
-			  (list 
-			   (slot-definition-pname slotd)
-			   (slot-definition-type slotd)
-			   value)))))
-    (if args
-	(let* ((string-size (size-of 'string))
-	       (string-writer (writer-function 'string))
-	       (string-destroy (destroy-function 'string))
-	       (params (allocate-memory 
-			(* (length args) (+ string-size +gvalue-size+)))))
-	  (loop
-	   for (pname type value) in args
-	   as tmp = params then (sap+ tmp (+ string-size +gvalue-size+))
-	   do (funcall string-writer pname tmp)
-	   (gvalue-init (sap+ tmp string-size) type value))
-	  (unwind-protect
-	       (setf  
-		(slot-value object 'location) 
-		(%gobject-newv (type-number-of object) (length args) params))
-	    (loop
-	     repeat (length args)
-	     as tmp = params then (sap+ tmp (+ string-size +gvalue-size+))
-	     do (funcall string-destroy tmp)
-	     (gvalue-unset (sap+ tmp string-size)))
-	    (deallocate-memory params)))
-	(setf  
-	 (slot-value object 'location) 
-	 (%gobject-new (type-number-of object)))))
+    (if (proxy-valid-p instance)
+	(format stream "at 0x~X (~D)" (pointer-address (foreign-location instance)) (ref-count instance))
+      (write-string "at \"unbound\"" stream))))
+
+
+(define-type-method reader-function ((type gobject) &key (ref :read) inlined)
+  (assert-not-inlined type inlined)
+  (ecase ref
+    ((:read :peek) (call-next-method type :ref :read))
+    (:get
+     #'(lambda (location &optional (offset 0))
+	 (let ((instance (ref-pointer location offset)))
+	   (unless (null-pointer-p instance)
+	     (multiple-value-bind (gobject new-p)
+		 (ensure-proxy-instance 'gobject instance :reference nil)
+	       (unless new-p
+		 (%object-unref instance))
+	       (setf (ref-pointer location offset) (make-pointer 0))
+	       gobject)))))))
+
+(define-type-method callback-wrapper ((type gobject) var arg form)
+  (let ((class (type-expand type)))
+    `(let ((,var (ensure-proxy-instance ',class ,arg)))
+       ,form)))
+
+(defun initial-add (object function initargs key pkey)
+  (loop 
+   as (initarg value . rest) = initargs then rest
+   do (cond
+       ((eq initarg key) (funcall function object value))
+       ((eq initarg pkey) (mapc #'(lambda (value)
+				    (funcall function object value))
+				value)))
+       while rest))
+
+(defun initial-apply-add (object function initargs key pkey)
+  (initial-add object #'(lambda (object value)
+			  (apply function object (mklist value)))
+	       initargs key pkey))
+
+
+(defmethod make-proxy-instance ((class gobject-class) location &rest initargs)
+  (declare (ignore location initargs))
+  (if (slot-value class 'instance-slots-p)
+      (error "Objects of class ~A has instance slots and should only be created with MAKE-INSTANCE" class)
+    (call-next-method)))
 
-  (%object-weak-ref object)
-  (apply #'call-next-method object initargs))
+(defparameter +gparameter-gvalue-offset+
+  (max (size-of 'pointer) (type-alignment '(unsigned-byte 64))))
+(defparameter +gparameter-size+
+  (+ +gparameter-gvalue-offset+ +gvalue-size+))
+
+(defmethod allocate-foreign ((object gobject) &rest initargs)
+  (let ((init-slots ())) 
+    (flet ((value-from-initargs (slotd)
+	     (loop
+	      with slot-initargs = (slot-definition-initargs slotd)
+	      for (initarg value) on initargs by #'cddr
+	      when (find initarg slot-initargs)
+	      do (return (values value t)))))
+
+    (loop 
+     for slotd in (class-slots (class-of object))
+     when (and 
+	   (eq (slot-definition-allocation slotd) :property)
+	   (construct-only-property-p slotd))
+     do (multiple-value-bind (value initarg-p) (value-from-initargs slotd)
+	  (cond
+	   (initarg-p (push (cons slotd value) init-slots))
+	   ((slot-definition-initfunction slotd)
+	    (push 
+	     (cons slotd (funcall (slot-definition-initfunction slotd)))
+	     init-slots))))))
+
+    (cond
+     (init-slots
+      (let* ((num-slots (length init-slots)))
+	(with-memory (params (* num-slots +gparameter-size+))
+          (loop
+	   with string-writer = (writer-function 'string)
+	   for (slotd . value) in init-slots
+	   as param = params then (pointer+ param +gparameter-size+)
+	   as type = (slot-definition-type slotd)
+	   as pname = (slot-definition-pname slotd)
+	   do (funcall string-writer pname param)
+	      (gvalue-init 
+	       (pointer+ param +gparameter-gvalue-offset+) type value))
 
+	  (unwind-protect
+	      (%gobject-newv (type-number-of object) num-slots params)
+	
+	    (loop
+	     with string-destroy = (destroy-function 'string)
+	     repeat num-slots
+	     as param = params then (pointer+ param +gparameter-size+)
+	     do (funcall string-destroy param)
+	        (gvalue-unset (pointer+ param +gparameter-gvalue-offset+)))))))
+     
+     (t (%gobject-new (type-number-of object))))))
+
+
+(defmethod shared-initialize ((object gobject) names &rest initargs)
+  (declare (ignore names initargs))
+  (let ((*ignore-setting-construct-only-property* t))
+    (call-next-method)))
 
 (defmethod initialize-instance :around ((object gobject) &rest initargs)
   (declare (ignore initargs))
-  (call-next-method)
-  (%object-weak-ref object))
+  (prog1
+      (call-next-method)
+    (let ((location (foreign-location object)))
+      #+debug-ref-counting(%object-weak-ref location)
+      #?(pkg-exists-p "glib-2.0" :atleast-version "2.8.0")
+      (when (slot-value (class-of object) 'instance-slots-p)
+	(%object-add-toggle-ref location)
+	(%object-unref location)))))
+
+
+(defmethod instance-finalizer ((instance gobject))
+  (let ((location (foreign-location instance)))
+    #?(pkg-exists-p "glib-2.0" :atleast-version "2.8.0")
+    (if (slot-value (class-of instance) 'instance-slots-p)
+	#'(lambda ()
+	    #+debug-ref-counting
+	    (format t "Finalizing proxy for 0x~8,'0X (~A)~%" 
+	     (pointer-address location) 
+	     (find-foreign-type-name (%type-number-of-ginstance location)))
+	    (%object-remove-toggle-ref location))
+      #'(lambda ()
+	  #+debug-ref-counting
+	  (format t "Finalizing proxy for 0x~8,'0X (~A)~%" 
+	   (pointer-address location)
+	   (find-foreign-type-name (%type-number-of-ginstance location)))
+	  (%object-unref location)))
+    #?-(pkg-exists-p "glib-2.0" :atleast-version "2.8.0")
+    #'(lambda ()
+	(%object-unref location))))
 
 
-(defcallback weak-notify (nil (data int) (location pointer))
-  (let ((object (find-cached-instance location)))
-    (when object
-;;       (warn "~A being finalized by the GObject system while still in existence in lisp" object)
-      (slot-makunbound object 'location)
-      (remove-cached-instance location))))
-
-(defbinding %object-weak-ref (object) nil
-  (object gobject)
-  ((callback weak-notify) pointer)
-  (0 unsigned-int))
-
 (defbinding (%gobject-new "g_object_new") () pointer
   (type type-number)
   (nil null))
@@ -228,6 +384,25 @@ (defbinding (%gobject-newv "g_object_newv") () pointer
   (params pointer))
 
 
+;;;; Floating references
+
+#?(pkg-exists-p "glib-2.0" :atleast-version "2.10.0")
+(progn
+  (defclass initially-unowned (gobject)
+    ()
+    (:metaclass gobject-class)
+    (:gtype "GInitiallyUnowned"))
+
+  (defbinding %object-ref-sink () pointer
+    (location pointer))
+
+  (defbinding %object-is-floating () boolean
+    (location pointer))
+
+  (defmethod initialize-instance :before ((object initially-unowned) &rest initargs)
+    (declare (ignore initargs))
+    (%object-ref-sink (foreign-location object))))
+
 
 ;;;; Property stuff
 
@@ -251,28 +426,44 @@ (defbinding object-freeze-notify () nil
 (defbinding object-thaw-notify () nil
   (object gobject))
 
+
+;;;; 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)
-  (destroy-marshal pointer))
+  (data pointer-data)
+  (destroy-marshal callback))
 
+(define-callback user-data-destroy-callback nil ((id pointer-data))
+  (destroy-user-data id))
 
-;;;; User data
-
-(defun (setf object-data) (data object key &key (test #'eq))
-  (%object-set-qdata-full
-   object (quark-from-object key :test test)
-   (register-user-data data) (callback %destroy-user-data))
+(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 object-data (object key &key (test #'eq))
-  (find-user-data
-   (%object-get-qdata object (quark-from-object key :test test))))
+(defmethod user-data ((object gobject) key)
+  (find-user-data (%object-get-qdata object (quark-intern key))))
+
+(defmethod user-data-p ((object gobject) key)
+  (user-data-exists-p (%object-get-qdata object (quark-intern key))))
+
+(defbinding %object-steal-qdata () pointer-data
+  (object gobject)		 
+  (id quark))
+
+(defmethod unset-user-data ((object gobject) key)
+  (destroy-user-data (%object-steal-qdata object (quark-intern key))))
 
 
 ;;;;
@@ -294,20 +485,28 @@ (defun %map-params (params length type inherited-p)
       (nreverse properties))))
 
 (defun query-object-class-properties (type &optional inherited-p)
-  (let* ((type-number (find-type-number type))
+  (let* ((type-number (find-type-number type t))
 	 (class (type-class-ref type-number)))
     (unwind-protect
 	 (multiple-value-bind (array length)
 	     (%object-class-list-properties class)
-	   (unwind-protect
-		(%map-params array length type-number inherited-p)
-	     (deallocate-memory array)))
+	   (unless (null-pointer-p array)
+	     (unwind-protect
+		 (%map-params array length type-number inherited-p)
+	       (deallocate-memory array))))
 ;      (type-class-unref type-number)
       )))
 
 
 (defun default-slot-name (name)
-  (intern (substitute #\- #\_ (string-upcase (string-upcase name)))))
+  (let ((prefix-len (length (package-prefix))))
+    (intern (substitute #\- #\_
+	     (string-upcase
+	      (if (and
+		   (string-prefix-p (package-prefix) name)
+		   (char= #\- (char name prefix-len)))
+		  (subseq name (1+ prefix-len))
+		name))))))
 
 (defun default-slot-accessor (class-name slot-name type)
   (intern
@@ -316,14 +515,18 @@ (defun default-slot-accessor (class-name slot-name type)
     (if (eq type 'boolean) "-P" ""))))
 
 
-(defun slot-definition-from-property (class property)
+(defun slot-definition-from-property (class property &optional slot-name args)
   (with-slots (name flags value-type documentation) property
-    (let* ((slot-name (default-slot-name name))
-	   (slot-type (or (type-from-number value-type) value-type))
+    (let* ((slot-name (or slot-name (default-slot-name name)))
+	   (slot-type (or (getf args :type) (type-from-number value-type) 'pointer))
 	   (accessor (default-slot-accessor class slot-name slot-type)))
       
       `(,slot-name
 	:allocation :property :pname ,name
+
+	,@(when (find :unbound args) (list :unbound (getf args :unbound)))
+	,@(when (find :getter args) (list :getter (getf args :getter)))
+	,@(when (find :setter args) (list :setter (getf args :setter)))
 	
 	;; accessors
 	,@(cond
@@ -342,15 +545,19 @@ (defun slot-definition-from-property (class property)
 	    '(:writable nil))
 	,@(when (not (member :readable flags))
 	    '(:readable nil))
-	,@(when (or (member :construct flags) 
-		    (member :construct-only flags))
-	    '(:construct t))
+	,@(when (member :construct-only flags)
+	    '(:construct-only t))
 	
 	;; initargs
-	,@(when (or (member :construct flags)
-		    (member :construct-only flags)
-		    (member :writable flags))
-	    (list :initarg (intern (string slot-name) "KEYWORD")))
+	,@(if (find :initarg args)
+	      (let ((initarg (getf args :initarg)))
+		(etypecase initarg
+		  (null ())
+		  (symbol `(:initarg ,initarg))))
+	    (when (or (member :construct flags)
+		      (member :construct-only flags)
+		      (member :writable flags))
+	      (list :initarg (intern (string slot-name) "KEYWORD"))))
 	
 	:type ,slot-type
 	:documentation ,documentation))))
@@ -358,27 +565,71 @@ (defun slot-definition-from-property (class property)
 
 (defun slot-definitions (class properties slots)
   (loop 
-   with manual-slots = slots
    for property in properties
-   unless (find-if 
-	   #'(lambda (slot)
-	       (destructuring-bind (name &rest args) slot
-		 (or 
-		  (equal (param-name property) (getf args :pname))
-		  (eq (default-slot-name (param-name property)) name))))
-	   manual-slots)
-   do (push (slot-definition-from-property class property) slots))
+   as slot = (or
+	      (find (param-name property) slots 
+	       :key #'(lambda (slot) (getf (rest slot) :pname)) 
+	       :test #'string=)
+	      (find (param-name property) slots 
+	       :key #'first :test #'string-equal))
+   do (cond
+       ((not slot) 
+	(push (slot-definition-from-property class property) slots))
+       ((getf (rest slot) :merge)
+	(setf 
+	 (rest slot) 
+	 (rest (slot-definition-from-property class property (first slot) (rest slot)))))))
   (delete-if #'(lambda (slot) (getf (rest slot) :ignore)) slots))
 
 
-(defun expand-gobject-type (type &optional options (metaclass 'gobject-class))
+(defun expand-gobject-type (type forward-p options &optional (metaclass 'gobject-class))
   (let ((supers (cons (supertype type) (implements type)))
 	(class  (type-from-number type))
-	(slots (getf options :slots)))    
+	(slots (getf options :slots)))
+    (when (member nil supers)
+      (error "Got NIL as a supertype for ~A (full list: ~A).~%~
+              This shouldn't happen - is the parent type correctly registered?"
+             (find-foreign-type-name type) supers))
     `(defclass ,class ,supers
-      ,(slot-definitions class (query-object-class-properties type) slots)
-      (:metaclass ,metaclass)
-      (:alien-name ,(find-type-name type)))))
-
-
-(register-derivable-type 'gobject "GObject" 'expand-gobject-type)
+	 ,(unless forward-p
+	    (slot-definitions class (query-object-class-properties type) slots))
+	 (:metaclass ,metaclass)
+	 (:gtype ,(register-type-as type)))))
+
+(defun gobject-dependencies (type options)
+  (delete-duplicates 
+   (cons
+    (supertype type)
+    (append 
+     (type-interfaces type)
+     (mapcar #'param-value-type (query-object-class-properties type))
+     (getf options :dependencies)
+     (loop
+      for slot in (getf options :slots)
+      as type = (getf (rest slot) :type)
+      when (and type (symbolp type) (find-type-number type))
+      collect (find-type-number type))))))
+
+
+(register-derivable-type 'gobject "GObject" 'expand-gobject-type 'gobject-dependencies)
+
+
+;;; Pseudo type for gobject instances which have their reference count
+;;; increased by the returning function
+
+(deftype referenced (type) type)
+
+(define-type-method from-alien-form ((type referenced) form &key (ref :free))
+  (cond
+   ((not (eq ref :free))
+    (error "Keyword arg :REF to FROM-ALIEN-FORM should be :FREE for type ~A. It was give ~A" type ref))
+   ((subtypep type 'gobject)
+    (from-alien-form (second (type-expand-to 'referenced type)) form :ref ref))))
+
+(define-type-method from-alien-function ((type referenced) &key (ref :free))
+  (cond
+   ((not (eq ref :free))
+    (error "Keyword arg :REF to FROM-ALIEN-FUNCTION should be :FREE for type ~A. It was give ~A" type ref))
+;   ((subtypep type 'gobject) (call-next-method type ref :free))))
+   ((subtypep type 'gobject) 
+    (from-alien-function (second (type-expand-to 'referenced type)) :ref ref))))