Wrap all mwextwm and internalwm code with XWIN_MULTIWINDOWEXTWM
This commit is contained in:
parent
16ee24cd99
commit
e494e24c50
|
@ -1,3 +1,9 @@
|
||||||
|
2004-11-06 Alexander Gottwald <ago at freedesktop dot org>
|
||||||
|
|
||||||
|
* winwndproc.c, wintrayicon.c, winscrinit.c:
|
||||||
|
* winmultiwindowwindow.c:
|
||||||
|
Wrap all mwextwm and internalwm code with XWIN_MULTIWINDOWEXTWM
|
||||||
|
|
||||||
2004-11-04 Kensuke Matsuzaki <zakki@peppermint.jp>
|
2004-11-04 Kensuke Matsuzaki <zakki@peppermint.jp>
|
||||||
|
|
||||||
* InitOutput.c: (winUseMsg):
|
* InitOutput.c: (winUseMsg):
|
||||||
|
|
|
@ -813,7 +813,9 @@ winMinimizeWindow (Window id)
|
||||||
{
|
{
|
||||||
WindowPtr pWin;
|
WindowPtr pWin;
|
||||||
winPrivWinPtr pWinPriv;
|
winPrivWinPtr pWinPriv;
|
||||||
|
#ifdef XWIN_MULTIWINDOWEXTWM
|
||||||
win32RootlessWindowPtr pRLWinPriv;
|
win32RootlessWindowPtr pRLWinPriv;
|
||||||
|
#endif
|
||||||
HWND hWnd;
|
HWND hWnd;
|
||||||
ScreenPtr pScreen = NULL;
|
ScreenPtr pScreen = NULL;
|
||||||
winPrivScreenPtr pScreenPriv = NULL;
|
winPrivScreenPtr pScreenPriv = NULL;
|
||||||
|
@ -829,12 +831,16 @@ winMinimizeWindow (Window id)
|
||||||
if (pScreen) pScreenPriv = winGetScreenPriv(pScreen);
|
if (pScreen) pScreenPriv = winGetScreenPriv(pScreen);
|
||||||
if (pScreenPriv) pScreenInfo = pScreenPriv->pScreenInfo;
|
if (pScreenPriv) pScreenInfo = pScreenPriv->pScreenInfo;
|
||||||
|
|
||||||
|
#ifdef XWIN_MULTIWINDOWEXTWM
|
||||||
if (pScreenPriv && pScreenInfo->fInternalWM)
|
if (pScreenPriv && pScreenInfo->fInternalWM)
|
||||||
{
|
{
|
||||||
pRLWinPriv = (win32RootlessWindowPtr) RootlessFrameForWindow (pWin, FALSE);
|
pRLWinPriv = (win32RootlessWindowPtr) RootlessFrameForWindow (pWin, FALSE);
|
||||||
hWnd = pRLWinPriv->hWnd;
|
hWnd = pRLWinPriv->hWnd;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
#else
|
||||||
|
if (pScreenPriv)
|
||||||
|
#endif
|
||||||
{
|
{
|
||||||
pWinPriv = winGetWindowPriv (pWin);
|
pWinPriv = winGetWindowPriv (pWin);
|
||||||
hWnd = pWinPriv->hWnd;
|
hWnd = pWinPriv->hWnd;
|
||||||
|
|
|
@ -585,24 +585,32 @@ winFinishScreenInitFB (int index,
|
||||||
pScreenPriv->fRestacking = FALSE;
|
pScreenPriv->fRestacking = FALSE;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM)
|
||||||
|
if (FALSE
|
||||||
#ifdef XWIN_MULTIWINDOW
|
#ifdef XWIN_MULTIWINDOW
|
||||||
|
|| pScreenInfo->fMultiWindow
|
||||||
|
#endif
|
||||||
|
#ifdef XWIN_MULTIWINDOWEXTWM
|
||||||
|
|| pScreenInfo->fInternalWM
|
||||||
|
#endif
|
||||||
|
)
|
||||||
|
{
|
||||||
#if CYGDEBUG || YES
|
#if CYGDEBUG || YES
|
||||||
if (pScreenInfo->fMultiWindow)
|
winDebug ("winFinishScreenInitFB - Calling winInitWM.\n");
|
||||||
winDebug ("winFinishScreenInitFB - Calling winInitWM.\n");
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Initialize multi window mode */
|
/* Initialize multi window mode */
|
||||||
if ((pScreenInfo->fMultiWindow || pScreenInfo->fInternalWM)
|
if (!winInitWM (&pScreenPriv->pWMInfo,
|
||||||
&& !winInitWM (&pScreenPriv->pWMInfo,
|
&pScreenPriv->ptWMProc,
|
||||||
&pScreenPriv->ptWMProc,
|
&pScreenPriv->ptXMsgProc,
|
||||||
&pScreenPriv->ptXMsgProc,
|
&pScreenPriv->pmServerStarted,
|
||||||
&pScreenPriv->pmServerStarted,
|
pScreenInfo->dwScreen,
|
||||||
pScreenInfo->dwScreen,
|
(HWND)&pScreenPriv->hwndScreen))
|
||||||
(HWND)&pScreenPriv->hwndScreen))
|
{
|
||||||
{
|
ErrorF ("winFinishScreenInitFB - winInitWM () failed.\n");
|
||||||
ErrorF ("winFinishScreenInitFB - winInitWM () failed.\n");
|
return FALSE;
|
||||||
return FALSE;
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Tell the server that we are enabled */
|
/* Tell the server that we are enabled */
|
||||||
|
|
|
@ -119,8 +119,10 @@ winHandleIconMessage (HWND hwnd, UINT message,
|
||||||
/* Restack and bring all windows to top */
|
/* Restack and bring all windows to top */
|
||||||
SetForegroundWindow (hwnd);
|
SetForegroundWindow (hwnd);
|
||||||
|
|
||||||
|
#ifdef XWIN_MULTIWINDOWEXTWM
|
||||||
if (pScreenInfo->fMWExtWM)
|
if (pScreenInfo->fMWExtWM)
|
||||||
winMWExtWMRestackWindows (pScreenInfo->pScreen);
|
winMWExtWMRestackWindows (pScreenInfo->pScreen);
|
||||||
|
#endif
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case WM_LBUTTONDBLCLK:
|
case WM_LBUTTONDBLCLK:
|
||||||
|
|
|
@ -1154,12 +1154,14 @@ winWindowProc (HWND hwnd, UINT message,
|
||||||
/* Call engine specific screen activation/deactivation function */
|
/* Call engine specific screen activation/deactivation function */
|
||||||
(*s_pScreenPriv->pwinActivateApp) (s_pScreen);
|
(*s_pScreenPriv->pwinActivateApp) (s_pScreen);
|
||||||
|
|
||||||
|
#ifdef XWIN_MULTIWINDOWEXTWM
|
||||||
if (s_pScreenPriv->fActive)
|
if (s_pScreenPriv->fActive)
|
||||||
{
|
{
|
||||||
/* Restack all window unless using built-in wm. */
|
/* Restack all window unless using built-in wm. */
|
||||||
if (s_pScreenInfo->fInternalWM && s_pScreenInfo->fAnotherWMRunning)
|
if (s_pScreenInfo->fInternalWM && s_pScreenInfo->fAnotherWMRunning)
|
||||||
winMWExtWMRestackWindows (s_pScreen);
|
winMWExtWMRestackWindows (s_pScreen);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
@ -1219,6 +1221,7 @@ winWindowProc (HWND hwnd, UINT message,
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
#ifdef XWIN_MULTIWINDOWEXTWM
|
||||||
case WM_MANAGE:
|
case WM_MANAGE:
|
||||||
ErrorF ("winWindowProc - WM_MANAGE\n");
|
ErrorF ("winWindowProc - WM_MANAGE\n");
|
||||||
s_pScreenInfo->fAnotherWMRunning = FALSE;
|
s_pScreenInfo->fAnotherWMRunning = FALSE;
|
||||||
|
@ -1240,6 +1243,7 @@ winWindowProc (HWND hwnd, UINT message,
|
||||||
winMWExtWMRestackWindows (s_pScreen);
|
winMWExtWMRestackWindows (s_pScreen);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
#endif
|
||||||
|
|
||||||
default:
|
default:
|
||||||
if(message == s_uTaskbarRestart)
|
if(message == s_uTaskbarRestart)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user