;; 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: gcallback.lisp,v 1.7 2002-03-24 12:52:11 espen Exp $
+;; $Id: gcallback.lisp,v 1.12 2004-11-06 21:39:58 espen Exp $
(in-package "GLIB")
(use-prefix "g")
-;;;; Closures
+;;;; Callback mechanism
(deftype gclosure () 'pointer)
-(defbinding lisp-callback-closure-new () gclosure
- (callback-id unsigned-int))
+(defbinding (callback-closure-new "clg_callback_closure_new") () gclosure
+ (callback-id unsigned-int)
+ (callback pointer)
+ (destroy-notify pointer))
(defun register-callback-function (function)
(check-type function (or null symbol function))
(register-user-data function))
+(def-callback closure-callback-marshal (c-call:void
+ (gclosure system-area-pointer)
+ (return-value system-area-pointer)
+ (n-params c-call:unsigned-int)
+ (param-values system-area-pointer)
+ (invocation-hint system-area-pointer)
+ (callback-id c-call:unsigned-int))
+ (callback-trampoline callback-id n-params param-values return-value))
+
+(def-callback %destroy-user-data (c-call:void (id c-call:unsigned-int))
+ (destroy-user-data id))
+
(defun make-callback-closure (function)
- (lisp-callback-closure-new (register-callback-function function)))
-
+ (callback-closure-new
+ (register-callback-function function)
+ (callback closure-callback-marshal) (callback %destroy-user-data)))
-;;;; Callback mechanism
-(defun callback-trampoline (callback-id params return-value)
+(defun callback-trampoline (callback-id n-params param-values return-value)
(let* ((return-type (unless (null-pointer-p return-value)
(gvalue-type return-value)))
- (args nil)
- (callback-function (find-user-data callback-id)))
-
- (destructuring-bind (nparams . param-values) params
- (dotimes (n nparams)
- (push (gvalue-get (sap+ param-values (* n +gvalue-size+))) args)))
-
- (labels ((invoke-callback ()
- (restart-case
- (unwind-protect
- (let ((result (apply callback-function (reverse args))))
- (when return-type
- (gvalue-set (print return-value) result))))
-
- (continue nil :report "Return from callback function"
- (when return-type
- (format
- *query-io*
- "Enter return value of type ~S: "
- return-type)
- (force-output *query-io*)
- (gvalue-set return-value (eval (read *query-io*)))))
- (re-invoke nil :report "Re-invoke callback function"
- (invoke-callback)))))
- (invoke-callback))))
-
-(defun after-gc-hook ()
- (setf
- (extern-alien "callback_trampoline" system-area-pointer)
- (make-pointer (kernel:get-lisp-obj-address #'callback-trampoline))
- (extern-alien "destroy_user_data" system-area-pointer)
- (make-pointer (kernel:get-lisp-obj-address #'destroy-user-data))))
-
-(pushnew 'after-gc-hook ext:*after-gc-hooks*)
-(after-gc-hook)
+ (args (loop
+ for n from 0 below n-params
+ collect (gvalue-get (sap+ param-values (* n +gvalue-size+))))))
+ (let ((result (apply #'invoke-callback callback-id return-type args)))
+ (when return-type
+ (gvalue-set return-value result)))))
+
+
+(defun invoke-callback (callback-id type &rest args)
+ (restart-case
+ (apply (find-user-data callback-id) args)
+ (continue nil :report "Return from callback function"
+ (when type
+ (format *query-io* "Enter return value of type ~S: " type)
+ (force-output *query-io*)
+ (eval (read *query-io*))))
+ (re-invoke nil :report "Re-invoke callback function"
+ (apply #'invoke-callback callback-id type args))))
;;;; Timeouts and idle functions
-(defvar *source-callback-marshal*
- (system:foreign-symbol-address "source_callback_marshal"))
-(defvar *destroy-notify*
- (system:foreign-symbol-address "destroy_notify"))
+(def-callback source-callback-marshal (c-call:void (callback-id c-call:unsigned-int))
+ (callback-trampoline callback-id 0 nil (make-pointer 0)))
(defbinding (timeout-add "g_timeout_add_full")
(function interval &optional (priority 0)) unsigned-int
(interval unsigned-int)
(*source-callback-marshal* pointer)
((register-callback-function function) unsigned-long)
- (*destroy-notify* pointer))
+ ((callback %destroy-user-data) pointer))
(defbinding (idle-add "g_idle_add_full")
(function &optional (priority 0)) unsigned-int
(priority int)
(*source-callback-marshal* pointer)
((register-callback-function function) unsigned-long)
- (*destroy-notify* pointer))
+ ((callback %destroy-user-data) pointer))
(handler unsigned-int))
-(defmethod signal-connect ((gobject gobject) signal function &rest args &key after object)
- (declare (ignore signal args after))
- (cond
- ((or (eq object t) (eq object gobject)) function)
- ((not object)
- #'(lambda (&rest args) (apply function (cdr args))))
- (t
- #'(lambda (&rest args) (apply function object (rest args))))))
+(defmethod signal-connect ((gobject gobject) signal function &key after object)
+"Connects a callback function to a signal for a particular object. If :OBJECT
+ is T, the object connected to is passed as the first argument to the callback
+ function, or if :OBJECT is any other non NIL value, it is passed as the first
+ argument instead. If :AFTER is non NIL, the handler will be called after the
+ default handler of the signal."
+ (let ((callback-id
+ (make-callback-closure
+ (cond
+ ((or (eq object t) (eq object gobject)) function)
+ ((not object)
+ #'(lambda (&rest args) (apply function (cdr args))))
+ (t
+ #'(lambda (&rest args) (apply function object (rest args))))))))
+ (signal-connect-closure gobject signal callback-id :after after)))
-(defmethod signal-connect :around ((gobject gobject) signal function
- &key after object)
- (declare (ignore object))
- (let ((callback-id (make-callback-closure (call-next-method))))
- (signal-connect-closure gobject signal callback-id :after after)))
+;;; Message logging
+
+;; TODO: define and signal conditions based on log-level
+;(defun log-handler (domain log-level message)
+(def-callback log-handler (c-call:void (domain c-call:c-string)
+ (log-level c-call:int)
+ (message c-call:c-string))
+ (error "~A: ~A" domain message))
+
+(setf (extern-alien "log_handler" system-area-pointer) (callback log-handler))
~mdw / clg / blobdiff