;; Common Lisp bindings for GTK+ v2.0
-;; Copyright (C) 2000-2001 Espen S. Johnsen <esj@stud.cs.uit.no>
+;; Copyright (C) 2000-2005 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 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.29 2005/01/30 14:30:30 espen Exp $
+;; $Id: gobject.lisp,v 1.34 2005/03/06 17:26:23 espen Exp $
(in-package "GLIB")
(defclass gobject-class (ginstance-class)
())
- (defmethod validate-superclass ((class gobject-class)
- (super pcl::standard-class))
+ (defmethod validate-superclass ((class gobject-class) (super standard-class))
; (subtypep (class-name super) 'gobject)
t))
(defmethod initialize-internal-slot-functions ((slotd effective-property-slot-definition))
- (let* ((type (slot-definition-type slotd))
- (pname (slot-definition-pname slotd))
- (type-number (find-type-number type)))
+ (let ((type (slot-definition-type slotd))
+ (pname (slot-definition-pname slotd)))
(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))) ;(type-from-number type-number))))
- (let ((gvalue (gvalue-new type-number)))
+ (setq reader (reader-function type)))
+ (let ((gvalue (gvalue-new type)))
(%object-get-property object pname gvalue)
(unwind-protect
(funcall reader gvalue +gvalue-value-offset+)
(let ((writer nil))
#'(lambda (value object)
(unless writer
- (setq writer (writer-function type))) ;(type-from-number type-number))))
- (let ((gvalue (gvalue-new type-number)))
+ (setq writer (writer-function type)))
+ (let ((gvalue (gvalue-new type)))
(funcall writer value gvalue +gvalue-value-offset+)
(%object-set-property object pname gvalue)
(gvalue-free gvalue t)
(defclass gobject (ginstance)
()
(:metaclass gobject-class)
- (:alien-name "GObject")))
+ (:gtype "GObject")))
(defun initial-add (object function initargs key pkey)
(data unsigned-long)
(destroy-marshal pointer))
+(defcallback user-data-destroy-func (nil (id unsigned-int))
+ (destroy-user-data id))
+
+(export 'user-data-destroy-func)
+
(defun (setf user-data) (data object key)
(%object-set-qdata-full object (quark-intern key)
- (register-user-data data) (callback %destroy-user-data))
+ (register-user-data data) (callback user-data-destroy-func))
data)
;; deprecated
(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 slot-definition-from-property (class property &optional slot-name args)
(with-slots (name flags value-type documentation) property
(let* ((slot-name (or slot-name (default-slot-name name)))
- (slot-type (or (getf args :type) (type-from-number value-type) value-type))
+ (slot-type (or (getf args :type) (type-from-number value-type) 'pointer))
(accessor (default-slot-accessor class slot-name slot-type)))
`(,slot-name
'(:construct t))
;; initargs
- ,@(when (or (member :construct flags)
- (member :construct-only flags)
- (member :writable flags))
- (list :initarg (intern (string slot-name) "KEYWORD")))
- ,@(cond
- ((find :initarg args) (list :initarg (getf args :initarg))))
+ ,@(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))))
(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
- ,(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)))))
+ (:gtype ,(find-type-init-function type)))))
+
+(defun gobject-dependencies (type)
+ (delete-duplicates
+ (cons
+ (supertype type)
+ (append
+ (type-interfaces type)
+ (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