Added args argument to COMPUTE-SIGNAL-FUNCTION

[clg] / gtk / gtk.lisp

diff --git a/gtk/gtk.lisp b/gtk/gtk.lisp
index 3a6174f4ca2520552c465b9cd9d55756a069a430..269be02b4ccdc5606140b9633e0770484f47fea9 100644 (file)
--- a/gtk/gtk.lisp
+++ b/gtk/gtk.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: gtk.lisp,v 1.64 2006-06-30 10:57:21 espen Exp $
+;; $Id: gtk.lisp,v 1.67 2007-01-07 20:23:22 espen Exp $
 
 
 (in-package "GTK")
@@ -65,6 +65,11 @@ (defun clg-init (&optional display)
          (error "When running clg in Slime the communication style :spawn can not be used. See the README file and <http://common-lisp.net/project/slime/doc/html/slime_45.html> for more information."))
 
   (unless (gdk:display-get-default)
+    #?(pkg-exists-p "gtk+-2.0" :atleast-version "2.8.0")
+    (progn
+      #+sbcl(sb-int:set-floating-point-modes :traps nil) 
+      #+cmu(ext:set-floating-point-modes :traps nil))
+
     (gdk:gdk-init)
     (unless (gtk-init)
       (error "Initialization of GTK+ failed."))
@@ -82,20 +87,27 @@ (defun clg-init (&optional display)
       #+clisp      
       ;; When running in Slime we need to hook into the Swank server
       ;; to handle events asynchronously
-      (if (find-symbol "WAIT-UNTIL-READABLE" "SWANK")
-         (setf (symbol-function 'swank::wait-until-readable)
-          #'(lambda (stream)
-              (loop
-               (case (socket:socket-status (cons stream :input) 0 *event-poll-interval*)
-                 (:input (return t))
-                 (:eof (read-char stream))
-                 (otherwise (main-iterate-all))))))
+      (if (find-package "SWANK")
+         (let ((read-from-emacs (symbol-function (find-symbol "READ-FROM-EMACS" "SWANK")))
+               (stream (funcall (find-symbol "CONNECTION.SOCKET-IO" "SWANK") (symbol-value (find-symbol "*EMACS-CONNECTION*" "SWANK")))))
+           (setf (symbol-function (find-symbol "READ-FROM-EMACS" "SWANK"))
+            #'(lambda ()
+                (loop
+                 (case (socket:socket-status (cons stream :input) 0 *event-poll-interval*)
+                   (:input (return (funcall read-from-emacs)))
+                   (:eof (read-char stream))
+                   (otherwise (main-iterate-all)))))))
        #-readline(warn "Not running in Slime and Readline support is missing, so the Gtk main loop has to be invoked explicit.")))))
 
 #+sbcl   
 (defun clg-init-with-threading (&optional display)
   "Initializes the system and starts the event handling"
   (unless (gdk:display-get-default)
+    #?(pkg-exists-p "gtk+-2.0" :atleast-version "2.8.0")
+    (progn
+      #+sbcl(sb-int:set-floating-point-modes :traps nil) 
+      #+cmu(ext:set-floating-point-modes :traps nil))
+
     (gdk:gdk-init)
     (gdk:threads-set-lock-functions)
     (unless (gtk-init)
@@ -424,11 +436,11 @@ (defun (setf bin-child) (child bin)
   (container-add bin child)
   child)
 
-(defmethod compute-signal-function ((bin bin) signal function object)
+(defmethod compute-signal-function ((bin bin) signal function object args)
   (declare (ignore signal))
   (if (eq object :child)
-      #'(lambda (&rest args) 
-         (apply function (bin-child bin) (rest args)))
+      #'(lambda (&rest emission-args) 
+         (apply function (bin-child bin) (nconc (rest emission-args) args)))
     (call-next-method)))
 
 
@@ -658,8 +670,8 @@ (defmethod compute-signal-id ((dialog dialog) signal)
       (ensure-signal-id 'response dialog)
     (call-next-method)))
 
-(defmethod compute-signal-function ((dialog dialog) signal function object)
-  (declare (ignore function object))
+(defmethod compute-signal-function ((dialog dialog) signal function object args)
+  (declare (ignore function object args))
   (let ((callback (call-next-method))
        (id (dialog-response-id dialog signal)))
     (if id