hw/xwin: Remove fInternalWM flag
Remove the fInternalWM flag as it is now always FALSE after removing the -internalwm option v2: Also remove then unused pRLWinPriv local from pRLWinPriv() Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
This commit is contained in:
parent
98238ece57
commit
2779a28a86
|
@ -404,7 +404,6 @@ typedef struct {
|
||||||
Bool fDecoration;
|
Bool fDecoration;
|
||||||
#ifdef XWIN_MULTIWINDOWEXTWM
|
#ifdef XWIN_MULTIWINDOWEXTWM
|
||||||
Bool fMWExtWM;
|
Bool fMWExtWM;
|
||||||
Bool fInternalWM;
|
|
||||||
Bool fAnotherWMRunning;
|
Bool fAnotherWMRunning;
|
||||||
#endif
|
#endif
|
||||||
Bool fRootless;
|
Bool fRootless;
|
||||||
|
|
|
@ -811,9 +811,6 @@ winMinimizeWindow(Window id)
|
||||||
WindowPtr pWin;
|
WindowPtr pWin;
|
||||||
winPrivWinPtr pWinPriv;
|
winPrivWinPtr pWinPriv;
|
||||||
|
|
||||||
#ifdef XWIN_MULTIWINDOWEXTWM
|
|
||||||
win32RootlessWindowPtr pRLWinPriv;
|
|
||||||
#endif
|
|
||||||
HWND hWnd;
|
HWND hWnd;
|
||||||
ScreenPtr pScreen = NULL;
|
ScreenPtr pScreen = NULL;
|
||||||
winPrivScreenPtr pScreenPriv = NULL;
|
winPrivScreenPtr pScreenPriv = NULL;
|
||||||
|
@ -833,16 +830,7 @@ winMinimizeWindow(Window id)
|
||||||
if (pScreen)
|
if (pScreen)
|
||||||
pScreenPriv = winGetScreenPriv(pScreen);
|
pScreenPriv = winGetScreenPriv(pScreen);
|
||||||
|
|
||||||
#ifdef XWIN_MULTIWINDOWEXTWM
|
|
||||||
if (pScreenPriv && pScreenPriv->pScreenInfo->fInternalWM) {
|
|
||||||
pRLWinPriv =
|
|
||||||
(win32RootlessWindowPtr) RootlessFrameForWindow(pWin, FALSE);
|
|
||||||
hWnd = pRLWinPriv->hWnd;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
#else
|
|
||||||
if (pScreenPriv)
|
if (pScreenPriv)
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
pWinPriv = winGetWindowPriv(pWin);
|
pWinPriv = winGetWindowPriv(pWin);
|
||||||
hWnd = pWinPriv->hWnd;
|
hWnd = pWinPriv->hWnd;
|
||||||
|
|
|
@ -130,7 +130,6 @@ winInitializeScreenDefaults(void)
|
||||||
defaultScreenInfo.fDecoration = TRUE;
|
defaultScreenInfo.fDecoration = TRUE;
|
||||||
#ifdef XWIN_MULTIWINDOWEXTWM
|
#ifdef XWIN_MULTIWINDOWEXTWM
|
||||||
defaultScreenInfo.fMWExtWM = FALSE;
|
defaultScreenInfo.fMWExtWM = FALSE;
|
||||||
defaultScreenInfo.fInternalWM = FALSE;
|
|
||||||
#endif
|
#endif
|
||||||
defaultScreenInfo.fRootless = FALSE;
|
defaultScreenInfo.fRootless = FALSE;
|
||||||
#ifdef XWIN_MULTIWINDOW
|
#ifdef XWIN_MULTIWINDOW
|
||||||
|
|
|
@ -533,9 +533,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
|
||||||
if (FALSE
|
if (FALSE
|
||||||
#ifdef XWIN_MULTIWINDOW
|
#ifdef XWIN_MULTIWINDOW
|
||||||
|| pScreenInfo->fMultiWindow
|
|| pScreenInfo->fMultiWindow
|
||||||
#endif
|
|
||||||
#ifdef XWIN_MULTIWINDOWEXTWM
|
|
||||||
|| pScreenInfo->fInternalWM
|
|
||||||
#endif
|
#endif
|
||||||
) {
|
) {
|
||||||
#if CYGDEBUG || YES
|
#if CYGDEBUG || YES
|
||||||
|
@ -548,9 +545,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
|
||||||
&pScreenPriv->ptXMsgProc,
|
&pScreenPriv->ptXMsgProc,
|
||||||
&pScreenPriv->pmServerStarted,
|
&pScreenPriv->pmServerStarted,
|
||||||
pScreenInfo->dwScreen, (HWND) &pScreenPriv->hwndScreen,
|
pScreenInfo->dwScreen, (HWND) &pScreenPriv->hwndScreen,
|
||||||
#ifdef XWIN_MULTIWINDOWEXTWM
|
|
||||||
pScreenInfo->fInternalWM ||
|
|
||||||
#endif
|
|
||||||
FALSE)) {
|
FALSE)) {
|
||||||
ErrorF("winFinishScreenInitFB - winInitWM () failed.\n");
|
ErrorF("winFinishScreenInitFB - winInitWM () failed.\n");
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
|
@ -350,7 +350,7 @@ winMWExtWMUpdateWindowDecoration(win32RootlessWindowPtr pRLWinPriv,
|
||||||
Bool
|
Bool
|
||||||
winIsInternalWMRunning(winScreenInfoPtr pScreenInfo)
|
winIsInternalWMRunning(winScreenInfoPtr pScreenInfo)
|
||||||
{
|
{
|
||||||
return pScreenInfo->fInternalWM && !pScreenInfo->fAnotherWMRunning;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -907,9 +907,6 @@ winMWExtWMWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
|
||||||
if (!wParam)
|
if (!wParam)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
if (!pScreenInfo->fInternalWM) //XXXX
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
winMWExtWMUpdateWindowDecoration(pRLWinPriv, pScreenInfo);
|
winMWExtWMUpdateWindowDecoration(pRLWinPriv, pScreenInfo);
|
||||||
|
|
||||||
if (winIsInternalWMRunning(pScreenInfo)) {
|
if (winIsInternalWMRunning(pScreenInfo)) {
|
||||||
|
|
|
@ -1192,7 +1192,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
|
||||||
#ifdef XWIN_MULTIWINDOWEXTWM
|
#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->fAnotherWMRunning)
|
||||||
winMWExtWMRestackWindows(s_pScreen);
|
winMWExtWMRestackWindows(s_pScreen);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@ -1260,21 +1260,11 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
|
||||||
case WM_MANAGE:
|
case WM_MANAGE:
|
||||||
ErrorF("winWindowProc - WM_MANAGE\n");
|
ErrorF("winWindowProc - WM_MANAGE\n");
|
||||||
s_pScreenInfo->fAnotherWMRunning = FALSE;
|
s_pScreenInfo->fAnotherWMRunning = FALSE;
|
||||||
|
|
||||||
if (s_pScreenInfo->fInternalWM) {
|
|
||||||
EnumThreadWindows(g_dwCurrentThreadID, winMWExtWMDecorateWindow, 0);
|
|
||||||
//RootlessRepositionWindows (s_pScreen);
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case WM_UNMANAGE:
|
case WM_UNMANAGE:
|
||||||
ErrorF("winWindowProc - WM_UNMANAGE\n");
|
ErrorF("winWindowProc - WM_UNMANAGE\n");
|
||||||
s_pScreenInfo->fAnotherWMRunning = TRUE;
|
s_pScreenInfo->fAnotherWMRunning = TRUE;
|
||||||
|
|
||||||
if (s_pScreenInfo->fInternalWM) {
|
|
||||||
EnumThreadWindows(g_dwCurrentThreadID, winMWExtWMDecorateWindow, 0);
|
|
||||||
winMWExtWMRestackWindows(s_pScreen);
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user