Type for callback ids changes to POINTER-DATA

[clg] / gtk / gtk.lisp

diff --git a/gtk/gtk.lisp b/gtk/gtk.lisp
index 62eb8a37d49c688a3d1ee61d456c9ed0616c4b0e..88c82b5869e68bf4269b93a977294f940b67748b 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.62 2006/04/26 12:33:52 espen Exp $
+;; $Id: gtk.lisp,v 1.69 2007/01/14 23:22:16 espen Exp $
 
 
 (in-package "GTK")
@@ -45,7 +45,7 @@ (defun gtk-version ()
       (format nil "Gtk+ v~A.~A.~A" major minor micro))))
 
 (defun clg-version ()
-  "clg 0.93pre")
+  "clg 0.93")
 
 
 ;;;; Initalization
@@ -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,34 +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)
-    (gdk:gdk-init)
-    (gdk:threads-set-lock-functions)
-    (unless (gtk-init)
-      (error "Initialization of GTK+ failed."))
-    (sb-thread:make-thread 
-     #'(lambda () 
-        (gdk:display-open display)
-        (gdk:with-global-lock (main)))
-     :name "gtk event loop")))
+    #?(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))
 
-#+sbcl   
-(defun clg-init-with-threading (&optional display)
-  "Initializes the system and starts the event handling"
-  (unless (gdk:display-get-default)
     (gdk:gdk-init)
     (gdk:threads-set-lock-functions)
     (unless (gtk-init)
@@ -438,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)))
 
 
@@ -672,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
@@ -1070,6 +1068,8 @@ (defun %add-activate-callback (widget signal function object after)
 (defmethod activate-radio-widget ((button radio-button))
   (signal-emit button 'clicked))
 
+(defgeneric add-activate-callback (action function &key object after))
+
 (defmethod add-activate-callback ((button radio-button) function &key object after)
   (%add-activate-callback button 'clicked function object after))
 
@@ -1484,10 +1484,14 @@ (defun (setf window-default-icon-list) (icons)
 (defbinding %window-set-default-icon () nil
   (icons (glist gdk:pixbuf)))
 
+(defgeneric (setf window-default-icon) (icon))
+
 (defmethod (setf window-default-icon) ((icon gdk:pixbuf))
   (%window-set-default-icon icon)
   icon)
 
+(defgeneric (setf window-group) (group window))
+
 (defmethod (setf window-group) ((group window-group) (window window))
   (window-group-add-window group window)
   group)
@@ -2408,3 +2412,17 @@ (defbinding %plug-new () pointer
 
 (defmethod allocate-foreign ((plug plug) &key id)
   (%plug-new (or id 0)))
+
+
+;;;; New stuff in Gtk+ 2.10
+
+;;; Link button
+
+#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.10.0")
+(progn
+  (define-callback-marshal %link-button-uri-callback nil (link-button (link string)))
+
+  (defbinding link-button-set-uri-hook (function) pointer
+    (%link-button-uri-callback callback)
+    ((register-callback-function function) unsigned-int)
+    (user-data-destroy-callback callback)))