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

Remove ancient HP VUE compatibility support

Browse Source
This commit is contained in:
wmoxam
2019-10-14 09:39:50 -04:00
committed by Jon Trulson
parent 4107a1b6be
commit de81a5b518
10 changed files with 2 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cde/programs/dtwm/README
View File

@@ -57,9 +57,6 @@ header file include flags, and macros (e.g. ABS).
over window icons. I suspect that this is not completely
implemented.
HP_VUE
This enables code that provides compatibility with HP_VUE.
ICCC_COMPLIANT
This enables stricter ICCCM compliance. Specifically, some
clients didn't get WM_PROTOCOLS quite right.

5
cde/programs/dtwm/WmBackdrop.c
View File

@@ -615,9 +615,6 @@ SetNewBackdrop(
ChangeBackdrop (pWS);
SaveWorkspaceResources (pWS, WM_RES_BACKDROP_IMAGE);
#ifdef HP_VUE
UpdateWorkspaceInfoProperty (pWS->pSD); /* to be backward compatible */
#endif /* HP_VUE */
SetWorkspaceInfoProperty (pWS);
/*
@@ -627,7 +624,7 @@ SetNewBackdrop(
DtWSM_REASON_BACKDROP);
}
/******************************<->*************************************
*
* Boolean IsBackdropWindow (pSD, win)

5
cde/programs/dtwm/WmInitWs.c
View File

@@ -1079,11 +1079,6 @@ void InitWmGlobal (int argc, char *argv [], char *environ [])
MapIconBoxes (pSD->pActiveWS);
ChangeBackdrop (pSD->pActiveWS);
#ifdef HP_VUE
UpdateWorkspaceInfoProperty (pSD); /* backward compatible */
#endif /* HP_VUE */
SetCurrentWorkspaceProperty (pSD);
SetWorkspaceListProperty (pSD);

31
cde/programs/dtwm/WmProperty.c
View File

@@ -1197,38 +1197,7 @@ void SetEmbeddedClientsProperty (Window propWindow,
} /* END OF FUNCTION SetEmbeddedClientsProperty */
#ifdef HP_VUE
/*************************************<->*************************************
*
* SetWorkspaceInfo (propWindow, pWsInfo, cInfo)
*
*
* Description:
* -----------
* This function sets up the _DT_WORKSPACE_INFO property
*
*
* Inputs:
* ------
* propWindow = window on which the _DT_WORKSPACE_INFO property is to be set
* pWsInfo = pointer to workspace info data
* cInfo = size of workspace info data
*
*
*************************************<->***********************************/
void SetWorkspaceInfo (Window propWindow, WorkspaceInfo *pWsInfo, unsigned long cInfo)
{
XChangeProperty (DISPLAY, propWindow, wmGD.xa_DT_WORKSPACE_INFO,
wmGD.xa_DT_WORKSPACE_INFO,
32, PropModeReplace, (unsigned char *)pWsInfo,
(cInfo * sizeof(WorkspaceInfo))/sizeof(long));
} /* END OF FUNCTION SetWorkspaceInfo */
#endif /* HP_VUE */
/*************************************<->*************************************
*
* SetWorkspaceListProperty (pSD)

3
cde/programs/dtwm/WmProperty.h
View File

@@ -49,9 +49,6 @@ extern MenuItem * GetMwmMenuItems (ClientData *pCD);
extern void SetEmbeddedClientsProperty (Window propWindow, Window *pEmbeddedClients, unsigned long cEmbeddedClients);
extern void GetInitialPropertyList (ClientData *pCD);
extern Status GetWorkspaceHints (Display *display, Window window, Atom **ppWsAtoms, unsigned int *pCount, Boolean *pbAll);
#ifdef HP_VUE
extern void SetWorkspaceInfo (Window propWindow, WorkspaceInfo *pWsInfo, unsigned long cInfo);
#endif /* HP_VUE */
extern void SetWorkspacePresence (Window propWindow, Atom *pWsPresence, unsigned long cPresence);
extern Boolean HasProperty(ClientData *pCD, Atom property);
extern void DiscardInitialPropertyList (ClientData *pCD);

107
cde/programs/dtwm/WmWrkspace.c
View File

@@ -240,10 +240,6 @@ ChangeToWorkspace(
ShowPresenceBox(pSD->presence.pCDforClient, F_CONTEXT_ICON);
}
#ifdef HP_VUE
/* sync up workspace info property with current state */
UpdateWorkspaceInfoProperty (pSD);
#endif /* HP_VUE */
SetCurrentWorkspaceProperty (pSD);
/* send workspace change broadcast message */
@@ -305,9 +301,6 @@ ChangeWorkspaceTitle(
* Replace old workspace in info property
*/
SetWorkspaceInfoProperty (pWS);
#ifdef HP_VUE
UpdateWorkspaceInfoProperty (pWS->pSD);
#endif /* HP_VUE */
XFlush (DISPLAY);
/*
@@ -391,83 +384,7 @@ UpdateWorkspacePresenceProperty(
} /* END OF FUNCTION UpdateWorkspacePresenceProperty */
#ifdef HP_VUE
/*************************************<->*************************************
*
* UpdateWorkspaceInfoProperty (pSD)
*
*
* Description:
* -----------
* This function updates the _DT_WORKSPACE_INFO property for the
* screen
*
* Inputs:
* ------
* pSD = pointer to screen data
*
*
*************************************<->***********************************/
void
UpdateWorkspaceInfoProperty(
WmScreenData *pSD )
{
WorkspaceInfo *pWsInfo;
WmWorkspaceData *pws;
int count;
if (wmGD.useStandardBehavior)
{
/*
* Don't change any workspace properties in standard behavior
* mode.
*/
return;
}
if (pWsInfo = (WorkspaceInfo *)
XtMalloc (pSD->numWorkspaces * sizeof(WorkspaceInfo)))
{
/* put current workspace at top of list */
pWsInfo[0].workspace = pSD->pActiveWS->id;
pWsInfo[0].backgroundWindow = pSD->pActiveWS->backdrop.window;
pWsInfo[0].bg = pSD->pActiveWS->backdrop.background;
pWsInfo[0].fg = pSD->pActiveWS->backdrop.foreground;
pWsInfo[0].backdropName = pSD->pActiveWS->backdrop.nameAtom;
/* add in the rest of the workspaces */
pws = pSD->pWS;
for (count = 1; count < pSD->numWorkspaces; count++)
{
if (pWsInfo[0].workspace == pws->id)
pws++; /* already at top, skip this one */
pWsInfo[count].workspace = pws->id;
pWsInfo[count].backgroundWindow = pws->backdrop.window;
pWsInfo[count].bg = pws->backdrop.background;
pWsInfo[count].fg = pws->backdrop.foreground;
pWsInfo[count].backdropName = pws->backdrop.nameAtom;
pws++;
}
/* set the property */
SetWorkspaceInfo (pSD->wmWorkspaceWin, pWsInfo,
pSD->numWorkspaces);
XtFree ((char *)pWsInfo);
}
else
{
Warning (((char *)GETMESSAGE(76, 3, "Insufficient memory to update workspace info")));
}
} /* END OF FUNCTION UpdateWorkspaceInfoProperty */
#endif /* HP_VUE */
/*************************************<->*************************************
*
* AddPersistentWindow (pWS)
@@ -848,9 +765,6 @@ ProcessDtWmHints (ClientData *pCD)
{
DtWmHints *pHints;
Atom property;
#ifdef HP_VUE
Atom propertyVUE;
#endif /* HP_VUE */
long saveFunctions;
/*
@@ -858,16 +772,9 @@ ProcessDtWmHints (ClientData *pCD)
*/
property = XmInternAtom(DISPLAY, _XA_DT_WM_HINTS, False);
#ifdef HP_VUE
propertyVUE = XmInternAtom(DISPLAY, _XA_VUE_WM_HINTS, False);
#endif /* HP_VUE */
if (
#ifdef HP_VUE
((HasProperty (pCD, property)) || (HasProperty (pCD, propertyVUE)))
#else /* HP_VUE */
(HasProperty (pCD, property))
#endif /* HP_VUE */
&& (_DtWsmGetDtWmHints (DISPLAY, pCD->client, &pHints) == Success))
{
pCD->clientFlags |= GOT_DT_WM_HINTS;
@@ -997,14 +904,7 @@ GetClientWorkspaceInfo(
GetMyOwnPresence (pCD, &pIDs, &numIDs)) ||
(WorkspaceIsInCommand (DISPLAY, pCD, &pIDs, &numIDs)) ||
(
#ifdef HP_VUE
(HasProperty (pCD, wmGD.xa_DT_WORKSPACE_HINTS) ||
HasProperty (pCD,
XmInternAtom (DISPLAY, _XA_VUE_WORKSPACE_HINTS,
False)))
#else /* HP_VUE */
HasProperty (pCD, wmGD.xa_DT_WORKSPACE_HINTS)
#endif /* HP_VUE */
&& (GetWorkspaceHints (DISPLAY, pCD->client, &pIDs, &numIDs, &bAll) ==
Success))) &&
numIDs)
@@ -3306,14 +3206,7 @@ GetMyOwnPresence(
* Get the workspace presence property
*/
if (
#ifdef HP_VUE
(HasProperty (pCD, wmGD.xa_DT_WORKSPACE_PRESENCE) ||
HasProperty (pCD,
XmInternAtom (DISPLAY, _XA_VUE_WORKSPACE_PRESENCE,
False)))
#else /* HP_VUE */
HasProperty (pCD, wmGD.xa_DT_WORKSPACE_PRESENCE)
#endif /* HP_VUE */
&& (DtWsmGetWorkspacesOccupied (DISPLAY, pCD->client, ppIDs,
&nIDs) == Success))
{

4
cde/programs/dtwm/WmWrkspace.h
View File

@@ -39,10 +39,6 @@ extern Boolean DuplicateWorkspaceName (
int num);
extern void UpdateWorkspacePresenceProperty(
ClientData *pCD) ;
#ifdef HP_VUE
extern void UpdateWorkspaceInfoProperty(
WmScreenData *pSD) ;
#endif /* HP_VUE */
extern WmWorkspaceData * CreateWorkspace(
WmScreenData *pSD,
unsigned char *name) ;