/[cmucl]/src/clx/input.lisp
ViewVC logotype

Diff of /src/clx/input.lisp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.6 by dtc, Sat Dec 19 15:21:18 1998 UTC revision 1.7 by pw, Tue Mar 16 23:37:43 1999 UTC
# Line 388  Line 388 
388             (type generalized-boolean force-output-p)             (type generalized-boolean force-output-p)
389             (dynamic-extent predicate-args))             (dynamic-extent predicate-args))
390    (declare (type function predicate)    (declare (type function predicate)
391             #+clx-ansi-common-lisp             (dynamic-extent predicate))
            (dynamic-extent predicate)  
            #+(and lispm (not clx-ansi-common-lisp))  
            (sys:downward-funarg predicate))  
392    (let ((reply-buffer nil)    (let ((reply-buffer nil)
393          (token (or (current-process) (cons nil nil))))          (token (or (current-process) (cons nil nil))))
394      (declare (type (or null reply-buffer) reply-buffer))      (declare (type (or null reply-buffer) reply-buffer))
# Line 419  Line 416 
416                              (declare (type display display)                              (declare (type display display)
417                                       (dynamic-extent predicate-args)                                       (dynamic-extent predicate-args)
418                                       (type function predicate)                                       (type function predicate)
419                                       #+clx-ansi-common-lisp                                       (dynamic-extent predicate))
                                      (dynamic-extent predicate)  
                                      #+(and lispm (not clx-ansi-common-lisp))  
                                      (sys:downward-funarg predicate))  
420                              (or (apply predicate predicate-args)                              (or (apply predicate predicate-args)
421                                  (null (display-input-in-progress display))                                  (null (display-input-in-progress display))
422                                  (not (null (display-dead display)))))                                  (not (null (display-dead display)))))
# Line 763  Line 757 
757               (declare (type display display)               (declare (type display display)
758                        (type reply-buffer event))                        (type reply-buffer event))
759               (declare (type function handler)               (declare (type function handler)
760                        #+clx-ansi-common-lisp                        (dynamic-extent handler))
                       (dynamic-extent handler)  
                       #+(and lispm (not clx-ansi-common-lisp))  
                       (sys:downward-funarg handler))  
761               (reading-event (event :display display :sizes (8 16 ,@get-sizes))               (reading-event (event :display display :sizes (8 16 ,@get-sizes))
762                 (funcall handler                 (funcall handler
763                          :display display                          :display display
# Line 1177  Line 1168 
1168             (type (or null number) timeout)             (type (or null number) timeout)
1169             (type generalized-boolean peek-p discard-p force-output-p))             (type generalized-boolean peek-p discard-p force-output-p))
1170    (declare (type t handler)    (declare (type t handler)
1171             #+clx-ansi-common-lisp             (dynamic-extent handler))
            (dynamic-extent handler)  
            #+(and lispm (not clx-ansi-common-lisp))  
            (sys:downward-funarg #+Genera * #-Genera handler))  
1172    (event-loop (display event timeout force-output-p discard-p)    (event-loop (display event timeout force-output-p discard-p)
1173      (let* ((event-code (event-code event)) ;; Event decoder defined by DECLARE-EVENT      (let* ((event-code (event-code event)) ;; Event decoder defined by DECLARE-EVENT
1174             (event-decoder (and (index< event-code (length *event-handler-vector*))             (event-decoder (and (index< event-code (length *event-handler-vector*))
# Line 1533  Line 1521 
1521        (when (= code (second extension))        (when (= code (second extension))
1522          (return (first extension))))))          (return (first extension))))))
1523    
 #-(or clx-ansi-common-lisp excl lcl3.0 CMU)  
 (define-condition request-error (x-error)  
   ((display :reader request-error-display)  
    (error-key :reader request-error-error-key)  
    (major :reader request-error-major)  
    (minor :reader request-error-minor)  
    (sequence :reader request-error-sequence)  
    (current-sequence :reader request-error-current-sequence)  
    (asynchronous :reader request-error-asynchronous))  
   (:report report-request-error))  
   
1524  (defun report-request-error (condition stream)  (defun report-request-error (condition stream)
1525    (let ((error-key (request-error-error-key condition))    (let ((error-key (request-error-error-key condition))
1526          (asynchronous (request-error-asynchronous condition))          (asynchronous (request-error-asynchronous condition))
# Line 1558  Line 1535 
1535    
1536  ;; Since the :report arg is evaluated as (function report-request-error) the  ;; Since the :report arg is evaluated as (function report-request-error) the
1537  ;; define-condition must come after the function definition.  ;; define-condition must come after the function definition.
1538  #+(or clx-ansi-common-lisp excl lcl3.0 CMU)  
1539  (define-condition request-error (x-error)  (define-condition request-error (x-error)
1540    ((display :reader request-error-display :initarg :display)    ((display :reader request-error-display :initarg :display)
1541     (error-key :reader request-error-error-key :initarg :error-key)     (error-key :reader request-error-error-key :initarg :error-key)

Legend:
Removed from v.1.6  
changed lines
  Added in v.1.7

  ViewVC Help
Powered by ViewVC 1.1.5