[mcclim-cvs] CVS update: mcclim/Backends/CLX/port.lisp

[Christophe Rhodes]

Update of /project/mcclim/cvsroot/mcclim/Backends/CLX
In directory common-lisp.net:/tmp/cvs-serv23885/Backends/CLX

Modified Files:
	port.lisp 
Log Message:
Fix the new $DISPLAY parsing code after feedback from rpg.

Date: Tue Apr  5 22:09:29 2005
Author: crhodes

Index: mcclim/Backends/CLX/port.lisp
diff -u mcclim/Backends/CLX/port.lisp:1.110 mcclim/Backends/CLX/port.lisp:1.111
--- mcclim/Backends/CLX/port.lisp:1.110	Sun Apr  3 00:18:20 2005
+++ mcclim/Backends/CLX/port.lisp	Tue Apr  5 22:09:29 2005
@@ -194,8 +194,8 @@
                 (t :internet))))
     (list :clx
 	  :host (getf path :host host)
-	  :display-id (getf path :display-id display)
-	  :screen-id (getf path :screen-id screen)
+	  :display-id (getf path :display-id (or display 0))
+	  :screen-id (getf path :screen-id (or screen 0))
 	  :protocol protocol)))
 
 (setf (get :x11 :port-type) 'clx-port)
@@ -268,7 +268,9 @@
 (defmethod initialize-clx ((port clx-port))
   (let ((options (cdr (port-server-path port))))
     (setf (clx-port-display port)
-	  (xlib:open-display (getf options :host "") :display (getf options :display-id 0) :protocol (getf options :protocol :local)))
+	  (xlib:open-display (getf options :host) 
+			     :display (getf options :display-id) 
+			     :protocol (getf options :protocol)))
     (progn
       (setf (xlib:display-error-handler (clx-port-display port))
         #'clx-error-handler)
@@ -277,7 +279,7 @@
       (setf (xlib:display-after-function (clx-port-display port)) #'xlib:display-force-output))
       
     
-    (setf (clx-port-screen port) (nth (getf options :screen-id 0)
+    (setf (clx-port-screen port) (nth (getf options :screen-id)
 				      (xlib:display-roots (clx-port-display port))))
     (setf (clx-port-window port) (xlib:screen-root (clx-port-screen port)))
     (make-cursor-table port)