From: Chris Hanson <org/chris-hanson/cph>
Date: Sun, 1 Aug 1993 05:06:25 +0000 (+0000)
Subject: Extend handling of simple events to include deletion of non-selected
X-Git-Tag: 20090517-FFI~8157
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=3d09364e9f28f408eab54b74bcd1039d8234fc1d;p=mit-scheme.git

Extend handling of simple events to include deletion of non-selected
screens.
---

diff --git a/v7/src/edwin/edwin.pkg b/v7/src/edwin/edwin.pkg
index 78a71157f..8c37f9eb1 100644
--- a/v7/src/edwin/edwin.pkg
+++ b/v7/src/edwin/edwin.pkg
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: edwin.pkg,v 1.120 1993/08/01 00:15:52 cph Exp $
+$Id: edwin.pkg,v 1.121 1993/08/01 05:06:25 cph Exp $
 
 Copyright (c) 1989-1993 Massachusetts Institute of Technology
 
@@ -419,6 +419,8 @@ MIT in each case. |#
 	  execute-command
 	  execute-command-history-entry
 	  initialize-command-reader!
+	  input-event/operands
+	  input-event/operator
 	  input-event/type
 	  input-event?
 	  keyboard-keys-read
diff --git a/v7/src/edwin/input.scm b/v7/src/edwin/input.scm
index 8df6fe0c6..a3fa94bde 100644
--- a/v7/src/edwin/input.scm
+++ b/v7/src/edwin/input.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;	$Id: input.scm,v 1.94 1993/08/01 00:15:55 cph Exp $
+;;;	$Id: input.scm,v 1.95 1993/08/01 05:06:16 cph Exp $
 ;;;
 ;;;	Copyright (c) 1986, 1989-93 Massachusetts Institute of Technology
 ;;;
@@ -204,7 +204,13 @@ B 3BAB8C
   (let loop ()
     (let ((input (thunk)))
       (if (and (input-event? input)
-	       (memq (input-event/type input) '(UPDATE SET-SCREEN-SIZE)))
+	       (let ((type (input-event/type input)))
+		 (or (eq? type 'UPDATE)
+		     (eq? type 'SET-SCREEN-SIZE)
+		     (and (eq? type 'DELETE-SCREEN)
+			  (eq? (input-event/operator input) delete-screen!)
+			  (not (selected-screen?
+				(car (input-event/operands input))))))))
 	  (begin
 	    (apply-input-event input)
 	    (loop))