(defvar *foreign-gobjects* (make-weak-hash-table :test 'equal :weakness :value))
(defvar *foreign-gobjects-ref-count* (make-hash-table :test 'equal))
+(defvar *lisp-objects-pointers* (make-hash-table :test 'equal))
(defvar *current-creating-object* nil)
(defcstruct g-object-struct
(declare (ignore data))
(debugf "g-object has finalized ~A ~A~%" (g-type-name (g-type-from-object object-pointer)) object-pointer))
+(defun erase-pointer (data object-pointer)
+ (declare (ignore data))
+ (remhash (pointer-address object-pointer) *lisp-objects-pointers*))
+
+(defcallback weak-notify-erase-pointer :void ((data :pointer) (object-pointer :pointer))
+ (erase-pointer data object-pointer))
+
(defun should-ref-sink-at-creation (object)
;;If object was not created from lisp-side, we should ref it
;;If an object is regular g-object, we should not ref-sink it
(debugf "g_object_ref_sink(~A)~%" (pointer obj))
(g-object-ref-sink (pointer obj)))
(g-object-weak-ref (pointer obj) (callback weak-notify-print) (null-pointer))
+ (g-object-weak-ref (pointer obj) (callback weak-notify-erase-pointer) (null-pointer))
(setf (g-object-has-reference obj) t)
(setf (gethash (pointer-address (pointer obj)) *foreign-gobjects*)
obj)
(defun g-object-dispose (pointer)
(unless (gethash (pointer-address pointer) *foreign-gobjects-ref-count*)
- (format t "GObject ~A is already disposed, signalling error~%" pointer)
+ (debugf "GObject ~A is already disposed, signalling error~%" pointer)
(error "GObject ~A is already disposed" pointer))
(debugf "g_object_unref(~A) (of type ~A, lisp-value ~A) (lisp ref-count ~A, gobject ref-count ~A)~%"
pointer
(gethash (pointer-address pointer) *foreign-gobjects*)
(gethash (pointer-address pointer) *foreign-gobjects-ref-count*)
(ref-count pointer))
- (awhen (gethash (pointer-address pointer) *foreign-gobjects*)
- (setf (pointer it) nil)
- (cancel-finalization it))
+ (let ((object (gethash (pointer-address pointer) *foreign-gobjects*)))
+ (when object
+ (setf (pointer object) nil)
+ (cancel-finalization object)))
(remhash (pointer-address pointer) *foreign-gobjects*)
(remhash (pointer-address pointer) *foreign-gobjects-ref-count*)
(g-object-unref pointer))
(defvar *registered-object-types* (make-hash-table :test 'equal))
(defun register-object-type (name type)
(setf (gethash name *registered-object-types*) type))
+(defun registered-object-type-by-name (name)
+ (gethash name *registered-object-types*))
(defun get-g-object-lisp-type (g-type)
(loop
while (not (zerop g-type))
(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)))
(define-foreign-type foreign-g-object-type ()
(defmethod translate-to-foreign (object (type foreign-g-object-type))
(cond
+ ((null object)
+ (null-pointer))
+ ((pointerp object) object)
((null (pointer object))
(error "Object ~A has been disposed" object))
((typep object 'g-object)
nil
"Object ~A is not a subtype of ~A" object (sub-type type))
(pointer object))
- ((pointerp object) object)
(t (error "Object ~A is not translatable as GObject*" object))))
(defun get-g-object-for-pointer (pointer)
(unless (null-pointer-p pointer)
- (aif (gethash (pointer-address pointer) *foreign-gobjects*)
- (prog1 it
- (incf (gethash (pointer-address pointer) *foreign-gobjects-ref-count*))
- (debugf "increfering object ~A~%" pointer))
- (make-g-object-from-pointer pointer))))
+ (let ((object (gethash (pointer-address pointer) *foreign-gobjects*)))
+ (if object
+ (prog1 object
+ (incf (gethash (pointer-address pointer) *foreign-gobjects-ref-count*))
+ (debugf "increfering object ~A~%" pointer))
+ (make-g-object-from-pointer pointer)))))
(defmethod translate-from-foreign (pointer (type foreign-g-object-type))
(get-g-object-for-pointer pointer))
(etypecase object
(g-object (pointer object)))))
+(defun g-param-spec-property-type (param-spec property-name object-type assert-readable assert-writable)
+ (when (null-pointer-p param-spec)
+ (error "Property ~A on type ~A is not found"
+ property-name
+ (g-type-name object-type)))
+ (when (and assert-readable
+ (not (member :readable
+ (foreign-slot-value param-spec
+ 'g-param-spec
+ 'flags))))
+ (error "Property ~A on type ~A is not readable"
+ property-name
+ (g-type-name object-type)))
+ (when (and assert-writable
+ (not (member :writable
+ (foreign-slot-value param-spec
+ 'g-param-spec
+ 'flags))))
+ (error "Property ~A on type ~A is not writable"
+ property-name
+ (g-type-name object-type)))
+ (foreign-slot-value param-spec 'g-param-spec 'value-type))
+
(defun g-object-type-property-type (object-type property-name
&key assert-readable assert-writable)
(let* ((object-class (g-type-class-ref object-type))
(param-spec (g-object-class-find-property object-class property-name)))
(unwind-protect
- (progn
- (when (null-pointer-p param-spec)
- (error "Property ~A on type ~A is not found"
- property-name
- (g-type-name object-type)))
- (when (and assert-readable
- (not (member :readable
- (foreign-slot-value param-spec
- 'g-param-spec
- 'flags))))
- (error "Property ~A on type ~A is not readable"
- property-name
- (g-type-name object-type)))
- (when (and assert-writable
- (not (member :writable
- (foreign-slot-value param-spec
- 'g-param-spec
- 'flags))))
- (error "Property ~A on type ~A is not writable"
- property-name
- (g-type-name object-type)))
- (foreign-slot-value param-spec 'g-param-spec 'value-type))
+ (g-param-spec-property-type param-spec property-name object-type assert-readable assert-writable)
(g-type-class-unref object-class))))
(defun g-object-property-type (object property-name
for arg-name in args-names
for arg-value in args-values
for arg-type in args-types
- for arg-g-type = (ensure-g-type arg-type)
+ for arg-g-type = (if arg-type (ensure-g-type arg-type) (g-object-type-property-type object-type arg-name))
for parameter = (mem-aref parameters 'g-parameter i)
do (setf (foreign-slot-value parameter 'g-parameter 'name) arg-name)
do (set-g-value (foreign-slot-value parameter 'g-parameter 'value)
projects / cl-gtk2.git / blobdiff