From crhodes at common-lisp.net Thu Jun 2 11:52:05 2005 From: crhodes at common-lisp.net (Christophe Rhodes) Date: Thu, 2 Jun 2005 13:52:05 +0200 (CEST) Subject: [Phemlock-cvs] CVS update: phemlock/src/clim/patch.lisp Message-ID: <20050602115205.70EF58875E@common-lisp.net> Update of /project/phemlock/cvsroot/phemlock/src/clim In directory common-lisp.net:/tmp/cvs-serv1415/src/clim Modified Files: patch.lisp Log Message: Minor patches to make it build and run with current mcclim. Date: Thu Jun 2 13:52:04 2005 Author: crhodes Index: phemlock/src/clim/patch.lisp diff -u phemlock/src/clim/patch.lisp:1.1.1.1 phemlock/src/clim/patch.lisp:1.2 --- phemlock/src/clim/patch.lisp:1.1.1.1 Fri Jul 9 15:38:05 2004 +++ phemlock/src/clim/patch.lisp Thu Jun 2 13:52:04 2005 @@ -1,13 +1,5 @@ (in-package :clim-internals) -(defmethod stream-listen ((stream standard-extended-input-stream)) - (with-encapsulating-stream (estream stream) - (loop for char = (read-gesture-or-reason stream :timeout 0 :peek-p t) - do (if (read-result-p char) - (loop-finish) - (stream-read-gesture estream)) ; consume pointer gesture - finally (return (characterp char))))) - (in-package :clim-clx) #+NIL From crhodes at common-lisp.net Thu Jun 2 11:52:06 2005 From: crhodes at common-lisp.net (Christophe Rhodes) Date: Thu, 2 Jun 2005 13:52:06 +0200 (CEST) Subject: [Phemlock-cvs] CVS update: phemlock/src/core/charmacs.lisp Message-ID: <20050602115206.B367588771@common-lisp.net> Update of /project/phemlock/cvsroot/phemlock/src/core In directory common-lisp.net:/tmp/cvs-serv1415/src/core Modified Files: charmacs.lisp Log Message: Minor patches to make it build and run with current mcclim. Date: Thu Jun 2 13:52:05 2005 Author: crhodes Index: phemlock/src/core/charmacs.lisp diff -u phemlock/src/core/charmacs.lisp:1.2 phemlock/src/core/charmacs.lisp:1.3 --- phemlock/src/core/charmacs.lisp:1.2 Mon Dec 27 19:53:27 2004 +++ phemlock/src/core/charmacs.lisp Thu Jun 2 13:52:05 2005 @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; #+CMU (ext:file-comment - "$Header: /project/phemlock/cvsroot/phemlock/src/core/charmacs.lisp,v 1.2 2004/12/27 18:53:27 gbaumann Exp $") + "$Header: /project/phemlock/cvsroot/phemlock/src/core/charmacs.lisp,v 1.3 2005/06/02 11:52:05 crhodes Exp $") ;;; ;;; ********************************************************************** ;;; @@ -29,7 +29,7 @@ ;;;; Stuff for the Syntax table functions (syntax) -(defconstant syntax-char-code-limit char-code-limit +(defconstant syntax-char-code-limit 256 "The highest char-code which a character argument to the syntax table functions may have.") From crhodes at common-lisp.net Thu Jun 2 11:52:05 2005 From: crhodes at common-lisp.net (Christophe Rhodes) Date: Thu, 2 Jun 2005 13:52:05 +0200 (CEST) Subject: [Phemlock-cvs] CVS update: phemlock/hemlock.asd Message-ID: <20050602115205.7A6CD88773@common-lisp.net> Update of /project/phemlock/cvsroot/phemlock In directory common-lisp.net:/tmp/cvs-serv1415 Modified Files: hemlock.asd Log Message: Minor patches to make it build and run with current mcclim. Date: Thu Jun 2 13:52:04 2005 Author: crhodes Index: phemlock/hemlock.asd diff -u phemlock/hemlock.asd:1.7 phemlock/hemlock.asd:1.8 --- phemlock/hemlock.asd:1.7 Sun Jan 30 15:51:33 2005 +++ phemlock/hemlock.asd Thu Jun 2 13:52:04 2005 @@ -64,6 +64,7 @@ :directory (pathname-directory *hemlock-base-directory*) :defaults *hemlock-base-directory*) + :depends-on (clx mcclim) ;; :source-extension "lisp" ;; :binary-pathname #.*binary-pathname* ;; :depends-on (:clim-clx #+NIL :mcclim-freetype) @@ -105,14 +106,14 @@ ((:file "package") ;; Lisp implementation specific stuff goes into one of the next ;; two files. - (:file "lispdep") - (:file "hemlock-ext") + (:file "lispdep" :depends-on ("package")) + (:file "hemlock-ext" :depends-on ("package")) - (:file "decls") ; early declarations of functions and stuff - (:file "struct") - #+port-core-struct-ed (:file "struct-ed") - (hemlock-system:iso-8859-1-file "charmacs") - (:file "key-event"))) + (:file "decls" :depends-on ("package")) ; early declarations of functions and stuff + (:file "struct" :depends-on ("package")) + #+port-core-struct-ed (:file "struct-ed" :depends-on ("package")) + (hemlock-system:iso-8859-1-file "charmacs" :depends-on ("package")) + (:file "key-event" :depends-on ("package")))) (:module bitmap-1 :pathname #.(merge-pathnames (make-pathname @@ -128,7 +129,7 @@ (make-pathname :directory '(:relative "src" "core")) *hemlock-base-directory*) - :depends-on (bitmap-1) + :depends-on (bitmap-1 core-1) :components ((:file "rompsite") (:file "input") @@ -168,7 +169,7 @@ (make-pathname :directory '(:relative "src")) *hemlock-base-directory*) - :depends-on (core-2) + :depends-on (core-2 core-1) :components ((:file "pop-up-stream"))) (:module tty-2 @@ -183,7 +184,7 @@ (make-pathname :directory '(:relative "src")) *hemlock-base-directory*) - :depends-on (root-1) + :depends-on (root-1 core-1) :components ((:file "font") (:file "streams") @@ -196,7 +197,7 @@ (make-pathname :directory '(:relative "src" "user")) *hemlock-base-directory*) - :depends-on (root-2) + :depends-on (root-2 core-1) :components ((:file "echocoms") @@ -258,7 +259,7 @@ (make-pathname :directory '(:relative "src" "bitmap")) *hemlock-base-directory*) - :depends-on (user-1) + :depends-on (user-1 core-1) :components ((:file "rompsite") (:file "input") @@ -270,7 +271,7 @@ (make-pathname :directory '(:relative "src" "clim")) *hemlock-base-directory*) - :depends-on (bitmap-2) + :depends-on (bitmap-2 core-1) :components ((:file "patch") (:file "foo")