Introspected classes now defined in propper order

[clg] / glib / gobject.lisp

diff --git a/glib/gobject.lisp b/glib/gobject.lisp
index f1f04d3818f6c43ced39021420c436ba9e69daa4..a722174e7f2fdb639eb7dfd1c700b08f3a1d3bf3 100644 (file)
--- a/glib/gobject.lisp
+++ b/glib/gobject.lisp
@@ -15,7 +15,7 @@
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 

-;; $Id: gobject.lisp,v 1.27 2005-01-03 16:40:45 espen Exp $
+;; $Id: gobject.lisp,v 1.30 2005-02-01 15:24:52 espen Exp $

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


@@ -268,22 +268,21 @@ (defbinding object-freeze-notify () nil
 (defbinding object-thaw-notify () nil
   (object gobject))
 
 (defbinding object-thaw-notify () nil
   (object gobject))
 

+
+;;;; User data
+

 (defbinding %object-set-qdata-full () nil
   (object gobject)
   (id quark)
   (data unsigned-long)
   (destroy-marshal pointer))
 
 (defbinding %object-set-qdata-full () nil
   (object gobject)
   (id quark)
   (data unsigned-long)
   (destroy-marshal pointer))
 

-
-;;;; User data
-

 (defun (setf user-data) (data object key)
 (defun (setf user-data) (data object key)

-  (%object-set-qdata-full
-   object (quark-from-object key)
+  (%object-set-qdata-full object (quark-intern key)

    (register-user-data data) (callback %destroy-user-data))
   data)
 
    (register-user-data data) (callback %destroy-user-data))
   data)
 

-;; depecated
+;; deprecated

 (defun (setf object-data) (data object key &key (test #'eq))
   (assert (eq test #'eq))
   (setf (user-data object key) data))
 (defun (setf object-data) (data object key &key (test #'eq))
   (assert (eq test #'eq))
   (setf (user-data object key) data))


@@ -293,15 +292,22 @@ (defbinding %object-get-qdata () unsigned-long
   (id quark))
 
 (defun user-data (object key)
   (id quark))
 
 (defun user-data (object key)

-  (find-user-data (%object-get-qdata object (quark-from-object key))))
+  (find-user-data (%object-get-qdata object (quark-intern key))))

 
 

-;; depecated
+;; deprecated

 (defun object-data (object key &key (test #'eq))
   (assert (eq test #'eq))
   (user-data object key))
 
 (defun user-data-p (object key)
 (defun object-data (object key &key (test #'eq))
   (assert (eq test #'eq))
   (user-data object key))
 
 (defun user-data-p (object key)

-  (nth-value 1 (find-user-data (%object-get-qdata object (quark-from-object key)))))
+  (user-data-exists-p (%object-get-qdata object (quark-intern key))))
+
+(defbinding %object-steal-qdata () unsigned-long
+  (object gobject)              
+  (id quark))
+
+(defun unset-user-data (object key)
+  (destroy-user-data (%object-steal-qdata object (quark-intern key))))

 
 
 ;;;;
 
 
 ;;;;


@@ -345,10 +351,10 @@ (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
           (accessor (default-slot-accessor class slot-name slot-type)))
       
       `(,slot-name


@@ -405,21 +411,25 @@ (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))
        (slots (getf options :slots)))    
     `(defclass ,class ,supers
   (let ((supers (cons (supertype type) (implements type)))
        (class  (type-from-number type))
        (slots (getf options :slots)))    
     `(defclass ,class ,supers

-      ,(slot-definitions class (query-object-class-properties type) slots)
+       ,(unless forward-p
+         (slot-definitions class (query-object-class-properties type) slots))

       (:metaclass ,metaclass)
       (:alien-name ,(find-type-name type)))))
 
       (:metaclass ,metaclass)
       (:alien-name ,(find-type-name type)))))
 

+(defun gobject-dependencies (type)
+  (delete-duplicates (mapcar #'param-value-type (query-object-class-properties type))))
+

 
 

-(register-derivable-type 'gobject "GObject" 'expand-gobject-type)
+(register-derivable-type 'gobject "GObject" 'expand-gobject-type 'gobject-dependencies)

 
 
 ;;; Pseudo type for gobject instances which have their reference count
 
 
 ;;; Pseudo type for gobject instances which have their reference count