andreacavalli
/
xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xwin: remove always true/set XWIN_MULTIWINDOW conditional/define 

v2: drop trailing endif (Jon)

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Jon Turney <jon.turney@dronecode.org.uk>
This commit is contained in:
Emil Velikov 2017-08-22 11:48:29 +01:00 committed by Adam Jackson
parent 9d00f6190a
commit 8f1a200d0b
24 changed files with 5 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -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])

6
hw/xwin/InitOutput.c
View File

@ -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);

4
hw/xwin/Makefile.am
View File

@ -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) \

8
hw/xwin/glx/Makefile.am
View File

@ -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

1
hw/xwin/glx/meson.build
View File

@ -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(

4
hw/xwin/glx/winpriv.c
View File

@ -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)

1
hw/xwin/meson.build
View File

@ -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 = [

14
hw/xwin/win.h
View File

@ -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

14
hw/xwin/wincreatewnd.c
View File

@ -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 () "

2
hw/xwin/wincursor.c
View File

@ -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);

6
hw/xwin/windialogs.c
View File

@ -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 */

2
hw/xwin/winengine.c
View File

@ -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");

4
hw/xwin/winglobals.h
View File

@ -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];

2
hw/xwin/winkeyhook.c
View File

@ -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) {

2
hw/xwin/winmultiwindowicons.c
View File

@ -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

10
hw/xwin/winprefs.c
View File

@ -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

18
hw/xwin/winprocarg.c
View File

@ -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 */

2
hw/xwin/winrandr.c
View File

@ -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");

10
hw/xwin/winscrinit.c
View File

@ -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;

14
hw/xwin/winshadgdi.c
View File

@ -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;
}

4
hw/xwin/wintrayicon.c
View File

@ -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);

9
hw/xwin/winvalargs.c
View File

@ -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

2
hw/xwin/winwindow.h
View File

@ -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

10
hw/xwin/winwndproc.c
View File

@ -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;