X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/b43753170fdeed0b344b149a3ad3d187fa4ed303..ce9d2008d8ac932db2dd84476c346e4bed57b888:/glib/gcallback.lisp diff --git a/glib/gcallback.lisp b/glib/gcallback.lisp index 0f7baf2..2b1d196 100644 --- a/glib/gcallback.lisp +++ b/glib/gcallback.lisp @@ -20,7 +20,7 @@ ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -;; $Id: gcallback.lisp,v 1.44 2007-06-20 10:21:54 espen Exp $ +;; $Id: gcallback.lisp,v 1.51 2009-02-10 15:18:15 espen Exp $ (in-package "GLIB") @@ -36,6 +36,17 @@ (check-type function (or null symbol function)) (register-user-data function)) +(deftype user-callback () '(or function symbol)) + +(define-type-method alien-type ((type user-callback)) + (declare (ignore type)) + (alien-type 'pointer-data)) + +(define-type-method to-alien-form ((type user-callback) func &optional copy-p) + (declare (ignore type copy-p)) + `(register-callback-function ,func)) + + ;; Callback marshaller for regular signal handlers (define-callback signal-handler-marshal nil ((gclosure gclosure) (return-value gvalue) (n-params unsigned-int) @@ -90,9 +101,9 @@ (disconnect () :report "Disconnect and exit signal handler" (when (signal-handler-is-connected-p instance handler-id) (signal-handler-disconnect instance handler-id)) - (values nil t)))) + (values nil t))) (when (signal-handler-is-connected-p instance handler-id) - (signal-handler-unblock instance handler-id)))) + (signal-handler-unblock instance handler-id))))) (defun invoke-callback (callback-id return-type &rest args) (restart-case (apply (find-user-data callback-id) args) @@ -121,14 +132,14 @@ (define-callback source-callback-marshal boolean ((callback-id unsigned-int)) (invoke-source-callback callback-id)) -(defun invoke-source-callback (callback-id) - (restart-case (funcall (find-user-data callback-id)) +(defun invoke-source-callback (callback-id &rest args) + (restart-case (apply (find-user-data callback-id) args) (remove () :report "Exit and remove source callback" nil) (continue () :report "Return from source callback" t) (re-invoke nil :report "Re-invoke source callback" - (invoke-source-callback callback-id)))) + (apply #'invoke-source-callback callback-id args)))) (defbinding (timeout-add "g_timeout_add_full") @@ -159,7 +170,7 @@ ((signal-name-to-string name) string) ((find-type-number type t) type-number)) -(defbinding signal-name () (copy-of string) +(defbinding signal-name () (or null (copy-of string)) (signal-id unsigned-int)) (defbinding signal-list-ids (type) (vector unsigned-int n-ids) @@ -233,27 +244,40 @@ ;;;; Signal connecting and controlling -(defvar *overridden-signals* (make-hash-table :test 'equalp)) +(define-flags-type connect-flags :after :swapped) + +(defvar *signal-override-closures* (make-hash-table :test 'equalp)) -(defbinding %signal-override-class-closure () nil +(defbinding %%signal-override-class-closure () nil (signal-id unsigned-int) (type-number type-number) (callback-closure pointer)) +(defun %signal-override-class-closure (type name function) + (multiple-value-bind (callback-closure callback-id) + (make-callback-closure function class-handler-marshal) + (let ((signal-id (ensure-signal-id-from-type name type))) + (%%signal-override-class-closure signal-id (find-type-number type t) callback-closure)) + (setf + (gethash (list type name) *signal-override-closures*) + (list callback-id function)))) + (defun signal-override-class-closure (name type function) - (let* ((signal-id (ensure-signal-id-from-type name type)) - (type-number (find-type-number type t)) - (callback-id (gethash (cons type-number signal-id) *overridden-signals*))) + (let ((callback-id + (first (gethash (list type name) *signal-override-closures*)))) (if callback-id (update-user-data callback-id function) - (multiple-value-bind (callback-closure callback-id) - (make-callback-closure function class-handler-marshal) - (%signal-override-class-closure signal-id type-number callback-closure) - (setf - (gethash (cons type-number signal-id) *overridden-signals*) - callback-id))))) + (%signal-override-class-closure type name function)))) +(defun reinitialize-signal-override-class-closures () + (maphash + #'(lambda (key value) + (destructuring-bind (type name) key + (destructuring-bind (callback-id function) value + (declare (ignore callback-id)) + (%signal-override-class-closure type name function)))) + *signal-override-closures*)) (defbinding %signal-chain-from-overridden () nil (args pointer) @@ -280,7 +304,6 @@ do (gvalue-unset (pointer+ params offset))) (deallocate-memory params))))) - (defmacro define-signal-handler (name ((object class) &rest args) &body body) (let* ((info (signal-query (ensure-signal-id-from-type name class))) (types (cons class (signal-param-types info))) @@ -440,28 +463,34 @@ handler will be called after the default handler for the signal. If :REMOVE is non NIL, the handler will be removed after beeing invoked once. ARGS is a list of additional arguments passed to the callback function." -(let* ((signal-id (compute-signal-id gobject signal)) - (detail-quark (if detail (quark-intern detail) 0)) - (signal-stop-emission - #'(lambda () - (%signal-stop-emission gobject signal-id detail-quark))) - (callback (compute-signal-function gobject signal function object args)) - (wrapper #'(lambda (&rest args) - (let ((*signal-stop-emission* signal-stop-emission)) - (apply callback args))))) - (multiple-value-bind (closure-id callback-id) - (make-callback-closure wrapper signal-handler-marshal) - (let ((handler-id (%signal-connect-closure-by-id - gobject signal-id detail-quark closure-id after))) - (when remove - (update-user-data callback-id - #'(lambda (&rest args) + (let* ((signal-id (compute-signal-id gobject signal)) + (detail-quark (if detail (quark-intern detail) 0)) + (callback + (compute-signal-function gobject signal function object args)) + (wrapper + #'(lambda (&rest args) + (let ((*signal-stop-emission* + #'(lambda () + (%signal-stop-emission (first args) + signal-id detail-quark)))) + (apply callback args))))) + (multiple-value-bind (closure-id callback-id) + (make-callback-closure wrapper signal-handler-marshal) + (let ((handler-id (%signal-connect-closure-by-id + gobject signal-id detail-quark closure-id after))) + (when remove + (update-user-data callback-id + #'(lambda (&rest args) + (let ((gobject (first args))) (unwind-protect - (let ((*signal-stop-emission* signal-stop-emission)) - (apply callback args)) + (let ((*signal-stop-emission* + #'(lambda () + (%signal-stop-emission gobject + signal-id detail-quark)))) + (apply callback args)) (when (signal-handler-is-connected-p gobject handler-id) - (signal-handler-disconnect gobject handler-id)))))) - handler-id)))) + (signal-handler-disconnect gobject handler-id))))))) + handler-id)))) ;;;; Signal emission @@ -493,7 +522,7 @@ function." finally (if return-type (return - (with-gvalue (return-value) + (with-gvalue (return-value return-type) (%signal-emitv params signal-id detail return-value))) (%signal-emitv params signal-id detail (make-pointer 0)))) (loop @@ -517,6 +546,8 @@ function." ;;;; Signal registration +(defvar *registered-signals* ()) + (defbinding %signal-newv (name itype flags return-type param-types) unsigned-int ((signal-name-to-string name) string) @@ -532,8 +563,15 @@ function." (defun signal-new (name itype flags return-type param-types) (when (zerop (signal-lookup name itype)) + (push (list name itype flags return-type param-types) *registered-signals*) (%signal-newv name itype flags return-type param-types))) +(defun reinitialize-signals () + (mapc #'(lambda (args) (apply #'%signal-newv args)) *registered-signals*)) + +(asdf:install-init-hook 'reinitialize-signals) +(asdf:install-init-hook 'reinitialize-signal-override-class-closures) + ;;;; Convenient macros (defmacro define-callback-marshal (name return-type args &key (callback-id :last))