From: Chris Hanson <org/chris-hanson/cph>
Date: Thu, 4 Apr 1996 18:39:30 +0000 (+0000)
Subject: If a window is unmapped when it is selected, perhaps by deleting
X-Git-Tag: 20090517-FFI~5630
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=27000f208699ba2ca62e0a82aa9244ce50ffbab4;p=mit-scheme.git

If a window is unmapped when it is selected, perhaps by deleting
another window, map and raise it.
---

diff --git a/v7/src/edwin/xterm.scm b/v7/src/edwin/xterm.scm
index b10439c22..31a3e2b23 100644
--- a/v7/src/edwin/xterm.scm
+++ b/v7/src/edwin/xterm.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;	$Id: xterm.scm,v 1.51 1996/04/04 18:37:13 cph Exp $
+;;;	$Id: xterm.scm,v 1.52 1996/04/04 18:39:30 cph Exp $
 ;;;
 ;;;	Copyright (c) 1989-96 Massachusetts Institute of Technology
 ;;;
@@ -334,10 +334,14 @@
 
 (define (xterm-screen/grab-focus! screen)
   (and last-focus-time
-       (screen-visible? screen)
-       (begin
-	 (x-window-set-input-focus (screen-xterm screen) last-focus-time)
-	 true)))
+       (not (screen-deleted? screen))
+       (let ((xterm (screen-xterm screen)))
+	 (if (eq? (screen-visibility screen) 'UNMAPPED)
+	     (begin
+	       (x-window-map xterm)
+	       (x-window-flush xterm)))
+	 (x-window-set-input-focus xterm last-focus-time)
+	 #t)))
 
 (define (xterm-screen/exit! screen)
   (set-screen-selected?! screen false)
@@ -391,10 +395,14 @@
 (define-integrable (maybe-raise-screen)
   (if x-screen-auto-raise
       (let ((screen (selected-screen)))
-	(if (let ((visibility (screen-visibility screen)))
-	      (or (eq? visibility 'OBSCURED)
-		  (eq? visibility 'PARTIALLY-OBSCURED)))
-	    (x-window-raise (screen-xterm screen))))))
+	(let ((xterm (screen-xterm screen)))
+	  (case (screen-visibility screen)
+	    ((OBSCURED PARTIALLY-OBSCURED)
+	     (x-window-raise xterm))
+	    ((UNMAPPED)
+	     (x-window-map xterm)
+	     (x-window-flush xterm)
+	     (x-window-raise xterm)))))))
 
 (define (get-xterm-input-operations)
   (let ((display x-display-data)