Commit f09962e2 authored by Raymond Toy's avatar Raymond Toy
Browse files

Merge branch 'rtoy-update-clx' into rtoy-update-clx-with-cmucl-fixes

parents 560af621 c1864fe6

src/clx/demo/bezier.lisp

+0 −3
Original line number Diff line number Diff line
@@ -18,9 +18,6 @@ 
;;; express or implied warranty.

;;;



#+cmu

(ext:file-comment "$Id: bezier.lisp,v 1.3 2009/06/17 18:22:46 rtoy Rel $")



(in-package :xlib)



(export 'draw-curves)

src/clx/demo/beziertest.lisp

+0 −3
Original line number Diff line number Diff line
@@ -18,9 +18,6 @@ 
;;; express or implied warranty.

;;;



#+cmu

(ext:file-comment "$Id: beziertest.lisp,v 1.3 2009/06/17 18:22:46 rtoy Rel $")



(in-package :xlib)



(defun bezier-test (host &optional (pathname "/usr/X.V11R1/extensions/test/datafile"))

src/clx/demo/clclock.lisp

+2 −5
Original line number Diff line number Diff line 
#+cmu

(ext:file-comment "$Id: clclock.lisp,v 1.2 2009/06/17 18:22:46 rtoy Rel $")



(defpackage "XCLCLOCK"

(defpackage #:xlib-demo/clclock

  (:use "CL")

  (:export "CLOCK"))



(in-package "XCLCLOCK")

(in-package #:xlib-demo/clclock)



(defvar *display* (xlib:open-default-display))

(defvar *screen* (xlib:display-default-screen *display*))

src/clx/demo/clipboard.lisp

+2 −5
Original line number Diff line number Diff line
@@ -59,14 +59,11 @@ 
;;; OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

;;; DEALINGS IN THE SOFTWARE.



#+cmu

(ext:file-comment "$Id: clipboard.lisp,v 1.2 2009/06/17 18:22:46 rtoy Rel $")



(defpackage "CLIPBOARD"

(defpackage #:xlib-demo/clipboard

  (:use "CL" "XLIB")

  (:export "MAIN"))



(in-package "CLIPBOARD")

(in-package #:xlib-demo/clipboard)



;;; This is "traditional" XLIB style; I don't really know if it's the

;;; best way -- in developing this program, style of XLIB programming

src/clx/demo/clx-demos.lisp

+4 −7
Original line number Diff line number Diff line
@@ -6,13 +6,10 @@ 
;;; This file should be portable to any valid Common Lisp with CLX -- DEC 88.

;;;



#+cmu

(ext:file-comment "$Id: clx-demos.lisp,v 1.2 2009/06/17 18:22:46 rtoy Rel $")



(defpackage :demos (:use :common-lisp)

(defpackage #:xlib-demo/demos (:use :common-lisp)

  (:export do-all-demos demo))



(in-package :demos)

(in-package :xlib-demo/demos)





;;;; Graphic demos wrapper macro.
@@ -39,11 +36,11 @@ 
       (unless *display*

	 #+:cmu

	 (multiple-value-setq (*display* *screen*) (ext:open-clx-display))

	 #+(or sbcl allegro clisp)

	 #+(or sbcl allegro clisp lispworks)

	 (progn

	   (setf *display* (xlib::open-default-display))

	   (setf *screen* (xlib:display-default-screen *display*)))

	 #-(or cmu sbcl allegro clisp)

	 #-(or cmu sbcl allegro clisp lispworks)

	 (progn

	   ;; Portable method

	   (setf *display* (xlib:open-display (machine-instance)))