From: Chris Hanson Date: Tue, 14 May 1996 01:55:25 +0000 (+0000) Subject: Change DISPLAY-STYLE in order to orthogonalize the effects that it can X-Git-Tag: 20090517-FFI~5519 X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=c9194a0d9ea0b066a5b22598432b437f6c383b3e;p=mit-scheme.git Change DISPLAY-STYLE in order to orthogonalize the effects that it can have. New design allows each of the different style effects to be selected separately. --- diff --git a/v7/src/edwin/edwin.pkg b/v7/src/edwin/edwin.pkg index 796895ee1..0e0bef9e8 100644 --- a/v7/src/edwin/edwin.pkg +++ b/v7/src/edwin/edwin.pkg @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: edwin.pkg,v 1.196 1996/05/14 01:43:50 cph Exp $ +$Id: edwin.pkg,v 1.197 1996/05/14 01:50:03 cph Exp $ Copyright (c) 1989-96 Massachusetts Institute of Technology @@ -302,7 +302,7 @@ MIT in each case. |# display-style/discard-screen-contents? display-style/ignore-input? display-style/ignore-redisplay-flags? - display-style/screen-output? + display-style/no-screen-output? edwin-variable$cursor-centering-point edwin-variable$mode-line-inverse-video edwin-variable$scroll-step diff --git a/v7/src/edwin/eystep.scm b/v7/src/edwin/eystep.scm index a59d9f10a..73033b0d6 100644 --- a/v7/src/edwin/eystep.scm +++ b/v7/src/edwin/eystep.scm @@ -1,6 +1,6 @@ ;;; -*-Scheme-*- ;;; -;;; $Id: eystep.scm,v 1.2 1994/10/13 04:26:01 cph Exp $ +;;; $Id: eystep.scm,v 1.3 1996/05/14 01:52:30 cph Exp $ ;;; ;;; Copyright (c) 1994 Massachusetts Institute of Technology ;;; @@ -295,7 +295,7 @@ c contract the step under the cursor") (let ((start (ynode-start-mark regions (cadr last-event)))) (if start (set-buffer-point! buffer start)))))) - (if redisplay? (update-screens! #f))) + (if redisplay? (update-screens! '(IGNORE-INPUT)))) (define (output-and-mung-region point thunk region-munger) ;; Display something in the stepper buffer and then run something on diff --git a/v7/src/edwin/process.scm b/v7/src/edwin/process.scm index 46db1fcc1..3d6984b96 100644 --- a/v7/src/edwin/process.scm +++ b/v7/src/edwin/process.scm @@ -1,6 +1,6 @@ ;;; -*-Scheme-*- ;;; -;;; $Id: process.scm,v 1.46 1996/05/14 01:07:46 cph Exp $ +;;; $Id: process.scm,v 1.47 1996/05/14 01:52:11 cph Exp $ ;;; ;;; Copyright (c) 1991-96 Massachusetts Institute of Technology ;;; @@ -619,11 +619,11 @@ after the listing is made.)" (lambda (copy-input) (call-with-output-copier process output-mark (lambda (copy-output) - (if allow-redisplay? (update-screens! #f)) + (if allow-redisplay? (update-screens! '(IGNORE-INPUT))) (let loop () (copy-input) (if (and (> (copy-output) 0) allow-redisplay?) - (update-screens! #f)) + (update-screens! '(IGNORE-INPUT))) (let ((status (subprocess-status process))) (if (eq? status 'RUNNING) (loop) diff --git a/v7/src/edwin/screen.scm b/v7/src/edwin/screen.scm index 4b2efdf59..4d0b79ad0 100644 --- a/v7/src/edwin/screen.scm +++ b/v7/src/edwin/screen.scm @@ -1,6 +1,6 @@ ;;; -*-Scheme-*- ;;; -;;; $Id: screen.scm,v 1.108 1996/05/14 01:44:18 cph Exp $ +;;; $Id: screen.scm,v 1.109 1996/05/14 01:49:49 cph Exp $ ;;; ;;; Copyright (c) 1989-96 Massachusetts Institute of Technology ;;; @@ -651,8 +651,8 @@ (and (thunk) (if (screen-visible? screen) (and (or (not (screen-needs-update? screen)) - (and (display-style/screen-output? - display-style) + (and (not (display-style/no-screen-output? + display-style)) (screen-update screen display-style))) (begin (screen-update-cursor screen) diff --git a/v7/src/edwin/snr.scm b/v7/src/edwin/snr.scm index c9f269272..a7190036a 100644 --- a/v7/src/edwin/snr.scm +++ b/v7/src/edwin/snr.scm @@ -1,6 +1,6 @@ ;;; -*-Scheme-*- ;;; -;;; $Id: snr.scm,v 1.8 1996/05/12 02:19:20 cph Exp $ +;;; $Id: snr.scm,v 1.9 1996/05/14 01:55:25 cph Exp $ ;;; ;;; Copyright (c) 1995-96 Massachusetts Institute of Technology ;;; @@ -741,7 +741,7 @@ With negative argument -N, show the N oldest unread articles." (if (news-group:subscribed? group) (begin (read-news-group-headers buffer group) - (update-screens! #f)))))))) + (update-screens! '(IGNORE-INPUT))))))))) (define-command news-read-group-headers "Read the unread headers for the News group indicated by point. @@ -769,7 +769,7 @@ This command has no effect in the all-groups buffer." (for-each-vector-element (news-server-buffer:groups buffer) (lambda (group) (refresh-news-group buffer group) - (update-screens! #f))))))) + (update-screens! '(IGNORE-INPUT)))))))) (define-command news-refresh-group "Update the unread-message estimate for the News group indicated by point. diff --git a/v7/src/edwin/vc.scm b/v7/src/edwin/vc.scm index 253e68fb7..3da4cac06 100644 --- a/v7/src/edwin/vc.scm +++ b/v7/src/edwin/vc.scm @@ -1,6 +1,6 @@ ;;; -*-Scheme-*- ;;; -;;; $Id: vc.scm,v 1.23 1996/05/14 01:44:01 cph Exp $ +;;; $Id: vc.scm,v 1.24 1996/05/14 01:51:42 cph Exp $ ;;; ;;; Copyright (c) 1994-96 Massachusetts Institute of Technology ;;; @@ -1347,7 +1347,7 @@ the value of vc-log-mode-hook." (point-context (vc-mark-context (buffer-point buffer))) (mark-context (vc-mark-context (buffer-mark buffer)))) (revert-buffer buffer #t dont-confirm?) - (update-screens! '(IGNORE-INPUT)) + (update-screens! '(IGNORE-INPUT NO-SCREEN-OUTPUT)) (if (null? point-contexts) (let ((m (vc-find-context buffer point-context))) (if m diff --git a/v7/src/edwin/window.scm b/v7/src/edwin/window.scm index c710064b5..db2d4cf5c 100644 --- a/v7/src/edwin/window.scm +++ b/v7/src/edwin/window.scm @@ -1,6 +1,6 @@ ;;; -*-Scheme-*- ;;; -;;; $Id: window.scm,v 1.157 1996/05/14 01:44:11 cph Exp $ +;;; $Id: window.scm,v 1.158 1996/05/14 01:51:16 cph Exp $ ;;; ;;; Copyright (c) 1986, 1989-96 Massachusetts Institute of Technology ;;; @@ -265,21 +265,21 @@ (define (display-style/discard-screen-contents? display-style) (if (pair? display-style) (memq 'DISCARD-SCREEN-CONTENTS display-style) - display-style)) + (and display-style (not (null? display-style))))) -(define (display-style/screen-output? display-style) - (or (not (pair? display-style)) - (memq 'SCREEN-OUTPUT display-style))) +(define (display-style/no-screen-output? display-style) + (and (pair? display-style) + (memq 'NO-SCREEN-OUTPUT display-style))) (define (display-style/ignore-redisplay-flags? display-style) (if (pair? display-style) (memq 'IGNORE-REDISPLAY-FLAGS display-style) - display-style)) + (and display-style (not (null? display-style))))) (define (display-style/ignore-input? display-style) (if (pair? display-style) (memq 'IGNORE-INPUT display-style) - display-style)) + (and display-style (not (null? display-style))))) ;;;; Standard Methods ;;; All windows support these operations