X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=glib%2Fgobject.object.high.lisp;h=678fb2bd6c226a24a4cfbd8689e6e309973b8297;hb=e6ec5def79916d6ecf3b1ea9aaecbbc295fdad95;hp=38926b42e64055e50725e7226435a1f77f75d759;hpb=e51007b28b495d35ed2a67b2d35dcf70d2c2395e;p=cl-gtk2.git diff --git a/glib/gobject.object.high.lisp b/glib/gobject.object.high.lisp index 38926b4..678fb2b 100644 --- a/glib/gobject.object.high.lisp +++ b/glib/gobject.object.high.lisp @@ -9,13 +9,18 @@ (has-reference :type boolean :accessor g-object-has-reference - :initform nil)) + :initform nil) + (signal-handlers + :type (array t *) + :initform (make-array 0 :adjustable t :fill-pointer t) + :reader g-object-signal-handlers)) (:documentation "Base class for GObject classes hierarchy.")) (defvar *foreign-gobjects-weak* (make-weak-hash-table :test 'equal :weakness :value)) (defvar *foreign-gobjects-strong* (make-hash-table :test 'equal)) (defvar *current-creating-object* nil) +(defvar *current-object-from-pointer* nil) (defun ref-count (pointer) (foreign-slot-value (if (pointerp pointer) pointer (pointer pointer)) 'g-object-struct :ref-count)) @@ -31,10 +36,13 @@ (s (format nil "~A" obj))) (finalize obj (lambda () - (debugf "~A is queued for GC (having ~A refs)~%" pointer (ref-count pointer)) + (log-for :gc "~A ~A is queued for GC (having ~A refs)~%" + (g-type-from-object pointer) pointer (ref-count pointer)) (handler-case (g-object-dispose-carefully pointer) - (error (e) (format t "Error in finalizer for ~A: ~A~%" s e)))))) + (error (e) + (log-for :gc "Error in finalizer for ~A: ~A~%" s e) + (format t "Error in finalizer for ~A: ~A~%" s e)))))) (register-g-object obj) (activate-gc-hooks)) @@ -44,7 +52,7 @@ (defun activate-gc-hooks () (with-recursive-lock-held (*gobject-gc-hooks-lock*) (when *gobject-gc-hooks* - (debugf "activating gc hooks for objects: ~A~%" *gobject-gc-hooks*) + (log-for :gc "activating gc hooks for objects: ~A~%" *gobject-gc-hooks*) (loop for pointer in *gobject-gc-hooks* do (g-object-remove-toggle-ref pointer (callback gobject-toggle-ref-toggled) (null-pointer))) @@ -60,13 +68,15 @@ (let ((locks-were-present (not (null *gobject-gc-hooks*)))) (push pointer *gobject-gc-hooks*) (unless locks-were-present - (debugf "adding idle-gc-hook to main loop~%") + (log-for :gc "adding idle-gc-hook to main loop~%") (g-idle-add (callback g-idle-gc-hook) (null-pointer)))))) (defun g-object-dispose-carefully (pointer) (handler-case (register-gobject-for-gc pointer) - (error (e) (format t "Error in dispose: ~A~%" e)))) + (error (e) + (log-for :gc "Error in dispose: ~A~%" e) + (format t "Error in dispose: ~A~%" e)))) (defun should-ref-sink-at-creation (object) ;;If object was not created from lisp-side, we should ref it @@ -74,17 +84,20 @@ ;;If an object is GInitiallyUnowned, then it is created with a floating reference, we should ref-sink it ;;A special case is GtkWindow: we should ref-sink it anyway (let ((r (cond - ((eq object *current-creating-object*) ;; g_object_new returns objects with ref = 1, we should save _this_ ref - (g-object-is-floating (pointer object))) ;; but floating objects should be ref_sunk + ((equal *current-object-from-pointer* (pointer object)) + (log-for :gc "*cur-obj-from-ptr* ") + t) ;; not new objects should be ref_sunk + ((eq object *current-creating-object*) ;; g_object_new returns objects with ref = 1, we should save _this_ ref + (typep object 'g-initially-unowned)) ;; but GInitiallyUnowned objects should be ref_sunk (t t)))) - (debugf "(should-ref-sink-at-creation ~A) => ~A~%" object r) + (log-for :gc "(should-ref-sink-at-creation ~A) => ~A~%" object r) r)) (defcallback gobject-toggle-ref-toggled :void ((data :pointer) (pointer :pointer) (is-last-ref :boolean)) (declare (ignore data)) - (debugf "~A is now ~A with ~A refs~%" pointer (if is-last-ref "weak pointer" "strong pointer") (ref-count pointer)) - (debugf "obj: ~A~%" (or (gethash (pointer-address pointer) *foreign-gobjects-strong*) + (log-for :gc "~A is now ~A with ~A refs~%" pointer (if is-last-ref "weak pointer" "strong pointer") (ref-count pointer)) + (log-for :gc "obj: ~A~%" (or (gethash (pointer-address pointer) *foreign-gobjects-strong*) (gethash (pointer-address pointer) *foreign-gobjects-weak*))) (if is-last-ref (let ((obj (gethash (pointer-address pointer) *foreign-gobjects-strong*))) @@ -92,25 +105,32 @@ (progn (remhash (pointer-address pointer) *foreign-gobjects-strong*) (setf (gethash (pointer-address pointer) *foreign-gobjects-weak*) obj)) - (warn "GObject at ~A has no lisp-side (strong) reference" pointer))) + (progn + (log-for :gc "GObject at ~A has no lisp-side (strong) reference" pointer) + (warn "GObject at ~A has no lisp-side (strong) reference" pointer)))) (let ((obj (gethash (pointer-address pointer) *foreign-gobjects-weak*))) - (unless obj (warn "GObject at ~A has no lisp-side (weak) reference" pointer)) + (unless obj + (log-for :gc "GObject at ~A has no lisp-side (weak) reference" pointer) + (warn "GObject at ~A has no lisp-side (weak) reference" pointer)) (remhash (pointer-address pointer) *foreign-gobjects-weak*) (setf (gethash (pointer-address pointer) *foreign-gobjects-strong*) obj)))) (defcallback gobject-weak-ref-finalized :void ((data :pointer) (pointer :pointer)) (declare (ignore data)) - (debugf "~A is weak-ref-finalized with ~A refs~%" pointer (ref-count pointer)) + (log-for :gc "~A is weak-ref-finalized with ~A refs~%" pointer (ref-count pointer)) (remhash (pointer-address pointer) *foreign-gobjects-weak*) (when (gethash (pointer-address pointer) *foreign-gobjects-strong*) - (warn "GObject at ~A was weak-ref-finalized while still holding lisp-side strong reference to it" pointer)) + (warn "GObject at ~A was weak-ref-finalized while still holding lisp-side strong reference to it" pointer) + (log-for :gc "GObject at ~A was weak-ref-finalized while still holding lisp-side strong reference to it" pointer)) (remhash (pointer-address pointer) *foreign-gobjects-strong*)) (defun register-g-object (obj) - (debugf "registered GObject ~A with gobject ref-count ~A ~A~%" (pointer obj) (ref-count obj) (if (g-object-is-floating (pointer obj)) "(floating)" "")) + (log-for :gc "registered GObject ~A (~A) with initial ref-count ~A ~A~%" + (pointer obj) obj + (ref-count obj) (if (g-object-is-floating (pointer obj)) "(floating)" "")) (when (should-ref-sink-at-creation obj) - (debugf "g_object_ref_sink(~A)~%" (pointer obj)) + (log-for :gc "g_object_ref_sink(~A)~%" (pointer obj)) (g-object-ref-sink (pointer obj))) (setf (g-object-has-reference obj) t) (setf (gethash (pointer-address (pointer obj)) *foreign-gobjects-strong*) obj) @@ -136,8 +156,8 @@ (unless lisp-type (error "Type ~A is not registered with REGISTER-OBJECT-TYPE" (g-type-name g-type))) - (g-object-ref pointer) - (make-instance lisp-type :pointer pointer))) + (let ((*current-object-from-pointer* pointer)) + (make-instance lisp-type :pointer pointer)))) (define-foreign-type foreign-g-object-type () ((sub-type :reader sub-type :initarg :sub-type :initform 'g-object)) @@ -164,7 +184,8 @@ (unless (null-pointer-p pointer) (or (gethash (pointer-address pointer) *foreign-gobjects-strong*) (gethash (pointer-address pointer) *foreign-gobjects-weak*) - (make-g-object-from-pointer pointer)))) + (progn (log-for :gc "Now creating object for ~A~%" pointer) + (make-g-object-from-pointer pointer))))) (defmethod translate-from-foreign (pointer (type foreign-g-object-type)) (get-g-object-for-pointer pointer)) @@ -205,48 +226,3 @@ (defmethod set-gvalue-for-type (gvalue-ptr (type-numeric (eql +g-type-interface+)) value) (set-gvalue-object gvalue-ptr value)) - -(defun g-signal-connect (object signal handler &key after) - "Deprecated alias for @fun{connect-signal}" - (connect-signal object signal handler :after after)) - -(defun connect-signal (object signal handler &key after) - "Connects the function to a signal for a particular object. -If @code{after} is true, then the function will be called after the default handler of the signal. - -@arg[object]{an instance of @class{gobject}} -@arg[signal]{a string; names the signal} -@arg[handler]{a function; handles the signal. Number (and type) of arguments and return value type depends on the signal} -@arg[after]{a boolean}" - (g-signal-connect-closure (ensure-object-pointer object) - signal - (create-g-closure handler) - after)) - -(defun emit-signal (object signal-name &rest args) - "Emits the signal. -@arg[object]{an instance of @class{g-object}. Signal is emitted on this object} -@arg[signal-name]{a string specifying the signal} -@arg[args]{arguments for the signal} -@return{none}" - (let* ((object-type (g-type-from-object (pointer object))) - (signal-info (parse-signal-name object-type signal-name))) - (unless signal-info - (error "Signal ~A not found on object ~A" signal-name object)) - (let ((params-count (length (signal-info-param-types signal-info)))) - (with-foreign-object (params 'g-value (1+ params-count)) - (set-g-value (mem-aref params 'g-value 0) object object-type :zero-g-value t) - (iter (for i from 0 below params-count) - (for arg in args) - (for type in (signal-info-param-types signal-info)) - (set-g-value (mem-aref params 'g-value (1+ i)) arg type :zero-g-value t)) - (prog1 - (if (g-type= (signal-info-return-type signal-info) +g-type-void+) - (g-signal-emitv params (signal-info-id signal-info) signal-name (null-pointer)) - (with-foreign-object (return-value 'g-value) - (g-value-zero return-value) - (g-value-init return-value (signal-info-return-type signal-info)) - (prog1 (parse-g-value return-value) - (g-value-unset return-value)))) - (iter (for i from 0 below (1+ params-count)) - (g-value-unset (mem-aref params 'g-value i))))))))