Added properties to interface classes

[clg] / glib / ginterface.lisp

diff --git a/glib/ginterface.lisp b/glib/ginterface.lisp
index 906606a45b94d31ae8b186ec19d08a28f61ea0aa..47fc9a3ea727adb7f355ca450c189888e0a96dc2 100644 (file)
--- a/glib/ginterface.lisp
+++ b/glib/ginterface.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
 
-;; $Id: ginterface.lisp,v 1.2 2004-10-27 14:58:59 espen Exp $
+;; $Id: ginterface.lisp,v 1.3 2004-10-31 00:56:29 espen Exp $
 
 (in-package "GLIB")
 
@@ -52,6 +52,27 @@ (eval-when (:compile-toplevel :load-toplevel :execute)
   (defclass ginterface-class (virtual-slot-class)
     ()))
 
+(defmethod direct-slot-definition-class ((class ginterface-class) &rest initargs)
+  (case (getf initargs :allocation)
+    (:property (find-class 'direct-property-slot-definition))
+    (t (call-next-method))))
+
+(defmethod effective-slot-definition-class ((class ginterface-class) &rest initargs)
+  (case (getf initargs :allocation)
+    (:property (find-class 'effective-property-slot-definition))
+    (t (call-next-method))))
+
+(defmethod compute-effective-slot-definition-initargs ((class ginterface-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))
+       (call-next-method))
+    (call-next-method)))
+
 
 (defmethod shared-initialize ((class ginterface-class) names
                              &rest initargs &key name alien-name)
@@ -71,12 +92,41 @@ (defmethod validate-superclass
 
 ;;;;
 
-(defun expand-ginterface-type (type-number options &rest args)
+
+(defbinding type-default-interface-ref (type) pointer
+  ((find-type-number type t) type-number))
+
+(defbinding type-default-interface-unref (type) nil
+  ((find-type-number type t) type-number))
+
+(defbinding type-default-interface-peek (type) pointer
+  ((find-type-number type t) type-number))
+
+(defbinding %object-interface-list-properties () pointer
+  (iface pointer)
+  (n-properties unsigned-int :out))
+
+(defun query-object-interface-properties (type &optional inherited-p)
+  (let* ((type-number (find-type-number type))
+        (iface (type-default-interface-ref type-number)))
+    (unwind-protect
+        (multiple-value-bind (array length)
+            (%object-interface-list-properties iface)
+          (unwind-protect
+               (%map-params array length type-number inherited-p)
+            (deallocate-memory array)))
+;      (type-default-interface-unref type-number)
+      )))
+
+
+(defun expand-ginterface-type (type options &rest args)
   (declare (ignore args))
-  `(defclass ,(type-from-number type-number) (ginterface)
-     ,(getf options :slots)
-     (:metaclass ginterface-class)
-     (:alien-name ,(find-type-name type-number))))
+  (let ((class (type-from-number type))
+       (slots (getf options :slots)))    
+    `(defclass ,class (,(supertype type))
+      ,(slot-definitions class (query-object-interface-properties type) slots)
+      (:metaclass ginterface-class)
+      (:alien-name ,(find-type-name type)))))
 
 
 (register-derivable-type 'ginterface "GInterface" 'expand-ginterface-type)