From 8f1a200d0be261a60bb9e8e72d8704cef2d91cd4 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Tue, 22 Aug 2017 11:48:29 +0100 Subject: [PATCH] xwin: remove always true/set XWIN_MULTIWINDOW conditional/define v2: drop trailing endif (Jon) Signed-off-by: Emil Velikov Reviewed-by: Jon Turney --- configure.ac | 1 - hw/xwin/InitOutput.c | 6 ------ hw/xwin/Makefile.am | 4 ---- hw/xwin/glx/Makefile.am | 8 +++----- hw/xwin/glx/meson.build | 1 - hw/xwin/glx/winpriv.c | 4 ---- hw/xwin/meson.build | 1 - hw/xwin/win.h | 14 -------------- hw/xwin/wincreatewnd.c | 14 -------------- hw/xwin/wincursor.c | 2 -- hw/xwin/windialogs.c | 6 ------ hw/xwin/winengine.c | 2 -- hw/xwin/winglobals.h | 4 ---- hw/xwin/winkeyhook.c | 2 -- hw/xwin/winmultiwindowicons.c | 2 -- hw/xwin/winprefs.c | 10 ---------- hw/xwin/winprocarg.c | 18 ------------------ hw/xwin/winrandr.c | 2 -- hw/xwin/winscrinit.c | 10 +--------- hw/xwin/winshadgdi.c | 14 -------------- hw/xwin/wintrayicon.c | 4 ---- hw/xwin/winvalargs.c | 9 +-------- hw/xwin/winwindow.h | 2 -- hw/xwin/winwndproc.c | 10 ---------- 24 files changed, 5 insertions(+), 145 deletions(-) diff --git a/configure.ac b/configure.ac index 920815bf8..3049041df 100644 --- a/configure.ac +++ b/configure.ac @@ -2191,7 +2191,6 @@ dnl XWin requires OpenGL spec files in order to generate wrapper code for native fi AM_CONDITIONAL(XWIN, [test "x$XWIN" = xyes]) -AM_CONDITIONAL(XWIN_MULTIWINDOW, [test "x$XWIN" = xyes]) AM_CONDITIONAL(XWIN_MULTIWINDOWEXTWM, [test "x$XWIN" = xyes && test "x$WINDOWSWM" = xyes]) AM_CONDITIONAL(XWIN_GLX_WINDOWS, [test "x$XWIN" = xyes && test "x$GLX" = xyes]) AM_CONDITIONAL(XWIN_WINDOWS_DRI, [test "x$XWIN" = xyes && test "x$WINDOWSDRI" = xyes]) diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c index 7a25a464c..168c47fc4 100644 --- a/hw/xwin/InitOutput.c +++ b/hw/xwin/InitOutput.c @@ -190,13 +190,11 @@ ddxGiveUp(enum ExitCode error) winDeleteNotifyIcon(winGetScreenPriv(g_ScreenInfo[i].pScreen)); } -#ifdef XWIN_MULTIWINDOW /* Unload libraries for taskbar grouping */ winPropertyStoreDestroy(); /* Notify the worker threads we're exiting */ winDeinitMultiWindowWM(); -#endif #ifdef HAS_DEVWINDOWS /* Close our handle to our message queue */ @@ -787,9 +785,7 @@ winUseMsg(void) "\tUse the entire virtual screen if multiple\n" "\tmonitors are present.\n"); -#ifdef XWIN_MULTIWINDOW ErrorF("-multiwindow\n" "\tRun the server in multi-window mode.\n"); -#endif #ifdef XWIN_MULTIWINDOWEXTWM ErrorF("-mwextwm\n" @@ -948,10 +944,8 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char *argv[]) /* Detect supported engines */ winDetectSupportedEngines(); -#ifdef XWIN_MULTIWINDOW /* Load libraries for taskbar grouping */ winPropertyStoreInit(); -#endif /* Store the instance handle */ g_hInstance = GetModuleHandle(NULL); diff --git a/hw/xwin/Makefile.am b/hw/xwin/Makefile.am index b83b28d84..b20737186 100644 --- a/hw/xwin/Makefile.am +++ b/hw/xwin/Makefile.am @@ -20,7 +20,6 @@ XWIN_GLX_LIBS += $(top_builddir)/hw/xwin/glx/libXwinGLX.la XWIN_GLX_SYS_LIBS = -lopengl32 endif -if XWIN_MULTIWINDOW SRCS_MULTIWINDOW = \ winmultiwindowshape.c \ winmultiwindowwindow.c \ @@ -28,9 +27,7 @@ SRCS_MULTIWINDOW = \ winmultiwindowwndproc.c \ propertystore.h \ winSetAppUserModelID.c -DEFS_MULTIWINDOW = -DXWIN_MULTIWINDOW MULTIWINDOW_SYS_LIBS = -lshlwapi -lole32 -endif if XWIN_MULTIWINDOWEXTWM SRCS_MULTIWINDOWEXTWM = \ @@ -114,7 +111,6 @@ SRCS = InitInput.c \ DEFS = \ $(DEFS_GLX_WINDOWS) \ - $(DEFS_MULTIWINDOW) \ $(DEFS_MULTIWINDOWEXTWM) \ $(DEFS_NATIVEGDI) \ $(DEFS_PRIMARYFB) \ diff --git a/hw/xwin/glx/Makefile.am b/hw/xwin/glx/Makefile.am index 599ec37cc..f19995086 100644 --- a/hw/xwin/glx/Makefile.am +++ b/hw/xwin/glx/Makefile.am @@ -20,10 +20,6 @@ endif libnativeGLthunk_la_SOURCES = \ glthunk.c -if XWIN_MULTIWINDOW -DEFS_MULTIWINDOW = -DXWIN_MULTIWINDOW -endif - if XWIN_MULTIWINDOWEXTWM DEFS_MULTIWINDOWEXTWM = -DXWIN_MULTIWINDOWEXTWM endif @@ -32,7 +28,9 @@ if XWIN_GLX_WINDOWS DEFS_GLX_WINDOWS = -DXWIN_GLX_WINDOWS endif -DEFS = $(DEFS_MULTIWINDOW) $(DEFS_MULTIWINDOWEXTWM) $(DEFS_GLX_WINDOWS) +DEFS = \ + $(DEFS_MULTIWINDOWEXTWM) \ + $(DEFS_GLX_WINDOWS) AM_CPPFLAGS = -I$(top_srcdir)/miext/rootless diff --git a/hw/xwin/glx/meson.build b/hw/xwin/glx/meson.build index 77ffeda28..7843a5f00 100644 --- a/hw/xwin/glx/meson.build +++ b/hw/xwin/glx/meson.build @@ -63,7 +63,6 @@ endif xwin_glx_c_args = [] xwin_glx_c_args += '-DHAVE_XWIN_CONFIG_H' -xwin_glx_c_args += '-DXWIN_MULTIWINDOW' xwin_glx_c_args += '-DXWIN_GLX_WINDOWS' xwin_glx = static_library( diff --git a/hw/xwin/glx/winpriv.c b/hw/xwin/glx/winpriv.c index c98ad9099..8ed93aba3 100644 --- a/hw/xwin/glx/winpriv.c +++ b/hw/xwin/glx/winpriv.c @@ -39,7 +39,6 @@ winGetWindowInfo(WindowPtr pWin) hwnd = pWinScreen->hwndScreen; pScreenInfo = pWinScreen->pScreenInfo; -#ifdef XWIN_MULTIWINDOW /* check for multiwindow mode */ if (pScreenInfo->fMultiWindow) { winWindowPriv(pWin); @@ -64,7 +63,6 @@ winGetWindowInfo(WindowPtr pWin) return hwnd; } -#endif #ifdef XWIN_MULTIWINDOWEXTWM /* check for multiwindow external wm mode */ if (pScreenInfo->fMWExtWM) { @@ -107,10 +105,8 @@ winCheckScreenAiglxIsSupported(ScreenPtr pScreen) winPrivScreenPtr pWinScreen = winGetScreenPriv(pScreen); winScreenInfoPtr pScreenInfo = pWinScreen->pScreenInfo; -#ifdef XWIN_MULTIWINDOW if (pScreenInfo->fMultiWindow) return TRUE; -#endif #ifdef XWIN_MULTIWINDOWEXTWM if (pScreenInfo->fMWExtWM) diff --git a/hw/xwin/meson.build b/hw/xwin/meson.build index eef4fee0d..f71de8301 100644 --- a/hw/xwin/meson.build +++ b/hw/xwin/meson.build @@ -18,7 +18,6 @@ xwin_c_args = [] xwin_c_args += '-DHAVE_XWIN_CONFIG_H' xwin_c_args += '-Wno-bad-function-cast' # XXX: these conditionals are always on and can be removed -xwin_c_args += '-DXWIN_MULTIWINDOW' xwin_c_args += '-DXWIN_RANDR' srcs_windows = [ diff --git a/hw/xwin/win.h b/hw/xwin/win.h index 6ae242375..dda2cb548 100644 --- a/hw/xwin/win.h +++ b/hw/xwin/win.h @@ -394,12 +394,8 @@ typedef struct { Bool fMWExtWM; #endif Bool fRootless; -#ifdef XWIN_MULTIWINDOW Bool fMultiWindow; -#endif -#if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM) Bool fMultiMonitorOverride; -#endif Bool fMultipleMonitors; Bool fLessPointer; winResizeMode iResizeMode; @@ -474,17 +470,13 @@ typedef struct _winPrivScreenRec { Bool fRestacking; #endif -#ifdef XWIN_MULTIWINDOW /* Privates used by multi-window */ pthread_t ptWMProc; pthread_t ptXMsgProc; void *pWMInfo; -#endif -#if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM) /* Privates used by both multi-window and rootless */ Bool fRootWindowShown; -#endif /* Privates used for any module running in a seperate thread */ pthread_mutex_t pmServerStarted; @@ -924,7 +916,6 @@ Bool void winSetShapeRootless(WindowPtr pWindow, int kind); -#ifdef XWIN_MULTIWINDOW /* * winmultiwindowshape.c */ @@ -937,9 +928,7 @@ void void winUpdateRgnMultiWindow(WindowPtr pWindow); -#endif -#ifdef XWIN_MULTIWINDOW /* * winmultiwindowwindow.c */ @@ -990,16 +979,13 @@ XID int winAdjustXWindow(WindowPtr pWin, HWND hwnd); -#endif -#ifdef XWIN_MULTIWINDOW /* * winmultiwindowwndproc.c */ LRESULT CALLBACK winTopLevelWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam); -#endif /* * wintrayicon.c diff --git a/hw/xwin/wincreatewnd.c b/hw/xwin/wincreatewnd.c index e6e587f9f..daa6daac9 100644 --- a/hw/xwin/wincreatewnd.c +++ b/hw/xwin/wincreatewnd.c @@ -156,9 +156,7 @@ winCreateBoundingWindowWindowed(ScreenPtr pScreen) && !pScreenInfo->fMWExtWM #endif && !pScreenInfo->fRootless -#ifdef XWIN_MULTIWINDOW && !pScreenInfo->fMultiWindow -#endif ) { /* Try to handle startup via run.exe. run.exe instructs Windows to * hide all created windows. Detect this case and make sure the @@ -220,9 +218,7 @@ winCreateBoundingWindowWindowed(ScreenPtr pScreen) || pScreenInfo->fMWExtWM #endif || pScreenInfo->fRootless -#ifdef XWIN_MULTIWINDOW || pScreenInfo->fMultiWindow -#endif ) && (pScreenInfo->iResizeMode == resizeWithScrollbars)) { /* We cannot have scrollbars if we do not have a window border */ @@ -243,9 +239,7 @@ winCreateBoundingWindowWindowed(ScreenPtr pScreen) && !pScreenInfo->fMWExtWM #endif && !pScreenInfo->fRootless -#ifdef XWIN_MULTIWINDOW && !pScreenInfo->fMultiWindow -#endif ) { #if CYGDEBUG winDebug @@ -293,9 +287,7 @@ winCreateBoundingWindowWindowed(ScreenPtr pScreen) #ifdef XWIN_MULTIWINDOWEXTWM && !pScreenInfo->fMWExtWM #endif -#ifdef XWIN_MULTIWINDOW && !pScreenInfo->fMultiWindow -#endif ) { /* Trim window width to fit work area */ if (iWidth > (rcWorkArea.right - rcWorkArea.left)) @@ -430,13 +422,9 @@ winCreateBoundingWindowWindowed(ScreenPtr pScreen) #ifdef XWIN_MULTIWINDOWEXTWM || pScreenInfo->fMWExtWM #endif -#ifdef XWIN_MULTIWINDOW || pScreenInfo->fMultiWindow -#endif ) { -#if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM) pScreenPriv->fRootWindowShown = FALSE; -#endif ShowWindow(*phwnd, SW_HIDE); } else @@ -452,9 +440,7 @@ winCreateBoundingWindowWindowed(ScreenPtr pScreen) && !pScreenInfo->fMWExtWM #endif && !pScreenInfo->fRootless -#ifdef XWIN_MULTIWINDOW && !pScreenInfo->fMultiWindow -#endif ) { if (!BringWindowToTop(*phwnd)) { ErrorF("winCreateBoundingWindowWindowed - BringWindowToTop () " diff --git a/hw/xwin/wincursor.c b/hw/xwin/wincursor.c index bddd6b7ed..2afcf9fb5 100644 --- a/hw/xwin/wincursor.c +++ b/hw/xwin/wincursor.c @@ -95,9 +95,7 @@ winPointerWarpCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y) */ if ((pScreenPriv->hwndScreen == GetForegroundWindow()) || pScreenPriv->pScreenInfo->fRootless -#ifdef XWIN_MULTIWINDOW || pScreenPriv->pScreenInfo->fMultiWindow -#endif ) { /* Get the client area coordinates */ GetClientRect(pScreenPriv->hwndScreen, &rcClient); diff --git a/hw/xwin/windialogs.c b/hw/xwin/windialogs.c index c7668e6a9..26b2ebd2c 100644 --- a/hw/xwin/windialogs.c +++ b/hw/xwin/windialogs.c @@ -201,18 +201,14 @@ winInitDialog(HWND hwndDlg) 0, 0, SWP_NOSIZE | SWP_FRAMECHANGED); } -#ifdef XWIN_MULTIWINDOW if (g_hIconX) hIcon = g_hIconX; else -#endif hIcon = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_XWIN)); -#ifdef XWIN_MULTIWINDOW if (g_hSmallIconX) hIconSmall = g_hSmallIconX; else -#endif hIconSmall = LoadImage(g_hInstance, MAKEINTRESOURCE(IDI_XWIN), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), @@ -236,11 +232,9 @@ winDisplayExitDialog(winPrivScreenPtr pScreenPriv) for (i = 1; i < currentMaxClients; i++) if (clients[i] != NullClient) liveClients++; -#if defined(XWIN_MULTIWINDOW) /* Count down server internal clients */ if (pScreenPriv->pScreenInfo->fMultiWindow) liveClients -= 2; /* multiwindow window manager & XMsgProc */ -#endif if (g_fClipboardStarted) liveClients--; /* clipboard manager */ diff --git a/hw/xwin/winengine.c b/hw/xwin/winengine.c index d816851e2..2336442c0 100644 --- a/hw/xwin/winengine.c +++ b/hw/xwin/winengine.c @@ -150,9 +150,7 @@ winSetEngine(ScreenPtr pScreen) #ifdef XWIN_MULTIWINDOWEXTWM || pScreenInfo->fMWExtWM #endif -#ifdef XWIN_MULTIWINDOW || pScreenInfo->fMultiWindow -#endif ) { winErrorFVerb(2, "winSetEngine - Multi Window or Rootless => ShadowGDI\n"); diff --git a/hw/xwin/winglobals.h b/hw/xwin/winglobals.h index d05330617..250085fbc 100644 --- a/hw/xwin/winglobals.h +++ b/hw/xwin/winglobals.h @@ -74,14 +74,10 @@ extern Bool g_fClipboard; extern Bool g_fClipboardStarted; /* The global X default icons */ -#if defined(XWIN_MULTIWINDOW) extern HICON g_hIconX; extern HICON g_hSmallIconX; -#endif -#ifdef XWIN_MULTIWINDOW extern DWORD g_dwCurrentThreadID; -#endif extern Bool g_fKeyboardHookLL; extern Bool g_fButton[3]; diff --git a/hw/xwin/winkeyhook.c b/hw/xwin/winkeyhook.c index 66d68f63d..bb99c3e25 100644 --- a/hw/xwin/winkeyhook.c +++ b/hw/xwin/winkeyhook.c @@ -61,7 +61,6 @@ winKeyboardMessageHookLL(int iCode, WPARAM wParam, LPARAM lParam) PKBDLLHOOKSTRUCT p = (PKBDLLHOOKSTRUCT) lParam; HWND hwnd = GetActiveWindow(); -#ifdef XWIN_MULTIWINDOW WindowPtr pWin = NULL; winPrivWinPtr pWinPriv = NULL; winPrivScreenPtr pScreenPriv = NULL; @@ -79,7 +78,6 @@ winKeyboardMessageHookLL(int iCode, WPARAM wParam, LPARAM lParam) if (pScreenInfo->fMultiWindow) fPassAltTab = FALSE; } -#endif /* Pass keystrokes on to our main message loop */ if (iCode == HC_ACTION) { diff --git a/hw/xwin/winmultiwindowicons.c b/hw/xwin/winmultiwindowicons.c index 050795123..c43c29887 100644 --- a/hw/xwin/winmultiwindowicons.c +++ b/hw/xwin/winmultiwindowicons.c @@ -581,7 +581,6 @@ winXIconToHICON(xcb_connection_t *conn, xcb_window_t id, int iconSize) * Change the Windows window icon */ -#ifdef XWIN_MULTIWINDOW void winUpdateIcon(HWND hWnd, xcb_connection_t *conn, Window id, HICON hIconNew) { @@ -671,4 +670,3 @@ winDestroyIcon(HICON hIcon) hIcon != g_hSmallIconX && !winIconIsOverride(hIcon)) DestroyIcon(hIcon); } -#endif diff --git a/hw/xwin/winprefs.c b/hw/xwin/winprefs.c index 65115ec5b..0ac5b4fea 100644 --- a/hw/xwin/winprefs.c +++ b/hw/xwin/winprefs.c @@ -138,7 +138,6 @@ MakeMenu(char *name, HMENU editMenu, int editItem) return hmenu; } -#ifdef XWIN_MULTIWINDOW /* * Callback routine that is executed once per window class. * Removes or creates custom window settings depending on LPARAM @@ -197,7 +196,6 @@ ReloadEnumWindowsProc(HWND hwnd, LPARAM lParam) return TRUE; } -#endif /* * Removes any custom icons in classes, custom menus, etc. @@ -210,7 +208,6 @@ ReloadPrefs(winPrivScreenPtr pScreenPriv) { int i; -#ifdef XWIN_MULTIWINDOW winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo; /* First, iterate over all windows, deleting their icons and custom menus. @@ -221,7 +218,6 @@ ReloadPrefs(winPrivScreenPtr pScreenPriv) */ if (pScreenInfo->fMultiWindow) EnumThreadWindows(g_dwCurrentThreadID, ReloadEnumWindowsProc, FALSE); -#endif /* Now, free/clear all info from our prefs structure */ for (i = 0; i < pref.menuItems; i++) @@ -264,14 +260,12 @@ ReloadPrefs(winPrivScreenPtr pScreenPriv) g_hIconX = NULL; g_hSmallIconX = NULL; -#ifdef XWIN_MULTIWINDOW if (pScreenInfo->fMultiWindow) { winInitGlobalIcons(); /* Rebuild the icons and menus */ EnumThreadWindows(g_dwCurrentThreadID, ReloadEnumWindowsProc, TRUE); } -#endif /* Whew, done */ } @@ -385,14 +379,12 @@ HandleCustomWM_COMMAND(HWND hwnd, WORD command, winPrivScreenPtr pScreenPriv) SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE); -#if XWIN_MULTIWINDOW { winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo; if (pScreenInfo->fMultiWindow) /* Reflect the changed Z order */ winReorderWindowsMultiWindow(); } -#endif return TRUE; case CMD_RELOAD: @@ -409,7 +401,6 @@ HandleCustomWM_COMMAND(HWND hwnd, WORD command, winPrivScreenPtr pScreenPriv) return FALSE; } -#ifdef XWIN_MULTIWINDOW /* * Add the default or a custom menu depending on the class match */ @@ -459,7 +450,6 @@ SetupSysMenu(HWND hwnd) MakeMenu(pref.defaultSysMenuName, sys, -1); } } -#endif /* * Possibly add a menu to the toolbar icon diff --git a/hw/xwin/winprocarg.c b/hw/xwin/winprocarg.c index 64d07cc6e..803e78f93 100644 --- a/hw/xwin/winprocarg.c +++ b/hw/xwin/winprocarg.c @@ -130,12 +130,8 @@ winInitializeScreenDefaults(void) defaultScreenInfo.fMWExtWM = FALSE; #endif defaultScreenInfo.fRootless = FALSE; -#ifdef XWIN_MULTIWINDOW defaultScreenInfo.fMultiWindow = FALSE; -#endif -#if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM) defaultScreenInfo.fMultiMonitorOverride = FALSE; -#endif defaultScreenInfo.fMultipleMonitors = FALSE; defaultScreenInfo.fLessPointer = FALSE; defaultScreenInfo.iResizeMode = resizeDefault; @@ -524,10 +520,8 @@ ddxProcessArgument(int argc, char *argv[], int i) * Look for the '-fullscreen' argument */ if (IS_OPTION("-fullscreen")) { -#if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM) if (!screenInfoPtr->fMultiMonitorOverride) screenInfoPtr->fMultipleMonitors = FALSE; -#endif screenInfoPtr->fFullScreen = TRUE; /* Indicate that we have processed this argument */ @@ -548,10 +542,8 @@ ddxProcessArgument(int argc, char *argv[], int i) * Look for the '-nodecoration' argument */ if (IS_OPTION("-nodecoration")) { -#if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM) if (!screenInfoPtr->fMultiMonitorOverride) screenInfoPtr->fMultipleMonitors = FALSE; -#endif screenInfoPtr->fDecoration = FALSE; /* Indicate that we have processed this argument */ @@ -585,40 +577,32 @@ ddxProcessArgument(int argc, char *argv[], int i) * Look for the '-rootless' argument */ if (IS_OPTION("-rootless")) { -#if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM) if (!screenInfoPtr->fMultiMonitorOverride) screenInfoPtr->fMultipleMonitors = FALSE; -#endif screenInfoPtr->fRootless = TRUE; /* Indicate that we have processed this argument */ return 1; } -#ifdef XWIN_MULTIWINDOW /* * Look for the '-multiwindow' argument */ if (IS_OPTION("-multiwindow")) { -#if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM) if (!screenInfoPtr->fMultiMonitorOverride) screenInfoPtr->fMultipleMonitors = TRUE; -#endif screenInfoPtr->fMultiWindow = TRUE; /* Indicate that we have processed this argument */ return 1; } -#endif /* * Look for the '-multiplemonitors' argument */ if (IS_OPTION("-multiplemonitors") || IS_OPTION("-multimonitors")) { -#if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM) screenInfoPtr->fMultiMonitorOverride = TRUE; -#endif screenInfoPtr->fMultipleMonitors = TRUE; /* Indicate that we have processed this argument */ @@ -630,9 +614,7 @@ ddxProcessArgument(int argc, char *argv[], int i) */ if (IS_OPTION("-nomultiplemonitors") || IS_OPTION("-nomultimonitors")) { -#if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM) screenInfoPtr->fMultiMonitorOverride = TRUE; -#endif screenInfoPtr->fMultipleMonitors = FALSE; /* Indicate that we have processed this argument */ diff --git a/hw/xwin/winrandr.c b/hw/xwin/winrandr.c index 1560199c1..3e084221e 100644 --- a/hw/xwin/winrandr.c +++ b/hw/xwin/winrandr.c @@ -174,9 +174,7 @@ winRandRScreenSetSize(ScreenPtr pScreen, || pScreenInfo->fMWExtWM #endif || pScreenInfo->fRootless -#ifdef XWIN_MULTIWINDOW || pScreenInfo->fMultiWindow -#endif ) { ErrorF ("winRandRScreenSetSize - resize not supported in rootless modes\n"); diff --git a/hw/xwin/winscrinit.c b/hw/xwin/winscrinit.c index acdd49e6d..a44e21fbd 100644 --- a/hw/xwin/winscrinit.c +++ b/hw/xwin/winscrinit.c @@ -453,7 +453,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv) #undef WRAP } -#ifdef XWIN_MULTIWINDOW /* Handle multi window mode */ else if (pScreenInfo->fMultiWindow) { /* Define the WRAP macro temporarily for local use */ @@ -496,7 +495,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv) /* Undefine the WRAP macro, as it is not needed elsewhere */ #undef WRAP } -#endif /* Wrap either fb's or shadow's CloseScreen with our CloseScreen */ pScreenPriv->CloseScreen = pScreen->CloseScreen; @@ -525,12 +523,7 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv) pScreenPriv->fRestacking = FALSE; #endif -#if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM) - if (FALSE -#ifdef XWIN_MULTIWINDOW - || pScreenInfo->fMultiWindow -#endif - ) { + if (pScreenInfo->fMultiWindow) { #if CYGDEBUG || YES winDebug("winFinishScreenInitFB - Calling winInitWM.\n"); #endif @@ -546,7 +539,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv) return FALSE; } } -#endif /* Tell the server that we are enabled */ pScreenPriv->fEnabled = TRUE; diff --git a/hw/xwin/winshadgdi.c b/hw/xwin/winshadgdi.c index 770942ad7..6d7ebce07 100644 --- a/hw/xwin/winshadgdi.c +++ b/hw/xwin/winshadgdi.c @@ -37,11 +37,9 @@ * Local function prototypes */ -#ifdef XWIN_MULTIWINDOW static wBOOL CALLBACK winRedrawAllProcShadowGDI(HWND hwnd, LPARAM lParam); static wBOOL CALLBACK winRedrawDamagedWindowShadowGDI(HWND hwnd, LPARAM lParam); -#endif static Bool winAllocateFBShadowGDI(ScreenPtr pScreen); @@ -263,7 +261,6 @@ winQueryRGBBitsAndMasks(ScreenPtr pScreen) return fReturn; } -#ifdef XWIN_MULTIWINDOW /* * Redraw all ---? */ @@ -309,7 +306,6 @@ winRedrawDamagedWindowShadowGDI(HWND hwnd, LPARAM lParam) } return TRUE; } -#endif /* * Allocate a DIB for the shadow framebuffer GDI server @@ -403,11 +399,9 @@ winAllocateFBShadowGDI(ScreenPtr pScreen) (int) pScreenInfo->dwStride); #endif -#ifdef XWIN_MULTIWINDOW /* Redraw all windows */ if (pScreenInfo->fMultiWindow) EnumThreadWindows(g_dwCurrentThreadID, winRedrawAllProcShadowGDI, 0); -#endif return fReturn; } @@ -525,13 +519,11 @@ winShadowUpdateGDI(ScreenPtr pScreen, shadowBufPtr pBuf) SelectClipRgn(pScreenPriv->hdcScreen, NULL); } -#ifdef XWIN_MULTIWINDOW /* Redraw all multiwindow windows */ if (pScreenInfo->fMultiWindow) EnumThreadWindows(g_dwCurrentThreadID, winRedrawDamagedWindowShadowGDI, (LPARAM) pBoxExtents); -#endif } static Bool @@ -776,12 +768,10 @@ winBltExposedRegionsShadowGDI(ScreenPtr pScreen) /* EndPaint frees the DC */ EndPaint(pScreenPriv->hwndScreen, &ps); -#ifdef XWIN_MULTIWINDOW /* Redraw all windows */ if (pScreenInfo->fMultiWindow) EnumThreadWindows(g_dwCurrentThreadID, winRedrawAllProcShadowGDI, (LPARAM) pScreenPriv->hwndScreen); -#endif return TRUE; } @@ -845,11 +835,9 @@ winRedrawScreenShadowGDI(ScreenPtr pScreen) pScreenInfo->dwWidth, pScreenInfo->dwHeight, pScreenPriv->hdcShadow, 0, 0, SRCCOPY); -#ifdef XWIN_MULTIWINDOW /* Redraw all windows */ if (pScreenInfo->fMultiWindow) EnumThreadWindows(g_dwCurrentThreadID, winRedrawAllProcShadowGDI, 0); -#endif return TRUE; } @@ -944,11 +932,9 @@ winInstallColormapShadowGDI(ColormapPtr pColormap) /* Save a pointer to the newly installed colormap */ pScreenPriv->pcmapInstalled = pColormap; -#ifdef XWIN_MULTIWINDOW /* Redraw all windows */ if (pScreenInfo->fMultiWindow) EnumThreadWindows(g_dwCurrentThreadID, winRedrawAllProcShadowGDI, 0); -#endif return TRUE; } diff --git a/hw/xwin/wintrayicon.c b/hw/xwin/wintrayicon.c index 1511fc1f2..a22ca24f2 100644 --- a/hw/xwin/wintrayicon.c +++ b/hw/xwin/wintrayicon.c @@ -109,9 +109,7 @@ LRESULT winHandleIconMessage(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, winPrivScreenPtr pScreenPriv) { -#if defined(XWIN_MULTIWINDOWEXTWM) || defined(XWIN_MULTIWINDOW) winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo; -#endif switch (lParam) { case WM_LBUTTONUP: @@ -146,7 +144,6 @@ winHandleIconMessage(HWND hwnd, UINT message, /* Get actual tray icon menu */ hmenuTray = GetSubMenu(hmenuPopup, 0); -#ifdef XWIN_MULTIWINDOW /* Check for MultiWindow mode */ if (pScreenInfo->fMultiWindow) { MENUITEMINFO mii = { 0 }; @@ -166,7 +163,6 @@ winHandleIconMessage(HWND hwnd, UINT message, SetMenuItemInfo(hmenuTray, ID_APP_HIDE_ROOT, FALSE, &mii); } else -#endif { /* Remove Hide Root Window button */ RemoveMenu(hmenuTray, ID_APP_HIDE_ROOT, MF_BYCOMMAND); diff --git a/hw/xwin/winvalargs.c b/hw/xwin/winvalargs.c index f93872419..50587d4b3 100644 --- a/hw/xwin/winvalargs.c +++ b/hw/xwin/winvalargs.c @@ -86,10 +86,8 @@ winValidateArgs(void) int iCount = 0; /* Count conflicting options */ -#ifdef XWIN_MULTIWINDOW if (g_ScreenInfo[i].fMultiWindow) ++iCount; -#endif #ifdef XWIN_MULTIWINDOWEXTWM if (g_ScreenInfo[i].fMWExtWM) ++iCount; @@ -112,10 +110,9 @@ winValidateArgs(void) /* Check for -multiwindow or -mwextwm and Xdmcp */ /* allow xdmcp if screen 0 is normal. */ if (g_fXdmcpEnabled && !fHasNormalScreen0 && (FALSE -#ifdef XWIN_MULTIWINDOW || g_ScreenInfo[i]. fMultiWindow -#endif + #ifdef XWIN_MULTIWINDOWEXTWM || g_ScreenInfo[i]. fMWExtWM @@ -129,9 +126,7 @@ winValidateArgs(void) /* Check for -multiwindow, -mwextwm, or -rootless and -fullscreen */ if (g_ScreenInfo[i].fFullScreen && (FALSE -#ifdef XWIN_MULTIWINDOW || g_ScreenInfo[i].fMultiWindow -#endif #ifdef XWIN_MULTIWINDOWEXTWM || g_ScreenInfo[i].fMWExtWM #endif @@ -144,9 +139,7 @@ winValidateArgs(void) /* Check for -multiwindow, -mwextwm, or -rootless and -nodecoration */ if (!g_ScreenInfo[i].fDecoration && (FALSE -#ifdef XWIN_MULTIWINDOW || g_ScreenInfo[i].fMultiWindow -#endif #ifdef XWIN_MULTIWINDOWEXTWM || g_ScreenInfo[i].fMWExtWM #endif diff --git a/hw/xwin/winwindow.h b/hw/xwin/winwindow.h index 65e4bea0c..959ce152a 100644 --- a/hw/xwin/winwindow.h +++ b/hw/xwin/winwindow.h @@ -84,7 +84,6 @@ typedef struct { #endif } winPrivWinRec, *winPrivWinPtr; -#ifdef XWIN_MULTIWINDOW typedef struct _winWMMessageRec { DWORD dwID; DWORD msg; @@ -162,5 +161,4 @@ void void winShowWindowOnTaskbar(HWND hWnd, Bool show); -#endif /* XWIN_MULTIWINDOW */ #endif diff --git a/hw/xwin/winwndproc.c b/hw/xwin/winwndproc.c index 538430c13..02186b13e 100644 --- a/hw/xwin/winwndproc.c +++ b/hw/xwin/winwndproc.c @@ -229,11 +229,9 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) || s_pScreenInfo-> fRootless -#ifdef XWIN_MULTIWINDOW || s_pScreenInfo-> fMultiWindow -#endif )) { DWORD dwWidth = 0, dwHeight = 0; @@ -321,9 +319,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) || s_pScreenInfo->fMWExtWM #endif || s_pScreenInfo->fRootless -#ifdef XWIN_MULTIWINDOW || s_pScreenInfo->fMultiWindow -#endif || s_pScreenInfo->fFullScreen) break; @@ -624,9 +620,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) || s_pScreenInfo->fMWExtWM #endif || s_pScreenInfo->fRootless -#ifdef XWIN_MULTIWINDOW || s_pScreenInfo->fMultiWindow -#endif ) break; @@ -1189,7 +1183,6 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) winDisplayExitDialog(s_pScreenPriv); return 0; -#ifdef XWIN_MULTIWINDOW case ID_APP_HIDE_ROOT: if (s_pScreenPriv->fRootWindowShown) ShowWindow(s_pScreenPriv->hwndScreen, SW_HIDE); @@ -1197,7 +1190,6 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) ShowWindow(s_pScreenPriv->hwndScreen, SW_SHOW); s_pScreenPriv->fRootWindowShown = !s_pScreenPriv->fRootWindowShown; return 0; -#endif case ID_APP_MONITOR_PRIMARY: fPrimarySelection = !fPrimarySelection; @@ -1217,10 +1209,8 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) case WM_GIVEUP: /* Tell X that we are giving up */ -#ifdef XWIN_MULTIWINDOW if (s_pScreenInfo->fMultiWindow) winDeinitMultiWindowWM(); -#endif GiveUp(0); return 0;