diff options
Diffstat (limited to 'hw/xwin/winblock.c')
| -rw-r--r-- | hw/xwin/winblock.c | 31 |
1 files changed, 22 insertions, 9 deletions
diff --git a/hw/xwin/winblock.c b/hw/xwin/winblock.c index 35463493b..a7ca230c5 100644 --- a/hw/xwin/winblock.c +++ b/hw/xwin/winblock.c @@ -1,5 +1,5 @@ /* - *Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved. + *Copyright (C) 2001-2004 Harold L Hunt II All Rights Reserved. * *Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the @@ -15,21 +15,31 @@ *THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, *EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - *NONINFRINGEMENT. IN NO EVENT SHALL THE XFREE86 PROJECT BE LIABLE FOR + *NONINFRINGEMENT. IN NO EVENT SHALL HAROLD L HUNT II BE LIABLE FOR *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * - *Except as contained in this notice, the name of the XFree86 Project + *Except as contained in this notice, the name of Harold L Hunt II *shall not be used in advertising or otherwise to promote the sale, use *or other dealings in this Software without prior written authorization - *from the XFree86 Project. + *from Harold L Hunt II. * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winblock.c,v 1.5 2002/10/17 08:18:22 alanh Exp $ */ #include "win.h" +#include "winmsg.h" + + +/* + * References to external symbols + */ + +extern HWND g_hDlgDepthChange; +extern HWND g_hDlgExit; +extern HWND g_hDlgAbout; + /* See Porting Layer Definition - p. 6 */ void @@ -41,12 +51,13 @@ winBlockHandler (int nScreen, winScreenPriv((ScreenPtr)pBlockData); MSG msg; +#if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW) /* Signal threaded modules to begin */ if (pScreenPriv != NULL && !pScreenPriv->fServerStarted) { int iReturn; - ErrorF ("winBlockHandler - Releasing pmServerStarted\n"); + winDebug ("winBlockHandler - Releasing pmServerStarted\n"); /* Flag that modules are to be started */ pScreenPriv->fServerStarted = TRUE; @@ -60,10 +71,11 @@ winBlockHandler (int nScreen, goto winBlockHandler_ProcessMessages; } - ErrorF ("winBlockHandler - pthread_mutex_unlock () returned\n"); + winDebug ("winBlockHandler - pthread_mutex_unlock () returned\n"); } winBlockHandler_ProcessMessages: +#endif /* Process all messages on our queue */ while (PeekMessage (&msg, NULL, 0, 0, PM_REMOVE)) @@ -71,10 +83,11 @@ winBlockHandler_ProcessMessages: if ((g_hDlgDepthChange == 0 || !IsDialogMessage (g_hDlgDepthChange, &msg)) && (g_hDlgExit == 0 - || !IsDialogMessage (g_hDlgExit, &msg))) + || !IsDialogMessage (g_hDlgExit, &msg)) + && (g_hDlgAbout == 0 + || !IsDialogMessage (g_hDlgAbout, &msg))) { DispatchMessage (&msg); } } - winReorderWindowsMultiWindow ((ScreenPtr)pBlockData); } |