Removed obsoleted code

[clg] / glib / gcallback.lisp

diff --git a/glib/gcallback.lisp b/glib/gcallback.lisp
index 0005f14f7a31f9d264112ee96d009a4fe328f802..928b2df03565c24cabc52c49cb23e1c47df8d7c3 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
 
 ;; 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.2 2001/02/11 21:49:12 espen Exp $
+;; $Id: gcallback.lisp,v 1.4 2001/10/21 21:58:44 espen Exp $

 
 (in-package "GLIB")
 
 
 (in-package "GLIB")
 


@@ -26,7 +26,7 @@ (use-prefix "g")
 
 (deftype gclosure () 'pointer)
 
 
 (deftype gclosure () 'pointer)
 

-(define-foreign lisp-callback-closure-new () gclosure
+(defbinding lisp-callback-closure-new () gclosure

   (callback-id unsigned-int))
 
 
   (callback-id unsigned-int))
 
 


@@ -50,7 +50,7 @@ (defun callback-trampoline (callback-id params return-value)
     (labels ((invoke-callback ()
               (restart-case
                   (unwind-protect
     (labels ((invoke-callback ()
               (restart-case
                   (unwind-protect

-                      (let ((result (apply callback-function args)))
+                      (let ((result (apply callback-function (reverse args))))

                         (when return-type
                           (gvalue-set return-value result))))
                
                         (when return-type
                           (gvalue-set return-value result))))
                


@@ -83,11 +83,11 @@ (after-gc-hook)
 (defun signal-name-to-string (name)
   (substitute #\_ #\- (string-downcase (string name))))
 
 (defun signal-name-to-string (name)
   (substitute #\_ #\- (string-downcase (string name))))
 

-(define-foreign signal-lookup (name itype) unsigned-int
+(defbinding signal-lookup (name itype) unsigned-int

   ((signal-name-to-string name) string)
   (itype type-number))
 
   ((signal-name-to-string name) string)
   (itype type-number))
 

-(define-foreign signal-name () string
+(defbinding signal-name () string

   (signal-id unsigned-int))
 
 (defun ensure-signal-id (signal-id instance)
   (signal-id unsigned-int))
 
 (defun ensure-signal-id (signal-id instance)


@@ -96,27 +96,27 @@ (defun ensure-signal-id (signal-id instance)
     (string (signal-lookup signal-id (type-number-of instance)))
     (symbol (signal-lookup signal-id (type-number-of instance)))))
   
     (string (signal-lookup signal-id (type-number-of instance)))
     (symbol (signal-lookup signal-id (type-number-of instance)))))
   

-(define-foreign signal-stop-emission (instance signal-id) nil
+(defbinding signal-stop-emission (instance signal-id) nil

   (instance ginstance)
   ((ensure-signal-id signal-id instance) unsigned-int))
 
   (instance ginstance)
   ((ensure-signal-id signal-id instance) unsigned-int))
 

-; (define-foreign ("g_signal_add_emission_hook_full" signal-add-emisson-hook)
+; (defbinding (signal-add-emisson-hook "g_signal_add_emission_hook_full")

 ;     () unsigned-int
 ;   (signal-id unsigned-int)
 ;   (closure gclosure))
 
 ;     () unsigned-int
 ;   (signal-id unsigned-int)
 ;   (closure gclosure))
 

-; (define-foreign signal-remove-emisson-hook () nil
+; (defbinding signal-remove-emisson-hook () nil

 ;   (signal-id unsigned-int)
 ;   (hook-id unsigned-int))
 
 ;   (signal-id unsigned-int)
 ;   (hook-id unsigned-int))
 

-(define-foreign ("g_signal_has_handler_pending" signal-has-handler-pending-p)
+(defbinding (signal-has-handler-pending-p "g_signal_has_handler_pending")

     (instance signal-id &key detail blocked) boolean
   (instance ginstance)
   ((ensure-signal-id signal-id instance) unsigned-int)
   ((or detail 0) quark)
   (blocked boolean))
     
     (instance signal-id &key detail blocked) boolean
   (instance ginstance)
   ((ensure-signal-id signal-id instance) unsigned-int)
   ((or detail 0) quark)
   (blocked boolean))
     

-(define-foreign ("g_signal_connect_closure_by_id" signal-connect-closure)
+(defbinding (signal-connect-closure "g_signal_connect_closure_by_id")

     (instance signal-id closure &key detail after) unsigned-int
   (instance ginstance)
   ((ensure-signal-id signal-id instance) unsigned-int)
     (instance signal-id closure &key detail after) unsigned-int
   (instance ginstance)
   ((ensure-signal-id signal-id instance) unsigned-int)


@@ -124,36 +124,29 @@ (define-foreign ("g_signal_connect_closure_by_id" signal-connect-closure)
   (closure gclosure)
   (after boolean))
 
   (closure gclosure)
   (after boolean))
 

-(define-foreign signal-handler-block () nil
+(defbinding signal-handler-block () nil

   (instance ginstance)
   (handler unsigned-int))
 
   (instance ginstance)
   (handler unsigned-int))
 

-(define-foreign signal-handler-unblock () nil
+(defbinding signal-handler-unblock () nil

   (instance ginstance)
   (handler unsigned-int))
 
   (instance ginstance)
   (handler unsigned-int))
 

-(define-foreign signal-handler-disconnect () nil
+(defbinding signal-handler-disconnect () nil

   (instance ginstance)
   (handler unsigned-int))
 
 
   (instance ginstance)
   (handler unsigned-int))
 
 

-(defun signal-connect (instance signal function &key after object)
-  (let ((callback
-        (cond
-         ((or (eq object t) (eq object instance)) function)
-         ((not object)
-          #'(lambda (&rest args) (apply function (cdr args))))
-         (t
-          #'(lambda (&rest args) (apply function object (rest args)))))))
-    
-    (signal-connect-closure
-     instance signal (register-callback-function callback) :after after)))
-
+(defmethod signal-connect ((gobject gobject) signal function &rest args &key after object)
+  (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))))))

 
 

-;;;; Idles and timeouts

 
 

-; (defun timeout-remove (tag)
-;   (source-remove tag))
-  
-; (defun idle-remove (tag)
-;   (source-remove tag))
+(defmethod signal-connect :around ((gobject gobject) signal function
+                                  &key after object)
+  (let ((callback-id (register-callback-function (call-next-method))))
+    (signal-connect-closure gobject signal callback-id :after after)))