dtwm: Remove WSM define, that is always on for CDE
This commit is contained in:
@@ -59,9 +59,7 @@
|
||||
#include "WmWinInfo.h"
|
||||
#include "WmWinList.h"
|
||||
#include "WmWinState.h"
|
||||
#ifdef WSM
|
||||
#include "WmWrkspace.h"
|
||||
#endif /* WSM */
|
||||
|
||||
|
||||
/*
|
||||
@@ -246,10 +244,8 @@ Boolean WmDispatchClientEvent (XEvent *event)
|
||||
{
|
||||
SetActiveScreen (PSD_FOR_CLIENT(pCD));
|
||||
}
|
||||
#ifdef WSM
|
||||
/* Get workspace specific client data */
|
||||
SetClientWsIndex (pCD);
|
||||
#endif /* WSM */
|
||||
|
||||
/*
|
||||
* Handle events on top-level client windows.
|
||||
@@ -412,7 +408,6 @@ Boolean WmDispatchClientEvent (XEvent *event)
|
||||
* This is a request to change the state of the client window from
|
||||
* iconic (minimized) to normal.
|
||||
*/
|
||||
#ifdef WSM
|
||||
if (!ClientInWorkspace (ACTIVE_WS, pCD))
|
||||
{
|
||||
if (pCD->absentMapBehavior == AMAP_BEHAVIOR_IGNORE)
|
||||
@@ -430,9 +425,6 @@ Boolean WmDispatchClientEvent (XEvent *event)
|
||||
{
|
||||
SetClientState (pCD, NORMAL_STATE, GetTimestamp ());
|
||||
}
|
||||
#else /* WSM */
|
||||
SetClientState (pCD, NORMAL_STATE, GetTimestamp ());
|
||||
#endif /* WSM */
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -515,9 +507,7 @@ Boolean WmDispatchClientEvent (XEvent *event)
|
||||
Boolean HandleEventsOnSpecialWindows (XEvent *pEvent)
|
||||
{
|
||||
Boolean dispatchEvent = True;
|
||||
#ifdef WSM
|
||||
WmScreenData *pSD;
|
||||
#endif /* WSM */
|
||||
|
||||
|
||||
/*
|
||||
@@ -557,7 +547,6 @@ Boolean HandleEventsOnSpecialWindows (XEvent *pEvent)
|
||||
}
|
||||
dispatchEvent = False; /* don't have the toolkit dispatch the event */
|
||||
}
|
||||
#ifdef WSM
|
||||
else if (!XFindContext (DISPLAY, pEvent->xany.window,
|
||||
wmGD.mwmWindowContextType, (caddr_t *)&pSD))
|
||||
{
|
||||
@@ -572,7 +561,6 @@ Boolean HandleEventsOnSpecialWindows (XEvent *pEvent)
|
||||
HandleDtWmClientMessage ((XClientMessageEvent *)pEvent);
|
||||
}
|
||||
}
|
||||
#endif /* WSM */
|
||||
else
|
||||
{
|
||||
/*
|
||||
@@ -795,12 +783,10 @@ void HandleCPropertyNotify (ClientData *pCD, XPropertyEvent *propertyEvent)
|
||||
{
|
||||
ProcessWmProtocols (pCD);
|
||||
}
|
||||
#ifdef WSM
|
||||
else if (propertyEvent->atom == wmGD.xa_DT_WORKSPACE_HINTS)
|
||||
{
|
||||
(void) ProcessWorkspaceHints (pCD);
|
||||
}
|
||||
#endif /* WSM */
|
||||
else if (propertyEvent->atom == wmGD.xa_MWM_MESSAGES)
|
||||
{
|
||||
if (pCD->protocolFlags & PROTOCOL_MWM_MESSAGES)
|
||||
@@ -2577,12 +2563,10 @@ void HandleClientMessage (ClientData *pCD, XClientMessageEvent *clientEvent)
|
||||
{
|
||||
newState = NORMAL_STATE;
|
||||
}
|
||||
#ifdef WSM
|
||||
if (!ClientInWorkspace (ACTIVE_WS, pCD))
|
||||
{
|
||||
newState |= UNSEEN_STATE;
|
||||
}
|
||||
#endif /* WSM */
|
||||
|
||||
SetClientState (pCD, newState, GetTimestamp ());
|
||||
|
||||
|
||||
Reference in New Issue
Block a user