X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/b43753170fdeed0b344b149a3ad3d187fa4ed303..c345a646d7ecaf736ae423ac7041e9be6b7be1df:/glib/gcallback.lisp

diff --git a/glib/gcallback.lisp b/glib/gcallback.lisp
index 0f7baf2..357535d 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.49 2008-04-11 20:51:45 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,6 +244,8 @@
 
 ;;;; Signal connecting and controlling
 
+(define-flags-type connect-flags :after :swapped)
+
 (defvar *overridden-signals* (make-hash-table :test 'equalp))
 
 (defbinding %signal-override-class-closure () nil
@@ -493,7 +506,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