Functions to access user data made generic

[clg] / glib / gobject.lisp

diff --git a/glib/gobject.lisp b/glib/gobject.lisp
index 829277271384f3825502cd7179dad10e9456a6b0..1b47b0a25f0d3647bf2300ab660d87a51d0e28b9 100644 (file)
--- 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.23 2004-12-16 23:19:17 espen Exp $
+;; $Id: gobject.lisp,v 1.55 2007-02-19 13:49:15 espen Exp $

 
 (in-package "GLIB")
 
 
 (in-package "GLIB")
 


@@ -23,25 +28,40 @@ (in-package "GLIB")
 ;;;; Metaclass used for subclasses of gobject
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
 ;;;; Metaclass used for subclasses of gobject
 
 (eval-when (:compile-toplevel :load-toplevel :execute)

+;;   (push :debug-ref-counting *features*)

   (defclass gobject-class (ginstance-class)
   (defclass gobject-class (ginstance-class)

-    ())
-
-  (defmethod validate-superclass ((class gobject-class)
-                               (super pcl::standard-class))
+    ((instance-slots-p :initform nil :reader instance-slots-p
+      :documentation "Non NIL if the class has slots with instance allocation")))
+  (defmethod shared-initialize ((class gobject-class) names &rest initargs)
+    (declare (ignore names initargs))
+    (call-next-method)
+    (unless (slot-boundp class 'ref)
+      (setf (slot-value class 'ref) '%object-ref))
+    (unless (slot-boundp class 'unref)
+      (setf (slot-value class 'unref) '%object-unref)))
+
+  (defmethod validate-superclass ((class gobject-class) (super standard-class))

 ;  (subtypep (class-name super) 'gobject)
     t))
 
 (defclass direct-property-slot-definition (direct-virtual-slot-definition)
   ((pname :reader slot-definition-pname :initarg :pname)
 ;  (subtypep (class-name super) 'gobject)
     t))
 
 (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)
 
 (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))
 
 (defbinding %object-ref () pointer
   (location pointer))


@@ -49,13 +69,38 @@ (defbinding %object-ref () pointer
 (defbinding %object-unref () nil
   (location 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
 
 
 ; (defbinding object-class-install-param () nil


@@ -74,66 +119,135 @@ (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))
 (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))
     (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)
     (t (call-next-method))))
 
 (defmethod compute-effective-slot-definition-initargs ((class gobject-class) direct-slotds)

-  (if (typep (first direct-slotds) 'direct-property-slot-definition)
-      (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)))
 
 
        (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))
   (let* ((type (slot-definition-type slotd))
         (pname (slot-definition-pname slotd))

-        (type-number (find-type-number type)))
-    (when (and (not (slot-boundp slotd 'getter)) (slot-readable-p slotd))
-      (setf 
-       (slot-value slotd 'getter)
-       (let ((reader nil))
-        #'(lambda (object)
-            (unless reader
-              (setq reader (reader-function (type-from-number type-number))))
-            (let ((gvalue (gvalue-new type-number)))
-              (%object-get-property object pname gvalue)
-              (unwind-protect
-                (funcall reader  gvalue +gvalue-value-offset+)
-                (gvalue-free gvalue t)))))))
-    
-    (when (and (not (slot-boundp slotd 'setter)) (slot-writable-p slotd))
-      (setf 
-       (slot-value slotd 'setter)
-       (let ((writer nil))
-        #'(lambda (value object)
-            (unless writer
-              (setq writer (writer-function (type-from-number type-number))))
-            (let ((gvalue (gvalue-new type-number)))
-              (funcall writer value gvalue +gvalue-value-offset+)
-              (%object-set-property object pname gvalue)
-              (gvalue-free gvalue t)
-              value))))))
-
-  (call-next-method))
+        (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))
+  (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)
 
 
 ;;;; 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)
     (: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 (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 
 
 (defun initial-add (object function initargs key pkey)
   (loop 


@@ -151,58 +265,93 @@ (defun initial-apply-add (object function initargs key pkey)
               initargs key pkey))
 
 
               initargs key pkey))
 
 

-(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 (when initargs
-                (loop 
-                 as (key value . rest) = initargs then rest
-                 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))
-                 while rest))))
-    (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))
+(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)))
+
+
+(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* ((pointer-size (size-of 'pointer))
+            (element-size (+ +gvalue-size+ pointer-size))
+            (num-slots (length init-slots)))
+       (with-memory (params (* num-slots element-size))
+          (loop
+          with string-writer = (writer-function 'string)
+          for (slotd . value) in init-slots
+          as param = params then (pointer+ param element-size)
+          as type = (slot-definition-type slotd)
+          as pname = (slot-definition-pname slotd)
+          do (funcall string-writer pname param)
+              (gvalue-init (pointer+ param pointer-size) type value))
+

          (unwind-protect
          (unwind-protect

-              (setf  
-               (slot-value object 'location) 
-               (%gobject-newv (type-number-of object) (length args) params))
+             (%gobject-newv (type-number-of object) num-slots params)
+       

            (loop
            (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)))))
+            with string-destroy = (destroy-function 'string)
+            repeat num-slots
+            as param = params then (pointer+ param element-size)
+            do (funcall string-destroy param)
+               (gvalue-unset (pointer+ param pointer-size)))))))
+
+     (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)))

 
 

-  (apply #'call-next-method object initargs))
+(defmethod initialize-instance :around ((object gobject) &rest initargs)
+  (declare (ignore initargs))
+  (prog1
+      (call-next-method)
+    #+debug-ref-counting(%object-weak-ref (foreign-location object))
+    #?(pkg-exists-p "glib-2.0" :atleast-version "2.8.0")
+    (when (slot-value (class-of object) 'instance-slots-p)
+      (%object-add-toggle-ref (foreign-location object))
+      (%object-unref (foreign-location object)))))

 
 
 (defmethod instance-finalizer ((instance gobject))
 
 
 (defmethod instance-finalizer ((instance gobject))

-  (let ((location (proxy-location instance)))
+  (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~%" (pointer-address location))
+           (%object-remove-toggle-ref location))
+      #'(lambda ()
+         #+debug-ref-counting
+         (format t "Finalizing proxy for 0x~8,'0X~%" (pointer-address location))
+         (%object-unref location)))
+    #?-(pkg-exists-p "glib-2.0" :atleast-version "2.8.0")

     #'(lambda ()
     #'(lambda ()

-       (remove-cached-instance location)

        (%object-unref location))))
 
 
        (%object-unref location))))
 
 


@@ -239,28 +388,44 @@ (defbinding object-freeze-notify () nil
 (defbinding object-thaw-notify () nil
   (object gobject))
 
 (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)
 (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)
 
   data)
 

-(defbinding %object-get-qdata () unsigned-long
+(defbinding %object-get-qdata () pointer-data
+  (object gobject)              
+  (id quark))
+
+(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))
 
   (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 unset-user-data ((object gobject) key)
+  (destroy-user-data (%object-steal-qdata object (quark-intern key))))

 
 
 ;;;;
 
 
 ;;;;


@@ -282,20 +447,28 @@ (defun %map-params (params length type inherited-p)
       (nreverse properties))))
 
 (defun query-object-class-properties (type &optional 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)
         (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)
 ;      (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
 
 (defun default-slot-accessor (class-name slot-name type)
   (intern


@@ -304,19 +477,18 @@ (defun default-slot-accessor (class-name slot-name type)
     (if (eq type 'boolean) "-P" ""))))
 
 
     (if (eq type 'boolean) "-P" ""))))
 
 

-(defun slot-definition-from-property (class property &optional args)
+(defun slot-definition-from-property (class property &optional slot-name args)

   (with-slots (name flags value-type documentation) property
   (with-slots (name flags value-type documentation) property

-    (let* ((slot-name (default-slot-name name))
-          (slot-type (or (getf args :type) (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
 
           (accessor (default-slot-accessor class slot-name slot-type)))
       
       `(,slot-name
        :allocation :property :pname ,name
 

-       ;; temporary hack
-       ,@(cond
-          ((find :unbound args) (list :unbound (getf args :unbound)))
-          ((type-is-p slot-type 'gobject) (list :unbound nil)))
+       ,@(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
        
        ;; accessors
        ,@(cond


@@ -335,15 +507,19 @@ (defun slot-definition-from-property (class property &optional args)
            '(:writable nil))
        ,@(when (not (member :readable flags))
            '(:readable nil))
            '(: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
        
        ;; 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))))
        
        :type ,slot-type
        :documentation ,documentation))))


@@ -364,18 +540,54 @@ (defun slot-definitions (class properties slots)
        ((getf (rest slot) :merge)
        (setf 
         (rest slot) 
        ((getf (rest slot) :merge)
        (setf 
         (rest slot) 

-        (rest (slot-definition-from-property class property (rest slot)))))))
+        (rest (slot-definition-from-property class property (first slot) (rest slot)))))))

   (delete-if #'(lambda (slot) (getf (rest slot) :ignore)) slots))
 
 
   (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))
   (let ((supers (cons (supertype type) (implements type)))
        (class  (type-from-number type))

-       (slots (getf options :slots)))    
+       (slots (getf options :slots)))

     `(defclass ,class ,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))))