Fixed some portability issues

[clg] / gtk / gtk.lisp

diff --git a/gtk/gtk.lisp b/gtk/gtk.lisp
index 640d87c572bc6d9f7909becc020c2323fd3b91ef..38c61bbf9cc5814d432e99dd005b23e0384622d7 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.
 
 ;; 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.70 2007/05/10 20:17:17 espen Exp $
+;; $Id: gtk.lisp,v 1.71 2007/06/01 09:17:17 espen Exp $

 
 
 (in-package "GTK")
 
 
 (in-package "GTK")


@@ -77,13 +77,15 @@ (defun clg-init (&optional display)
     (progn
       (signal-connect (gdk:display-manager) 'display-opened
        #'(lambda (display)
     (progn
       (signal-connect (gdk:display-manager) 'display-opened
        #'(lambda (display)

-          (let ((handler (add-fd-handler 
-                          (gdk:display-connection-number display) 
-                          :input #'main-iterate-all)))
-            (signal-connect display 'closed
-             #'(lambda (is-error-p)
-                 (declare (ignore is-error-p))
-                 (remove-fd-handler handler))))))
+          (let ((fd (gdk:display-connection-number display)))
+            (unless (< fd 0)
+              (let ((handler (add-fd-handler 
+                              (gdk:display-connection-number display) 
+                              :input #'main-iterate-all)))
+                (signal-connect display 'closed
+                 #'(lambda (is-error-p)
+                     (declare (ignore is-error-p))
+                     (remove-fd-handler handler))))))))

       (setq *periodic-polling-function* #'main-iterate-all)
       (setq *max-event-to-sec* 0)
       (setq *max-event-to-usec* *event-poll-interval*))
       (setq *periodic-polling-function* #'main-iterate-all)
       (setq *max-event-to-sec* 0)
       (setq *max-event-to-usec* *event-poll-interval*))


@@ -108,7 +110,6 @@ (defun clg-init (&optional display)
     (gdk:display-open display)))
 
 
     (gdk:display-open display)))
 
 

-

 #+sbcl   
 (defun clg-init-with-threading (&optional display)
   "Initializes the system and starts event handling"
 #+sbcl   
 (defun clg-init-with-threading (&optional display)
   "Initializes the system and starts event handling"