external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

dtwm: Cleanup some implicit definitions

Browse source 
Mostly this is adding appropriate #includes and declarations,
but for WmImage.c we also change from using the proper name
for XmeGetMask, rather than the identical but renamed
version _DtGetMask which is not exported in any header.
This commit is contained in:
Frederic Koehler 2012-08-09 17:11:11 -04:00 • committed by Jon Trulson
parent 185ec24999
commit 44dfebe9d2
24 changed files with 56 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
cde/programs/dtwm/Callback.c
View file

@ -58,6 +58,7 @@
#include <Xm/Form.h>
#include <Xm/ToggleBG.h>
#include <Xm/AtomMgr.h>
#include <Xm/TextF.h>
#include <X11/Xatom.h>
#include <X11/keysym.h>

1
cde/programs/dtwm/DataBaseLoad.h
View file

@ -484,6 +484,7 @@ struct _AnimationItem
extern Boolean FrontPanelReadDatabases (void);
extern void InitParse(char *, ElementValue **);
extern void InitializeControlFields( ElementValue *element_values, char *);
extern void InitializeSubpanelFields (ElementValue * element_values);
extern void _WriteControlElementValues(ElementValue *);
extern void WriteControlComponentFile(ControlData *);
extern void WriteSubpanelComponentFile(SubpanelData *);

1
cde/programs/dtwm/Print.c
View file

@ -42,6 +42,7 @@
#include <Dt/DbReader.h> /* required for DtDbPathId type */
#include <Dt/WsmM.h>
#include <Dt/IconFile.h>
#include <Dt/Dt.h>
#include "DataBaseLoad.h"
#include "Parse.h"

3
cde/programs/dtwm/WmBackdrop.c
View file

@ -45,6 +45,8 @@ static char rcsid[] = ""
#define DTWM_NEED_BACKBITS
#include "WmIBitmap.h"
#include "WmBackdrop.h"
#include "WmError.h"
#include "WmProperty.h"
#include <X11/Core.h>
#include <X11/StringDefs.h>
#include <X11/Intrinsic.h>
@ -54,6 +56,7 @@ static char rcsid[] = ""
#include <Dt/DtP.h>
#include <Dt/WsmM.h>
#include <Xm/Xm.h>
#include <Xm/AtomMgr.h>
#include <errno.h>
#include <signal.h>
#include <stdio.h>

2
cde/programs/dtwm/WmEvent.c
View file

@ -48,8 +48,10 @@ static char rcsid[] = "$XConsortium: WmEvent.c /main/7 1996/11/20 15:27:47 rswis
* include extern functions
*/
#include "WmEvent.h"
#include "WmError.h"
#ifdef WSM
#include "WmBackdrop.h"
#include "WmWrkspace.h"
#endif /* WSM */
#include "WmCDInfo.h"
#include "WmCDecor.h"

1
cde/programs/dtwm/WmFP.c
View file

@ -67,6 +67,7 @@
#include "UI.h"
#include "WmPanelP.h"
#include "WmManage.h"
#include <pwd.h>
#include <fcntl.h>

2
cde/programs/dtwm/WmFeedback.c
View file

@ -43,7 +43,7 @@ static char rcsid[] = "$XConsortium: WmFeedback.c /main/6 1996/10/23 17:20:55 rs
#define MWM_NEED_TIME16
#include "WmBitmap.h"
#include "WmError.h"
#include <Xm/Xm.h>
#include <X11/Shell.h>
#include <Xm/Label.h>

3
cde/programs/dtwm/WmHelp.c
View file

@ -44,7 +44,10 @@ static char rcsid[] = ""
#include "WmGlobal.h"
#include "WmError.h"
#include "WmFunction.h"
#include "WmHelp.h"
#include "WmCDecor.h"
#include "WmResParse.h"
#ifdef PANELIST
#include "WmPanelP.h"
#endif /* PANELIST */

3
cde/programs/dtwm/WmICCC.h
View file

@ -31,6 +31,8 @@
/*
* (c) Copyright 1987, 1988, 1989, 1990 HEWLETT-PACKARD COMPANY */
#ifndef _Dt_WmICCC_h_
#define _Dt_WmICCC_h_
/*
* Included Files:
*/
@ -143,3 +145,4 @@ typedef struct _PropWMState
/* PropWMState state field value: */
#define WithdrawnSTATE 0
#endif /* _Dt_WmICCC_h_ */

4
cde/programs/dtwm/WmIPC.c
View file

@ -38,7 +38,9 @@ static char rcsid[] = ""
* Included Files:
*/
#include "WmGlobal.h"
#include "WmProtocol.h"
#include <Xm/XmAll.h>
#include <Dt/Dt.h>
#include <Dt/DtP.h>
#include <Dt/Action.h>
#include <Dt/WsmM.h>
@ -51,6 +53,8 @@ static char rcsid[] = ""
#include "WmFunction.h"
#include "WmWrkspace.h"
#include "WmIPC.h"
#include "WmXSMP.h"
#include "WmPanelP.h"
#include "DataBaseLoad.h"

8
cde/programs/dtwm/WmIconBox.h
View file

@ -43,6 +43,7 @@ extern void CheckIconBoxResize (ClientData *pCD, unsigned int changedValues,
extern Boolean CheckIconBoxSize (IconBoxData *pIBD);
extern void DeleteIconFromBox (IconBoxData *pIBD, ClientData *pCD);
extern void DeleteIconInfo (IconBoxData *pIBD, ClientData *pCD);
extern void DestroyIconBox (WmWorkspaceData *pWS);
extern Boolean ExpandVirtualSpace (IconBoxData *pIBD, int newWidth,
int newHeight);
extern Boolean ExtendIconList (IconBoxData *pIBD, int incr);
@ -60,6 +61,13 @@ extern void IconScrollVisibleCallback (Widget w, caddr_t client_data,
#endif
extern void IconActivateCallback (Widget w, caddr_t client_data,
XmAnyCallbackStruct *call_data);
#ifdef PANELIST
extern void IconBoxPopUp (WmWorkspaceData *pWS, Boolean up);
extern Boolean IconBoxShowing (WmWorkspaceData *pWS);
#else /* PANELIST */
extern void IconBoxPopUp (WmWorkspaceData *pWS, ControlWindowStruct *pCW, Boolean up);
extern Boolean IconBoxShowing (WmWorkspaceData *pWS, ControlWindowStruct *pCW);
#endif /* PANELIST */
extern Boolean IconVisible (ClientData *pCD);
extern IconInfo *InsertIconInfo (IconBoxData *pIBD, ClientData *pCD,
Widget theWidget);

2
cde/programs/dtwm/WmImage.c
View file

@ -255,7 +255,7 @@ Pixmap MakeNamedIconPixmap (ClientData *pCD, String iconName)
}
else
{
mask = _DtGetMask (XtScreen(PSD_FOR_CLIENT(pCD)->screenTopLevelW1),
mask = XmeGetMask (XtScreen(PSD_FOR_CLIENT(pCD)->screenTopLevelW1),
(sIconFileName == NULL) ? iconName : sIconFileName);
if (mask == XmUNSPECIFIED_PIXMAP)
{

4
cde/programs/dtwm/WmInitWs.c
View file

@ -59,6 +59,7 @@ static char rcsid[] = "$TOG: WmInitWs.c /main/18 1999/09/20 15:18:22 mgreess $"
#include <X11/Xos.h>
#include <X11/cursorfont.h>
#include <Xm/Xm.h>
#include <Xm/AtomMgr.h>
#include <X11/Shell.h>
#include <X11/Core.h>
#include <X11/keysym.h>
@ -78,6 +79,7 @@ typedef struct
#ifdef WSM
#include <Dt/GetDispRes.h>
#include <Dt/SessionP.h>
#include <Dt/SessionM.h>
#include <Dt/DtP.h>
#include <Dt/Message.h>
#include <Dt/WsmM.h>
@ -2677,6 +2679,8 @@ VirtKeys4DIN(
if( !prop_existed )
{
bindingsString = NULL ;
/* FIXME: this is an unexported openmotif procedure */
extern void _XmVirtKeysLoadFallbackBindings(Display *dsp, String *binding);
_XmVirtKeysLoadFallbackBindings( dsp, &bindingsString) ;
XtFree( bindingsString) ;

2
cde/programs/dtwm/WmOL.c
View file

@ -37,6 +37,8 @@ static char rcsid[] = "$XConsortium: WmOL.c /main/4 1995/11/01 11:45:08 rswiston
*/
#include "WmGlobal.h"
#include "WmOL.h"
#include "WmProperty.h"
#include <Xm/AtomMgr.h>
#define ValidPropertyList(pcd) ((pcd)->paInitialProperties != NULL)

3
cde/programs/dtwm/WmOL.h
View file

@ -122,6 +122,9 @@ extern Boolean HasOpenLookHints( ClientData *pCD );
extern OLWinAttr * GetOLWinAttr( ClientData *pCD );
extern Boolean GetOLDecorFlags(ClientData *pCD, Atom property,
unsigned long *pDecor);
extern void InitOLCompat(void);
extern void ProcessOLDecoration(ClientData *pCD);
/*

1
cde/programs/dtwm/WmParse.c
View file

@ -66,6 +66,7 @@ static char rcsid[] = "$XConsortium: WmParse.c /main/5 1996/10/30 11:36:06 drk $
#ifdef MULTIBYTE
#include <stdlib.h>
#endif /* MULTIBYTE */
#include <ctype.h>
/*
* Internal routines

2
cde/programs/dtwm/WmPresence.c
View file

@ -38,6 +38,7 @@ static char rcsid[] = "$XConsortium: WmPresence.c /main/7 1996/10/23 17:24:56 rs
#include "WmGlobal.h"
#include "WmResNames.h"
#include "WmHelp.h"
#include "WmError.h"
#include <X11/Core.h>
#include <X11/StringDefs.h>
@ -47,6 +48,7 @@ static char rcsid[] = "$XConsortium: WmPresence.c /main/7 1996/10/23 17:24:56 rs
#include <Xm/Xm.h>
#include <Xm/Form.h>
#include <Xm/PushBG.h>
#include <Xm/PushB.h>
#include <Xm/LabelG.h>
#include <Xm/List.h>
#include <Xm/SeparatoG.h>

4
cde/programs/dtwm/WmProperty.h
View file

@ -30,6 +30,7 @@
/* $XConsortium: WmProperty.h /main/4 1995/11/01 11:48:54 rswiston $ */
/*
* (c) Copyright 1987, 1988, 1989, 1990 HEWLETT-PACKARD COMPANY */
#include "WmICCC.h"
extern SizeHints * GetNormalHints (ClientData *pCD);
extern void ProcessWmProtocols (ClientData *pCD);
@ -38,6 +39,9 @@ extern void SetMwmInfo (Window propWindow, long flags, Window wmWindow);
#ifdef WSM
void SetMwmSaveSessionInfo (Window wmWindow);
#endif /* WSM */
extern void GetDtWmRequest (WmScreenData *pSD, char **pszReq, Boolean *pmore);
extern void GetDtSessionHints (WmScreenData *pSD, int sNum);
extern PropWMState * GetWMState (Window window);
extern void SetWMState (Window window, int state, Window icon);
extern PropMwmHints * GetMwmHints (ClientData *pCD);

3
cde/programs/dtwm/WmResParse.c
View file

@ -7315,6 +7315,9 @@ void ProcessMotifBindings (void)
XDeleteProperty (DISPLAY, RootWindow (DISPLAY, 0),
XInternAtom (DISPLAY, "_MOTIF_DEFAULT_BINDINGS", False));
/* FIXME: unexported openmotif procedures */
extern Boolean _XmVirtKeysLoadFileBindings(Display *dsp, String *binding);
extern void _XmVirtKeysLoadFallbackBindings(Display *dsp, String *binding);
if (_XmVirtKeysLoadFileBindings (fileName, &bindings) == True) {
XChangeProperty (DISPLAY, RootWindow(DISPLAY, 0),
XInternAtom (DISPLAY, "_MOTIF_BINDINGS", False),

6
cde/programs/dtwm/WmResParse.h
View file

@ -48,9 +48,9 @@ extern Boolean FindDtSessionMatch(int commandArgc,
WmScreenData *pSD,
char **pWorkSpaceList,
char *clientMachine);
extern void WmDtGetHelprgs(char *args,
unsigned char** volume,
unsigned char** topic,
extern void WmDtGetHelpArgs(char *args,
unsigned char* volume,
unsigned char* topic,
int *argsCount);
extern void GetActionIndex (int tableSize, int *actionIndex);
extern void GetFunctionTableValues (int *execIndex, int *nopIndex,

1
cde/programs/dtwm/WmResource.h
View file

@ -46,6 +46,7 @@ extern void SetStdGlobalResourceValues (void);
extern void ProcessScreenListResource (void);
extern void ProcessAppearanceResources (WmScreenData *pSD);
extern void ProcessGlobalScreenResources (void);
extern void ProcessPresenceResources (WmScreenData *pSD);
extern void ProcessScreenResources (WmScreenData *pSD, unsigned char *screenName);
#ifdef WSM
extern void ProcessWorkspaceList (WmScreenData *pSD);

1
cde/programs/dtwm/WmWinState.c
View file

@ -42,6 +42,7 @@ static char rcsid[] = "$XConsortium: WmWinState.c /main/6 1996/06/20 09:39:39 rs
#include "WmGlobal.h"
#include "WmICCC.h"
#include "WmProtocol.h"
#include "WmIPC.h"
/*

2
cde/programs/dtwm/WmWrkspace.c
View file

@ -42,9 +42,11 @@ static char rcsid[] = "$XConsortium: WmWrkspace.c /main/7 1996/10/23 17:26:33 rs
#include "WmHelp.h"
#include "WmResNames.h"
#include "WmIPlace.h"
#include "WmInitWs.h"
#include <X11/Xutil.h>
#include "WmICCC.h"
#include <Xm/Xm.h>
#include <Xm/AtomMgr.h>
#include <Dt/DtP.h>
#include <Dt/WsmM.h>
#include <stdio.h>

1
cde/programs/dtwm/WmWrkspace.h
View file

@ -39,6 +39,7 @@ static char rcsid[] = ""
extern void ChangeToWorkspace(
WmWorkspaceData *pNewWS) ;
extern void ChangeWorkspaceTitle( WmWorkspaceData *pWS, char * pchTitle);
extern Boolean DuplicateWorkspaceName (
WmScreenData *pSD,
unsigned char *name,