[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Recent Lucid patches for CLX



Well, I can't program my way out of a paper bag, it seems clear.

Thanks to Hans Muller of Sun for a pair of scissors to cut my way out...

I confused "alists" with "plists" in my recent set of patches, and
since Hans hadn't been confused, I broke his code.  Here's a patch to
my patch, using the plist correctly this time.  Oh the embarrassment.

					yduJ (Judy Anderson)
					Lucid, Inc.
					yduJ@lucid.com
					edsel!yduJ@labrea.stanford.edu
					...!sun!edsel!yduJ
					(617)784-6114
---------------------------------------------------------------------------
*** lib/CLX/dependent.l	Thu Feb  9 11:12:48 1989
--- lib/LUCID-CLX/dependent.lisp	Fri Feb 17 13:09:38 1989
***************
*** 904,916 ****
  (defmacro extract-underlying-stream (stream display direction)
    ;;;Our job is to quickly get at the underlying stream for this display's
    ;;;input stream structure.
!   `(let ((pair (assoc ,direction (display-plist ,display))))
!      (if pair (second pair)
! 	 (progn 
! 	   (push (list ,direction
! 		       (lucid::underlying-stream ,stream ,direction))
! 		 (display-plist ,display))
! 	   (second (assoc ,direction (display-plist ,display)))))))
  
  #+lcl3.0
  (defun buffer-read-default (display vector start end timeout)
--- 904,914 ----
  (defmacro extract-underlying-stream (stream display direction)
    ;;;Our job is to quickly get at the underlying stream for this display's
    ;;;input stream structure.
!   `(or (getf (display-plist ,display) ,direction)
!        (setf (getf (display-plist ,display) ,direction)
! 	     (lucid::underlying-stream ,stream (if (eq ,direction 'input)
! 						   :input 
! 						 :output)))))
  
  #+lcl3.0
  (defun buffer-read-default (display vector start end timeout)
***************
*** 925,931 ****
  	   (optimize (speed 3)
  		     (safety 0)))
    (let* ((stream (display-input-stream display))
! 	 (fast-stream (extract-underlying-stream stream display :input)))
      (cond ((or (null timeout)
  	       (listen stream))
  	   (lcl:with-scheduling-inhibited
--- 923,929 ----
  	   (optimize (speed 3)
  		     (safety 0)))
    (let* ((stream (display-input-stream display))
! 	 (fast-stream (extract-underlying-stream stream display 'input)))
      (cond ((or (null timeout)
  	       (listen stream))
  	   (lcl:with-scheduling-inhibited
***************
*** 1034,1040 ****
    (lcl:with-scheduling-inhibited
        (lcl:write-array
  	(extract-underlying-stream
! 	  (display-output-stream display) display :output)
  	vector start end)))
  
  ;;; WARNING:
--- 1032,1038 ----
    (lcl:with-scheduling-inhibited
        (lcl:write-array
  	(extract-underlying-stream
! 	  (display-output-stream display) display 'output)
  	vector start end)))
  
  ;;; WARNING: