;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-;; $Id: gtkobject.lisp,v 1.31 2006/02/15 09:47:42 espen Exp $
+;; $Id: gtkobject.lisp,v 1.47 2008/03/06 22:02:08 espen Exp $
(in-package "GTK")
-;;;; Misc utils
-
-; (defun name-to-string (name)
-; (substitute #\_ #\- (string-downcase (string name))))
-
-; (defun string-to-name (name &optional (package "KEYWORD"))
-; (intern (substitute #\- #\_ (string-upcase name)) package))
-
-
-
;;;; Superclass for the gtk class hierarchy
(eval-when (:compile-toplevel :load-toplevel :execute)
- (init-types-in-library
- #.(concatenate 'string (pkg-config:pkg-variable "gtk+-2.0" "libdir")
- "/libgtk-x11-2.0.so"))
+ (init-types-in-library gtk "libgtk-2.0")
(defclass %object (gobject)
()
(call-next-method)
;; Add a temorary reference which will be removed when the object is
;; sinked
- (reference-foreign (class-of object) (foreign-location object))
+ (funcall (reference-function '%object) (foreign-location object))
(%object-sink object))
(defbinding %object-sink () nil
;;;; Main loop and event handling
-(declaim (inline events-pending-p main-iteration))
+(defparameter *reentrant-main-iteration* t)
+(defvar *running-main-iteration* nil)
(defbinding events-pending-p () boolean)
(defun main-iterate-all (&rest args)
(declare (ignore args))
- (loop
- while (events-pending-p)
- do (main-iteration-do nil)))
+ (unless (and (not *reentrant-main-iteration*) *running-main-iteration*)
+ (let ((*running-main-iteration* t))
+ (loop
+ while (events-pending-p)
+ do (main-iteration-do nil))))
+ #+clisp 0)
+
+
+(define-callback fd-source-callback-marshal nil
+ ((callback-id unsigned-int) (fd unsigned-int))
+ (glib::invoke-source-callback callback-id fd))
+
+(defbinding (input-add "gtk_input_add_full") (fd condition function) unsigned-int
+ (fd unsigned-int)
+ (condition gdk:input-condition)
+ (fd-source-callback-marshal callback)
+ (nil null)
+ ((register-callback-function function) unsigned-long)
+ (user-data-destroy-callback callback))
;;;; Metaclass for child classes
(defvar *container-to-child-class-mappings* (make-hash-table))
(eval-when (:compile-toplevel :load-toplevel :execute)
- (defclass child-class (virtual-slots-class)
+ (defclass container-child-class (virtual-slots-class)
())
(defclass direct-child-slot-definition (direct-virtual-slot-definition)
((pname :reader slot-definition-pname :initarg :pname)))
(defclass effective-child-slot-definition (effective-virtual-slot-definition)
- ((pname :reader slot-definition-pname :initarg :pname)))
+ ((pname :reader slot-definition-pname :initarg :pname))))
-(defmethod shared-initialize ((class child-class) names &key container)
+(defmethod shared-initialize ((class container-child-class) names &key container)
+ (declare (ignore names))
(call-next-method)
(setf
(gethash (find-class (first container)) *container-to-child-class-mappings*)
- class))
-
-(defmethod direct-slot-definition-class ((class child-class) &rest initargs)
+ class)
+ #+clisp
+ (loop
+ for slotd in (class-direct-slots class)
+ when (typep slotd 'direct-child-slot-definition)
+ do (loop
+ for reader in (slot-definition-readers slotd)
+ do (add-reader-method class
+ (ensure-generic-function reader :lambda-list '(object))
+ (slot-definition-name slotd)))
+ (loop
+ for writer in (slot-definition-writers slotd)
+ do (add-writer-method class
+ (ensure-generic-function writer :lambda-list '(value object))
+ (slot-definition-name slotd)))))
+
+(defmethod direct-slot-definition-class ((class container-child-class) &rest initargs)
(case (getf initargs :allocation)
(:property (find-class 'direct-child-slot-definition))
(t (call-next-method))))
-(defmethod effective-slot-definition-class ((class child-class) &rest initargs)
+(defmethod effective-slot-definition-class ((class container-child-class) &rest initargs)
(case (getf initargs :allocation)
(:property (find-class 'effective-child-slot-definition))
(t (call-next-method))))
-(defmethod compute-effective-slot-definition-initargs ((class child-class) direct-slotds)
+(defmethod compute-effective-slot-definition-initargs ((class container-child-class) direct-slotds)
(if (eq (slot-definition-allocation (first direct-slotds)) :property)
(nconc
(list :pname (most-specific-slot-value direct-slotds 'pname))
- ;; Need this to prevent type expansion in SBCL (>= 0.9.8)
- (list :type (most-specific-slot-value direct-slotds 'type))
(call-next-method))
(call-next-method)))
-(progn
- #+cmu(declaim (optimize (inhibit-warnings 3)))
- #+sbcl(declaim (muffle-conditions compiler-note))
- (defun %container-child-get-property (parent child pname gvalue))
- (defun %container-child-set-property (parent child pname gvalue)))
-
-
-(defmethod initialize-internal-slot-functions ((slotd effective-child-slot-definition))
- (let ((type (slot-definition-type slotd))
- (pname (slot-definition-pname slotd)))
- (setf
- (slot-value slotd 'getter)
- #'(lambda (object)
- (with-slots (parent child) object
- (let ((gvalue (gvalue-new type)))
- (%container-child-get-property parent child pname gvalue)
- (unwind-protect
- (funcall (reader-function type) gvalue +gvalue-value-offset+)
- (gvalue-free gvalue t))))))
-
- (setf
- (slot-value slotd 'setter)
- #'(lambda (value object)
- (with-slots (parent child) object
- (let ((gvalue (gvalue-new type)))
- (funcall (writer-function type) value gvalue +gvalue-value-offset+)
- (%container-child-set-property parent child pname gvalue)
- (gvalue-free gvalue t)
- value)))))
-
- (call-next-method)))
+(defmethod slot-readable-p ((slotd effective-child-slot-definition))
+ (declare (ignore slotd))
+ t)
+(defmethod compute-slot-reader-function ((slotd effective-child-slot-definition) &optional signal-unbound-p)
+ (declare (ignore signal-unbound-p))
+ (let* ((type (slot-definition-type slotd))
+ (pname (slot-definition-pname slotd))
+ (reader (reader-function type :ref :get)))
+ #'(lambda (object)
+ (with-slots (parent child) object
+ (with-memory (gvalue +gvalue-size+)
+ (glib::%gvalue-init gvalue (find-type-number type))
+ (%container-child-get-property parent child pname gvalue)
+ (funcall reader gvalue +gvalue-value-offset+))))))
+
+(defmethod slot-writable-p ((slotd effective-child-slot-definition))
+ (declare (ignore slotd))
+ t)
-(defmethod add-reader-method ((class child-class) generic-function slot-name)
+(defmethod compute-slot-writer-function ((slotd effective-child-slot-definition))
+ (let* ((type (slot-definition-type slotd))
+ (pname (slot-definition-pname slotd))
+ (writer (writer-function type :temp t))
+ (destroy (destroy-function type :temp t)))
+ #'(lambda (value object)
+ (with-slots (parent child) object
+ (with-memory (gvalue +gvalue-size+)
+ (glib::%gvalue-init gvalue (find-type-number type))
+ (funcall writer value gvalue +gvalue-value-offset+)
+ (%container-child-set-property parent child pname gvalue)
+ (funcall destroy gvalue +gvalue-value-offset+))
+ value))))
+
+
+(defmethod add-reader-method ((class container-child-class) generic-function slot-name #?(sbcl>= 1 0 2)slot-documentation #?(sbcl>= 1 0 14)source-location)
(add-method
generic-function
(make-instance 'standard-method
:specializers (list (find-class 'widget))
:lambda-list '(widget)
+ :documentation (or #?(sbcl>= 1 0 2)slot-documentation "automatically generated reader method")
:function #'(lambda (args next-methods)
(declare (ignore next-methods))
(child-property-value (first args) slot-name)))))
-(defmethod add-writer-method
- ((class child-class) generic-function slot-name)
+(defmethod add-writer-method ((class container-child-class) generic-function slot-name #?(sbcl>= 1 0 2)slot-documentation #?(sbcl>= 1 0 14)source-location)
(add-method
generic-function
(make-instance 'standard-method
:specializers (list (find-class t) (find-class 'widget))
:lambda-list '(value widget)
+ :documentation (or #?(sbcl>= 1 0 2)slot-documentation "automatically generated reader method")
:function #'(lambda (args next-methods)
(declare (ignore next-methods))
(destructuring-bind (value widget) args
(setf (child-property-value widget slot-name) value))))))
-(defmethod validate-superclass ((class child-class) (super standard-class))
+(defmethod validate-superclass ((class container-child-class) (super standard-class))
;(subtypep (class-name super) 'container-child)
t)
-(defclass container-child ()
+(defclass container-child (virtual-slots-object)
((parent :initarg :parent :type container)
(child :initarg :child :type widget)))
(class pointer)
(n-properties unsigned-int :out))
-(defun query-container-class-child-properties (type-number)
+(defun query-container-class-child-properties (type-number &optional owner-only-p)
(let ((class (type-class-ref type-number)))
(multiple-value-bind (array length)
(%container-class-list-child-properties class)
(unwind-protect
- (map-c-vector 'list #'identity array 'param length)
+ (let ((properties (map-c-vector 'list #'identity array 'param length)))
+ (if owner-only-p
+ (delete-if
+ #'(lambda (property)
+ (not (eql (slot-value property 'glib::owner-type) type-number)))
+ properties)
+ properties))
(deallocate-memory array)))))
(defun default-container-child-name (container-class)
(expand-gobject-type type t options)
`(progn
,(expand-gobject-type type nil options)
- (defclass ,child-class (,(default-container-child-name super))
- ,(slot-definitions child-class
- (query-container-class-child-properties type) nil)
- (:metaclass child-class)
- (:container ,class))))))
-
+ ,(let ((child-properties (query-container-class-child-properties type t)))
+ (when child-properties
+ `(defclass ,child-class (,(default-container-child-name super))
+ ,(slot-definitions child-class child-properties nil)
+ (:metaclass container-child-class)
+ (:container ,class))))))))
+
+(defun container-child-class (container-class)
+ (gethash container-class *container-to-child-class-mappings*))
+
+(defun container-dependencies (type options)
+ (delete-duplicates
+ (append
+ (gobject-dependencies type options)
+ (mapcar #'param-value-type (query-container-class-child-properties type)))))
+
+(register-derivable-type 'container "GtkContainer" 'expand-container-type 'container-dependencies)
+
+
+(defmacro define-callback-setter (name arg return-type &rest rest-args)
+ (let ((callback (gensym)))
+ (if arg
+ `(progn
+ (define-callback-marshal ,callback ,return-type
+ ,(cons arg rest-args))
+ (defbinding ,name () nil
+ ,arg
+ (,callback callback)
+ (function user-callback)
+ (user-data-destroy-callback callback)))
+ `(progn
+ (define-callback-marshal ,callback ,return-type ,rest-args)
+ (defbinding ,name () nil
+ (,callback callback)
+ (function user-callback)
+ (user-data-destroy-callback callback))))))
-(register-derivable-type 'container "GtkContainer" 'expand-container-type 'gobject-dependencies)
~mdw / clg / blobdiff