diff options
168 files changed, 1558 insertions, 1370 deletions
diff --git a/include/X11/ConvertI.h b/include/X11/ConvertI.h index b773b6f..13689ab 100644 --- a/include/X11/ConvertI.h +++ b/include/X11/ConvertI.h @@ -46,6 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +/* $XFree86: xc/lib/Xt/ConvertI.h,v 1.3 2001/12/14 19:56:09 dawes Exp $ */ /* Representation types */ @@ -101,3 +102,5 @@ extern Boolean _XtConvert( #endif ); +void _XtConvertInitialize(void); + diff --git a/include/X11/EventI.h b/include/X11/EventI.h index aabdc08..73c9770 100644 --- a/include/X11/EventI.h +++ b/include/X11/EventI.h @@ -47,6 +47,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +/* $XFree86: xc/lib/Xt/EventI.h,v 1.3 2001/12/14 19:56:12 dawes Exp $ */ /* * Event.h - exported types and functions for toolkit event handler @@ -62,6 +63,8 @@ SOFTWARE. typedef struct _XtGrabRec *XtGrabList; +#include "PassivGraI.h" + extern void _XtEventInitialize( #if NeedFunctionPrototypes void @@ -124,4 +127,16 @@ extern EventMask _XtConvertTypeToMask( #endif ); +/* EventUtil.c */ +extern Widget _XtFindRemapWidget(XEvent *event, Widget widget, + EventMask mask, XtPerDisplayInput pdi); +extern void _XtUngrabBadGrabs(XEvent *event, Widget widget, + EventMask mask, XtPerDisplayInput pdi); +extern void _XtFillAncestorList(Widget **listPtr, int *maxElemsPtr, + int *numElemsPtr, Widget start, + Widget breakWidget); + +/* NextEvent.c */ +extern Boolean XtAppPeekEvent_SkipTimer; + #endif /* _Event_h_ */ diff --git a/include/X11/InitialI.h b/include/X11/InitialI.h index 9a01356..0fe1d25 100644 --- a/include/X11/InitialI.h +++ b/include/X11/InitialI.h @@ -46,6 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +/* $XFree86: xc/lib/Xt/InitialI.h,v 3.10 2001/12/14 19:56:18 dawes Exp $ */ #ifndef _XtinitialI_h #define _XtinitialI_h @@ -80,6 +81,7 @@ SOFTWARE. #endif #endif +#include <X11/Xos.h> #include <X11/Xpoll.h> typedef struct _TimerEventRec { @@ -199,6 +201,9 @@ typedef struct _XtAppStruct { #endif } XtAppStruct; +extern void _XtHeapInit(Heap* heap); +extern void _XtHeapFree(Heap* heap); + #ifdef XTTRACEMEMORY @@ -457,4 +462,10 @@ extern void _XtFreeWWTable( #endif ); +extern String _XtGetUserName(String dest, int len); +extern XrmDatabase _XtPreparseCommandLine(XrmOptionDescRec *urlist, + Cardinal num_urs, int argc, String *argv, + String *applName, String *displayName, + String *language); + #endif /* _XtinitialI_h */ diff --git a/include/X11/Intrinsic.h b/include/X11/Intrinsic.h index bae18eb..3d41150 100644 --- a/include/X11/Intrinsic.h +++ b/include/X11/Intrinsic.h @@ -48,6 +48,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/Xt/Intrinsic.h,v 3.8 2001/12/14 19:56:22 dawes Exp $ */ #ifndef _XtIntrinsic_h #define _XtIntrinsic_h @@ -60,15 +61,7 @@ in this Software without prior written authorization from The Open Group. #include <X11/Xos.h> /* for R4 compatibility */ #else #include <X11/Xosdefs.h> -#ifndef X_NOT_STDC_ENV #include <string.h> /* for XtNewString */ -#else -#ifdef SYSV -#include <string.h> -#else -#include <strings.h> -#endif /* SYSV else */ -#endif /* !X_NOT_STDC_ENV else */ #endif /* XT_BC else */ #define XtSpecificationRelease 6 @@ -101,9 +94,7 @@ typedef char *String; #endif /* NeedFunctionPrototypes */ -#ifndef NULL -#define NULL 0 -#endif +#include <stddef.h> #ifdef VMS #define externalref globalref @@ -750,13 +741,8 @@ extern void XtDisplayStringConversionWarning( #endif ); -#ifdef __STDC__ externalref XtConvertArgRec const colorConvertArgs[]; externalref XtConvertArgRec const screenConvertArg[]; -#else -externalref XtConvertArgRec colorConvertArgs[]; -externalref XtConvertArgRec screenConvertArg[]; -#endif extern void XtAppAddConverter( /* obsolete */ #if NeedFunctionPrototypes @@ -2057,25 +2043,11 @@ extern void XtGetConstraintResourceList( #define XtDefaultFont "XtDefaultFont" #define XtDefaultFontSet "XtDefaultFontSet" -#if defined(CRAY) || defined(__arm) -#if __STDC__ +#if defined(CRAY) #define XtOffset(p_type,field) _Offsetof(p_type,field) -#else -#ifdef CRAY2 -#define XtOffset(p_type,field) \ - (sizeof(int)*((unsigned int)&(((p_type)NULL)->field))) - -#else /* !CRAY2 */ - -#define XtOffset(p_type,field) ((unsigned int)&(((p_type)NULL)->field)) - -#endif /* !CRAY2 */ -#endif /* __STDC__ */ -#else /* ! (CRAY || __arm) */ - +#else /* ! CRAY */ #define XtOffset(p_type,field) \ ((Cardinal) (((char *) (&(((p_type)NULL)->field))) - ((char *) NULL))) - #endif /* !CRAY */ #ifdef offsetof diff --git a/include/X11/IntrinsicI.h b/include/X11/IntrinsicI.h index 3771dca..d1e000c 100644 --- a/include/X11/IntrinsicI.h +++ b/include/X11/IntrinsicI.h @@ -46,6 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +/* $XFree86: xc/lib/Xt/IntrinsicI.h,v 3.8 2001/12/14 19:56:25 dawes Exp $ */ #ifndef _XtintrinsicI_h #define _XtintrinsicI_h @@ -64,14 +65,6 @@ SOFTWARE. #include "ConvertI.h" #include "TranslateI.h" -#include "CallbackI.h" -#include "EventI.h" -#include "HookObjI.h" -#include "PassivGraI.h" -#include "ThreadsI.h" -#include "InitialI.h" -#include "ResourceI.h" -#include "StringDefs.h" #define RectObjClassFlag 0x02 #define WidgetClassFlag 0x04 @@ -233,16 +226,17 @@ extern void _XtAddShellToHookObj( #endif ); +/* GCManager.c */ +extern void _XtGClistFree(Display *dpy, XtPerDisplay pd); + /** GeoTattler stuff */ #ifdef XT_GEO_TATTLER extern void _XtGeoTab (); extern void _XtGeoTrace ( -#if NeedVarargsPrototypes Widget widget, ... -#endif ); #define CALLGEOTAT(f) f diff --git a/include/X11/PassivGraI.h b/include/X11/PassivGraI.h index ee240cf..178c5ef 100644 --- a/include/X11/PassivGraI.h +++ b/include/X11/PassivGraI.h @@ -51,6 +51,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/Xt/PassivGraI.h,v 1.3 2001/12/14 19:56:27 dawes Exp $ */ #ifndef _PDI_h_ #define _PDI_h_ @@ -192,4 +193,10 @@ extern void _XtRegisterPassiveGrabs( #endif ); +extern void _XtClearAncestorCache( +#if NeedFunctionPrototypes + Widget /* widget */ +#endif +); + #endif /* _PDI_h_ */ diff --git a/include/X11/ResConfigP.h b/include/X11/ResConfigP.h index b717fd6..60f9414 100644 --- a/include/X11/ResConfigP.h +++ b/include/X11/ResConfigP.h @@ -52,10 +52,15 @@ dealings in this Software without prior written authorization from the IBM Corporation. ******************************************************************/ +/* $XFree86: xc/lib/Xt/ResConfigP.h,v 3.7 2001/12/20 19:40:59 tsi Exp $ */ #ifndef _RESCONFIGP_H #define _RESCONFIGP_H +#include <X11/Xfuncproto.h> + +_XFUNCPROTOBEGIN + /* * Atom names for resource configuration management customization tool. */ @@ -70,4 +75,6 @@ extern void _XtResourceConfigurationEH( #endif ); +_XFUNCPROTOEND + #endif diff --git a/include/X11/ResourceI.h b/include/X11/ResourceI.h index 35c39eb..7a9d5a0 100644 --- a/include/X11/ResourceI.h +++ b/include/X11/ResourceI.h @@ -46,6 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +/* $XFree86: xc/lib/Xt/ResourceI.h,v 1.5 2001/12/14 19:56:28 dawes Exp $ */ /**************************************************************** * @@ -53,6 +54,9 @@ SOFTWARE. * ****************************************************************/ +#ifndef _XtresourceI_h +#define _XtresourceI_h + #define StringToQuark(string) XrmStringToQuark(string) #define StringToName(string) XrmStringToName(string) #define StringToClass(string) XrmStringToClass(string) @@ -86,3 +90,12 @@ extern void _XtCopyFromParent( XrmValue* /* value */ #endif ); + +extern void _XtCopyToArg(char *src, XtArgVal *dst, unsigned int size); +extern void _XtCopyFromArg(XtArgVal src, char *dst, unsigned int size); +extern XrmResourceList* _XtCreateIndirectionTable(XtResourceList resources, + Cardinal num_resources); +extern void _XtResourceListInitialize(void); + + +#endif /* _XtresourceI_h */ diff --git a/include/X11/ThreadsI.h b/include/X11/ThreadsI.h index 93cda63..3b51e07 100644 --- a/include/X11/ThreadsI.h +++ b/include/X11/ThreadsI.h @@ -53,6 +53,11 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/Xt/ThreadsI.h,v 3.5 2001/12/14 19:56:31 dawes Exp $ */ + +#ifndef _XtThreadsI_h +#define _XtThreadsI_h + #ifdef XTHREADS typedef struct _LockRec *LockPtr; @@ -132,3 +137,4 @@ extern void (*_XtInitAppLock)( #define DPY_TO_APPCON(d) #endif /* !defined(XTHREADS) */ +#endif /* _XtThreadsI_h */ diff --git a/include/X11/TranslateI.h b/include/X11/TranslateI.h index 760e6e6..bb86ee2 100644 --- a/include/X11/TranslateI.h +++ b/include/X11/TranslateI.h @@ -46,6 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +/* $XFree86: xc/lib/Xt/TranslateI.h,v 1.3 2001/12/14 19:56:32 dawes Exp $ */ /* * TranslateI.h - Header file private to translation management @@ -70,8 +71,13 @@ typedef unsigned short TMShortCard; typedef unsigned long TMLongCard; typedef short TMShortInt; -typedef Boolean (*MatchProc)(); - /* Event *parsed, TMEventPtr incoming */ +typedef struct _TMTypeMatchRec *TMTypeMatch; +typedef struct _TMModifierMatchRec *TMModifierMatch; +typedef struct _TMEventRec *TMEventPtr; + +typedef Boolean (*MatchProc)(TMTypeMatch typeMatch, + TMModifierMatch modMatch, + TMEventPtr eventSeq); typedef struct _ModToKeysymTable { Modifiers mask; @@ -122,14 +128,14 @@ typedef struct _TMModifierMatchRec{ TMLongCard modifierMask; LateBindingsPtr lateModifiers; Boolean standard; -}TMModifierMatchRec, *TMModifierMatch; +}TMModifierMatchRec; typedef struct _TMTypeMatchRec{ TMLongCard eventType; TMLongCard eventCode; TMLongCard eventCodeMask; MatchProc matchEvent; -}TMTypeMatchRec, *TMTypeMatch; +}TMTypeMatchRec; typedef struct _TMBranchHeadRec { unsigned int isSimple:1; @@ -284,7 +290,7 @@ typedef EventSeqPtr EventPtr; typedef struct _TMEventRec { XEvent *xev; Event event; -}TMEventRec,*TMEventPtr; +}TMEventRec; typedef struct _ActionHookRec { struct _ActionHookRec* next; /* must remain first */ @@ -446,7 +452,16 @@ extern void _XtTranslateEvent( #endif ); -extern void _XtBuildKeysymTables(); +#include "CallbackI.h" +#include "EventI.h" +#include "HookObjI.h" +#include "PassivGraI.h" +#include "ThreadsI.h" +#include "InitialI.h" +#include "ResourceI.h" +#include "StringDefs.h" + +extern void _XtBuildKeysymTables(Display *dpy, XtPerDisplay pd); #ifndef NO_MIT_HACKS extern void _XtDisplayTranslations( @@ -653,3 +668,7 @@ extern void _XtUnmergeTranslations( XtTranslations /* xlations */ #endif ); + +/* TMKey.c */ +extern void _XtAllocTMContext(XtPerDisplay pd); + diff --git a/include/X11/VarargsI.h b/include/X11/VarargsI.h index 114905b..6e4bd60 100644 --- a/include/X11/VarargsI.h +++ b/include/X11/VarargsI.h @@ -25,17 +25,12 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/Xt/VarargsI.h,v 3.6 2001/12/14 19:56:32 dawes Exp $ */ #ifndef _VarargsI_h_ #define _VarargsI_h_ -#if NeedVarargsPrototypes -# include <stdarg.h> -# define Va_start(a,b) va_start(a,b) -#else -# include <varargs.h> -# define Va_start(a,b) va_start(a) -#endif +#include <stdarg.h> /* private routines */ diff --git a/include/X11/Xtos.h b/include/X11/Xtos.h index a512d1e..3b1b91d 100644 --- a/include/X11/Xtos.h +++ b/include/X11/Xtos.h @@ -48,6 +48,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +/* $XFree86: xc/lib/Xt/Xtos.h,v 3.10 2002/04/04 14:05:35 eich Exp $ */ #ifndef _Xtos_h #define _Xtos_h @@ -60,7 +61,12 @@ SOFTWARE. #define WORD64 #endif -#ifdef __alpha +#if defined(__alpha) || defined(__alpha__) || \ + defined(__ia64__) || defined(ia64) || \ + defined(__sparc64__) || \ + defined(__s390x__) || \ + (defined(__hppa__) && defined(__LP64__)) || \ + defined(__x86_64__) || defined(x86_64) #define LONG64 #endif diff --git a/man/XtAddActions.man b/man/XtAddActions.man index 446ca53..3538e22 100644 --- a/man/XtAddActions.man +++ b/man/XtAddActions.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtAddAct.man,v 1.4 2001/03/16 17:53:51 pookie Exp $ +.\" $Xorg: XtAddAct.man,v 1.3 2000/08/17 19:41:57 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealing in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtAddAct.man,v 1.2 2001/01/27 18:20:23 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,7 +127,7 @@ .el .sp 10p .. .ny0 -.TH XtAddActions 3Xt "Release 6.6" "X Version 11" "XT COMPATIBILITY FUNCTIONS" +.TH XtAddActions 3Xt __xorgversion__ "XT COMPATIBILITY FUNCTIONS" .SH NAME XtAddActions \- register an action table .SH SYNTAX diff --git a/man/XtAddCallback.man b/man/XtAddCallback.man index 3d1e93a..744993d 100644 --- a/man/XtAddCallback.man +++ b/man/XtAddCallback.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtAddCbk.man,v 1.4 2001/03/16 17:53:51 pookie Exp $ +.\" $Xorg: XtAddCbk.man,v 1.3 2000/08/17 19:41:57 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealing in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtAddCbk.man,v 1.3 2001/02/09 03:47:49 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,11 +127,11 @@ .el .sp 10p .. .ny0 -.TH XtAddCallback 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtAddCallback 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtAddCallback, XtAddCallbacks, XtRemoveCallback, XtRemoveCallbacks, XtRemoveAllCallbacks \- add and remove callback procedures .SH SYNTAX -void XtAddCallback(\fIw\fP, \fIcallback_name, \fP\fIcallback\fP, \ +void XtAddCallback(\fIw\fP, \fIcallback_name, \fP\fIcallback\fP, \fIclient_data\fP) .br Widget \fIw\fP; @@ -147,7 +150,7 @@ void XtAddCallbacks(\fIw\fP, \fIcallback_name, \fP\fIcallbacks\fP) .br XtCallbackList \fIcallbacks\fP; .LP -void XtRemoveCallback(\fIw\fP, \fIcallback_name\fP, \fIcallback\fP, \ +void XtRemoveCallback(\fIw\fP, \fIcallback_name\fP, \fIcallback\fP, \fIclient_data\fP) .br Widget \fIw\fP; @@ -180,7 +183,7 @@ client data. .ds Cn \ to which the procedure is to be appended or deleted .IP \fIcallback_name\fP 1i Specifies the callback list\*(Cn. -.ds Cd it is invoked by XtCallbacks or NULL, \ +.ds Cd it is invoked by XtCallbacks or NULL, or the client data to match on the registered callback procedures .IP \fIclient_data\fP 1i Specifies the argument that is to be passed to the specified procedure diff --git a/man/XtAddEventHandler.man b/man/XtAddEventHandler.man index 71f4c3b..fc03d02 100644 --- a/man/XtAddEventHandler.man +++ b/man/XtAddEventHandler.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtAddEHand.man,v 1.4 2001/03/16 17:53:51 pookie Exp $ +.\" $Xorg: XtAddEHand.man,v 1.3 2000/08/17 19:41:57 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtAddEHand.man,v 1.3 2001/02/09 03:47:49 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,11 +126,11 @@ .el .sp 10p .. .ny0 -.TH XtAddEventHandler 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtAddEventHandler 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtAddEventHandler, XtAddRawEventHandler, XtRemoveEventHandler, XtRemoveRawEventHandler, XtInsertEventHandler, XtInsertRawEventHandler \- add and remove event handlers .SH SYNTAX -void XtAddEventHandler(\fIw\fP, \fIevent_mask\fP, \fInonmaskable\fP, \ +void XtAddEventHandler(\fIw\fP, \fIevent_mask\fP, \fInonmaskable\fP, \fIproc\fP, \fIclient_data\fP) .br Widget \fIw\fP; @@ -140,7 +143,7 @@ void XtAddEventHandler(\fIw\fP, \fIevent_mask\fP, \fInonmaskable\fP, \ .br XtPointer \fIclient_data\fP; .LP -void XtAddRawEventHandler(\fIw\fP, \fIevent_mask\fP, \fInonmaskable\fP, \ +void XtAddRawEventHandler(\fIw\fP, \fIevent_mask\fP, \fInonmaskable\fP, \fIproc\fP, \fIclient_data\fP) .br Widget \fIw\fP; @@ -153,7 +156,7 @@ void XtAddRawEventHandler(\fIw\fP, \fIevent_mask\fP, \fInonmaskable\fP, \ .br XtPointer \fIclient_data\fP; .LP -void XtRemoveEventHandler(\fIw\fP, \fIevent_mask\fP, \fInonmaskable\fP, \ +void XtRemoveEventHandler(\fIw\fP, \fIevent_mask\fP, \fInonmaskable\fP, \fIproc\fP, \fIclient_data\fP) .br Widget \fIw\fP; @@ -166,7 +169,7 @@ void XtRemoveEventHandler(\fIw\fP, \fIevent_mask\fP, \fInonmaskable\fP, \ .br XtPointer \fIclient_data\fP; .LP -void XtRemoveRawEventHandler(\fIw\fP, \fIevent_mask\fP, \fInonmaskable\fP, \ +void XtRemoveRawEventHandler(\fIw\fP, \fIevent_mask\fP, \fInonmaskable\fP, \fIproc\fP, \fIclient_data\fP) .br Widget \fIw\fP; @@ -179,7 +182,7 @@ void XtRemoveRawEventHandler(\fIw\fP, \fIevent_mask\fP, \fInonmaskable\fP, \ .br XtPointer \fIclient_data\fP; .LP -void XtInsertEventHandler(\fIw\fP, \fIevent_mask\fP, \fInonmaskable\fP, \ +void XtInsertEventHandler(\fIw\fP, \fIevent_mask\fP, \fInonmaskable\fP, \fIproc\fP, \fIclient_data\fP, \fIposition\fP) .br Widget \fIw\fP; @@ -194,7 +197,7 @@ void XtInsertEventHandler(\fIw\fP, \fIevent_mask\fP, \fInonmaskable\fP, \ .br XtListPosition \fIposition\fP; .LP -void XtInsertRawEventHandler(\fIw\fP, \fIevent_mask\fP, \fInonmaskable\fP, \ +void XtInsertRawEventHandler(\fIw\fP, \fIevent_mask\fP, \fInonmaskable\fP, \fIproc\fP, \fIclient_data\fP, \fIposition\fP) .br Widget \fIw\fP; diff --git a/man/XtAddExposureToRegion.man b/man/XtAddExposureToRegion.man index 8f8e9ae..fed71b0 100644 --- a/man/XtAddExposureToRegion.man +++ b/man/XtAddExposureToRegion.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtAddETReg.man,v 1.4 2001/03/16 17:53:51 pookie Exp $ +.\" $Xorg: XtAddETReg.man,v 1.3 2000/08/17 19:41:57 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtAddETReg.man,v 1.2 2001/01/27 18:20:23 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,7 +127,7 @@ .el .sp 10p .. .ny0 -.TH XtAddExposureToRegion 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtAddExposureToRegion 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtAddExposureToRegion \- merge exposure events into a region .SH SYNTAX diff --git a/man/XtAddGrab.man b/man/XtAddGrab.man index 0a836ef..1d78dfc 100644 --- a/man/XtAddGrab.man +++ b/man/XtAddGrab.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtAddGrab.man,v 1.4 2001/03/16 17:53:51 pookie Exp $ +.\" $Xorg: XtAddGrab.man,v 1.3 2000/08/17 19:41:57 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtAddGrab.man,v 1.2 2001/01/27 18:20:23 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,7 +127,7 @@ .el .sp 10p .. .ny0 -.TH XtAddGrab 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtAddGrab 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtAddGrab, XtRemoveGrab \- redirect user input to a modal widget .SH SYNTAX diff --git a/man/XtAddInput.man b/man/XtAddInput.man index 1c83e69..8524bd5 100644 --- a/man/XtAddInput.man +++ b/man/XtAddInput.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtAddIn.man,v 1.4 2001/03/16 17:53:51 pookie Exp $ +.\" $Xorg: XtAddIn.man,v 1.3 2000/08/17 19:41:57 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtAddIn.man,v 1.3 2001/02/09 03:47:49 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,11 +126,11 @@ .el .sp 10p .. .ny0 -.TH XtAddInput 3Xt "Release 6.6" "X Version 11" "XT COMPATIBILITY FUNCTIONS" +.TH XtAddInput 3Xt __xorgversion__ "XT COMPATIBILITY FUNCTIONS" .SH NAME XtAddInput, XtAddTimeout \- register input, timeout, and workprocs .SH SYNTAX -XtInputId XtAddInput(\fIsource\fP, \fIcondition\fP, \fIproc\fP, \ +XtInputId XtAddInput(\fIsource\fP, \fIcondition\fP, \fIproc\fP, \fIclient_data\fP) .br int \fIsource\fP; diff --git a/man/XtAllocateGC.man b/man/XtAllocateGC.man index 97a1ab9..a1d3378 100644 --- a/man/XtAllocateGC.man +++ b/man/XtAllocateGC.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtAllocGC.man,v 1.4 2001/03/16 17:53:51 pookie Exp $ +.\" $Xorg: XtAllocGC.man,v 1.3 2000/08/17 19:41:57 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtAllocGC.man,v 1.3 2001/02/09 03:47:49 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,11 +126,11 @@ .el .sp 10p .. .ny0 -.TH XtAllocateGC 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtAllocateGC 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtAllocateGC \- obtain a sharable GC with modifiable fields .SH SYNTAX -GC XtAllocateGC(\fIw\fP, \fIdepth\fP, \fIvalue_mask\fP, \fIvalues\fP, \ +GC XtAllocateGC(\fIw\fP, \fIdepth\fP, \fIvalue_mask\fP, \fIvalues\fP, \fIdynamic_mask\fP, \fIunused_mask\fP) .br Widget \fIw\fP; diff --git a/man/XtAppAddActionHook.man b/man/XtAppAddActionHook.man index 10d1a75..b0d15a9 100644 --- a/man/XtAppAddActionHook.man +++ b/man/XtAppAddActionHook.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtActHook.man,v 1.4 2001/03/16 17:53:51 pookie Exp $ +.\" $Xorg: XtActHook.man,v 1.3 2000/08/17 19:41:57 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtActHook.man,v 1.3 2001/02/09 03:47:49 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,11 +126,11 @@ .el .sp 10p .. .ny0 -.TH XtAppAddActionHook 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtAppAddActionHook 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtAppAddActionHook, XtRemoveActionHook \- register an action hook procedure .SH SYNTAX -XtActionHookId XtAppAddActionHook(\fIapp_context\fP, \fIproc\fP, \ +XtActionHookId XtAppAddActionHook(\fIapp_context\fP, \fIproc\fP, \fIclient_data\fP) .br XtAppContext \fIapp_context\fP; diff --git a/man/XtAppAddActions.man b/man/XtAppAddActions.man index 0ce5e0d..2b04a98 100644 --- a/man/XtAppAddActions.man +++ b/man/XtAppAddActions.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtAppAAct.man,v 1.4 2001/03/16 17:53:51 pookie Exp $ +.\" $Xorg: XtAppAAct.man,v 1.3 2000/08/17 19:41:57 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtAppAAct.man,v 1.2 2001/01/27 18:20:23 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,7 +127,7 @@ .el .sp 10p .. .ny0 -.TH XtAppAddActions 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtAppAddActions 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtAppAddActions \- register an action table .SH SYNTAX diff --git a/man/XtAppAddBlockHook.man b/man/XtAppAddBlockHook.man index 7f66fcd..6c5df69 100644 --- a/man/XtAppAddBlockHook.man +++ b/man/XtAppAddBlockHook.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtBlockH.man,v 1.4 2001/03/16 17:53:51 pookie Exp $ +.\" $Xorg: XtBlockH.man,v 1.3 2000/08/17 19:41:58 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtBlockH.man,v 1.3 2001/02/09 03:47:49 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,11 +126,11 @@ .el .sp 10p .. .ny0 -.TH XtAppAddBlockHook 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtAppAddBlockHook 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtAppAddBlockHook, XtRemoveBlockHook \- register a block hook procedure .SH SYNTAX -XtBlockHookId XtAppAddBlockHook(\fIapp_context\fP, \fIproc\fP, \ +XtBlockHookId XtAppAddBlockHook(\fIapp_context\fP, \fIproc\fP, \fIclient_data\fP) .br XtAppContext \fIapp_context\fP; diff --git a/man/XtAppAddConverter.man b/man/XtAppAddConverter.man index 619543f..9a17027 100644 --- a/man/XtAppAddConverter.man +++ b/man/XtAppAddConverter.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtAppAC.man,v 1.4 2001/03/16 17:53:51 pookie Exp $ +.\" $Xorg: XtAppAC.man,v 1.3 2000/08/17 19:41:57 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtAppAC.man,v 1.3 2001/02/09 03:47:49 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,11 +127,11 @@ .el .sp 10p .. .ny0 -.TH XtAppAddConverter 3Xt "Release 6.6" "X Version 11" "XT COMPATIBILITY FUNCTIONS" +.TH XtAppAddConverter 3Xt __xorgversion__ "XT COMPATIBILITY FUNCTIONS" .SH NAME XtAppAddConverter, XtAddConverter \- register resource converter .SH SYNTAX -void XtAppAddConverter(\fIapp_context\fP, \fIfrom_type\fP, \fIto_type\fP, \ +void XtAppAddConverter(\fIapp_context\fP, \fIfrom_type\fP, \fIto_type\fP, \fIconverter\fP, \fIconvert_args\fP, \fInum_args\fP) .br XtAppContext \fIapp_context\fP; @@ -143,7 +146,7 @@ void XtAppAddConverter(\fIapp_context\fP, \fIfrom_type\fP, \fIto_type\fP, \ .br Cardinal \fInum_args\fP; .LP -void XtAddConverter(\fIfrom_type\fP, \fIto_type\fP, \fIconverter\fP, \ +void XtAddConverter(\fIfrom_type\fP, \fIto_type\fP, \fIconverter\fP, \fIconvert_args\fP, \fInum_args\fP) .br String \fIfrom_type\fP; diff --git a/man/XtAppAddInput.man b/man/XtAppAddInput.man index 716e2c3..4f7451e 100644 --- a/man/XtAppAddInput.man +++ b/man/XtAppAddInput.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtAppAI.man,v 1.4 2001/03/16 17:53:51 pookie Exp $ +.\" $Xorg: XtAppAI.man,v 1.3 2000/08/17 19:41:57 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,7 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" $XFree86: xc/doc/man/Xt/XtAppAI.man,v 1.5 2001/02/09 03:47:49 tsi Exp $ .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,11 +125,11 @@ .el .sp 10p .. .ny0 -.TH XtAppAddInput 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtAppAddInput 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtAppAddInput, XtRemoveInput \- register and remove an input source .SH SYNTAX -XtInputId XtAppAddInput(\fIapp_context\fP, \fIsource\fP, \fIcondition\fP, \ +XtInputId XtAppAddInput(\fIapp_context\fP, \fIsource\fP, \fIcondition\fP, \fIproc\fP, \fIclient_data\fP) .br XtAppContext \fIapp_context\fP; @@ -205,7 +206,7 @@ XtAppAddInput(app_context, source, .br .B (XtPointer) -XtInputReadMask | XtInputWriteMask, +(XtInputReadMask | XtInputWriteMask), .br proc, .br diff --git a/man/XtAppAddSignal.man b/man/XtAppAddSignal.man index 13546d8..8890db9 100644 --- a/man/XtAppAddSignal.man +++ b/man/XtAppAddSignal.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtAppASig.man,v 1.4 2001/03/16 17:53:51 pookie Exp $ +.\" $Xorg: XtAppASig.man,v 1.3 2000/08/17 19:41:57 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtAppASig.man,v 1.2 2001/01/27 18:20:23 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,7 +126,7 @@ .el .sp 10p .. .ny0 -.TH XtAppAddSignal 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtAppAddSignal 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtAppAddSignal, XtRemoveSignal, XtNoticeSignal \- register and remove a signal source .SH SYNTAX diff --git a/man/XtAppAddTimeOut.man b/man/XtAppAddTimeOut.man index da352c4..fe71e3c 100644 --- a/man/XtAppAddTimeOut.man +++ b/man/XtAppAddTimeOut.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtAppATO.man,v 1.4 2001/03/16 17:53:51 pookie Exp $ +.\" $Xorg: XtAppATO.man,v 1.3 2000/08/17 19:41:57 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtAppATO.man,v 1.3 2001/02/09 03:47:49 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,11 +127,11 @@ .el .sp 10p .. .ny0 -.TH XtAppAddTimeOut 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtAppAddTimeOut 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtAppAddTimeOut, XtRemoveTimeOut \- register and remove timeouts .SH SYNTAX -XtIntervalId XtAppAddTimeOut(\fIapp_context\fP, \fIinterval\fP, \fIproc\fP, \ +XtIntervalId XtAppAddTimeOut(\fIapp_context\fP, \fIinterval\fP, \fIproc\fP, \fIclient_data\fP) .br XtAppContext \fIapp_context\fP; diff --git a/man/XtAppAddWorkProc.man b/man/XtAppAddWorkProc.man index 97cab2b..0e8b4fb 100644 --- a/man/XtAppAddWorkProc.man +++ b/man/XtAppAddWorkProc.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtAppAWP.man,v 1.4 2001/03/16 17:53:51 pookie Exp $ +.\" $Xorg: XtAppAWP.man,v 1.3 2000/08/17 19:41:57 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtAppAWP.man,v 1.2 2001/01/27 18:20:23 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,7 +127,7 @@ .el .sp 10p .. .ny0 -.TH XtAppAddWorkProc 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtAppAddWorkProc 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtAppAddWorkProc, XtRemoveWorkProc \- Add and remove background processing procedures .SH SYNTAX diff --git a/man/XtAppCreateShell.man b/man/XtAppCreateShell.man index fd6df5c..c14b08d 100644 --- a/man/XtAppCreateShell.man +++ b/man/XtAppCreateShell.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtAppCSh.man,v 1.4 2001/03/16 17:53:51 pookie Exp $ +.\" $Xorg: XtAppCSh.man,v 1.3 2000/08/17 19:41:58 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtAppCSh.man,v 1.3 2001/02/09 03:47:49 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,12 +126,12 @@ .el .sp 10p .. .ny0 -.TH XtAppCreateShell 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtAppCreateShell 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtAppCreateShell, XtVaAppCreateShell \- create top-level widget instance .SH SYNTAX -Widget XtAppCreateShell(\fIapplication_name\fP, \ -\fIapplication_class\fP, \fIwidget_class\fP, \fIdisplay\fP, \ +Widget XtAppCreateShell(\fIapplication_name\fP, +\fIapplication_class\fP, \fIwidget_class\fP, \fIdisplay\fP, \fIargs\fP, \fInum_args\fP) .br String \fIapplication_name\fP; @@ -143,7 +146,7 @@ Widget XtAppCreateShell(\fIapplication_name\fP, \ .br Cardinal \fInum_args\fP; .LP -Widget XtVaAppCreateShell(\fIapplication_name\fP, \ +Widget XtVaAppCreateShell(\fIapplication_name\fP, \fIapplication_class\fP, \fIwidget_class\fP, \fIdisplay\fP, ...) .br String \fIapplication_name\fP; diff --git a/man/XtAppError.man b/man/XtAppError.man index 9d804b5..ce0cdf5 100644 --- a/man/XtAppError.man +++ b/man/XtAppError.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtAppE.man,v 1.4 2001/03/16 17:53:51 pookie Exp $ +.\" $Xorg: XtAppE.man,v 1.3 2000/08/17 19:41:58 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtAppE.man,v 1.3 2001/02/09 03:47:49 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,7 +127,7 @@ .el .sp 10p .. .ny0 -.TH XtAppError 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtAppError 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtAppError, XtAppSetErrorHandler, XtAppSetWarningHandler, XtAppWarning \- low-level error handlers .SH SYNTAX @@ -156,7 +159,7 @@ void XtAppWarning(\fIapp_context\fP, \fImessage\fP) Specifies the application context. .IP \fImessage\fP 1i Specifies the nonfatal error message that is to be reported. -.ds Ha fatal error procedure, which should not return, \ +.ds Ha fatal error procedure, which should not return, or the nonfatal error procedure, which usually returns .IP \fIhandler\fP 1i Specifies the new \*(Ha. diff --git a/man/XtAppErrorMsg.man b/man/XtAppErrorMsg.man index 1786985..5412cc9 100644 --- a/man/XtAppErrorMsg.man +++ b/man/XtAppErrorMsg.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtAppEM.man,v 1.4 2001/03/16 17:53:51 pookie Exp $ +.\" $Xorg: XtAppEM.man,v 1.3 2000/08/17 19:41:58 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtAppEM.man,v 1.3 2001/02/09 03:47:49 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,11 +127,11 @@ .el .sp 10p .. .ny0 -.TH XtAppErrorMsg 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtAppErrorMsg 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtAppErrorMsg, XtAppSetErrorMsgHandler, XtAppSetWarningMsgHandler, XtAppWarningMsg \- high-level error handlers .SH SYNTAX -void XtAppErrorMsg(\fIapp_context\fP, \fIname\fP, \fItype\fP, \fIclass\fP, \ +void XtAppErrorMsg(\fIapp_context\fP, \fIname\fP, \fItype\fP, \fIclass\fP, \fIdefault\fP, \ \fIparams\fP, \fInum_params\fP) .br XtAppContext \fIapp_context\fP; @@ -184,7 +187,7 @@ Specifies the default message to use\*(Dm. Specifies the general kind of error. .IP \fItype\fP 1i Specifies the detailed name of the error. -.ds Mh fatal error procedure, which should not return \ +.ds Mh fatal error procedure, which should not return or the nonfatal error procedure, which usually returns .IP \fImsg_handler\fP 1i Specifies the new \*(Mh. diff --git a/man/XtAppGetErrorDatabase.man b/man/XtAppGetErrorDatabase.man index fd80ee1..5a2a7d1 100644 --- a/man/XtAppGetErrorDatabase.man +++ b/man/XtAppGetErrorDatabase.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtAppGEDB.man,v 1.4 2001/03/16 17:53:51 pookie Exp $ +.\" $Xorg: XtAppGEDB.man,v 1.3 2000/08/17 19:41:58 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtAppGEDB.man,v 1.2 2001/01/27 18:20:24 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,7 +127,7 @@ .el .sp 10p .. .ny0 -.TH XtAppGetErrorDatabase 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtAppGetErrorDatabase 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtAppGetErrorDatabase, XtAppGetErrorDatabaseText \- obtain error database .SH SYNTAX diff --git a/man/XtAppGetSelectionTimeout.man b/man/XtAppGetSelectionTimeout.man index 23c2f92..aeb102c 100644 --- a/man/XtAppGetSelectionTimeout.man +++ b/man/XtAppGetSelectionTimeout.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtAppGSTO.man,v 1.4 2001/03/16 17:53:51 pookie Exp $ +.\" $Xorg: XtAppGSTO.man,v 1.3 2000/08/17 19:41:58 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtAppGSTO.man,v 1.2 2001/01/27 18:20:24 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,7 +127,7 @@ .el .sp 10p .. .ny0 -.TH XtAppGetSelectionTimeout 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtAppGetSelectionTimeout 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtAppGetSelectionTimeout, XtAppSetSelectionTimeout \- set and obtain selection timeout values .SH SYNTAX diff --git a/man/XtAppInitialize.man b/man/XtAppInitialize.man index 06e348b..f7198c1 100644 --- a/man/XtAppInitialize.man +++ b/man/XtAppInitialize.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtAppInit.man,v 1.5 2001/03/16 17:53:51 pookie Exp $ +.\" $Xorg: XtAppInit.man,v 1.3 2000/08/17 19:41:58 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtAppInit.man,v 1.4 2001/03/04 00:04:25 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,12 +126,12 @@ .el .sp 10p .. .ny0 -.TH XtAppInitialize 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtAppInitialize 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtAppInitialize, XtVaAppInitialize \- initialize, open, or close a display .SH SYNTAX -Widget XtAppInitialize(\fIapp_context_return\fP, \fIapplication_class\fP, \ -\fIoptions\fP, \fInum_options\fP, \fIargc_in_out\fP, \fIargv_in_out\fP, \ +Widget XtAppInitialize(\fIapp_context_return\fP, \fIapplication_class\fP, +\fIoptions\fP, \fInum_options\fP, \fIargc_in_out\fP, \fIargv_in_out\fP, \fIfallback_resources\fP, \fIargs\fP, \fInum_args\fP) .br XtAppContext* \fIapp_context_return\fP; @@ -149,8 +152,8 @@ Widget XtAppInitialize(\fIapp_context_return\fP, \fIapplication_class\fP, \ .br Cardinal \fInum_args\fP; .LP -Widget XtVaAppInitialize(\fIapp_context_return\fP, \fIapplication_class\fP, \ -\fIoptions\fP, \fInum_options\fP, \fIargc_in_out\fP, \fIargv_in_out\fP, \ +Widget XtVaAppInitialize(\fIapp_context_return\fP, \fIapplication_class\fP, +\fIoptions\fP, \fInum_options\fP, \fIargc_in_out\fP, \fIargv_in_out\fP, \fIfallback_resources\fP, ...) .br XtAppContext* \fIapp_context_return\fP; @@ -207,7 +210,7 @@ then calls with \fIdisplay_string\fP NULL and \fIapplication_name\fP NULL, and finally calls .ZN XtAppCreateShell -with \fIappcation_name\fP NULL, \fIwidget_class\fP +with \fIapplication_name\fP NULL, \fIwidget_class\fP .ZN applicationShellWidgetClass , and the specified \fIargs\fP and \fInum_args\fP and returns the created shell. The modified \fIargc\fP and \fIargv\fP returned by diff --git a/man/XtAppLock.man b/man/XtAppLock.man index 608ebfd..c63be50 100644 --- a/man/XtAppLock.man +++ b/man/XtAppLock.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtAppLock.man,v 1.4 2001/03/16 17:53:51 pookie Exp $ +.\" $Xorg: XtAppLock.man,v 1.3 2000/08/17 19:41:58 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtAppLock.man,v 1.2 2001/01/27 18:20:24 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,7 +126,7 @@ .el .sp 10p .. .ny0 -.TH XtAppLock 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtAppLock 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtAppLock, XtAppUnlock \- lock and unlock application context .SH SYNTAX diff --git a/man/XtAppNextEvent.man b/man/XtAppNextEvent.man index cc0d167..2edfc97 100644 --- a/man/XtAppNextEvent.man +++ b/man/XtAppNextEvent.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtAppNEv.man,v 1.4 2001/03/16 17:53:51 pookie Exp $ +.\" $Xorg: XtAppNEv.man,v 1.3 2000/08/17 19:41:58 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,8 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" $XFree86: xc/doc/man/Xt/XtAppNEv.man,v 1.5 2001/01/27 18:20:24 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,7 +126,7 @@ .el .sp 10p .. .ny0 -.TH XtAppNextEvent 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtAppNextEvent 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtAppNextEvent, XtAppPending, XtAppPeekEvent, XtAppProcessEvent, XtDispatchEvent, XtAppMainLoop \- query and process events and input .SH SYNTAX @@ -270,14 +272,19 @@ and then it dispatches the event to the appropriate registered procedure by calling .ZN XtDispatchEvent . This constitutes the main loop of \*(tk applications, -and, as such, it does not return. +and, as such, it does not return unless +.ZN XtAppSetExitFlag +is called. Applications are expected to exit in response to some user action. There is nothing special about .ZN XtAppMainLoop ; -it is simply an infinite loop that calls +it is simply an loop that calls .ZN XtAppNextEvent and then -.ZN XtDispatchEvent . +.ZN XtDispatchEvent , +until +.ZN XtAppGetExitFlag () +returns true. .LP Applications can provide their own version of this loop, which tests some global termination flag or tests that the number diff --git a/man/XtAppReleaseCacheRefs.man b/man/XtAppReleaseCacheRefs.man index 33aa239..a24ab14 100644 --- a/man/XtAppReleaseCacheRefs.man +++ b/man/XtAppReleaseCacheRefs.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtAppRCR.man,v 1.4 2001/03/16 17:53:51 pookie Exp $ +.\" $Xorg: XtAppRCR.man,v 1.3 2000/08/17 19:41:58 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtAppRCR.man,v 1.2 2001/01/27 18:20:24 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,7 +126,7 @@ .el .sp 10p .. .ny0 -.TH XtAppReleaseCacheRefs 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtAppReleaseCacheRefs 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtAppReleaseCacheRefs \- decrement reference counts for resources .SH SYNTAX diff --git a/man/XtAppSetExitFlag.man b/man/XtAppSetExitFlag.man index 52a6d08..1c3c57a 100644 --- a/man/XtAppSetExitFlag.man +++ b/man/XtAppSetExitFlag.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtAppSEF.man,v 1.4 2001/03/16 17:53:51 pookie Exp $ +.\" $Xorg: XtAppSEF.man,v 1.3 2000/08/17 19:41:58 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtAppSEF.man,v 1.2 2001/01/27 18:20:24 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,7 +126,7 @@ .el .sp 10p .. .ny0 -.TH XtAppSetExitFlag 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtAppSetExitFlag 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtAppSetExitFlag, XtAppGetExitFlag \- thread support functions .SH SYNTAX diff --git a/man/XtAppSetFallbackResources.man b/man/XtAppSetFallbackResources.man index a58dbeb..ad4d131 100644 --- a/man/XtAppSetFallbackResources.man +++ b/man/XtAppSetFallbackResources.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtAppSetFR.man,v 1.4 2001/03/16 17:53:51 pookie Exp $ +.\" $Xorg: XtAppSetFR.man,v 1.3 2000/08/17 19:41:58 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,8 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtAppSetFR.man,v 1.5 2001/01/27 18:20:24 dawes Exp $ .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,7 +125,7 @@ .el .sp 10p .. .ny0 -.TH XtAppSetFallbackResources 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtAppSetFallbackResources 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtAppSetFallbackResources \- set fallback resources .SH SYNTAX @@ -152,12 +154,12 @@ class resource file. .ZN XtAppSetFallbackResources is not required to copy \fIspecification_list\fP; the caller must ensure that the contents of the list and the strings addressed by the -list remain valid until all displys are initialized or until +list remain valid until all displays are initialized or until .ZN XtAppSetFallbackResources is called again. The value NULL for \fIspecification_list\fP removes any previous fallback resource specification for the application context. The intended use for fallback resources is to provide a minimal number -of resources that will amke the application usable (or at least terminate +of resources that will make the application usable (or at least terminate with helful diagnostic messages) when some problem exists in finding and loading the application defaults file. .SH "SEE ALSO" diff --git a/man/XtAppSetTypeConverter.man b/man/XtAppSetTypeConverter.man index 33587f1..54b0438 100644 --- a/man/XtAppSetTypeConverter.man +++ b/man/XtAppSetTypeConverter.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtAppSTC.man,v 1.4 2001/03/16 17:53:51 pookie Exp $ +.\" $Xorg: XtAppSTC.man,v 1.3 2000/08/17 19:41:58 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtAppSTC.man,v 1.3 2001/02/09 03:47:49 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,12 +126,12 @@ .el .sp 10p .. .ny0 -.TH XtAppSetTypeConverter 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtAppSetTypeConverter 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtAppSetTypeConverter, XtSetTypeConverter \- register resource converter .SH SYNTAX -void XtAppSetTypeConverter(\fIapp_context\fP, \fIfrom_type\fP, \fIto_type\fP, \ -\fIconverter\fP, \fIconvert_args\fP, \fInum_args\fP, \ +void XtAppSetTypeConverter(\fIapp_context\fP, \fIfrom_type\fP, \fIto_type\fP, +\fIconverter\fP, \fIconvert_args\fP, \fInum_args\fP, \fIcache_type\fP, \fIdestructor\fP) .br XtAppContext \fIapp_context\fP; @@ -147,7 +150,7 @@ void XtAppSetTypeConverter(\fIapp_context\fP, \fIfrom_type\fP, \fIto_type\fP, \ .br XtDestructor \fIdestructor\fP; .LP -void XtSetTypeConverter(\fIfrom_type\fP, \fIto_type\fP, \fIconverter\fP, \ +void XtSetTypeConverter(\fIfrom_type\fP, \fIto_type\fP, \fIconverter\fP, \fIconvert_args\fP, \fInum_args\fP, \fIcache_type\fP, \fIdestructor\fP) .br String \fIfrom_type\fP; diff --git a/man/XtBuildEventMask.man b/man/XtBuildEventMask.man index 881a125..ff0da31 100644 --- a/man/XtBuildEventMask.man +++ b/man/XtBuildEventMask.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtBEMask.man,v 1.4 2001/03/16 17:53:51 pookie Exp $ +.\" $Xorg: XtBEMask.man,v 1.3 2000/08/17 19:41:58 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtBEMask.man,v 1.2 2001/01/27 18:20:24 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,7 +127,7 @@ .el .sp 10p .. .ny0 -.TH XtBuildEventMask 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtBuildEventMask 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtBuildEventMask \- retrieve a widget's event mask .SH SYNTAX diff --git a/man/XtCallAcceptFocus.man b/man/XtCallAcceptFocus.man index e5d7255..727e2b5 100644 --- a/man/XtCallAcceptFocus.man +++ b/man/XtCallAcceptFocus.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtCallAFoc.man,v 1.4 2001/03/16 17:53:51 pookie Exp $ +.\" $Xorg: XtCallAFoc.man,v 1.3 2000/08/17 19:41:59 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtCallAFoc.man,v 1.2 2001/01/27 18:20:24 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,7 +127,7 @@ .el .sp 10p .. .ny0 -.TH XtCallAcceptFocus 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtCallAcceptFocus 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtCallAcceptFocus \- calla widget's accept_focus procedure .SH SYNTAX diff --git a/man/XtCallActionProc.man b/man/XtCallActionProc.man index 1774529..27e52ed 100644 --- a/man/XtCallActionProc.man +++ b/man/XtCallActionProc.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtCallActP.man,v 1.4 2001/03/16 17:53:51 pookie Exp $ +.\" $Xorg: XtCallActP.man,v 1.3 2000/08/17 19:41:59 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtCallActP.man,v 1.3 2001/02/09 03:47:50 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,11 +126,11 @@ .el .sp 10p .. .ny0 -.TH XtCallActionProc 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtCallActionProc 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtCallActionProc \- invoke an action procedure directly .SH SYNTAX -void XtCallActionProc(\fIwidget\fP, \fIaction\fP, \fIevent\fP, \ +void XtCallActionProc(\fIwidget\fP, \fIaction\fP, \fIevent\fP, \fIparams\fP, \fInum_params\fP) .br Widget \fIwidget\fP; diff --git a/man/XtCallCallbacks.man b/man/XtCallCallbacks.man index f236af4..7b73f3d 100644 --- a/man/XtCallCallbacks.man +++ b/man/XtCallCallbacks.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtCallCbks.man,v 1.4 2001/03/16 17:53:51 pookie Exp $ +.\" $Xorg: XtCallCbks.man,v 1.3 2000/08/17 19:41:59 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtCallCbks.man,v 1.3 2001/02/09 03:47:50 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,7 +126,7 @@ .el .sp 10p .. .ny0 -.TH XtCallCallbacks 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtCallCallbacks 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtCallCallbacks, XtCallCallbackList, XtHasCallbacks \- process callbacks .SH SYNTAX @@ -143,7 +146,7 @@ void XtCallCallbackList(\fIw\fP, \fIcallbacks\fP, \fIcall_data\fP) .br XtPointer \fIcall_data\fP; .LP -typedef enum {XtCallbackNoList, XtCallbackHasNone, XtCallbackHasSome} \ +typedef enum {XtCallbackNoList, XtCallbackHasNone, XtCallbackHasSome} XtCallbackStatus; .sp XtCallbackStatus XtHasCallbacks(\fIw\fP, \fIcallback_name\fP) diff --git a/man/XtClass.man b/man/XtClass.man index d6ba804..94b1b09 100644 --- a/man/XtClass.man +++ b/man/XtClass.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtClass.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtClass.man,v 1.3 2000/08/17 19:41:59 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtClass.man,v 1.2 2001/01/27 18:20:24 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,7 +127,7 @@ .el .sp 10p .. .ny0 -.TH XtClass 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtClass 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtClass, XtSuperclass, XtIsSubclass, XtCheckSubclass, XtIsObject, XtIsRectObj, XtIsWidget, XtIsComposite, XtIsConstraint, XtIsShell, XtIsOverrideShell, XtIsWMShell, XtIsVendorShell, XtIsTransientShell, XtIsTopLevelShell, XtIsApplicationShell, XtIsSessionShell \- obtain and verify a widget's class .SH SYNTAX diff --git a/man/XtConfigureWidget.man b/man/XtConfigureWidget.man index a5fc17c..323f3af 100644 --- a/man/XtConfigureWidget.man +++ b/man/XtConfigureWidget.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtConfWid.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtConfWid.man,v 1.3 2000/08/17 19:41:59 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtConfWid.man,v 1.3 2001/02/09 03:47:50 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,11 +127,11 @@ .el .sp 10p .. .ny0 -.TH XtConfigureWidget 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtConfigureWidget 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtConfigureWidget, XtMoveWidget, XtResizeWidget \- move and resize widgets .SH SYNTAX -void XtConfigureWidget(\fIw\fP, \fIx\fP, \fIy\fP, \fIwidth\fP, \fIheight\fP, \ +void XtConfigureWidget(\fIw\fP, \fIx\fP, \fIy\fP, \fIwidth\fP, \fIheight\fP, \fIborder_width\fP) .br Widget \fIw\fP; diff --git a/man/XtConvert.man b/man/XtConvert.man index b340eb7..32faad3 100644 --- a/man/XtConvert.man +++ b/man/XtConvert.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtConvert.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtConvert.man,v 1.3 2000/08/17 19:41:59 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtConvert.man,v 1.3 2001/02/09 03:47:50 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,11 +127,11 @@ .el .sp 10p .. .ny0 -.TH XtConvert 3Xt "Release 6.6" "X Version 11" "XT COMPATIBILITY FUNCTIONS" +.TH XtConvert 3Xt __xorgversion__ "XT COMPATIBILITY FUNCTIONS" .SH NAME XtConvert, XtDirectConvert \- invoke resource converters .SH SYNTAX -void XtConvert(\fIw\fP, \fIfrom_type\fP, \fIfrom\fP, \fIto_type\fP, \ +void XtConvert(\fIw\fP, \fIfrom_type\fP, \fIfrom\fP, \fIto_type\fP, \fIto_return\fP) .br Widget \fIw\fP; @@ -141,7 +144,7 @@ void XtConvert(\fIw\fP, \fIfrom_type\fP, \fIfrom\fP, \fIto_type\fP, \ .br XrmValuePtr \fIto_return\fP; .LP -void XtDirectConvert(\fIconverter\fP, \fIargs\fP, \fInum_args\fP, \fIfrom\fP, \ +void XtDirectConvert(\fIconverter\fP, \fIargs\fP, \fInum_args\fP, \fIfrom\fP, \fIto_return\fP) .br XtConverter \fIconverter\fP; @@ -154,7 +157,7 @@ void XtDirectConvert(\fIconverter\fP, \fIargs\fP, \fInum_args\fP, \fIfrom\fP, \ .br XrmValuePtr \fIto_return\fP; .SH ARGUMENTS -.ds Al that contains the additional arguments needed to perform \ +.ds Al that contains the additional arguments needed to perform the conversion (often NULL) .IP \fIargs\fP 1i Specifies the argument list \*(Al. diff --git a/man/XtConvertAndStore.man b/man/XtConvertAndStore.man index 37947a3..bd19499 100644 --- a/man/XtConvertAndStore.man +++ b/man/XtConvertAndStore.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtConvSt.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtConvSt.man,v 1.3 2000/08/17 19:41:59 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtConvSt.man,v 1.3 2001/02/09 03:47:50 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,11 +126,11 @@ .el .sp 10p .. .ny0 -.TH XtConvertAndStore 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtConvertAndStore 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtConvertAndStore, XtCallConverter \- invoke resource converters .SH SYNTAX -Boolean XtConvertAndStore(\fIwidget\fP, \fIfrom_type\fP, \fIfrom\fP, \ +Boolean XtConvertAndStore(\fIwidget\fP, \fIfrom_type\fP, \fIfrom\fP, \fIto_type\fP, \fIto_in_out\fP) .br Widget \fIwidget\fP; @@ -140,7 +143,7 @@ Boolean XtConvertAndStore(\fIwidget\fP, \fIfrom_type\fP, \fIfrom\fP, \ .br XrmValuePtr \fIto_in_out\fP; .LP -void XtCallConverter(\fIdpy\fP, \fIconverter\fP, \fIargs\fP, \ +void XtCallConverter(\fIdpy\fP, \fIconverter\fP, \fIargs\fP, \fInum_args\fP, \fIfrom\fP, \fIto_in_out\fP, \fIcache_ref_return\fP) .br Display* \fIdpy\fP; diff --git a/man/XtCreateApplicationContext.man b/man/XtCreateApplicationContext.man index bdbc474..9c3d5ce 100644 --- a/man/XtCreateApplicationContext.man +++ b/man/XtCreateApplicationContext.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtCreACon.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtCreACon.man,v 1.3 2000/08/17 19:41:59 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtCreACon.man,v 1.2 2001/01/27 18:20:25 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,7 +127,7 @@ .el .sp 10p .. .ny0 -.TH XtCreateApplicationContext 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtCreateApplicationContext 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtCreateApplicationContext, XtDestroyApplicationContext, XtWidgetToApplicationContext, XtToolkitInitialize \- create, destroy, and obtain an application context .SH SYNTAX diff --git a/man/XtCreateApplicationShell.man b/man/XtCreateApplicationShell.man index 0ac962f..5ab100f 100644 --- a/man/XtCreateApplicationShell.man +++ b/man/XtCreateApplicationShell.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtCreASh.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtCreASh.man,v 1.3 2000/08/17 19:41:59 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtCreASh.man,v 1.3 2001/02/09 03:47:50 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,11 +127,11 @@ .el .sp 10p .. .ny0 -.TH XtCreateApplicationShell 3Xt "Release 6.6" "X Version 11" "XT COMPATIBILITY FUNCTIONS" +.TH XtCreateApplicationShell 3Xt __xorgversion__ "XT COMPATIBILITY FUNCTIONS" .SH NAME XtCreateApplicationShell \- create top-level widget instance .SH SYNTAX -Widget XtCreateApplicationShell(\fIname\fP, \fIwidget_class\fP, \ +Widget XtCreateApplicationShell(\fIname\fP, \fIwidget_class\fP, \fIargs\fP, \fInum_args\fP) .br String \fIname\fP; diff --git a/man/XtCreatePopupShell.man b/man/XtCreatePopupShell.man index 3426792..a7c7835 100644 --- a/man/XtCreatePopupShell.man +++ b/man/XtCreatePopupShell.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtCrePSh.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtCrePSh.man,v 1.3 2000/08/17 19:41:59 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtCrePSh.man,v 1.3 2001/02/09 03:47:50 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,11 +127,11 @@ .el .sp 10p .. .ny0 -.TH XtCreatePopupShell 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtCreatePopupShell 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtCreatePopupShell, XtVaCreatePopupShell \- create a popup shell .SH SYNTAX -Widget XtCreatePopupShell(\fIname\fP, \fIwidget_class\fP, \fIparent\fP, \ +Widget XtCreatePopupShell(\fIname\fP, \fIwidget_class\fP, \fIparent\fP, \fIargs\fP, \fInum_args\fP) .br String \fIname\fP; diff --git a/man/XtCreateSelectionRequest.man b/man/XtCreateSelectionRequest.man index d1f030b..6bfeca4 100644 --- a/man/XtCreateSelectionRequest.man +++ b/man/XtCreateSelectionRequest.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtCreateSR.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtCreateSR.man,v 1.3 2000/08/17 19:42:00 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtCreateSR.man,v 1.2 2001/01/27 18:20:25 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,7 +126,7 @@ .el .sp 10p .. .ny0 -.TH XtCreateSelectionRequest 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtCreateSelectionRequest 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtCreateSelectionRequest, XtSendSelectionRequest, XtCancelSelectionRequest \- bundle multiple selection conversion requests into a single request using MULTIPLE target .SH SYNTAX diff --git a/man/XtCreateWidget.man b/man/XtCreateWidget.man index 8eb767b..701d3c3 100644 --- a/man/XtCreateWidget.man +++ b/man/XtCreateWidget.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtCreWid.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtCreWid.man,v 1.3 2000/08/17 19:41:59 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtCreWid.man,v 1.3 2001/02/09 03:47:50 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,11 +127,11 @@ .el .sp 10p .. .ny0 -.TH XtCreateWidget 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtCreateWidget 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtCreateWidget, XtVaCreateWidget, XtCreateManagedWidget, XtVaCreateManagedWidget, XtDestroyWidget \- create and destroy widgets .SH SYNTAX -Widget XtCreateWidget(\fIname\fP, \fIwidget_class\fP, \fIparent\fP, \ +Widget XtCreateWidget(\fIname\fP, \fIwidget_class\fP, \fIparent\fP, \fIargs\fP, \fInum_args\fP) .br String \fIname\fP; @@ -149,7 +152,7 @@ Widget XtVaCreateWidget(\fIname\fP, \fIwidget_class\fP, \fIparent\fP, ...) .br Widget \fIparent\fP; .LP -Widget XtCreateManagedWidget(\fIname\fP, \fIwidget_class\fP, \fIparent\fP, \ +Widget XtCreateManagedWidget(\fIname\fP, \fIwidget_class\fP, \fIparent\fP, \fIargs\fP, \fInum_args\fP) .br String \fIname\fP; diff --git a/man/XtCreateWindow.man b/man/XtCreateWindow.man index 219479a..56bb307 100644 --- a/man/XtCreateWindow.man +++ b/man/XtCreateWindow.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtCreWin.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtCreWin.man,v 1.3 2000/08/17 19:41:59 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtCreWin.man,v 1.3 2001/02/09 03:47:50 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,11 +127,11 @@ .el .sp 10p .. .ny0 -.TH XtCreateWindow 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtCreateWindow 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtCreateWindow \- window creation convenience function .SH SYNTAX -void XtCreateWindow(\fIw\fP, \fIwindow_class\fP, \fIvisual\fP, \ +void XtCreateWindow(\fIw\fP, \fIwindow_class\fP, \fIvisual\fP, \fIvalue_mask\fP, \fIattributes\fP) .br Widget \fIw\fP; diff --git a/man/XtDisplay.man b/man/XtDisplay.man index 6cbbc2b..e237c04 100644 --- a/man/XtDisplay.man +++ b/man/XtDisplay.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtDisplay.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtDisplay.man,v 1.3 2000/08/17 19:42:00 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtDisplay.man,v 1.2 2001/01/27 18:20:25 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,7 +126,7 @@ .el .sp 10p .. .ny0 -.TH XtDisplay 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtDisplay 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtDisplay, XtDisplayOfObject, XtScreen, XtScreenOfObject, XtWindow, XtWindowOfObject \- obtain window information about a widget .SH SYNTAX diff --git a/man/XtDisplayInitialize.man b/man/XtDisplayInitialize.man index 906de64..83b9f82 100644 --- a/man/XtDisplayInitialize.man +++ b/man/XtDisplayInitialize.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtDisplayI.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtDisplayI.man,v 1.3 2000/08/17 19:42:00 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtDisplayI.man,v 1.3 2001/02/09 03:47:50 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,11 +126,11 @@ .el .sp 10p .. .ny0 -.TH XtDisplayInitialize 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtDisplayInitialize 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtDisplayInitialize, XtOpenDisplay, XtDatabase, XtScreenDatabase, XtCloseDisplay \- initialize, open, or close a display .SH SYNTAX -void XtDisplayInitialize(\fIapp_context\fP, \fIdisplay\fP, \ +void XtDisplayInitialize(\fIapp_context\fP, \fIdisplay\fP, \fIapplication_name\fP, \fIapplication_class\fP, .br \fIoptions\fP, \fInum_options\fP, \fIargc\fP, \fIargv\fP) @@ -148,7 +151,7 @@ void XtDisplayInitialize(\fIapp_context\fP, \fIdisplay\fP, \ .br String *\fIargv\fP; .LP -Display *XtOpenDisplay(\fIapp_context\fP, \fIdisplay_string\fP, \ +Display *XtOpenDisplay(\fIapp_context\fP, \fIdisplay_string\fP, \fIapplication_name\fP, \fIapplication_class\fP, .br \fIoptions\fP, \fInum_options\fP, \fIargc\fP, \fIargv\fP) diff --git a/man/XtDisplayStringConversionWarning.man b/man/XtDisplayStringConversionWarning.man index cc0ef70..b794b8a 100644 --- a/man/XtDisplayStringConversionWarning.man +++ b/man/XtDisplayStringConversionWarning.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtDStrCW.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtDStrCW.man,v 1.3 2000/08/17 19:42:00 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealing in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtDStrCW.man,v 1.3 2001/02/09 03:47:50 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,11 +127,11 @@ .el .sp 10p .. .ny0 -.TH XtDisplayStringConversionWarning 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtDisplayStringConversionWarning 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtDisplayStringConversionWarning \- issue a conversion warning message .SH SYNTAX -void XtDisplayStringConversionWarning(\fIdisplay\fP, \fIfrom_value\fP, \ +void XtDisplayStringConversionWarning(\fIdisplay\fP, \fIfrom_value\fP, \fIto_type\fP) .br Display* \fIdisplay\fP; diff --git a/man/XtDisplayToApplicationContext.man b/man/XtDisplayToApplicationContext.man index 20ea213..ba8dac0 100644 --- a/man/XtDisplayToApplicationContext.man +++ b/man/XtDisplayToApplicationContext.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtDisACon.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtDisACon.man,v 1.3 2000/08/17 19:42:00 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtDisACon.man,v 1.2 2001/01/27 18:20:25 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,7 +126,7 @@ .el .sp 10p .. .ny0 -.TH XtDisplayToApplicationContext 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtDisplayToApplicationContext 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtDisplayToApplicationContext \- obtain an application context .SH SYNTAX diff --git a/man/XtError.man b/man/XtError.man index 47039c8..a826a3e 100644 --- a/man/XtError.man +++ b/man/XtError.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtErr.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtErr.man,v 1.3 2000/08/17 19:42:00 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtErr.man,v 1.3 2001/02/09 03:47:50 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,7 +126,7 @@ .el .sp 10p .. .ny0 -.TH XtError 3Xt "Release 6.6" "X Version 11" "XT COMPATIBILITY FUNCTIONS" +.TH XtError 3Xt __xorgversion__ "XT COMPATIBILITY FUNCTIONS" .SH NAME XtError, XtSetErrorHandler, XtSetWarningHandler, XtWarning \- low-level error handlers .SH SYNTAX @@ -145,7 +148,7 @@ void XtWarning(\fImessage\fP) .SH ARGUMENTS .IP \fImessage\fP 1i Specifies the nonfatal error message that is to be reported. -.ds Ha fatal error procedure, which should not return, \ +.ds Ha fatal error procedure, which should not return, or the nonfatal error procedure, which usually returns .IP \fIhandler\fP 1i Specifies the new \*(Ha. diff --git a/man/XtErrorMsg.man b/man/XtErrorMsg.man index 1eeb5ac..6263fe1 100644 --- a/man/XtErrorMsg.man +++ b/man/XtErrorMsg.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtErrM.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtErrM.man,v 1.3 2000/08/17 19:42:00 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtErrM.man,v 1.3 2001/02/09 03:47:50 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,11 +126,11 @@ .el .sp 10p .. .ny0 -.TH XtErrorMsg 3Xt "Release 6.6" "X Version 11" "XT COMPATIBILITY FUNCTIONS" +.TH XtErrorMsg 3Xt __xorgversion__ "XT COMPATIBILITY FUNCTIONS" .SH NAME XtErrorMsg, XtSetErrorMsgHandler, XtWarningMsg, XtSetWarningMsgHandler \- high-level error handlers .SH SYNTAX -void XtErrorMsg(\fIname\fP, \fItype\fP, \fIclass\fP, \ +void XtErrorMsg(\fIname\fP, \fItype\fP, \fIclass\fP, \fIdefault\fP, \ \fIparams\fP, \fInum_params\fP) .br String \fIname\fP; @@ -150,7 +153,7 @@ void XtSetWarningMsgHandler(\fImsg_handler\fP) .br XtErrorMsgHandler \fImsg_handler\fP; .LP -void XtWarningMsg(\fIname\fP, \fItype\fP, \fIclass\fP, \ +void XtWarningMsg(\fIname\fP, \fItype\fP, \fIclass\fP, \fIdefault\fP, \fIparams\fP, \fInum_params\fP) .br String \fIname\fP; @@ -174,7 +177,7 @@ Specifies the default message to use\*(Dm. Specifies the general kind of error. .IP \fItype\fP 1i Specifies the detailed name of the error. -.ds Mh fatal error procedure, which should not return \ +.ds Mh fatal error procedure, which should not return or the nonfatal error procedure, which usually returns .IP \fImsg_handler\fP 1i Specifies the new \*(Mh. diff --git a/man/XtFindFile.man b/man/XtFindFile.man index 982af1e..90c6c46 100644 --- a/man/XtFindFile.man +++ b/man/XtFindFile.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtFindF.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtFindF.man,v 1.3 2000/08/17 19:42:00 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtFindF.man,v 1.4 2002/10/12 16:06:41 herrb Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,11 +126,11 @@ .el .sp 10p .. .ny0 -.TH XtFindFile 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtFindFile 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtFindFile \- search for a file using substitutions in the path list .SH SYNTAX -String XtFindFile(\fIpath\fP, \fIsubstitutions\fP, \fInum_substitutions\fP,\ +String XtFindFile(\fIpath\fP, \fIsubstitutions\fP, \fInum_substitutions\fP, \fIpredicate\fP) .br String \fIpath\fP; @@ -156,7 +159,7 @@ single colon. The character sequence ``%%'' specifies a percent character that does not introduce a substitution; the sequence is replaced by a single percent character. If a percent character is followed by any other character, -.PN XtFindFile +.ZN XtFindFile looks through the specified \fIsubstitutions\fP for that character in the \fImatch\fP field and if found replaces the percent and match characters with the string in the @@ -164,29 +167,29 @@ corresponding \fIsubstitution\fP field. A \fIsubstitution\fP field entry of NUL is equivalent to a pointer to an empty string. If the operating system does not interpret multiple embedded name separators in the path (i.e., ``/'' in POSIX) the same way as a single separator, -.PN XtFindFile +.ZN XtFindFile will collapse multiple separators into a single one after performing all string substitutions. Except for collapsing embedded separators, the contents of the string substitutions are not interpreted by -.PN XtFindFile +.ZN XtFindFile and may therefore contain any operating-system-dependent characters, including additional name separators. Each resulting string is passed to the predicate procedure until a string is found for which the procedure returns -.PN True ; +.ZN True ; this string is the return value for -.PN XtFindFile . +.ZN XtFindFile . If no string yields a -.PN True +.ZN True return from the predicate, -.PN XtFindFile +.ZN XtFindFile returns NULL. .LP If the \fIpredicate\fP parameter is NULL, an internal procedure that checks if the file exists, is readable, and is not a directory will be used. .LP It is the responsibility of the caller to free the returned string using -.PN XtFree +.ZN XtFree when it is no longer needed. .SH "SEE ALSO" .br diff --git a/man/XtGetActionKeysym.man b/man/XtGetActionKeysym.man index 6caa69b..df133ac 100644 --- a/man/XtGetActionKeysym.man +++ b/man/XtGetActionKeysym.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtGetActK.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtGetActK.man,v 1.3 2000/08/17 19:42:00 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtGetActK.man,v 1.2 2001/01/27 18:20:26 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,7 +126,7 @@ .el .sp 10p .. .ny0 -.TH XtGetActionKeysym 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtGetActionKeysym 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtGetActionKeysym \- obtain corresponding keysym .SH SYNTAX diff --git a/man/XtGetActionList.man b/man/XtGetActionList.man index cc5adda..da539e6 100644 --- a/man/XtGetActionList.man +++ b/man/XtGetActionList.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtGetActL.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtGetActL.man,v 1.3 2000/08/17 19:42:00 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtGetActL.man,v 1.3 2001/02/09 03:47:51 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,11 +126,11 @@ .el .sp 10p .. .ny0 -.TH XtGetActionList 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtGetActionList 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtGetActionList \- obtain class action list .SH SYNTAX -void XtGetActionList(\fIwidget_class\fP, \fIactions_return\fP, \ +void XtGetActionList(\fIwidget_class\fP, \fIactions_return\fP, \fInum_actions_return\fP) .br WidgetClass \fIwidget_class\fP; diff --git a/man/XtGetApplicationNameAndClass.man b/man/XtGetApplicationNameAndClass.man index 02acd4a..2904734 100644 --- a/man/XtGetApplicationNameAndClass.man +++ b/man/XtGetApplicationNameAndClass.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtGetANC.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtGetANC.man,v 1.3 2000/08/17 19:42:00 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtGetANC.man,v 1.3 2001/02/09 03:47:51 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,11 +126,11 @@ .el .sp 10p .. .ny0 -.TH XtGetApplicationNameAndClass 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtGetApplicationNameAndClass 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtGetApplicationNameAndClass \- retrieve application name and class .SH SYNTAX -void XtGetApplicationNameAndClass(\fIdisplay\fP, \fIname_return\fP, \ +void XtGetApplicationNameAndClass(\fIdisplay\fP, \fIname_return\fP, \fIclass_return\fP) .br Display* \fIdisplay\fP; diff --git a/man/XtGetApplicationResources.man b/man/XtGetApplicationResources.man index f2c4ad4..374a049 100644 --- a/man/XtGetApplicationResources.man +++ b/man/XtGetApplicationResources.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtGetAres.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtGetAres.man,v 1.3 2000/08/17 19:42:00 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtGetAres.man,v 1.3 2001/02/09 03:47:51 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,11 +127,11 @@ .el .sp 10p .. .ny0 -.TH XtGetApplicationResources 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtGetApplicationResources 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtGetApplicationResources, XtVaGetApplicationResources \- obtain application resources .SH SYNTAX -void XtGetApplicationResources(\fIw\fP, \fIbase\fP, \fIresources\fP, \ +void XtGetApplicationResources(\fIw\fP, \fIbase\fP, \fIresources\fP, \fInum_resources\fP, \fIargs\fP, \fInum_args\fP) .br Widget \fIw\fP; @@ -143,7 +146,7 @@ void XtGetApplicationResources(\fIw\fP, \fIbase\fP, \fIresources\fP, \ .br Cardinal \fInum_args\fP; .LP -void XtVaGetApplicationResources(\fIw\fP, \fIbase\fP, \fIresources\fP, \ +void XtVaGetApplicationResources(\fIw\fP, \fIbase\fP, \fIresources\fP, \fInum_resources\fP,\fI...\fP) .br Widget \fIw\fP; @@ -167,7 +170,7 @@ Specifies the number of arguments in the argument list. Specifies the number of resources in the resource list. .IP \fIresources\fP 1i Specifies the resource list for the subpart. -.ds Wi that wants resources for a subpart \ +.ds Wi that wants resources for a subpart or that identifies the resource database to search .IP \fIw\fP 1i Specifies the widget \*(Wi. diff --git a/man/XtGetClassExtension.man b/man/XtGetClassExtension.man index e870646..61498fd 100644 --- a/man/XtGetClassExtension.man +++ b/man/XtGetClassExtension.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtGetClExt.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtGetClExt.man,v 1.3 2000/08/17 19:42:00 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtGetClExt.man,v 1.3 2001/02/09 03:47:51 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,11 +126,11 @@ .el .sp 10p .. .ny0 -.TH XtGetClassExtension 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtGetClassExtension 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtGetClassExtension \- locate a class extension record .SH SYNTAX -XtPointer XtGetClassExtension(\fIobject_class\fP, \fIbyte_offset\fP \ +XtPointer XtGetClassExtension(\fIobject_class\fP, \fIbyte_offset\fP \fItype\fP, \fIversion\fP, \fIrecord_size\fP) .br WidgetClass \fIobject_class\fP; diff --git a/man/XtGetDisplays.man b/man/XtGetDisplays.man index 4443b72..02152ce 100644 --- a/man/XtGetDisplays.man +++ b/man/XtGetDisplays.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtGetDisp.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtGetDisp.man,v 1.3 2000/08/17 19:42:00 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtGetDisp.man,v 1.2 2001/01/27 18:20:26 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,7 +126,7 @@ .el .sp 10p .. .ny0 -.TH XtGetDisplays 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtGetDisplays 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtGetDisplays \- retrieve a list of displays associated with an application context .SH SYNTAX diff --git a/man/XtGetErrorDatabase.man b/man/XtGetErrorDatabase.man index 5585fb7..f8e00cf 100644 --- a/man/XtGetErrorDatabase.man +++ b/man/XtGetErrorDatabase.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtGEDB.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtGEDB.man,v 1.3 2000/08/17 19:42:00 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtGEDB.man,v 1.3 2001/02/09 03:47:50 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,13 +127,13 @@ .el .sp 10p .. .ny0 -.TH XtGetErrorDatabase 3Xt "Release 6.6" "X Version 11" "XT COMPATIBILITY FUNCTIONS" +.TH XtGetErrorDatabase 3Xt __xorgversion__ "XT COMPATIBILITY FUNCTIONS" .SH NAME XtGetErrorDatabase, XtGetErrorDatabaseText \- obtain error database .SH SYNTAX XrmDatabase *XtGetErrorDatabase() .LP -void XtGetErrorDatabaseText(\fIname\fP, \fItype\fP, \fIclass\fP, \ +void XtGetErrorDatabaseText(\fIname\fP, \fItype\fP, \fIclass\fP, \fIdefault\fP, \fIbuffer_return\fP, \fInbytes\fP, \fIdatabase\fP) .br char *\fIname\fP, *\fItype\fP, *\fIclass\fP; diff --git a/man/XtGetGC.man b/man/XtGetGC.man index c1f6f99..d45ddf2 100644 --- a/man/XtGetGC.man +++ b/man/XtGetGC.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtGetGC.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtGetGC.man,v 1.3 2000/08/17 19:42:00 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtGetGC.man,v 1.2 2001/01/27 18:20:26 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,7 +127,7 @@ .el .sp 10p .. .ny0 -.TH XtGetGC 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtGetGC 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtGetGC, XtReleaseGC \- obtain and destroy a sharable GC .SH SYNTAX diff --git a/man/XtGetKeyboardFocusWidget.man b/man/XtGetKeyboardFocusWidget.man index 8abd1b8..681b539 100644 --- a/man/XtGetKeyboardFocusWidget.man +++ b/man/XtGetKeyboardFocusWidget.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtGetKFoc.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtGetKFoc.man,v 1.3 2000/08/17 19:42:00 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtGetKFoc.man,v 1.2 2001/01/27 18:20:26 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,7 +126,7 @@ .el .sp 10p .. .ny0 -.TH XtGetKeyboardFocusWidget 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtGetKeyboardFocusWidget 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtGetKeyboardFocusWidget \- extension event handling .SH SYNTAX diff --git a/man/XtGetKeysymTable.man b/man/XtGetKeysymTable.man index a941649..35e991b 100644 --- a/man/XtGetKeysymTable.man +++ b/man/XtGetKeysymTable.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtKeysym.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtKeysym.man,v 1.3 2000/08/17 19:42:01 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealing in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtKeysym.man,v 1.3 2001/02/09 03:47:51 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,11 +127,11 @@ .el .sp 10p .. .ny0 -.TH XtGetKeysymTable 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtGetKeysymTable 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtGetKeysymTable, XtKeysymToKeycodeList \- query keysyms and keycodes .SH SYNTAX -Keysym* XtGetKeysymTable(\fIdisplay\fP, \fImin_keycode_return\fP, \ +Keysym* XtGetKeysymTable(\fIdisplay\fP, \fImin_keycode_return\fP, \fIkeysyms_per_keycode_return\fP) .br Display* \fIdisplay\fP; @@ -137,7 +140,7 @@ Keysym* XtGetKeysymTable(\fIdisplay\fP, \fImin_keycode_return\fP, \ .br int* \fIkeysyms_per_keycode_return\fP; .LP -void XtKeysymToKeycodeList(\fIdisplay\fP, \fIkeysym\fP, \ +void XtKeysymToKeycodeList(\fIdisplay\fP, \fIkeysym\fP, \fIkeycodes_return\fP, \fIkeycount_return\fP) .br Display* \fIdisplay\fP; diff --git a/man/XtGetResourceList.man b/man/XtGetResourceList.man index 8996344..f48ee3e 100644 --- a/man/XtGetResourceList.man +++ b/man/XtGetResourceList.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtGetRList.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtGetRList.man,v 1.3 2000/08/17 19:42:00 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtGetRList.man,v 1.3 2001/02/09 03:47:51 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,7 +127,7 @@ .el .sp 10p .. .ny0 -.TH XtGetResourceList 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtGetResourceList 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtGetResourceList, XtGetConstraintResourceList \- obtain resource list .SH SYNTAX @@ -136,7 +139,7 @@ void XtGetResourceList(\fIclass\fP, \fIresources_return\fP, \fInum_resources_ret .br Cardinal *\fInum_resources_return\fP; .LP -void XtGetConstraintResourceList(\fIclass\fP, \fIresources_return\fP, \ +void XtGetConstraintResourceList(\fIclass\fP, \fIresources_return\fP, \fInum_resources_return\fP); .br WidgetClass \fIclass\fP; diff --git a/man/XtGetSelectionParameters.man b/man/XtGetSelectionParameters.man index 0aa48a8..3125b27 100644 --- a/man/XtGetSelectionParameters.man +++ b/man/XtGetSelectionParameters.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtGetSP.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtGetSP.man,v 1.3 2000/08/17 19:42:00 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtGetSP.man,v 1.3 2001/02/09 03:47:51 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,11 +126,11 @@ .el .sp 10p .. .ny0 -.TH XtGetSelectionParameters 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtGetSelectionParameters 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtGetSelectionParameters \- retrieve target parameters for a selection request with a single target .SH SYNTAX -void XtGetSelectionParameters(\fIowner\fP, \fIselection\fP, \fIrequest_id\fP, \ +void XtGetSelectionParameters(\fIowner\fP, \fIselection\fP, \fIrequest_id\fP, \fItype_return\fP, \fIvalue_return\fP, \fIlength_return\fP, \fIformat_return\fP) .br Widget \fIowner\fP; diff --git a/man/XtGetSelectionRequest.man b/man/XtGetSelectionRequest.man index 3bf3c01..0144bcf 100644 --- a/man/XtGetSelectionRequest.man +++ b/man/XtGetSelectionRequest.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtGetSR.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtGetSR.man,v 1.3 2000/08/17 19:42:00 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtGetSR.man,v 1.3 2001/02/09 03:47:51 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,11 +126,11 @@ .el .sp 10p .. .ny0 -.TH XtGetSelectionRequest 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtGetSelectionRequest 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtGetSelectionRequest \- retrieve the event that triggered the XtConvertSelectionProc .SH SYNTAX -XSelectionRequestEvent* XtGetSelectionRequest(\fIw\fP, \fIselection\fP, \ +XSelectionRequestEvent* XtGetSelectionRequest(\fIw\fP, \fIselection\fP, \fIrequest_id\fP) .br Widget \fIw\fP; diff --git a/man/XtGetSelectionTimeout.man b/man/XtGetSelectionTimeout.man index 29ea665..491c7a5 100644 --- a/man/XtGetSelectionTimeout.man +++ b/man/XtGetSelectionTimeout.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtGetSTO.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtGetSTO.man,v 1.3 2000/08/17 19:42:00 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtGetSTO.man,v 1.2 2001/01/27 18:20:27 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,7 +126,7 @@ .el .sp 10p .. .ny0 -.TH XtGetSelectionTimeout 3Xt "Release 6.6" "X Version 11" "XT COMPATIBILITY FUNCTIONS" +.TH XtGetSelectionTimeout 3Xt __xorgversion__ "XT COMPATIBILITY FUNCTIONS" .SH NAME XtGetSelectionTimeout, XtSetSelectionTimeout \- set and obtain selection timeout values .SH SYNTAX diff --git a/man/XtGetSelectionValue.man b/man/XtGetSelectionValue.man index 11a5353..3976990 100644 --- a/man/XtGetSelectionValue.man +++ b/man/XtGetSelectionValue.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtGetSVal.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtGetSVal.man,v 1.3 2000/08/17 19:42:00 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealing in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtGetSVal.man,v 1.3 2001/02/09 03:47:51 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,11 +127,11 @@ .el .sp 10p .. .ny0 -.TH XtGetSelectionValue 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtGetSelectionValue 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtGetSelectionValue, XtGetSelectionValues \- obtain selection values .SH SYNTAX -void XtGetSelectionValue(\fIw\fP, \fIselection\fP, \fItarget\fP, \ +void XtGetSelectionValue(\fIw\fP, \fIselection\fP, \fItarget\fP, \fIcallback\fP, \fIclient_data\fP, \fItime\fP) .br Widget \fIw\fP; @@ -143,7 +146,7 @@ void XtGetSelectionValue(\fIw\fP, \fIselection\fP, \fItarget\fP, \ .br Time \fItime\fP; .LP -void XtGetSelectionValues(\fIw\fP, \fIselection\fP, \fItargets\fP, \ +void XtGetSelectionValues(\fIw\fP, \fIselection\fP, \fItargets\fP, \fIcount\fP, \fIcallback\fP, \fIclient_data\fP, \fItime\fP) .br Widget \fIw\fP; diff --git a/man/XtGetSelectionValueIncremental.man b/man/XtGetSelectionValueIncremental.man index 4ab34c9..0a6c533 100644 --- a/man/XtGetSelectionValueIncremental.man +++ b/man/XtGetSelectionValueIncremental.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtGetSValI.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtGetSValI.man,v 1.3 2000/08/17 19:42:01 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtGetSValI.man,v 1.3 2001/02/09 03:47:51 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,11 +126,11 @@ .el .sp 10p .. .ny0 -.TH XtGetSelectionValueIncremental 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtGetSelectionValueIncremental 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtGetSelectionValueIncremental, XtGetSelectionValuesIncremental \- obtain selection values .SH SYNTAX -void XtGetSelectionValueIncremental(\fIw\fP, \fIselection\fP, \fItarget\fP, \ +void XtGetSelectionValueIncremental(\fIw\fP, \fIselection\fP, \fItarget\fP, \fIcallback\fP, \fIclient_data\fP, \fItime\fP) .br Widget \fIw\fP; @@ -142,7 +145,7 @@ void XtGetSelectionValueIncremental(\fIw\fP, \fIselection\fP, \fItarget\fP, \ .br Time \fItime\fP; .LP -void XtGetSelectionValuesIncremental(\fIw\fP, \fIselection\fP, \fItargets\fP, \ +void XtGetSelectionValuesIncremental(\fIw\fP, \fIselection\fP, \fItargets\fP, \fIcount\fP, \fIcallback\fP, \fIclient_data\fP, \fItime\fP) .br Widget \fIw\fP; diff --git a/man/XtGetSubresources.man b/man/XtGetSubresources.man index 2063faa..ab64088 100644 --- a/man/XtGetSubresources.man +++ b/man/XtGetSubresources.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtGetSres.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtGetSres.man,v 1.3 2000/08/17 19:42:01 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtGetSres.man,v 1.3 2001/02/09 03:47:51 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,11 +127,11 @@ .el .sp 10p .. .ny0 -.TH XtGetSubresources 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtGetSubresources 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtGetSubresources, XtVaGetSubresources \- obtain subresources .SH SYNTAX -void XtGetSubresources(\fIw\fP, \fIbase\fP, \fIname\fP, \fIclass\fP, \ +void XtGetSubresources(\fIw\fP, \fIbase\fP, \fIname\fP, \fIclass\fP, \fIresources\fP, \fInum_resources\fP, \fIargs\fP, \fInum_args\fP) .br Widget \fIw\fP; @@ -147,7 +150,7 @@ void XtGetSubresources(\fIw\fP, \fIbase\fP, \fIname\fP, \fIclass\fP, \ .br Cardinal \fInum_args\fP; .LP -void XtVaGetSubresources(\fIw\fP, \fIbase\fP, \fIname\fP, \fIclass\fP, \ +void XtVaGetSubresources(\fIw\fP, \fIbase\fP, \fIname\fP, \fIclass\fP, \fIresources\fP, \fInum_resources\fP, \fI...\fP) .br Widget \fIw\fP; @@ -180,7 +183,7 @@ Specifies the number of arguments in the argument list. Specifies the number of resources in the resource list. .IP \fIresources\fP 1i Specifies the resource list for the subpart. -.ds Wi that wants resources for a subpart \ +.ds Wi that wants resources for a subpart or that identifies the resource database to search .IP \fIw\fP 1i Specifies the widget \*(Wi. diff --git a/man/XtGrabKey.man b/man/XtGrabKey.man index 8256122..14597c6 100644 --- a/man/XtGrabKey.man +++ b/man/XtGrabKey.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtGrabKey.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtGrabKey.man,v 1.3 2000/08/17 19:42:01 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtGrabKey.man,v 1.3 2001/02/09 03:47:51 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,11 +126,11 @@ .el .sp 10p .. .ny0 -.TH XtGrabKey 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtGrabKey 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtGrabKey, XtUngrabKey, XtGrabKeyboard, XtUngrabKeyboard, XtGrabButton, XtUngrabButton, XtGrabPointer, XtUngrabPointer \- manage grabs .SH SYNTAX -void XtGrabKey(\fIwidget\fP, \fIkeycode\fP, \fImodifiers\fP, \ +void XtGrabKey(\fIwidget\fP, \fIkeycode\fP, \fImodifiers\fP, \fIowner_events\fP, \fIpointer_mode\fP, \fIkeyboard_mode\fP) .br Widget \fIwidget\fP; @@ -150,7 +153,7 @@ void XtUngrabKey(\fIwidget\fP, \fIkeycode\fP, \fImodifiers\fP) .br Modifiers \fImodifiers\fP; .LP -int XtGrabKeyboard(\fIwidget\fP, \fIowner_events\fP, \fIpointer_mode\fP, \ +int XtGrabKeyboard(\fIwidget\fP, \fIowner_events\fP, \fIpointer_mode\fP, \fIkeyboard_mode\fP, \fItime\fP) .br Widget \fIwidget\fP; @@ -169,8 +172,8 @@ void XtUngrabKeyboard(\fIwidget\fP, \fItime\fP) .br Time \fItime\fP; .LP -void XtGrabButton(\fIwidget\fP, \fIbutton\fP, \fImodifiers\fP, \ -\fIowner_events\fP, \fIevent_mask\fP, \fIpointer_mode\fP, \fIkeyboard_mode\fP, \ +void XtGrabButton(\fIwidget\fP, \fIbutton\fP, \fImodifiers\fP, +\fIowner_events\fP, \fIevent_mask\fP, \fIpointer_mode\fP, \fIkeyboard_mode\fP, \fIconfine_to\fP, \fIcursor\fP) .br Widget \fIwidget\fP; @@ -199,8 +202,8 @@ void XtUngrabButton(\fIwidget\fP, \fIbutton\fP, \fImodifiers\fP) .br Modifiers \fImodifiers\fP; .LP -int XtGrabPointer(\fIwidget\fP, \fIowner_events\fP, \fIevent_mask\fP, \ -\fIpointer_mode\fP, \fIkeyboard_mode\fP, \fIconfine_to\fP, \fIcursor\fP, \ +int XtGrabPointer(\fIwidget\fP, \fIowner_events\fP, \fIevent_mask\fP, +\fIpointer_mode\fP, \fIkeyboard_mode\fP, \fIconfine_to\fP, \fIcursor\fP, \fItime\fP) .br Widget \fIwidget\fP; diff --git a/man/XtHooksOfDisplay.man b/man/XtHooksOfDisplay.man index aa42a83..997337d 100644 --- a/man/XtHooksOfDisplay.man +++ b/man/XtHooksOfDisplay.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtHookOD.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtHookOD.man,v 1.3 2000/08/17 19:42:01 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtHookOD.man,v 1.2 2001/01/27 18:20:27 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,7 +126,7 @@ .el .sp 10p .. .ny0 -.TH XtHooksOfDisplay 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtHooksOfDisplay 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtHooksOfDisplay \- external agent access points .SH SYNTAX diff --git a/man/XtInitialize.man b/man/XtInitialize.man index a6424e3..0da0bfe 100644 --- a/man/XtInitialize.man +++ b/man/XtInitialize.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtInit.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtInit.man,v 1.3 2000/08/17 19:42:01 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtInit.man,v 1.3 2001/02/09 03:47:51 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,11 +126,11 @@ .el .sp 10p .. .ny0 -.TH XtInitialize 3Xt "Release 6.6" "X Version 11" "XT COMPATIBILITY FUNCTIONS" +.TH XtInitialize 3Xt __xorgversion__ "XT COMPATIBILITY FUNCTIONS" .SH NAME XtInitialize \- initialize .SH SYNTAX -Widget XtInitialize(\fIshell_name\fP, \fIapplication_class\fP, \ +Widget XtInitialize(\fIshell_name\fP, \fIapplication_class\fP, \fIoptions\fP, \fInum_options\fP, \fIargc\fP, \fIargv\fP) .br String \fIshell_name\fP; diff --git a/man/XtInitializeWidgetClass.man b/man/XtInitializeWidgetClass.man index b9ba3ac..99f02cf 100644 --- a/man/XtInitializeWidgetClass.man +++ b/man/XtInitializeWidgetClass.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtInitWC.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtInitWC.man,v 1.3 2000/08/17 19:42:01 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtInitWC.man,v 1.2 2001/01/27 18:20:27 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,7 +126,7 @@ .el .sp 10p .. .ny0 -.TH XtInitializeWidgetClass 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtInitializeWidgetClass 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtInitializeWidgetClass \- initialize a widget class .SH SYNTAX diff --git a/man/XtInsertEventTypeHandler.man b/man/XtInsertEventTypeHandler.man index 0768dd2..d01bf21 100644 --- a/man/XtInsertEventTypeHandler.man +++ b/man/XtInsertEventTypeHandler.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtExtEvDis.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtExtEvDis.man,v 1.3 2000/08/17 19:42:00 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtExtEvDis.man,v 1.3 2001/02/09 03:47:50 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,13 +126,13 @@ .el .sp 10p .. .ny0 -.TH XtInsertEventTypeHandler 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtInsertEventTypeHandler 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME -XtInsertEventTypeHandler, XtRemoveEventTypeHandler, \ -XtRegisterExtensionSelector, XtSetEventDispatcher, XtDispatchEventToWidget \ +XtInsertEventTypeHandler, XtRemoveEventTypeHandler, +XtRegisterExtensionSelector, XtSetEventDispatcher, XtDispatchEventToWidget \- extension event handling .SH SYNTAX -void XtInsertEventTypeHandler(\fIwidget\fP, \fIevent_type\fP, \ +void XtInsertEventTypeHandler(\fIwidget\fP, \fIevent_type\fP, \fIselect_data\fP, \fIproc\fP, \fIclient_data\fP, \fIposition\fP) .br Widget \fIwdget\fP; @@ -144,7 +147,7 @@ void XtInsertEventTypeHandler(\fIwidget\fP, \fIevent_type\fP, \ .br XtListPosition \fIposition\fP; .LP -void XtRemoveEventTypeHandler(\fIwidget\fP, \fIevent_type\fP, \ +void XtRemoveEventTypeHandler(\fIwidget\fP, \fIevent_type\fP, \fIselect_data\fP, \fIproc\fP, \fIclient_data\fP) .br Widget \fIwdget\fP; @@ -157,7 +160,7 @@ void XtRemoveEventTypeHandler(\fIwidget\fP, \fIevent_type\fP, \ .br XtPointer \fIclient_data\fP; .LP -void XtRegisterExtensionSelector(\fIdisplay\fP, \fImin_event_type\fP, \ +void XtRegisterExtensionSelector(\fIdisplay\fP, \fImin_event_type\fP, \fImax_event_type\fP, \fIproc\fP, \fIclient_data\fP) .br Display* \fIdisplay\fP; @@ -170,7 +173,7 @@ void XtRegisterExtensionSelector(\fIdisplay\fP, \fImin_event_type\fP, \ .br XtPointer \fIclient_data\fP; .LP -XtEventDispatchProc XtSetEventDispatcher(\fIdisplay\fP, \fIevent_type\fP, \ +XtEventDispatchProc XtSetEventDispatcher(\fIdisplay\fP, \fIevent_type\fP, \fIproc\fP) .br Widget \fIwidget\fP; diff --git a/man/XtLastEventProcessed.man b/man/XtLastEventProcessed.man index 563f992..3bc6529 100644 --- a/man/XtLastEventProcessed.man +++ b/man/XtLastEventProcessed.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtLastProc.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtLastProc.man,v 1.3 2000/08/17 19:42:01 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtLastProc.man,v 1.2 2001/01/27 18:20:27 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,7 +126,7 @@ .el .sp 10p .. .ny0 -.TH XtLastEventProcessed 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtLastEventProcessed 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtLastEventProcessed, XtLastTimestampProcessed \- last event, last timestamp processed .SH SYNTAX diff --git a/man/XtMakeGeometryRequest.man b/man/XtMakeGeometryRequest.man index 03f85ee..88cc173 100644 --- a/man/XtMakeGeometryRequest.man +++ b/man/XtMakeGeometryRequest.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtMakGReq.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtMakGReq.man,v 1.3 2000/08/17 19:42:01 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtMakGReq.man,v 1.3 2001/02/09 03:47:51 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,11 +127,11 @@ .el .sp 10p .. .ny0 -.TH XtMakeGeometryRequest 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtMakeGeometryRequest 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtMakeGeometryRequest, XtMakeResizeRequest \- make geometry manager request .SH SYNTAX -XtGeometryResult XtMakeGeometryRequest(\fIw\fP, \fIrequest\fP, \ +XtGeometryResult XtMakeGeometryRequest(\fIw\fP, \fIrequest\fP, \fIreply_return\fP) .br Widget \fIw\fP; @@ -137,7 +140,7 @@ XtGeometryResult XtMakeGeometryRequest(\fIw\fP, \fIrequest\fP, \ .br XtWidgetGeometry *\fIreply_return\fP; .LP -XtGeometryResult XtMakeResizeRequest(\fIw\fP, \fIwidth\fP, \fIheight\fP, \ +XtGeometryResult XtMakeResizeRequest(\fIw\fP, \fIwidth\fP, \fIheight\fP, \fIwidth_return\fP, \fIheight_return\fP) .br Widget \fIw\fP; diff --git a/man/XtMalloc.man b/man/XtMalloc.man index 8f870c3..cc02940 100644 --- a/man/XtMalloc.man +++ b/man/XtMalloc.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtMalloc.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtMalloc.man,v 1.3 2000/08/17 19:42:01 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtMalloc.man,v 1.2 2001/01/27 18:20:28 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,7 +127,7 @@ .el .sp 10p .. .ny0 -.TH XtMalloc 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtMalloc 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtMalloc, XtCalloc, XtRealloc, XtFree, XtNew, XtNewString \- memory management functions .SH SYNTAX diff --git a/man/XtManageChildren.man b/man/XtManageChildren.man index 4f403c0..0497056 100644 --- a/man/XtManageChildren.man +++ b/man/XtManageChildren.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtManChild.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtManChild.man,v 1.3 2000/08/17 19:42:01 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtManChild.man,v 1.2 2001/01/27 18:20:28 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,7 +127,7 @@ .el .sp 10p .. .ny0 -.TH XtManageChildren 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtManageChildren 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtManageChildren, XtManageChild, XtUnmanageChildren, XtUnmanageChild, XtChangeManagedSet, XtIsManaged \- manage and unmanage children .SH SYNTAX diff --git a/man/XtMapWidget.man b/man/XtMapWidget.man index 37c7b30..0098157 100644 --- a/man/XtMapWidget.man +++ b/man/XtMapWidget.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtMapWid.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtMapWid.man,v 1.3 2000/08/17 19:42:01 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtMapWid.man,v 1.2 2001/01/27 18:20:28 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,7 +127,7 @@ .el .sp 10p .. .ny0 -.TH XtMapWidget 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtMapWidget 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtMapWidget, XtSetMappedWhenManaged, XtUnmapWidget \- map and unmap widgets .SH SYNTAX diff --git a/man/XtName.man b/man/XtName.man index 3d97fe7..82c6d86 100644 --- a/man/XtName.man +++ b/man/XtName.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtName.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtName.man,v 1.3 2000/08/17 19:42:01 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtName.man,v 1.2 2001/01/27 18:20:28 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,7 +126,7 @@ .el .sp 10p .. .ny0 -.TH XtName 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtName 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtName \- obtain widget's name .SH SYNTAX diff --git a/man/XtNameToWidget.man b/man/XtNameToWidget.man index 985c0cb..82fb843 100644 --- a/man/XtNameToWidget.man +++ b/man/XtNameToWidget.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtNameTWid.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtNameTWid.man,v 1.3 2000/08/17 19:42:01 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtNameTWid.man,v 1.2 2001/01/27 18:20:28 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,7 +127,7 @@ .el .sp 10p .. .ny0 -.TH XtNameToWidget 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtNameToWidget 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtNameToWidget, XtWindowToWidget \- translating strings to widgets or widgets to windows .SH SYNTAX diff --git a/man/XtNextEvent.man b/man/XtNextEvent.man index 3036b14..f654bd9 100644 --- a/man/XtNextEvent.man +++ b/man/XtNextEvent.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtNextEv.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtNextEv.man,v 1.3 2000/08/17 19:42:01 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealing in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtNextEv.man,v 1.4 2001/01/27 18:20:28 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,7 +127,7 @@ .el .sp 10p .. .ny0 -.TH XtNextEvent 3Xt "Release 6.6" "X Version 11" "XT COMPATIBILITY FUNCTIONS" +.TH XtNextEvent 3Xt __xorgversion__ "XT COMPATIBILITY FUNCTIONS" .SH NAME XtNextEvent, XtPending, XtPeekEvent, XtProcessEvent, XtMainLoop \- query and process events and input .SH SYNTAX diff --git a/man/XtOffset.man b/man/XtOffset.man index a4af121..af7c801 100644 --- a/man/XtOffset.man +++ b/man/XtOffset.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtOffset.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtOffset.man,v 1.3 2000/08/17 19:42:01 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtOffset.man,v 1.2 2001/01/27 18:20:28 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,7 +126,7 @@ .el .sp 10p .. .ny0 -.TH XtOffset 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtOffset 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtOffset, XtOffsetOf, XtNumber \- determine the byte offset or number of array elements .SH SYNTAX diff --git a/man/XtOpenApplication.man b/man/XtOpenApplication.man index be0cf3a..9b3896c 100644 --- a/man/XtOpenApplication.man +++ b/man/XtOpenApplication.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtOpenApp.man,v 1.5 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtOpenApp.man,v 1.3 2000/08/17 19:42:01 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtOpenApp.man,v 1.5 2001/03/07 15:13:09 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,12 +126,12 @@ .el .sp 10p .. .ny0 -.TH XtOpenApplication 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtOpenApplication 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtOpenApplication, XtVaOpenApplication \- initialize, open, or close a display .SH SYNTAX -Widget XtOpenApplication(\fIapp_context_return\fP, \fIapplication_class\fP, \ -\fIoptions\fP, \fInum_options\fP, \fIargc_in_out\fP, \fIargv_in_out\fP, \ +Widget XtOpenApplication(\fIapp_context_return\fP, \fIapplication_class\fP, +\fIoptions\fP, \fInum_options\fP, \fIargc_in_out\fP, \fIargv_in_out\fP, \fIfallback_resources\fP, \fIwidget_class\fP, \fIargs\fP, \fInum_args\fP) .br XtAppContext* \fIapp_context_return\fP; @@ -151,8 +154,8 @@ Widget XtOpenApplication(\fIapp_context_return\fP, \fIapplication_class\fP, \ .br Cardinal \fInum_args\fP; .LP -Widget XtVaOpenApplication(\fIapp_context_return\fP, \fIapplication_class\fP, \ -\fIoptions\fP, \fInum_options\fP, \fIargc_in_out\fP, \fIargv_in_out\fP, \ +Widget XtVaOpenApplication(\fIapp_context_return\fP, \fIapplication_class\fP, +\fIoptions\fP, \fInum_options\fP, \fIargc_in_out\fP, \fIargv_in_out\fP, \fIfallback_resources\fP, \fIwidget_class\fP, ...) .br XtAppContext* \fIapp_context_return\fP; @@ -213,13 +216,12 @@ then calls with \fIdisplay_string\fP NULL and \fIapplication_name\fP NULL, and finally calls .ZN XtAppCreateShell -with \fIappcation_name\fP NULL, \fIwidget_class\fP -.ZN applicationShellWidgetClass , +with \fIapplication_name\fP NULL, the specified \fIwidget_class\fP, and the specified \fIargs\fP and \fInum_args\fP and returns the created shell. The modified \fIargc\fP and \fIargv\fP returned by .ZN XtDisplayInitialize are returned in \fIargc_in_out\fP and \fIargv_in_out\fP. If -\fIapp_context_return\fI is not NULL, the created application context +\fIapp_context_return\fP is not NULL, the created application context is also returned. If the display specified by the command line cannot be opened, an error message is issued and .ZN XtOpenApplication @@ -233,6 +235,8 @@ XtAppInitialize and XtVaAppInitialize have been superceded by and .ZN XtVaOpenApplication respectively. +.SH "SEE ALSO" +XtAppInitialize(3Xt), XtVaAppInitialize(3Xt) .br \fI\*(xT\fP .br diff --git a/man/XtOwnSelection.man b/man/XtOwnSelection.man index 5b0cb06..04abf11 100644 --- a/man/XtOwnSelection.man +++ b/man/XtOwnSelection.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtOwnSel.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtOwnSel.man,v 1.3 2000/08/17 19:42:02 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtOwnSel.man,v 1.3 2001/02/09 03:47:51 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,11 +127,11 @@ .el .sp 10p .. .ny0 -.TH XtOwnSelection 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtOwnSelection 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtOwnSelection, XtOwnSelectionIncremental, XtDisownSelection \- set selection owner .SH SYNTAX -Boolean XtOwnSelection(\fIw\fP, \fIselection\fP, \fItime\fP, \ +Boolean XtOwnSelection(\fIw\fP, \fIselection\fP, \fItime\fP, \fIconvert_proc\fP, \fIlose_selection\fP, \fIdone_proc\fP) .br Widget \fIw\fP; @@ -143,8 +146,8 @@ Boolean XtOwnSelection(\fIw\fP, \fIselection\fP, \fItime\fP, \ .br XtSelectionDoneProc \fIdone_proc\fP; .LP -Boolean XtOwnSelectionIncremental(\fIw\fP, \fIselection\fP, \fItime\fP, \ -\fIconvert_callback\fP, \fIlose_callback\fP, \fIdone_callback\fP, \ +Boolean XtOwnSelectionIncremental(\fIw\fP, \fIselection\fP, \fItime\fP, +\fIconvert_callback\fP, \fIlose_callback\fP, \fIdone_callback\fP, \fIcancel_callback\fP, \fIclient_data\fP) .br Widget \fIw\fP; diff --git a/man/XtParent.man b/man/XtParent.man index 00bf366..b42e554 100644 --- a/man/XtParent.man +++ b/man/XtParent.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtParent.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtParent.man,v 1.3 2000/08/17 19:42:02 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtParent.man,v 1.2 2001/01/27 18:20:29 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,7 +127,7 @@ .el .sp 10p .. .ny0 -.TH XtParent 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtParent 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtParent \- obtain widget's parent widget id .SH SYNTAX diff --git a/man/XtParseAcceleratorTable.man b/man/XtParseAcceleratorTable.man index 7585473..0bc24ee 100644 --- a/man/XtParseAcceleratorTable.man +++ b/man/XtParseAcceleratorTable.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtParATab.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtParATab.man,v 1.3 2000/08/17 19:42:02 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtParATab.man,v 1.2 2001/01/27 18:20:28 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,7 +127,7 @@ .el .sp 10p .. .ny0 -.TH XtParseAcceleratorTable 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtParseAcceleratorTable 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtParseAcceleratorTable, XtInstallAccelerators, XtInstallAllAccelerators \- managing accelerator tables .SH SYNTAX diff --git a/man/XtParseTranslationTable.man b/man/XtParseTranslationTable.man index 6c01521..c7756e4 100644 --- a/man/XtParseTranslationTable.man +++ b/man/XtParseTranslationTable.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtParTTab.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtParTTab.man,v 1.3 2000/08/17 19:42:02 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtParTTab.man,v 1.2 2001/01/27 18:20:28 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,7 +127,7 @@ .el .sp 10p .. .ny0 -.TH XtParseTranslationTable 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtParseTranslationTable 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtParseTranslationTable, XtAugmentTranslations, XtOverrideTranslations, XtUninstallTranslations \- manage translation tables .SH SYNTAX diff --git a/man/XtPopdown.man b/man/XtPopdown.man index 8503a3e..e0362f5 100644 --- a/man/XtPopdown.man +++ b/man/XtPopdown.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtPopdown.man,v 1.4 2001/03/16 17:53:53 pookie Exp $ +.\" $Xorg: XtPopdown.man,v 1.3 2000/08/17 19:42:02 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtPopdown.man,v 1.2 2001/01/27 18:20:29 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,7 +127,7 @@ .el .sp 10p .. .ny0 -.TH XtPopdown 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtPopdown 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtPopdown, XtCallbackPopdown \- unmap a pop-up .SH SYNTAX diff --git a/man/XtPopup.man b/man/XtPopup.man index ab9e658..e7098ef 100644 --- a/man/XtPopup.man +++ b/man/XtPopup.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtPopup.man,v 1.4 2001/03/16 17:53:53 pookie Exp $ +.\" $Xorg: XtPopup.man,v 1.3 2000/08/17 19:42:02 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtPopup.man,v 1.2 2001/01/27 18:20:29 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,7 +127,7 @@ .el .sp 10p .. .ny0 -.TH XtPopup 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtPopup 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtPopup, XtPopupSpringLoaded, XtCallbackNone, XtCallbackNonexclusive, XtCallbackExclusive \- map a pop-up .SH SYNTAX diff --git a/man/XtProcessLock.man b/man/XtProcessLock.man index 1f44f3a..c273853 100644 --- a/man/XtProcessLock.man +++ b/man/XtProcessLock.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtProcLock.man,v 1.4 2001/03/16 17:53:53 pookie Exp $ +.\" $Xorg: XtProcLock.man,v 1.3 2000/08/17 19:42:02 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtProcLock.man,v 1.2 2001/01/27 18:20:29 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,7 +126,7 @@ .el .sp 10p .. .ny0 -.TH XtProcessLock 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtProcessLock 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtProcessLock, XtProcessUnlock \- lock and unlock process .SH SYNTAX diff --git a/man/XtQueryGeometry.man b/man/XtQueryGeometry.man index cbb093c..c477171 100644 --- a/man/XtQueryGeometry.man +++ b/man/XtQueryGeometry.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtQueryGeo.man,v 1.4 2001/03/16 17:53:53 pookie Exp $ +.\" $Xorg: XtQueryGeo.man,v 1.3 2000/08/17 19:42:02 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtQueryGeo.man,v 1.3 2001/02/09 03:47:51 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,11 +127,11 @@ .el .sp 10p .. .ny0 -.TH XtQueryGeometry 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtQueryGeometry 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtQueryGeometry \- query the preferred geometry of a child widget .SH SYNTAX -XtGeometryResult XtQueryGeometry(\fIw\fP, \fIintended\fP, \ +XtGeometryResult XtQueryGeometry(\fIw\fP, \fIintended\fP, \fIpreferred_return\fP) .br Widget \fIw\fP\^; diff --git a/man/XtRealizeWidget.man b/man/XtRealizeWidget.man index c93f358..e1acf7b 100644 --- a/man/XtRealizeWidget.man +++ b/man/XtRealizeWidget.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtRealize.man,v 1.4 2001/03/16 17:53:53 pookie Exp $ +.\" $Xorg: XtRealize.man,v 1.3 2000/08/17 19:42:02 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtRealize.man,v 1.2 2001/01/27 18:20:29 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,7 +127,7 @@ .el .sp 10p .. .ny0 -.TH XtRealizeWidget 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtRealizeWidget 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtRealizeWidget, XtIsRealized, XtUnrealizeWidget \- realize and unrealize widgets .SH SYNTAX diff --git a/man/XtRegisterDrawable.man b/man/XtRegisterDrawable.man index 35f18d8..5ab8e17 100644 --- a/man/XtRegisterDrawable.man +++ b/man/XtRegisterDrawable.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtRegDraw.man,v 1.4 2001/03/16 17:53:53 pookie Exp $ +.\" $Xorg: XtRegDraw.man,v 1.3 2000/08/17 19:42:02 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtRegDraw.man,v 1.2 2001/01/27 18:20:29 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,7 +126,7 @@ .el .sp 10p .. .ny0 -.TH XtRegisterDrawable 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtRegisterDrawable 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtRegisterDrawable \- register a drawable with the Intrisics event dispatcher .SH SYNTAX diff --git a/man/XtRegisterGrabAction.man b/man/XtRegisterGrabAction.man index 3447979..8c7c51a 100644 --- a/man/XtRegisterGrabAction.man +++ b/man/XtRegisterGrabAction.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtRegGA.man,v 1.4 2001/03/16 17:53:53 pookie Exp $ +.\" $Xorg: XtRegGA.man,v 1.3 2000/08/17 19:42:02 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtRegGA.man,v 1.3 2001/02/09 03:47:52 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,11 +126,11 @@ .el .sp 10p .. .ny0 -.TH XtRegisterGrabAction 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtRegisterGrabAction 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtRegisterGrabAction \- register button and key grabs .SH SYNTAX -void XtRegisterGrabAction(\fIaction_proc\fP, \fIowner_events\fP, \ +void XtRegisterGrabAction(\fIaction_proc\fP, \fIowner_events\fP, \fIevent_mask\fP, \fIpointer_mode\fP, \fIkeyboard_mode\fP) .br XtActionProc \fIaction_proc\fP; diff --git a/man/XtReservePropertyAtom.man b/man/XtReservePropertyAtom.man index e055e1f..e76a81a 100644 --- a/man/XtReservePropertyAtom.man +++ b/man/XtReservePropertyAtom.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtResPA.man,v 1.4 2001/03/16 17:53:53 pookie Exp $ +.\" $Xorg: XtResPA.man,v 1.3 2000/08/17 19:42:02 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtResPA.man,v 1.2 2001/01/27 18:20:29 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,7 +126,7 @@ .el .sp 10p .. .ny0 -.TH XtReservePropertyAtom 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtReservePropertyAtom 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtReservePropertyAtom, XtReleasePropertyAtom \- maintain a cache of property atoms .SH SYNTAX diff --git a/man/XtResolvePathname.man b/man/XtResolvePathname.man index d6a13b9..6123c49 100644 --- a/man/XtResolvePathname.man +++ b/man/XtResolvePathname.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtResPath.man,v 1.4 2001/03/16 17:53:53 pookie Exp $ +.\" $Xorg: XtResPath.man,v 1.3 2000/08/17 19:42:02 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtResPath.man,v 1.4 2002/10/12 16:06:41 herrb Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,11 +126,11 @@ .el .sp 10p .. .ny0 -.TH XtResolvePathname 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtResolvePathname 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtResolvePathname \- search for a file using standard substitution .SH SYNTAX -String XtResolvePathname(\fIdisplay\fP, \fItype\fP, \fIfilename\fP, \fIsuffix\fP, \ +String XtResolvePathname(\fIdisplay\fP, \fItype\fP, \fIfilename\fP, \fIsuffix\fP, \fIpath\fP, \fIsubstitutions\fP, \fInum_substitutions\fP, \fIpredicate\fP) .br Display *\fIdisplay\fP; @@ -244,22 +247,20 @@ Possible values might include ``.txt'', ``.dat'', and ``.bm''. .LP A suggested value for the default path on POSIX-based systems is .IP -<XRoot>/lib/X11/%L/%T/%N%C%S:<XRoot>/lib/X11/%l/%T/%N%C%S:\\ +__projectroot__/lib/X11/%L/%T/%N%C%S:__projectroot__/lib/X11/%l/%T/%N%C%S:\\ .br -<XRoot>/lib/X11/%T/%N%C%S:<XRoot>/lib/X11/%L/%T/%N%S:\\ +__projectroot__/lib/X11/%T/%N%C%S:__projectroot__/lib/X11/%L/%T/%N%S:\\ .br -<XRoot>/lib/X11/%l/%T/%N%S:<XRoot>/lib/X11/%T/%N%S -.LP -where <XRoot> is replaced by the root of the X11 installation tree -(/usr/X11R6, for example). +__projectroot__/lib/X11/%l/%T/%N%S:__projectroot__/lib/X11/%T/%N%S .LP Using this example, if the user has specified a language, it will be -used as a subdirectory of <XRoot>/lib/X11 that will be searched for other -files. If the desired file is not found there, the lookup will be -tried again using just the language part of the specification. If the -file is not there, it will be looked for in <XRoot>/lib/X11. The \fItype\fP -parameter is used as a subdirectory of the language directory or of -<XRoot>/lib/X11, and \fIsuffix\fP is appended to the file name. +used as a subdirectory of __projectroot__/lib/X11 that will be searched +for other files. If the desired file is not found there, the lookup +will be tried again using just the language part of the specification. +If the file is not there, it will be looked for in +__projectroot__/lib/X11. The \fItype\fP parameter is used as a +subdirectory of the language directory or of __projectroot__/lib/X11, +and \fIsuffix\fP is appended to the file name. .LP The %D substitution allows the addition of path elements to the implementation-specific default path, typically to diff --git a/man/XtSessionGetToken.man b/man/XtSessionGetToken.man index 481db71..ee81e57 100644 --- a/man/XtSessionGetToken.man +++ b/man/XtSessionGetToken.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtSession.man,v 1.4 2001/03/16 17:53:53 pookie Exp $ +.\" $Xorg: XtSession.man,v 1.3 2000/08/17 19:42:02 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtSession.man,v 1.2 2001/01/27 18:20:29 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,7 +127,7 @@ .el .sp 10p .. .ny0 -.TH XtSessionGetToken 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtSessionGetToken 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtSessionGetToken, XtSessionReturnToken \- token management for checkpointing .SH SYNTAX diff --git a/man/XtSetArg.man b/man/XtSetArg.man index 72166c8..01fcd6d 100644 --- a/man/XtSetArg.man +++ b/man/XtSetArg.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtSetArg.man,v 1.4 2001/03/16 17:53:53 pookie Exp $ +.\" $Xorg: XtSetArg.man,v 1.3 2000/08/17 19:42:02 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtSetArg.man,v 1.3 2001/02/09 03:47:52 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,7 +127,7 @@ .el .sp 10p .. .ny0 -.TH XtSetArg 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtSetArg 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtSetArg, XtMergeArgLists \- set and merge ArgLists .SH SYNTAX @@ -136,7 +139,7 @@ XtSetArg(\fIarg\fP, \fIname\fP, \fIvalue\fP) .br XtArgVal \fIvalue\fP; .LP -ArgList XtMergeArgLists(\fIargs1\fP, \fInum_args1\fP, \fIargs2\fP, \ +ArgList XtMergeArgLists(\fIargs1\fP, \fInum_args1\fP, \fIargs2\fP, \fInum_args2\fP) .br ArgList \fIargs1\fP; diff --git a/man/XtSetKeyTranslator.man b/man/XtSetKeyTranslator.man index 9ec8c5c..e68b454 100644 --- a/man/XtSetKeyTranslator.man +++ b/man/XtSetKeyTranslator.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtSetKTr.man,v 1.4 2001/03/16 17:53:53 pookie Exp $ +.\" $Xorg: XtSetKTr.man,v 1.3 2000/08/17 19:42:02 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtSetKTr.man,v 1.3 2001/02/09 03:47:52 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,7 +127,7 @@ .el .sp 10p .. .ny0 -.TH XtSetKeyTranslator 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtSetKeyTranslator 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtSetKeyTranslator, XtTranslateKeycode, XtRegisterCaseConverter, XtConvertCase \- convert KeySym to KeyCodes .SH SYNTAX @@ -134,7 +137,7 @@ void XtSetKeyTranslator(\fIdisplay\fP, \fIproc\fP) .br XtKeyProc \fIproc\fP; .LP -void XtTranslateKeycode(\fIdisplay\fP, \fIkeycode\fP, \fImodifiers\fP, \ +void XtTranslateKeycode(\fIdisplay\fP, \fIkeycode\fP, \fImodifiers\fP, \fImodifiers_return\fP, \fIkeysym_return\fP) .br Display *\fIdisplay\fP; @@ -157,7 +160,7 @@ void XtRegisterCaseConverter(\fIdisplay\fP, \fIproc\fP, \fIstart\fP, \fIstop\fP) .br KeySym \fIstop\fP; .LP -void XtConvertCase(\fIdisplay\fP, \fIkeysym\fP, \fIlower_return\fP, \ +void XtConvertCase(\fIdisplay\fP, \fIkeysym\fP, \fIlower_return\fP, \fIupper_return\fP) .br Display *\fIdisplay\fP; diff --git a/man/XtSetKeyboardFocus.man b/man/XtSetKeyboardFocus.man index bd2a62c..94c6e6c 100644 --- a/man/XtSetKeyboardFocus.man +++ b/man/XtSetKeyboardFocus.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtSetKFoc.man,v 1.4 2001/03/16 17:53:53 pookie Exp $ +.\" $Xorg: XtSetKFoc.man,v 1.3 2000/08/17 19:42:02 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtSetKFoc.man,v 1.3 2002/10/12 16:06:41 herrb Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,15 +127,15 @@ .el .sp 10p .. .ny0 -.TH XtSetKeyboardFocus 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtSetKeyboardFocus 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtSetKeyboardFocus \- focus events on a child widget .SH SYNTAX -XtSetKeyboardFocus(\fIsubtree\fP\, \fIdescendant\fP) +XtSetKeyboardFocus(\fIsubtree\fP, \fIdescendant\fP) .br Widget \fIsubtree\fP, \fIdescendant\fP; .SH ARGUMENTS -.IP \fIdescendant\fP 1i +.IP \fIsubtree\fP 1i Specifies either the widget in the subtree structure which is to receive the keyboard event, or .ZN None . @@ -140,7 +143,7 @@ Note that it is not an error to specify .ZN None when no input focus was previously set. .ds Wi for which the keyboard focus is to be set -.IP \fIw\fP 1i +.IP \fIdescendant\fP 1i Specifies the widget \*(Wi. .SH DESCRIPTION If a future diff --git a/man/XtSetLanguageProc.man b/man/XtSetLanguageProc.man index 06f89a9..b4aa336 100644 --- a/man/XtSetLanguageProc.man +++ b/man/XtSetLanguageProc.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtSetLangP.man,v 1.4 2001/03/16 17:53:53 pookie Exp $ +.\" $Xorg: XtSetLangP.man,v 1.3 2000/08/17 19:42:03 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtSetLangP.man,v 1.2 2001/01/27 18:20:29 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,7 +127,7 @@ .el .sp 10p .. .ny0 -.TH XtSetLanguageProc 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtSetLanguageProc 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtSetLanguageProc \- set the language procedure .SH SYNTAX diff --git a/man/XtSetMultiClickTime.man b/man/XtSetMultiClickTime.man index a6fcc15..31b3346 100644 --- a/man/XtSetMultiClickTime.man +++ b/man/XtSetMultiClickTime.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtClickT.man,v 1.4 2001/03/16 17:53:52 pookie Exp $ +.\" $Xorg: XtClickT.man,v 1.3 2000/08/17 19:41:59 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtClickT.man,v 1.2 2001/01/27 18:20:25 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,7 +126,7 @@ .el .sp 10p .. .ny0 -.TH XtSetMultiClickTime 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtSetMultiClickTime 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtSetMultiClickTime, XtGetMultiClickTime \- set and get multi-click times .SH SYNTAX diff --git a/man/XtSetSelectionParameters.man b/man/XtSetSelectionParameters.man index 8b6a05b..4f3d574 100644 --- a/man/XtSetSelectionParameters.man +++ b/man/XtSetSelectionParameters.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtSetSP.man,v 1.4 2001/03/16 17:53:53 pookie Exp $ +.\" $Xorg: XtSetSP.man,v 1.3 2000/08/17 19:42:03 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtSetSP.man,v 1.3 2001/02/09 03:47:52 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,11 +126,11 @@ .el .sp 10p .. .ny0 -.TH XtSetSelectionParameters 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtSetSelectionParameters 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtSetSelectionParameters \- specify target parameters for a selection request with a single target .SH SYNTAX -void XtSetSelectionParameters(\fIrequestor\fP, \fIselection\fP, \fItype\fP, \ +void XtSetSelectionParameters(\fIrequestor\fP, \fIselection\fP, \fItype\fP, \fIvalue\fP, \fIlength\fP, \fIformat\fP) .br Widget \fIrequestor\fP; diff --git a/man/XtSetSensitive.man b/man/XtSetSensitive.man index 5aa1330..52cce8e 100644 --- a/man/XtSetSensitive.man +++ b/man/XtSetSensitive.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtSetSens.man,v 1.4 2001/03/16 17:53:53 pookie Exp $ +.\" $Xorg: XtSetSens.man,v 1.3 2000/08/17 19:42:03 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtSetSens.man,v 1.2 2001/01/27 18:20:30 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,7 +127,7 @@ .el .sp 10p .. .ny0 -.TH XtSetSensitive 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtSetSensitive 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtSetSensitive, XtIsSensitive \- set and check a widget's sensitivity state .SH SYNTAX diff --git a/man/XtSetValues.man b/man/XtSetValues.man index ce7e904..ab60b44 100644 --- a/man/XtSetValues.man +++ b/man/XtSetValues.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtSetVal.man,v 1.4 2001/03/16 17:53:53 pookie Exp $ +.\" $Xorg: XtSetVal.man,v 1.3 2000/08/17 19:42:03 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtSetVal.man,v 1.3 2001/02/09 03:47:52 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,7 +126,7 @@ .el .sp 10p .. .ny0 -.TH XtSetValues 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtSetValues 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtSetValues, XtVaSetValues, XtSetSubvalues, XtVaSetSubvalues, XtGetValues, XtVaGetValues, XtGetSubvalues, XtVaGetSubvalues \- obtain and set widget resources .SH SYNTAX @@ -139,7 +142,7 @@ void XtVaSetValues(\fIw\fP, \fI...\fP) .br Widget \fIw\fP; .LP -void XtSetSubvalues(\fIbase\fP, \fIresources\fP, \fInum_resources\fP, \ +void XtSetSubvalues(\fIbase\fP, \fIresources\fP, \fInum_resources\fP, \fIargs\fP, \fInum_args\fP) .br XtPointer \fIbase\fP; @@ -172,7 +175,7 @@ void XtVaGetValues(\fIw\fP, \fI...\fP) .br Widget \fIw\fP; .LP -void XtGetSubvalues(\fIbase\fP, \fIresources\fP, \fInum_resources\fP, \ +void XtGetSubvalues(\fIbase\fP, \fIresources\fP, \fInum_resources\fP, \fIargs\fP, \fInum_args\fP) .br XtPointer \fIbase\fP; @@ -193,8 +196,8 @@ void XtVaGetSubvalues(\fIbase\fP, \fIresources\fP, \fInum_resources\fP, \fI...\f .br Cardinal \fInum_resources\fP; .SH ARGUMENTS -.ds Al of name/address pairs that contain the resource name \ -and either the address into which the resource value is to be stored \ +.ds Al of name/address pairs that contain the resource name +and either the address into which the resource value is to be stored or their new values .IP \fIargs\fP 1i Specifies the argument list \*(Al. diff --git a/man/XtSetWMColormapWindows.man b/man/XtSetWMColormapWindows.man index d8f087b..df10a4e 100644 --- a/man/XtSetWMColormapWindows.man +++ b/man/XtSetWMColormapWindows.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtSetWMC.man,v 1.4 2001/03/16 17:53:53 pookie Exp $ +.\" $Xorg: XtSetWMC.man,v 1.3 2000/08/17 19:42:03 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtSetWMC.man,v 1.2 2001/01/27 18:20:30 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,7 +126,7 @@ .el .sp 10p .. .ny0 -.TH XtSetWMColormapWindows 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtSetWMColormapWindows 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtSetWMColormapWindows \- Set the value of the WM_COLORMAP_WINDOWS property .SH SYNTAX diff --git a/man/XtStringConversionWarning.man b/man/XtStringConversionWarning.man index 1e6cf6b..1eadc7d 100644 --- a/man/XtStringConversionWarning.man +++ b/man/XtStringConversionWarning.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtStrCW.man,v 1.4 2001/03/16 17:53:53 pookie Exp $ +.\" $Xorg: XtStrCW.man,v 1.3 2000/08/17 19:42:03 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtStrCW.man,v 1.2 2001/01/27 18:20:30 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,7 +127,7 @@ .el .sp 10p .. .ny0 -.TH XtStringConversionWarning 3Xt "Release 6.6" "X Version 11" "XT COMPATIBILITY FUNCTIONS" +.TH XtStringConversionWarning 3Xt __xorgversion__ "XT COMPATIBILITY FUNCTIONS" .SH NAME XtStringConversionWarning \- issue a conversion warning message .SH SYNTAX diff --git a/man/XtToolkitThreadInitialize.man b/man/XtToolkitThreadInitialize.man index b54c24a..a1b243c 100644 --- a/man/XtToolkitThreadInitialize.man +++ b/man/XtToolkitThreadInitialize.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtThreadI.man,v 1.4 2001/03/16 17:53:53 pookie Exp $ +.\" $Xorg: XtThreadI.man,v 1.3 2000/08/17 19:42:03 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -24,6 +24,9 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from the .\" X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtThreadI.man,v 1.2 2001/01/27 18:20:30 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -123,7 +126,7 @@ .el .sp 10p .. .ny0 -.TH XtToolkitThreadInitialize 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtToolkitThreadInitialize 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtToolkitThreadInitialize \- initialize the toolkit for multiple threads .SH SYNTAX diff --git a/man/XtTranslateCoords.man b/man/XtTranslateCoords.man index f22f603..c82281d 100644 --- a/man/XtTranslateCoords.man +++ b/man/XtTranslateCoords.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtTransC.man,v 1.4 2001/03/16 17:53:53 pookie Exp $ +.\" $Xorg: XtTransC.man,v 1.3 2000/08/17 19:42:03 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtTransC.man,v 1.3 2001/02/09 03:47:52 tsi Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,11 +127,11 @@ .el .sp 10p .. .ny0 -.TH XtTranslateCoords 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtTranslateCoords 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtTranslateCoords \- translate widget coordinates .SH SYNTAX -void XtTranslateCoords(\fIw\fP, \fIx\fP, \fIy\fP, \fIrootx_return\fP, \ +void XtTranslateCoords(\fIw\fP, \fIx\fP, \fIy\fP, \fIrootx_return\fP, \fIrooty_return\fP) .br Widget \fIw\fP; diff --git a/man/XtVaCreateArgsList.man b/man/XtVaCreateArgsList.man index c40d451..c4fb01f 100644 --- a/man/XtVaCreateArgsList.man +++ b/man/XtVaCreateArgsList.man @@ -1,4 +1,4 @@ -.\" $Xorg: XtVaCrArgL.man,v 1.4 2001/03/16 17:53:53 pookie Exp $ +.\" $Xorg: XtVaCrArgL.man,v 1.3 2000/08/17 19:42:04 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -25,6 +25,9 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. +.\" +.\" $XFree86: xc/doc/man/Xt/XtVaCrArgL.man,v 1.2 2001/01/27 18:20:30 dawes Exp $ +.\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -124,7 +127,7 @@ .el .sp 10p .. .ny0 -.TH XtVaCreateArgsList 3Xt "Release 6.6" "X Version 11" "XT FUNCTIONS" +.TH XtVaCreateArgsList 3Xt __xorgversion__ "XT FUNCTIONS" .SH NAME XtVaCreateArgsList \- dynamically allocate a varargs list .SH SYNTAX diff --git a/src/ActionHook.c b/src/ActionHook.c index 54f8562..04322ef 100644 --- a/src/ActionHook.c +++ b/src/ActionHook.c @@ -60,6 +60,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/Xt/ActionHook.c,v 1.3 2001/12/14 19:56:05 dawes Exp $ */ /* * Contains XtAppAddActionHook, XtRemoveActionHook @@ -69,10 +70,10 @@ in this Software without prior written authorization from The Open Group. /*ARGSUSED*/ -static void FreeActionHookList( widget, closure, call_data ) - Widget widget; /* unused (and invalid) */ - XtPointer closure; /* ActionHook* */ - XtPointer call_data; /* unused */ +static void FreeActionHookList( + Widget widget, /* unused (and invalid) */ + XtPointer closure, /* ActionHook* */ + XtPointer call_data) /* unused */ { ActionHook list = *(ActionHook*)closure; while (list != NULL) { diff --git a/src/Alloc.c b/src/Alloc.c index 16d922d..80fadfb 100644 --- a/src/Alloc.c +++ b/src/Alloc.c @@ -58,6 +58,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/Xt/Alloc.c,v 1.9 2001/12/14 19:56:07 dawes Exp $ */ /* * X Toolkit Memory Allocation Routines @@ -66,13 +67,10 @@ in this Software without prior written authorization from The Open Group. */ #include "IntrinsicI.h" +#include "InitialI.h" #undef _XBCOPYFUNC -#ifndef X_NOT_STDC_ENV #include <stdlib.h> -#else -char *malloc(), *realloc(), *calloc(); -#endif #define Xmalloc(size) malloc((size)) #define Xrealloc(ptr, size) realloc((ptr), (size)) diff --git a/src/Callback.c b/src/Callback.c index 26213a9..84129a2 100644 --- a/src/Callback.c +++ b/src/Callback.c @@ -58,6 +58,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/Xt/Callback.c,v 1.8 2001/12/14 19:56:08 dawes Exp $ */ #include "IntrinsicI.h" @@ -70,9 +71,9 @@ static String XtNxtCallCallback = "xtCallCallback"; /* However it doesn't contain a final NULL record */ #define ToList(p) ((XtCallbackList) ((p)+1)) -static InternalCallbackList* FetchInternalList(widget, name) - Widget widget; - String name; +static InternalCallbackList* FetchInternalList( + Widget widget, + _Xconst char *name) { XrmQuark quark; int n; @@ -84,7 +85,7 @@ static InternalCallbackList* FetchInternalList(widget, name) offsets = (CallbackTable) widget->core.widget_class->core_class.callback_private; - for (n = (int) *(offsets++); --n >= 0; offsets++) + for (n = (int)(long) *(offsets++); --n >= 0; offsets++) if (quark == (*offsets)->xrm_name) { retval = (InternalCallbackList *) ((char *) widget - (*offsets)->xrm_offset - 1); @@ -190,10 +191,10 @@ void XtAddCallback(widget, name, callback, closure) } /* XtAddCallback */ /* ARGSUSED */ -static void AddCallbacks(widget, callbacks, newcallbacks) - Widget widget; - InternalCallbackList *callbacks; - XtCallbackList newcallbacks; +static void AddCallbacks( + Widget widget, + InternalCallbackList *callbacks, + XtCallbackList newcallbacks) { register InternalCallbackList icl; register int i, j; diff --git a/src/Composite.c b/src/Composite.c index 6d3ea64..c3612cc 100644 --- a/src/Composite.c +++ b/src/Composite.c @@ -58,6 +58,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/Xt/Composite.c,v 1.6 2001/12/14 19:56:08 dawes Exp $ */ #define COMPOSITE #include "IntrinsicI.h" @@ -167,7 +168,7 @@ static void CompositeClassPartInitialize(widgetClass) WidgetClass widgetClass; { register CompositePartPtr wcPtr; - register CompositePartPtr superPtr; + register CompositePartPtr superPtr = NULL; wcPtr = (CompositePartPtr) &(((CompositeWidgetClass)widgetClass)->composite_class); @@ -176,10 +177,6 @@ static void CompositeClassPartInitialize(widgetClass) /* don't compute possible bogus pointer */ superPtr = (CompositePartPtr)&(((CompositeWidgetClass)widgetClass ->core_class.superclass)->composite_class); -#ifdef lint - else - superPtr = NULL; -#endif /* We don't need to check for null super since we'll get to composite eventually, and it had better define them! */ diff --git a/src/Constraint.c b/src/Constraint.c index 90b62bd..3f1d3d5 100644 --- a/src/Constraint.c +++ b/src/Constraint.c @@ -58,12 +58,13 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/Xt/Constraint.c,v 1.3 2001/12/14 19:56:09 dawes Exp $ */ #define CONSTRAINT #include "IntrinsicI.h" #include "StringDefs.h" -static void ConstraintPartInitialize(); +static void ConstraintPartInitialize(WidgetClass wc); externaldef(constraintclassrec) ConstraintClassRec constraintClassRec = { { /******* CorePart *******/ /* superclass */ (WidgetClass) &compositeClassRec, diff --git a/src/Convert.c b/src/Convert.c index 08d461f..544eb80 100644 --- a/src/Convert.c +++ b/src/Convert.c @@ -32,6 +32,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +/* $XFree86: xc/lib/Xt/Convert.c,v 3.7 2001/12/14 19:56:09 dawes Exp $ */ /* @@ -61,6 +62,7 @@ in this Software without prior written authorization from The Open Group. #include "IntrinsicI.h" #include "StringDefs.h" +#include "Intrinsic.h" /* Conversion procedure hash table */ @@ -610,12 +612,8 @@ static void ComputeArgs(widget, convert_args, num_args, args) break; case XtBaseOffset: -#if defined(CRAY1) && !defined(__STDC__) args[i].addr = - (XPointer)((int)widget + (int)convert_args[i].address_id); -#else - args[i].addr = (XPointer)((char *)widget + (int)convert_args[i].address_id); -#endif + (XPointer)((char *)widget + (long)convert_args[i].address_id); break; case XtWidgetBaseOffset: @@ -626,13 +624,8 @@ static void ComputeArgs(widget, convert_args, num_args, args) ancestor = _XtWindowedAncestor(widget); } -#if defined(CRAY1) && !defined(__STDC__) - args[i].addr = - (XPointer)((int)ancestor + (int)convert_args[i].address_id); -#else args[i].addr = - (XPointer)((char *)ancestor + (int)convert_args[i].address_id); -#endif + (XPointer)((char *)ancestor + (long)convert_args[i].address_id); break; case XtImmediate: @@ -648,25 +641,21 @@ static void ComputeArgs(widget, convert_args, num_args, args) /* Convert in place for next usage */ convert_args[i].address_mode = XtResourceQuark; convert_args[i].address_id = - (XtPointer)XrmStringToQuark((String)convert_args[i].address_id); + (XtPointer)(long)XrmStringToQuark((String)convert_args[i].address_id); /* Fall through */ case XtResourceQuark: if (! ResourceQuarkToOffset(widget->core.widget_class, - (XrmQuark) convert_args[i].address_id, &offset)) { + (XrmQuark)(long) convert_args[i].address_id, &offset)) { params[0]= - XrmQuarkToString((XrmQuark) convert_args[i].address_id); + XrmQuarkToString((XrmQuark)(long) convert_args[i].address_id); XtAppWarningMsg(XtWidgetToApplicationContext(widget), "invalidResourceName","computeArgs",XtCXtToolkitError, "Cannot find resource name %s as argument to conversion", params,&num_params); offset = 0; } -#if defined(CRAY1) && !defined(__STDC__) - args[i].addr = (XPointer)((int)widget + offset); -#else args[i].addr = (XPointer)((char *)widget + offset); -#endif break; default: params[0] = XtName(widget); @@ -693,7 +682,7 @@ void XtDirectConvert(converter, args, num_args, from, to) LOCK_PROCESS; /* Try to find cache entry for conversion */ - hash = ((int)(converter) >> 2) + from->size + *((char *) from->addr); + hash = ((long) converter >> 2) + from->size + *((char *) from->addr); if (from->size > 1) hash += ((char *) from->addr)[1]; for (p = cacheHashTable[hash & CACHEHASHMASK]; p; p = p->next) { @@ -791,7 +780,7 @@ CallConverter(dpy, converter, LOCK_PROCESS; /* Try to find cache entry for conversion */ - hash = ((int)(converter) >> 2) + from->size + *((char *) from->addr); + hash = ((long)(converter) >> 2) + from->size + *((char *) from->addr); if (from->size > 1) hash += ((char *) from->addr)[1]; if (cP->cache_type != XtCacheNone) { diff --git a/src/Converters.c b/src/Converters.c index deaed4a..95a88e0 100644 --- a/src/Converters.c +++ b/src/Converters.c @@ -32,6 +32,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +/* $XFree86: xc/lib/Xt/Converters.c,v 3.13 2002/06/03 20:59:19 dawes Exp $ */ /* @@ -71,19 +72,17 @@ in this Software without prior written authorization from The Open Group. #include <X11/Xlocale.h> #include <errno.h> /* for StringToDirectoryString */ -#ifdef X_NOT_STDC_ENV -extern int errno; -#endif - -#ifdef __STDC__ -#define Const const +#ifdef __UNIXOS2__ +#define IsNewline(str) ((str) == '\n' || (str) == '\r') +#define IsWhitespace(str) ((str)== ' ' || (str) == '\t' || (str) == '\r') #else -#define Const /**/ +#define IsNewline(str) ((str) == '\n') +#define IsWhitespace(str) ((str)== ' ' || (str) == '\t') #endif -static Const String XtNwrongParameters = "wrongParameters"; -static Const String XtNconversionError = "conversionError"; -static Const String XtNmissingCharsetList = "missingCharsetList"; +static const String XtNwrongParameters = "wrongParameters"; +static const String XtNconversionError = "conversionError"; +static const String XtNmissingCharsetList = "missingCharsetList"; /* Representation types */ @@ -112,7 +111,11 @@ static XrmQuark XtQGravity; static XrmQuark XtQInt; static XrmQuark XtQPixel; static XrmQuark XtQPosition; +#ifdef __UNIXOS2__ +XrmQuark _XtQString = 0; +#else XrmQuark _XtQString; +#endif void _XtConvertInitialize() { @@ -267,7 +270,11 @@ static Boolean IsInteger(string, value) int val = 0; char ch; /* skip leading whitespace */ +#ifndef __UNIXOS2__ while ((ch = *string) == ' ' || ch == '\t') string++; +#else + while ((ch = *string) == ' ' || ch == '\t' || ch == '\r') string++; +#endif while ((ch = *string++)) { if (ch >= '0' && ch <= '9') { val *= 10; @@ -275,11 +282,11 @@ static Boolean IsInteger(string, value) foundDigit = True; continue; } - if (ch == ' ' || ch == '\t') { + if (IsWhitespace(ch)) { if (!foundDigit) return False; /* make sure only trailing whitespace */ while ((ch = *string++)) { - if (ch != ' ' && ch != '\t') + if (!IsWhitespace(ch)) return False; } break; @@ -421,7 +428,7 @@ Boolean XtCvtStringToBool(dpy, args, num_args, fromVal, toVal, closure_ret) return False; } -XtConvertArgRec Const colorConvertArgs[] = { +XtConvertArgRec const colorConvertArgs[] = { {XtWidgetBaseOffset, (XtPointer)XtOffsetOf(WidgetRec, core.screen), sizeof(Screen *)}, {XtWidgetBaseOffset, (XtPointer)XtOffsetOf(WidgetRec, core.colormap), @@ -554,7 +561,7 @@ static void FreePixel(app, toVal, closure, args, num_args) /* no longer used by Xt, but it's in the spec */ -XtConvertArgRec Const screenConvertArg[] = { +XtConvertArgRec const screenConvertArg[] = { {XtWidgetBaseOffset, (XtPointer)XtOffsetOf(WidgetRec, core.screen), sizeof(Screen *)} }; @@ -576,7 +583,7 @@ static void FetchDisplayArg(widget, size, value) value->addr = (XPointer)&DisplayOfScreen(XtScreenOfObject(widget)); } -static XtConvertArgRec Const displayConvertArg[] = { +static XtConvertArgRec const displayConvertArg[] = { {XtProcedureArg, (XtPointer)FetchDisplayArg, 0}, }; @@ -590,8 +597,8 @@ Boolean XtCvtStringToCursor(dpy, args, num_args, fromVal, toVal, closure_ret) XtPointer *closure_ret; { - static Const struct _CursorName { - Const char *name; + static const struct _CursorName { + const char *name; unsigned int shape; } cursor_names[] = { {"X_cursor", XC_X_cursor}, @@ -672,7 +679,7 @@ Boolean XtCvtStringToCursor(dpy, args, num_args, fromVal, toVal, closure_ret) {"watch", XC_watch}, {"xterm", XC_xterm}, }; - Const struct _CursorName *nP; + const struct _CursorName *nP; char *name = (char *)fromVal->addr; register int i; @@ -814,9 +821,11 @@ Boolean XtCvtStringToFloat(dpy, args, num_args, fromVal, toVal, closure_ret) int ret; float f, nan; +#ifndef ISC /* On ISC this generates a core dump :-( at least with gs */ /* depending on the system this may or may not do anything useful */ (void) sscanf ("NaNS", "%g", toVal->addr != NULL ? (float*) toVal->addr : &nan); +#endif if (*num_args != 0) XtAppWarningMsg(XtDisplayToApplicationContext(dpy), @@ -894,13 +903,13 @@ Boolean XtCvtStringToFont(dpy, args, num_args, fromVal, toVal, closure_ret) } } /* Should really do XListFonts, but most servers support this */ - f = XLoadFont(display, "-*-*-*-R-*-*-*-120-*-*-*-*-ISO8859-1"); + f = XLoadFont(display, "-*-*-*-R-*-*-*-120-*-*-*-*-ISO8859-*"); if (f != 0) goto Done; XtAppWarningMsg(XtDisplayToApplicationContext(dpy), "noFont","cvtStringToFont",XtCXtToolkitError, - "Unable to load any usable ISO8859-1 font", + "Unable to load any usable ISO8859 font", (String *) NULL, (Cardinal *)NULL); return False; @@ -1026,7 +1035,7 @@ Boolean XtCvtStringToFontSet(dpy, args, num_args, fromVal, toVal, closure_ret) } /* Should really do XListFonts, but most servers support this */ - f = XCreateFontSet(display, "-*-*-*-R-*-*-*-120-*-*-*-*", + f = XCreateFontSet(display, "-*-*-*-R-*-*-*-120-*-*-*-*,*", &missing_charset_list, &missing_charset_count, &def_string); /* Free any returned missing charset list */ @@ -1083,7 +1092,7 @@ static void FetchLocaleArg(widget, size, value ) value->addr = (XPointer)&locale; } -static XtConvertArgRec Const localeDisplayConvertArgs[] = { +static XtConvertArgRec const localeDisplayConvertArgs[] = { {XtProcedureArg, (XtPointer)FetchDisplayArg, 0}, {XtProcedureArg, (XtPointer)FetchLocaleArg, 0}, }; @@ -1153,13 +1162,13 @@ XtCvtStringToFontStruct(dpy, args, num_args, fromVal, toVal, closure_ret) } } /* Should really do XListFonts, but most servers support this */ - f = XLoadQueryFont(display, "-*-*-*-R-*-*-*-120-*-*-*-*-ISO8859-1"); + f = XLoadQueryFont(display, "-*-*-*-R-*-*-*-120-*-*-*-*-ISO8859-*"); if (f != NULL) goto Done; XtAppWarningMsg(XtDisplayToApplicationContext(dpy), "noFont","cvtStringToFontStruct",XtCXtToolkitError, - "Unable to load any usable ISO8859-1 font", + "Unable to load any usable ISO8859 font", (String *) NULL, (Cardinal *)NULL); return False; @@ -1451,7 +1460,7 @@ XtCvtStringToInitialState(dpy, args, num_args, fromVal, toVal, closure_ret) return False; } -static XtConvertArgRec Const visualConvertArgs[] = { +static XtConvertArgRec const visualConvertArgs[] = { {XtWidgetBaseOffset, (XtPointer)XtOffsetOf(WidgetRec, core.screen), sizeof(Screen *)}, {XtWidgetBaseOffset, (XtPointer)XtOffsetOf(WidgetRec, core.depth), @@ -1653,7 +1662,7 @@ Boolean XtCvtStringToCommandArgArray(dpy, args, num_args, fromVal, toVal, while (*src != '\0') { /* skip whitespace */ - while (*src == ' ' || *src == '\t' || *src == '\n') + while (IsWhitespace(*src) || IsNewline(*src)) src++; /* test for end of string */ if (*src == '\0') @@ -1662,9 +1671,9 @@ Boolean XtCvtStringToCommandArgArray(dpy, args, num_args, fromVal, toVal, /* start new token */ tokens++; start = src; - while (*src != '\0' && *src != ' ' && *src != '\t' && *src != '\n') { + while (*src != '\0' && !IsWhitespace(*src) && !IsNewline(*src)) { if (*src == '\\' && - (*(src+1) == ' ' || *(src+1) == '\t' || *(src+1) == '\n')) { + (IsWhitespace(*(src+1)) || IsNewline(*(src+1)))) { len = src - start; if (len) { /* copy preceeding part of token */ diff --git a/src/Create.c b/src/Create.c index 212ebd8..a172e52 100644 --- a/src/Create.c +++ b/src/Create.c @@ -32,6 +32,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +/* $XFree86: xc/lib/Xt/Create.c,v 3.10 2002/12/17 04:50:58 dawes Exp $ */ /* @@ -62,6 +63,7 @@ in this Software without prior written authorization from The Open Group. #include "IntrinsicI.h" #include "VarargsI.h" #include "ShellP.h" +#include "CreateI.h" #ifndef X_NO_RESOURCE_CONFIGURATION_MANAGEMENT #include "ResConfigP.h" #endif @@ -71,8 +73,7 @@ static String XtNxtCreateWidget = "xtCreateWidget"; static String XtNxtCreatePopupShell = "xtCreatePopupShell"; static void -CallClassPartInit(ancestor, wc) - WidgetClass ancestor, wc; +CallClassPartInit(WidgetClass ancestor, WidgetClass wc) { if (ancestor->core_class.superclass != NULL) { CallClassPartInit(ancestor->core_class.superclass, wc); @@ -192,12 +193,12 @@ XtInitializeWidgetClass(wc) } static void -CallInitialize (class, req_widget, new_widget, args, num_args) - WidgetClass class; - Widget req_widget; - Widget new_widget; - ArgList args; - Cardinal num_args; +CallInitialize ( + WidgetClass class, + Widget req_widget, + Widget new_widget, + ArgList args, + Cardinal num_args) { WidgetClass superclass; XtInitProc initialize; @@ -221,11 +222,12 @@ CallInitialize (class, req_widget, new_widget, args, num_args) } static void -CallConstraintInitialize (class, req_widget, new_widget, args, num_args) - ConstraintWidgetClass class; - Widget req_widget, new_widget; - ArgList args; - Cardinal num_args; +CallConstraintInitialize ( + ConstraintWidgetClass class, + Widget req_widget, + Widget new_widget, + ArgList args, + Cardinal num_args) { WidgetClass superclass; XtInitProc initialize; @@ -244,16 +246,15 @@ CallConstraintInitialize (class, req_widget, new_widget, args, num_args) } static Widget -xtWidgetAlloc(widget_class, parent_constraint_class, parent, name, - args, num_args, typed_args, num_typed_args) - WidgetClass widget_class; - ConstraintWidgetClass parent_constraint_class; - Widget parent; - String name; - ArgList args; /* must be NULL if typed_args is non-NULL */ - Cardinal num_args; - XtTypedArgList typed_args; /* must be NULL if args is non-NULL */ - Cardinal num_typed_args; +xtWidgetAlloc( + WidgetClass widget_class, + ConstraintWidgetClass parent_constraint_class, + Widget parent, + String name, + ArgList args, /* must be NULL if typed_args is non-NULL */ + Cardinal num_args, + XtTypedArgList typed_args, /* must be NULL if args is non-NULL */ + Cardinal num_typed_args) { Widget widget; Cardinal wsize, csize = 0; @@ -290,6 +291,7 @@ xtWidgetAlloc(widget_class, parent_constraint_class, parent, name, } } widget = (Widget) __XtMalloc((unsigned)(wsize + csize)); + bzero(widget, wsize + csize); widget->core.constraints = (csize ? (XtPointer)((char *)widget + wsize) : NULL); } @@ -303,8 +305,8 @@ xtWidgetAlloc(widget_class, parent_constraint_class, parent, name, } static void -CompileCallbacks(widget) - Widget widget; +CompileCallbacks( + Widget widget) { CallbackTable offsets; InternalCallbackList* cl; @@ -314,7 +316,7 @@ CompileCallbacks(widget) offsets = (CallbackTable) widget->core.widget_class->core_class.callback_private; - for (i = (int) *(offsets++); --i >= 0; offsets++) { + for (i = (int)(long) *(offsets++); --i >= 0; offsets++) { cl = (InternalCallbackList *) ((char *) widget - (*offsets)->xrm_offset - 1); if (*cl) @@ -324,26 +326,25 @@ CompileCallbacks(widget) } static Widget -xtCreate(name, class, widget_class, parent, default_screen, - args, num_args, typed_args, num_typed_args, parent_constraint_class, - post_proc) - char *name, *class; - WidgetClass widget_class; - Widget parent; - Screen* default_screen; /* undefined when creating a nonwidget */ - ArgList args; /* must be NULL if typed_args is non-NULL */ - Cardinal num_args; - XtTypedArgList typed_args; /* must be NULL if args is non-NULL */ - Cardinal num_typed_args; - ConstraintWidgetClass parent_constraint_class; +xtCreate( + char *name, + char *class, + WidgetClass widget_class, + Widget parent, + Screen* default_screen, /* undefined when creating a nonwidget */ + ArgList args, /* must be NULL if typed_args is non-NULL */ + Cardinal num_args, + XtTypedArgList typed_args, /* must be NULL if args is non-NULL */ + Cardinal num_typed_args, + ConstraintWidgetClass parent_constraint_class, /* NULL if not a subclass of Constraint or if child is popup shell */ - XtWidgetProc post_proc; + XtWidgetProc post_proc) { /* need to use strictest alignment rules possible in next two decls. */ double widget_cache[100]; double constraint_cache[20]; Widget req_widget; - XtPointer req_constraints; + XtPointer req_constraints = NULL; Cardinal wsize, csize; Widget widget; XtCacheRef *cache_refs; @@ -413,7 +414,9 @@ xtCreate(name, class, widget_class, parent, default_screen, } else req_widget->core.constraints = NULL; CallConstraintInitialize(parent_constraint_class, req_widget, widget, args, num_args); - if (csize) XtStackFree(req_constraints, constraint_cache); + if (csize) { + XtStackFree(req_constraints, constraint_cache); + } } XtStackFree((XtPointer)req_widget, widget_cache); if (post_proc != (XtWidgetProc) NULL) { @@ -454,8 +457,7 @@ xtCreate(name, class, widget_class, parent, default_screen, } static void -widgetPostProc(w) - Widget w; +widgetPostProc(Widget w) { XtWidgetProc insert_child; Widget parent = XtParent(w); @@ -481,15 +483,14 @@ widgetPostProc(w) } Widget -_XtCreateWidget(name, widget_class, parent, - args, num_args, typed_args, num_typed_args) - String name; - WidgetClass widget_class; - Widget parent; - ArgList args; - Cardinal num_args; - XtTypedArgList typed_args; - Cardinal num_typed_args; +_XtCreateWidget( + String name, + WidgetClass widget_class, + Widget parent, + ArgList args, + Cardinal num_args, + XtTypedArgList typed_args, + Cardinal num_typed_args) { register Widget widget; ConstraintWidgetClass cwc; @@ -585,7 +586,7 @@ XtCreateWidget(name, widget_class, parent, args, num_args) WIDGET_TO_APPCON(parent); LOCK_APP(app); - retval = _XtCreateWidget(name, widget_class, parent, args, num_args, + retval = _XtCreateWidget((String)name, widget_class, parent, args, num_args, (XtTypedArgList)NULL, (Cardinal)0); UNLOCK_APP(app); return retval; @@ -616,16 +617,15 @@ XtCreateManagedWidget(name, widget_class, parent, args, num_args) LOCK_APP(app); XtCheckSubclass(parent, compositeWidgetClass, "in XtCreateManagedWidget"); - widget = _XtCreateWidget(name, widget_class, parent, args, num_args, - (XtTypedArgList)NULL, (Cardinal) 0); + widget = _XtCreateWidget((String)name, widget_class, parent, args, + num_args, (XtTypedArgList)NULL, (Cardinal) 0); XtManageChild(widget); UNLOCK_APP(app); return widget; } static void -popupPostProc(w) - Widget w; +popupPostProc(Widget w) { Widget parent = XtParent(w); @@ -696,8 +696,8 @@ XtCreatePopupShell(name, widget_class, parent, args, num_args) WIDGET_TO_APPCON(parent); LOCK_APP(app); - retval = _XtCreatePopupShell(name, widget_class, parent, args, num_args, - (XtTypedArgList)NULL, (Cardinal)0); + retval = _XtCreatePopupShell((String)name, widget_class, parent, args, + num_args, (XtTypedArgList)NULL, (Cardinal)0); UNLOCK_APP(app); return retval; } @@ -760,8 +760,8 @@ XtAppCreateShell(name, class, widget_class, display, args, num_args) DPY_TO_APPCON(display); LOCK_APP(app); - retval = _XtAppCreateShell(name, class, widget_class, display, args, - num_args, (XtTypedArgList)NULL, (Cardinal)0); + retval = _XtAppCreateShell((String)name, (String)class, widget_class, + display, args, num_args, (XtTypedArgList)NULL, (Cardinal)0); UNLOCK_APP(app); return retval; } diff --git a/src/Destroy.c b/src/Destroy.c index aed7cc7..bc81e1f 100644 --- a/src/Destroy.c +++ b/src/Destroy.c @@ -58,6 +58,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/Xt/Destroy.c,v 1.3 2001/12/14 19:56:11 dawes Exp $ */ #include "IntrinsicI.h" @@ -188,7 +189,7 @@ static Boolean IsDescendant(widget, root) static void XtPhase2Destroy (widget) register Widget widget; { - Display *display; + Display *display = NULL; Window window; Widget parent; XtAppContext app = XtWidgetToApplicationContext(widget); @@ -244,9 +245,6 @@ static void XtPhase2Destroy (widget) */ if (XtIsShell(widget) || !XtIsWidget(widget)) { window = 0; -#ifdef lint - display = 0; -#endif } else { display = XtDisplay(widget); diff --git a/src/Display.c b/src/Display.c index a0f1ba0..d5f8157 100644 --- a/src/Display.c +++ b/src/Display.c @@ -32,6 +32,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +/* $XFree86: xc/lib/Xt/Display.c,v 3.15 2002/09/18 01:25:01 dawes Exp $ */ /* @@ -64,11 +65,7 @@ in this Software without prior written authorization from The Open Group. #include "ResConfigP.h" #endif -#ifndef X_NOT_STDC_ENV #include <stdlib.h> -#else -extern char* getenv(); -#endif #ifdef XTHREADS void (*_XtProcessLock)() = NULL; @@ -78,10 +75,6 @@ void (*_XtInitAppLock)() = NULL; static String XtNnoPerDisplay = "noPerDisplay"; -extern void _XtHeapInit(); -extern void _XtHeapFree(); -extern XrmDatabase _XtPreparseCommandLine(); - ProcessContext _XtGetProcessContext() { static ProcessContextRec processContextRec = { @@ -139,8 +132,6 @@ static void XtDeleteFromAppContext(d, app) { register int i; - LOCK_APP(app); - for (i = 0; i < app->count; i++) if (app->list[i] == d) break; if (i < app->count) { @@ -149,45 +140,14 @@ static void XtDeleteFromAppContext(d, app) app->count--; } app->rebuild_fdlist = TRUE; - #ifndef USE_POLL - - { - int display; - int source; - - /* - * Search through list[] for largest connection number - */ - - app->fds.nfds = 0; - - for (display = 0; display < app->count; display++) { - if ((ConnectionNumber(app->list[display]) + 1) > app->fds.nfds) { - app->fds.nfds = ConnectionNumber(app->list[display]) + 1; - } - } - - /* - * Search through input_list[] for largest input source, i.e. - * file descriptor - */ - - for (source = (app->input_max - 1); ((source >= 0) && ((source + 1) > app->fds.nfds)); source--) { - if (app->input_list[source] != (InputEvent *) NULL) { - app->fds.nfds = (source + 1); - break; - } - } - } - + if ((ConnectionNumber(d) + 1) == app->fds.nfds) + app->fds.nfds--; + else /* Unnecessary, just to be fool-proof */ + FD_CLR(ConnectionNumber(d), &app->fds.rmask); #else - app->fds.nfds--; - #endif - - UNLOCK_APP(app); } static XtPerDisplay NewPerDisplay(dpy) @@ -210,7 +170,6 @@ static XtPerDisplay InitPerDisplay(dpy, app, name, classname) String name; String classname; { - extern void _XtAllocTMContext(); XtPerDisplay pd; AddToAppContext(dpy, app); @@ -301,10 +260,11 @@ Display *XtOpenDisplay(app, displayName, applName, className, LOCK_APP(app); LOCK_PROCESS; /* parse the command line for name, display, and/or language */ - db = _XtPreparseCommandLine(urlist, num_urs, *argc, argv, &applName, - (displayName ? NULL : &displayName), - (app->process->globalLangProcRec.proc ? - &language : NULL)); + db = _XtPreparseCommandLine(urlist, num_urs, *argc, argv, + (String *)&applName, + (String *)(displayName ? NULL : &displayName), + (app->process->globalLangProcRec.proc ? + &language : NULL)); UNLOCK_PROCESS; d = XOpenDisplay(displayName); @@ -315,6 +275,14 @@ Display *XtOpenDisplay(app, displayName, applName, className, #else char *ptr = strrchr(argv[0], '/'); #endif +#ifdef __UNIXOS2__ + char *dot_ptr,*ptr2; + ptr2 = strrchr(argv[0],'\\'); + if (ptr2 > ptr) ptr = ptr2; + dot_ptr = strrchr(argv[0],'.'); + if (dot_ptr && (dot_ptr > ptr)) *dot_ptr='\0'; +#endif /* This will remove the .exe suffix under OS/2 */ + if (ptr) applName = ++ptr; else applName = argv[0]; } else @@ -620,11 +588,8 @@ PerDisplayTablePtr _XtperDisplayList = NULL; XtPerDisplay _XtSortPerDisplayList(dpy) Display *dpy; { - register PerDisplayTablePtr pd, opd; + register PerDisplayTablePtr pd, opd = NULL; -#ifdef lint - opd = NULL; -#endif LOCK_PROCESS; for (pd = _XtperDisplayList; pd != NULL && pd->dpy != dpy; @@ -662,13 +627,10 @@ static void CloseDisplay(dpy) Display *dpy; { register XtPerDisplay xtpd; - register PerDisplayTablePtr pd, opd; + register PerDisplayTablePtr pd, opd = NULL; XrmDatabase db; int i; -#ifdef lint - opd = NULL; -#endif XtDestroyWidget(XtHooksOfDisplay(dpy)); LOCK_PROCESS; @@ -690,7 +652,6 @@ static void CloseDisplay(dpy) xtpd = &(pd->perDpy); if (xtpd != NULL) { - extern void _XtGClistFree(); if (xtpd->destroy_callbacks != NULL) { XtCallCallbackList((Widget) NULL, (XtCallbackList)xtpd->destroy_callbacks, @@ -861,6 +822,6 @@ void XtGetDisplays(app_context, dpy_return, num_dpy_return) *num_dpy_return = app_context->count; *dpy_return = (Display**)__XtMalloc(app_context->count * sizeof(Display*)); for (ii = 0; ii < app_context->count; ii++) - *dpy_return[ii] = app_context->list[ii]; + (*dpy_return)[ii] = app_context->list[ii]; UNLOCK_APP(app_context); } diff --git a/src/Error.c b/src/Error.c index 27186d6..5dc5224 100644 --- a/src/Error.c +++ b/src/Error.c @@ -32,6 +32,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +/* $XFree86: xc/lib/Xt/Error.c,v 3.12 2001/12/14 19:56:11 dawes Exp $ */ /* @@ -61,6 +62,7 @@ in this Software without prior written authorization from The Open Group. #include "IntrinsicI.h" #include <stdio.h> +#include <stdlib.h> /* The error handlers in the application context aren't used since we can't come up with a uniform way of using them. If you can, define @@ -281,7 +283,7 @@ in this environment. You may get a more descriptive message by running the\n\ program as a non-root user or by removing the suid bit on the executable."); (*fn)(buffer); /* if *fn is an ErrorHandler it should exit */ } - } + } #endif else { /* diff --git a/src/Event.c b/src/Event.c index 47d1e43..fa08dd0 100644 --- a/src/Event.c +++ b/src/Event.c @@ -58,17 +58,12 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/Xt/Event.c,v 3.10 2001/12/14 19:56:11 dawes Exp $ */ #include "IntrinsicI.h" #include "Shell.h" #include "StringDefs.h" -#ifdef __STDC__ -#define Const const -#else -#define Const /**/ -#endif - typedef struct _XtEventRecExt { int type; XtPointer select_data[1]; /* actual dimension is [mask] */ @@ -269,7 +264,7 @@ AddEventHandler(widget, select_data, type, has_type_specifier, other, proc, XtListPosition position; { register XtEventRec *p, **pp; - EventMask oldMask, eventMask; + EventMask oldMask = 0, eventMask = 0; if (!has_type_specifier) { eventMask = *(EventMask*)select_data & ~NonMaskableMask; @@ -583,7 +578,7 @@ typedef struct _WWTable { WWPair pairs; /* bogus entries */ } *WWTable; -static Const WidgetRec WWfake; /* placeholder for deletions */ +static const WidgetRec WWfake; /* placeholder for deletions */ #define WWHASH(tab,win) ((win) & tab->mask) #define WWREHASHVAL(tab,win) ((((win) % tab->rehash) + 2) | 1) @@ -1239,7 +1234,7 @@ char * arg; return(FALSE); } -static EventMask Const masks[] = { +static EventMask const masks[] = { 0, /* Error, should never see */ 0, /* Reply, should never see */ KeyPressMask, /* KeyPress */ @@ -1314,11 +1309,12 @@ static Widget LookupSpringLoaded(grabList) XtGrabList gl; for (gl = grabList; gl != NULL; gl = gl->next) { - if (gl->spring_loaded) + if (gl->spring_loaded) { if (XtIsSensitive(gl->widget)) return gl->widget; else return NULL; + } if (gl->exclusive) break; } return NULL; @@ -1338,10 +1334,10 @@ static Boolean DispatchEvent(event, widget) if (nextEvent.type == LeaveNotify && event->xcrossing.window == nextEvent.xcrossing.window && nextEvent.xcrossing.mode == NotifyNormal && - (event->xcrossing.detail != NotifyInferior && - nextEvent.xcrossing.detail != NotifyInferior || - event->xcrossing.detail == NotifyInferior && - nextEvent.xcrossing.detail == NotifyInferior)) { + ((event->xcrossing.detail != NotifyInferior && + nextEvent.xcrossing.detail != NotifyInferior) || + (event->xcrossing.detail == NotifyInferior && + nextEvent.xcrossing.detail == NotifyInferior))) { /* skip the enter/leave pair */ XNextEvent(event->xcrossing.display, &nextEvent); return False; @@ -1432,8 +1428,6 @@ Boolean _XtDefaultDispatcher(event) EventMask mask = _XtConvertTypeToMask(event->type); Widget dspWidget; Boolean was_filtered = False; - extern Widget _XtFindRemapWidget(); - extern void _XtUngrabBadGrabs(); dspWidget = _XtFindRemapWidget(event, widget, mask, pdi); diff --git a/src/EventUtil.c b/src/EventUtil.c index 54bdfc0..d14f952 100644 --- a/src/EventUtil.c +++ b/src/EventUtil.c @@ -59,10 +59,12 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/Xt/EventUtil.c,v 1.6 2001/12/14 19:56:13 dawes Exp $ */ #include "IntrinsicI.h" #include "PassivGraI.h" #include "StringDefs.h" +#include "EventI.h" static XContext perWidgetInputContext = 0; diff --git a/src/GCManager.c b/src/GCManager.c index e80c758..5cd2b25 100644 --- a/src/GCManager.c +++ b/src/GCManager.c @@ -58,6 +58,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/Xt/GCManager.c,v 1.6 2001/12/14 19:56:14 dawes Exp $ */ #include "IntrinsicI.h" @@ -89,13 +90,13 @@ typedef struct _GCrec { GCClipXOrigin | GCClipYOrigin | GCDashOffset | \ GCArcMode) -static Bool Matches(dpy, ptr, valueMask, v, readOnlyMask, dynamicMask) - Display *dpy; - GCptr ptr; - register XtGCMask valueMask; - register XGCValues *v; - XtGCMask readOnlyMask; - XtGCMask dynamicMask; +static Bool Matches( + Display *dpy, + GCptr ptr, + register XtGCMask valueMask, + register XGCValues *v, + XtGCMask readOnlyMask, + XtGCMask dynamicMask) { XGCValues gcv; register XtGCMask checkMask; diff --git a/src/Geometry.c b/src/Geometry.c index 1d901eb..d07f1e1 100644 --- a/src/Geometry.c +++ b/src/Geometry.c @@ -58,13 +58,15 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/Xt/Geometry.c,v 1.12 2001/12/14 19:56:15 dawes Exp $ */ #include "IntrinsicI.h" #include "ShellP.h" +#include "ShellI.h" -static void ClearRectObjAreas(r, old) - RectObj r; - XWindowChanges* old; +static void ClearRectObjAreas( + RectObj r, + XWindowChanges* old) { Widget pw = _XtWindowedAncestor((Widget)r); int bw2; @@ -99,7 +101,7 @@ _XtMakeGeometryRequest (widget, request, reply, clear_rect_obj) Boolean * clear_rect_obj; { XtWidgetGeometry junk; - XtGeometryHandler manager; + XtGeometryHandler manager = (XtGeometryHandler) NULL; XtGeometryResult returnCode; Widget parent = widget->core.parent; Boolean managed, parentRealized, rgm = False; @@ -156,32 +158,52 @@ _XtMakeGeometryRequest (widget, request, reply, clear_rect_obj) "non-shell has no parent in XtMakeGeometryRequest", (String *)NULL, (Cardinal *)NULL); - /* - * This shouldn't ever happen, we only test for this to pass VSW5. - * Normally managing the widget will catch this, but VSW5 does - * some really screwy stuff to get here. - */ - if (!XtIsComposite(parent)) + managed = XtIsManaged(widget); + parentRealized = XtIsRealized(parent); + if (XtIsComposite(parent)) + { + LOCK_PROCESS; + manager = ((CompositeWidgetClass) (parent->core.widget_class)) + ->composite_class.geometry_manager; + UNLOCK_PROCESS; + } + } + +#if 0 + /* + * The Xt spec says that these conditions must generate + * error messages (not warnings), but many Xt applications + * and toolkits (including parts of Xaw, Motif and Netscape) + * depend on the previous Xt behaviour. Thus, these tests + * should probably remain disabled. + */ + if (parentRealized && managed) { + if (parent && !XtIsComposite(parent)) + { + /* + * This shouldn't ever happen, we only test for this to pass + * VSW5. Normally managing the widget will catch this, but VSW5 + * does some really screwy stuff to get here. + */ XtAppErrorMsg(XtWidgetToApplicationContext(widget), "invalidParent", "xtMakeGeometryRequest", XtCXtToolkitError, "XtMakeGeometryRequest - parent not composite", (String *)NULL, (Cardinal *)NULL); - - managed = XtIsManaged(widget); - parentRealized = XtIsRealized(parent); - LOCK_PROCESS; - manager = ((CompositeWidgetClass) (parent->core.widget_class)) - ->composite_class.geometry_manager; - UNLOCK_PROCESS; - } - - if (managed && manager == (XtGeometryHandler) NULL) { - XtErrorMsg("invalidGeometryManager","xtMakeGeometryRequest", - XtCXtToolkitError, - "XtMakeGeometryRequest - parent has no geometry manager", - (String *)NULL, (Cardinal *)NULL); + } + else if (manager == (XtGeometryHandler) NULL) + { + XtAppErrorMsg(XtWidgetToApplicationContext(widget), + "invalidGeometryManager","xtMakeGeometryRequest", + XtCXtToolkitError, + "XtMakeGeometryRequest - parent has no geometry manager", + (String *)NULL, (Cardinal *)NULL); + } } +#else + if (!manager) + managed = False; +#endif if (widget->core.being_destroyed) { CALLGEOTAT(_XtGeoTab(-1)); @@ -392,11 +414,12 @@ _XtMakeGeometryRequest (widget, request, reply, clear_rect_obj) if (req.changeMask & CWStackMode) { req.changes.stack_mode = request->stack_mode; CALLGEOTAT(_XtGeoTrace(widget,"stack_mode changing\n")); - if (req.changeMask & CWSibling) + if (req.changeMask & CWSibling) { if (XtIsWidget(request->sibling)) req.changes.sibling = XtWindow(request->sibling); else req.changeMask &= ~(CWStackMode | CWSibling); + } } #ifdef XT_GEO_TATTLER @@ -514,16 +537,18 @@ XtMakeResizeRequest (widget, width, height, replyWidth, replyHeight) } else { r = _XtMakeGeometryRequest(widget, &request, &reply, &junk); } - if (replyWidth != NULL) + if (replyWidth != NULL) { if (r == XtGeometryAlmost && reply.request_mode & CWWidth) *replyWidth = reply.width; else *replyWidth = width; - if (replyHeight != NULL) + } + if (replyHeight != NULL) { if (r == XtGeometryAlmost && reply.request_mode & CWHeight) *replyHeight = reply.height; else *replyHeight = height; + } UNLOCK_APP(app); return ((r == XtGeometryDone) ? XtGeometryYes : r); } /* XtMakeResizeRequest */ @@ -727,7 +752,6 @@ void XtTranslateCoords(w, x, y, rootx, rooty) (String *)NULL, (Cardinal *)NULL); else { Position x, y; - extern void _XtShellGetCoordinates(); _XtShellGetCoordinates( w, &x, &y ); *rootx += x + w->core.border_width; *rooty += y + w->core.border_width; diff --git a/src/GetResList.c b/src/GetResList.c index 7def21e..7b60b33 100644 --- a/src/GetResList.c +++ b/src/GetResList.c @@ -32,6 +32,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +/* $XFree86: xc/lib/Xt/GetResList.c,v 3.6 2001/12/14 19:56:16 dawes Exp $ */ /* @@ -60,11 +61,14 @@ in this Software without prior written authorization from The Open Group. */ #include "IntrinsicI.h" +#include "Intrinsic.h" /* * XtGetResourceList(), XtGetConstraintResourceList() */ +#define TOXRMQUARK(p) ((XrmQuark)(long)(p)) /* avoid LP64 warnings */ + void XtGetResourceList(widget_class, resources, num_resources) WidgetClass widget_class; XtResourceList *resources; @@ -95,17 +99,17 @@ void XtGetResourceList(widget_class, resources, num_resources) for (i = 0; i < widget_class->core_class.num_resources; i++) { if (list[i] != NULL) { dlist[dest].resource_name = (String) - XrmQuarkToString((XrmQuark) list[i]->resource_name); + XrmQuarkToString(TOXRMQUARK(list[i]->resource_name)); dlist[dest].resource_class = (String) - XrmQuarkToString((XrmQuark) list[i]->resource_class); + XrmQuarkToString(TOXRMQUARK(list[i]->resource_class)); dlist[dest].resource_type = (String) - XrmQuarkToString((XrmQuark) list[i]->resource_type); + XrmQuarkToString(TOXRMQUARK(list[i]->resource_type)); dlist[dest].resource_size = list[i]->resource_size; /* trust that resource_offset isn't that big */ dlist[dest].resource_offset = (Cardinal) -((int)(list[i]->resource_offset + 1)); dlist[dest].default_type = (String) - XrmQuarkToString((XrmQuark) list[i]->default_type); + XrmQuarkToString(TOXRMQUARK(list[i]->default_type)); dlist[dest].default_addr = list[i]->default_addr; dest++; } @@ -115,8 +119,7 @@ void XtGetResourceList(widget_class, resources, num_resources) } -static Boolean ClassIsSubclassOf(class, superclass) - WidgetClass class, superclass; +static Boolean ClassIsSubclassOf(WidgetClass class, WidgetClass superclass) { for (; class != NULL; class = class->core_class.superclass) { if (class == superclass) return True; @@ -167,17 +170,17 @@ void XtGetConstraintResourceList(widget_class, resources, num_resources) for (i = 0; i < class->constraint_class.num_resources; i++) { if (list[i] != NULL) { dlist[dest].resource_name = (String) - XrmQuarkToString((XrmQuark) list[i]->resource_name); + XrmQuarkToString(TOXRMQUARK(list[i]->resource_name)); dlist[dest].resource_class = (String) - XrmQuarkToString((XrmQuark) list[i]->resource_class); + XrmQuarkToString(TOXRMQUARK(list[i]->resource_class)); dlist[dest].resource_type = (String) - XrmQuarkToString((XrmQuark) list[i]->resource_type); + XrmQuarkToString(TOXRMQUARK(list[i]->resource_type)); dlist[dest].resource_size = list[i]->resource_size; /* trust that resource_offset isn't that big */ dlist[dest].resource_offset = (Cardinal) -((int)(list[i]->resource_offset + 1)); dlist[dest].default_type = (String) - XrmQuarkToString((XrmQuark) list[i]->default_type); + XrmQuarkToString(TOXRMQUARK(list[i]->default_type)); dlist[dest].default_addr = list[i]->default_addr; dest++; } diff --git a/src/GetValues.c b/src/GetValues.c index 19131f7..0434500 100644 --- a/src/GetValues.c +++ b/src/GetValues.c @@ -59,19 +59,17 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/Xt/GetValues.c,v 1.3 2001/12/14 19:56:16 dawes Exp $ */ #include "IntrinsicI.h" #include "StringDefs.h" -extern void _XtCopyToArg(); -extern XrmResourceList* _XtCreateIndirectionTable(); - -static int GetValues(base, res, num_resources, args, num_args) - char* base; /* Base address to fetch values from */ - XrmResourceList* res; /* The current resource values. */ - register Cardinal num_resources; /* number of items in resources */ - ArgList args; /* The resource values requested */ - Cardinal num_args; /* number of items in arg list */ +static int GetValues( + char* base, /* Base address to fetch values from */ + XrmResourceList* res, /* The current resource values. */ + register Cardinal num_resources, /* number of items in resources */ + ArgList args, /* The resource values requested */ + Cardinal num_args) /* number of items in arg list */ { register ArgList arg; register int i; @@ -122,11 +120,11 @@ static int GetValues(base, res, num_resources, args, num_args) return translation_arg_num; } /* GetValues */ -static void CallGetValuesHook(widget_class, w, args, num_args) - WidgetClass widget_class; - Widget w; - ArgList args; - Cardinal num_args; +static void CallGetValuesHook( + WidgetClass widget_class, + Widget w, + ArgList args, + Cardinal num_args) { WidgetClass superclass; XtArgsProc get_values_hook; @@ -146,11 +144,11 @@ static void CallGetValuesHook(widget_class, w, args, num_args) -static void CallConstraintGetValuesHook(widget_class, w, args, num_args) - WidgetClass widget_class; - Widget w; - ArgList args; - Cardinal num_args; +static void CallConstraintGetValuesHook( + WidgetClass widget_class, + Widget w, + ArgList args, + Cardinal num_args) { ConstraintClassExtension ext; diff --git a/src/HookObj.c b/src/HookObj.c index fa95c0c..881e55f 100644 --- a/src/HookObj.c +++ b/src/HookObj.c @@ -25,6 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/Xt/HookObj.c,v 1.3 2001/12/14 19:56:17 dawes Exp $ */ #include "IntrinsicI.h" #include "StringDefs.h" @@ -56,7 +57,9 @@ static XtResource resources[] = { XtOffsetOf(HookObjRec, hooks.num_shells), XtRImmediate, (XtPointer) 0 } }; -static void GetValuesHook(), Initialize(); +static void GetValuesHook(Widget widget, ArgList args, Cardinal *num_args); +static void Initialize(Widget req, Widget new, ArgList args, + Cardinal *num_args); externaldef(hookobjclassrec) HookObjClassRec hookObjClassRec = { { /* Object Class Part */ @@ -101,9 +104,10 @@ externaldef(hookobjclassrec) HookObjClassRec hookObjClassRec = { externaldef(hookObjectClass) WidgetClass hookObjectClass = (WidgetClass)&hookObjClassRec; -static void FreeShellList(w, closure, call_data) - Widget w; - XtPointer closure, call_data; +static void FreeShellList( + Widget w, + XtPointer closure, + XtPointer call_data) { HookObject h = (HookObject)w; if (h->hooks.shells != NULL) diff --git a/src/Hooks.c b/src/Hooks.c index 5878d61..ad4cc19 100644 --- a/src/Hooks.c +++ b/src/Hooks.c @@ -25,15 +25,17 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/Xt/Hooks.c,v 1.3 2001/12/14 19:56:18 dawes Exp $ */ /*LINTLIBRARY*/ #include "IntrinsicI.h" +#include "CreateI.h" -static void FreeBlockHookList( widget, closure, call_data ) - Widget widget; /* unused (and invalid) */ - XtPointer closure; /* ActionHook* */ - XtPointer call_data; /* unused */ +static void FreeBlockHookList( + Widget widget, /* unused (and invalid) */ + XtPointer closure, /* ActionHook* */ + XtPointer call_data) /* unused */ { BlockHook list = *(BlockHook*)closure; while (list != NULL) { @@ -88,9 +90,10 @@ void XtRemoveBlockHook( id ) UNLOCK_APP(app); } -static void DeleteShellFromHookObj(shell, closure, call_data) - Widget shell; - XtPointer closure, call_data; +static void DeleteShellFromHookObj( + Widget shell, + XtPointer closure, + XtPointer call_data) { /* app_con is locked when this function is called */ int ii, jj; @@ -147,7 +150,6 @@ Boolean _XtIsHookObject(widget) Widget XtHooksOfDisplay(dpy) Display* dpy; { - extern Widget _XtCreateHookObj(); Widget retval; XtPerDisplay pd; DPY_TO_APPCON(dpy); diff --git a/src/Initialize.c b/src/Initialize.c index 74e9c0b..6c2a300 100644 --- a/src/Initialize.c +++ b/src/Initialize.c @@ -1,4 +1,4 @@ -/* $Xorg: Initialize.c,v 1.9 2001/03/19 14:27:27 coskrey Exp $ */ +/* $Xorg: Initialize.c,v 1.8 2001/02/09 02:03:55 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts @@ -32,6 +32,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +/* $XFree86: xc/lib/Xt/Initialize.c,v 3.20 2002/04/10 16:20:07 tsi Exp $ */ /* @@ -76,19 +77,7 @@ in this Software without prior written authorization from The Open Group. #include <X11/Xos_r.h> #endif -#ifdef __STDC__ -#define Const const -#else -#define Const /**/ -#endif - -#ifndef X_NOT_STDC_ENV #include <stdlib.h> -#else -extern char *getenv(); -#endif - -extern void _XtConvertInitialize(); #if (defined(SUNSHLIB) || defined(AIXSHLIB)) && defined(SHAREDCODE) /* @@ -126,7 +115,7 @@ extern void _XtConvertInitialize(); policy, which the toolkit avoids but I hate differing programs at this level. */ -static XrmOptionDescRec Const opTable[] = { +static XrmOptionDescRec const opTable[] = { {"+rv", "*reverseVideo", XrmoptionNoArg, (XtPointer) "off"}, {"+synchronous","*synchronous", XrmoptionNoArg, (XtPointer) "off"}, {"-background", "*background", XrmoptionSepArg, (XtPointer) NULL}, @@ -159,13 +148,12 @@ static XrmOptionDescRec Const opTable[] = { * GetHostname - emulates gethostname() on non-bsd systems. */ -static void GetHostname (buf, maxlen) - char *buf; - int maxlen; +static void GetHostname ( + char *buf, + int maxlen) { - int len; - #ifdef USE_UNAME + int len; struct utsname name; if (maxlen <= 0 || buf == NULL) @@ -206,7 +194,6 @@ void _XtInherit() void XtToolkitInitialize() { - extern void _XtResourceListInitialize(); static Boolean initialized = False; LOCK_PROCESS; @@ -224,6 +211,12 @@ void XtToolkitInitialize() _XtConvertInitialize(); _XtEventInitialize(); _XtTranslateInitialize(); + + /* Some apps rely on old (broken) XtAppPeekEvent behavior */ + if(getenv("XTAPPPEEKEVENT_SKIPTIMER")) + XtAppPeekEvent_SkipTimer = True; + else + XtAppPeekEvent_SkipTimer = False; } @@ -240,7 +233,9 @@ String _XtGetUserName(dest, len) } else *dest = '\0'; #else +#ifdef X_NEEDS_PWPARAMS _Xgetpwparams pwparams; +#endif struct passwd *pw; char* ptr; @@ -259,9 +254,9 @@ String _XtGetUserName(dest, len) } -static String GetRootDirName(dest, len) - String dest; - int len; +static String GetRootDirName( + String dest, + int len) { #ifdef WIN32 register char *ptr1; @@ -282,7 +277,9 @@ static String GetRootDirName(dest, len) else *dest = '\0'; #else +#ifdef X_NEEDS_PWPARAMS _Xgetpwparams pwparams; +#endif struct passwd *pw; static char *ptr; @@ -307,9 +304,9 @@ static String GetRootDirName(dest, len) return dest; } -static void CombineAppUserDefaults(dpy, pdb) - Display *dpy; - XrmDatabase *pdb; +static void CombineAppUserDefaults( + Display *dpy, + XrmDatabase *pdb) { char* filename; char* path; @@ -347,9 +344,9 @@ static void CombineAppUserDefaults(dpy, pdb) if (deallocate) DEALLOCATE_LOCAL(path); } -static void CombineUserDefaults(dpy, pdb) - Display *dpy; - XrmDatabase *pdb; +static void CombineUserDefaults( + Display *dpy, + XrmDatabase *pdb) { char *slashDotXdefaults = "/.Xdefaults"; char *dpy_defaults = XResourceManagerString(dpy); @@ -366,20 +363,19 @@ static void CombineUserDefaults(dpy, pdb) } /*ARGSUSED*/ -static Bool StoreDBEntry(db, bindings, quarks, type, value, data) - XrmDatabase *db; - XrmBindingList bindings; - XrmQuarkList quarks; - XrmRepresentation *type; - XrmValuePtr value; - XPointer data; +static Bool StoreDBEntry( + XrmDatabase *db, + XrmBindingList bindings, + XrmQuarkList quarks, + XrmRepresentation *type, + XrmValuePtr value, + XPointer data) { XrmQPutResource((XrmDatabase *)data, bindings, quarks, *type, value); return False; } -static XrmDatabase CopyDB(db) - XrmDatabase db; +static XrmDatabase CopyDB(XrmDatabase db) { XrmDatabase copy = NULL; XrmQuark empty = NULLQUARK; @@ -390,10 +386,10 @@ static XrmDatabase CopyDB(db) } /*ARGSUSED*/ -static String _XtDefaultLanguageProc(dpy, xnl, closure) - Display *dpy; /* unused */ - String xnl; - XtPointer closure; /* unused */ +static String _XtDefaultLanguageProc( + Display *dpy, /* unused */ + String xnl, + XtPointer closure) /* unused */ { if (! setlocale(LC_ALL, xnl)) XtWarning("locale not supported by C library, locale unchanged"); @@ -566,14 +562,17 @@ XrmDatabase XtScreenDatabase(screen) * Caller is responsible for freeing the returned option table. */ -static void _MergeOptionTables(src1, num_src1, src2, num_src2, dst, num_dst) - XrmOptionDescRec *src1, *src2; - Cardinal num_src1, num_src2; - XrmOptionDescRec **dst; - Cardinal *num_dst; +static void _MergeOptionTables( + const XrmOptionDescRec *src1, + Cardinal num_src1, + const XrmOptionDescRec *src2, + Cardinal num_src2, + XrmOptionDescRec **dst, + Cardinal *num_dst) { XrmOptionDescRec *table, *endP; - register XrmOptionDescRec *opt1, *opt2, *whereP, *dstP; + register XrmOptionDescRec *opt1, *whereP, *dstP; + const register XrmOptionDescRec *opt2; int i1, i2, dst_len, order; Boolean found; enum {Check, NotSorted, IsSorted} sort_order = Check; @@ -636,11 +635,13 @@ static void _MergeOptionTables(src1, num_src1, src2, num_src2, dst, num_dst) /* NOTE: name, class, and type must be permanent strings */ -static Boolean _GetResource(dpy, list, name, class, type, value) - Display *dpy; - XrmSearchList list; - String name, class, type; - XrmValue* value; +static Boolean _GetResource( + Display *dpy, + XrmSearchList list, + String name, + String class, + String type, + XrmValue* value) { XrmRepresentation db_type; XrmValue db_value; @@ -721,9 +722,9 @@ XrmDatabase _XtPreparseCommandLine(urlist, num_urs, argc, argv, applName, } -static void GetLanguage(dpy, pd) - Display *dpy; - XtPerDisplay pd; +static void GetLanguage( + Display *dpy, + XtPerDisplay pd) { XrmRepresentation type; XrmValue value; @@ -757,20 +758,20 @@ static void GetLanguage(dpy, pd) UNLOCK_PROCESS; } -static void ProcessInternalConnection (client_data, fd, id) - XtPointer client_data; - int* fd; - XtInputId* id; +static void ProcessInternalConnection ( + XtPointer client_data, + int* fd, + XtInputId* id) { XProcessInternalConnection ((Display *) client_data, *fd); } -static void ConnectionWatch (dpy, client_data, fd, opening, watch_data) - Display* dpy; - XPointer client_data; - int fd; - Bool opening; - XPointer* watch_data; +static void ConnectionWatch ( + Display* dpy, + XPointer client_data, + int fd, + Bool opening, + XPointer* watch_data) { XtInputId* iptr; XtAppContext app = XtDisplayToApplicationContext(dpy); diff --git a/src/Intrinsic.c b/src/Intrinsic.c index 71e5ab4..2629775 100644 --- a/src/Intrinsic.c +++ b/src/Intrinsic.c @@ -32,6 +32,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +/* $XFree86: xc/lib/Xt/Intrinsic.c,v 3.22 2003/01/12 03:55:46 tsi Exp $ */ /* @@ -70,11 +71,7 @@ in this Software without prior written authorization from The Open Group. #include <sys/stat.h> #endif /* VMS */ -#ifndef X_NOT_STDC_ENV #include <stdlib.h> -#else -extern char *getenv(); -#endif String XtCXtToolkitError = "XtToolkitError"; @@ -582,7 +579,7 @@ static Widget SearchChildren(root, names, bindings, matchproc, NameMatchProc matchproc; int in_depth, *out_depth, *found_depth; { - Widget w1, w2; + Widget w1 = 0, w2; int d1, d2; if (XtIsComposite(root)) { @@ -868,7 +865,7 @@ Boolean XtIsObject(object) return True; } -#if defined(WIN32) || defined(__EMX__) +#if defined(WIN32) static int access_file (path, pathbuf, len_pathbuf, pathret) char* path; char* pathbuf; @@ -906,7 +903,7 @@ static int AccessFile (path, pathbuf, len_pathbuf, pathret) /* try the places set in the environment */ drive = getenv ("_XBASEDRIVE"); -#ifdef __EMX__ +#ifdef __UNIXOS2__ if (!drive) drive = getenv ("X11ROOT"); #endif @@ -921,7 +918,7 @@ static int AccessFile (path, pathbuf, len_pathbuf, pathret) return 1; } -#ifndef __EMX__ +#ifndef __UNIXOS2__ /* one last place to look */ drive = getenv ("HOMEDRIVE"); if (drive) { @@ -965,7 +962,7 @@ static Boolean TestFile(path) #ifndef VMS int ret = 0; struct stat status; -#if defined(WIN32) || defined(__EMX__) /* || defined(OS2) */ +#if defined(WIN32) char buf[MAX_PATH]; char* bufp; int len; @@ -983,7 +980,7 @@ static Boolean TestFile(path) #else (status.st_mode & S_IFDIR) == 0); /* not a directory */ #endif /* X_NOT_POSIX else */ -#if defined(WIN32) || defined(__EMX__) /* || defined(OS2) */ +#if defined(WIN32) XtStackFree ((XtPointer)bufp, buf); #endif return ret; @@ -1122,16 +1119,24 @@ String XtFindFile(path, substitutions, num_substitutions, predicate) continue; } if (*colon == ':') +#ifdef __UNIXOS2__ + if (colon > (path+1)) +#endif break; } len = colon - path; if (Resolve(path, len, substitutions, num_substitutions, buf, '/')) { if (firstTime || strcmp(buf1,buf2) != 0) { +#ifdef __UNIXOS2__ + { + char *bufx = (char*)__XOS2RedirRoot(buf); + strcpy(buf,bufx); + } +#endif #ifdef XNL_DEBUG printf("Testing file %s\n", buf); #endif /* XNL_DEBUG */ - /* Check out the file */ if ((*predicate) (buf)) { /* We've found it, return it */ @@ -1171,85 +1176,97 @@ static char *ExtractLocaleName(lang) String lang; { -#if defined(hpux) || defined(CSRG_BASED) || defined(sun) || defined(SVR4) || defined(sgi) || defined(__osf__) || defined(AIXV3) || defined(ultrix) || defined(WIN32) -#ifdef hpux +#if defined(hpux) || defined(CSRG_BASED) || defined(sun) || defined(SVR4) || defined(sgi) || defined(__osf__) || defined(AIXV3) || defined(ultrix) || defined(WIN32) || defined(__UNIXOS2__) || defined (linux) +# ifdef hpux /* * We need to discriminated between HPUX 9 and HPUX 10. The equivalent * code in Xlib in SetLocale.c does include locale.h via X11/Xlocale.h. */ -#include <locale.h> -#ifndef _LastCategory -/* HPUX 9 and earlier */ -#define SKIPCOUNT 2 -#define STARTCHAR ':' -#define ENDCHAR ';' -#else -/* HPUX 10 */ -#define ENDCHAR ' ' -#endif -#else -#ifdef ultrix -#define SKIPCOUNT 2 -#define STARTCHAR '\001' -#define ENDCHAR '\001' -#else -#ifdef WIN32 -#define SKIPCOUNT 1 -#define STARTCHAR '=' -#define ENDCHAR ';' -#define WHITEFILL -#else -#if defined(__osf__) || (defined(AIXV3) && !defined(AIXV4)) -#define STARTCHAR ' ' -#define ENDCHAR ' ' -#else -#if !defined(sun) || defined(SVR4) -#define STARTCHAR '/' -#endif -#define ENDCHAR '/' -#endif -#endif -#endif -#endif +# include <locale.h> +# ifndef _LastCategory + /* HPUX 9 and earlier */ +# define SKIPCOUNT 2 +# define STARTCHAR ':' +# define ENDCHAR ';' +# else + /* HPUX 10 */ +# define ENDCHAR ' ' +# endif +# else +# ifdef ultrix +# define SKIPCOUNT 2 +# define STARTCHAR '\001' +# define ENDCHAR '\001' +# else +# if defined(WIN32) || defined(__UNIXOS2__) +# define SKIPCOUNT 1 +# define STARTCHAR '=' +# define ENDCHAR ';' +# define WHITEFILL +# else +# if defined(__osf__) || (defined(AIXV3) && !defined(AIXV4)) +# define STARTCHAR ' ' +# define ENDCHAR ' ' +# else +# if defined(linux) +# define STARTSTR "LC_CTYPE=" +# define ENDCHAR ';' +# else +# if !defined(sun) || defined(SVR4) +# define STARTCHAR '/' +# define ENDCHAR '/' +# endif +# endif +# endif +# endif +# endif +# endif char *start; char *end; int len; -#ifdef SKIPCOUNT +# ifdef SKIPCOUNT int n; -#endif +# endif static char* buf = NULL; start = lang; -#ifdef SKIPCOUNT +# ifdef SKIPCOUNT for (n = SKIPCOUNT; --n >= 0 && start && (start = strchr (start, STARTCHAR)); start++) ; if (!start) start = lang; -#endif -#ifdef STARTCHAR - if (start && (start = strchr (start, STARTCHAR))) { - start++; -#endif - if (end = strchr (start, ENDCHAR)) { +# endif +# ifdef STARTCHAR + if (start && (start = strchr (start, STARTCHAR))) +# elif defined (STARTSTR) + if (start && (start = strstr (start,STARTSTR))) +# endif + { +# ifdef STARTCHAR + start++; +# elif defined (STARTSTR) + start += strlen(STARTSTR); +# endif + + if ((end = strchr (start, ENDCHAR))) { len = end - start; if (buf != NULL) XtFree (buf); buf = XtMalloc (len + 1); if (buf == NULL) return NULL; strncpy(buf, start, len); *(buf + len) = '\0'; -#ifdef WHITEFILL +# ifdef WHITEFILL for (start = buf; start = strchr(start, ' '); ) *start++ = '-'; -#endif +# endif return buf; - } -#ifdef STARTCHAR + } else /* if no ENDCHAR is found we are at the end of the line */ + return start; } -#endif -#ifdef WHITEFILL +# ifdef WHITEFILL if (strchr(lang, ' ')) { if (buf != NULL) XtFree (buf); else buf = XtMalloc (strlen (lang) + 1); @@ -1259,10 +1276,10 @@ static char *ExtractLocaleName(lang) *start++ = '-'; return buf; } -#endif -#undef STARTCHAR -#undef ENDCHAR -#undef WHITEFILL +# endif +# undef STARTCHAR +# undef ENDCHAR +# undef WHITEFILL #endif return lang; @@ -1337,7 +1354,7 @@ static char *implementation_default_path(void) static char *implementation_default_path() #endif { -#ifdef WIN32 +#if defined(WIN32) || defined(__UNIXOS2__) /* if you know how to pass % thru the compiler let me know */ static char xfilesearchpath[] = XFILESEARCHPATHDEFAULT; static Bool fixed; @@ -1619,19 +1636,13 @@ int direction ; void -#if NeedVarargsPrototypes _XtGeoTrace (Widget widget, ...) -#else -_XtGeoTrace (widget, va_alist) -Widget widget; -va_dcl -#endif { va_list args; char *fmt; int i ; if (IsTattled(widget)) { - Va_start(args, widget); + va_start(args, widget); fmt = va_arg(args, char *); for (i=0; i<n_tab; i++) printf(" "); (void) vprintf(fmt, args); diff --git a/src/Keyboard.c b/src/Keyboard.c index 5f1e84e..0bfdf96 100644 --- a/src/Keyboard.c +++ b/src/Keyboard.c @@ -59,13 +59,14 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/Xt/Keyboard.c,v 3.4 2001/12/14 19:56:26 dawes Exp $ */ #include "IntrinsicI.h" #include "PassivGraI.h" +#include "EventI.h" #define _GetWindowedAncestor(w) (XtIsWidget(w) ? w : _XtWindowedAncestor(w)) -extern void _XtFillAncestorList(); extern void _XtSendFocusEvent(); /* InActiveSubtree cache of the current focus source and its ancestors */ diff --git a/src/Manage.c b/src/Manage.c index 98ad68e..03c1472 100644 --- a/src/Manage.c +++ b/src/Manage.c @@ -32,6 +32,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +/* $XFree86: xc/lib/Xt/Manage.c,v 3.8 2001/12/14 19:56:26 dawes Exp $ */ /* @@ -66,18 +67,18 @@ static String XtNxtUnmanageChildren = "xtUnmanageChildren"; static String XtNxtManageChildren = "xtManageChildren"; static String XtNxtChangeManagedSet = "xtChangeManagedSet"; -static void UnmanageChildren(children, num_children, parent, num_unique_children, call_change_managed, caller_func) - WidgetList children; - Cardinal num_children; - Widget parent; - Cardinal* num_unique_children; - Boolean call_change_managed; - String caller_func; +static void UnmanageChildren( + WidgetList children, + Cardinal num_children, + Widget parent, + Cardinal* num_unique_children, + Boolean call_change_managed, + String caller_func) { Widget child; Cardinal i; - XtWidgetProc change_managed; - Bool parent_realized; + XtWidgetProc change_managed = NULL; + Bool parent_realized = False; *num_unique_children = 0; @@ -189,20 +190,20 @@ void XtUnmanageChild(child) } /* XtUnmanageChild */ -static void ManageChildren(children, num_children, parent, call_change_managed, caller_func) - WidgetList children; - Cardinal num_children; - Widget parent; - Boolean call_change_managed; - String caller_func; +static void ManageChildren( + WidgetList children, + Cardinal num_children, + Widget parent, + Boolean call_change_managed, + String caller_func) { #define MAXCHILDREN 100 Widget child; Cardinal num_unique_children, i; - XtWidgetProc change_managed; + XtWidgetProc change_managed = NULL; WidgetList unique_children; Widget cache[MAXCHILDREN]; - Bool parent_realized; + Bool parent_realized = False; if (XtIsComposite((Widget) parent)) { LOCK_PROCESS; @@ -368,7 +369,7 @@ void XtSetMappedWhenManaged(widget, mapped_when_managed) call_data.type = XtHsetMappedWhenManaged; call_data.widget = widget; - call_data.event_data = (XtPointer) mapped_when_managed; + call_data.event_data = (XtPointer) (unsigned long) mapped_when_managed; XtCallCallbackList(hookobj, ((HookObject)hookobj)->hooks.changehook_callbacks, (XtPointer)&call_data); diff --git a/src/NextEvent.c b/src/NextEvent.c index 0e6c45f..098bd16 100644 --- a/src/NextEvent.c +++ b/src/NextEvent.c @@ -1,4 +1,4 @@ -/* $Xorg: NextEvent.c,v 1.11 2001/03/19 14:27:27 coskrey Exp $ */ +/* $Xorg: NextEvent.c,v 1.8 2001/02/09 02:03:55 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts, @@ -35,7 +35,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. /* -Copyright 1987, 1988, 1994, 1998 The Open Group +Copyright 1987, 1988, 1994, 1998, 2001 The Open Group Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted without fee, provided that @@ -58,12 +58,14 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/Xt/NextEvent.c,v 3.26 2002/06/04 21:55:42 dawes Exp $ */ #include "IntrinsicI.h" #include <stdio.h> #include <errno.h> -#ifdef X_NOT_STDC_ENV -extern int errno; + +#ifdef __UNIXOS2__ +#include <sys/time.h> #endif static TimerEventRec* freeTimerRecs; @@ -163,7 +165,7 @@ typedef struct { static struct timeval zero_time = { 0 , 0}; #ifndef USE_POLL -static fd_set zero_fd = { 0 }; +static fd_set zero_fd; #else #define X_BLOCK -1 #define X_DONT_BLOCK 0 @@ -334,6 +336,7 @@ static void AdjustTimes (app, block, howlong, ignoreTimers, wt) #endif } + static int IoWait (wt, wf) wait_times_ptr_t wt; wait_fds_ptr_t wf; @@ -346,6 +349,7 @@ static int IoWait (wt, wf) #endif } + static void FindInputs (app, wf, nfds, ignoreEvents, ignoreInputs, dpy_no, found_input) XtAppContext app; wait_fds_ptr_t wf; @@ -421,8 +425,16 @@ static void FindInputs (app, wf, nfds, ignoreEvents, ignoreInputs, dpy_no, found if (condition) { for (ep = app->input_list[ii]; ep; ep = ep->ie_next) if (condition & ep->ie_condition) { - ep->ie_oq = app->outstandingQueue; - app->outstandingQueue = ep; + /* make sure this input isn't already marked outstanding */ + InputEvent *oq; + for (oq = app->outstandingQueue; oq; oq = oq->ie_oq) + if (oq == ep) + break; + if (!oq) + { + ep->ie_oq = app->outstandingQueue; + app->outstandingQueue = ep; + } } *found_input = True; } @@ -468,8 +480,16 @@ ENDILOOP: ; *found_input = True; for (ep = app->input_list[fdlp->fd]; ep; ep = ep->ie_next) if (condition & ep->ie_condition) { - ep->ie_oq = app->outstandingQueue; - app->outstandingQueue = ep; + InputEvent *oq; + /* make sure this input isn't already marked outstanding */ + for (oq = app->outstandingQueue; oq; oq = oq->ie_oq) + if (oq == ep) + break; + if (!oq) + { + ep->ie_oq = app->outstandingQueue; + app->outstandingQueue = ep; + } } } } @@ -1071,45 +1091,10 @@ void XtRemoveInput( id ) if (found) { app->input_count--; - if (app->input_list[source] == NULL) - #ifdef USE_POLL - + if (app->input_list[source] == NULL) app->fds.nfds--; - -#else - - { - int display; - int source; - - /* - * Search through list[] for largest connection number - */ - - app->fds.nfds = 0; - - for (display = 0; display < app->count; display++) { - if ((ConnectionNumber(app->list[display]) + 1) > app->fds.nfds) { - app->fds.nfds = ConnectionNumber(app->list[display]) + 1; - } - } - - /* - * Search through input_list[] for largest input source, i.e. - * file descriptor - */ - - for (source = (app->input_max - 1); ((source >= 0) && ((source +1) > app->fds.nfds)); source--) { - if (app->input_list[source] != (InputEvent *) NULL) { - app->fds.nfds = (source + 1); - break; - } - } - } - #endif - app->rebuild_fdlist = TRUE; } else XtAppWarningMsg(app, "invalidProcedure","inputHandler", @@ -1545,6 +1530,8 @@ Boolean XtPeekEvent(event) return XtAppPeekEvent(_XtDefaultAppContext(), event); } +Boolean XtAppPeekEvent_SkipTimer; + Boolean XtAppPeekEvent(app, event) XtAppContext app; XEvent *event; @@ -1594,7 +1581,7 @@ Boolean XtAppPeekEvent(app, event) * Check to see why a -1 was returned, if a timer expired, * call it and block some more */ - if (app->timerQueue != NULL) { /* timer */ + if ((app->timerQueue != NULL) && ! XtAppPeekEvent_SkipTimer) { /* timer */ struct timeval cur_time; Bool did_timer = False; @@ -1604,10 +1591,11 @@ Boolean XtAppPeekEvent(app, event) TimerEventRec *te_ptr = app->timerQueue; app->timerQueue = app->timerQueue->te_next; te_ptr->te_next = NULL; - if (te_ptr->te_proc != NULL) + if (te_ptr->te_proc != NULL) { TeCallProc(te_ptr); + did_timer = True; + } LOCK_PROCESS; - did_timer = True; te_ptr->te_next = freeTimerRecs; freeTimerRecs = te_ptr; UNLOCK_PROCESS; @@ -1623,15 +1611,23 @@ Boolean XtAppPeekEvent(app, event) continue; /* keep blocking */ } } + /* + * spec is vague here; we'll assume signals also return FALSE, + * of course to determine whether a signal is pending requires + * walking the signalQueue looking for se_notice flags which + * this code doesn't do. + */ +#if 0 if (app->signalQueue != NULL) { /* signal */ - /* spec is vague here; we'll assume signals also return FALSE */ event->xany.type = 0; event->xany.display = NULL; event->xany.window = 0; UNLOCK_APP(app); return FALSE; } - else { /* input */ + else +#endif + { /* input */ event->xany.type = 0; event->xany.display = NULL; event->xany.window = 0; diff --git a/src/Object.c b/src/Object.c index 29d9066..fc12be5 100644 --- a/src/Object.c +++ b/src/Object.c @@ -58,6 +58,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/Xt/Object.c,v 1.6 2001/12/14 19:56:26 dawes Exp $ */ #define OBJECT #include "IntrinsicI.h" @@ -143,7 +144,7 @@ static void ConstructCallbackOffsets(widgetClass) superTable = (CallbackTable) ((ObjectClass) objectClass->object_class.superclass)-> object_class.callback_private; - tableSize = (int) superTable[0]; + tableSize = (int)(long) superTable[0]; } else { superTable = (CallbackTable) NULL; tableSize = 0; @@ -163,10 +164,10 @@ static void ConstructCallbackOffsets(widgetClass) newTable = (CallbackTable) __XtMalloc(sizeof(XrmResource *) * (tableSize + 1)); - newTable[0] = (XrmResource *) tableSize; + newTable[0] = (XrmResource *)(long) tableSize; if (superTable) - tableSize -= (int) superTable[0]; + tableSize -= (int)(long) superTable[0]; resourceList = (XrmResourceList) objectClass->object_class.resources; for (i=1; tableSize > 0; resourceList++) if (resourceList->xrm_type == QCallback) { @@ -175,7 +176,8 @@ static void ConstructCallbackOffsets(widgetClass) } if (superTable) - for (tableSize = (int) *superTable++; --tableSize >= 0; superTable++) + for (tableSize = (int)(long) *superTable++; + --tableSize >= 0; superTable++) newTable[i++] = *superTable; objectClass->object_class.callback_private = (XtPointer) newTable; @@ -252,7 +254,7 @@ static Boolean ObjectSetValues(old, request, widget, args, num_args) /* Compile any callback lists into internal form */ offsets = (CallbackTable) XtClass(widget)->core_class.callback_private; - for (i= (int) *(offsets++); --i >= 0; offsets++) { + for (i= (int)(long) *(offsets++); --i >= 0; offsets++) { ol = (InternalCallbackList *) ((char *) old - (*offsets)->xrm_offset - 1); nl = (InternalCallbackList *) @@ -281,7 +283,7 @@ static void ObjectDestroy (widget) offsets = (CallbackTable) widget->core.widget_class->core_class.callback_private; - for (i = (int) *(offsets++); --i >= 0; offsets++) { + for (i = (int)(long) *(offsets++); --i >= 0; offsets++) { cl = *(InternalCallbackList *) ((char *) widget - (*offsets)->xrm_offset - 1); if (cl) XtFree((char *) cl); diff --git a/src/RectObj.c b/src/RectObj.c index 6d4708f..bd7d5c5 100644 --- a/src/RectObj.c +++ b/src/RectObj.c @@ -46,10 +46,13 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +/* $XFree86: xc/lib/Xt/RectObj.c,v 1.3 2001/12/14 19:56:27 dawes Exp $ */ #define RECTOBJ #include "IntrinsicI.h" #include "StringDefs.h" +#include "CreateI.h" + /****************************************************************** * * Rectangle Object Resources diff --git a/src/ResConfig.c b/src/ResConfig.c index 68ccbb7..e9ac7ae 100644 --- a/src/ResConfig.c +++ b/src/ResConfig.c @@ -52,6 +52,7 @@ dealings in this Software without prior written authorization from the IBM Corporation. ******************************************************************/ +/* $XFree86: xc/lib/Xt/ResConfig.c,v 3.8 2001/12/14 19:56:28 dawes Exp $ */ #include "Intrinsic.h" #include "IntrinsicI.h" @@ -61,10 +62,8 @@ Corporation. #include "StringDefs.h" #include "ResConfigP.h" #include <X11/Xatom.h> - -#ifdef DEBUG #include <stdio.h> -#endif +#include <stdlib.h> #define MAX_BUFFER 512 @@ -700,7 +699,7 @@ _search_widget_tree (w, resource, value) { Widget parent = w; char *last_part; - char *remainder; + char *remainder = NULL; char last_token; char *indx, *copy; char *loose, *tight; @@ -992,7 +991,7 @@ _XtResourceConfigurationEH (w, client_data, event) * resource and value fields. */ if (data) { - resource_len = Strtoul (data, &data_ptr, 10); + resource_len = Strtoul ((void *)data, &data_ptr, 10); data_ptr++; data_ptr[resource_len] = '\0'; diff --git a/src/Resources.c b/src/Resources.c index 20a56c0..d8e5d40 100644 --- a/src/Resources.c +++ b/src/Resources.c @@ -59,6 +59,8 @@ in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/Xt/Resources.c,v 1.9 2001/12/14 19:56:28 dawes Exp $ */ + /*LINTLIBRARY*/ #include "IntrinsicI.h" #include "VarargsI.h" @@ -370,12 +372,8 @@ void _XtCompileResourceList(resources, num_resources) xrmres->xrm_name = PSToQ(resources->resource_name); xrmres->xrm_class = PSToQ(resources->resource_class); xrmres->xrm_type = PSToQ(resources->resource_type); -#if defined(CRAY1) && !defined(__STDC__) - xrmres->xrm_offset = -(resources->resource_offset * sizeof(long) + 1); -#else xrmres->xrm_offset = (Cardinal) (-(int)resources->resource_offset - 1); -#endif xrmres->xrm_default_type = PSToQ(resources->default_type); } #undef PSToQ @@ -395,12 +393,8 @@ static void XrmCompileResourceListEphem(resources, num_resources) xrmres->xrm_name = StringToName(resources->resource_name); xrmres->xrm_class = StringToClass(resources->resource_class); xrmres->xrm_type = StringToQuark(resources->resource_type); -#if defined(CRAY1) && !defined(__STDC__) - xrmres->xrm_offset = -(resources->resource_offset * sizeof(long) + 1); -#else xrmres->xrm_offset = (Cardinal) (-(int)resources->resource_offset - 1); -#endif xrmres->xrm_default_type = StringToQuark(resources->default_type); } #undef xrmres @@ -413,7 +407,7 @@ static void BadSize(size, name) String params[2]; Cardinal num_params = 2; - params[0] = (String) size; + params[0] = (String)(long) size; params[1] = XrmQuarkToString(name); XtWarningMsg("invalidSizeOverride", "xtDependencies", XtCXtToolkitError, "Representation size %d must match superclass's to override %s", diff --git a/src/Selection.c b/src/Selection.c index 846b1bd..0a5cd9d 100644 --- a/src/Selection.c +++ b/src/Selection.c @@ -58,11 +58,13 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/Xt/Selection.c,v 3.9 2001/12/14 19:56:29 dawes Exp $ */ #include "IntrinsicI.h" #include "StringDefs.h" #include "SelectionI.h" #include <X11/Xatom.h> +#include <stdio.h> void _XtSetDefaultSelectionTimeout(timeout) unsigned long *timeout; @@ -614,13 +616,14 @@ Boolean *cont; XtRemoveTimeOut(req->timeout); #endif if (req->allSent) { - if (ctx->notify) + if (ctx->notify) { if (ctx->incremental) { (*(XtSelectionDoneIncrProc)ctx->notify) (ctx->widget, &ctx->selection, &req->target, (XtRequestId*)&req, ctx->owner_closure); } else (*ctx->notify)(ctx->widget, &ctx->selection, &req->target); + } RemoveHandler(req, (EventMask)PropertyChangeMask, HandlePropertyGone, closure); XtFree((char*)req); diff --git a/src/SetSens.c b/src/SetSens.c index 3a5e95e..96940cd 100644 --- a/src/SetSens.c +++ b/src/SetSens.c @@ -58,6 +58,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/Xt/SetSens.c,v 1.3 2001/12/14 19:56:29 dawes Exp $ */ #include "IntrinsicI.h" #include "StringDefs.h" @@ -66,9 +67,9 @@ in this Software without prior written authorization from The Open Group. * XtSetSensitive() */ -static void SetAncestorSensitive(widget, ancestor_sensitive) - register Widget widget; - Boolean ancestor_sensitive; +static void SetAncestorSensitive( + register Widget widget, + Boolean ancestor_sensitive) { Arg args[1]; register Cardinal i; diff --git a/src/SetValues.c b/src/SetValues.c index e7f0c2e..7465aff 100644 --- a/src/SetValues.c +++ b/src/SetValues.c @@ -58,6 +58,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/Xt/SetValues.c,v 1.3 2001/12/14 19:56:30 dawes Exp $ */ #include "IntrinsicI.h" @@ -66,15 +67,12 @@ in this Software without prior written authorization from The Open Group. */ -extern void _XtCopyFromArg(); -extern XrmResourceList* _XtCreateIndirectionTable(); - -static void SetValues(base, res, num_resources, args, num_args) - char* base; /* Base address to write values to */ - XrmResourceList* res; /* The current resource values. */ - register Cardinal num_resources; /* number of items in resources */ - ArgList args; /* The resource values to set */ - Cardinal num_args; /* number of items in arg list */ +static void SetValues( + char* base, /* Base address to write values to */ + XrmResourceList* res, /* The current resource values. */ + register Cardinal num_resources, /* number of items in resources */ + ArgList args, /* The resource values to set */ + Cardinal num_args) /* number of items in arg list */ { register ArgList arg; register int i; @@ -97,11 +95,13 @@ static void SetValues(base, res, num_resources, args, num_args) } } /* SetValues */ -static Boolean CallSetValues (class, current, request, new, args, num_args) - WidgetClass class; - Widget current, request, new; - ArgList args; - Cardinal num_args; +static Boolean CallSetValues ( + WidgetClass class, + Widget current, + Widget request, + Widget new, + ArgList args, + Cardinal num_args) { Boolean redisplay = FALSE; WidgetClass superclass; @@ -130,11 +130,13 @@ static Boolean CallSetValues (class, current, request, new, args, num_args) } static Boolean -CallConstraintSetValues (class, current, request, new, args, num_args) - ConstraintWidgetClass class; - Widget current, request, new; - ArgList args; - Cardinal num_args; +CallConstraintSetValues ( + ConstraintWidgetClass class, + Widget current, + Widget request, + Widget new, + ArgList args, + Cardinal num_args) { Boolean redisplay = FALSE; XtSetValuesFunc set_values; @@ -189,7 +191,7 @@ void XtSetValues(w, args, num_args) XtGeometryResult result; XtWidgetGeometry geoReq, geoReply; WidgetClass wc; - ConstraintWidgetClass cwc; + ConstraintWidgetClass cwc = 0; Boolean hasConstraints; XtAlmostProc set_values_almost; XtAppContext app = XtWidgetToApplicationContext(w); diff --git a/src/Shell.c b/src/Shell.c index cf9a3df..8c600d9 100644 --- a/src/Shell.c +++ b/src/Shell.c @@ -32,6 +32,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +/* $XFree86: xc/lib/Xt/Shell.c,v 3.15 2001/12/14 19:56:30 dawes Exp $ */ /* @@ -69,12 +70,14 @@ in this Software without prior written authorization from The Open Group. #include "StringDefs.h" #include "Shell.h" #include "ShellP.h" +#include "ShellI.h" #include "Vendor.h" #include "VendorP.h" #include <X11/Xatom.h> #include <X11/Xlocale.h> #include <X11/ICE/ICElib.h> #include <stdio.h> +#include <stdlib.h> #ifdef EDITRES #include <X11/Xmu/Editres.h> @@ -682,8 +685,10 @@ externaldef(applicationshellwidgetclass) WidgetClass applicationShellWidgetClass static XtResource sessionResources[]= { +#ifndef XT_NO_SM {XtNconnection, XtCConnection, XtRSmcConn, sizeof(SmcConn), Offset(session.connection), XtRSmcConn, (XtPointer) NULL}, +#endif {XtNsessionID, XtCSessionID, XtRString, sizeof(String), Offset(session.session_id), XtRString, (XtPointer) NULL}, {XtNrestartCommand, XtCRestartCommand, XtRCommandArgArray, sizeof(String*), @@ -1085,8 +1090,6 @@ static void ApplicationInitialize(req, new, args, num_args) #define XtRestartStyleHintMask (1L<<7) #define XtShutdownCommandMask (1L<<8) -extern char *getenv(); - static void JoinSession(); static void SetSessionProperties(); static void StopManagingSession(); @@ -1113,6 +1116,7 @@ static void SessionInitialize(req, new, args, num_args) ArgList args; /* unused */ Cardinal *num_args; /* unused */ { +#ifndef XT_NO_SM SessionShellWidget w = (SessionShellWidget)new; if (w->session.session_id) w->session.session_id = @@ -1144,6 +1148,7 @@ static void SessionInitialize(req, new, args, num_args) if (w->session.connection) SetSessionProperties(w, True, 0L, 0L); +#endif /* !XT_NO_SM */ } static void Resize(w) @@ -1511,6 +1516,7 @@ static void _popup_set_prop(w) "WM_CLIENT_LEADER", False), XA_WINDOW, 32, PropModeReplace, (unsigned char *)(&(p->core.window)), 1); +#ifndef XT_NO_SM if (p == (Widget) w) { for ( ; p->core.parent != NULL; p = p->core.parent); if (XtIsSubclass(p, sessionShellWidgetClass)) { @@ -1526,6 +1532,7 @@ static void _popup_set_prop(w) } } } +#endif /* !XT_NO_SM */ if (wmshell->wm.window_role) XChangeProperty(XtDisplay((Widget)w), XtWindow((Widget)w), @@ -1696,6 +1703,7 @@ static void ApplicationDestroy(wid) static void SessionDestroy(wid) Widget wid; { +#ifndef XT_NO_SM SessionShellWidget w = (SessionShellWidget) wid; StopManagingSession(w, w->session.connection); @@ -1708,6 +1716,7 @@ static void SessionDestroy(wid) FreeStringArray(w->session.environment); XtFree(w->session.current_dir); XtFree(w->session.program_path); +#endif /* !XT_NO_SM */ } /* @@ -1925,7 +1934,7 @@ static Bool isMine(dpy, event, arg) return FALSE; } -static _wait_for_response(w, event, request_num) +static Boolean _wait_for_response(w, event, request_num) ShellWidget w; XEvent *event; unsigned long request_num; @@ -1977,7 +1986,7 @@ static XtGeometryResult RootGeometryManager(gw, request, reply) unsigned int mask = request->request_mode; XEvent event; Boolean wm; - register struct _OldXSizeHints *hintp; + register struct _OldXSizeHints *hintp = NULL; int oldx, oldy, oldwidth, oldheight, oldborder_width; unsigned long request_num; @@ -2247,13 +2256,14 @@ static Boolean SetValues(old, ref, new, args, num_args) if (! (ow->shell.client_specified & _XtShellPositionValid)) { Cardinal n; - void _XtShellGetCoordinates(); for (n = *num_args; n; n--, args++) { if (strcmp(XtNx, args->name) == 0) { - _XtShellGetCoordinates(ow, &ow->core.x, &ow->core.y); + _XtShellGetCoordinates((Widget)ow, &ow->core.x, + &ow->core.y); } else if (strcmp(XtNy, args->name) == 0) { - _XtShellGetCoordinates(ow, &ow->core.x, &ow->core.y); + _XtShellGetCoordinates((Widget)ow, &ow->core.x, + &ow->core.y); } } } @@ -2531,6 +2541,7 @@ static Boolean SessionSetValues(current, request, new, args, num_args) ArgList args; Cardinal *num_args; { +#ifndef XT_NO_SM SessionShellWidget nw = (SessionShellWidget) new; SessionShellWidget cw = (SessionShellWidget) current; unsigned long set_mask = 0L; @@ -2629,6 +2640,7 @@ static Boolean SessionSetValues(current, request, new, args, num_args) if ((cw->session.join_session && !nw->session.join_session) || (cw->session.connection && !nw->session.connection)) StopManagingSession(nw, nw->session.connection); +#endif /* !XT_NO_SM */ if (cw->wm.client_leader != nw->wm.client_leader || cw->session.session_id != nw->session.session_id) { @@ -2683,7 +2695,6 @@ static void GetValuesHook(widget, args, num_args) Cardinal* num_args; { ShellWidget w = (ShellWidget) widget; - extern void _XtCopyToArg(); /* x and y resource values may be invalid after a shell resize */ if (XtIsRealized(widget) && @@ -2733,13 +2744,6 @@ static void ApplicationShellInsertChild(widget) #define XtSessionCheckpoint 0 #define XtSessionInteract 1 -extern String _XtGetUserName( -#if NeedFunctionPrototypes - String /* dest_dir */, - int /* len */ -#endif -); - static void CallSaveCallbacks(); static String *EditCommand(); static Boolean ExamineToken(); @@ -2750,6 +2754,7 @@ static void XtCallDieCallbacks(); static void XtCallSaveCallbacks(); static void XtCallSaveCompleteCallbacks(); +#ifndef XT_NO_SM static void StopManagingSession(w, connection) SessionShellWidget w; SmcConn connection; /* connection to close, if any */ @@ -2834,6 +2839,8 @@ static void JoinSession(w) } #undef XT_MSG_LENGTH +#endif /* !XT_NO_SM */ + static String * NewStringArray(str) String *str; { @@ -2872,6 +2879,7 @@ static void FreeStringArray(str) } +#ifndef XT_NO_SM static SmProp * CardPack(name, closure) char *name; XtPointer closure; @@ -2999,7 +3007,7 @@ static void SetSessionProperties(w, initialize, set_mask, unset_mask) user_name = _XtGetUserName(nam_buf, sizeof nam_buf); if (user_name) props[num_props++] = ArrayPack(SmUserID, &user_name); - sprintf(pid, "%d", getpid()); + sprintf(pid, "%ld", (long)getpid()); props[num_props++] = ArrayPack(SmProcessID, &pidp); if (num_props) { @@ -3414,3 +3422,4 @@ static String* EditCommand(str, src1, src2) return new; } +#endif /* !XT_NO_SM */ diff --git a/src/TMaction.c b/src/TMaction.c index b185f87..a1b7b0a 100644 --- a/src/TMaction.c +++ b/src/TMaction.c @@ -59,6 +59,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/Xt/TMaction.c,v 3.7 2001/12/14 19:56:30 dawes Exp $ */ /* TMaction.c -- maintains the state table of actions for the translation * manager. @@ -592,8 +593,8 @@ void _XtBindActions(widget, tm) int globalUnbound = 0; Cardinal i; TMBindData bindData = (TMBindData)tm->proc_table; - TMSimpleBindProcs simpleBindProcs; - TMComplexBindProcs complexBindProcs; + TMSimpleBindProcs simpleBindProcs = NULL; + TMComplexBindProcs complexBindProcs = NULL; XtActionProc *newProcs; Widget bindWidget; diff --git a/src/TMgrab.c b/src/TMgrab.c index e2a56e8..9257293 100644 --- a/src/TMgrab.c +++ b/src/TMgrab.c @@ -58,6 +58,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/Xt/TMgrab.c,v 1.3 2001/12/14 19:56:30 dawes Exp $ */ /*LINTLIBRARY*/ #include "IntrinsicI.h" @@ -72,11 +73,11 @@ typedef struct _GrabActionRec { static GrabActionRec *grabActionList = NULL; -static void GrabAllCorrectKeys(widget, typeMatch, modMatch, grabP) - Widget widget; - TMTypeMatch typeMatch; - TMModifierMatch modMatch; - GrabActionRec* grabP; +static void GrabAllCorrectKeys( + Widget widget, + TMTypeMatch typeMatch, + TMModifierMatch modMatch, + GrabActionRec* grabP) { Display *dpy = XtDisplay(widget); KeyCode *keycodes, *keycodeP; @@ -156,9 +157,9 @@ typedef struct { GrabActionRec *grabP; }DoGrabRec; -static Boolean DoGrab(state, data) - StatePtr state; - XtPointer data; +static Boolean DoGrab( + StatePtr state, + XtPointer data) { DoGrabRec *doGrabP = (DoGrabRec *)data; GrabActionRec* grabP = doGrabP->grabP; diff --git a/src/TMkey.c b/src/TMkey.c index 92fe81f..3087407 100644 --- a/src/TMkey.c +++ b/src/TMkey.c @@ -59,6 +59,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/Xt/TMkey.c,v 3.10 2001/12/14 19:56:30 dawes Exp $ */ #define XK_MISCELLANY #define XK_LATIN1 @@ -68,11 +69,8 @@ in this Software without prior written authorization from The Open Group. #include "IntrinsicI.h" #include <X11/keysymdef.h> - -#ifdef __STDC__ -#define Const const -#else -#define Const /**/ +#ifdef XKB +#include <X11/XKBlib.h> #endif #define FLUSHKEYCACHE(ctx) \ @@ -86,7 +84,7 @@ in this Software without prior written authorization from The Open Group. */ #define FM(i) i >> (8 - TMKEYCACHELOG2) -static Const unsigned char modmix[256] = { +static const unsigned char modmix[256] = { FM(0x0f), FM(0x8f), FM(0x4f), FM(0xcf), FM(0x2f), FM(0xaf), FM(0x6f), FM(0xef), FM(0x1f), FM(0x9f), FM(0x5f), FM(0xdf), FM(0x3f), FM(0xbf), FM(0x7f), FM(0xff), FM(0x07), FM(0x87), FM(0x47), FM(0xc7), FM(0x27), FM(0xa7), FM(0x67), FM(0xe7), @@ -219,8 +217,7 @@ void _XtAllocTMContext(pd) pd->tm_context = ctx; } -static unsigned int num_bits(mask) - unsigned long mask; +static unsigned int num_bits(unsigned long mask) { register unsigned long y; @@ -601,9 +598,7 @@ void XtTranslateKey(dpy, keycode, modifiers, } #else { - XkbLookupKeySym(dpy, keycode, modifiers, modifiers_return, - keysym_return); - return; + XkbLookupKeySym(dpy, keycode, modifiers, modifiers_return, keysym_return); } #endif @@ -692,7 +687,7 @@ void XtKeysymToKeycodeList(dpy, keysym, keycodes_return, keycount_return) KeySym lsym, usym; unsigned maxcodes = 0; unsigned ncodes = 0; - KeyCode *keycodes, *codeP; + KeyCode *keycodes, *codeP = NULL; DPY_TO_APPCON(dpy); LOCK_APP(app); diff --git a/src/TMparse.c b/src/TMparse.c index 3ec7de6..e758e36 100644 --- a/src/TMparse.c +++ b/src/TMparse.c @@ -32,6 +32,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +/* $XFree86: xc/lib/Xt/TMparse.c,v 3.9 2002/05/31 18:45:46 dawes Exp $ */ /* @@ -62,6 +63,7 @@ in this Software without prior written authorization from The Open Group. #include "IntrinsicI.h" #include "StringDefs.h" #include <ctype.h> +#include <stdlib.h> #ifndef NOTASCII #define XK_LATIN1 #endif @@ -367,9 +369,14 @@ static EventKey events[] = { }; +#ifndef __UNIXOS2__ +#define IsNewline(str) ((str) == '\n') +#else +#define IsNewline(str) ((str) == '\n' || (str) == '\r') +#endif #define ScanFor(str, ch) \ - while ((*(str) != (ch)) && (*(str) != '\0') && (*(str) != '\n')) (str)++ + while ((*(str) != (ch)) && (*(str) != '\0') && !IsNewline(*(str))) (str)++ #define ScanNumeric(str) while ('0' <= *(str) && *(str) <= '9') (str)++ @@ -378,9 +385,13 @@ static EventKey events[] = { ('a' <= *(str) && *(str) <= 'z') || \ ('0' <= *(str) && *(str) <= '9')) (str)++ +#ifndef __UNIXOS2__ #define ScanWhitespace(str) \ while (*(str) == ' ' || *(str) == '\t') (str)++ - +#else +#define ScanWhitespace(str) \ + while (*(str) == ' ' || *(str) == '\t' || *(str) == '\r') (str)++ +#endif static Boolean initialized = FALSE; static XrmQuark QMeta; @@ -951,7 +962,7 @@ static String ParseKeySym(str, closure, event,error) keySymName = keySymNamebuf; str++; keySymName[0] = *str; - if (*str != '\0' && *str != '\n') str++; + if (*str != '\0' && !IsNewline(*str)) str++; keySymName[1] = '\0'; event->event.eventCode = StringToKeySym(keySymName, error); event->event.eventCodeMask = ~0L; @@ -971,7 +982,7 @@ static String ParseKeySym(str, closure, event,error) && *str != ':' && *str != ' ' && *str != '\t' - && *str != '\n' + && !IsNewline(*str) && (*str != '(' || *(str+1) <= '0' || *(str+1) >= '9') && *str != '\0') str++; keySymName = XtStackAlloc (str - start + 1, keySymNamebuf); @@ -981,6 +992,7 @@ static String ParseKeySym(str, closure, event,error) event->event.eventCodeMask = ~0L; } if (*error) { + /* We never get here when keySymName hasn't been allocated */ if (keySymName[0] == '<') { /* special case for common error */ XtWarningMsg(XtNtranslationParseError, "missingComma", @@ -1069,7 +1081,7 @@ static String ParseAtom(str, closure, event,error) && *str != ':' && *str != ' ' && *str != '\t' - && *str != '\n' + && !IsNewline(*str) && *str != '\0') str++; if (str-start >= 999) { Syntax( "Atom name must be less than 1000 characters long.", "" ); @@ -1157,7 +1169,7 @@ static String ParseQuotedStringEvent(str, event,error) str++; s[0] = *str; s[1] = '\0'; - if (*str != '\0' && *str != '\n') str++; + if (*str != '\0' && !IsNewline(*str)) str++; event->event.eventType = KeyPress; event->event.eventCode = StringToKeySym(s, error); if (*error) return PanicModeRecovery(str); @@ -1229,7 +1241,7 @@ static void RepeatDownPlus(eventP, reps, actionsP) ActionPtr **actionsP; { EventRec upEventRec; - register EventPtr event, downEvent, lastDownEvent; + register EventPtr event, downEvent, lastDownEvent = NULL; EventPtr upEvent = &upEventRec; register int i; @@ -1335,7 +1347,7 @@ static void RepeatUpPlus(eventP, reps, actionsP) ActionPtr **actionsP; { EventRec upEventRec; - register EventPtr event, downEvent, lastUpEvent; + register EventPtr event, downEvent, lastUpEvent = NULL; EventPtr upEvent = &upEventRec; register int i; @@ -1518,7 +1530,7 @@ static String ParseEventSeq(str, eventSeqP, actionsP,error) *eventSeqP = NULL; - while ( *str != '\0' && *str != '\n') { + while ( *str != '\0' && !IsNewline(*str)) { static Event nullEvent = {0, 0,0L, 0, 0L, 0L,_XtRegularMatch,FALSE}; EventPtr event; @@ -1527,7 +1539,7 @@ static String ParseEventSeq(str, eventSeqP, actionsP,error) if (*str == '"') { str++; - while (*str != '"' && *str != '\0' && *str != '\n') { + while (*str != '"' && *str != '\0' && !IsNewline(*str)) { event = XtNew(EventRec); event->event = nullEvent; event->state = /* (StatePtr) -1 */ NULL; @@ -1656,7 +1668,7 @@ static String ParseString(str, strP) && *str != '\t' && *str != ',' && *str != ')' - && *str != '\n' + && !IsNewline(*str) && *str != '\0') str++; *strP = __XtMalloc((unsigned)(str-start+1)); (void) memmove(*strP, start, str-start); @@ -1682,7 +1694,7 @@ static String ParseParamSeq(str, paramSeqP, paramNumP) register Cardinal i; ScanWhitespace(str); - while (*str != ')' && *str != '\0' && *str != '\n') { + while (*str != ')' && *str != '\0' && !IsNewline(*str)) { String newStr; str = ParseString(str, &newStr); if (newStr != NULL) { @@ -1759,7 +1771,7 @@ static String ParseActionSeq(parseTree, str, actionsP, error) ActionPtr *nextActionP = actionsP; *actionsP = NULL; - while (*str != '\0' && *str != '\n') { + while (*str != '\0' && !IsNewline(*str)) { register ActionPtr action; XrmQuark quark; @@ -1776,7 +1788,7 @@ static String ParseActionSeq(parseTree, str, actionsP, error) *nextActionP = action; nextActionP = &action->next; } - if (*str == '\n') str++; + if (IsNewline(*str)) str++; ScanWhitespace(str); return str; } @@ -1790,7 +1802,11 @@ static void ShowProduction(currentProduction) int len; char *eol, *production, productionbuf[500]; - eol = strchr(currentProduction, '\n'); +#ifdef __UNIXOS2__ + eol = strchr(currentProduction, '\r'); + if (!eol) /* try '\n' as well below */ +#endif + eol = strchr(currentProduction, '\n'); if (eol) len = eol - currentProduction; else len = strlen (currentProduction); production = XtStackAlloc (len + 1, productionbuf); @@ -1864,7 +1880,7 @@ static String CheckForPoundSign(str, defaultOp, actualOpRtn) else if (!strcmp(operation,"override")) opType = XtTableOverride; ScanWhitespace(str); - if (*str == '\n') { + if (IsNewline(*str)) { str++; ScanWhitespace(str); } diff --git a/src/TMprint.c b/src/TMprint.c index 24b0d2e..3b44326 100644 --- a/src/TMprint.c +++ b/src/TMprint.c @@ -58,6 +58,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/Xt/TMprint.c,v 1.6 2001/12/14 19:56:31 dawes Exp $ */ /*LINTLIBRARY*/ #include "IntrinsicI.h" @@ -196,7 +197,7 @@ static void PrintCode(sb, mask, code) if (mask != 0) { if (mask != (unsigned long)~0L) (void) sprintf(sb->current, "0x%lx:0x%lx", mask, code); - else (void) sprintf(sb->current, /*"0x%lx"*/ "%d", code); + else (void) sprintf(sb->current, /*"0x%lx"*/ "%d", (unsigned)code); sb->current += strlen(sb->current); } } diff --git a/src/TMstate.c b/src/TMstate.c index 8bfb96e..2283e13 100644 --- a/src/TMstate.c +++ b/src/TMstate.c @@ -32,6 +32,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +/* $XFree86: xc/lib/Xt/TMstate.c,v 1.8 2001/12/14 19:56:31 dawes Exp $ */ /* @@ -76,7 +77,11 @@ static StatePtr NewState(); static String XtNtranslationError = "translationError"; +#ifndef __EMX__ TMGlobalRec _XtGlobalTM; /* initialized to zero K&R */ +#else +TMGlobalRec _XtGlobalTM = {0}; +#endif #define MatchIncomingEvent(tmEvent, typeMatch, modMatch) \ (typeMatch->eventType == tmEvent->event.eventType && \ @@ -238,7 +243,7 @@ TMShortCard _XtGetTypeIndex(event) TMShortCard i, j = TM_TYPE_SEGMENT_SIZE; TMShortCard typeIndex = 0; TMTypeMatch typeMatch; - TMTypeMatch segment; + TMTypeMatch segment = NULL; LOCK_PROCESS; for (i = 0; i < _XtGlobalTM.numTypeMatchSegments; i++) { @@ -321,7 +326,7 @@ TMShortCard _XtGetModifierIndex(event) TMShortCard i, j = TM_MOD_SEGMENT_SIZE; TMShortCard modIndex = 0; TMModifierMatch modMatch; - TMModifierMatch segment; + TMModifierMatch segment = NULL; LOCK_PROCESS; for (i = 0; i < _XtGlobalTM.numModMatchSegments; i++) { @@ -764,12 +769,12 @@ static void HandleSimpleState(w, tmRecPtr, curEventPtr) TMSimpleStateTree stateTree; TMContext *contextPtr = GetContextPtr(tmRecPtr); TMShortCard i; - ActionRec *actions; + ActionRec *actions = NULL; Boolean matchExact = False; Boolean match = False; StatePtr complexMatchState = NULL; int currIndex; - TMShortCard typeIndex, modIndex; + TMShortCard typeIndex = 0, modIndex = 0; int matchTreeIndex = TM_NO_MATCH; LOCK_PROCESS; @@ -990,7 +995,7 @@ static void HandleComplexState(w, tmRecPtr, curEventPtr) { XtTranslations xlations = tmRecPtr->translations; TMContext *contextPtr = GetContextPtr(tmRecPtr); - TMShortCard i, matchTreeIndex; + TMShortCard i, matchTreeIndex = 0; StatePtr matchState = NULL, candState; TMComplexStateTree *stateTreePtr = (TMComplexStateTree *)&xlations->stateTreeTbl[0]; @@ -1712,7 +1717,7 @@ static XtTranslations MergeThem(dest, first, second) UNLOCK_PROCESS; return NULL; } - UNLOCK_PROCESS; + UNLOCK_PROCESS; #ifndef REFCNT_TRANSLATIONS @@ -1810,7 +1815,7 @@ static XtTranslations MergeTranslations(widget, oldXlations, newXlations, Widget source; TMShortCard *numNewRtn; { - XtTranslations newTable, xlations; + XtTranslations newTable = NULL, xlations; TMComplexBindProcs bindings; TMShortCard i, j; TMStateTree *treePtr; @@ -1931,10 +1936,10 @@ static Boolean ComposeTranslations(dest, operation, source, newXlations) { XtTranslations newTable, oldXlations; XtTranslations accNewXlations; - EventMask oldMask; + EventMask oldMask = 0; TMBindData bindData; TMComplexBindProcs oldBindings = NULL; - TMShortCard numOldBindings, numNewBindings = 0, numBytes; + TMShortCard numOldBindings = 0, numNewBindings = 0, numBytes; TMComplexBindProcsRec stackBindings[16], *newBindings; /* diff --git a/src/Threads.c b/src/Threads.c index 2fca1fb..ef9a3bb 100644 --- a/src/Threads.c +++ b/src/Threads.c @@ -53,6 +53,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/Xt/Threads.c,v 3.6 2001/12/14 19:56:31 dawes Exp $ */ #include "IntrinsicI.h" @@ -93,7 +94,7 @@ typedef struct _LockRec { static LockPtr process_lock = NULL; static void -InitProcessLock() +InitProcessLock(void) { if(!process_lock) { process_lock = XtNew(LockRec); @@ -109,7 +110,7 @@ InitProcessLock() } static void -ProcessLock() +ProcessLock(void) { #ifdef _XMUTEX_NESTS xmutex_lock(process_lock->mutex); @@ -141,7 +142,7 @@ ProcessLock() } static void -ProcessUnlock() +ProcessUnlock(void) { #ifdef _XMUTEX_NESTS process_lock->level--; @@ -213,7 +214,9 @@ AppUnlock(app) app_lock->level--; xmutex_unlock(app_lock->mutex); #else - xthread_t self = xthread_self(); + xthread_t self; + + self = xthread_self(); xmutex_lock(app_lock->mutex); assert(xthread_equal(app_lock->holder, self)); if (app_lock->level != 0) { diff --git a/src/VarCreate.c b/src/VarCreate.c index 3d9614d..2aed5d4 100644 --- a/src/VarCreate.c +++ b/src/VarCreate.c @@ -52,27 +52,25 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/Xt/VarCreate.c,v 3.7 2001/12/14 19:56:32 dawes Exp $ */ #include "IntrinsicI.h" #include "StringDefs.h" #include "Shell.h" #include "VarargsI.h" +#include "CreateI.h" #if (defined(SUNSHLIB) || defined(AIXSHLIB)) && defined(SHAREDCODE) #define XtToolkitInitialize _XtToolkitInitialize #endif /* (SUNSHLIB || AIXSHLIB) && SHAREDCODE */ -extern Widget _XtCreateWidget(); -extern Widget _XtAppCreateShell(); -extern Widget _XtCreatePopupShell(); - static Widget -_XtVaCreateWidget(name, widget_class, parent, var, count) - String name; - WidgetClass widget_class; - Widget parent; - va_list var; - int count; +_XtVaCreateWidget( + String name, + WidgetClass widget_class, + Widget parent, + va_list var, + int count) { register Widget widget; XtTypedArgList typed_args = NULL; @@ -91,21 +89,12 @@ _XtVaCreateWidget(name, widget_class, parent, var, count) } -#if NeedVarargsPrototypes Widget XtVaCreateWidget( _Xconst char* name, WidgetClass widget_class, Widget parent, ...) -#else -/*VARARGS3*/ -Widget XtVaCreateWidget(name, widget_class, parent, va_alist) - String name; - WidgetClass widget_class; - Widget parent; - va_dcl -#endif { va_list var; register Widget widget; @@ -113,33 +102,25 @@ Widget XtVaCreateWidget(name, widget_class, parent, va_alist) WIDGET_TO_APPCON(parent); LOCK_APP(app); - Va_start(var,parent); + va_start(var,parent); _XtCountVaList(var, &total_count, &typed_count); va_end(var); - Va_start(var,parent); - widget = _XtVaCreateWidget(name, widget_class, parent, var, total_count); + va_start(var,parent); + widget = _XtVaCreateWidget((String)name, widget_class, parent, var, + total_count); va_end(var); UNLOCK_APP(app); return widget; } -#if NeedVarargsPrototypes Widget XtVaCreateManagedWidget( _Xconst char* name, WidgetClass widget_class, Widget parent, ...) -#else -/*VARARGS3*/ -Widget XtVaCreateManagedWidget(name, widget_class, parent, va_alist) - String name; - WidgetClass widget_class; - Widget parent; - va_dcl -#endif { va_list var; register Widget widget; @@ -147,12 +128,13 @@ Widget XtVaCreateManagedWidget(name, widget_class, parent, va_alist) WIDGET_TO_APPCON(parent); LOCK_APP(app); - Va_start(var,parent); + va_start(var,parent); _XtCountVaList(var, &total_count, &typed_count); va_end(var); - Va_start(var,parent); - widget = _XtVaCreateWidget(name, widget_class, parent, var, total_count); + va_start(var,parent); + widget = _XtVaCreateWidget((String)name, widget_class, parent, var, + total_count); XtManageChild(widget); va_end(var); UNLOCK_APP(app); @@ -160,7 +142,6 @@ Widget XtVaCreateManagedWidget(name, widget_class, parent, va_alist) } -#if NeedVarargsPrototypes Widget XtVaAppCreateShell( _Xconst char* name, @@ -168,15 +149,6 @@ XtVaAppCreateShell( WidgetClass widget_class, Display* display, ...) -#else -/*VARARGS4*/ -Widget XtVaAppCreateShell(name, class, widget_class, display, va_alist) - String name; - String class; - WidgetClass widget_class; - Display* display; - va_dcl -#endif { va_list var; register Widget widget; @@ -186,15 +158,15 @@ Widget XtVaAppCreateShell(name, class, widget_class, display, va_alist) DPY_TO_APPCON(display); LOCK_APP(app); - Va_start(var,display); + va_start(var,display); _XtCountVaList(var, &total_count, &typed_count); va_end(var); - Va_start(var,display); + va_start(var,display); _XtVaToTypedArgList(var, total_count, &typed_args, &num_args); - widget = _XtAppCreateShell(name, class, widget_class, display, - (ArgList)NULL, (Cardinal)0, typed_args, num_args); + widget = _XtAppCreateShell((String)name, (String)class, widget_class, + display, (ArgList)NULL, (Cardinal)0, typed_args, num_args); if (typed_args != NULL) { XtFree((XtPointer)typed_args); } @@ -205,21 +177,12 @@ Widget XtVaAppCreateShell(name, class, widget_class, display, va_alist) } -#if NeedVarargsPrototypes Widget XtVaCreatePopupShell( _Xconst char* name, WidgetClass widget_class, Widget parent, ...) -#else -/*VARARGS3*/ -Widget XtVaCreatePopupShell(name, widget_class, parent, va_alist) - String name; - WidgetClass widget_class; - Widget parent; - va_dcl -#endif { va_list var; register Widget widget; @@ -229,14 +192,14 @@ Widget XtVaCreatePopupShell(name, widget_class, parent, va_alist) WIDGET_TO_APPCON(parent); LOCK_APP(app); - Va_start(var,parent); + va_start(var,parent); _XtCountVaList(var, &total_count, &typed_count); va_end(var); - Va_start(var,parent); + va_start(var,parent); _XtVaToTypedArgList(var, total_count, &typed_args, &num_args); - widget = _XtCreatePopupShell(name, widget_class, parent, + widget = _XtCreatePopupShell((String)name, widget_class, parent, (ArgList)NULL, (Cardinal)0, typed_args, num_args); if (typed_args != NULL) { XtFree((XtPointer)typed_args); @@ -247,15 +210,8 @@ Widget XtVaCreatePopupShell(name, widget_class, parent, va_alist) return widget; } -#if NeedVarargsPrototypes void XtVaSetValues(Widget widget, ...) -#else -/*VARARGS1*/ -void XtVaSetValues(widget, va_alist) - Widget widget; - va_dcl -#endif { va_list var; ArgList args = NULL; @@ -264,11 +220,11 @@ void XtVaSetValues(widget, va_alist) WIDGET_TO_APPCON(widget); LOCK_APP(app); - Va_start(var,widget); + va_start(var,widget); _XtCountVaList(var, &total_count, &typed_count); va_end(var); - Va_start(var,widget); + va_start(var,widget); _XtVaToArgList(widget, var, total_count, &args, &num_args); XtSetValues(widget, args, num_args); @@ -279,24 +235,15 @@ void XtVaSetValues(widget, va_alist) } -#if NeedVarargsPrototypes void XtVaSetSubvalues(XtPointer base, XtResourceList resources, Cardinal num_resources, ...) -#else -/*VARARGS3*/ -void XtVaSetSubvalues(base, resources, num_resources, va_alist) - XtPointer base; - XtResourceList resources; - Cardinal num_resources; - va_dcl -#endif { va_list var; ArgList args; Cardinal num_args; int total_count, typed_count; - Va_start(var, num_resources); + va_start(var, num_resources); _XtCountVaList(var, &total_count, &typed_count); va_end(var); @@ -304,7 +251,7 @@ void XtVaSetSubvalues(base, resources, num_resources, va_alist) XtWarning("XtVaTypedArg is not valid in XtVaSetSubvalues()\n"); } - Va_start(var, num_resources); + va_start(var, num_resources); _XtVaToArgList((Widget)NULL, var, total_count, &args, &num_args); XtSetSubvalues(base, resources, num_resources, args, num_args); @@ -316,7 +263,6 @@ void XtVaSetSubvalues(base, resources, num_resources, va_alist) va_end(var); } -#if NeedVarargsPrototypes Widget _XtVaOpenApplication( XtAppContext *app_context_return, @@ -328,21 +274,6 @@ _XtVaOpenApplication( String *fallback_resources, WidgetClass widget_class, va_list var_args) -#else -/*VARARGS8*/ -Widget _XtVaOpenApplication(app_context_return, application_class, options, - num_options, argc_in_out, argv_in_out, - fallback_resources, widget_class, var_args) - XtAppContext *app_context_return; - char *application_class; - XrmOptionDescList options; - Cardinal num_options; - int *argc_in_out; - String *argv_in_out; - String *fallback_resources; - WidgetClass widget_class; - va_list var_args; -#endif { XtAppContext app_con; Display * dpy; @@ -397,7 +328,6 @@ Widget _XtVaOpenApplication(app_context_return, application_class, options, return(root); } -#if NeedVarargsPrototypes Widget _XtVaAppInitialize( XtAppContext *app_context_return, @@ -408,20 +338,6 @@ _XtVaAppInitialize( String *argv_in_out, String *fallback_resources, va_list var_args) -#else -/*VARARGS7*/ -Widget _XtVaAppInitialize(app_context_return, application_class, options, - num_options, argc_in_out, argv_in_out, - fallback_resources, var_args) - XtAppContext *app_context_return; - char *application_class; - XrmOptionDescList options; - Cardinal num_options; - int *argc_in_out; - String *argv_in_out; - String *fallback_resources; - va_list var_args; -#endif { return _XtVaOpenApplication(app_context_return, application_class, options, num_options, @@ -436,7 +352,6 @@ Widget _XtVaAppInitialize(app_context_return, application_class, options, * _XtVaOpenApplication and to _XtVaAppInitialize. */ -#if NeedVarargsPrototypes Widget XtVaOpenApplication( XtAppContext *app_context_return, @@ -448,30 +363,15 @@ XtVaOpenApplication( String *fallback_resources, WidgetClass widget_class, ...) -#else -Widget XtVaOpenApplication(app_context_return, application_class, options, - num_options, argc_in_out, argv_in_out, - fallback_resources, widget_class, va_alist) - XtAppContext *app_context_return; - String application_class; - XrmOptionDescList options; - Cardinal num_options; - int *argc_in_out; - String *argv_in_out; - String *fallback_resources; - WidgetClass widget_class; - va_dcl -#endif { va_list var; - Va_start(var, widget_class); + va_start(var, widget_class); return _XtVaOpenApplication(app_context_return, (String)application_class, options, num_options, argc_in_out, argv_in_out, fallback_resources, widget_class, var); } -#if NeedVarargsPrototypes Widget XtVaAppInitialize( XtAppContext *app_context_return, @@ -482,23 +382,10 @@ XtVaAppInitialize( String *argv_in_out, String *fallback_resources, ...) -#else -Widget XtVaAppInitialize(app_context_return, application_class, options, - num_options, argc_in_out, argv_in_out, - fallback_resources, va_alist) - XtAppContext *app_context_return; - String application_class; - XrmOptionDescList options; - Cardinal num_options; - int *argc_in_out; - String *argv_in_out; - String *fallback_resources; - va_dcl -#endif { va_list var; - Va_start(var, fallback_resources); + va_start(var, fallback_resources); return _XtVaOpenApplication(app_context_return, (String)application_class, options, num_options, argc_in_out, argv_in_out, fallback_resources, diff --git a/src/VarGet.c b/src/VarGet.c index ef72cad..237b49c 100644 --- a/src/VarGet.c +++ b/src/VarGet.c @@ -51,6 +51,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/Xt/VarGet.c,v 1.8 2001/12/14 19:56:32 dawes Exp $ */ #include "IntrinsicI.h" #include "VarargsI.h" @@ -58,7 +59,6 @@ in this Software without prior written authorization from The Open Group. static String XtNxtGetTypedArg = "xtGetTypedArg"; -#if NeedVarargsPrototypes void XtVaGetSubresources( Widget widget, @@ -68,17 +68,6 @@ XtVaGetSubresources( XtResourceList resources, Cardinal num_resources, ...) -#else -/*VARARGS6*/ -void XtVaGetSubresources(widget, base, name, class, resources, num_resources, va_alist) - Widget widget; - XtPointer base; - String name; - String class; - XtResourceList resources; - Cardinal num_resources; - va_dcl -#endif { va_list var; XtTypedArgList args; @@ -87,11 +76,11 @@ void XtVaGetSubresources(widget, base, name, class, resources, num_resources, va WIDGET_TO_APPCON(widget); LOCK_APP(app); - Va_start(var, num_resources); + va_start(var, num_resources); _XtCountVaList(var, &total_count, &typed_count); va_end(var); - Va_start(var, num_resources); + va_start(var, num_resources); _XtVaToTypedArgList(var, total_count, &args, &num_args); @@ -107,18 +96,8 @@ void XtVaGetSubresources(widget, base, name, class, resources, num_resources, va } -#if NeedVarargsPrototypes void XtVaGetApplicationResources(Widget widget, XtPointer base, XtResourceList resources, Cardinal num_resources, ...) -#else -/*VARARGS4*/ -void XtVaGetApplicationResources(widget, base, resources, num_resources, va_alist) - Widget widget; - XtPointer base; - XtResourceList resources; - Cardinal num_resources; - va_dcl -#endif { va_list var; XtTypedArgList args; @@ -127,11 +106,11 @@ void XtVaGetApplicationResources(widget, base, resources, num_resources, va_alis WIDGET_TO_APPCON(widget); LOCK_APP(app); - Va_start(var,num_resources); + va_start(var,num_resources); _XtCountVaList(var, &total_count, &typed_count); va_end(var); - Va_start(var,num_resources); + va_start(var,num_resources); _XtVaToTypedArgList(var, total_count, &args, &num_args); @@ -242,15 +221,8 @@ GetNestedArg(widget, avlist, args, resources, num_resources) return(count); } -#if NeedVarargsPrototypes void XtVaGetValues(Widget widget, ...) -#else -/*VARARGS1*/ -void XtVaGetValues(widget, va_alist) - Widget widget; - va_dcl -#endif { va_list var; String attr; @@ -262,7 +234,7 @@ void XtVaGetValues(widget, va_alist) WIDGET_TO_APPCON(widget); LOCK_APP(app); - Va_start(var,widget); + va_start(var,widget); _XtCountVaList(var, &total_count, &typed_count); @@ -273,7 +245,7 @@ void XtVaGetValues(widget, va_alist) else args = NULL; /* for lint; really unused */ va_end(var); - Va_start(var,widget); + va_start(var,widget); for(attr = va_arg(var, String), count = 0 ; attr != NULL; attr = va_arg(var, String)) { if (strcmp(attr, XtVaTypedArg) == 0) { @@ -313,24 +285,15 @@ void XtVaGetValues(widget, va_alist) UNLOCK_APP(app); } -#if NeedVarargsPrototypes void XtVaGetSubvalues(XtPointer base,XtResourceList resources, Cardinal num_resources, ...) -#else -/*VARARGS3*/ -void XtVaGetSubvalues(base, resources, num_resources, va_alist) - XtPointer base; - XtResourceList resources; - Cardinal num_resources; - va_dcl -#endif { va_list var; ArgList args; Cardinal num_args; int total_count, typed_count; - Va_start(var,num_resources); + va_start(var,num_resources); _XtCountVaList(var, &total_count, &typed_count); @@ -339,7 +302,7 @@ void XtVaGetSubvalues(base, resources, num_resources, va_alist) } va_end(var); - Va_start(var,num_resources); + va_start(var,num_resources); _XtVaToArgList((Widget)NULL, var, total_count, &args, &num_args); va_end(var); diff --git a/src/Varargs.c b/src/Varargs.c index e2a0f45..552f72d 100644 --- a/src/Varargs.c +++ b/src/Varargs.c @@ -25,6 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/Xt/Varargs.c,v 3.10 2001/12/14 19:56:32 dawes Exp $ */ #include "IntrinsicI.h" #include "VarargsI.h" @@ -38,10 +39,10 @@ static String XtNxtConvertVarToArgList = "xtConvertVarToArgList"; * attributes that are typed. The list is counted recursively. */ static void -_XtCountNestedList(avlist, total_count, typed_count) - XtTypedArgList avlist; - int *total_count; - int *typed_count; +_XtCountNestedList( + XtTypedArgList avlist, + int *total_count, + int *typed_count) { for (; avlist->name != NULL; avlist++) { if (strcmp(avlist->name, XtVaNestedList) == 0) { @@ -82,17 +83,17 @@ _XtCountVaList(var, total_count, typed_count) for(attr = va_arg(var, String) ; attr != NULL; attr = va_arg(var, String)) { if (strcmp(attr, XtVaTypedArg) == 0) { - va_arg(var, String); - va_arg(var, String); - va_arg(var, XtArgVal); - va_arg(var, int); + (void)va_arg(var, String); + (void)va_arg(var, String); + (void)va_arg(var, XtArgVal); + (void)va_arg(var, int); ++(*total_count); ++(*typed_count); } else if (strcmp(attr, XtVaNestedList) == 0) { _XtCountNestedList(va_arg(var, XtTypedArgList), total_count, typed_count); } else { - va_arg(var, XtArgVal); + (void)va_arg(var, XtArgVal); ++(*total_count); } } @@ -104,16 +105,8 @@ _XtCountVaList(var, total_count, typed_count) * constructs an attribute-value list of type XtTypedArgList and * returns the list. */ -#if NeedVarargsPrototypes XtVarArgsList XtVaCreateArgsList(XtPointer unused, ...) -#else -/*ARGSUSED*/ -/*VARARGS1*/ -XtVarArgsList XtVaCreateArgsList(unused, va_alist) - XtPointer unused; - va_dcl -#endif { va_list var; XtTypedArgList avlist; @@ -125,22 +118,22 @@ XtVarArgsList XtVaCreateArgsList(unused, va_alist) * Note: The count is required only to allocate enough space to store * the list. Therefore nested lists are not counted recursively. */ - Va_start(var,unused); + va_start(var,unused); for(attr = va_arg(var, String) ; attr != NULL; attr = va_arg(var, String)) { ++count; if (strcmp(attr, XtVaTypedArg) == 0) { - va_arg(var, String); - va_arg(var, String); - va_arg(var, XtArgVal); - va_arg(var, int); + (void)va_arg(var, String); + (void)va_arg(var, String); + (void)va_arg(var, XtArgVal); + (void)va_arg(var, int); } else { - va_arg(var, XtArgVal); + (void)va_arg(var, XtArgVal); } } va_end(var); - Va_start(var,unused); + va_start(var,unused); avlist = _XtVaCreateTypedArgList(var, count); va_end(var); return (XtVarArgsList)avlist; @@ -190,14 +183,13 @@ XtTypedArgList _XtVaCreateTypedArgList(var, count) * 1 if the conversion succeeded and 0 if the conversion failed. */ static int -TypedArgToArg(widget, typed_arg, arg_return, resources, num_resources, - memory_return) - Widget widget; - XtTypedArgList typed_arg; - ArgList arg_return; - XtResourceList resources; - Cardinal num_resources; - ArgList memory_return; +TypedArgToArg( + Widget widget, + XtTypedArgList typed_arg, + ArgList arg_return, + XtResourceList resources, + Cardinal num_resources, + ArgList memory_return) { String to_type = NULL; XrmValue from_val, to_val; @@ -279,14 +271,13 @@ TypedArgToArg(widget, typed_arg, arg_return, resources, num_resources, * an ArgList/count. */ static int -NestedArgtoArg(widget, avlist, args, resources, num_resources, - memory_return) - Widget widget; - XtTypedArgList avlist; - ArgList args; - XtResourceList resources; - Cardinal num_resources; - ArgList memory_return; +NestedArgtoArg( + Widget widget, + XtTypedArgList avlist, + ArgList args, + XtResourceList resources, + Cardinal num_resources, + ArgList memory_return) { int count = 0; @@ -356,7 +347,8 @@ _XtFreeArgList(args, total_count, typed_count) } -static void GetResources(); +static void GetResources(Widget widget, XtResourceList *res_list, + Cardinal *number); /* @@ -485,9 +477,9 @@ Cardinal * number; } } -static int NestedArgtoTypedArg(args, avlist) - XtTypedArgList args; - XtTypedArgList avlist; +static int NestedArgtoTypedArg( + XtTypedArgList args, + XtTypedArgList avlist) { int count = 0; diff --git a/src/Vendor.c b/src/Vendor.c index 4123ddc..3b282dc 100644 --- a/src/Vendor.c +++ b/src/Vendor.c @@ -46,6 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +/* $XFree86: xc/lib/Xt/Vendor.c,v 1.7 2002/05/31 18:45:46 dawes Exp $ */ /* Make sure all wm properties can make it out of the resource manager */ @@ -63,6 +64,24 @@ SOFTWARE. * ***************************************************************************/ +#ifdef __UNIXOS2__ +/* to fix the EditRes problem because of wrong linker semantics */ +extern WidgetClass vendorShellWidgetClass; +unsigned long _DLL_InitTerm(unsigned long mod,unsigned long flag) +{ + switch (flag) { + case 0: /*called on init*/ + _CRT_init(); + vendorShellWidgetClass = (WidgetClass)(&vendorShellClassRec); + return 1; + case 1: /*called on exit*/ + return 1; + default: + return 0; + } +} +#endif + externaldef(vendorshellclassrec) VendorShellClassRec vendorShellClassRec = { { /* superclass */ (WidgetClass) &wmShellClassRec, diff --git a/src/sharedlib.c b/src/sharedlib.c index 55d79c6..5096c44 100644 --- a/src/sharedlib.c +++ b/src/sharedlib.c @@ -25,15 +25,17 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/Xt/sharedlib.c,v 3.7 2002/05/31 18:45:46 dawes Exp $ */ #if (defined(SUNSHLIB) || defined(AIXSHLIB)) && !defined(SHAREDCODE) #include "IntrinsicI.h" #include "VarargsI.h" #include "ShellP.h" #include "VendorP.h" +#include "CreateI.h" -#ifdef AIXSHLIB +#if defined(AIXSHLIB) || defined(__UNIXOS2__) WidgetClass vendorShellWidgetClass = (WidgetClass) &vendorShellClassRec; static void _XtVendorInitialize() @@ -138,7 +140,6 @@ ArgList args_in; fallback_resources, args_in, num_args_in); } -#if NeedVarargsPrototypes Widget XtVaAppInitialize( XtAppContext *app_context_return, @@ -149,25 +150,12 @@ XtVaAppInitialize( String *argv_in_out, String *fallback_resources, ...) -#else -Widget XtVaAppInitialize(app_context_return, application_class, options, - num_options, argc_in_out, argv_in_out, - fallback_resources, va_alist) - XtAppContext *app_context_return; - String application_class; - XrmOptionDescList options; - Cardinal num_options; - int *argc_in_out; - String *argv_in_out; - String *fallback_resources; - va_dcl -#endif { va_list var; extern Widget _XtVaAppInitialize(); VENDORINIT - Va_start(var, fallback_resources); + va_start(var, fallback_resources); return _XtVaAppInitialize(app_context_return, application_class, options, num_options, argc_in_out, argv_in_out, fallback_resources, var); @@ -210,7 +198,6 @@ ArgList args_in; args_in, num_args_in); } -#if NeedVarargsPrototypes Widget XtVaOpenApplication( XtAppContext *app_context_return, @@ -222,26 +209,12 @@ XtVaOpenApplication( String *fallback_resources, WidgetClass widget_class, ...) -#else -Widget XtVaOpenApplication(app_context_return, application_class, options, - num_options, argc_in_out, argv_in_out, - fallback_resources, widget_class, va_alist) - XtAppContext *app_context_return; - String application_class; - XrmOptionDescList options; - Cardinal num_options; - int *argc_in_out; - String *argv_in_out; - String *fallback_resources; - WidgetClass widget_class; - va_dcl -#endif { va_list var; extern Widget _XtVaOpenApplication(); VENDORINIT - Va_start(var, widget_class); + va_start(var, widget_class); return _XtVaOpenApplication(app_context_return, application_class, options, num_options, argc_in_out, argv_in_out, fallback_resources, widget_class, var); diff --git a/util/Shell.ht b/util/Shell.ht index 6e87abe..c511645 100644 --- a/util/Shell.ht +++ b/util/Shell.ht @@ -46,6 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +/* $XFree86: xc/lib/Xt/util/Shell.ht,v 3.5 2001/12/14 19:56:39 dawes Exp $ */ #ifndef _XtShell_h #define _XtShell_h @@ -63,11 +64,7 @@ SOFTWARE. */ #ifndef XTSTRINGDEFINES -#ifdef __STDC__ #define _XtShell_h_Const const -#else -#define _XtShell_h_Const /**/ -#endif #endif <<<STRING_TABLE_GOES_HERE>>> diff --git a/util/StrDefs.ct b/util/StrDefs.ct index 3c4417f..0c60d80 100644 --- a/util/StrDefs.ct +++ b/util/StrDefs.ct @@ -46,12 +46,9 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +/* $XFree86: xc/lib/Xt/util/StrDefs.ct,v 3.5 2001/12/14 19:56:39 dawes Exp $ */ -#ifdef __STDC__ #define Const const -#else -#define Const /**/ -#endif <<<STRING_TABLE_GOES_HERE>>> diff --git a/util/StrDefs.ht b/util/StrDefs.ht index 4132c79..c3f70b3 100644 --- a/util/StrDefs.ht +++ b/util/StrDefs.ht @@ -46,16 +46,13 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +/* $XFree86: xc/lib/Xt/util/StrDefs.ht,v 3.5 2001/12/14 19:56:39 dawes Exp $ */ #ifndef _XtStringDefs_h_ #define _XtStringDefs_h_ #ifndef XTSTRINGDEFINES -#ifdef __STDC__ #define _XtStringDefs_h_Const const -#else -#define _XtStringDefs_h_Const /**/ -#endif #endif <<<STRING_TABLE_GOES_HERE>>> diff --git a/util/makestrs.c b/util/makestrs.c index 5d58f35..803bad7 100644 --- a/util/makestrs.c +++ b/util/makestrs.c @@ -25,16 +25,14 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/config/util/makestrs.c,v 3.7 2001/12/14 19:53:22 dawes Exp $ */ /* Constructs string definitions */ #include <stdio.h> #include <X11/Xos.h> -#ifndef X_NOT_STDC_ENV #include <stdlib.h> -#else -char *malloc(); -#endif +#include <unistd.h> #if defined(macII) && !defined(__STDC__) /* stdlib.h fails to define these */ char *malloc(); #endif /* macII */ @@ -84,9 +82,7 @@ static char* externdefstr; #define X_MAGIC_STRING "<<<STRING_TABLE_GOES_HERE>>>" -static void WriteHeaderProlog (f, phile) - FILE* f; - File* phile; +static void WriteHeaderProlog (FILE *f, File *phile) { Table* t; TableEnt* te; @@ -107,9 +103,7 @@ static void WriteHeaderProlog (f, phile) (void) fprintf (f, "%s", "#else\n"); } -static void IntelABIWriteHeader (f, phile) - FILE* f; - File* phile; +static void IntelABIWriteHeader (FILE *f, File *phile) { Table* t; TableEnt* te; @@ -128,9 +122,7 @@ static void IntelABIWriteHeader (f, phile) (void) fprintf (f, "#endif /* %s */\n", featurestr); } -static void SPARCABIWriteHeader (f, phile) - FILE* f; - File* phile; +static void SPARCABIWriteHeader (FILE *f, File *phile) { Table* t; TableEnt* te; @@ -141,9 +133,7 @@ static void SPARCABIWriteHeader (f, phile) prefixstr, te->left, te->right); } -static void FunctionWriteHeader (f, phile) - FILE* f; - File* phile; +static void FunctionWriteHeader (FILE *f, File *phile) { Table* t; TableEnt* te; @@ -164,9 +154,7 @@ static void FunctionWriteHeader (f, phile) (void) fprintf (f, "#endif /* %s */\n", featurestr); } -static void ArrayperWriteHeader (f, phile) - FILE* f; - File* phile; +static void ArrayperWriteHeader (FILE *f, File *phile) { Table* t; TableEnt* te; @@ -184,9 +172,7 @@ static void ArrayperWriteHeader (f, phile) (void) fprintf (f, "#endif /* %s */\n", featurestr); } -static void DefaultWriteHeader (f, phile) - FILE* f; - File* phile; +static void DefaultWriteHeader (FILE *f, File *phile) { Table* t; TableEnt* te; @@ -207,9 +193,7 @@ static void DefaultWriteHeader (f, phile) (void) fprintf (f, "#endif /* %s */\n", featurestr); } -static void CopyTmplProlog (tmpl, f) - FILE* tmpl; - FILE* f; +static void CopyTmplProlog (FILE *tmpl, FILE *f) { char buf[1024]; static char* magic_string = X_MAGIC_STRING; @@ -223,9 +207,7 @@ static void CopyTmplProlog (tmpl, f) } } -static void CopyTmplEpilog (tmpl, f) - FILE* tmpl; - FILE* f; +static void CopyTmplEpilog (FILE *tmpl, FILE *f) { char buf[1024]; @@ -236,16 +218,11 @@ static void CopyTmplEpilog (tmpl, f) static char* abistring[] = { "Default", "Array per string", "Intel", "Intel BC", "SPARC", "Function" }; -static void WriteHeader (tagline, phile, abi) - char* tagline; - File* phile; - int abi; +static void WriteHeader (char *tagline, File *phile, int abi) { FILE* f; char* tmp; - Table* t; - TableEnt* te; - static void (*headerproc[])() = { + static void (*headerproc[])(FILE *f, File *phile) = { DefaultWriteHeader, ArrayperWriteHeader, IntelABIWriteHeader, IntelABIWriteHeader, SPARCABIWriteHeader, FunctionWriteHeader }; @@ -284,9 +261,7 @@ static void WriteHeader (tagline, phile, abi) (void) fclose (f); } -static void WriteSourceLine (te, abi, fudge) - TableEnt* te; - int abi; +static void WriteSourceLine (TableEnt *te, int abi, int fudge) { char* c; @@ -298,8 +273,7 @@ static void WriteSourceLine (te, abi, fudge) static char* const_string = "%s %sConst char %s[] = {\n"; -static void IntelABIWriteSource (abi) - int abi; +static void IntelABIWriteSource (int abi) { File* phile; @@ -317,8 +291,7 @@ static void IntelABIWriteSource (abi) } } -static void IntelABIBCWriteSource (abi) - int abi; +static void IntelABIBCWriteSource (int abi) { File* phile; @@ -345,8 +318,7 @@ static void IntelABIBCWriteSource (abi) } } -static void FunctionWriteSource (abi) - int abi; +static void FunctionWriteSource (int abi) { File* phile; @@ -368,8 +340,7 @@ static void FunctionWriteSource (abi) } } -static void ArrayperWriteSource (abi) - int abi; +static void ArrayperWriteSource (int abi) { File* phile; static int done_atom; @@ -385,14 +356,14 @@ static void ArrayperWriteSource (abi) done_atom = 1; } (void) printf ("%s %sConst char %s%s[] = \"%s\";\n", - externdefstr, conststr ? conststr : prefixstr, + externdefstr, conststr ? conststr : "", + prefixstr, te->left, te->right); } } } -static void DefaultWriteSource (abi) - int abi; +static void DefaultWriteSource (int abi) { File* phile; @@ -410,11 +381,9 @@ static void DefaultWriteSource (abi) } } -static void WriteSource(tagline, abi) - char* tagline; - int abi; +static void WriteSource(char *tagline, int abi) { - static void (*sourceproc[])() = { + static void (*sourceproc[])(int) = { DefaultWriteSource, ArrayperWriteSource, IntelABIWriteSource, IntelABIBCWriteSource, DefaultWriteSource, FunctionWriteSource }; @@ -446,8 +415,7 @@ static void WriteSource(tagline, abi) if (tmpl) CopyTmplEpilog (tmpl, stdout); } -static void DoLine(buf) - char* buf; +static void DoLine(char *buf) { #define X_NO_TOKEN 0 #define X_FILE_TOKEN 1 @@ -611,8 +579,7 @@ static void DoLine(buf) } } -static void IntelABIIndexEntries (file) - File* file; +static void IntelABIIndexEntries (File *file) { Table* t; TableEnt* te; @@ -625,8 +592,7 @@ static void IntelABIIndexEntries (file) } } -static void DefaultIndexEntries (file) - File* file; +static void DefaultIndexEntries (File *file) { Table* t; TableEnt* te; @@ -640,9 +606,7 @@ static void DefaultIndexEntries (file) } } -static void IndexEntries (file,abi) - File* file; - int abi; +static void IndexEntries (File *file, int abi) { switch (abi) { case X_SPARC_ABI: @@ -657,8 +621,7 @@ static void IndexEntries (file,abi) } } -static char* DoComment (line) - char* line; +static char* DoComment (char *line) { char* tag; char* eol; @@ -676,9 +639,7 @@ static char* DoComment (line) return ret; } -int main(argc, argv) - int argc; - char** argv; +int main(int argc, char *argv[]) { int len, i; char* tagline = NULL; diff --git a/util/makestrs.man b/util/makestrs.man index 7cc6b4c..7da5e8b 100644 --- a/util/makestrs.man +++ b/util/makestrs.man @@ -22,7 +22,10 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from The .\" Open Group. -.TH MAKESTRS 1 "Release 6.4" "X Version 11" +.\" +.\" $XFree86: xc/config/util/makestrs.man,v 3.8 2001/12/14 19:53:22 dawes Exp $ +.\" +.TH MAKESTRS 1 __xorgversion__ .SH NAME makestrs \- makes string table C source and header(s) .SH SYNOPSIS @@ -83,26 +86,26 @@ no abioptions are specified. .SH SYNTAX The syntax for string-list file is (items in square brackets are optional): .RS 4 -#prefix <text> +\&#prefix <text> .RE .RS 4 -#feature <text> +\&#feature <text> .RE .RS 4 -#externref <text> +\&#externref <text> .RE .RS 4 -#externdef [<text>] +\&#externdef [<text>] .RE .RS 4 [#ctempl <text>] .RE .LP .RS 4 -#file <filename> +\&#file <filename> .RE .RS 4 -#table <tablename> +\&#table <tablename> .RE .RS 4 [#htempl] @@ -129,19 +132,19 @@ The syntax for string-list file is (items in square brackets are optional): <text> .RE .RS 4 -... + ... .RE .RS 4 -#table <tablename> +\&#table <tablename> .RE .RS 4 -...] + ...] .RE .RS 4 [#file <filename> .RE .RS 4 -...] + ...] .RE .LP In words you may have one or more #file directives. Each #file may have |