Remove around method for SIGNAL-CONNECT

[clg] / glib / gcallback.lisp

diff --git a/glib/gcallback.lisp b/glib/gcallback.lisp
index e0d9e31079542d42b9416791650f8dff3607dadb..b872c4a08c6244bc3fd82d51450e6c09ff2006b2 100644 (file)
--- a/glib/gcallback.lisp
+++ b/glib/gcallback.lisp
@@ -15,7 +15,7 @@
 ;; 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.5 2002-01-20 14:52:04 espen Exp $
+;; $Id: gcallback.lisp,v 1.8 2002-03-24 15:43:16 espen Exp $
 
 (in-package "GLIB")
 
@@ -29,17 +29,19 @@ (deftype gclosure () 'pointer)
 (defbinding lisp-callback-closure-new () gclosure
   (callback-id unsigned-int))
 
+(defun register-callback-function (function)
+  (check-type function (or null symbol function))
+  (register-user-data function))
 
+(defun make-callback-closure (function)
+  (lisp-callback-closure-new (register-callback-function function)))
 
-;;;; Callback mechanism
 
-(defun register-callback-function (function)
-  (check-type function (or null symbol function))
-  (lisp-callback-closure-new (register-user-data function)))
+;;;; Callback mechanism
 
 (defun callback-trampoline (callback-id params return-value)
   (let* ((return-type (unless (null-pointer-p return-value)
-                       (type-from-number (gvalue-type return-value))))
+                       (gvalue-type return-value)))
         (args nil)
         (callback-function (find-user-data callback-id)))
 
@@ -52,7 +54,7 @@ (defun callback-trampoline (callback-id params return-value)
                   (unwind-protect
                       (let ((result (apply callback-function (reverse args))))
                         (when return-type
-                          (gvalue-set return-value result))))
+                          (gvalue-set (print return-value) result))))
                
                 (continue nil :report "Return from callback function"
                  (when return-type
@@ -77,11 +79,31 @@ (pushnew 'after-gc-hook ext:*after-gc-hooks*)
 (after-gc-hook)
 
 
+;;;; Timeouts and idle functions
 
-;;;; Signals
+(defvar *source-callback-marshal*
+  (system:foreign-symbol-address "source_callback_marshal"))
+(defvar *destroy-notify*
+  (system:foreign-symbol-address "destroy_notify"))
 
-(defun signal-name-to-string (name)
-  (substitute #\_ #\- (string-downcase (string name))))
+(defbinding (timeout-add "g_timeout_add_full")
+    (function interval &optional (priority 0)) unsigned-int 
+  (priority int)
+  (interval unsigned-int)
+  (*source-callback-marshal* pointer)
+  ((register-callback-function function) unsigned-long)
+  (*destroy-notify* 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))
+
+
+
+;;;; Signals
 
 (defbinding signal-lookup (name itype) unsigned-int
   ((signal-name-to-string name) string)
@@ -137,18 +159,13 @@ (defbinding signal-handler-disconnect () nil
   (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 :around ((gobject gobject) signal function
-                                  &key after object)
-  (declare (ignore object))
-  (let ((callback-id (register-callback-function (call-next-method))))
+(defmethod signal-connect ((gobject gobject) signal function &key after object)
+  (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)))