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

OpenIndiana and Solaris port

Browse Source
This commit is contained in:
Ulrich Wilkens
2014-10-28 19:46:43 +01:00
committed by Jon Trulson
parent 42e891d9e7
commit 01d6c363fa
296 changed files with 1049 additions and 1091 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cde/programs/dtinfo/dtinfo/src/Agents/Imakefile
View File

@@ -1,6 +1,6 @@
XCOMM $XConsortium: Imakefile /main/8 1996/08/21 15:41:09 drk $
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
DEPEND_DEFINES = $(DEPENDDEFINES)
CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
MAKEFILEDEPS=Classlist.mk
@@ -10,11 +10,11 @@ LIBNAME=Agents
NormalCplusplusObjectRule()
#ifdef DoLicenseManagement
INCLUDES=$(BROWSER_INCLUDES) $(MMDB_INCLUDES) $(LICENSE_L_INCLUDES)
INCLUDES=$(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES) $(MMDB_INCLUDES) $(LICENSE_L_INCLUDES)
EXTRA_DEFINES=-DLICENSE_MANAGEMENT
#else
XCOMM Should remove LICENSE_L_INCLUDES from this list in this case
INCLUDES=$(BROWSER_INCLUDES) $(COMMON_CLASS_INCLUDES)
INCLUDES=$(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES) $(COMMON_CLASS_INCLUDES)
#endif
#include "Classlist.mk"

1
cde/programs/dtinfo/dtinfo/src/Agents/LibraryAgentMotif.hh
View File

@@ -30,7 +30,6 @@
#include "UAS.hh"
#include <X11/Intrinsic.h>
class OutlineListView;
class OutlineListView;
class WTopLevelShell;
class ScopeMenu;

18
cde/programs/dtinfo/dtinfo/src/Agents/NodePrintAgent.C
View File

@@ -199,15 +199,15 @@ static char another_g_top_locator[4096] ;
* DtHelpDialog widget action list - required by the DisplayArea
*/
static XtActionsRec DrawnBActions[] =
{
{(char*)"DeSelectAll" , _DtHelpDeSelectAll },
{(char*)"SelectAll" , _DtHelpSelectAll },
{(char*)"ActivateLink" , _DtHelpActivateLink },
{(char*)"CopyToClipboard", _DtHelpCopyAction },
{(char*)"PageUpOrDown" , _DtHelpPageUpOrDown },
{(char*)"PageLeftOrRight", _DtHelpPageLeftOrRight},
{(char*)"NextLink" , _DtHelpNextLink }
};
{
{(char*)"DeSelectAll" , (DeSelectAll_ptr)_DtHelpDeSelectAll },
{(char*)"SelectAll" , (SelectAll_ptr)_DtHelpSelectAll },
{(char*)"ActivateLink" , (ActivateLink_ptr)_DtHelpActivateLink },
{(char*)"CopyToClipboard", (CopyAction_ptr)_DtHelpCopyAction },
{(char*)"PageUpOrDown" , (PageUpOrDown_ptr)_DtHelpPageUpOrDown },
{(char*)"PageLeftOrRight", (PageLeftOrRight_ptr)_DtHelpPageLeftOrRight },
{(char*)"NextLink" , (NextLink_ptr)_DtHelpNextLink }
};
//------- Functions --------------------------------------------

15
cde/programs/dtinfo/dtinfo/src/Agents/NodePrintAgent.hh
View File

@@ -34,6 +34,21 @@
#include "UAS.hh"
typedef void _DtHelpDeSelectAll_t(_WidgetRec*,_XEvent*,char**,unsigned*);
typedef _DtHelpDeSelectAll_t * DeSelectAll_ptr;
typedef void _DtHelpSelectAll_t(_WidgetRec*,_XEvent*,char**,unsigned*);
typedef _DtHelpSelectAll_t * SelectAll_ptr;
typedef void _DtHelpActivateLink_t(_WidgetRec*,_XEvent*,char**,unsigned*);
typedef _DtHelpActivateLink_t * ActivateLink_ptr;
typedef void _DtHelpCopyAction_t(_WidgetRec*,_XEvent*,char**,unsigned*);
typedef _DtHelpCopyAction_t * CopyAction_ptr;
typedef void _DtHelpPageUpOrDown_t(_WidgetRec*,_XEvent*,char**,unsigned*);
typedef _DtHelpPageUpOrDown_t * PageUpOrDown_ptr;
typedef void _DtHelpPageLeftOrRight_t(_WidgetRec*,_XEvent*,char**,unsigned*);
typedef _DtHelpPageLeftOrRight_t * PageLeftOrRight_ptr;
typedef void _DtHelpNextLink_t(_WidgetRec*,_XEvent*,char**,unsigned*);
typedef _DtHelpNextLink_t * NextLink_ptr;
class NodeViewInfo;
class NodeHandle;
class Manager;

10
cde/programs/dtinfo/dtinfo/src/Agents/NodeWindowAgentMotif.C
View File

@@ -209,6 +209,12 @@ xList<UAS_Pointer<UAS_Common> > g_tab_list;
extern AppPrintData * l_AppPrintData;
extern "C"
{
typedef void (*resize_cb_ptr)();
typedef void (*hypertext_cb_ptr)();
}
#ifdef CV_HYPER_DEBUG
void
#else
@@ -1753,8 +1759,8 @@ NodeWindowAgent::create_ui()
FALSE, // traversal flag
1, // rows
1, // columns
(void(*)()) hypertext_cb, // hypertext cb
(void(*)())resize_cb, // resize cb
(hypertext_cb_ptr) hypertext_cb, // hypertext cb
(resize_cb_ptr) resize_cb, // resize cb
0, // exec ok routine
this, // client_data
defaultList // default font list

16
cde/programs/dtinfo/dtinfo/src/Basic/FolioObject.C
View File

@@ -176,7 +176,7 @@ FolioObject::notify (u_int notify_type, void *notify_data)
// /////////////////////////////////////////////////////////////////
void
#if defined(SC3) || defined(__osf__) || defined(USL)
#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS)
FolioObject::add_dependent (FolioObject *dependent, notify_handler_t handler,
#else
FolioObject::add_dependent (void *dependent, notify_handler_t handler,
@@ -184,7 +184,7 @@ FolioObject::add_dependent (void *dependent, notify_handler_t handler,
u_int notify_type, void *dependent_data)
{
// Adds to begining because that's easiest.
#if defined(SC3) || defined(__osf__) || defined(USL)
#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS)
f_dependents = new Dependent (&f_dependents, f_dependents,
dependent, NULL, handler,
notify_type, dependent_data);
@@ -206,7 +206,7 @@ FolioObject::add_dependent (void *dependent, notify_handler_t handler,
// by mistake like this. We'll just have to cast it to a FolioObject
// when the call through it is made and hope the compiler doesn't
// expect it to point to an actual FolioObject (or whatever, eg: WWL).
#if defined(SC3) || defined(__osf__) || defined(USL)
#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS)
ON_DEBUG(printf ("@@@ adding to depend_on_list of %p\n", dependent));
dependent->f_depend_on_list =
new DependOnList (dependent->f_depend_on_list, f_dependents);
@@ -244,7 +244,7 @@ FolioObject::remove_depend_on (FolioObject *target, Dependent *d)
// /////////////////////////////////////////////////////////////////
void
#if defined(SC3) || defined(__osf__) || defined(USL)
#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS)
FolioObject::remove_dependent (FolioObject *dependent,
#else
FolioObject::remove_dependent (void *dependent,
@@ -258,7 +258,7 @@ FolioObject::remove_dependent (void *dependent,
// That means that each handler added must be removed!
for (d = &f_dependents; *d != NULL; d = &((*d)->f_next))
{
#if defined(SC3) || defined(__osf__) || defined(USL)
#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS)
if ((*d)->f_dependent == dependent &&
#else
if ((*d)->f_dependent == (FolioObject*)dependent &&
@@ -272,7 +272,7 @@ FolioObject::remove_dependent (void *dependent,
// f_folio_object will be NULL if the Dependent object was
// created in add_dependent! DJB 11/10/92
assert ((*d)->f_folio_object != NULL);
#if defined(SC3) || defined(__osf__) || defined(USL)
#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS)
remove_depend_on (dependent, *d);
#else
remove_depend_on ((FolioObject*)dependent, *d);
@@ -342,7 +342,7 @@ FolioObject::release_depend_on_list()
// by deleting that handle!!!
void
#if defined(SC3) || defined(__osf__) || defined(USL)
#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS)
FolioObject::observe (FolioObject *real_this, FolioObject *target,
#else
FolioObject::observe (void *real_this, FolioObject *target,
@@ -358,7 +358,7 @@ FolioObject::observe (void *real_this, FolioObject *target,
// ---
// OK, instead we will have to pass in the "real" this pointer which
// may be different from the this pointer visible in this routine.
#if defined(SC3) || defined(__osf__) || defined(USL)
#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS)
target->f_dependents =
new Dependent (&target->f_dependents, target->f_dependents,
real_this, this,

6
cde/programs/dtinfo/dtinfo/src/Basic/FolioObject.hh
View File

@@ -72,7 +72,7 @@ public: // functions
#define AddDependentd(CB, TYPE, DATA) \
add_dependent (this, (notify_handler_t)CB, TYPE, DATA)
#if defined(SC3) || defined(__osf__) || defined(USL)
#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS)
void add_dependent (FolioObject *dependent, notify_handler_t handler,
u_int notify_type, void *dependent_data = NULL);
#else
@@ -85,7 +85,7 @@ public: // functions
#define RemoveDependentd(CB, TYPE, DATA) \
remove_dependent(this, (notify_handler_t)CB, TYPE, DATA)
#if defined(SC3) || defined(__osf__) || defined(USL)
#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS)
void remove_dependent (FolioObject *dependent, notify_handler_t handler,
u_int notify_type, void *dependent_data = NULL);
#else
@@ -101,7 +101,7 @@ public: // functions
#define Observed(TARG, TYPE, CB, DATA) \
observe (this, TARG, (notify_handler_t) CB, TYPE, DATA)
#if defined(SC3) || defined(__osf__) || defined(USL)
#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS)
void observe (FolioObject *real_this, FolioObject *target,
notify_handler_t callback, u_int notify_type,
void *client_data = NULL);

1
cde/programs/dtinfo/dtinfo/src/Basic/HashTbl.C
View File

@@ -56,6 +56,7 @@ public: // functions
// NOTE: remove 3rd param after testing
: List (10, 10, List::GROW_ADD) { };
int find (FolioObject &);
using List::remove;
void remove (FolioObject &);
};

6
cde/programs/dtinfo/dtinfo/src/Basic/Imakefile
View File

@@ -1,6 +1,6 @@
XCOMM $XConsortium: Imakefile /main/6 1996/08/21 15:41:35 drk $
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
DEPEND_DEFINES = $(DEPENDDEFINES)
CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
MAKEFILEDEPS=Classlist.mk
@@ -10,9 +10,9 @@ LIBNAME=Basic
NormalCplusplusObjectRule()
#if defined(UseWideChars) && defined(SunArchitecture) && (OSMajorVersion == 4)
INCLUDES=$(BROWSER_INCLUDES) $(MMDB_INCLUDES) -I/VOB/olias/library/Xwchar/src -I/VOB/olias/library/binstall/include
INCLUDES=$(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES) $(MMDB_INCLUDES) -I/VOB/olias/library/Xwchar/src -I/VOB/olias/library/binstall/include
#else
INCLUDES=$(BROWSER_INCLUDES) $(COMMON_CLASS_INCLUDES) -I/VOB/olias/library/binstall/include
INCLUDES=$(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES) $(COMMON_CLASS_INCLUDES) -I/VOB/olias/library/binstall/include
#endif
#include "Classlist.mk"

4
cde/programs/dtinfo/dtinfo/src/Graphics/Imakefile
View File

@@ -1,6 +1,6 @@
XCOMM $XConsortium: Imakefile /main/5 1996/08/21 15:41:55 drk $
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
DEPEND_DEFINES = $(DEPENDDEFINES)
CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
MAKEFILEDEPS=Classlist.mk
@@ -9,7 +9,7 @@ LIBNAME=Graphics
NormalCplusplusObjectRule()
INCLUDES=$(BROWSER_INCLUDES) $(MMDB_INCLUDES)
INCLUDES=$(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES) $(MMDB_INCLUDES)
#ifdef DoLicenseManagement
EXTRA_DEFINES=-DLICENSE_MANAGEMENT

24
cde/programs/dtinfo/dtinfo/src/Imakefile
View File

@@ -1,6 +1,6 @@
XCOMM $TOG: Imakefile /main/48 1998/08/10 15:52:48 mgreess $
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
DEPEND_DEFINES = $(DEPENDDEFINES)
CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
PROGRAM_NAME=dtinfo
@@ -50,7 +50,7 @@ SYS_LIBRARIES=-lm -L$(XPROJECTROOT)/lib -L$(MPROJECTROOT)/lib
SYS_LIBRARIES=-lm
#endif
INCLUDES = -I. $(BROWSER_INCLUDES) $(MMDB_INCLUDES)
INCLUDES = $(CXXDEPENDINCLUDES) -I. $(BROWSER_INCLUDES) $(MMDB_INCLUDES)
OLIASNORMALLIBS= \
Agents/libAgents.a \
@@ -67,7 +67,7 @@ OLIASNORMALLIBS= \
OliasSearch/libOliasSearch.a \
Widgets/libWidgets.a \
cgm/libcgm.a
#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 5
OLIASTLIBS= \
Agents/libAgentsT.a \
Basic/libBasicT.a \
@@ -89,7 +89,7 @@ DLLIB=-ldl
OTHEROBJS=Support/InputNotifier.o
#if defined(SunArchitecture) && (CplusplusCompilerMajorVersion > 3)
#if defined(SunArchitecture) && (CplusplusCompilerMajorVersion > 5)
MMDBTEMPLATES=$(OLIAS)/mmdb/libMMDBTemplates.a
UAS_TEMPLATES=UAS/Base/libBaseT.a \
UAS/DtSR/libDtSRT.a \
@@ -257,7 +257,7 @@ DTI_CC_OBJS = \
$(MMDB_DIR)/dti_cc/CC_String.o $(MMDB_DIR)/dti_cc/CC_Tokenizer.o \
$(MMDB_DIR)/dti_cc/CC_Stack.o $(MMDB_DIR)/dti_cc/CC_Slist.o
#if defined(HPArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion != 4)
#if defined(HPArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion < 4)
EXTRA_HARDCOPY_OBJS = $(MMDB_DIR)/HardCopy/TemplatesAutoNumber.o
#endif
@@ -266,7 +266,7 @@ HARDCOPY_OBJS = \
$(MMDB_DIR)/HardCopy/autoNumber.o $(MMDB_DIR)/HardCopy/autoNumberFP.o \
$(EXTRA_HARDCOPY_OBJS)
#if defined(HPArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion != 4)
#if defined(HPArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion < 4)
EXTRA_STYLESHEET_OBJS = $(MMDB_DIR)/StyleSheet/SSTemplates.o
#endif
@@ -313,7 +313,10 @@ all:: Prelude.h dfiles messages Dtinfo
includes:: Prelude.h dfiles messages
#if defined(HPArchitecture) ||defined (AIXArchitecture) || defined(UXPArchitecture) || (defined(SunArchitecture) && CplusplusCompilerMajorVersion < 4) || defined(AlphaArchitecture) || defined(USLArchitecture) || defined(BSDArchitecture)
#if defined(HPArchitecture) ||defined (AIXArchitecture) || \
defined(UXPArchitecture) || defined(AlphaArchitecture) || \
(defined(SunArchitecture) && CplusplusCompilerMajorVersion < 6) || \
defined(USLArchitecture) || defined(BSDArchitecture)
# ifndef Dont_Use_Templates_Repository
# define Dont_Use_Templates_Repository
UAS_INCLUDES=-I./UAS/Base
@@ -338,7 +341,8 @@ SpecialCPlusPlusObjectRule(Templates.o,,-ptf $(SUBDIR_TEMPL_INCLUDES))
SpecialCPlusPlusExpandRule(Templates..c,,-ptf -DMakeOperatorNewPublic)
#elif defined(DoLicenseManagement)
SpecialCPlusPlusObjectRule(Templates.o,,-ptf $(LICENSE_L_INCLUDES))
#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
#elif defined(LinuxArchitecture) || defined(BSDArchitecture) || \
defined(SunArchitecture)
SpecialCPlusPlusObjectRule(Templates.o,,$(SUBDIR_TEMPL_INCLUDES))
SpecialCPlusPlusExpandRule(Templates..c,,-DMakeOperatorNewPublic)
#else
@@ -358,7 +362,7 @@ makelib(Preferences)
makelibT(Managers)
makelib(Other)
makelibT(Agents)
#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 5
makelibsubsubdir(UAS,Base)
makelibsubsubdir(UAS,DtSR)
makelibsubsubdir(UAS,MMDB)
@@ -370,7 +374,7 @@ makelibT(Marks)
makelibT(OnlineRender)
makelibT(OliasSearch)
makelib(cgm)
#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 5
makelibTsubsubdir(UAS,Base)
makelibTsubsubdir(UAS,DtSR)
makelibTsubsubdir(UAS,MMDB)

4
cde/programs/dtinfo/dtinfo/src/Managers/Imakefile
View File

@@ -1,7 +1,7 @@
XCOMM $XConsortium: Imakefile /main/9 1996/08/21 15:42:26 drk $
XCOMM NodeMgr.o and PrintMgr.o need STYLE_SHEET_INCLUDES.
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES) $(STYLE_SHEET_INCLUDES)
DEPEND_DEFINES = $(DEPENDDEFINES) $(STYLE_SHEET_INCLUDES)
CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
DEFINES=-DCDE_NEXT $(BYTE_ORDER_DEFINES)
@@ -23,7 +23,7 @@ LIBNAME=Managers
NormalCplusplusObjectRule()
INCLUDES=$(BROWSER_INCLUDES) $(COMMON_CLASS_INCLUDES)
INCLUDES=$(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES) $(COMMON_CLASS_INCLUDES)
#include "Classlist.mk"

4
cde/programs/dtinfo/dtinfo/src/Marks/Imakefile
View File

@@ -1,6 +1,6 @@
XCOMM $XConsortium: Imakefile /main/6 1996/08/21 15:42:50 drk $
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
DEPEND_DEFINES = $(DEPENDDEFINES)
CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
NormalCplusplusObjectRule()
@@ -10,7 +10,7 @@ MAKEFILEDEPS=Classlist.mk
LIBNAME=Marks
INCLUDES=-I.. $(EXCEPTIONS_INCLUDES) $(MMDB_INCLUDES) $(UAS_INCLUDES)
INCLUDES=$(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES) $(MMDB_INCLUDES) $(UAS_INCLUDES)
DEFINES=$(BYTE_ORDER_DEFINES)
#include "Classlist.mk"

3
cde/programs/dtinfo/dtinfo/src/OliasSearch/Imakefile
View File

@@ -1,5 +1,6 @@
XCOMM $XConsortium: Imakefile /main/4 1996/08/21 15:42:57 drk $
DEPEND_DEFINES = $(DEPENDDEFINES)
CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
MAKEFILEDEPS=Classlist.mk
@@ -7,7 +8,7 @@ LIBNAME=OliasSearch
NormalCplusplusObjectRule()
INCLUDES=$(BROWSER_INCLUDES)
INCLUDES=$(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES)
#include "Classlist.mk"

4
cde/programs/dtinfo/dtinfo/src/OnlineRender/Imakefile
View File

@@ -1,13 +1,13 @@
XCOMM $XConsortium: Imakefile /main/8 1996/08/21 15:43:09 drk $
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
DEPEND_DEFINES = $(DEPENDDEFINES)
CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
LIBNAME=OnlineRender
NormalCplusplusObjectRule()
INCLUDES=$(BROWSER_INCLUDES) $(MMDB_INCLUDES) $(STYLE_SHEET_INCLUDES) \
INCLUDES=$(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES) $(MMDB_INCLUDES) $(STYLE_SHEET_INCLUDES) \
$(COMMON_CLASS_INCLUDES)
DEFINES=-DCDE_NEXT

4
cde/programs/dtinfo/dtinfo/src/Other/Imakefile
View File

@@ -1,6 +1,6 @@
XCOMM $XConsortium: Imakefile /main/8 1996/08/21 15:43:18 drk $
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
DEPEND_DEFINES = $(DEPENDDEFINES)
CDEBUGFLAGS=-g
@@ -10,7 +10,7 @@ LIBNAME=Other
NormalCplusplusObjectRule()
INCLUDES = $(BROWSER_INCLUDES)
INCLUDES = $(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES)
#include "Classlist.mk"

34
cde/programs/dtinfo/dtinfo/src/Other/WindowSystemMotif.C
View File

@@ -206,15 +206,15 @@ NULL
static XtActionsRec DrawnBActions[] =
{
{(char*)"DeSelectAll" , _DtHelpDeSelectAll },
{(char*)"SelectAll" , _DtHelpSelectAll },
{(char*)"ActivateLink" , _DtHelpActivateLink },
{(char*)"CopyToClipboard", _DtHelpCopyAction },
{(char*)"PageUpOrDown" , _DtHelpPageUpOrDown },
{(char*)"PageLeftOrRight", _DtHelpPageLeftOrRight},
{(char*)"NextLink" , _DtHelpNextLink }
};
{
{(char*)"DeSelectAll" , (DeSelectAll_ptr)_DtHelpDeSelectAll },
{(char*)"SelectAll" , (SelectAll_ptr)_DtHelpSelectAll },
{(char*)"ActivateLink" , (ActivateLink_ptr)_DtHelpActivateLink },
{(char*)"CopyToClipboard", (CopyAction_ptr)_DtHelpCopyAction },
{(char*)"PageUpOrDown" , (PageUpOrDown_ptr)_DtHelpPageUpOrDown },
{(char*)"PageLeftOrRight", (PageLeftOrRight_ptr)_DtHelpPageLeftOrRight },
{(char*)"NextLink" , (NextLink_ptr)_DtHelpNextLink }
};
@@ -268,10 +268,11 @@ WindowSystem::WindowSystem (int &argc, char *argv[])
bool debugging = get_boolean_app_resource("debug");
if (!debugging)
{
signal (SIGABRT, /*DWC IBM (SIG_PF)*/ core_dump_handler);
signal (SIGBUS, /*(SIG_PF)*/ core_dump_handler);
signal (SIGSEGV, /*(SIG_PF)*/ core_dump_handler);
signal (SIGINT, interrupt_handler);
signal (SIGABRT,
/*DWC IBM (SIG_PF)*/ (core_dump_handler_ptr)core_dump_handler);
signal (SIGBUS, /*(SIG_PF)*/ (core_dump_handler_ptr)core_dump_handler);
signal (SIGSEGV, /*(SIG_PF)*/ (core_dump_handler_ptr)core_dump_handler);
signal (SIGINT, (interrupt_handler_ptr)interrupt_handler);
}
/* Reference the scale widget so Veritas Replay Xt lib can link. */
@@ -553,7 +554,7 @@ WindowSystem::init()
XSynchronize(f_display, True);
#endif
XSync(f_display, False);
XSetErrorHandler(xevent_error_aborter);
XSetErrorHandler((xevent_error_aborter_ptr)xevent_error_aborter);
#if 0
XtAppSetFallbackResources(f_application_context, fallbacks);
@@ -620,7 +621,8 @@ WindowSystem::init()
parentCvtArg, XtNumber (parentCvtArg), XtCacheNone, NULL);
#endif /* XmVersion < 1002 */
XtAddConverter (XtRString, XtRGravity, XmuCvtStringToGravity, NULL, 0);
XtAddConverter (XtRString, XtRGravity,
(XmuCvtStringToGravity_ptr)XmuCvtStringToGravity, NULL, 0);
#if XmVersion >= 1002
XmRepTypeInstallTearOffModelConverter();
@@ -1592,6 +1594,6 @@ WindowSystem::interrupt_handler (int /* signal_number */)
}
#if defined(SVR4) || defined(hpux) || defined(_IBMR2)
signal (SIGINT, interrupt_handler);
signal (SIGINT, (interrupt_handler_ptr)interrupt_handler);
#endif
}

27
cde/programs/dtinfo/dtinfo/src/Other/WindowSystemMotif.hh
View File

@@ -41,6 +41,33 @@ typedef struct _VideoShell
Boolean silent;
} VideoShell;
typedef void _DtHelpDeSelectAll_t(_WidgetRec*,_XEvent*,char**,unsigned*);
typedef _DtHelpDeSelectAll_t * DeSelectAll_ptr;
typedef void _DtHelpSelectAll_t(_WidgetRec*,_XEvent*,char**,unsigned*);
typedef _DtHelpSelectAll_t * SelectAll_ptr;
typedef void _DtHelpActivateLink_t(_WidgetRec*,_XEvent*,char**,unsigned*);
typedef _DtHelpActivateLink_t * ActivateLink_ptr;
typedef void _DtHelpCopyAction_t(_WidgetRec*,_XEvent*,char**,unsigned*);
typedef _DtHelpCopyAction_t * CopyAction_ptr;
typedef void _DtHelpPageUpOrDown_t(_WidgetRec*,_XEvent*,char**,unsigned*);
typedef _DtHelpPageUpOrDown_t * PageUpOrDown_ptr;
typedef void _DtHelpPageLeftOrRight_t(_WidgetRec*,_XEvent*,char**,unsigned*);
typedef _DtHelpPageLeftOrRight_t * PageLeftOrRight_ptr;
typedef void _DtHelpNextLink_t(_WidgetRec*,_XEvent*,char**,unsigned*);
typedef _DtHelpNextLink_t * NextLink_ptr;
typedef void XmuCvtStringToGravity_t(XrmValue*,unsigned*,XrmValue*,XrmValue*);
typedef XmuCvtStringToGravity_t * XmuCvtStringToGravity_ptr;
extern "C"
{
typedef void core_dump_handler_t(int signal_number);
typedef core_dump_handler_t * core_dump_handler_ptr;
typedef void interrupt_handler_t(int signal_number);
typedef interrupt_handler_t * interrupt_handler_ptr;
typedef int xevent_error_aborter_t(Display *display,XErrorEvent* error_event);
typedef xevent_error_aborter_t * xevent_error_aborter_ptr;
}
class WindowGeometry;
class WindowSystem : public WWL, public FolioObject

8
cde/programs/dtinfo/dtinfo/src/Preferences/Imakefile
View File

@@ -1,7 +1,7 @@
XCOMM $XConsortium: Imakefile /main/6 1996/08/21 15:43:25 drk $
#define CplusplusSource YES
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
DEPEND_DEFINES = $(DEPENDDEFINES)
MAKEFILEDEPS=Classlist.mk
@@ -9,7 +9,7 @@ LIBNAME=Preferences
NormalCplusplusObjectRule()
INCLUDES=$(BROWSER_INCLUDES)
INCLUDES=$(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES)
#include "Classlist.mk"
@@ -18,7 +18,9 @@ OBJS=$(SRCS:.C=.o)
make_libfiles($(LIBNAME), $(CLASSES))
#if defined(LinuxArchitecture) || defined(BSDArchitecture)
#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
SimpleLibraryT($(LIBNAME), $(OBJS), $(LIBDIR))
#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
#else
SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))

3
cde/programs/dtinfo/dtinfo/src/Preferences/UserPreference.C
View File

@@ -63,7 +63,8 @@
#include <ctype.h>
#include <stdio.h>
#include <unistd.h>
#if !defined(hpux) && !defined(__osf__) && !defined(USL) && !defined(linux) && !defined(CSRG_BASED)
#if !defined(hpux) && !defined(__osf__) && !defined(USL) && \
!defined(linux) && !defined(CSRG_BASED) && !defined(sun)
#include <sysent.h>
#endif
#include <sys/types.h>

4
cde/programs/dtinfo/dtinfo/src/Query/Imakefile
View File

@@ -1,6 +1,6 @@
XCOMM $XConsortium: Imakefile /main/7 1996/08/21 15:43:32 drk $
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
DEPEND_DEFINES = $(DEPENDDEFINES)
CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
MAKEFILEDEPS=Classlist.mk
@@ -9,7 +9,7 @@ LIBNAME=Query
NormalCplusplusObjectRule()
INCLUDES=$(BROWSER_INCLUDES) $(COMMON_CLASS_INCLUDES)
INCLUDES=$(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES) $(COMMON_CLASS_INCLUDES)
#include "Classlist.mk"

4
cde/programs/dtinfo/dtinfo/src/Support/Imakefile
View File

@@ -1,6 +1,6 @@
XCOMM $XConsortium: Imakefile /main/5 1996/08/21 15:43:45 drk $
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
DEPEND_DEFINES = $(DEPENDDEFINES)
CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
MAKEFILEDEPS=Classlist.mk
@@ -10,7 +10,7 @@ LIBDIR=../lib
NormalCplusplusObjectRule()
INCLUDES=-I.. $(EXCEPTIONS_INCLUDES) $(UAS_INCLUDES)
INCLUDES=$(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES) $(UAS_INCLUDES)
#include "Classlist.mk"

9
cde/programs/dtinfo/dtinfo/src/Support/xList.hh
View File

@@ -49,7 +49,8 @@ private:
};
template <class T>
#if defined(__uxp__) || defined(_IBMR2) || defined(__osf__) || defined(USL) || defined(linux) || defined(CSRG_BASED)
#if defined(__uxp__) || defined(_IBMR2) || defined(__osf__) || \
defined(USL) || defined(linux) || defined(CSRG_BASED) || defined(sun)
class xList : public List_base
#else
class xList : private List_base
@@ -60,7 +61,8 @@ class xList : private List_base
#ifdef SC3
friend class List_Iterator<T>;
#else
#if !defined(_IBMR2) && !defined(__osf__) && !defined(USL) && !defined(linux) && !defined(CSRG_BASED)
#if !defined(_IBMR2) && !defined(__osf__) && !defined(USL) && \
!defined(linux) && !defined(CSRG_BASED) && !defined(sun)
template <class T> friend class List_Iterator;
#endif
#endif
@@ -96,7 +98,8 @@ public:
template <class T>
#if defined(_IBMR2) || defined(__osf__) || defined(linux) || defined(CSRG_BASED)
#if defined(_IBMR2) || defined(__osf__) || defined(linux) || \
defined(CSRG_BASED) || defined(sun)
class List_Iterator : public List_Iterator_base
#else
class List_Iterator : private List_Iterator_base

4
cde/programs/dtinfo/dtinfo/src/UAS/Base/Imakefile
View File

@@ -1,6 +1,6 @@
XCOMM $XConsortium: Imakefile /main/7 1996/08/21 15:44:17 drk $
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
DEPEND_DEFINES = $(DEPENDDEFINES)
CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
MAKEFILEDEPS=Classlist.mk
@@ -10,7 +10,7 @@ LIBDIR=../lib
NormalCplusplusObjectRule()
INCLUDES=-I. -I.. -I../.. -I../Support $(EXCEPTIONS_INCLUDES) $(COMMON_CLASS_INCLUDES)
INCLUDES = $(CXXDEPENDINCLUDES) -I. -I.. -I../.. -I../Support $(EXCEPTIONS_INCLUDES) $(COMMON_CLASS_INCLUDES)
make_libfiles($(LIBNAME),)

2
cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_Exceptions.hh
View File

@@ -11,7 +11,7 @@ class UAS_Exception: public Exception {
protected:
UAS_String fMessage;
public:
DECLARE_EXCEPTION(UAS_Exception, Exception);
DECLARE_EXCEPTION(UAS_Exception, Exception)
UAS_Exception(const UAS_String&m): fMessage(m) {}
virtual ~UAS_Exception() {}
const UAS_String & message () const { return fMessage; }

4
cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_OQLParser.hh
View File

@@ -13,7 +13,7 @@
class UAS_OQLParser_Exception : public UAS_Exception
{
public:
DECLARE_EXCEPTION(UAS_OQLParser_Exception, Exception);
DECLARE_EXCEPTION(UAS_OQLParser_Exception, Exception)
UAS_OQLParser_Exception(const UAS_String &m) : UAS_Exception(m) {};
virtual ~UAS_OQLParser_Exception() {};
@@ -22,7 +22,7 @@ class UAS_OQLParser_Exception : public UAS_Exception
class UAS_Search_Feature_Unavailable : public UAS_OQLParser_Exception
{
public:
DECLARE_EXCEPTION(UAS_Search_Feature_Unavailable, Exception);
DECLARE_EXCEPTION(UAS_Search_Feature_Unavailable, Exception)
UAS_Search_Feature_Unavailable(const UAS_String &m) :
UAS_OQLParser_Exception(m) {};

4
cde/programs/dtinfo/dtinfo/src/UAS/DtSR/Imakefile
View File

@@ -1,6 +1,6 @@
XCOMM $XConsortium: Imakefile /main/8 1996/08/21 15:44:56 drk $
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
DEPEND_DEFINES = $(DEPENDDEFINES)
CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
MAKEFILEDEPS=Classlist.mk
@@ -15,7 +15,7 @@ DEFINES=-DCDE_NEXT
NormalCplusplusObjectRule()
INCLUDES=-I../.. $(EXCEPTIONS_INCLUDES) $(UAS_INCLUDES) $(DTSEARCH_INCLUDES) $(UTIL_CLASSES_INCLUDES) $(COMMON_CLASS_INCLUDES)
INCLUDES = $(CXXDEPENDINCLUDES) -I../.. $(EXCEPTIONS_INCLUDES) $(UAS_INCLUDES) $(DTSEARCH_INCLUDES) $(UTIL_CLASSES_INCLUDES) $(COMMON_CLASS_INCLUDES)
#include "Classlist.mk"

4
cde/programs/dtinfo/dtinfo/src/UAS/MMDB/Imakefile
View File

@@ -1,6 +1,6 @@
XCOMM $XConsortium: Imakefile /main/9 1996/08/21 15:45:19 drk $
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
DEPEND_DEFINES = $(DEPENDDEFINES)
CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
MAKEFILEDEPS=Classlist.mk
@@ -17,7 +17,7 @@ SEARCHENG_INCLUDES=$(FULCRUM_INCLUDES)
SEARCHENG_DEFINES=$(FULCRUM_DEFINES)
#endif
INCLUDES=-I. -I../Base -I../.. $(EXCEPTIONS_INCLUDES) $(COMMON_CLASS_INCLUDES) $(SEARCHENG_INCLUDES) $(SEARCHENG_DEFINES)
INCLUDES = $(CXXDEPENDINCLUDES) -I. -I../Base -I../.. $(EXCEPTIONS_INCLUDES) $(COMMON_CLASS_INCLUDES) $(SEARCHENG_INCLUDES) $(SEARCHENG_DEFINES)
make_libfiles($(LIBNAME),)

8
cde/programs/dtinfo/dtinfo/src/Widgets/Imakefile
View File

@@ -1,6 +1,6 @@
XCOMM $XConsortium: Imakefile /main/6 1996/08/21 15:45:28 drk $
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
DEPEND_DEFINES = $(DEPENDDEFINES)
LIBNAME= Widgets
LIBDIR = ../lib
@@ -26,9 +26,11 @@ OBJS = $(OBJS1) $(OBJS2)
NormalCplusplusObjectRule()
NormalLibraryObjectRule()
INCLUDES=$(CDEINCLUDES) $(WWL_INCLUDES) $(EXCEPTIONS_INCLUDES)
INCLUDES=$(CXXDEPENDINCLUDES) $(CDEINCLUDES) $(WWL_INCLUDES) $(EXCEPTIONS_INCLUDES)
#if defined(LinuxArchitecture) || defined(BSDArchitecture)
#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
SimpleLibraryT($(LIBNAME), $(OBJS), $(LIBDIR))
#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
#else
SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))

2
cde/programs/dtinfo/dtinfo/wwl/include/WWL/WArgList.h
View File

@@ -45,7 +45,7 @@
#define WArgList_h
// Allow setting of resources by name in arg list
#if defined(linux) || defined(CSRG_BASED)
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
#define CASTRNAM (char*)
#define CASTVAL (void*)(size_t)
#else

2
cde/programs/dtinfo/dtinfo/wwl/include/WWL/WXmText.h
View File

@@ -69,7 +69,7 @@ inline XmTextSource GetSource () const { return XmTextGetSource (widget); }
inline char* GetString () const { return XmTextGetString (widget); }
inline XmTextPosition GetTopCharacter () const { return XmTextGetTopCharacter (widget); }
inline void Insert (XmTextPosition position, char* value) const { XmTextInsert (widget, position, value); }
inline Boolean Paste (Widget widget) const { return XmTextPaste (widget); }
inline Boolean Paste (Widget twidget) const { return XmTextPaste (twidget); }
inline Boolean PosToXY (XmTextPosition position, Position* x, Position* y) const { return XmTextPosToXY (widget, position, x, y); }
inline Boolean Remove () const { return XmTextRemove (widget); }
inline void Replace (XmTextPosition from, XmTextPosition to, char* s) const { XmTextReplace (widget, from, to, s); }

2
cde/programs/dtinfo/dtinfo/wwl/include/WWL/WXmTextField.h
View File

@@ -64,7 +64,7 @@ inline char* GetSelection () const { return XmTextFieldGetSelection (widget); }
inline Boolean GetSelectionPosition (XmTextPosition* left, XmTextPosition* right) const { return XmTextFieldGetSelectionPosition (widget, left, right); }
inline char* GetString () const { return XmTextFieldGetString (widget); }
inline void Insert (XmTextPosition position, char* value) const { XmTextFieldInsert (widget, position, value); }
inline Boolean Paste (Widget widget) const { return XmTextFieldPaste (widget); }
inline Boolean Paste (Widget twidget) const { return XmTextFieldPaste (twidget); }
inline Boolean PosToXY (XmTextPosition position, Position* x, Position* y) const { return XmTextFieldPosToXY (widget, position, x, y); }
inline Boolean Remove () const { return XmTextFieldRemove (widget); }
inline void Replace (XmTextPosition from, XmTextPosition to, char* s) const { XmTextFieldReplace (widget, from, to, s); }

4
cde/programs/dtinfo/dtinfo/wwl/include/WWL/wwl.h
View File

@@ -52,7 +52,7 @@
// /__ \/ F-91405 ORSAY Cedex +33 (1) 69 41 66 29
#include <X11/Intrinsic.h>
#if !defined(linux) && !defined(CSRG_BASED)
#if !defined(linux) && !defined(CSRG_BASED) && !defined(sun)
#include <generic.h>
#else
#define name2(__n1,__n2) __paste2(__n1,__n2)
@@ -78,7 +78,7 @@ class WComposite;
typedef void (* XtProc)();
#endif
#if defined(linux) || defined(CSRG_BASED)
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
#define CASTRNAM (char*)
#define CASTVAL (void*)(size_t)
#else