Ok, two more removal patches:
1) Remove HP_VUE compatibility ifdefs
2) Remove `notdef` ifdefs
On Mon, Oct 14, 2019 at 5:36 PM Wesley Moxam <wesley.mo...@gmail.com> wrote:
> Here are 3 more removal patches:
>
> 1) HP_EXTENSIONS is for HPUX systems. It doesn't seemed to be used anymore.
> 2) `legacysun` is presumably for older sun systems. I doubt anyone is
> using it
> 3) `oldcode` seems to be a name that was used to comment out old code.
>
>
> On Mon, Oct 14, 2019 at 10:16 AM Wesley Moxam <wesley.mo...@gmail.com>
> wrote:
>
>> This is the first of a series of patches to remove dead code. There seems
>> to be a decent amount of half finished code that's omitted via ifdef, it'll
>> be good to remove it.
>>
>> -- W
>>
>
From da91aa6cba51943843c969033122e5e919978494 Mon Sep 17 00:00:00 2001
From: wmoxam <w...@wmoxam.com>
Date: Mon, 14 Oct 2019 09:39:50 -0400
Subject: [PATCH] Remove ancient HP VUE compatibility support
---
cde/lib/DtSvc/DtUtil1/GetVWmHint.c | 67 ------------------
cde/lib/DtSvc/DtUtil1/WmWsOccupy.c | 92 -------------------------
cde/lib/DtSvc/DtUtil1/WsmP.h | 89 +-----------------------
cde/programs/dtwm/README | 3 -
cde/programs/dtwm/WmBackdrop.c | 5 +-
cde/programs/dtwm/WmInitWs.c | 5 --
cde/programs/dtwm/WmProperty.c | 31 ---------
cde/programs/dtwm/WmProperty.h | 3 -
cde/programs/dtwm/WmWrkspace.c | 107 -----------------------------
cde/programs/dtwm/WmWrkspace.h | 4 --
10 files changed, 2 insertions(+), 404 deletions(-)
diff --git a/cde/lib/DtSvc/DtUtil1/GetVWmHint.c b/cde/lib/DtSvc/DtUtil1/GetVWmHint.c
index b1701e6f..0cc7d5c7 100644
--- a/cde/lib/DtSvc/DtUtil1/GetVWmHint.c
+++ b/cde/lib/DtSvc/DtUtil1/GetVWmHint.c
@@ -86,10 +86,6 @@ _DtWsmGetDtWmHints(
unsigned long leftover, items, length;
int rcode;
Atom property;
-#ifdef HP_VUE
- unsigned long oldlength;
-#endif /* HP_VUE */
-
property = XmInternAtom(display, _XA_DT_WM_HINTS, False);
length = sizeof (DtWmHints) / sizeof (long);
@@ -121,69 +117,6 @@ _DtWsmGetDtWmHints(
*ppDtWmHints = NULL;
}
}
-#ifdef HP_VUE
- else {
- /*
- * Didn't get the Dt hints, try to get the Vue hints.
- * Not that the Vue hints had the same structure, just
- * under a different property name.
- */
- property = XmInternAtom(display, _XA_VUE_WM_HINTS, False);
- /*
- * Property previously existed without attachWindow.
- */
- oldlength = length - (sizeof(Window)/sizeof(long));
-
- *ppDtWmHints = NULL;
- if ((rcode=XGetWindowProperty(
- display,
- window,
- property,
- 0L, /* offset */
- length,
- False, /* delete */
- property, /* req_type */
- &actualType,
- &actualFormat,
- &items, /* items returned */
- &leftover,
- (unsigned char **)ppDtWmHints))==Success)
- {
-
- if ((actualType != property) ||
- (items < oldlength))
- {
- /* wrong type, force failure */
- rcode = BadValue;
- if (actualType != None)
- {
- XFree ((char *)*ppDtWmHints);
- }
- *ppDtWmHints = NULL;
- }
-
- if (*ppDtWmHints && (items < length))
- {
- DtWmHints *pvh;
-
- /* assume old property, return full sized
- property with empty values */
- pvh = (DtWmHints *) malloc (length * sizeof (long));
-
- pvh->flags = (*ppDtWmHints)->flags;
- pvh->functions = (*ppDtWmHints)->functions;
- pvh->behaviors = (*ppDtWmHints)->behaviors;
- pvh->attachWindow = NULL;
-
- XFree ((char *) *ppDtWmHints);
-
- *ppDtWmHints = pvh;
- }
- }
- }
-#endif /* HP_VUE */
-
return(rcode);
-
} /* END OF FUNCTION _DtWsmGetDtWmHints */
diff --git a/cde/lib/DtSvc/DtUtil1/WmWsOccupy.c b/cde/lib/DtSvc/DtUtil1/WmWsOccupy.c
index f2542bb7..c19a91cd 100644
--- a/cde/lib/DtSvc/DtUtil1/WmWsOccupy.c
+++ b/cde/lib/DtSvc/DtUtil1/WmWsOccupy.c
@@ -77,14 +77,6 @@ static int _GetWorkspacesOccupied(
Atom **ppaWs,
unsigned long *pNumWs,
Atom property) ;
-#ifdef HP_VUE
-static int _GetWorkspacePresence(
- Display *display,
- Window window,
- Atom **ppWsPresence,
- unsigned long *pNumPresence,
- Atom property ) ;
-#endif /* HP_VUE */
/******** End Static Function Declarations ********/
@@ -159,79 +151,7 @@ _GetWorkspacesOccupied(
} /* END OF FUNCTION GetWorkspacesOccupied */
-#ifdef HP_VUE
-
-/*************************************<->*************************************
- *
- * int _GetWorkspacePresence (display, window, ppWsPresence,
- * pNumPresence, property)
- *
- *
- * Description:
- * -----------
- * Get the contents of the _DT_WORKSPACE_PRESENCE property on a window
- *
- *
- * Inputs:
- * ------
- * display - display
- * window - window to get hints from
- * ppWsPresence - pointer to a pointer to return
- * pNumPresence - pointer to a number to return
- * property - the property atom
- *
- * Outputs:
- * --------
- * *ppWsPresence - points to the list of workspace info structures
- * (NOTE: This should be freed using XFree)
- * *pNumPresence - the number of workspace info structure in the list
- * Return - status from XGetWindowProperty
- *
- * Comments:
- * ---------
- * Assumes that less than BUFSIZ bytes will be returned. This code
- * won't work for very large amounts of info (lots of workspaces).
- *
- *************************************<->***********************************/
-static int
-_GetWorkspacePresence(
- Display *display,
- Window window,
- Atom **ppWsPresence,
- unsigned long *pNumPresence,
- Atom property )
-{
- Atom actualType;
- int actualFormat;
- unsigned long leftover;
- int rcode;
- *ppWsPresence = NULL;
- if ((rcode=XGetWindowProperty(display,window,
- property,0L, (long)BUFSIZ,
- False,property,
- &actualType,&actualFormat,
- pNumPresence,&leftover,(unsigned char **)ppWsPresence))==Success)
- {
-
- if (actualType != property)
- {
- /* wrong type, force failure */
- *pNumPresence = 0;
- rcode = BadValue;
- if (actualType != None)
- {
- XFree ((char *)*ppWsPresence);
- }
- }
- }
-
- return(rcode);
-
-} /* END OF FUNCTION GetWorkspacePresence */
-#endif /* HP_VUE */
-
-
/*************************************<->*************************************
*
* int DtWsmGetWorkspacesOccupied (display, window, ppaWs, pNumWs)
@@ -277,18 +197,6 @@ DtWsmGetWorkspacesOccupied(
pNumWs,
XmInternAtom(display, _XA_DT_WORKSPACE_PRESENCE,
False));
-#ifdef HP_VUE
- /*
- * Be compatible with HP VUE
- */
- if (rcode != Success)
- {
- rcode = _GetWorkspacePresence (display, window, ppaWs,
- pNumWs,
- XmInternAtom(display, _XA_VUE_WORKSPACE_PRESENCE,
- False));
- }
-#endif /* HP_VUE */
_DtSvcAppUnlock(app);
return (rcode);
diff --git a/cde/lib/DtSvc/DtUtil1/WsmP.h b/cde/lib/DtSvc/DtUtil1/WsmP.h
index cbf792d4..9d32e116 100644
--- a/cde/lib/DtSvc/DtUtil1/WsmP.h
+++ b/cde/lib/DtSvc/DtUtil1/WsmP.h
@@ -31,8 +31,7 @@
**
** Description: Defines PRIVATE properties, structures, and
** parameters used for communication with the
- ** workspace manager. This also includes some
- ** backward compatibility stuff for HP_VUE.
+ ** workspace manager.
**
** (c) Copyright 1996 Digital Equipment Corporation.
** (c) Copyright 1993,1994,1996 Hewlett-Packard Company.
@@ -162,19 +161,6 @@ typedef struct _DtWmHints
#define DtWM_BEHAVIOR_SUBPANEL (1L << 2)
#define DtWM_BEHAVIOR_SUB_RESTORED (1L << 3)
-#ifdef HP_VUE
-/*
- * For Compatibility with some old HP VUE clients
- */
-#define _XA_VUE_WORKSPACE_INFO "_VUE_WORKSPACE_INFO"
-#define _XA_VUE_WORKSPACE_HINTS "_VUE_WORKSPACE_HINTS"
-#define _XA_VUE_WORKSPACE_PRESENCE "_VUE_WORKSPACE_PRESENCE"
-#define _XA_VUE_WM_REQUEST "_VUE_WM_REQUEST"
-#define _XA_VUE_WM_HINTS "_VUE_WM_HINTS"
-#endif /* HP_VUE */
-
-
-
/**********************************************************************
* Session atom names
**********************************************************************/
@@ -261,29 +247,6 @@ typedef void (*DtWsmMarqueeSelectionProc) ();
* NOTE: The "(client -> dtwm)" indication calls out the direction
* of information flow. In this case, the client writes the
* property and dtwm reads the property.
- *
- */
-#ifdef HP_VUE
-/*
- * %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- * % _VUE_WORKSPACE_INFO is obsolete, but maintained for %
- * % backward compatiblity. Its function has been %
- * % replaced by %
- * % _DT_WORKSPACE_LIST %
- * % _DT_WORKSPACE_INFO_<name> %
- * %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- * _VUE_WORKSPACE_INFO (dtwm -> client)
- *
- * This property is a list of structures that contain information
- * on each workspace. Each structure contains the atom representing
- * the workspace string name and the window id of the background
- * window for the workspace (if any). The first workspace in the
- * list is the "active" workspace for the screen. This property is
- * placed on the window identified by the "wmWindow" member of
- * the _MOTIF_WM_INFO property.
- */
-#endif /* HP_VUE */
-/*
*
* _DT_WM_REQUEST (client -> dtwm)
*
@@ -329,21 +292,6 @@ typedef struct _DtWorkspaceHints
/* DtWorkspaceHints "wsflags" definitions */
#define DT_WORKSPACE_FLAGS_OCCUPY_ALL (1L << 0)
-
-#ifdef HP_VUE
-/*
- * Obsolete WorkspaceInfo structure
- */
-typedef struct _WorkspaceInfo
-{
- Atom workspace; /* workspace "name" */
- Window backgroundWindow; /* backdrop window ID (if any) */
- unsigned long bg; /* backdrop background pixel */
- unsigned long fg; /* backdrop foreground pixel */
- Atom backdropName; /* atomized name for backdrop */
-} WorkspaceInfo;
-#endif /* HP_VUE */
-
/**********************************************************************
* Marquee Selection Structures
**********************************************************************/
@@ -390,41 +338,6 @@ struct _DtWsmCBContext
* Convenience Routines
**********************************************************************/
-#ifdef HP_VUE
-/*************************************<->*************************************
- *
- * Status DtGetWorkspaceInfo (display, root, ppWsInfo, pNumInfo)
- *
- *
- * Description:
- * -----------
- * Get the contents of the _DT_WORKSPACE_INFO property on a window
- *
- *
- * Inputs:
- * ------
- * display - display
- * root - root window of screen being managed
- * ppWsInfo - pointer to a pointer (to be returned)
- * pNumInfo - pointer to a number (to be returned)
- *
- * Outputs:
- * -------
- * *ppWsInfo - pointer to a list of workspace info structures
- * *pNumInfo - number of workspace info structures in list
- * Return - Success if property fetched ok.
- * Failure returns are from XGetWindowProperty
- *
- *************************************<->***********************************/
-extern Status
-DtGetWorkspaceInfo(
- Display *display,
- Window root,
- WorkspaceInfo **ppWsInfo,
- unsigned long *pNumInfo) ;
-#endif /* HP_VUE */
-
-
/*************************************<->*************************************
*
* int _DtGetMwmWindow (display, root, pMwmWindow)
diff --git a/cde/programs/dtwm/README b/cde/programs/dtwm/README
index 3ab2d969..7960d1fc 100644
--- a/cde/programs/dtwm/README
+++ b/cde/programs/dtwm/README
@@ -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.
diff --git a/cde/programs/dtwm/WmBackdrop.c b/cde/programs/dtwm/WmBackdrop.c
index 4cdfac56..57fa77fd 100644
--- a/cde/programs/dtwm/WmBackdrop.c
+++ b/cde/programs/dtwm/WmBackdrop.c
@@ -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)
diff --git a/cde/programs/dtwm/WmInitWs.c b/cde/programs/dtwm/WmInitWs.c
index f902586e..fc3be949 100644
--- a/cde/programs/dtwm/WmInitWs.c
+++ b/cde/programs/dtwm/WmInitWs.c
@@ -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);
diff --git a/cde/programs/dtwm/WmProperty.c b/cde/programs/dtwm/WmProperty.c
index 5cde076f..30a084dd 100644
--- a/cde/programs/dtwm/WmProperty.c
+++ b/cde/programs/dtwm/WmProperty.c
@@ -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)
diff --git a/cde/programs/dtwm/WmProperty.h b/cde/programs/dtwm/WmProperty.h
index a7c24c43..389033cd 100644
--- a/cde/programs/dtwm/WmProperty.h
+++ b/cde/programs/dtwm/WmProperty.h
@@ -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);
diff --git a/cde/programs/dtwm/WmWrkspace.c b/cde/programs/dtwm/WmWrkspace.c
index 29693dbb..38cfd769 100644
--- a/cde/programs/dtwm/WmWrkspace.c
+++ b/cde/programs/dtwm/WmWrkspace.c
@@ -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))
{
diff --git a/cde/programs/dtwm/WmWrkspace.h b/cde/programs/dtwm/WmWrkspace.h
index 18366579..ebb5738a 100644
--- a/cde/programs/dtwm/WmWrkspace.h
+++ b/cde/programs/dtwm/WmWrkspace.h
@@ -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) ;
--
2.23.0
From 55e36c890f41652b80377d6077fa259e872f0780 Mon Sep 17 00:00:00 2001
From: wmoxam <w...@wmoxam.com>
Date: Sun, 13 Oct 2019 23:33:24 -0400
Subject: [PATCH] 'notdef' means it's not used, so we remove it
---
cde/lib/DtHelp/GifUtils.c | 24 ----------
cde/lib/pam/examples/login/login.c | 11 -----
.../tt/bin/ttdbserverd/db_server_functions.C | 33 -------------
cde/lib/tt/lib/api/c/api_filemap.C | 30 ------------
cde/lib/tt/lib/db/tt_db_client.C | 5 --
cde/lib/tt/lib/util/tt_file_system.C | 15 ------
cde/lib/tt/lib/util/tt_host_equiv.C | 39 ---------------
cde/lib/tt/lib/util/tt_path.C | 48 -------------------
cde/programs/dtcm/dtcm/calendarA.c | 21 --------
cde/programs/dtlogin/choose.c | 28 -----------
cde/programs/dtlogin/xdmauth.c | 9 ----
cde/programs/dtmail/dtmail/DtMailEditor.C | 26 ----------
cde/programs/dtterm/DtTermMain.c | 9 ----
cde/programs/dtwm/README | 5 --
cde/programs/dtwm/WmResource.c | 24 ----------
15 files changed, 327 deletions(-)
diff --git a/cde/lib/DtHelp/GifUtils.c b/cde/lib/DtHelp/GifUtils.c
index 003928fe..666d899e 100644
--- a/cde/lib/DtHelp/GifUtils.c
+++ b/cde/lib/DtHelp/GifUtils.c
@@ -245,31 +245,7 @@ DoExtension(byte **inbuf, int label, GifState *g)
switch (label) {
case 0x01: /* Plain Text Extension */
str = "Plain Text Extension";
-#ifdef notdef
- if (GetDataBlock(inbuf, (unsigned char*) buf, g) == 0)
- ;
-
- lpos = LM_to_uint(buf[0], buf[1]);
- tpos = LM_to_uint(buf[2], buf[3]);
- width = LM_to_uint(buf[4], buf[5]);
- height = LM_to_uint(buf[6], buf[7]);
- cellw = buf[8];
- cellh = buf[9];
- foreground = buf[10];
- background = buf[11];
-
- while (GetDataBlock(inbuf, (unsigned char*) buf, g) != 0) {
- PPM_ASSIGN(image[ypos][xpos],
- cmap[CM_RED][v],
- cmap[CM_GREEN][v],
- cmap[CM_BLUE][v]);
- ++index;
- }
-
- return FALSE;
-#else
break;
-#endif
case 0xff: /* Application Extension */
str = "Application Extension";
break;
diff --git a/cde/lib/pam/examples/login/login.c b/cde/lib/pam/examples/login/login.c
index 0570a5f9..ffe28b0f 100644
--- a/cde/lib/pam/examples/login/login.c
+++ b/cde/lib/pam/examples/login/login.c
@@ -624,17 +624,6 @@ donothing(int sig)
pam_end(pamh, PAM_ABORT);
}
-#ifdef notdef
-static int intrupt;
-
-/*ARGSUSED*/
-static void
-catch(int sig)
-{
- ++intrupt;
-}
-#endif
-
/*
* *** Bad login logging support ***
*/
diff --git a/cde/lib/tt/bin/ttdbserverd/db_server_functions.C b/cde/lib/tt/bin/ttdbserverd/db_server_functions.C
index 55a9f918..d71b4f55 100644
--- a/cde/lib/tt/bin/ttdbserverd/db_server_functions.C
+++ b/cde/lib/tt/bin/ttdbserverd/db_server_functions.C
@@ -1832,24 +1832,12 @@ extern char * _tt_status_message(Tt_status s);
_tt_file_netfile_results *
_tt_file_netfile_1 (_tt_file_netfile_args *args, SVCXPRT * /* transp */)
{
-
-#ifdef notdef
-printf("DEBUG: SERVER: _tt_file_netfile_1: calling _tt_file_netfile(%s)\n",
- (char *) args->file_or_netfile);
-#endif
-
static _tt_file_netfile_results results;
static char * canonical_path;
// we have a netfilename, get the local file version...
canonical_path = _tt_file_netfile(args->file_or_netfile);
-#ifdef notdef
-printf("DEBUG: SERVER: _tt_file_netfile_1: _tt_file_netfile(%s) returned %s\n",
- args->file_or_netfile, canonical_path);
-#endif
-
-
if (_tt_pointer_error(canonical_path) != TT_OK) {
results.results = TT_DB_ERR_ILLEGAL_FILE;
results.result_string = NULL;
@@ -1859,11 +1847,6 @@ printf("DEBUG: SERVER: _tt_file_netfile_1: _tt_file_netfile(%s) returned %s\n",
}
results.tt_status = (int) _tt_pointer_error(canonical_path);
-#ifdef notdef
-printf("\t results.tt_status == %s\n",
- _tt_status_message(_tt_pointer_error(canonical_path)));
-#endif
-
return &results;
}
@@ -1873,23 +1856,12 @@ printf("\t results.tt_status == %s\n",
_tt_file_netfile_results *
_tt_netfile_file_1 (_tt_file_netfile_args *args, SVCXPRT * /* transp */)
{
-
-#ifdef notdef
-printf("DEBUG: SERVER: _tt_netfile_file_1: calling _tt_netfile_file(%s)\n",
- (char *) args->file_or_netfile);
-#endif
-
static _tt_file_netfile_results results;
static char * canonical_path;
// we have a netfilename, get the local file version...
canonical_path = _tt_netfile_file(args->file_or_netfile);
-#ifdef notdef
-printf("DEBUG: SERVER: _tt_netfile_file_1: _tt_netfile_file(%s) returned %s\n",
- args->file_or_netfile, canonical_path);
-#endif
-
if (_tt_pointer_error(canonical_path) != TT_OK) {
results.results = TT_DB_ERR_ILLEGAL_FILE;
results.result_string = NULL;
@@ -1899,11 +1871,6 @@ printf("DEBUG: SERVER: _tt_netfile_file_1: _tt_netfile_file(%s) returned %s\n",
}
results.tt_status = (int) _tt_pointer_error(canonical_path);
-#ifdef notdef
-printf("\t results.tt_status == %s\n",
- _tt_status_message(_tt_pointer_error(canonical_path)));
-#endif
-
return &results;
}
diff --git a/cde/lib/tt/lib/api/c/api_filemap.C b/cde/lib/tt/lib/api/c/api_filemap.C
index 16536986..7efdb03b 100644
--- a/cde/lib/tt/lib/api/c/api_filemap.C
+++ b/cde/lib/tt/lib/api/c/api_filemap.C
@@ -170,10 +170,6 @@ _tt_host_file_netfile(const char * host, const char * filename)
_Tt_host_equiv_ptr eq_p = new _Tt_host_equiv;
if (eq_p->hostname_equiv(hostname, local_host) == 1) {
-#ifdef notdef
-printf("DEBUG _tt_host_file_netfile: resolving locally.\n");
-#endif
-
// strdup already done in _tt_netfile_file()
return _tt_file_netfile(filename);
}
@@ -234,10 +230,6 @@ _tt_host_netfile_file(const char * host, const char * netfilename)
_Tt_host_equiv_ptr eq_p = new _Tt_host_equiv;
if (eq_p->hostname_equiv(hostname, local_host) == 1) {
-#ifdef notdef
-printf("DEBUG _tt_host_netfile_file: resolving locally.\n");
-#endif
-
// strdup already done in _tt_netfile_file()
return _tt_netfile_file(netfilename);
}
@@ -385,11 +377,6 @@ set_filename(const _Tt_string & filename)
// Now get the network path of the file.
tmp_string = _tt_local_network_path(absolute_path);
-#ifdef notdef
-printf("DEBUG set_filename: _tt_local_network_path(%s) returned %s\n",
- (char *) absolute_path, (char *) tmp_string);
-#endif
-
_lpath = absolute_path; // what we know the file as.
// load hostname and rpath simultaneously
@@ -409,10 +396,6 @@ printf("DEBUG set_filename: _tt_local_network_path(%s) returned %s\n",
_canonical_path = _canonical_path.cat(_hostname).cat(_rpath).cat(_lpath);
-#ifdef notdef
-printf("DEBUG set_filename: _canonical_path == %s\n", (char *) _canonical_path);
-#endif
-
return _canonical_path;
}
@@ -465,27 +448,14 @@ parse_netfilename(const _Tt_string & canonical_name)
_canonical_path = canonical_name;
-#ifdef notdef
- printf("DEBUG parse_netfilename: _canonical_path == %s\n", (char *) _canonical_path);
-#endif
-
tmp_string = _canonical_path.split(':', dummy);
_hostname = tmp_string.mid(h_begin, h_end - h_begin + 1);
_rpath = tmp_string.mid(r_begin, r_end - r_begin + 1);
-#ifdef notdef
- printf("DEBUG parse_netfilename: _rpath == %s\n", (char *) _rpath);
-#endif
-
_lpath = tmp_string.mid(l_begin, l_end - l_begin + 1);
-#ifdef notdef
- printf("DEBUG parse_netfilename: _lpath == %s\n", (char *) _lpath);
-#endif
-
-
return _canonical_path;
}
diff --git a/cde/lib/tt/lib/db/tt_db_client.C b/cde/lib/tt/lib/db/tt_db_client.C
index 70303fce..f6f3812a 100644
--- a/cde/lib/tt/lib/db/tt_db_client.C
+++ b/cde/lib/tt/lib/db/tt_db_client.C
@@ -303,11 +303,6 @@ _Tt_db_results _Tt_db_client::connectToDB (const _Tt_string &hostname)
void _Tt_db_client::
SetError(enum clnt_stat cf_stat)
{
-
-#ifdef notdef
-printf("DEBUG _Tt_db_client::SetError() -- cf_stat == %d\n", cf_stat);
-#endif /* notdef */
-
switch (cf_stat) {
case RPC_PROGNOTREGISTERED:
case RPC_AUTHERROR:
diff --git a/cde/lib/tt/lib/util/tt_file_system.C b/cde/lib/tt/lib/util/tt_file_system.C
index e30c73d7..7973315c 100644
--- a/cde/lib/tt/lib/util/tt_file_system.C
+++ b/cde/lib/tt/lib/util/tt_file_system.C
@@ -371,29 +371,14 @@ findMountEntry (const _Tt_string &network_path)
while (entries_cursor.next()) {
current_hostname = entries_cursor->getHostname();
-#ifdef notdef
-printf("DEBUG findMountEntry: hostname = %s, current_hostname = %s\n",
- (char *) hostname, (char *) current_hostname);
-#endif
-
if (eq_p->hostname_equiv(hostname, current_hostname) == 1) {
current_partition = entries_cursor->getPartition();
current_partition_length = current_partition.len();
-#ifdef notdef
-printf("DEBUG findMountEntry: found hostname equivalence between %s and %s\n",
- (char *) hostname, (char *) current_hostname);
-#endif
-
if (path_length >= current_partition_length) {
if (!memcmp((char *)path, (char *)current_partition,
current_partition_length)) {
entry = *entries_cursor;
-#ifdef notdef
-printf("DEBUG findMountEntry: found PATH equivalence between %s and %s\n",
- (char *) hostname, (char *) current_hostname);
-#endif
-
break;
}
}
diff --git a/cde/lib/tt/lib/util/tt_host_equiv.C b/cde/lib/tt/lib/util/tt_host_equiv.C
index b0eac0da..9778fa34 100644
--- a/cde/lib/tt/lib/util/tt_host_equiv.C
+++ b/cde/lib/tt/lib/util/tt_host_equiv.C
@@ -108,11 +108,6 @@ prefix_host(const _Tt_string & host, const _Tt_string & localhost)
_Tt_string h_prefix = host, l_prefix = localhost,
h, l, rpart_host, rpart_localhost;
-#ifdef notdef
-printf("DEBUG prefix_host: host = %s, localhost = %s\n",
- (char *) host, (char *) localhost);
-#endif
-
while (rpart_host == rpart_localhost) {
h = h_prefix;
l = l_prefix;
@@ -126,9 +121,6 @@ printf("DEBUG prefix_host: host = %s, localhost = %s\n",
rpart_localhost = l.split(j, l_prefix);
}
-#ifdef notdef
-printf("DEBUG prefix_host: returning %s\n", (char *) h);
-#endif
return h;
}
@@ -142,9 +134,6 @@ hostname_equiv(const _Tt_string & host1, const _Tt_string & host2)
{
// First try a simple comparison.
if (host1 == host2) {
-#ifdef notdef
-printf("DEBUG hostname_equiv: host1 == host2, returning 1\n");
-#endif
return 1;
}
@@ -194,10 +183,6 @@ printf("DEBUG hostname_equiv: host1 == host2, returning 1\n");
// so do just one comparison.
if (short_tmp != long_prefix) {
-#ifdef notdef
-printf("DEBUG hostname_equiv: short_tmp %s != long_prefix %s, returning 0\n",
- (char *) short_tmp, (char *) long_prefix);
-#endif
return 0;
}
is_found = 1;
@@ -205,18 +190,11 @@ printf("DEBUG hostname_equiv: short_tmp %s != long_prefix %s, returning 0\n",
}
if (short_prefix != long_prefix) {
-#ifdef notdef
-printf("DEBUG hostname_equiv: short_prefix %s != long_prefix %s, returning 0\n",
- (char *) short_prefix, (char *) long_prefix);
-#endif
return 0;
}
}
if (is_found != 1) {
-#ifdef notdef
-printf("DEBUG hostname_equiv: is_found != 1, returning 0\n");
-#endif
return 0; // no prefix was found
}
@@ -239,9 +217,6 @@ printf("DEBUG hostname_equiv: is_found != 1, returning 0\n");
if (_cache_it(sh, shorthost) == 1) {
_cache_table->insert(sh);
} else {
-#ifdef notdef
-printf("DEBUG hostname_equiv: sh.is_null(): returning 0\n");
-#endif
return 0;
}
}
@@ -253,9 +228,6 @@ printf("DEBUG hostname_equiv: sh.is_null(): returning 0\n");
if (_cache_it(lh, longhost) == 1) {
_cache_table->insert(lh);
} else {
-#ifdef notdef
-printf("DEBUG hostname_equiv: lh.is_null(): returning 0\n");
-#endif
return 0;
}
}
@@ -266,10 +238,6 @@ printf("DEBUG hostname_equiv: lh.is_null(): returning 0\n");
// This will probably never happen but why
// not be careful?
if (sh->addr_length != lh->addr_length) {
-#ifdef notdef
-printf("DEBUG hostname_equiv: sh->addr_length %d != h->addr_length %d, returning 0\n",
- sh->addr_length, lh->addr_length);
-#endif
return 0;
}
@@ -278,17 +246,10 @@ printf("DEBUG hostname_equiv: sh->addr_length %d != h->addr_length %d, returning
while (sh_c.next()) {
while (lh_c.next()) {
-#ifdef notdef
-printf("DEBUG hostname_equiv: checking address at 0x%x w/ 0x%x\n",
- (char *) *sh_c, (char *) *lh_c);
-#endif
// Do the IP addresses match?
if (memcmp((char *) *sh_c, (char *) *lh_c,
sh->addr_length) == 0) {
// success!
-#ifdef notdef
-printf("DEBUG hostname_equiv: found match!\n");
-#endif
return 1;
}
}
diff --git a/cde/lib/tt/lib/util/tt_path.C b/cde/lib/tt/lib/util/tt_path.C
index 6aebf77f..7cc309c0 100644
--- a/cde/lib/tt/lib/util/tt_path.C
+++ b/cde/lib/tt/lib/util/tt_path.C
@@ -258,90 +258,42 @@ _Tt_string _tt_local_network_path(const _Tt_string &path)
if (path.len()) {
_Tt_string real_path = _tt_realpath(path);
-#ifdef notdef
-printf("DEBUG _tt_local_network_path: real_path initialized to %s\n",
- (char *) real_path);
-#endif
_Tt_file_system file_system;
_Tt_file_system_entry_ptr entry =
file_system.bestMatchToPath(real_path);
_Tt_string hostname = entry->getHostname();
-#ifdef notdef
-printf("DEBUG _tt_local_network_path: hostname = %s\n",
- (char *) hostname);
-#endif
_Tt_string loop_back_mount_point =
entry->getLoopBackMountPoint();
-#ifdef notdef
-printf("DEBUG _tt_local_network_path: loop_back_mount_point = %s\n",
- (char *) loop_back_mount_point == NULL ? "(null)" : (char *) loop_back_mount_point);
-#endif
_Tt_string mount_point;
if (loop_back_mount_point.len() > 0) {
mount_point = loop_back_mount_point;
-#ifdef notdef
-printf("DEBUG _tt_local_network_path: ! isLocal 1: mount_point = %s\n",
- (char *) mount_point);
-#endif
} else {
mount_point = entry->getMountPoint();
-#ifdef notdef
-printf("DEBUG _tt_local_network_path: ! isLocal 2: mount_point = %s\n",
- (char *) mount_point);
-#endif
}
if (entry->isLocal()) {
if (loop_back_mount_point.len() > 0) {
-#ifdef notdef
-printf("DEBUG _tt_local_network_path: isLocal 2: mount_point = %s\n",
- (char *) mount_point);
-#endif
// Get the path info after the loop back
// mount point path.
real_path = real_path.right(real_path.len() -
mount_point.len());
-#ifdef notdef
-printf("DEBUG _tt_local_network_path: isLocal 2: real_path = %s\n",
- (char *) real_path);
-#endif
// Replace the loop back mount point path
// with the mount point path.
if (mount_point != "/") {
real_path = mount_point.cat(real_path);
}
-#ifdef notdef
-printf("DEBUG _tt_local_network_path: isLocal 3: real_path = %s\n",
- (char *) real_path);
-#endif
}
} else {
_Tt_string partition = entry->getPartition();
-#ifdef notdef
-printf("DEBUG _tt_local_network_path: ! isLocal: partition = %s\n",
- (char *) partition);
-#endif
// Get the path info after the mount point path
real_path =
real_path.right(real_path.len()-mount_point.len());
-#ifdef notdef
-printf("DEBUG _tt_local_network_path: ! isLocal: real_path = %s\n",
- (char *) real_path);
-#endif
// Replace the mount point path with the exported
// partition path.
real_path = partition.cat(real_path);
-#ifdef notdef
-printf("DEBUG _tt_local_network_path: ! isLocal: real_path = %s\n",
- (char *) real_path);
-#endif
}
network_path = hostname.cat(":").cat(real_path);
-#ifdef notdef
-printf("DEBUG _tt_local_network_path: network_path = %s\n",
- (char *) network_path);
-#endif
}
return network_path;
diff --git a/cde/programs/dtcm/dtcm/calendarA.c b/cde/programs/dtcm/dtcm/calendarA.c
index c588ff4c..6f079dae 100644
--- a/cde/programs/dtcm/dtcm/calendarA.c
+++ b/cde/programs/dtcm/dtcm/calendarA.c
@@ -2916,27 +2916,6 @@ paint_canvas(
return stat;
}
-#ifdef notdef
-extern char*
-cm_get_relname()
-{
- char s[BUFSIZ];
- static char *CM_name;
-
- /* we now make a composite name for the tool, combining
- * "Calendar Manager" with a release identifier
- */
- if (CM_name == NULL) {
- sprintf(s, "%s", catgets(calendar->DT_catd, 1, 113, "Calendar"));
- CM_name = (char*)ckalloc(cm_strlen(s) + 2);
-
- sprintf(CM_name, "%s", s);
- }
-
- return (char*)CM_name;
-}
-#endif
-
extern Boolean
in_range(time_t start, time_t stop, time_t tick) {
if (tick >= start && tick <= stop)
diff --git a/cde/programs/dtlogin/choose.c b/cde/programs/dtlogin/choose.c
index 4d15008a..ab3cc4db 100644
--- a/cde/programs/dtlogin/choose.c
+++ b/cde/programs/dtlogin/choose.c
@@ -324,34 +324,6 @@ RegisterIndirectChoice (
return 1;
}
-#ifdef notdef
-static void
-RemoveIndirectChoice (clientAddress, connectionType)
- ARRAY8Ptr clientAddress;
- CARD16 connectionType;
-{
- ChoicePtr c, prev;
-
- prev = 0;
- for (c = choices; c; c = c->next)
- {
- if (XdmcpARRAY8Equal (clientAddress, &c->client) &&
- connectionType == c->connectionType)
- {
- if (prev)
- prev->next = c->next;
- else
- choices = c->next;
- XdmcpDisposeARRAY8 (&c->client);
- XdmcpDisposeARRAY8 (&c->choice);
- free ((char *) c);
- return;
- }
- prev = c;
- }
-}
-#endif
-
/*ARGSUSED*/
static void
AddChooserHost (
diff --git a/cde/programs/dtlogin/xdmauth.c b/cde/programs/dtlogin/xdmauth.c
index 375d53b3..585e1f07 100644
--- a/cde/programs/dtlogin/xdmauth.c
+++ b/cde/programs/dtlogin/xdmauth.c
@@ -105,15 +105,6 @@ XdmPrintDataHex(const char *s, const char *a, int l)
Debug ("\n");
}
-#ifdef notdef /* not used */
-XdmPrintKey (s, k)
- char *s;
- XdmAuthKeyRec *k;
-{
- XdmPrintDataHex (s, (char *) k->data, 8);
-}
-#endif
-
#ifdef XDMCP
void
XdmPrintArray8Hex(const char *s, ARRAY8Ptr a)
diff --git a/cde/programs/dtmail/dtmail/DtMailEditor.C b/cde/programs/dtmail/dtmail/DtMailEditor.C
index 28a2780c..0c9be1fc 100644
--- a/cde/programs/dtmail/dtmail/DtMailEditor.C
+++ b/cde/programs/dtmail/dtmail/DtMailEditor.C
@@ -521,32 +521,6 @@ DtMailEditor::attachDragMotionHandler(
}
}
-#ifdef notdef
-void
-DtMailEditor::attachDragSetup()
-{
- Boolean btn1_transfer;
- Widget widget = _myAttachArea->baseWidget();
-
- DebugPrintf(3, "In DtMailEditor::attachDragSetup()\n");
-
- XtAddEventHandler(widget, Button1MotionMask, FALSE,
- (XtEventHandler)&DtMailEditor::attachDragMotionHandler,
- (XtPointer)this);
-
- XtVaGetValues(
- (Widget)XmGetXmDisplay(XtDisplayOfObject(widget)),
- "enableBtn1Transfer", &btn1_transfer,
- NULL);
-
- if (!btn1_transfer) {
- XtAddEventHandler(widget, Button2MotionMask, FALSE,
- (XtEventHandler)&DtMailEditor::attachDragMotionHandler,
- (XtPointer)this);
- }
-}
-#endif
-
void
DtMailEditor::stripCRLF(char **buffer, const char * buf, const unsigned long len)
{
diff --git a/cde/programs/dtterm/DtTermMain.c b/cde/programs/dtterm/DtTermMain.c
index c5486f2e..d6229b54 100644
--- a/cde/programs/dtterm/DtTermMain.c
+++ b/cde/programs/dtterm/DtTermMain.c
@@ -431,9 +431,6 @@ DecrementInstanceCountAndExit(Widget w, XtPointer client_data,
#ifdef TERMINAL_SERVER
if (attrs.standAlone || !attrs.serverId) {
#endif /* TERMINAL_SERVER */
-#ifdef notdef
- if (!attrs.server) {
-#endif /* notdef */
if (InstanceCount <= 0) {
/* use a timeout so that the toolkit can finish killing off
* this widget...
@@ -446,12 +443,6 @@ DecrementInstanceCountAndExit(Widget w, XtPointer client_data,
ServerInstanceTerminated((Widget) client_data);
}
#endif /* TERMINAL_SERVER */
-#ifdef notdef
- } else {
- /* Here is where one would add the call into sunDtTermServer.c
- * implement a "lurking" dtterm server. */
- }
-#endif /* notdef */
}
/***************************************************************************
diff --git a/cde/programs/dtwm/README b/cde/programs/dtwm/README
index 3ab2d969..7dff5b5e 100644
--- a/cde/programs/dtwm/README
+++ b/cde/programs/dtwm/README
@@ -161,8 +161,3 @@ header file include flags, and macros (e.g. ABS).
_NO_WM
Enables testing code in WmPanel.c that allows it to be compiled
with a test program outside of the window manager.
-
- notdef
- Enables more complete resource comparison in WmResource.c which
- could make resource utilization more optimal. This is currently
- turned off to avoid some problems with the pixmap resources.
diff --git a/cde/programs/dtwm/WmResource.c b/cde/programs/dtwm/WmResource.c
index 197ec911..5e6fc557 100644
--- a/cde/programs/dtwm/WmResource.c
+++ b/cde/programs/dtwm/WmResource.c
@@ -6219,29 +6219,6 @@ Boolean SimilarAppearanceData (AppearanceData *pAD1, AppearanceData *pAD2)
{
Boolean rval;
-#ifdef notdef
- if ((pAD1->fontList == pAD2->fontList) &&
- (pAD1->background == pAD2->background) &&
- (pAD1->foreground == pAD2->foreground) &&
- (pAD1->backgroundPStr == pAD2->backgroundPStr) &&
- (pAD1->backgroundPixmap == pAD2->backgroundPixmap) &&
- (pAD1->bottomShadowColor == pAD2->bottomShadowColor) &&
- (pAD1->bottomShadowPStr == pAD2->bottomShadowPStr) &&
- (pAD1->bottomShadowPixmap == pAD2->bottomShadowPixmap) &&
- (pAD1->topShadowColor == pAD2->topShadowColor) &&
- (pAD1->topShadowPStr == pAD2->topShadowPStr) &&
- (pAD1->topShadowPixmap == pAD2->topShadowPixmap) &&
- (pAD1->activeBackground == pAD2->activeBackground) &&
- (pAD1->activeForeground == pAD2->activeForeground) &&
- (pAD1->activeBackgroundPStr == pAD2->activeBackgroundPStr) &&
- (pAD1->activeBackgroundPixmap == pAD2->activeBackgroundPixmap) &&
- (pAD1->activeBottomShadowColor == pAD2->activeBottomShadowColor) &&
- (pAD1->activeBottomShadowPStr == pAD2->activeBottomShadowPStr) &&
- (pAD1->activeBottomShadowPixmap == pAD2->activeBottomShadowPixmap) &&
- (pAD1->activeTopShadowColor == pAD2->activeTopShadowColor) &&
- (pAD1->activeTopShadowPStr == pAD2->activeTopShadowPStr) &&
- (pAD1->activeTopShadowPixmap == pAD2->activeTopShadowPixmap) )
-#else
/*
* !!! Should find out why all the Pixmap resources are unset !!!
*/
@@ -6261,7 +6238,6 @@ Boolean SimilarAppearanceData (AppearanceData *pAD1, AppearanceData *pAD2)
(pAD1->activeBottomShadowPStr == pAD2->activeBottomShadowPStr) &&
(pAD1->activeTopShadowColor == pAD2->activeTopShadowColor) &&
(pAD1->activeTopShadowPStr == pAD2->activeTopShadowPStr) )
-#endif
{
rval = True;
}
--
2.23.0
_______________________________________________
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
