debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dtwm: Remove WSM define, that is always on for CDE

Browse Source
This commit is contained in:
Peter Howkins
2018-06-20 00:46:58 +01:00
parent 5dc05eaeb4
commit 9a551dd8a6
57 changed files with 237 additions and 2797 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cde/programs/dtwm/WmProperty.c
+3 -25
View File
@@ -37,11 +37,9 @@
#include "WmGlobal.h"
#include "WmICCC.h"
#include <stdio.h>
#ifdef WSM
#include <Dt/WsmP.h>
#include <X11/Xatom.h>
#include <Xm/AtomMgr.h>
#endif /* WSM */
/*
* include extern functions
@@ -114,7 +112,6 @@ GetNormalHints(
* ICCC_CURRENT version: nitems = PROP_SIZE_HINTS_ELEMENTS
*/
#ifdef WSM
if ((!HasProperty (pCD, XA_WM_NORMAL_HINTS)) ||
((Success != XGetWindowProperty (DISPLAY, pCD->client,
XA_WM_NORMAL_HINTS, 0L, (long)PROP_SIZE_HINTS_ELEMENTS,
@@ -123,15 +120,6 @@ GetNormalHints(
(actualType != XA_WM_SIZE_HINTS) ||
(nitems < (PROP_SIZE_HINTS_ELEMENTS - 3)) ||
(actualFormat != 32)))
#else /* WSM */
if ((Success != XGetWindowProperty (DISPLAY, pCD->client,
XA_WM_NORMAL_HINTS, 0L, (long)PROP_SIZE_HINTS_ELEMENTS,
False, XA_WM_SIZE_HINTS, &actualType, &actualFormat,
&nitems, &leftover, (unsigned char **)&property)) ||
(actualType != XA_WM_SIZE_HINTS) ||
(nitems < (PROP_SIZE_HINTS_ELEMENTS - 3)) ||
(actualFormat != 32))
#endif /* WSM */
{
/*
* Indicate no property values were retrieved:
@@ -259,11 +247,9 @@ void ProcessWmProtocols (ClientData *pCD)
*/
#ifndef ICCC_COMPLIANT
#ifdef WSM
if (!HasProperty (pCD, wmGD.xa_WM_PROTOCOLS))
rValue = -1;
else
#endif /* WSM */
rValue = XGetWindowProperty (DISPLAY, pCD->client, wmGD.xa_WM_PROTOCOLS, 0L,
(long)MAX_CLIENT_PROTOCOL_COUNT, False, AnyPropertyType,
&actualType, &actualFormat, &nitems, &leftover,
@@ -272,11 +258,9 @@ void ProcessWmProtocols (ClientData *pCD)
if ((rValue != Success) || (actualType == None) || (actualFormat != 32))
#else
#ifdef WSM
if (!HasProperty (pCD, wmGD.xa_WM_PROTOCOLS))
rValue = -1;
else
#endif /* WSM */
rValue = XGetWMProtocols (DISPLAY, pCD->client,
(Atom **)&property, &nitems);
@@ -384,11 +368,9 @@ void ProcessMwmMessages (ClientData *pCD)
* Read the _MWM_MESSAGES property.
*/
#ifdef WSM
if (!HasProperty (pCD, wmGD.xa_MWM_MESSAGES))
rValue = ~Success;
else
#endif /* WSM */
rValue = XGetWindowProperty (DISPLAY, pCD->client, wmGD.xa_MWM_MESSAGES, 0L,
(long)MAX_MWM_MESSAGES_COUNT, False, AnyPropertyType,
&actualType, &actualFormat, &nitems, &leftover,
@@ -481,8 +463,7 @@ void SetMwmInfo (Window propWindow, long flags, Window wmWindow)
} /* END OF FUNCTION SetMwmInfo */
#ifdef WSM
/*************************************<->*************************************
*
* SetMwmSaveSessionInfo (wmWindow)
@@ -517,7 +498,7 @@ void SetMwmSaveSessionInfo (Window wmWindow)
SetWMState(wmWindow, NORMAL_STATE, 0);
} /* END OF FUNCTION SetMwmSaveSessionInfo */
#endif /* WSM */
/*************************************<->*************************************
@@ -667,11 +648,9 @@ GetMwmHints(
unsigned long leftover;
#ifdef WSM
if (!HasProperty(pCD, wmGD.xa_MWM_HINTS))
ret_val = ~Success;
else
#endif /* WSM */
ret_val = XGetWindowProperty (DISPLAY, pCD->client, wmGD.xa_MWM_HINTS,
0L, PROP_MWM_HINTS_ELEMENTS,
False, wmGD.xa_MWM_HINTS,
@@ -1103,7 +1082,6 @@ GetMwmMenuItems(
} /* END OF FUNCTION GetMwmMenuItems */
#ifdef WSM
/*************************************<->*************************************
@@ -1955,7 +1933,7 @@ HasProperty (
return (bFound);
} /* END OF FUNCTION HasProperty */
#endif /* WSM */