X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/b19bbc943eecd2655a0e3f32eefada102f51142f..afa01e1b95c480818761b9e337ff08da44e9d49f:/glib/ginterface.lisp

diff --git a/glib/ginterface.lisp b/glib/ginterface.lisp
index 0e89408..6083654 100644
--- a/glib/ginterface.lisp
+++ b/glib/ginterface.lisp
@@ -20,34 +20,35 @@
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-;; $Id: ginterface.lisp,v 1.14 2006-02-15 09:45:41 espen Exp $
+;; $Id: ginterface.lisp,v 1.18 2006-04-26 21:00:22 espen Exp $
 
 (in-package "GLIB")
 
 (use-prefix "g")
 
-;;;; 
+;;;; Superclass for interfaces
 
-(defclass ginterface ()
+(defclass interface ()
   ())
 
+
 ;;;; Metaclass for interfaces
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
-  (defclass ginterface-class (virtual-slots-class)
+  (defclass interface-class (virtual-slots-class)
     ()))
 
-(defmethod direct-slot-definition-class ((class ginterface-class) &rest initargs)
+(defmethod direct-slot-definition-class ((class interface-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)
+(defmethod effective-slot-definition-class ((class interface-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)
+(defmethod compute-effective-slot-definition-initargs ((class interface-class) direct-slotds)
   (if (eq (slot-definition-allocation (first direct-slotds)) :property)
       (nconc 
        (list :pname (signal-name-to-string 
@@ -59,58 +60,57 @@ (defmethod compute-effective-slot-definition-initargs ((class ginterface-class)
     (call-next-method)))
 
 
-(defmethod shared-initialize ((class ginterface-class) names &key name gtype)
+(defmethod shared-initialize ((class interface-class) names &key name gtype)
   (declare (ignore names))
-  (let* ((class-name (or name (class-name class)))
+  (let* ((class-name (or name (class-name class)))	 
 	 (type-number
 	  (or
 	   (find-type-number class-name)
 	   (register-type class-name 
 	    (or (first gtype) (default-type-init-name class-name))))))
-;    (type-default-interface-ref type-number)
-    )
+    (type-default-interface-ref type-number))
   (call-next-method))
 
 
-(defmethod validate-superclass ((class ginterface-class) (super standard-class))
-  (subtypep (class-name super) 'ginterface))
+(defmethod validate-superclass ((class interface-class) (super standard-class))
+  (subtypep (class-name super) 'interface))
 
 
-(defmethod alien-type ((class ginterface-class) &rest args)
-  (declare (ignore class args))
+(define-type-method alien-type ((type interface))
+  (declare (ignore type))
   (alien-type 'gobject))
 
-(defmethod size-of ((class ginterface-class) &rest args)
-  (declare (ignore class args))
+(define-type-method size-of ((type interface) &key inlined)
+  (assert-not-inlined type inlined)
   (size-of 'gobject))
 
-(defmethod from-alien-form (location (class ginterface-class) &rest args)
-  (declare (ignore class args))
-  (from-alien-form location 'gobject))
+(define-type-method from-alien-form ((type interface) location &key (ref :copy))
+  (declare (ignore type))
+  (from-alien-form 'gobject location :ref ref))
 
-(defmethod from-alien-function ((class ginterface-class) &rest args)
-  (declare (ignore class args))
-  (from-alien-function 'gobject))
+(define-type-method from-alien-function ((type interface) &key (ref :copy))
+  (declare (ignore type))
+  (from-alien-function 'gobject :ref ref))
 
-(defmethod to-alien-form (instance (class ginterface-class) &rest args)
-  (declare (ignore class args))
-  (to-alien-form instance 'gobject))
+(define-type-method to-alien-form ((type interface) instance &optional copy-p)
+  (declare (ignore type))
+  (to-alien-form 'gobject instance copy-p))
 
-(defmethod to-alien-function ((class ginterface-class) &rest args)
-  (declare (ignore class args))
-  (to-alien-function 'gobject))
+(define-type-method to-alien-function ((type interface) &optional copy-p)
+  (declare (ignore type))
+  (to-alien-function 'gobject copy-p))
 
-(defmethod reader-function ((class ginterface-class) &rest args)
-  (declare (ignore class args))
-  (reader-function 'gobject))
+(define-type-method reader-function ((type interface) &key ref inlined)
+  (assert-not-inlined type inlined)
+  (reader-function 'gobject :ref ref))
 
-(defmethod writer-function ((class ginterface-class) &rest args)
-  (declare (ignore class args))
-  (writer-function 'gobject))
+(define-type-method writer-function ((type interface) &key temp inlined)
+  (assert-not-inlined type inlined)
+  (writer-function 'gobject :temp temp))
 
-(defmethod destroy-function ((class ginterface-class) &rest args)
-  (declare (ignore class args))
-  (destroy-function 'gobject))
+(define-type-method destroy-function ((type interface) &key temp inlined)
+  (assert-not-inlined type inlined)
+  (destroy-function 'gobject :temp temp))
 
 
 ;;;;
@@ -119,8 +119,8 @@ (defmethod destroy-function ((class ginterface-class) &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-unref () nil
+  (iface pointer))
 
 (defbinding type-default-interface-peek (type) pointer
   ((find-type-number type t) type-number))
@@ -139,24 +139,30 @@ (defun query-object-interface-properties (type &optional inherited-p)
 	     (unwind-protect
 		 (%map-params array length type-number inherited-p)
 	       (deallocate-memory array))))
-;      (type-default-interface-unref type-number)
-      )))
+      (type-default-interface-unref iface))))
 
 
-(defun expand-ginterface-type (type forward-p options &rest args)
+(defun expand-interface-type (type forward-p options &rest args)
   (declare (ignore args))
   (let ((class (type-from-number type))
 	(slots (getf options :slots))) 
     `(defclass ,class (,(supertype type))
        ,(unless forward-p
 	  (slot-definitions class (query-object-interface-properties type) slots))
-      (:metaclass ginterface-class)
+      (:metaclass interface-class)
       (:gtype ,(register-type-as type)))))
 
-(defun ginterface-dependencies (type)
+(defun interface-dependencies (type options)
   (delete-duplicates 
    (cons
     (supertype type)
-    (mapcar #'param-value-type (query-object-interface-properties type)))))
+    (append
+     (mapcar #'param-value-type (query-object-interface-properties type))
+     (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 'ginterface "GInterface" 'expand-ginterface-type 'ginterface-dependencies)
+(register-derivable-type 'interface "GInterface" 'expand-interface-type 'interface-dependencies)