diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:49:07 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:49:07 +0000 |
| commit | 0097b6fe2d1739e46e4e7726aaa481b6dc84870c (patch) | |
| tree | 5e279fda13b69a02c684338ee803defbda33ab08 /hw/xwin/winscrinit.c | |
| parent | c57959ad6a4c0f5329762f401fd7871ffb2ee90c (diff) | |
merge latest (4.3.99.16) from XFree86 (vendor) branch
Diffstat (limited to 'hw/xwin/winscrinit.c')
| -rw-r--r-- | hw/xwin/winscrinit.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/hw/xwin/winscrinit.c b/hw/xwin/winscrinit.c index 41811d253..79e985c6b 100644 --- a/hw/xwin/winscrinit.c +++ b/hw/xwin/winscrinit.c @@ -31,7 +31,7 @@ * Harold L Hunt II * Kensuke Matsuzaki */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winscrinit.c,v 1.26 2003/02/12 15:01:38 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winscrinit.c,v 1.28 2003/08/07 23:47:58 alanh Exp $ */ #include "win.h" @@ -510,6 +510,11 @@ winFinishScreenInitFB (int index, /* Set the ServerStarted flag to false */ pScreenPriv->fServerStarted = FALSE; + /* Set the WindowOrderChanged flag to false */ + pScreenPriv->fWindowOrderChanged = FALSE; + + pScreenPriv->fRestacking = FALSE; + #if CYGDEBUG || YES if (pScreenInfo->fMultiWindow) ErrorF ("winFinishScreenInitFB - Calling winInitWM.\n"); @@ -519,6 +524,7 @@ winFinishScreenInitFB (int index, if (pScreenInfo->fMultiWindow && !winInitWM (&pScreenPriv->pWMInfo, &pScreenPriv->ptWMProc, + &pScreenPriv->ptXMsgProc, &pScreenPriv->pmServerStarted, pScreenInfo->dwScreen)) { @@ -584,7 +590,7 @@ winFinishScreenInitNativeGDI (int index, int nVisuals = 0, nDepths = 0, nRootDepth = 0; /* Ignore user input (mouse, keyboard) */ - pScreenInfo->fIgnoreInput = TRUE; + pScreenInfo->fIgnoreInput = FALSE; /* Get device contexts for the screen and shadow bitmap */ pScreenPriv->hdcScreen = GetDC (pScreenPriv->hwndScreen); @@ -616,7 +622,7 @@ winFinishScreenInitNativeGDI (int index, NULL, /* No framebuffer */ pScreenInfo->dwWidth, pScreenInfo->dwHeight, monitorResolution, monitorResolution, - pScreenInfo->dwWidth, + pScreenInfo->dwStride, nRootDepth, nDepths, pDepths, rootVisual, nVisuals, pVisuals)) { @@ -624,6 +630,8 @@ winFinishScreenInitNativeGDI (int index, return FALSE; } + pScreen->defColormap = FakeClientID(0); + /* * Register our block and wakeup handlers; these procedures * process messages in our Windows message queue; specifically, |