;; 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.15 2006-02-26 15:30:01 espen Exp $
+;; $Id: ginterface.lisp,v 1.17 2006-04-25 22:02:34 espen Exp $
(in-package "GLIB")
(defmethod shared-initialize ((class ginterface-class) names &key name gtype)
(declare (ignore names))
- (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)
- )
+ (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))
(call-next-method))
(declare (ignore type))
(alien-type 'gobject))
-(define-type-method size-of ((type ginterface))
- (declare (ignore type))
+(define-type-method size-of ((type ginterface) &key inlined)
+ (assert-not-inlined type inlined)
(size-of 'gobject))
-(define-type-method from-alien-form ((type ginterface) location)
+(define-type-method from-alien-form ((type ginterface) location &key (ref :copy))
(declare (ignore type))
- (from-alien-form 'gobject location))
+ (from-alien-form 'gobject location :ref ref))
-(define-type-method from-alien-function ((type ginterface))
+(define-type-method from-alien-function ((type ginterface) &key (ref :copy))
(declare (ignore type))
- (from-alien-function 'gobject))
+ (from-alien-function 'gobject :ref ref))
-(define-type-method to-alien-form ((type ginterface) instance)
+(define-type-method to-alien-form ((type ginterface) instance &optional copy-p)
(declare (ignore type))
- (to-alien-form 'gobject instance))
+ (to-alien-form 'gobject instance copy-p))
-(define-type-method to-alien-function ((type ginterface))
+(define-type-method to-alien-function ((type ginterface) &optional copy-p)
(declare (ignore type))
- (to-alien-function 'gobject))
+ (to-alien-function 'gobject copy-p))
-(define-type-method reader-function ((type ginterface))
- (declare (ignore type))
- (reader-function 'gobject))
+(define-type-method reader-function ((type ginterface) &key ref inlined)
+ (assert-not-inlined type inlined)
+ (reader-function 'gobject :ref ref))
-(define-type-method writer-function ((type ginterface))
- (declare (ignore type))
- (writer-function 'gobject))
+(define-type-method writer-function ((type ginterface) &key temp inlined)
+ (assert-not-inlined type inlined)
+ (writer-function 'gobject :temp temp))
-(define-type-method destroy-function ((type ginterface))
- (declare (ignore type))
- (destroy-function 'gobject))
+(define-type-method destroy-function ((type ginterface) &key temp inlined)
+ (assert-not-inlined type inlined)
+ (destroy-function 'gobject :temp temp))
;;;;
(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))
(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)
(:metaclass ginterface-class)
(:gtype ,(register-type-as type)))))
-(defun ginterface-dependencies (type)
+(defun ginterface-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)