Applied Win32 patch/code cleanups

[clg] / glib / gcallback.lisp

diff --git a/glib/gcallback.lisp b/glib/gcallback.lisp
index d80f89fd2cc0b083fc420bfcab971806e7c588e6..1b2e54fd16339658db1cece1b5b7ec21ec5c839d 100644 (file)
--- 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.40 2007-02-19 13:46:44 espen Exp $
+;; $Id: gcallback.lisp,v 1.43 2007-06-15 12:03:26 espen Exp $
 
 (in-package "GLIB")
 
@@ -40,22 +40,22 @@ (defun register-callback-function (function)
 (define-callback signal-handler-marshal nil
     ((gclosure gclosure) (return-value gvalue) (n-params unsigned-int) 
      (param-values pointer) (invocation-hint pointer) 
-     (callback-id unsigned-long))
+     (callback-id pointer-data))
   (declare (ignore gclosure invocation-hint))
   (callback-trampoline #'invoke-signal-handler callback-id n-params param-values return-value))
 
-;; Callback marshaller  for class handlers
+;; Callback marshaller for class handlers
 (define-callback class-handler-marshal nil
     ((gclosure gclosure) (return-value gvalue) (n-params unsigned-int) 
      (param-values pointer) (invocation-hint pointer) 
-     (callback-id unsigned-long))
+     (callback-id pointer-data))
   (declare (ignore gclosure invocation-hint))
   (callback-trampoline #'invoke-callback callback-id n-params param-values return-value))
 
 ;; Callback marshaller for emission hooks
 (define-callback emission-hook-marshal nil
     ((invocation-hint pointer) (n-params unsigned-int) (param-values pointer)
-     (callback-id unsigned-long))
+     (callback-id pointer-data))
   (declare (ignore invocation-hint))
   (callback-trampoline #'invoke-callback callback-id n-params param-values))
 
@@ -87,7 +87,7 @@ (defun invoke-signal-handler (callback-id return-type &rest args)
     (signal-handler-block instance handler-id)
     (unwind-protect
        (restart-case (apply #'invoke-callback callback-id nil args)
-         (abort () :report "Disconnect and exit signal handler"
+         (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))))
@@ -118,8 +118,18 @@ (defconstant +priority-low+ 300)
 (defbinding source-remove () boolean
   (tag unsigned-int))
 
-(define-callback source-callback-marshal nil ((callback-id unsigned-int))
-  (callback-trampoline #'invoke-callback callback-id 0 nil))
+(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))
+    (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))))
+
 
 (defbinding (timeout-add "g_timeout_add_full")
     (interval function &optional (priority +priority-default+)) unsigned-int 
@@ -352,7 +362,7 @@ (defbinding signal-handler-find () unsigned-long
   (detail quark)
   (closure (or null pointer))
   (func (or null pointer))
-  (data unsigned-long))
+  (data pointer-data))
 
 (defbinding signal-handler-disconnect () nil
   (instance ginstance)
@@ -377,7 +387,7 @@ (defun callback-closure-new (callback-id callback destroy-notify)
     (closure-set-meta-marshal gclosure callback-id callback)
     gclosure))
 
-(defun make-callback-closure (function marshaller)
+(defun make-callback-closure (function &optional (marshaller signal-handler-marshal))
   (let ((callback-id (register-callback-function function)))
     (values
      (callback-closure-new callback-id marshaller user-data-destroy-callback)