Index: mcclim.asd
===================================================================
RCS file: /project/mcclim/cvsroot/mcclim/mcclim.asd,v
retrieving revision 1.4
diff -Ifasl -u -r1.4 mcclim.asd
--- mcclim.asd	1 Mar 2005 15:46:13 -0000	1.4
+++ mcclim.asd	31 Mar 2005 14:35:32 -0000
@@ -218,8 +218,11 @@
 (defsystem :clim-clx
     :depends-on (:clim #+(or sbcl openmcl ecl) :clx)
     :components
-    ((:module "Backends/CLX"
+    ((:module "Lisp-Dep"
+	      :components ((:file "fix-clx")))
+     (:module "Backends/CLX"
               :pathname #.(make-pathname :directory '(:relative "Backends" "CLX"))
+	      :depends-on "Lisp-Dep"
               :components
               ((:file "package")
                (:file "image" :depends-on ("package"))
Index: Backends/CLX/port.lisp
===================================================================
RCS file: /project/mcclim/cvsroot/mcclim/Backends/CLX/port.lisp,v
retrieving revision 1.109
diff -Ifasl -u -r1.109 port.lisp
--- Backends/CLX/port.lisp	22 Mar 2005 12:31:22 -0000	1.109
+++ Backends/CLX/port.lisp	31 Mar 2005 14:35:33 -0000
@@ -249,9 +249,18 @@
     (xlib:close-font font)))
 
 (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)))
+  (let ((options (cdr (port-server-path port)))
+	(default-options (xlib:default-mcclim-clx-options)))
+    (let (host display protocol)
+      (if options
+	  (setf host (getf options :host "")
+		display (getf options :display-id 0)
+		protocol :local)
+	  (setf host (getf default-options :host "")
+		display (getf default-options :display-id 0)
+		protocol (getf default-options :protocol :local)))
+      (setf (clx-port-display port)
+	    (xlib:open-display host :display display :protocol protocol)))
     (progn
       (setf (xlib:display-error-handler (clx-port-display port))
         #'clx-error-handler)
@@ -260,7 +269,9 @@
       (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 (if options
+					  (getf options :screen-id 0)
+					  (getf default-options :screen-id 0))
 				      (xlib:display-roots (clx-port-display port))))
     (setf (clx-port-window port) (xlib:screen-root (clx-port-screen port)))
     (make-cursor-table port)