dtwm: Cleanup some implicit definitions

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.

diff --git a/cde/programs/dtwm/Callback.c b/cde/programs/dtwm/Callback.c
index f7259af0b5ab42d3e7172c2732658b7daa4c88cb..3ea47a4b63bb6975c163b608f1ebabb9ded8d6ed 100644 (file)
--- a/cde/programs/dtwm/Callback.c
+++ b/cde/programs/dtwm/Callback.c
@@ -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>

diff --git a/cde/programs/dtwm/DataBaseLoad.h b/cde/programs/dtwm/DataBaseLoad.h
index 698a7c409befabcd442c0ddd6b76eed7073ef368..346cbfca8769fb7c99d3aa32feccb848402a465e 100644 (file)
--- a/cde/programs/dtwm/DataBaseLoad.h
+++ b/cde/programs/dtwm/DataBaseLoad.h
@@ -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 *);

diff --git a/cde/programs/dtwm/Print.c b/cde/programs/dtwm/Print.c
index 32155cc6550d3f59800d4bc376c872395f2f4a7e..79cbc501f04cbed797587504ab6f89e9d3b1de74 100644 (file)
--- a/cde/programs/dtwm/Print.c
+++ b/cde/programs/dtwm/Print.c
@@ -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"
 

diff --git a/cde/programs/dtwm/WmBackdrop.c b/cde/programs/dtwm/WmBackdrop.c
index 0ee6501b089dcc698d053332820cf0ab7280fcf5..f2783a5e989629289a3dda50540114889f8782bc 100644 (file)
--- a/cde/programs/dtwm/WmBackdrop.c
+++ b/cde/programs/dtwm/WmBackdrop.c
@@ -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>

diff --git a/cde/programs/dtwm/WmEvent.c b/cde/programs/dtwm/WmEvent.c
index 40a8ab8b00e81c1922e28916009d07b23b608dfa..f643503b27b605410373fbe128669a8d9232166d 100644 (file)
--- a/cde/programs/dtwm/WmEvent.c
+++ b/cde/programs/dtwm/WmEvent.c
@@ -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"

diff --git a/cde/programs/dtwm/WmFP.c b/cde/programs/dtwm/WmFP.c
index 2df767918109e5c598bf3ed6afb6c40ee7519261..48a81081908b543078569b71a4c7ef615d697507 100644 (file)
--- a/cde/programs/dtwm/WmFP.c
+++ b/cde/programs/dtwm/WmFP.c
@@ -67,6 +67,7 @@
 #include "UI.h"
 
 #include "WmPanelP.h"
+#include "WmManage.h"
 
 #include <pwd.h>
 #include <fcntl.h>

diff --git a/cde/programs/dtwm/WmFeedback.c b/cde/programs/dtwm/WmFeedback.c
index 1aeac4be839a3b68eee76aecd7f8f3f735cee6cb..6413b4f7d565737384f5881b03a166111bafa8c4 100644 (file)
--- a/cde/programs/dtwm/WmFeedback.c
+++ b/cde/programs/dtwm/WmFeedback.c
@@ -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>

diff --git a/cde/programs/dtwm/WmHelp.c b/cde/programs/dtwm/WmHelp.c
index 8e80b06fa13ce43021fb70f117dc9346d354cbdf..f37d2ec656e4097e6c34bb7e09614f44adfe7fbd 100644 (file)
--- a/cde/programs/dtwm/WmHelp.c
+++ b/cde/programs/dtwm/WmHelp.c
@@ -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 */

diff --git a/cde/programs/dtwm/WmICCC.h b/cde/programs/dtwm/WmICCC.h
index 2e02c7b5362aef14a39b3c3dd17f32ca40a76c45..a55ac360673929562f297d4ace9568c789725402 100644 (file)
--- a/cde/programs/dtwm/WmICCC.h
+++ b/cde/programs/dtwm/WmICCC.h
@@ -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_ */

diff --git a/cde/programs/dtwm/WmIPC.c b/cde/programs/dtwm/WmIPC.c
index 0a7a8f10607f2cbff5ab388995d5d4124993d83f..331f43bc3478849cd93d1d1dbd06d3a5faae3112 100644 (file)
--- a/cde/programs/dtwm/WmIPC.c
+++ b/cde/programs/dtwm/WmIPC.c
@@ -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"
 
 

diff --git a/cde/programs/dtwm/WmIconBox.h b/cde/programs/dtwm/WmIconBox.h
index 37d22a613180033d960c059fd5cb310bdef2b838..0f83b1a7a0d378c922a857189e5db025923d0121 100644 (file)
--- a/cde/programs/dtwm/WmIconBox.h
+++ b/cde/programs/dtwm/WmIconBox.h
@@ -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);

diff --git a/cde/programs/dtwm/WmImage.c b/cde/programs/dtwm/WmImage.c
index bd97079801bcf109c1ed2bac67333d5c0e332220..29f722145d0463eaef46dbe024e9f33ecc293de7 100644 (file)
--- a/cde/programs/dtwm/WmImage.c
+++ b/cde/programs/dtwm/WmImage.c
@@ -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) 
           {

diff --git a/cde/programs/dtwm/WmInitWs.c b/cde/programs/dtwm/WmInitWs.c
index 2f77f9a50af8d8f6c465ff85f3368a26cea697c2..d040cce14ddead3abe048030aeae85b04ffaa518 100644 (file)
--- a/cde/programs/dtwm/WmInitWs.c
+++ b/cde/programs/dtwm/WmInitWs.c
@@ -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) ;
 

diff --git a/cde/programs/dtwm/WmOL.c b/cde/programs/dtwm/WmOL.c
index 5708a2a922e84375488625f6a780e9c573177284..f40fe7701fdc0c8e7821378df7340edc77b28b34 100644 (file)
--- a/cde/programs/dtwm/WmOL.c
+++ b/cde/programs/dtwm/WmOL.c
@@ -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)
 

diff --git a/cde/programs/dtwm/WmOL.h b/cde/programs/dtwm/WmOL.h
index 8936c1161648e4180810ace37b10f8ad48dd523a..e3af6e2dc37af9362f2299d1aa1f185d37262a97 100644 (file)
--- a/cde/programs/dtwm/WmOL.h
+++ b/cde/programs/dtwm/WmOL.h
@@ -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);
+
 
 
 /*

diff --git a/cde/programs/dtwm/WmParse.c b/cde/programs/dtwm/WmParse.c
index 6b76c2beba3767ba68eb9830e3ec3826de4cd3e4..21ec751846c0740d7ac1b1106e76f593e51982d7 100644 (file)
--- a/cde/programs/dtwm/WmParse.c
+++ b/cde/programs/dtwm/WmParse.c
@@ -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

diff --git a/cde/programs/dtwm/WmPresence.c b/cde/programs/dtwm/WmPresence.c
index ece105b62082acb67ff113625cca0ce5e39137f0..c1b2f841163373865c197e090fa46df606491b8f 100644 (file)
--- a/cde/programs/dtwm/WmPresence.c
+++ b/cde/programs/dtwm/WmPresence.c
@@ -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>

diff --git a/cde/programs/dtwm/WmProperty.h b/cde/programs/dtwm/WmProperty.h
index 256900569dac416839d0575f9e160b49a19a0348..b86af328586e900d14bf2d421c15a21f9f7a4625 100644 (file)
--- a/cde/programs/dtwm/WmProperty.h
+++ b/cde/programs/dtwm/WmProperty.h
@@ -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);

diff --git a/cde/programs/dtwm/WmResParse.c b/cde/programs/dtwm/WmResParse.c
index a0630a027632697dc73556438c57af45b8e7dc5b..717f6fcfce623426c7fa456d07d60ba6f8557565 100644 (file)
--- a/cde/programs/dtwm/WmResParse.c
+++ b/cde/programs/dtwm/WmResParse.c
@@ -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),

diff --git a/cde/programs/dtwm/WmResParse.h b/cde/programs/dtwm/WmResParse.h
index 60e266f7ad5a8493647a993b9645874e83413831..40603081005647d90454820c82fc9d70a1469fd6 100644 (file)
--- a/cde/programs/dtwm/WmResParse.h
+++ b/cde/programs/dtwm/WmResParse.h
@@ -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,

diff --git a/cde/programs/dtwm/WmResource.h b/cde/programs/dtwm/WmResource.h
index 2bd4d952e8647a00045c53081e6f49174b4e31d5..2271830709f83a8f2824b28934b9fcb8b0649f59 100644 (file)
--- a/cde/programs/dtwm/WmResource.h
+++ b/cde/programs/dtwm/WmResource.h
@@ -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);

diff --git a/cde/programs/dtwm/WmWinState.c b/cde/programs/dtwm/WmWinState.c
index 94040a5fcec9ee8acf953a541bb6d39ecba21920..9e63a4b2de322f38d780da83c305d72763c56334 100644 (file)
--- a/cde/programs/dtwm/WmWinState.c
+++ b/cde/programs/dtwm/WmWinState.c
@@ -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"
 
 
 /*

diff --git a/cde/programs/dtwm/WmWrkspace.c b/cde/programs/dtwm/WmWrkspace.c
index 8ded58f0cfee4f7316c1848bbbb762b572e60a06..ae3d0f2b36193c718b0492b30f420758bc2dd62a 100644 (file)
--- a/cde/programs/dtwm/WmWrkspace.c
+++ b/cde/programs/dtwm/WmWrkspace.c
@@ -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>

diff --git a/cde/programs/dtwm/WmWrkspace.h b/cde/programs/dtwm/WmWrkspace.h
index 9df7edf94d7239e45ba1e8ba23afdd269d22ca25..15328a202f628115a0d3a15080f83cb1917c1062 100644 (file)
--- a/cde/programs/dtwm/WmWrkspace.h
+++ b/cde/programs/dtwm/WmWrkspace.h
@@ -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,