From 0d206e177f46eedfffd8f88e985efdfaf117021c Mon Sep 17 00:00:00 2001
From: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Fri, 3 Jun 2005 08:12:22 +0000
Subject: [PATCH] Backout last winRaiseWindow patch which caused stacking
 problems

---
 hw/xwin/ChangeLog               | 6 ++++++
 hw/xwin/winblock.c              | 6 ------
 hw/xwin/winmultiwindowwndproc.c | 3 +--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/hw/xwin/ChangeLog b/hw/xwin/ChangeLog
index 478ef8daa..21f653a6c 100644
--- a/hw/xwin/ChangeLog
+++ b/hw/xwin/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-03  Alexander Gottwald  <ago at freedesktop dot org>
+
+	* winmultiwindowwndproc.c:
+	* winblock.c:
+	Backout last winRaiseWindow patch which caused stacking problems
+
 2005-05-25  Alexander Gottwald  <ago at freedesktop dot org>
 
 	* win.h:
diff --git a/hw/xwin/winblock.c b/hw/xwin/winblock.c
index ec2d16eeb..1d21faf46 100644
--- a/hw/xwin/winblock.c
+++ b/hw/xwin/winblock.c
@@ -41,8 +41,6 @@ extern HWND			g_hDlgExit;
 extern HWND			g_hDlgAbout;
 
 
-Bool winInBlockHandler = FALSE;
-
 /* See Porting Layer Definition - p. 6 */
 void
 winBlockHandler (int nScreen,
@@ -89,9 +87,6 @@ winBlockHandler (int nScreen,
 winBlockHandler_ProcessMessages:
 #endif
 
-
-
-  winInBlockHandler = TRUE;
   /* Process all messages on our queue */
   while (PeekMessage (&msg, NULL, 0, 0, PM_REMOVE))
     {
@@ -105,5 +100,4 @@ winBlockHandler_ProcessMessages:
 	  DispatchMessage (&msg);
 	}
     }
-  winInBlockHandler = FALSE;
 }
diff --git a/hw/xwin/winmultiwindowwndproc.c b/hw/xwin/winmultiwindowwndproc.c
index 56e51565c..93ddcd4b3 100755
--- a/hw/xwin/winmultiwindowwndproc.c
+++ b/hw/xwin/winmultiwindowwndproc.c
@@ -266,11 +266,10 @@ ValidateSizing (HWND hwnd, WindowPtr pWin,
 }
 
 extern Bool winInDestroyWindowsWindow;
-extern Bool winInBlockHandler; 
 static Bool winInRaiseWindow = FALSE;
 static void winRaiseWindow(WindowPtr pWin)
 {
-  if (winInBlockHandler && !winInDestroyWindowsWindow && !winInRaiseWindow)
+  if (!winInDestroyWindowsWindow && !winInRaiseWindow)
   {
     BOOL oldstate = winInRaiseWindow;
     winInRaiseWindow = TRUE;