frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backout last winRaiseWindow patch which caused stacking problems

This commit is contained in:
Alexander Gottwald 2005-06-03 08:12:22 +00:00
parent 2fc290f646
commit 0d206e177f
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/xwin/ChangeLog
View File

@ -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> 2005-05-25 Alexander Gottwald <ago at freedesktop dot org>
* win.h: * win.h:

6
hw/xwin/winblock.c
View File

@ -41,8 +41,6 @@ extern HWND g_hDlgExit;
extern HWND g_hDlgAbout; extern HWND g_hDlgAbout;
Bool winInBlockHandler = FALSE;
/* See Porting Layer Definition - p. 6 */ /* See Porting Layer Definition - p. 6 */
void void
winBlockHandler (int nScreen, winBlockHandler (int nScreen,
@ -89,9 +87,6 @@ winBlockHandler (int nScreen,
winBlockHandler_ProcessMessages: winBlockHandler_ProcessMessages:
#endif #endif
winInBlockHandler = TRUE;
/* Process all messages on our queue */ /* Process all messages on our queue */
while (PeekMessage (&msg, NULL, 0, 0, PM_REMOVE)) while (PeekMessage (&msg, NULL, 0, 0, PM_REMOVE))
{ {
@ -105,5 +100,4 @@ winBlockHandler_ProcessMessages:
DispatchMessage (&msg); DispatchMessage (&msg);
} }
} }
winInBlockHandler = FALSE;
} }

3
hw/xwin/winmultiwindowwndproc.c
View File

@ -266,11 +266,10 @@ ValidateSizing (HWND hwnd, WindowPtr pWin,
} }
extern Bool winInDestroyWindowsWindow; extern Bool winInDestroyWindowsWindow;
extern Bool winInBlockHandler;
static Bool winInRaiseWindow = FALSE; static Bool winInRaiseWindow = FALSE;
static void winRaiseWindow(WindowPtr pWin) static void winRaiseWindow(WindowPtr pWin)
{ {
if (winInBlockHandler && !winInDestroyWindowsWindow && !winInRaiseWindow) if (!winInDestroyWindowsWindow && !winInRaiseWindow)
{ {
BOOL oldstate = winInRaiseWindow; BOOL oldstate = winInRaiseWindow;
winInRaiseWindow = TRUE; winInRaiseWindow = TRUE;