1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
|
diff -ur clx_0.6.1.orig/clx.asd clx_0.6.1/clx.asd
--- clx_0.6.1.orig/clx.asd 2005-03-29 08:42:20.000000000 -0600
+++ clx_0.6.1/clx.asd 2005-03-30 23:55:19.000000000 -0600
@@ -35,7 +35,7 @@
(defclass legacy-file (static-file) ())
(defsystem CLX
- :depends-on (sb-bsd-sockets)
+ :depends-on (#+sbcl sb-bsd-sockets)
:version "0.6.1"
:serial t
:default-component-class clx-source-file
Only in clx_0.6.1: clx.asd.~1.23.~
diff -ur clx_0.6.1.orig/depdefs.lisp clx_0.6.1/depdefs.lisp
--- clx_0.6.1.orig/depdefs.lisp 2003-06-05 15:18:22.000000000 -0500
+++ clx_0.6.1/depdefs.lisp 2005-03-31 00:15:05.000000000 -0600
@@ -400,10 +400,10 @@
(eval-when (:compile-toplevel :load-toplevel :execute)
;; FIXME: maybe we should reevaluate this?
(defvar *def-clx-class-use-defclass*
- #+Genera t
+ #+(or Genera sbcl) t
#+(and cmu pcl) '(XLIB:DRAWABLE XLIB:WINDOW XLIB:PIXMAP)
#+(and cmu (not pcl)) nil
- #-(or Genera cmu) nil
+ #-(or Genera cmu sbcl) nil
"Controls whether DEF-CLX-CLASS uses DEFCLASS.
If it is a list, it is interpreted by DEF-CLX-CLASS to be a list of
Only in clx_0.6.1: depdefs.lisp.~1.4.~
diff -ur clx_0.6.1.orig/dependent.lisp clx_0.6.1/dependent.lisp
--- clx_0.6.1.orig/dependent.lisp 2004-06-11 07:18:17.000000000 -0500
+++ clx_0.6.1/dependent.lisp 2005-03-31 00:20:25.000000000 -0600
@@ -1511,11 +1511,16 @@
(cdr (host-address host)))
:foreign-port (+ *x-tcp-port* display)))
-#+(or sbcl ecl)
+#+(or sbcl ecl cmu)
(defconstant +X-unix-socket-path+
"/tmp/.X11-unix/X"
"The location of the X socket")
+#+(or sbcl ecl CMU)
+(defconstant +X-tcp-port+
+ 6000
+ "The TCP port number for X")
+
#+sbcl
(defun open-x-stream (host display protocol)
(declare (ignore protocol)
@@ -1528,11 +1533,22 @@
(let ((host (car (host-ent-addresses (get-host-by-name host)))))
(when host
(let ((s (make-instance 'inet-socket :type :stream :protocol :tcp)))
- (socket-connect s host (+ 6000 display))
+ (socket-connect s host (+ +X-tcp-port+ display))
s))))
:element-type '(unsigned-byte 8)
:input t :output t :buffering :none))
+#+CMU
+(defun open-x-stream (host display protocol)
+ (declare (ignore protocol)
+ (type (integer 0) display))
+ (system:make-fd-stream
+ (if (or (string= host "") (string= host "unix"))
+ (ext:connect-to-unix-socket (format nil "~A~D" +X-unix-socket-path+ display))
+ (ext:connect-to-inet-socket host (+ +X-tcp-port+ display)))
+ :input t :output t :element-type '(unsigned-byte 8)))
+
+
#+ecl
(defun open-x-stream (host display protocol)
(declare (ignore protocol)
@@ -1541,7 +1557,7 @@
(if (or (string= host "") (string= host "unix")) ; AF_UNIX doamin socket
(sys::open-unix-socket-stream
(format nil "~A~D" +X-unix-socket-path+ display))
- (si::open-client-stream host (+ 6000 display)))))
+ (si::open-client-stream host (+ +X-tcp-port+ display)))))
;;; BUFFER-READ-DEFAULT - read data from the X stream
@@ -3092,7 +3108,7 @@
(defmacro with-underlying-simple-vector
((variable element-type pixarray) &body body)
(declare (ignore element-type))
- `(#+cmu kernel::with-array-data #+sbcl sb-kernel:with-array-data
+ `(#+cmu lisp::with-array-data #+sbcl sb-kernel:with-array-data
((,variable ,pixarray) (start) (end))
(declare (ignore start end))
,@body))
@@ -3505,11 +3521,11 @@
height width)
(declare (type array-index source-width sx sy dest-width dx dy height width))
#.(declare-buffun)
- (kernel::with-array-data ((sdata source)
+ (lisp::with-array-data ((sdata source)
(sstart)
(send))
(declare (ignore send))
- (kernel::with-array-data ((ddata dest)
+ (lisp::with-array-data ((ddata dest)
(dstart)
(dend))
(declare (ignore dend))
Only in clx_0.6.1: dependent.lisp.~1.19.~
|
GitWeb