diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:28:16 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:28:16 +0000 |
| commit | f81d7ef72c9b4f13e33efa812bed9446657ed003 (patch) | |
| tree | 183442a515d232d4d88cb56d6de651c215731c3f | |
| parent | bdc0667ef29e24b1a2188b11546d843a7d3e5ef6 (diff) | |
| download | xorg-lib-libXt-f81d7ef72c9b4f13e33efa812bed9446657ed003.tar.gz | |
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_902xf86-4_3_99_901xf86-4_3_99_16
152 files changed, 1037 insertions, 4285 deletions
diff --git a/include/X11/CallbackI.h b/include/X11/CallbackI.h index 9d4db98..b45ef68 100644 --- a/include/X11/CallbackI.h +++ b/include/X11/CallbackI.h @@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +/* $XFree86: xc/lib/Xt/CallbackI.h,v 1.4 2003/10/24 15:47:35 tsi Exp $ */ /**************************************************************** * @@ -68,67 +69,49 @@ typedef struct internalCallbackRec { } InternalCallbackRec, *InternalCallbackList; typedef Boolean (*_XtConditionProc)( -#if NeedFunctionPrototypes XtPointer /* data */ -#endif ); extern void _XtAddCallback( -#if NeedFunctionPrototypes InternalCallbackList* /* callbacks */, XtCallbackProc /* callback */, XtPointer /* closure */ -#endif ); extern void _XtAddCallbackOnce( -#if NeedFunctionPrototypes InternalCallbackList* /* callbacks */, XtCallbackProc /* callback */, XtPointer /* closure */ -#endif ); extern InternalCallbackList _XtCompileCallbackList( -#if NeedFunctionPrototypes XtCallbackList /* xtcallbacks */ -#endif ); extern XtCallbackList _XtGetCallbackList( -#if NeedFunctionPrototypes InternalCallbackList* /* callbacks */ -#endif ); extern void _XtRemoveAllCallbacks( -#if NeedFunctionPrototypes InternalCallbackList* /* callbacks */ -#endif ); extern void _XtRemoveCallback( -#if NeedFunctionPrototypes InternalCallbackList* /* callbacks */, XtCallbackProc /* callback */, XtPointer /* closure */ -#endif ); extern void _XtPeekCallback( -#if NeedFunctionPrototypes Widget /* widget */, XtCallbackList /* callbacks */, XtCallbackProc * /* callback */, XtPointer * /* closure */ -#endif ); extern void _XtCallConditionalCallbackList( -#if NeedFunctionPrototypes Widget /* widget */, XtCallbackList /* callbacks */, XtPointer /* call_data */, _XtConditionProc /* cond_proc */ -#endif ); diff --git a/include/X11/Composite.h b/include/X11/Composite.h index 4c1e029..90a8ba4 100644 --- a/include/X11/Composite.h +++ b/include/X11/Composite.h @@ -46,6 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +/* $XFree86: xc/lib/Xt/Composite.h,v 1.4 2003/10/24 15:47:35 tsi Exp $ */ #ifndef _XtComposite_h #define _XtComposite_h @@ -53,59 +54,45 @@ SOFTWARE. typedef struct _CompositeClassRec *CompositeWidgetClass; typedef Cardinal (*XtOrderProc)( -#if NeedFunctionPrototypes Widget /* child */ -#endif ); _XFUNCPROTOBEGIN extern void XtManageChildren( -#if NeedFunctionPrototypes WidgetList /* children */, Cardinal /* num_children */ -#endif ); extern void XtManageChild( -#if NeedFunctionPrototypes Widget /* child */ -#endif ); extern void XtUnmanageChildren( -#if NeedFunctionPrototypes WidgetList /* children */, Cardinal /* num_children */ -#endif ); extern void XtUnmanageChild( -#if NeedFunctionPrototypes Widget /* child */ -#endif ); typedef void (*XtDoChangeProc)( -#if NeedFunctionPrototypes Widget /* composite_parent */, WidgetList /* unmanage_children */, Cardinal * /* num_unmanage_children */, WidgetList /* manage_children */, Cardinal * /* num_manage_children */, XtPointer /* client_data */ -#endif ); extern void XtChangeManagedSet( -#if NeedFunctionPrototypes WidgetList /* unmanage_children */, Cardinal /* num_unmanage_children */, XtDoChangeProc /* do_change_proc */, XtPointer /* client_data */, WidgetList /* manage_children */, Cardinal /* num_manage_children */ -#endif ); _XFUNCPROTOEND diff --git a/include/X11/ConvertI.h b/include/X11/ConvertI.h index 13689ab..674fdfb 100644 --- a/include/X11/ConvertI.h +++ b/include/X11/ConvertI.h @@ -46,7 +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 $ */ +/* $XFree86: xc/lib/Xt/ConvertI.h,v 1.4 2003/04/21 16:34:26 herrb Exp $ */ /* Representation types */ @@ -59,25 +59,18 @@ extern XrmQuark _XtQString; typedef struct _ConverterRec **ConverterTable; extern void _XtAddDefaultConverters( -#if NeedFunctionPrototypes ConverterTable /* table */ -#endif ); extern void _XtSetDefaultConverterTable( -#if NeedFunctionPrototypes ConverterTable* /* table */ -#endif ); extern void _XtFreeConverterTable( -#if NeedFunctionPrototypes ConverterTable /* table */ -#endif ); extern void _XtTableAddConverter( -#if NeedFunctionPrototypes ConverterTable /* table */, XrmRepresentation /* from_type */, XrmRepresentation /* to_type */, @@ -88,18 +81,15 @@ extern void _XtTableAddConverter( XtCacheType /* cache_type */, XtDestructor /* destructor */, _XtBoolean /* global */ -#endif ); extern Boolean _XtConvert( -#if NeedFunctionPrototypes Widget /* widget */, XrmRepresentation /* from_type */, XrmValuePtr /* from */, XrmRepresentation /* to_type */, XrmValuePtr /* to */, XtCacheRef* /* cache_ref_return */ -#endif ); void _XtConvertInitialize(void); diff --git a/include/X11/EventI.h b/include/X11/EventI.h index 73c9770..e2d7564 100644 --- a/include/X11/EventI.h +++ b/include/X11/EventI.h @@ -47,7 +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 $ */ +/* $XFree86: xc/lib/Xt/EventI.h,v 1.4 2003/04/21 16:34:27 herrb Exp $ */ /* * Event.h - exported types and functions for toolkit event handler @@ -66,9 +66,7 @@ typedef struct _XtGrabRec *XtGrabList; #include "PassivGraI.h" extern void _XtEventInitialize( -#if NeedFunctionPrototypes void -#endif ); typedef struct _XtEventRec { @@ -96,35 +94,25 @@ typedef struct _BlockHookRec { } BlockHookRec, *BlockHook; extern void _XtFreeEventTable( -#if NeedFunctionPrototypes XtEventTable* /* event_table */ -#endif ); extern Boolean _XtOnGrabList( -#if NeedFunctionPrototypes Widget /* widget */, XtGrabRec* /* grabList */ -#endif ); extern void _XtRemoveAllInputs( -#if NeedFunctionPrototypes XtAppContext /* app */ -#endif ); extern void _XtRefreshMapping( -#if NeedFunctionPrototypes XEvent* /* event */, _XtBoolean /* dispatch */ -#endif ); extern EventMask _XtConvertTypeToMask( -#if NeedFunctionPrototypes int /* eventType */ -#endif ); /* EventUtil.c */ diff --git a/include/X11/InitialI.h b/include/X11/InitialI.h index 0fe1d25..b5f185c 100644 --- a/include/X11/InitialI.h +++ b/include/X11/InitialI.h @@ -46,7 +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 $ */ +/* $XFree86: xc/lib/Xt/InitialI.h,v 3.11 2003/04/21 16:34:27 herrb Exp $ */ #ifndef _XtinitialI_h #define _XtinitialI_h @@ -208,12 +208,10 @@ extern void _XtHeapFree(Heap* heap); extern char *_XtHeapMalloc( -#if NeedFunctionPrototypes Heap* /* heap */, Cardinal /* size */, char * /* file */, int /* line */ -#endif ); #define _XtHeapAlloc(heap,bytes) _XtHeapMalloc(heap, bytes, __FILE__, __LINE__) @@ -221,44 +219,33 @@ extern char *_XtHeapMalloc( #else /* XTTRACEMEMORY */ extern char* _XtHeapAlloc( -#if NeedFunctionPrototypes Heap* /* heap */, Cardinal /* size */ -#endif ); #endif /* XTTRACEMEMORY */ extern void _XtSetDefaultErrorHandlers( -#if NeedFunctionPrototypes XtErrorMsgHandler* /* errMsg */, XtErrorMsgHandler* /* warnMsg */, XtErrorHandler* /* err */, XtErrorHandler* /* warn */ -#endif ); extern void _XtSetDefaultSelectionTimeout( -#if NeedFunctionPrototypes unsigned long* /* timeout */ -#endif ); extern XtAppContext _XtDefaultAppContext( -#if NeedFunctionPrototypes void -#endif ); extern ProcessContext _XtGetProcessContext( -#if NeedFunctionPrototypes void -#endif ); Display * _XtAppInit( -#if NeedFunctionPrototypes XtAppContext* /* app_context_return */, String /* application_class */, XrmOptionDescRec* /* options */, @@ -266,25 +253,19 @@ _XtAppInit( int* /* argc_in_out */, String** /* argv_in_out */, String* /* fallback_resources */ -#endif ); extern void _XtDestroyAppContexts( -#if NeedFunctionPrototypes void -#endif ); extern void _XtCloseDisplays( -#if NeedFunctionPrototypes XtAppContext /* app */ -#endif ); extern int _XtAppDestroyCount; extern int _XtWaitForSomething( -#if NeedFunctionPrototypes XtAppContext /* app */, _XtBoolean /* ignoreEvents */, _XtBoolean /* ignoreTimers */, @@ -295,7 +276,6 @@ extern int _XtWaitForSomething( _XtBoolean /* drop_lock */, #endif unsigned long* /* howlong */ -#endif ); typedef struct _CaseConverterRec *CaseConverterPtr; @@ -365,21 +345,15 @@ typedef struct _PerDisplayTable { extern PerDisplayTablePtr _XtperDisplayList; extern XtPerDisplay _XtSortPerDisplayList( -#if NeedFunctionPrototypes Display* /* dpy */ -#endif ); extern XtPerDisplay _XtGetPerDisplay( -#if NeedFunctionPrototypes Display* /* dpy */ -#endif ); extern XtPerDisplayInputRec* _XtGetPerDisplayInput( -#if NeedFunctionPrototypes Display* /* dpy */ -#endif ); #if 0 @@ -405,7 +379,6 @@ extern XtPerDisplayInputRec* _XtGetPerDisplayInput( #endif extern void _XtDisplayInitialize( -#if NeedFunctionPrototypes Display* /* dpy */, XtPerDisplay /* pd */, _Xconst char* /* name */, @@ -413,53 +386,38 @@ extern void _XtDisplayInitialize( Cardinal /* num_urs */, int* /* argc */, char** /* argv */ -#endif ); extern void _XtCacheFlushTag( -#if NeedFunctionPrototypes XtAppContext /* app */, XtPointer /* tag */ -#endif ); extern void _XtFreeActions( -#if NeedFunctionPrototypes struct _ActionListRec* /* action_table */ -#endif ); extern void _XtDoPhase2Destroy( -#if NeedFunctionPrototypes XtAppContext /* app */, int /* dispatch_level */ -#endif ); extern void _XtDoFreeBindings( -#if NeedFunctionPrototypes XtAppContext /* app */ -#endif ); extern void _XtExtensionSelect( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); #define _XtSafeToDestroy(app) ((app)->dispatch_level == 0) extern void _XtAllocWWTable( -#if NeedFunctionPrototypes XtPerDisplay pd -#endif ); extern void _XtFreeWWTable( -#if NeedFunctionPrototypes XtPerDisplay pd -#endif ); extern String _XtGetUserName(String dest, int len); diff --git a/include/X11/Intrinsic.h b/include/X11/Intrinsic.h index 3d41150..edbdfc2 100644 --- a/include/X11/Intrinsic.h +++ b/include/X11/Intrinsic.h @@ -48,7 +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 $ */ +/* $XFree86: xc/lib/Xt/Intrinsic.h,v 3.9 2003/04/21 16:34:27 herrb Exp $ */ #ifndef _XtIntrinsic_h #define _XtIntrinsic_h @@ -68,8 +68,6 @@ in this Software without prior written authorization from The Open Group. typedef char *String; -#if NeedFunctionPrototypes - /* We do this in order to get "const" declarations to work right. We * use _XtString instead of String so that C++ applications can * #define String to something else if they choose, to avoid conflicts @@ -92,8 +90,6 @@ typedef char *String; #define _XtXtEnum XtEnum #endif /* NeedWidePrototypes */ -#endif /* NeedFunctionPrototypes */ - #include <stddef.h> #ifdef VMS @@ -168,11 +164,7 @@ typedef unsigned int Cardinal; typedef unsigned short Dimension; /* Size in pixels */ typedef short Position; /* Offset from 0 coordinate */ -#if NeedFunctionPrototypes typedef void* XtPointer; -#else -typedef char* XtPointer; -#endif /* The type Opaque is NOT part of the Xt standard, do NOT use it. */ /* (It remains here only for backward compatibility.) */ @@ -189,12 +181,10 @@ typedef struct _TranslationData *XtAccelerators; typedef unsigned int Modifiers; typedef void (*XtActionProc)( -#if NeedFunctionPrototypes Widget /* widget */, XEvent* /* event */, String* /* params */, Cardinal* /* num_params */ -#endif ); typedef XtActionProc* XtBoundActions; @@ -223,11 +213,9 @@ typedef struct { } XtConvertArgRec, *XtConvertArgList; typedef void (*XtConvertArgProc)( -#if NeedFunctionPrototypes Widget /* widget */, Cardinal* /* size */, XrmValue* /* value */ -#endif ); typedef struct { @@ -245,33 +233,27 @@ typedef struct { #define XtSMDontChange 5 typedef void (*XtConverter)( /* obsolete */ -#if NeedFunctionPrototypes XrmValue* /* args */, Cardinal* /* num_args */, XrmValue* /* from */, XrmValue* /* to */ -#endif ); typedef Boolean (*XtTypeConverter)( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValue* /* args */, Cardinal* /* num_args */, XrmValue* /* from */, XrmValue* /* to */, XtPointer* /* converter_data */ -#endif ); typedef void (*XtDestructor)( -#if NeedFunctionPrototypes XtAppContext /* app */, XrmValue* /* to */, XtPointer /* converter_data */, XrmValue* /* args */, Cardinal* /* num_args */ -#endif ); typedef Opaque XtCacheRef; @@ -279,50 +261,40 @@ typedef Opaque XtCacheRef; typedef Opaque XtActionHookId; typedef void (*XtActionHookProc)( -#if NeedFunctionPrototypes Widget /* w */, XtPointer /* client_data */, String /* action_name */, XEvent* /* event */, String* /* params */, Cardinal* /* num_params */ -#endif ); typedef unsigned long XtBlockHookId; typedef void (*XtBlockHookProc)( -#if NeedFunctionPrototypes XtPointer /* client_data */ -#endif ); typedef void (*XtKeyProc)( -#if NeedFunctionPrototypes Display* /* dpy */, _XtKeyCode /* keycode */, Modifiers /* modifiers */, Modifiers* /* modifiers_return */, KeySym* /* keysym_return */ -#endif ); typedef void (*XtCaseProc)( -#if NeedFunctionPrototypes Display* /* display */, KeySym /* keysym */, KeySym* /* lower_return */, KeySym* /* upper_return */ -#endif ); typedef void (*XtEventHandler)( -#if NeedFunctionPrototypes Widget /* widget */, XtPointer /* closure */, XEvent* /* event */, Boolean* /* continue_to_dispatch */ -#endif ); typedef unsigned long EventMask; @@ -335,25 +307,19 @@ typedef unsigned long XtInputMask; #define XtInputExceptMask (1L<<2) typedef void (*XtTimerCallbackProc)( -#if NeedFunctionPrototypes XtPointer /* closure */, XtIntervalId* /* id */ -#endif ); typedef void (*XtInputCallbackProc)( -#if NeedFunctionPrototypes XtPointer /* closure */, int* /* source */, XtInputId* /* id */ -#endif ); typedef void (*XtSignalCallbackProc)( -#if NeedFunctionPrototypes XtPointer /* closure */, XtSignalId* /* id */ -#endif ); typedef struct { @@ -364,11 +330,9 @@ typedef struct { typedef XtPointer XtVarArgsList; typedef void (*XtCallbackProc)( -#if NeedFunctionPrototypes Widget /* widget */, XtPointer /* closure */, /* data the application registered */ XtPointer /* call_data */ /* callback specific data */ -#endif ); typedef struct _XtCallbackRec { @@ -407,48 +371,36 @@ typedef struct _XtResource { } XtResource, *XtResourceList; typedef void (*XtResourceDefaultProc)( -#if NeedFunctionPrototypes Widget /* widget */, int /* offset */, XrmValue* /* value */ -#endif ); typedef String (*XtLanguageProc)( -#if NeedFunctionPrototypes Display* /* dpy */, String /* xnl */, XtPointer /* client_data */ -#endif ); typedef void (*XtErrorMsgHandler)( -#if NeedFunctionPrototypes String /* name */, String /* type */, String /* class */, String /* default */, String* /* params */, Cardinal* /* num_params */ -#endif ); typedef void (*XtErrorHandler)( -#if NeedFunctionPrototypes String /* msg */ -#endif ); typedef void (*XtCreatePopupChildProc)( -#if NeedFunctionPrototypes Widget /* shell */ -#endif ); typedef Boolean (*XtWorkProc)( -#if NeedFunctionPrototypes XtPointer /* closure */ /* data the application registered */ -#endif ); typedef struct { @@ -457,15 +409,12 @@ typedef struct { } SubstitutionRec, *Substitution; typedef Boolean (*XtFilePredicate)( -#if NeedFunctionPrototypes String /* filename */ -#endif ); typedef XtPointer XtRequestId; typedef Boolean (*XtConvertSelectionProc)( -#if NeedFunctionPrototypes Widget /* widget */, Atom* /* selection */, Atom* /* target */, @@ -473,26 +422,20 @@ typedef Boolean (*XtConvertSelectionProc)( XtPointer* /* value_return */, unsigned long* /* length_return */, int* /* format_return */ -#endif ); typedef void (*XtLoseSelectionProc)( -#if NeedFunctionPrototypes Widget /* widget */, Atom* /* selection */ -#endif ); typedef void (*XtSelectionDoneProc)( -#if NeedFunctionPrototypes Widget /* widget */, Atom* /* selection */, Atom* /* target */ -#endif ); typedef void (*XtSelectionCallbackProc)( -#if NeedFunctionPrototypes Widget /* widget */, XtPointer /* closure */, Atom* /* selection */, @@ -500,29 +443,23 @@ typedef void (*XtSelectionCallbackProc)( XtPointer /* value */, unsigned long* /* length */, int* /* format */ -#endif ); typedef void (*XtLoseSelectionIncrProc)( -#if NeedFunctionPrototypes Widget /* widget */, Atom* /* selection */, XtPointer /* client_data */ -#endif ); typedef void (*XtSelectionDoneIncrProc)( -#if NeedFunctionPrototypes Widget /* widget */, Atom* /* selection */, Atom* /* target */, XtRequestId* /* receiver_id */, XtPointer /* client_data */ -#endif ); typedef Boolean (*XtConvertSelectionIncrProc)( -#if NeedFunctionPrototypes Widget /* widget */, Atom* /* selection */, Atom* /* target */, @@ -533,33 +470,26 @@ typedef Boolean (*XtConvertSelectionIncrProc)( unsigned long* /* max_length */, XtPointer /* client_data */, XtRequestId* /* receiver_id */ -#endif ); typedef void (*XtCancelConvertSelectionProc)( -#if NeedFunctionPrototypes Widget /* widget */, Atom* /* selection */, Atom* /* target */, XtRequestId* /* receiver_id */, XtPointer /* client_data */ -#endif ); typedef Boolean (*XtEventDispatchProc)( -#if NeedFunctionPrototypes XEvent* /* event */ -#endif ); typedef void (*XtExtensionSelectProc)( -#if NeedFunctionPrototypes Widget /* widget */, int* /* event_types */, XtPointer* /* select_data */, int /* count */, XtPointer /* client_data */ -#endif ); /*************************************************************** @@ -571,17 +501,14 @@ typedef void (*XtExtensionSelectProc)( _XFUNCPROTOBEGIN extern Boolean XtConvertAndStore( -#if NeedFunctionPrototypes Widget /* widget */, _Xconst _XtString /* from_type */, XrmValue* /* from */, _Xconst _XtString /* to_type */, XrmValue* /* to_in_out */ -#endif ); extern Boolean XtCallConverter( -#if NeedFunctionPrototypes Display* /* dpy */, XtTypeConverter /* converter */, XrmValuePtr /* args */, @@ -589,95 +516,69 @@ extern Boolean XtCallConverter( XrmValuePtr /* from */, XrmValue* /* to_in_out */, XtCacheRef* /* cache_ref_return */ -#endif ); extern Boolean XtDispatchEvent( -#if NeedFunctionPrototypes XEvent* /* event */ -#endif ); extern Boolean XtCallAcceptFocus( -#if NeedFunctionPrototypes Widget /* widget */, Time* /* time */ -#endif ); extern Boolean XtPeekEvent( /* obsolete */ -#if NeedFunctionPrototypes XEvent* /* event_return */ -#endif ); extern Boolean XtAppPeekEvent( -#if NeedFunctionPrototypes XtAppContext /* app_context */, XEvent* /* event_return */ -#endif ); extern Boolean XtIsSubclass( -#if NeedFunctionPrototypes Widget /* widget */, WidgetClass /* widgetClass */ -#endif ); extern Boolean XtIsObject( -#if NeedFunctionPrototypes Widget /* object */ -#endif ); extern Boolean _XtCheckSubclassFlag( /* implementation-private */ -#if NeedFunctionPrototypes Widget /* object */, _XtXtEnum /* type_flag */ -#endif ); extern Boolean _XtIsSubclassOf( /* implementation-private */ -#if NeedFunctionPrototypes Widget /* object */, WidgetClass /* widget_class */, WidgetClass /* flag_class */, _XtXtEnum /* type_flag */ -#endif ); extern Boolean XtIsManaged( -#if NeedFunctionPrototypes Widget /* rectobj */ -#endif ); extern Boolean XtIsRealized( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); extern Boolean XtIsSensitive( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); extern Boolean XtOwnSelection( -#if NeedFunctionPrototypes Widget /* widget */, Atom /* selection */, Time /* time */, XtConvertSelectionProc /* convert */, XtLoseSelectionProc /* lose */, XtSelectionDoneProc /* done */ -#endif ); extern Boolean XtOwnSelectionIncremental( -#if NeedFunctionPrototypes Widget /* widget */, Atom /* selection */, Time /* time */, @@ -686,87 +587,69 @@ extern Boolean XtOwnSelectionIncremental( XtSelectionDoneIncrProc /* done_callback */, XtCancelConvertSelectionProc /* cancel_callback */, XtPointer /* client_data */ -#endif ); extern XtGeometryResult XtMakeResizeRequest( -#if NeedFunctionPrototypes Widget /* widget */, _XtDimension /* width */, _XtDimension /* height */, Dimension* /* width_return */, Dimension* /* height_return */ -#endif ); extern void XtTranslateCoords( -#if NeedFunctionPrototypes Widget /* widget */, _XtPosition /* x */, _XtPosition /* y */, Position* /* rootx_return */, Position* /* rooty_return */ -#endif ); extern KeySym* XtGetKeysymTable( -#if NeedFunctionPrototypes Display* /* dpy */, KeyCode* /* min_keycode_return */, int* /* keysyms_per_keycode_return */ -#endif ); extern void XtKeysymToKeycodeList( -#if NeedFunctionPrototypes Display* /* dpy */, KeySym /* keysym */, KeyCode** /* keycodes_return */, Cardinal* /* keycount_return */ -#endif ); extern void XtStringConversionWarning( /* obsolete */ -#if NeedFunctionPrototypes _Xconst _XtString /* from_value */, _Xconst _XtString /* to_type */ -#endif ); extern void XtDisplayStringConversionWarning( -#if NeedFunctionPrototypes Display* /* dpy */, _Xconst _XtString /* from_value */, _Xconst _XtString /* to_type */ -#endif ); externalref XtConvertArgRec const colorConvertArgs[]; externalref XtConvertArgRec const screenConvertArg[]; extern void XtAppAddConverter( /* obsolete */ -#if NeedFunctionPrototypes XtAppContext /* app_context */, _Xconst _XtString /* from_type */, _Xconst _XtString /* to_type */, XtConverter /* converter */, XtConvertArgList /* convert_args */, Cardinal /* num_args */ -#endif ); extern void XtAddConverter( /* obsolete */ -#if NeedFunctionPrototypes _Xconst _XtString /* from_type */, _Xconst _XtString /* to_type */, XtConverter /* converter */, XtConvertArgList /* convert_args */, Cardinal /* num_args */ -#endif ); extern void XtSetTypeConverter( -#if NeedFunctionPrototypes _Xconst _XtString /* from_type */, _Xconst _XtString /* to_type */, XtTypeConverter /* converter */, @@ -774,11 +657,9 @@ extern void XtSetTypeConverter( Cardinal /* num_args */, XtCacheType /* cache_type */, XtDestructor /* destructor */ -#endif ); extern void XtAppSetTypeConverter( -#if NeedFunctionPrototypes XtAppContext /* app_context */, _Xconst _XtString /* from_type */, _Xconst _XtString /* to_type */, @@ -787,27 +668,22 @@ extern void XtAppSetTypeConverter( Cardinal /* num_args */, XtCacheType /* cache_type */, XtDestructor /* destructor */ -#endif ); extern void XtConvert( /* obsolete */ -#if NeedFunctionPrototypes Widget /* widget */, _Xconst _XtString /* from_type */, XrmValue* /* from */, _Xconst _XtString /* to_type */, XrmValue* /* to_return */ -#endif ); extern void XtDirectConvert( /* obsolete */ -#if NeedFunctionPrototypes XtConverter /* converter */, XrmValuePtr /* args */, Cardinal /* num_args */, XrmValuePtr /* from */, XrmValue* /* to_return */ -#endif ); /**************************************************************** @@ -817,126 +693,92 @@ extern void XtDirectConvert( /* obsolete */ ****************************************************************/ extern XtTranslations XtParseTranslationTable( -#if NeedFunctionPrototypes _Xconst _XtString /* table */ -#endif ); extern XtAccelerators XtParseAcceleratorTable( -#if NeedFunctionPrototypes _Xconst _XtString /* source */ -#endif ); extern void XtOverrideTranslations( -#if NeedFunctionPrototypes Widget /* widget */, XtTranslations /* translations */ -#endif ); extern void XtAugmentTranslations( -#if NeedFunctionPrototypes Widget /* widget */, XtTranslations /* translations */ -#endif ); extern void XtInstallAccelerators( -#if NeedFunctionPrototypes Widget /* destination */, Widget /* source */ -#endif ); extern void XtInstallAllAccelerators( -#if NeedFunctionPrototypes Widget /* destination */, Widget /* source */ -#endif ); extern void XtUninstallTranslations( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); extern void XtAppAddActions( -#if NeedFunctionPrototypes XtAppContext /* app_context */, XtActionList /* actions */, Cardinal /* num_actions */ -#endif ); extern void XtAddActions( /* obsolete */ -#if NeedFunctionPrototypes XtActionList /* actions */, Cardinal /* num_actions */ -#endif ); extern XtActionHookId XtAppAddActionHook( -#if NeedFunctionPrototypes XtAppContext /* app_context */, XtActionHookProc /* proc */, XtPointer /* client_data */ -#endif ); extern void XtRemoveActionHook( -#if NeedFunctionPrototypes XtActionHookId /* id */ -#endif ); extern void XtGetActionList( -#if NeedFunctionPrototypes WidgetClass /* widget_class */, XtActionList* /* actions_return */, Cardinal* /* num_actions_return */ -#endif ); extern void XtCallActionProc( -#if NeedFunctionPrototypes Widget /* widget */, _Xconst _XtString /* action */, XEvent* /* event */, String* /* params */, Cardinal /* num_params */ -#endif ); extern void XtRegisterGrabAction( -#if NeedFunctionPrototypes XtActionProc /* action_proc */, _XtBoolean /* owner_events */, unsigned int /* event_mask */, int /* pointer_mode */, int /* keyboard_mode */ -#endif ); extern void XtSetMultiClickTime( -#if NeedFunctionPrototypes Display* /* dpy */, int /* milliseconds */ -#endif ); extern int XtGetMultiClickTime( -#if NeedFunctionPrototypes Display* /* dpy */ -#endif ); extern KeySym XtGetActionKeysym( -#if NeedFunctionPrototypes XEvent* /* event */, Modifiers* /* modifiers_return */ -#endif ); /*************************************************************** @@ -946,48 +788,38 @@ extern KeySym XtGetActionKeysym( ****************************************************************/ extern void XtTranslateKeycode( -#if NeedFunctionPrototypes Display* /* dpy */, _XtKeyCode /* keycode */, Modifiers /* modifiers */, Modifiers* /* modifiers_return */, KeySym* /* keysym_return */ -#endif ); extern void XtTranslateKey( -#if NeedFunctionPrototypes Display* /* dpy */, _XtKeyCode /* keycode */, Modifiers /* modifiers */, Modifiers* /* modifiers_return */, KeySym* /* keysym_return */ -#endif ); extern void XtSetKeyTranslator( -#if NeedFunctionPrototypes Display* /* dpy */, XtKeyProc /* proc */ -#endif ); extern void XtRegisterCaseConverter( -#if NeedFunctionPrototypes Display* /* dpy */, XtCaseProc /* proc */, KeySym /* start */, KeySym /* stop */ -#endif ); extern void XtConvertCase( -#if NeedFunctionPrototypes Display* /* dpy */, KeySym /* keysym */, KeySym* /* lower_return */, KeySym* /* upper_return */ -#endif ); /**************************************************************** @@ -1002,188 +834,142 @@ extern void XtConvertCase( #define XtAllEvents ((EventMask) -1L) extern void XtAddEventHandler( -#if NeedFunctionPrototypes Widget /* widget */, EventMask /* event_mask */, _XtBoolean /* nonmaskable */, XtEventHandler /* proc */, XtPointer /* closure */ -#endif ); extern void XtRemoveEventHandler( -#if NeedFunctionPrototypes Widget /* widget */, EventMask /* event_mask */, _XtBoolean /* nonmaskable */, XtEventHandler /* proc */, XtPointer /* closure */ -#endif ); extern void XtAddRawEventHandler( -#if NeedFunctionPrototypes Widget /* widget */, EventMask /* event_mask */, _XtBoolean /* nonmaskable */, XtEventHandler /* proc */, XtPointer /* closure */ -#endif ); extern void XtRemoveRawEventHandler( -#if NeedFunctionPrototypes Widget /* widget */, EventMask /* event_mask */, _XtBoolean /* nonmaskable */, XtEventHandler /* proc */, XtPointer /* closure */ -#endif ); extern void XtInsertEventHandler( -#if NeedFunctionPrototypes Widget /* widget */, EventMask /* event_mask */, _XtBoolean /* nonmaskable */, XtEventHandler /* proc */, XtPointer /* closure */, XtListPosition /* position */ -#endif ); extern void XtInsertRawEventHandler( -#if NeedFunctionPrototypes Widget /* widget */, EventMask /* event_mask */, _XtBoolean /* nonmaskable */, XtEventHandler /* proc */, XtPointer /* closure */, XtListPosition /* position */ -#endif ); extern XtEventDispatchProc XtSetEventDispatcher( -#if NeedFunctionPrototypes Display* /* dpy */, int /* event_type */, XtEventDispatchProc /* proc */ -#endif ); extern Boolean XtDispatchEventToWidget( -#if NeedFunctionPrototypes Widget /* widget */, XEvent* /* event */ -#endif ); extern void XtInsertEventTypeHandler( -#if NeedFunctionPrototypes Widget /* widget */, int /* type */, XtPointer /* select_data */, XtEventHandler /* proc */, XtPointer /* closure */, XtListPosition /* position */ -#endif ); extern void XtRemoveEventTypeHandler( -#if NeedFunctionPrototypes Widget /* widget */, int /* type */, XtPointer /* select_data */, XtEventHandler /* proc */, XtPointer /* closure */ -#endif ); extern EventMask XtBuildEventMask( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); extern void XtRegisterExtensionSelector( -#if NeedFunctionPrototypes Display* /* dpy */, int /* min_event_type */, int /* max_event_type */, XtExtensionSelectProc /* proc */, XtPointer /* client_data */ -#endif ); extern void XtAddGrab( -#if NeedFunctionPrototypes Widget /* widget */, _XtBoolean /* exclusive */, _XtBoolean /* spring_loaded */ -#endif ); extern void XtRemoveGrab( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); extern void XtProcessEvent( /* obsolete */ -#if NeedFunctionPrototypes XtInputMask /* mask */ -#endif ); extern void XtAppProcessEvent( -#if NeedFunctionPrototypes XtAppContext /* app_context */, XtInputMask /* mask */ -#endif ); extern void XtMainLoop( /* obsolete */ -#if NeedFunctionPrototypes void -#endif ); extern void XtAppMainLoop( -#if NeedFunctionPrototypes XtAppContext /* app_context */ -#endif ); extern void XtAddExposureToRegion( -#if NeedFunctionPrototypes XEvent* /* event */, Region /* region */ -#endif ); extern void XtSetKeyboardFocus( -#if NeedFunctionPrototypes Widget /* subtree */, Widget /* descendent */ -#endif ); extern Widget XtGetKeyboardFocusWidget( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); extern XEvent* XtLastEventProcessed( -#if NeedFunctionPrototypes Display* /* dpy */ -#endif ); extern Time XtLastTimestampProcessed( -#if NeedFunctionPrototypes Display* /* dpy */ -#endif ); /**************************************************************** @@ -1193,84 +979,62 @@ extern Time XtLastTimestampProcessed( ****************************************************************/ extern XtIntervalId XtAddTimeOut( /* obsolete */ -#if NeedFunctionPrototypes unsigned long /* interval */, XtTimerCallbackProc /* proc */, XtPointer /* closure */ -#endif ); extern XtIntervalId XtAppAddTimeOut( -#if NeedFunctionPrototypes XtAppContext /* app_context */, unsigned long /* interval */, XtTimerCallbackProc /* proc */, XtPointer /* closure */ -#endif ); extern void XtRemoveTimeOut( -#if NeedFunctionPrototypes XtIntervalId /* timer */ -#endif ); extern XtInputId XtAddInput( /* obsolete */ -#if NeedFunctionPrototypes int /* source */, XtPointer /* condition */, XtInputCallbackProc /* proc */, XtPointer /* closure */ -#endif ); extern XtInputId XtAppAddInput( -#if NeedFunctionPrototypes XtAppContext /* app_context */, int /* source */, XtPointer /* condition */, XtInputCallbackProc /* proc */, XtPointer /* closure */ -#endif ); extern void XtRemoveInput( -#if NeedFunctionPrototypes XtInputId /* id */ -#endif ); extern XtSignalId XtAppAddSignal( -#if NeedFunctionPrototypes XtAppContext /* app_context */, XtSignalCallbackProc /* proc */, XtPointer /* closure */ -#endif ); extern void XtRemoveSignal( -#if NeedFunctionPrototypes XtSignalId /* id */ -#endif ); extern void XtNoticeSignal( -#if NeedFunctionPrototypes XtSignalId /* id */ -#endif ); extern void XtNextEvent( /* obsolete */ -#if NeedFunctionPrototypes XEvent* /* event */ -#endif ); extern void XtAppNextEvent( -#if NeedFunctionPrototypes XtAppContext /* app_context */, XEvent* /* event_return */ -#endif ); #define XtIMXEvent 1 @@ -1280,29 +1044,21 @@ extern void XtAppNextEvent( #define XtIMAll (XtIMXEvent | XtIMTimer | XtIMAlternateInput | XtIMSignal) extern Boolean XtPending( /* obsolete */ -#if NeedFunctionPrototypes void -#endif ); extern XtInputMask XtAppPending( -#if NeedFunctionPrototypes XtAppContext /* app_context */ -#endif ); extern XtBlockHookId XtAppAddBlockHook( -#if NeedFunctionPrototypes XtAppContext /* app_context */, XtBlockHookProc /* proc */, XtPointer /* client_data */ -#endif ); extern void XtRemoveBlockHook( -#if NeedFunctionPrototypes XtBlockHookId /* id */ -#endif ); /**************************************************************** @@ -1335,59 +1091,43 @@ extern void XtRemoveBlockHook( (WidgetClass)topLevelShellWidgetClass, (XtEnum)0x80)) extern void XtRealizeWidget( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); void XtUnrealizeWidget( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); extern void XtDestroyWidget( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); extern void XtSetSensitive( -#if NeedFunctionPrototypes Widget /* widget */, _XtBoolean /* sensitive */ -#endif ); extern void XtSetMappedWhenManaged( -#if NeedFunctionPrototypes Widget /* widget */, _XtBoolean /* mapped_when_managed */ -#endif ); extern Widget XtNameToWidget( -#if NeedFunctionPrototypes Widget /* reference */, _Xconst _XtString /* names */ -#endif ); extern Widget XtWindowToWidget( -#if NeedFunctionPrototypes Display* /* display */, Window /* window */ -#endif ); extern XtPointer XtGetClassExtension( -#if NeedFunctionPrototypes WidgetClass /* object_class */, Cardinal /* byte_offset */, XrmQuark /* type */, long /* version */, Cardinal /* record_size */ -#endif ); /*************************************************************** @@ -1401,12 +1141,10 @@ extern XtPointer XtGetClassExtension( ((void)( (arg).name = (n), (arg).value = (XtArgVal)(d) )) extern ArgList XtMergeArgLists( -#if NeedFunctionPrototypes ArgList /* args1 */, Cardinal /* num_args1 */, ArgList /* args2 */, Cardinal /* num_args2 */ -#endif ); /*************************************************************** @@ -1419,9 +1157,7 @@ extern ArgList XtMergeArgLists( #define XtVaTypedArg "XtVaTypedArg" extern XtVarArgsList XtVaCreateArgsList( -#if NeedVarargsPrototypes XtPointer /*unused*/, ... -#endif ); /************************************************************* @@ -1435,63 +1171,43 @@ extern XtVarArgsList XtVaCreateArgsList( /* We're not included from the private file, so define these */ extern Display *XtDisplay( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); extern Display *XtDisplayOfObject( -#if NeedFunctionPrototypes Widget /* object */ -#endif ); extern Screen *XtScreen( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); extern Screen *XtScreenOfObject( -#if NeedFunctionPrototypes Widget /* object */ -#endif ); extern Window XtWindow( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); extern Window XtWindowOfObject( -#if NeedFunctionPrototypes Widget /* object */ -#endif ); extern String XtName( -#if NeedFunctionPrototypes Widget /* object */ -#endif ); extern WidgetClass XtSuperclass( -#if NeedFunctionPrototypes Widget /* object */ -#endif ); extern WidgetClass XtClass( -#if NeedFunctionPrototypes Widget /* object */ -#endif ); extern Widget XtParent( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); #endif /*_XtIntrinsicP_h*/ @@ -1501,68 +1217,52 @@ extern Widget XtParent( XUnmapWindow(XtDisplay(widget), XtWindow(widget)) extern void XtAddCallback( -#if NeedFunctionPrototypes Widget /* widget */, _Xconst _XtString /* callback_name */, XtCallbackProc /* callback */, XtPointer /* closure */ -#endif ); extern void XtRemoveCallback( -#if NeedFunctionPrototypes Widget /* widget */, _Xconst _XtString /* callback_name */, XtCallbackProc /* callback */, XtPointer /* closure */ -#endif ); extern void XtAddCallbacks( -#if NeedFunctionPrototypes Widget /* widget */, _Xconst _XtString /* callback_name */, XtCallbackList /* callbacks */ -#endif ); extern void XtRemoveCallbacks( -#if NeedFunctionPrototypes Widget /* widget */, _Xconst _XtString /* callback_name */, XtCallbackList /* callbacks */ -#endif ); extern void XtRemoveAllCallbacks( -#if NeedFunctionPrototypes Widget /* widget */, _Xconst _XtString /* callback_name */ -#endif ); extern void XtCallCallbacks( -#if NeedFunctionPrototypes Widget /* widget */, _Xconst _XtString /* callback_name */, XtPointer /* call_data */ -#endif ); extern void XtCallCallbackList( -#if NeedFunctionPrototypes Widget /* widget */, XtCallbackList /* callbacks */, XtPointer /* call_data */ -#endif ); extern XtCallbackStatus XtHasCallbacks( -#if NeedFunctionPrototypes Widget /* widget */, _Xconst _XtString /* callback_name */ -#endif ); /**************************************************************** @@ -1573,166 +1273,128 @@ extern XtCallbackStatus XtHasCallbacks( extern XtGeometryResult XtMakeGeometryRequest( -#if NeedFunctionPrototypes Widget /* widget */, XtWidgetGeometry* /* request */, XtWidgetGeometry* /* reply_return */ -#endif ); extern XtGeometryResult XtQueryGeometry( -#if NeedFunctionPrototypes Widget /* widget */, XtWidgetGeometry* /* intended */, XtWidgetGeometry* /* preferred_return */ -#endif ); extern Widget XtCreatePopupShell( -#if NeedFunctionPrototypes _Xconst _XtString /* name */, WidgetClass /* widgetClass */, Widget /* parent */, ArgList /* args */, Cardinal /* num_args */ -#endif ); extern Widget XtVaCreatePopupShell( -#if NeedVarargsPrototypes _Xconst _XtString /* name */, WidgetClass /* widgetClass */, Widget /* parent */, ... -#endif ); extern void XtPopup( -#if NeedFunctionPrototypes Widget /* popup_shell */, XtGrabKind /* grab_kind */ -#endif ); extern void XtPopupSpringLoaded( -#if NeedFunctionPrototypes Widget /* popup_shell */ -#endif ); extern void XtCallbackNone( -#if NeedFunctionPrototypes Widget /* widget */, XtPointer /* closure */, XtPointer /* call_data */ -#endif ); extern void XtCallbackNonexclusive( -#if NeedFunctionPrototypes Widget /* widget */, XtPointer /* closure */, XtPointer /* call_data */ -#endif ); extern void XtCallbackExclusive( -#if NeedFunctionPrototypes Widget /* widget */, XtPointer /* closure */, XtPointer /* call_data */ -#endif ); extern void XtPopdown( -#if NeedFunctionPrototypes Widget /* popup_shell */ -#endif ); extern void XtCallbackPopdown( -#if NeedFunctionPrototypes Widget /* widget */, XtPointer /* closure */, XtPointer /* call_data */ -#endif ); extern void XtMenuPopupAction( -#if NeedFunctionPrototypes Widget /* widget */, XEvent* /* event */, String* /* params */, Cardinal* /* num_params */ -#endif ); extern Widget XtCreateWidget( -#if NeedFunctionPrototypes _Xconst _XtString /* name */, WidgetClass /* widget_class */, Widget /* parent */, ArgList /* args */, Cardinal /* num_args */ -#endif ); extern Widget XtCreateManagedWidget( -#if NeedFunctionPrototypes _Xconst _XtString /* name */, WidgetClass /* widget_class */, Widget /* parent */, ArgList /* args */, Cardinal /* num_args */ -#endif ); extern Widget XtVaCreateWidget( -#if NeedVarargsPrototypes _Xconst _XtString /* name */, WidgetClass /* widget */, Widget /* parent */, ... -#endif ); extern Widget XtVaCreateManagedWidget( -#if NeedVarargsPrototypes _Xconst _XtString /* name */, WidgetClass /* widget_class */, Widget /* parent */, ... -#endif ); extern Widget XtCreateApplicationShell( /* obsolete */ -#if NeedFunctionPrototypes _Xconst _XtString /* name */, WidgetClass /* widget_class */, ArgList /* args */, Cardinal /* num_args */ -#endif ); extern Widget XtAppCreateShell( -#if NeedFunctionPrototypes _Xconst _XtString /* application_name */, _Xconst _XtString /* application_class */, WidgetClass /* widget_class */, Display* /* display */, ArgList /* args */, Cardinal /* num_args */ -#endif ); extern Widget XtVaAppCreateShell( -#if NeedVarargsPrototypes _Xconst _XtString /* application_name */, _Xconst _XtString /* application_class */, WidgetClass /* widget_class */, Display* /* display */, ... -#endif ); /**************************************************************** @@ -1742,21 +1404,16 @@ extern Widget XtVaAppCreateShell( ****************************************************************/ extern void XtToolkitInitialize( -#if NeedFunctionPrototypes void -#endif ); extern XtLanguageProc XtSetLanguageProc( -#if NeedFunctionPrototypes XtAppContext /* app_context */, XtLanguageProc /* proc */, XtPointer /* client_data */ -#endif ); extern void XtDisplayInitialize( -#if NeedFunctionPrototypes XtAppContext /* app_context */, Display* /* dpy */, _Xconst _XtString /* application_name */, @@ -1765,11 +1422,9 @@ extern void XtDisplayInitialize( Cardinal /* num_options */, int* /* argc */, char** /* argv */ -#endif ); extern Widget XtOpenApplication( -#if NeedFunctionPrototypes XtAppContext* /* app_context_return */, _Xconst _XtString /* application_class */, XrmOptionDescList /* options */, @@ -1780,11 +1435,9 @@ extern Widget XtOpenApplication( WidgetClass /* widget_class */, ArgList /* args */, Cardinal /* num_args */ -#endif ); extern Widget XtVaOpenApplication( -#if NeedVarargsPrototypes XtAppContext* /* app_context_return */, _Xconst _XtString /* application_class */, XrmOptionDescList /* options */, @@ -1794,11 +1447,9 @@ extern Widget XtVaOpenApplication( String* /* fallback_resources */, WidgetClass /* widget_class */, ... -#endif ); extern Widget XtAppInitialize( /* obsolete */ -#if NeedFunctionPrototypes XtAppContext* /* app_context_return */, _Xconst _XtString /* application_class */, XrmOptionDescList /* options */, @@ -1808,11 +1459,9 @@ extern Widget XtAppInitialize( /* obsolete */ String* /* fallback_resources */, ArgList /* args */, Cardinal /* num_args */ -#endif ); extern Widget XtVaAppInitialize( /* obsolete */ -#if NeedVarargsPrototypes XtAppContext* /* app_context_return */, _Xconst _XtString /* application_class */, XrmOptionDescList /* options */, @@ -1821,22 +1470,18 @@ extern Widget XtVaAppInitialize( /* obsolete */ String* /* argv_in_out */, String* /* fallback_resources */, ... -#endif ); extern Widget XtInitialize( /* obsolete */ -#if NeedFunctionPrototypes _Xconst _XtString /* shell_name */, _Xconst _XtString /* application_class */, XrmOptionDescRec* /* options */, Cardinal /* num_options */, int* /* argc */, char** /* argv */ -#endif ); extern Display *XtOpenDisplay( -#if NeedFunctionPrototypes XtAppContext /* app_context */, _Xconst _XtString /* display_string */, _Xconst _XtString /* application_name */, @@ -1845,87 +1490,63 @@ extern Display *XtOpenDisplay( Cardinal /* num_options */, int* /* argc */, char** /* argv */ -#endif ); extern XtAppContext XtCreateApplicationContext( -#if NeedFunctionPrototypes void -#endif ); extern void XtAppSetFallbackResources( -#if NeedFunctionPrototypes XtAppContext /* app_context */, String* /* specification_list */ -#endif ); extern void XtDestroyApplicationContext( -#if NeedFunctionPrototypes XtAppContext /* app_context */ -#endif ); extern void XtInitializeWidgetClass( -#if NeedFunctionPrototypes WidgetClass /* widget_class */ -#endif ); extern XtAppContext XtWidgetToApplicationContext( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); extern XtAppContext XtDisplayToApplicationContext( -#if NeedFunctionPrototypes Display* /* dpy */ -#endif ); extern XrmDatabase XtDatabase( -#if NeedFunctionPrototypes Display* /* dpy */ -#endif ); extern XrmDatabase XtScreenDatabase( -#if NeedFunctionPrototypes Screen* /* screen */ -#endif ); extern void XtCloseDisplay( -#if NeedFunctionPrototypes Display* /* dpy */ -#endif ); extern void XtGetApplicationResources( -#if NeedFunctionPrototypes Widget /* widget */, XtPointer /* base */, XtResourceList /* resources */, Cardinal /* num_resources */, ArgList /* args */, Cardinal /* num_args */ -#endif ); extern void XtVaGetApplicationResources( -#if NeedVarargsPrototypes Widget /* widget */, XtPointer /* base */, XtResourceList /* resources */, Cardinal /* num_resources */, ... -#endif ); extern void XtGetSubresources( -#if NeedFunctionPrototypes Widget /* widget */, XtPointer /* base */, _Xconst _XtString /* name */, @@ -1934,11 +1555,9 @@ extern void XtGetSubresources( Cardinal /* num_resources */, ArgList /* args */, Cardinal /* num_args */ -#endif ); extern void XtVaGetSubresources( -#if NeedVarargsPrototypes Widget /* widget */, XtPointer /* base */, _Xconst _XtString /* name */, @@ -1946,91 +1565,70 @@ extern void XtVaGetSubresources( XtResourceList /* resources */, Cardinal /* num_resources */, ... -#endif ); extern void XtSetValues( -#if NeedFunctionPrototypes Widget /* widget */, ArgList /* args */, Cardinal /* num_args */ -#endif ); extern void XtVaSetValues( -#if NeedVarargsPrototypes Widget /* widget */, ... -#endif ); extern void XtGetValues( -#if NeedFunctionPrototypes Widget /* widget */, ArgList /* args */, Cardinal /* num_args */ -#endif ); extern void XtVaGetValues( -#if NeedVarargsPrototypes Widget /* widget */, ... -#endif ); extern void XtSetSubvalues( -#if NeedFunctionPrototypes XtPointer /* base */, XtResourceList /* resources */, Cardinal /* num_resources */, ArgList /* args */, Cardinal /* num_args */ -#endif ); extern void XtVaSetSubvalues( -#if NeedVarargsPrototypes XtPointer /* base */, XtResourceList /* resources */, Cardinal /* num_resources */, ... -#endif ); extern void XtGetSubvalues( -#if NeedFunctionPrototypes XtPointer /* base */, XtResourceList /* resources */, Cardinal /* num_resources */, ArgList /* args */, Cardinal /* num_args */ -#endif ); extern void XtVaGetSubvalues( -#if NeedVarargsPrototypes XtPointer /* base */, XtResourceList /* resources */, Cardinal /* num_resources */, ... -#endif ); extern void XtGetResourceList( -#if NeedFunctionPrototypes WidgetClass /* widget_class */, XtResourceList* /* resources_return */, Cardinal* /* num_resources_return */ -#endif ); extern void XtGetConstraintResourceList( -#if NeedFunctionPrototypes WidgetClass /* widget_class */, XtResourceList* /* resources_return */, Cardinal* /* num_resources_return */ -#endif ); #define XtUnspecifiedPixmap ((Pixmap)2) @@ -2078,15 +1676,11 @@ typedef struct _XtCheckpointTokenRec { } XtCheckpointTokenRec, *XtCheckpointToken; XtCheckpointToken XtSessionGetToken( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); void XtSessionReturnToken( -#if NeedFunctionPrototypes XtCheckpointToken /* token */ -#endif ); /************************************************************* @@ -2096,33 +1690,24 @@ void XtSessionReturnToken( ************************************************************/ extern XtErrorMsgHandler XtAppSetErrorMsgHandler( -#if NeedFunctionPrototypes XtAppContext /* app_context */, XtErrorMsgHandler /* handler */ -#endif ); extern void XtSetErrorMsgHandler( /* obsolete */ -#if NeedFunctionPrototypes XtErrorMsgHandler /* handler */ -#endif ); extern XtErrorMsgHandler XtAppSetWarningMsgHandler( -#if NeedFunctionPrototypes XtAppContext /* app_context */, XtErrorMsgHandler /* handler */ -#endif ); extern void XtSetWarningMsgHandler( /* obsolete */ -#if NeedFunctionPrototypes XtErrorMsgHandler /* handler */ -#endif ); extern void XtAppErrorMsg( -#if NeedFunctionPrototypes XtAppContext /* app_context */, _Xconst _XtString /* name */, _Xconst _XtString /* type */, @@ -2130,22 +1715,18 @@ extern void XtAppErrorMsg( _Xconst _XtString /* default */, String* /* params */, Cardinal* /* num_params */ -#endif ); extern void XtErrorMsg( /* obsolete */ -#if NeedFunctionPrototypes _Xconst _XtString /* name */, _Xconst _XtString /* type */, _Xconst _XtString /* class */, _Xconst _XtString /* default */, String* /* params */, Cardinal* /* num_params */ -#endif ); extern void XtAppWarningMsg( -#if NeedFunctionPrototypes XtAppContext /* app_context */, _Xconst _XtString /* name */, _Xconst _XtString /* type */, @@ -2153,86 +1734,62 @@ extern void XtAppWarningMsg( _Xconst _XtString /* default */, String* /* params */, Cardinal* /* num_params */ -#endif ); extern void XtWarningMsg( /* obsolete */ -#if NeedFunctionPrototypes _Xconst _XtString /* name */, _Xconst _XtString /* type */, _Xconst _XtString /* class */, _Xconst _XtString /* default */, String* /* params */, Cardinal* /* num_params */ -#endif ); extern XtErrorHandler XtAppSetErrorHandler( -#if NeedFunctionPrototypes XtAppContext /* app_context */, XtErrorHandler /* handler */ -#endif ); extern void XtSetErrorHandler( /* obsolete */ -#if NeedFunctionPrototypes XtErrorHandler /* handler */ -#endif ); extern XtErrorHandler XtAppSetWarningHandler( -#if NeedFunctionPrototypes XtAppContext /* app_context */, XtErrorHandler /* handler */ -#endif ); extern void XtSetWarningHandler( /* obsolete */ -#if NeedFunctionPrototypes XtErrorHandler /* handler */ -#endif ); extern void XtAppError( -#if NeedFunctionPrototypes XtAppContext /* app_context */, _Xconst _XtString /* message */ -#endif ); extern void XtError( /* obsolete */ -#if NeedFunctionPrototypes _Xconst _XtString /* message */ -#endif ); extern void XtAppWarning( -#if NeedFunctionPrototypes XtAppContext /* app_context */, _Xconst _XtString /* message */ -#endif ); extern void XtWarning( /* obsolete */ -#if NeedFunctionPrototypes _Xconst _XtString /* message */ -#endif ); extern XrmDatabase *XtAppGetErrorDatabase( -#if NeedFunctionPrototypes XtAppContext /* app_context */ -#endif ); extern XrmDatabase *XtGetErrorDatabase( /* obsolete */ -#if NeedFunctionPrototypes void -#endif ); extern void XtAppGetErrorDatabaseText( -#if NeedFunctionPrototypes XtAppContext /* app_context */, _Xconst _XtString /* name */, _Xconst _XtString /* type */, @@ -2241,18 +1798,15 @@ extern void XtAppGetErrorDatabaseText( String /* buffer_return */, int /* nbytes */, XrmDatabase /* database */ -#endif ); extern void XtGetErrorDatabaseText( /* obsolete */ -#if NeedFunctionPrototypes _Xconst _XtString /* name */, _Xconst _XtString /* type */, _Xconst _XtString /* class */, _Xconst _XtString /* default */, String /* buffer_return */, int /* nbytes */ -#endif ); /**************************************************************** @@ -2262,63 +1816,47 @@ extern void XtGetErrorDatabaseText( /* obsolete */ ****************************************************************/ extern char *XtMalloc( -#if NeedFunctionPrototypes Cardinal /* size */ -#endif ); extern char *XtCalloc( -#if NeedFunctionPrototypes Cardinal /* num */, Cardinal /* size */ -#endif ); extern char *XtRealloc( -#if NeedFunctionPrototypes char* /* ptr */, Cardinal /* num */ -#endif ); extern void XtFree( -#if NeedFunctionPrototypes char* /* ptr */ -#endif ); #ifdef XTTRACEMEMORY extern char *_XtMalloc( /* implementation-private */ -#if NeedFunctionPrototypes Cardinal /* size */, char * /* file */, int /* line */ -#endif ); extern char *_XtRealloc( /* implementation-private */ -#if NeedFunctionPrototypes char * /* ptr */, Cardinal /* size */, char * /* file */, int /* line */ -#endif ); extern char *_XtCalloc( /* implementation-private */ -#if NeedFunctionPrototypes Cardinal /* num */, Cardinal /* size */, char * /* file */, int /* line */ -#endif ); extern void _XtFree( /* implementation-private */ -#if NeedFunctionPrototypes char * /* ptr */ -#endif ); #define XtMalloc(size) _XtMalloc(size, __FILE__, __LINE__) @@ -2339,24 +1877,18 @@ extern void _XtFree( /* implementation-private */ **************************************************************/ extern XtWorkProcId XtAddWorkProc( /* obsolete */ -#if NeedFunctionPrototypes XtWorkProc /* proc */, XtPointer /* closure */ -#endif ); extern XtWorkProcId XtAppAddWorkProc( -#if NeedFunctionPrototypes XtAppContext /* app_context */, XtWorkProc /* proc */, XtPointer /* closure */ -#endif ); extern void XtRemoveWorkProc( -#if NeedFunctionPrototypes XtWorkProcId /* id */ -#endif ); @@ -2366,22 +1898,18 @@ extern void XtRemoveWorkProc( *****************************************************************/ extern GC XtGetGC( -#if NeedFunctionPrototypes Widget /* widget */, XtGCMask /* valueMask */, XGCValues* /* values */ -#endif ); extern GC XtAllocateGC( -#if NeedFunctionPrototypes Widget /* widget */, Cardinal /* depth */, XtGCMask /* valueMask */, XGCValues* /* values */, XtGCMask /* dynamicMask */, XtGCMask /* unusedMask */ -#endif ); /* This implementation of XtDestroyGC differs from the formal specification @@ -2389,62 +1917,47 @@ extern GC XtAllocateGC( * may conform to the spec, use of XtReleaseGC is strongly encouraged. */ extern void XtDestroyGC( /* obsolete */ -#if NeedFunctionPrototypes GC /* gc */ -#endif ); extern void XtReleaseGC( -#if NeedFunctionPrototypes Widget /* object */, GC /* gc */ -#endif ); extern void XtAppReleaseCacheRefs( -#if NeedFunctionPrototypes XtAppContext /* app_context */, XtCacheRef* /* cache_ref */ -#endif ); extern void XtCallbackReleaseCacheRef( -#if NeedFunctionPrototypes Widget /* widget */, XtPointer /* closure */, /* XtCacheRef */ XtPointer /* call_data */ -#endif ); extern void XtCallbackReleaseCacheRefList( -#if NeedFunctionPrototypes Widget /* widget */, XtPointer /* closure */, /* XtCacheRef* */ XtPointer /* call_data */ -#endif ); extern void XtSetWMColormapWindows( -#if NeedFunctionPrototypes Widget /* widget */, Widget* /* list */, Cardinal /* count */ -#endif ); extern String XtFindFile( -#if NeedFunctionPrototypes _Xconst _XtString /* path */, Substitution /* substitutions */, Cardinal /* num_substitutions */, XtFilePredicate /* predicate */ -#endif ); extern String XtResolvePathname( -#if NeedFunctionPrototypes Display* /* dpy */, _Xconst _XtString /* type */, _Xconst _XtString /* filename */, @@ -2453,7 +1966,6 @@ extern String XtResolvePathname( Substitution /* substitutions */, Cardinal /* num_substitutions */, XtFilePredicate /* predicate */ -#endif ); /**************************************************************** @@ -2465,26 +1977,21 @@ extern String XtResolvePathname( #define XT_CONVERT_FAIL (Atom)0x80000001 extern void XtDisownSelection( -#if NeedFunctionPrototypes Widget /* widget */, Atom /* selection */, Time /* time */ -#endif ); extern void XtGetSelectionValue( -#if NeedFunctionPrototypes Widget /* widget */, Atom /* selection */, Atom /* target */, XtSelectionCallbackProc /* callback */, XtPointer /* closure */, Time /* time */ -#endif ); extern void XtGetSelectionValues( -#if NeedFunctionPrototypes Widget /* widget */, Atom /* selection */, Atom* /* targets */, @@ -2492,55 +1999,41 @@ extern void XtGetSelectionValues( XtSelectionCallbackProc /* callback */, XtPointer* /* closures */, Time /* time */ -#endif ); extern void XtAppSetSelectionTimeout( -#if NeedFunctionPrototypes XtAppContext /* app_context */, unsigned long /* timeout */ -#endif ); extern void XtSetSelectionTimeout( /* obsolete */ -#if NeedFunctionPrototypes unsigned long /* timeout */ -#endif ); extern unsigned long XtAppGetSelectionTimeout( -#if NeedFunctionPrototypes XtAppContext /* app_context */ -#endif ); extern unsigned long XtGetSelectionTimeout( /* obsolete */ -#if NeedFunctionPrototypes void -#endif ); extern XSelectionRequestEvent *XtGetSelectionRequest( -#if NeedFunctionPrototypes Widget /* widget */, Atom /* selection */, XtRequestId /* request_id */ -#endif ); extern void XtGetSelectionValueIncremental( -#if NeedFunctionPrototypes Widget /* widget */, Atom /* selection */, Atom /* target */, XtSelectionCallbackProc /* selection_callback */, XtPointer /* client_data */, Time /* time */ -#endif ); extern void XtGetSelectionValuesIncremental( -#if NeedFunctionPrototypes Widget /* widget */, Atom /* selection */, Atom* /* targets */, @@ -2548,22 +2041,18 @@ extern void XtGetSelectionValuesIncremental( XtSelectionCallbackProc /* callback */, XtPointer* /* client_data */, Time /* time */ -#endif ); extern void XtSetSelectionParameters( -#if NeedFunctionPrototypes Widget /* requestor */, Atom /* selection */, Atom /* type */, XtPointer /* value */, unsigned long /* length */, int /* format */ -#endif ); extern void XtGetSelectionParameters( -#if NeedFunctionPrototypes Widget /* owner */, Atom /* selection */, XtRequestId /* request_id */, @@ -2571,82 +2060,62 @@ extern void XtGetSelectionParameters( XtPointer* /* value_return */, unsigned long* /* length_return */, int* /* format_return */ -#endif ); extern void XtCreateSelectionRequest( -#if NeedFunctionPrototypes Widget /* requestor */, Atom /* selection */ -#endif ); extern void XtSendSelectionRequest( -#if NeedFunctionPrototypes Widget /* requestor */, Atom /* selection */, Time /* time */ -#endif ); extern void XtCancelSelectionRequest( -#if NeedFunctionPrototypes Widget /* requestor */, Atom /* selection */ -#endif ); extern Atom XtReservePropertyAtom( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); extern void XtReleasePropertyAtom( -#if NeedFunctionPrototypes Widget /* widget */, Atom /* selection */ -#endif ); extern void XtGrabKey( -#if NeedFunctionPrototypes Widget /* widget */, _XtKeyCode /* keycode */, Modifiers /* modifiers */, _XtBoolean /* owner_events */, int /* pointer_mode */, int /* keyboard_mode */ -#endif ); extern void XtUngrabKey( -#if NeedFunctionPrototypes Widget /* widget */, _XtKeyCode /* keycode */, Modifiers /* modifiers */ -#endif ); extern int XtGrabKeyboard( -#if NeedFunctionPrototypes Widget /* widget */, _XtBoolean /* owner_events */, int /* pointer_mode */, int /* keyboard_mode */, Time /* time */ -#endif ); extern void XtUngrabKeyboard( -#if NeedFunctionPrototypes Widget /* widget */, Time /* time */ -#endif ); extern void XtGrabButton( -#if NeedFunctionPrototypes Widget /* widget */, int /* button */, Modifiers /* modifiers */, @@ -2656,19 +2125,15 @@ extern void XtGrabButton( int /* keyboard_mode */, Window /* confine_to */, Cursor /* cursor */ -#endif ); extern void XtUngrabButton( -#if NeedFunctionPrototypes Widget /* widget */, unsigned int /* button */, Modifiers /* modifiers */ -#endif ); extern int XtGrabPointer( -#if NeedFunctionPrototypes Widget /* widget */, _XtBoolean /* owner_events */, unsigned int /* event_mask */, @@ -2677,43 +2142,32 @@ extern int XtGrabPointer( Window /* confine_to */, Cursor /* cursor */, Time /* time */ -#endif ); extern void XtUngrabPointer( -#if NeedFunctionPrototypes Widget /* widget */, Time /* time */ -#endif ); extern void XtGetApplicationNameAndClass( -#if NeedFunctionPrototypes Display* /* dpy */, String* /* name_return */, String* /* class_return */ -#endif ); extern void XtRegisterDrawable( -#if NeedFunctionPrototypes Display* /* dpy */, Drawable /* drawable */, Widget /* widget */ -#endif ); extern void XtUnregisterDrawable( -#if NeedFunctionPrototypes Display* /* dpy */, Drawable /* drawable */ -#endif ); extern Widget XtHooksOfDisplay( -#if NeedFunctionPrototypes Display* /* dpy */ -#endif ); typedef struct { @@ -2757,41 +2211,29 @@ typedef struct { } XtDestroyHookDataRec, *XtDestroyHookData; extern void XtGetDisplays( -#if NeedFunctionPrototypes XtAppContext /* app_context */, Display*** /* dpy_return */, Cardinal* /* num_dpy_return */ -#endif ); extern Boolean XtToolkitThreadInitialize( -#if NeedFunctionPrototypes void -#endif ); extern void XtAppSetExitFlag( -#if NeedFunctionPrototypes XtAppContext /* app_context */ -#endif ); extern Boolean XtAppGetExitFlag( -#if NeedFunctionPrototypes XtAppContext /* app_context */ -#endif ); extern void XtAppLock( -#if NeedFunctionPrototypes XtAppContext /* app_context */ -#endif ); extern void XtAppUnlock( -#if NeedFunctionPrototypes XtAppContext /* app_context */ -#endif ); /* @@ -2802,376 +2244,310 @@ extern void XtAppUnlock( /* String converters */ extern Boolean XtCvtStringToAcceleratorTable( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtStringToAtom( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* Display */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtStringToBool( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtStringToBoolean( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtStringToCommandArgArray( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtStringToCursor( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* Display */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtStringToDimension( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtStringToDirectoryString( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtStringToDisplay( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtStringToFile( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtStringToFloat( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtStringToFont( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* Display */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtStringToFontSet( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* Display, locale */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtStringToFontStruct( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* Display */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtStringToGravity( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtStringToInitialState( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtStringToInt( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtStringToPixel( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* Screen, Colormap */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); #define XtCvtStringToPosition XtCvtStringToShort extern Boolean XtCvtStringToRestartStyle( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtStringToShort( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtStringToTranslationTable( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtStringToUnsignedChar( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtStringToVisual( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* Screen, depth */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); /* int converters */ extern Boolean XtCvtIntToBool( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtIntToBoolean( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtIntToColor( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* Screen, Colormap */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); #define XtCvtIntToDimension XtCvtIntToShort extern Boolean XtCvtIntToFloat( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtIntToFont( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtIntToPixel( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtIntToPixmap( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); #define XtCvtIntToPosition XtCvtIntToShort extern Boolean XtCvtIntToShort( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtIntToUnsignedChar( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); /* Color converter */ extern Boolean XtCvtColorToPixel( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); /* Pixel converter */ diff --git a/include/X11/IntrinsicI.h b/include/X11/IntrinsicI.h index d1e000c..6b0e8ef 100644 --- a/include/X11/IntrinsicI.h +++ b/include/X11/IntrinsicI.h @@ -46,7 +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 $ */ +/* $XFree86: xc/lib/Xt/IntrinsicI.h,v 3.9 2003/04/21 16:34:28 herrb Exp $ */ #ifndef _XtintrinsicI_h #define _XtintrinsicI_h @@ -193,37 +193,27 @@ SOFTWARE. extern String XtCXtToolkitError; extern void _XtAllocError( -#if NeedFunctionPrototypes String /* alloc_type */ -#endif ); extern void _XtCompileResourceList( -#if NeedFunctionPrototypes XtResourceList /* resources */, Cardinal /* num_resources */ -#endif ); extern XtGeometryResult _XtMakeGeometryRequest( -#if NeedFunctionPrototypes Widget /* widget */, XtWidgetGeometry* /* request */, XtWidgetGeometry* /* reply_return */, Boolean* /* clear_rect_obj */ -#endif ); extern Boolean _XtIsHookObject( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); extern void _XtAddShellToHookObj( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); /* GCManager.c */ @@ -233,7 +223,7 @@ extern void _XtGClistFree(Display *dpy, XtPerDisplay pd); #ifdef XT_GEO_TATTLER -extern void _XtGeoTab (); +extern void _XtGeoTab (int); extern void _XtGeoTrace ( Widget widget, ... @@ -250,15 +240,11 @@ extern void _XtGeoTrace ( #ifndef XTTRACEMEMORY extern char* __XtMalloc ( -#if NeedFunctionPrototypes unsigned /* size */ -#endif ); extern char* __XtCalloc ( -#if NeedFunctionPrototypes unsigned /* num */, unsigned /* size */ -#endif ); #else diff --git a/include/X11/IntrinsicP.h b/include/X11/IntrinsicP.h index 255ef4c..ec70f05 100644 --- a/include/X11/IntrinsicP.h +++ b/include/X11/IntrinsicP.h @@ -46,6 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +/* $XFree86: xc/lib/Xt/IntrinsicP.h,v 1.4 2003/10/24 15:47:35 tsi Exp $ */ #ifndef _XtintrinsicP_h #define _XtintrinsicP_h @@ -77,80 +78,60 @@ typedef unsigned long XtVersionType; #define XtVersionDontCheck 0 typedef void (*XtProc)( -#if NeedFunctionPrototypes void -#endif ); typedef void (*XtWidgetClassProc)( -#if NeedFunctionPrototypes WidgetClass /* class */ -#endif ); typedef void (*XtWidgetProc)( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); typedef Boolean (*XtAcceptFocusProc)( -#if NeedFunctionPrototypes Widget /* widget */, Time* /* time */ -#endif ); typedef void (*XtArgsProc)( -#if NeedFunctionPrototypes Widget /* widget */, ArgList /* args */, Cardinal* /* num_args */ -#endif ); typedef void (*XtInitProc)( -#if NeedFunctionPrototypes Widget /* request */, Widget /* new */, ArgList /* args */, Cardinal* /* num_args */ -#endif ); typedef Boolean (*XtSetValuesFunc)( -#if NeedFunctionPrototypes Widget /* old */, Widget /* request */, Widget /* new */, ArgList /* args */, Cardinal* /* num_args */ -#endif ); typedef Boolean (*XtArgsFunc)( -#if NeedFunctionPrototypes Widget /* widget */, ArgList /* args */, Cardinal* /* num_args */ -#endif ); typedef void (*XtAlmostProc)( -#if NeedFunctionPrototypes Widget /* old */, Widget /* new */, XtWidgetGeometry* /* request */, XtWidgetGeometry* /* reply */ -#endif ); typedef void (*XtExposeProc)( -#if NeedFunctionPrototypes Widget /* widget */, XEvent* /* event */, Region /* region */ -#endif ); /* compress_exposure options*/ @@ -166,26 +147,20 @@ typedef void (*XtExposeProc)( #define XtExposeNoRegion 0x80 typedef void (*XtRealizeProc)( -#if NeedFunctionPrototypes Widget /* widget */, XtValueMask* /* mask */, XSetWindowAttributes* /* attributes */ -#endif ); typedef XtGeometryResult (*XtGeometryHandler)( -#if NeedFunctionPrototypes Widget /* widget */, XtWidgetGeometry* /* request */, XtWidgetGeometry* /* reply */ -#endif ); typedef void (*XtStringProc)( -#if NeedFunctionPrototypes Widget /* widget */, String /* str */ -#endif ); typedef struct { @@ -196,7 +171,6 @@ typedef struct { } XtTypedArg, *XtTypedArgList; typedef void (*XtAllocateProc)( -#if NeedFunctionPrototypes WidgetClass /* widget_class */, Cardinal * /* constraint_size */, Cardinal * /* more_bytes */, @@ -206,14 +180,11 @@ typedef void (*XtAllocateProc)( Cardinal * /* num_typed_args */, Widget * /* widget_return */, XtPointer * /* more_bytes_return */ -#endif ); typedef void (*XtDeallocateProc)( -#if NeedFunctionPrototypes Widget /* widget */, XtPointer /* more_bytes */ -#endif ); struct _XtStateRec; /* Forward declare before use for C++ */ @@ -288,71 +259,53 @@ typedef struct _XtTMRec { _XFUNCPROTOBEGIN extern Widget _XtWindowedAncestor( /* internal; implementation-dependent */ -#if NeedFunctionPrototypes Widget /* object */ -#endif ); extern void _XtInherit( -#if NeedFunctionPrototypes void -#endif ); extern void XtCreateWindow( -#if NeedFunctionPrototypes Widget /* widget */, unsigned int /* window_class */, Visual* /* visual */, XtValueMask /* value_mask */, XSetWindowAttributes* /* attributes */ -#endif ); extern void XtResizeWidget( -#if NeedFunctionPrototypes Widget /* widget */, _XtDimension /* width */, _XtDimension /* height */, _XtDimension /* border_width */ -#endif ); extern void XtMoveWidget( -#if NeedFunctionPrototypes Widget /* widget */, _XtPosition /* x */, _XtPosition /* y */ -#endif ); extern void XtConfigureWidget( -#if NeedFunctionPrototypes Widget /* widget */, _XtPosition /* x */, _XtPosition /* y */, _XtDimension /* width */, _XtDimension /* height */, _XtDimension /* border_width */ -#endif ); extern void XtResizeWindow( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); extern void XtProcessLock( -#if NeedFunctionPrototypes void -#endif ); extern void XtProcessUnlock( -#if NeedFunctionPrototypes void -#endif ); _XFUNCPROTOEND diff --git a/include/X11/PassivGraI.h b/include/X11/PassivGraI.h index 178c5ef..91c3de4 100644 --- a/include/X11/PassivGraI.h +++ b/include/X11/PassivGraI.h @@ -51,7 +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 $ */ +/* $XFree86: xc/lib/Xt/PassivGraI.h,v 1.4 2003/04/21 16:34:28 herrb Exp $ */ #ifndef _PDI_h_ #define _PDI_h_ @@ -136,26 +136,20 @@ typedef struct XtPerDisplayInputRec{ #define IsPseudoGrab(g) ((g == XtPseudoPassiveServerGrab)) extern void _XtDestroyServerGrabs( -#if NeedFunctionPrototypes Widget /* w */, XtPointer /* pwi */, /*XtPerWidgetInput*/ XtPointer /* call_data */ -#endif ); extern XtPerWidgetInput _XtGetPerWidgetInput( -#if NeedFunctionPrototypes Widget /* widget */, _XtBoolean /* create */ -#endif ); extern XtServerGrabPtr _XtCheckServerGrabsOnWidget( -#if NeedFunctionPrototypes XEvent* /* event */, Widget /* widget */, _XtBoolean /* isKeyboard */ -#endif ); /* @@ -165,38 +159,28 @@ extern XtGrabList* _XtGetGrabList( XtPerDisplayInput ); #define _XtGetGrabList(pdi) (&(pdi)->grabList) extern void _XtFreePerWidgetInput( -#if NeedFunctionPrototypes Widget /* w */, XtPerWidgetInput /* pwi */ -#endif ); extern Widget _XtProcessKeyboardEvent( -#if NeedFunctionPrototypes XKeyEvent* /* event */, Widget /* widget */, XtPerDisplayInput /* pdi */ -#endif ); extern Widget _XtProcessPointerEvent( -#if NeedFunctionPrototypes XButtonEvent* /* event */, Widget /* widget */, XtPerDisplayInput /* pdi */ -#endif ); extern void _XtRegisterPassiveGrabs( -#if NeedFunctionPrototypes Widget /* widget */ -#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 60f9414..2fe22ee 100644 --- a/include/X11/ResConfigP.h +++ b/include/X11/ResConfigP.h @@ -52,7 +52,7 @@ 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 $ */ +/* $XFree86: xc/lib/Xt/ResConfigP.h,v 3.8 2003/04/21 16:34:28 herrb Exp $ */ #ifndef _RESCONFIGP_H #define _RESCONFIGP_H @@ -68,11 +68,9 @@ _XFUNCPROTOBEGIN #define RCM_INIT "Custom Init" extern void _XtResourceConfigurationEH( -#if NeedFunctionPrototypes Widget /* w */, XtPointer /* client_data */, XEvent * /* event */ -#endif ); _XFUNCPROTOEND diff --git a/include/X11/ResourceI.h b/include/X11/ResourceI.h index 7a9d5a0..0957b96 100644 --- a/include/X11/ResourceI.h +++ b/include/X11/ResourceI.h @@ -46,7 +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 $ */ +/* $XFree86: xc/lib/Xt/ResourceI.h,v 1.6 2003/04/21 16:34:28 herrb Exp $ */ /**************************************************************** * @@ -62,33 +62,25 @@ SOFTWARE. #define StringToClass(string) XrmStringToClass(string) extern void _XtResourceDependencies( -#if NeedFunctionPrototypes WidgetClass /* wc */ -#endif ); extern void _XtConstraintResDependencies( -#if NeedFunctionPrototypes ConstraintWidgetClass /* wc */ -#endif ); extern XtCacheRef* _XtGetResources( -#if NeedFunctionPrototypes Widget /* w */, ArgList /* args */, Cardinal /* num_args */, XtTypedArgList /* typed_args */, Cardinal* /* num_typed_args */ -#endif ); extern void _XtCopyFromParent( -#if NeedFunctionPrototypes Widget /* widget */, int /* offset */, XrmValue* /* value */ -#endif ); extern void _XtCopyToArg(char *src, XtArgVal *dst, unsigned int size); diff --git a/include/X11/ThreadsI.h b/include/X11/ThreadsI.h index 3b51e07..14d34b0 100644 --- a/include/X11/ThreadsI.h +++ b/include/X11/ThreadsI.h @@ -53,7 +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/ThreadsI.h,v 3.5 2001/12/14 19:56:31 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/ThreadsI.h,v 3.6 2003/04/21 16:34:29 herrb Exp $ */ #ifndef _XtThreadsI_h #define _XtThreadsI_h @@ -63,44 +63,32 @@ in this Software without prior written authorization from The Open Group. typedef struct _LockRec *LockPtr; typedef void (*ThreadAppProc)( -#if NeedFunctionPrototypes XtAppContext /* app */ -#endif ); typedef void (*ThreadAppYieldLockProc)( -#if NeedFunctionPrototypes XtAppContext, /* app */ Boolean*, /* push_thread */ Boolean*, /* pushed_thread */ int* /* level */ -#endif ); typedef void (*ThreadAppRestoreLockProc)( -#if NeedFunctionPrototypes XtAppContext /* app */, int, /* level */ Boolean* /* pushed_thread */ -#endif ); extern void (*_XtProcessLock)( -#if NeedFunctionPrototypes void -#endif ); extern void (*_XtProcessUnlock)( -#if NeedFunctionPrototypes void -#endif ); extern void (*_XtInitAppLock)( -#if NeedFunctionPrototypes XtAppContext /* app */ -#endif ); #define INIT_APP_LOCK(app) if(_XtInitAppLock) (*_XtInitAppLock)(app) diff --git a/include/X11/TranslateI.h b/include/X11/TranslateI.h index bb86ee2..3af90eb 100644 --- a/include/X11/TranslateI.h +++ b/include/X11/TranslateI.h @@ -46,7 +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 $ */ +/* $XFree86: xc/lib/Xt/TranslateI.h,v 1.4 2003/04/21 16:34:29 herrb Exp $ */ /* * TranslateI.h - Header file private to translation management @@ -376,80 +376,60 @@ extern TMGlobalRec _XtGlobalTM; */ extern void _XtPopup( -#if NeedFunctionPrototypes Widget /* widget */, XtGrabKind /* grab_kind */, _XtBoolean /* spring_loaded */ -#endif ); extern String _XtPrintXlations( -#if NeedFunctionPrototypes Widget /* w */, XtTranslations /* xlations */, Widget /* accelWidget */, _XtBoolean /* includeRHS */ -#endif ); extern void _XtRegisterGrabs( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); extern XtPointer _XtInitializeActionData( -#if NeedFunctionPrototypes struct _XtActionsRec * /* actions */, Cardinal /* count */, _XtBoolean /* inPlace */ -#endif ); extern void _XtAddEventSeqToStateTree( -#if NeedFunctionPrototypes EventSeqPtr /* eventSeq */, TMParseStateTree /* stateTree */ -#endif ); extern Boolean _XtMatchUsingStandardMods( -#if NeedFunctionPrototypes TMTypeMatch /* typeMatch */, TMModifierMatch /* modMatch */, TMEventPtr /* eventSeq */ -#endif ); extern Boolean _XtMatchUsingDontCareMods( -#if NeedFunctionPrototypes TMTypeMatch /* typeMatch */, TMModifierMatch /* modMatch */, TMEventPtr /* eventSeq */ -#endif ); extern Boolean _XtRegularMatch( -#if NeedFunctionPrototypes TMTypeMatch /* typeMatch */, TMModifierMatch /* modMatch */, TMEventPtr /* eventSeq */ -#endif ); extern Boolean _XtMatchAtom( -#if NeedFunctionPrototypes TMTypeMatch /* typeMatch */, TMModifierMatch /* modMatch */, TMEventPtr /* eventSeq */ -#endif ); extern void _XtTranslateEvent( -#if NeedFunctionPrototypes Widget /* widget */, XEvent* /* event */ -#endif ); #include "CallbackI.h" @@ -465,208 +445,152 @@ extern void _XtBuildKeysymTables(Display *dpy, XtPerDisplay pd); #ifndef NO_MIT_HACKS extern void _XtDisplayTranslations( -#if NeedFunctionPrototypes Widget /* widget */, XEvent* /* event */, String* /* params */, Cardinal* /* num_params */ -#endif ); extern void _XtDisplayAccelerators( -#if NeedFunctionPrototypes Widget /* widget */, XEvent* /* event */, String* /* params */, Cardinal* /* num_params */ -#endif ); extern void _XtDisplayInstalledAccelerators( -#if NeedFunctionPrototypes Widget /* widget */, XEvent* /* event */, String* /* params */, Cardinal* /* num_params */ -#endif ); #endif /* ifndef NO_MIT_HACKS */ extern void _XtPopupInitialize( -#if NeedFunctionPrototypes XtAppContext /* app_context */ -#endif ); extern void _XtBindActions( -#if NeedFunctionPrototypes Widget /* widget */, XtTM /* tm_rec */ -#endif ); extern Boolean _XtComputeLateBindings( -#if NeedFunctionPrototypes Display* /* dpy */, LateBindingsPtr /* lateModifiers */, Modifiers* /* computed */, Modifiers* /* computedMask */ -#endif ); extern XtTranslations _XtCreateXlations( -#if NeedFunctionPrototypes TMStateTree * /* stateTrees */, TMShortCard /* numStateTrees */, XtTranslations /* first */, XtTranslations /* second */ -#endif ); extern Boolean _XtCvtMergeTranslations( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, Cardinal* /* num_args */, XrmValuePtr /* from */, XrmValuePtr /* to */, XtPointer* /* closure_ret */ -#endif ); void _XtFreeTranslations( -#if NeedFunctionPrototypes XtAppContext /* app */, XrmValuePtr /* toVal */, XtPointer /* closure */, XrmValuePtr /* args */, Cardinal* /* num_args */ -#endif ); extern TMShortCard _XtGetModifierIndex( -#if NeedFunctionPrototypes Event* /* event */ -#endif ); extern TMShortCard _XtGetQuarkIndex( -#if NeedFunctionPrototypes TMParseStateTree /* stateTreePtr */, XrmQuark /* quark */ -#endif ); extern XtTranslations _XtGetTranslationValue( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); extern TMShortCard _XtGetTypeIndex( -#if NeedFunctionPrototypes Event* /* event */ -#endif ); extern void _XtGrabInitialize( -#if NeedFunctionPrototypes XtAppContext /* app */ -#endif ); extern void _XtInstallTranslations( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); extern void _XtRemoveTranslations( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); extern void _XtDestroyTMData( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); extern void _XtMergeTranslations( -#if NeedFunctionPrototypes Widget /* widget */, XtTranslations /* newXlations */, _XtTranslateOp /* operation */ -#endif ); extern void _XtActionInitialize( -#if NeedFunctionPrototypes XtAppContext /* app */ -#endif ); extern TMStateTree _XtParseTreeToStateTree( -#if NeedFunctionPrototypes TMParseStateTree /* parseTree */ -#endif ); extern String _XtPrintActions( -#if NeedFunctionPrototypes ActionRec* /* actions */, XrmQuark* /* quarkTbl */ -#endif ); extern String _XtPrintEventSeq( -#if NeedFunctionPrototypes EventSeqPtr /* eventSeq */, Display* /* dpy */ -#endif ); typedef Boolean (*_XtTraversalProc)( -#if NeedFunctionPrototypes StatePtr /* state */, XtPointer /* data */ -#endif ); extern void _XtTraverseStateTree( -#if NeedFunctionPrototypes TMStateTree /* tree */, _XtTraversalProc /* func */, XtPointer /* data */ -#endif ); extern void _XtTranslateInitialize( -#if NeedFunctionPrototypes void -#endif ); extern void _XtAddTMConverters( -#if NeedFunctionPrototypes ConverterTable /* table */ -#endif ); extern void _XtUnbindActions( -#if NeedFunctionPrototypes Widget /* widget */, XtTranslations /* xlations */, TMBindData /* bindData */ -#endif ); extern void _XtUnmergeTranslations( -#if NeedFunctionPrototypes Widget /* widget */, XtTranslations /* xlations */ -#endif ); /* TMKey.c */ diff --git a/include/X11/VarargsI.h b/include/X11/VarargsI.h index 6e4bd60..87a26db 100644 --- a/include/X11/VarargsI.h +++ b/include/X11/VarargsI.h @@ -25,7 +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/VarargsI.h,v 3.6 2001/12/14 19:56:32 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/VarargsI.h,v 3.7 2003/04/21 16:34:29 herrb Exp $ */ #ifndef _VarargsI_h_ #define _VarargsI_h_ @@ -35,45 +35,31 @@ in this Software without prior written authorization from The Open Group. /* private routines */ extern void _XtCountVaList( -#if NeedFunctionPrototypes va_list /*var*/, int* /*total_count*/, int* /*typed_count*/ -#endif ); extern void _XtVaToArgList( -#if NeedFunctionPrototypes Widget /*widget*/, va_list /*var*/, int /*max_count*/, ArgList* /*args_return*/, Cardinal* /*num_args_return*/ -#endif ); extern void _XtVaToTypedArgList( -#if NeedFunctionPrototypes va_list /*var*/, int /*count*/, XtTypedArgList* /*args_return*/, Cardinal* /*num_args_return*/ -#endif ); extern XtTypedArgList _XtVaCreateTypedArgList( -#if NeedFunctionPrototypes va_list /*var*/, int /*count*/ -#endif ); extern void _XtFreeArgList( -#if NeedFunctionPrototypes ArgList /*args*/, int /*total_count*/, int /*typed_count*/ -#endif ); extern void _XtGetApplicationResources( -#if NeedFunctionPrototypes Widget /*w*/, XtPointer /*base*/, XtResourceList /*resources*/, Cardinal /*num_resources*/, ArgList /*args*/, Cardinal /*num_args*/, XtTypedArgList /*typed_args*/, Cardinal /*num_typed_args*/ -#endif ); extern void _XtGetSubresources( -#if NeedFunctionPrototypes Widget /*w*/, XtPointer /*base*/, const char* /*name*/, const char* /*class*/, XtResourceList /*resources*/, Cardinal /*num_resources*/, ArgList /*args*/, Cardinal /*num_args*/, XtTypedArgList /*typed_args*/, Cardinal /*num_typed_args*/ -#endif ); #endif /* _VarargsI_h_ */ diff --git a/include/X11/Xtos.h b/include/X11/Xtos.h index 3b1b91d..f87fdb2 100644 --- a/include/X11/Xtos.h +++ b/include/X11/Xtos.h @@ -31,13 +31,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -48,7 +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 $ */ +/* $XFree86: xc/lib/Xt/Xtos.h,v 3.13 2003/10/24 15:47:35 tsi Exp $ */ #ifndef _Xtos_h #define _Xtos_h @@ -61,20 +61,16 @@ SOFTWARE. #define WORD64 #endif -#if defined(__alpha) || defined(__alpha__) || \ +#if defined (_LP64) || \ + defined(__alpha) || defined(__alpha__) || \ defined(__ia64__) || defined(ia64) || \ defined(__sparc64__) || \ defined(__s390x__) || \ (defined(__hppa__) && defined(__LP64__)) || \ - defined(__x86_64__) || defined(x86_64) + defined(__AMD64__) || defined(AMD64) || \ + (defined(sgi) && (_MIPS_SZLONG == 64)) #define LONG64 #endif -#ifdef __sgi -#if (_MIPS_SZLONG == 64) -#define LONG64 -#endif -#endif - #endif /* _Xtos_h */ /* DON'T ADD STUFF AFTER THIS #endif */ diff --git a/man/XtAddActions.man b/man/XtAddActions.man index 3538e22..bca20c7 100644 --- a/man/XtAddActions.man +++ b/man/XtAddActions.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtAddAct.man,v 1.3 2003/04/28 22:18:17 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,11 +131,8 @@ .SH NAME XtAddActions \- register an action table .SH SYNTAX -void XtAddActions(\fIactions\fP, \fInum_actions\fP) -.br - XtActionList \fIactions\fP; -.br - Cardinal \fInum_actions\fP; +.HP +void XtAddActions(XtActionList \fIactions\fP, Cardinal \fInum_actions\fP); .SH ARGUMENTS .IP \fIactions\fP 1i Specifies the action table to register. diff --git a/man/XtAddCallback.man b/man/XtAddCallback.man index 744993d..215c13d 100644 --- a/man/XtAddCallback.man +++ b/man/XtAddCallback.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtAddCbk.man,v 1.4 2003/04/28 22:18:17 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,49 +131,20 @@ .SH NAME XtAddCallback, XtAddCallbacks, XtRemoveCallback, XtRemoveCallbacks, XtRemoveAllCallbacks \- add and remove callback procedures .SH SYNTAX -void XtAddCallback(\fIw\fP, \fIcallback_name, \fP\fIcallback\fP, -\fIclient_data\fP) -.br - Widget \fIw\fP; -.br - String \fIcallback_name\fP; -.br - XtCallbackProc \fIcallback\fP; -.br - XtPointer \fIclient_data\fP; -.LP -void XtAddCallbacks(\fIw\fP, \fIcallback_name, \fP\fIcallbacks\fP) -.br - Widget \fIw\fP; -.br - String \fIcallback_name\fP; -.br - XtCallbackList \fIcallbacks\fP; -.LP -void XtRemoveCallback(\fIw\fP, \fIcallback_name\fP, \fIcallback\fP, -\fIclient_data\fP) -.br - Widget \fIw\fP; -.br - String \fIcallback_name\fP; -.br - XtCallbackProc \fIcallback\fP; -.br - XtPointer \fIclient_data\fP; -.LP -void XtRemoveCallbacks(\fIw\fP, \fIcallback_name\fP, \fIcallbacks\fP) -.br - Widget \fIw\fP; -.br - String \fIcallback_name\fP; -.br - XtCallbackList \fIcallbacks\fP; -.LP -void XtRemoveAllCallbacks(\fIw\fP, \fIcallback_name\fP) -.br - Widget \fIw\fP; -.br - String \fIcallback_name\fP; +.HP +void XtAddCallback(Widget \fIw\fP, String \fIcallback_name\fP, XtCallbackProc +\fIcallback\fP, XtPointer \fIclient_data\fP); +.HP +void XtAddCallbacks(Widget \fIw\fP, String \fIcallback_name\fP, XtCallbackList +\fIcallbacks\fP); +.HP +void XtRemoveCallback(Widget \fIw\fP, String \fIcallback_name\fP, +XtCallbackProc \fIcallback\fP, XtPointer \fIclient_data\fP); +.HP +void XtRemoveCallbacks(Widget \fIw\fP, String \fIcallback_name\fP, +XtCallbackList \fIcallbacks\fP); +.HP +void XtRemoveAllCallbacks(Widget \fIw\fP, String \fIcallback_name\fP, .SH ARGUMENTS .IP \fIcallback\fP 1i Specifies the callback procedure\*(Cb. diff --git a/man/XtAddEventHandler.man b/man/XtAddEventHandler.man index fc03d02..ed545df 100644 --- a/man/XtAddEventHandler.man +++ b/man/XtAddEventHandler.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtAddEHand.man,v 1.4 2003/04/28 22:18:17 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,88 +130,28 @@ .SH NAME XtAddEventHandler, XtAddRawEventHandler, XtRemoveEventHandler, XtRemoveRawEventHandler, XtInsertEventHandler, XtInsertRawEventHandler \- add and remove event handlers .SH SYNTAX -void XtAddEventHandler(\fIw\fP, \fIevent_mask\fP, \fInonmaskable\fP, -\fIproc\fP, \fIclient_data\fP) -.br - Widget \fIw\fP; -.br - EventMask \fIevent_mask\fP; -.br - Boolean \fInonmaskable\fP; -.br - XtEventHandler \fIproc\fP; -.br - XtPointer \fIclient_data\fP; -.LP -void XtAddRawEventHandler(\fIw\fP, \fIevent_mask\fP, \fInonmaskable\fP, -\fIproc\fP, \fIclient_data\fP) -.br - Widget \fIw\fP; -.br - EventMask \fIevent_mask\fP; -.br - Boolean \fInonmaskable\fP; -.br - XtEventHandler \fIproc\fP; -.br - XtPointer \fIclient_data\fP; -.LP -void XtRemoveEventHandler(\fIw\fP, \fIevent_mask\fP, \fInonmaskable\fP, -\fIproc\fP, \fIclient_data\fP) -.br - Widget \fIw\fP; -.br - EventMask \fIevent_mask\fP; -.br - Boolean \fInonmaskable\fP; -.br - XtEventHandler \fIproc\fP; -.br - XtPointer \fIclient_data\fP; -.LP -void XtRemoveRawEventHandler(\fIw\fP, \fIevent_mask\fP, \fInonmaskable\fP, -\fIproc\fP, \fIclient_data\fP) -.br - Widget \fIw\fP; -.br - EventMask \fIevent_mask\fP; -.br - Boolean \fInonmaskable\fP; -.br - XtEventHandler \fIproc\fP; -.br - XtPointer \fIclient_data\fP; -.LP -void XtInsertEventHandler(\fIw\fP, \fIevent_mask\fP, \fInonmaskable\fP, -\fIproc\fP, \fIclient_data\fP, \fIposition\fP) -.br - Widget \fIw\fP; -.br - EventMask \fIevent_mask\fP; -.br - Boolean \fInonmaskable\fP; -.br - XtEventHandler \fIproc\fP; -.br - XtPointer \fIclient_data\fP; -.br - XtListPosition \fIposition\fP; -.LP -void XtInsertRawEventHandler(\fIw\fP, \fIevent_mask\fP, \fInonmaskable\fP, -\fIproc\fP, \fIclient_data\fP, \fIposition\fP) -.br - Widget \fIw\fP; -.br - EventMask \fIevent_mask\fP; -.br - Boolean \fInonmaskable\fP; -.br - XtEventHandler \fIproc\fP; -.br - XtPointer \fIclient_data\fP; -.br - XtListPosition \fIposition\fP; -.LP +.HP +void XtAddEventHandler(Widget \fIw\fP, EventMask \fIevent_mask\fP, Boolean +\fInonmaskable\fP, XtEventHandler \fIproc\fP, XtPointer \fIclient_data\fP); +.HP +void XtAddRawEventHandler(Widget \fIw\fP, EventMask \fIevent_mask\fP, Boolean +\fInonmaskable\fP, XtEventHandler \fIproc\fP, XtPointer \fIclient_data\fP); +.HP +void XtRemoveEventHandler(Widget \fIw\fP, EventMask \fIevent_mask\fP, Boolean +\fInonmaskable\fP, XtEventHandler \fIproc\fP, XtPointer \fIclient_data\fP); +.HP +void XtRemoveRawEventHandler(Widget \fIw\fP, EventMask \fIevent_mask\fP, +Boolean \fInonmaskable\fP, XtEventHandler \fIproc\fP, XtPointer +\fIclient_data\fP); +.HP +void XtInsertEventHandler(Widget \fIw\fP, EventMask \fIevent_mask\fP, Boolean +\fInonmaskable\fP, XtEventHandler \fIproc\fP, XtPointer \fIclient_data\fP, +XtListPosition \fIposition\fP); +.HP +void XtInsertRawEventHandler(Widget \fIw\fP, EventMask \fIevent_mask\fP, +Boolean \fInonmaskable\fP, XtEventHandler \fIproc\fP, XtPointer +\fIclient_data\fP, XtListPosition \fIposition\fP); +.HP typedef enum { XtListHead, XtListTail } XtListPosition; .SH ARGUMENTS .IP \fIclient_data\fP 1i diff --git a/man/XtAddExposureToRegion.man b/man/XtAddExposureToRegion.man index fed71b0..908b586 100644 --- a/man/XtAddExposureToRegion.man +++ b/man/XtAddExposureToRegion.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtAddETReg.man,v 1.3 2003/04/28 22:18:17 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,11 +131,8 @@ .SH NAME XtAddExposureToRegion \- merge exposure events into a region .SH SYNTAX -void XtAddExposureToRegion(\fIevent\fP, \fIregion\fP) -.br - XEvent *\fIevent\fP; -.br - Region \fIregion\fP; +.HP +void XtAddExposureToRegion(XEvent *\fIevent\fP, Region \fIregion\fP); .SH ARGUMENTS .IP \fIevent\fP 1i Specifies a pointer to the diff --git a/man/XtAddGrab.man b/man/XtAddGrab.man index 1d78dfc..96bebc6 100644 --- a/man/XtAddGrab.man +++ b/man/XtAddGrab.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtAddGrab.man,v 1.3 2003/04/28 22:18:17 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,17 +131,11 @@ .SH NAME XtAddGrab, XtRemoveGrab \- redirect user input to a modal widget .SH SYNTAX -void XtAddGrab(\fIw\fP, \fIexclusive\fP, \fIspring_loaded\fP) -.br - Widget \fIw\fP; -.br - Boolean \fIexclusive\fP; -.br - Boolean \fIspring_loaded\fP; -.LP -void XtRemoveGrab(\fIw\fP) -.br - Widget \fIw\fP; +.HP +void XtAddGrab(Widget \fIw\fP, Boolean \fIexclusive\fP, Boolean +\fIspring_loaded\fP); +.HP +void XtRemoveGrab(Widget \fIw\fP); .SH ARGUMENTS .IP \fIexclusive\fP 1i Specifies whether user events should be dispatched exclusively to this widget diff --git a/man/XtAddInput.man b/man/XtAddInput.man index 8524bd5..af18983 100644 --- a/man/XtAddInput.man +++ b/man/XtAddInput.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtAddIn.man,v 1.4 2003/04/28 22:18:17 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,30 +130,15 @@ .SH NAME XtAddInput, XtAddTimeout \- register input, timeout, and workprocs .SH SYNTAX -XtInputId XtAddInput(\fIsource\fP, \fIcondition\fP, \fIproc\fP, -\fIclient_data\fP) -.br - int \fIsource\fP; -.br - XtPointer \fIcondition\fP; -.br - XtInputCallbackProc \fIproc\fP; -.br - XtPointer \fIclient_data\fP; -.LP -XtIntervalId XtAddTimeout(\fIinterval\fP, \fIproc\fP, \fIclient_data\fP) -.br - unsigned long \fIinterval\fP; -.br - XtInputCallbackProc \fIproc\fP; -.br - XtPointer \fIclient_data\fP; -.LP -XtWorkProcId XtAddWorkProc(\fIproc\fP, \fIclient_data\fP) -.br - XtWorkProc \fIproc\fP; -.br - XtPointer \fIclient_data\fP; +.HP +XtInputId XtAddInput(int \fIsource\fP, XtPointer \fIcondition\fP, +XtInputCallbackProc \fIproc\fP, XtPointer \fIclient_data\fP); +.HP +XtIntervalId XtAddTimeout(unsigned long \fIinterval\fP, XtInputCallbackProc +\fIproc\fP, XtPointer \fIclient_data\fP); +.HP +XtWorkProcId XtAddWorkProc(XtWorkProc \fIproc\fP, XtPointer +\fIclient_data\fP); .LP .SH ARGUMENTS .IP \fIclient_data\fP 1i diff --git a/man/XtAllocateGC.man b/man/XtAllocateGC.man index a1d3378..4cc7fe6 100644 --- a/man/XtAllocateGC.man +++ b/man/XtAllocateGC.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtAllocGC.man,v 1.4 2003/04/28 22:18:17 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,20 +130,10 @@ .SH NAME XtAllocateGC \- obtain a sharable GC with modifiable fields .SH SYNTAX -GC XtAllocateGC(\fIw\fP, \fIdepth\fP, \fIvalue_mask\fP, \fIvalues\fP, -\fIdynamic_mask\fP, \fIunused_mask\fP) -.br - Widget \fIw\fP; -.br - Cardinal \fIdepth\fP; -.br - XtGCMask \fIvalue_mask\fP; -.br - XGCValues *\fIvalues\fP; -.br - XtGCMask \fIdynamic_mask\fP; -.br - XtGCMask \fIunused_mask\fP; +.HP +GC XtAllocateGC(Widget \fIw\fP, Cardinal \fIdepth\fP, XtGCMask +\fIvalue_mask\fP, XGCValues *\fIvalues\fP, XtGCMask \fIdynamic_mask\fP, +XtGCMask \fIunused_mask\fP); .SH ARGUMENTS .IP \fIvalues\fP 1i Specifies the actual values for this GC. diff --git a/man/XtAppAddActionHook.man b/man/XtAppAddActionHook.man index b0d15a9..28eb413 100644 --- a/man/XtAppAddActionHook.man +++ b/man/XtAppAddActionHook.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtActHook.man,v 1.4 2003/04/28 22:18:17 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,18 +130,11 @@ .SH NAME XtAppAddActionHook, XtRemoveActionHook \- register an action hook procedure .SH SYNTAX -XtActionHookId XtAppAddActionHook(\fIapp_context\fP, \fIproc\fP, -\fIclient_data\fP) -.br - XtAppContext \fIapp_context\fP; -.br - XtActionHookProc \fIproc\fP; -.br - XtPointer \fIclient_data\fP; -.LP -void XtRemoveActionHook(\fIid\FP) -.br - XtActionHookId \fIid\fP; +.HP +XtActionHookId XtAppAddActionHook(XtAppContext \fIapp_context\fP, +XtActionHookProc \fIproc\fP, XtPointer \fIclient_data\fP); +.HP +void XtRemoveActionHook(XtActionHookId \fIid\fP); .SH ARGUMENTS .IP \fIapp_context\fP 1i Specifies the application context. diff --git a/man/XtAppAddActions.man b/man/XtAppAddActions.man index 2b04a98..00062cb 100644 --- a/man/XtAppAddActions.man +++ b/man/XtAppAddActions.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtAppAAct.man,v 1.3 2003/04/28 22:18:18 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,13 +131,9 @@ .SH NAME XtAppAddActions \- register an action table .SH SYNTAX -void XtAppAddActions(\fIapp_context\fP, \fIactions\fP, \fInum_actions\fP) -.br - XtAppContext \fIapp_context\fP; -.br - XtActionList \fIactions\fP; -.br - Cardinal \fInum_actions\fP; +.HP +void XtAppAddActions(XtAppContext \fIapp_context\fP, XtActionList +\fIactions\fP, Cardinal \fInum_actions\fP); .SH ARGUMENTS .IP \fIapp_context\fP 1i Specifies the application context. diff --git a/man/XtAppAddBlockHook.man b/man/XtAppAddBlockHook.man index 6c5df69..d3dadb4 100644 --- a/man/XtAppAddBlockHook.man +++ b/man/XtAppAddBlockHook.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtBlockH.man,v 1.4 2003/04/28 22:18:18 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,18 +130,11 @@ .SH NAME XtAppAddBlockHook, XtRemoveBlockHook \- register a block hook procedure .SH SYNTAX -XtBlockHookId XtAppAddBlockHook(\fIapp_context\fP, \fIproc\fP, -\fIclient_data\fP) -.br - XtAppContext \fIapp_context\fP; -.br - XtBlockHookProc \fIproc\fP; -.br - XtPointer \fIclient_data\fP; -.LP -void XtRemoveBlockHook(\fIid\FP) -.br - XtBlockHookId \fIid\fP; +.HP +XtBlockHookId XtAppAddBlockHook(XtAppContext \fIapp_context\fP, +XtBlockHookProc \fIproc\fP, XtPointer \fIclient_data\fP); +.HP +void XtRemoveBlockHook(XtBlockHookId \fIid\fP); .SH ARGUMENTS .IP \fIapp_context\fP 1i Specifies the application context. diff --git a/man/XtAppAddConverter.man b/man/XtAppAddConverter.man index 9a17027..b812674 100644 --- a/man/XtAppAddConverter.man +++ b/man/XtAppAddConverter.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtAppAC.man,v 1.4 2003/04/28 22:18:18 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,33 +131,14 @@ .SH NAME XtAppAddConverter, XtAddConverter \- register resource converter .SH SYNTAX -void XtAppAddConverter(\fIapp_context\fP, \fIfrom_type\fP, \fIto_type\fP, -\fIconverter\fP, \fIconvert_args\fP, \fInum_args\fP) -.br - XtAppContext \fIapp_context\fP; -.br - String \fIfrom_type\fP; -.br - String \fIto_type\fP; -.br - XtConverter \fIconverter\fP; -.br - XtConvertArgList \fIconvert_args\fP; -.br - Cardinal \fInum_args\fP; -.LP -void XtAddConverter(\fIfrom_type\fP, \fIto_type\fP, \fIconverter\fP, -\fIconvert_args\fP, \fInum_args\fP) -.br - String \fIfrom_type\fP; -.br - String \fIto_type\fP; -.br - XtConverter \fIconverter\fP; -.br - XtConvertArgList \fIconvert_args\fP; -.br - Cardinal \fInum_args\fP; +.HP +void XtAppAddConverter(XtAppContext \fIapp_context\fP, String \fIfrom_type\fP, +String \fIto_type\fP, XtConverter \fIconverter\fP, XtConvertArgList +\fIconvert_args\fP, Cardinal \fInum_args\fP); +.HP +void XtAddConverter(String \fIfrom_type\fP, String \fIto_type\fP, XtConverter +\fIconverter\fP, XtConvertArgList \fIconvert_args\fP, Cardinal +\fInum_args\fP); .SH ARGUMENTS .IP \fIapp_context\fP 1i Specifies the application context. diff --git a/man/XtAppAddInput.man b/man/XtAppAddInput.man index 4f7451e..eb0c39a 100644 --- a/man/XtAppAddInput.man +++ b/man/XtAppAddInput.man @@ -25,7 +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 $ +.\" $XFree86: xc/doc/man/Xt/XtAppAI.man,v 1.6 2003/04/28 22:18:18 herrb Exp $ .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -129,22 +129,12 @@ .SH NAME XtAppAddInput, XtRemoveInput \- register and remove an input source .SH SYNTAX -XtInputId XtAppAddInput(\fIapp_context\fP, \fIsource\fP, \fIcondition\fP, -\fIproc\fP, \fIclient_data\fP) -.br - XtAppContext \fIapp_context\fP; -.br - int \fIsource\fP; -.br - XtPointer \fIcondition\fP; -.br - XtInputCallbackProc \fIproc\fP; -.br - XtPointer \fIclient_data\fP; -.LP -void XtRemoveInput(\fIid\fP) -.br - XtInputId \fIid\fP; +.HP +XtInputId XtAppAddInput(XtAppContext \fIapp_context\fP, int \fIsource\fP, +XtPointer \fIcondition\fP, XtInputCallbackProc \fIproc\fP, XtPointer +\fIclient_data\fP); +.HP +void XtRemoveInput(XtInputId \fIid\fP); .SH ARGUMENTS .ds Co that identifies the application .IP \fIapp_context\fP 1i diff --git a/man/XtAppAddSignal.man b/man/XtAppAddSignal.man index 8890db9..5c25bcd 100644 --- a/man/XtAppAddSignal.man +++ b/man/XtAppAddSignal.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtAppASig.man,v 1.3 2003/04/28 22:18:18 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,21 +130,13 @@ .SH NAME XtAppAddSignal, XtRemoveSignal, XtNoticeSignal \- register and remove a signal source .SH SYNTAX -XtSignalId XtAppAddSignal(\fIapp_context\fP, \fIproc\fP, \fIclient_data\fP) -.br - XtAppContext \fIapp_context\fP; -.br - XtSignalCallbackProc \fIproc\fP; -.br - XtPointer \fIclient_data\fP; -.LP -void XtRemoveSignal(\fIid\fP) -.br - XtSignalId \fIid\fP; -.LP -void XtNoticeSignal(\fIid\fP) -.br - XtSignalId \fIid\fP) +.HP +XtSignalId XtAppAddSignal(XtAppContext \fIapp_context\fP, XtSignalCallbackProc +\fIproc\fP, XtPointer \fIclient_data\fP); +.HP +void XtRemoveSignal(XtSignalId \fIid\fP); +.HP +void XtNoticeSignal(XtSignalId \fIid\fP); .SH ARGUMENTS .IP \fIapp_context\fP 1i Specifies the application context. diff --git a/man/XtAppAddTimeOut.man b/man/XtAppAddTimeOut.man index fe71e3c..2bddbbc 100644 --- a/man/XtAppAddTimeOut.man +++ b/man/XtAppAddTimeOut.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtAppATO.man,v 1.4 2003/04/28 22:18:18 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,20 +131,11 @@ .SH NAME XtAppAddTimeOut, XtRemoveTimeOut \- register and remove timeouts .SH SYNTAX -XtIntervalId XtAppAddTimeOut(\fIapp_context\fP, \fIinterval\fP, \fIproc\fP, -\fIclient_data\fP) -.br - XtAppContext \fIapp_context\fP; -.br - unsigned long \fIinterval\fP; -.br - XtTimerCallbackProc \fIproc\fP; -.br - XtPointer \fIclient_data\fP; -.LP -void XtRemoveTimeOut(\fItimer\fP) -.br - XtIntervalId \fItimer\fP; +.HP +XtIntervalId XtAppAddTimeOut(XtAppContext \fIapp_context\fP, unsigned long +\fIinterval\fP, XtTimerCallbackProc \fIproc\fP, XtPointer \fIclient_data\fP); +.HP +void XtRemoveTimeOut(XtIntervalId \fItimer\fP); .SH ARGUMENTS .ds Co for which the timer is to be set .IP \fIapp_context\fP 1i diff --git a/man/XtAppAddWorkProc.man b/man/XtAppAddWorkProc.man index 0e8b4fb..6457fab 100644 --- a/man/XtAppAddWorkProc.man +++ b/man/XtAppAddWorkProc.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtAppAWP.man,v 1.3 2003/04/28 22:18:18 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,17 +131,11 @@ .SH NAME XtAppAddWorkProc, XtRemoveWorkProc \- Add and remove background processing procedures .SH SYNTAX -XtWorkProcId XtAppAddWorkProc(\fIapp_context\fP, \fIproc\fP, \fIclient_data\fP) -.br - XtAppContext \fIapp_context\fP; -.br - XtWorkProc \fIproc\fP; -.br - XtPointer \fIclient_data\fP; -.LP -void XtRemoveWorkProc(\fIid\fP) -.br - XtWorkProcId \fIid\fP; +.HP +XtWorkProcId XtAppAddWorkProc(XtAppContext \fIapp_context\fP, XtWorkProc +\fIproc\fP, XtPointer \fIclient_data\fP); +.HP +void XtRemoveWorkProc(XtWorkProcId \fIid\fP); .SH ARGUMENTS .ds Co that identifies the application .IP \fIapp_context\fP 1i diff --git a/man/XtAppCreateShell.man b/man/XtAppCreateShell.man index c14b08d..d204fde 100644 --- a/man/XtAppCreateShell.man +++ b/man/XtAppCreateShell.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtAppCSh.man,v 1.4 2003/04/28 22:18:18 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,32 +130,14 @@ .SH NAME XtAppCreateShell, XtVaAppCreateShell \- create top-level widget instance .SH SYNTAX -Widget XtAppCreateShell(\fIapplication_name\fP, -\fIapplication_class\fP, \fIwidget_class\fP, \fIdisplay\fP, -\fIargs\fP, \fInum_args\fP) -.br - String \fIapplication_name\fP; -.br - String \fIapplication_class\fP; -.br - WidgetClass \fIwidget_class\fP; -.br - Display *\fIdisplay\fP; -.br - ArgList \fIargs\fP; -.br - Cardinal \fInum_args\fP; -.LP -Widget XtVaAppCreateShell(\fIapplication_name\fP, -\fIapplication_class\fP, \fIwidget_class\fP, \fIdisplay\fP, ...) -.br - String \fIapplication_name\fP; -.br - String \fIapplication_class\fP; -.br - WidgetClass \fIwidget_class\fP; -.br - Display *\fIdisplay\fP; +.HP +Widget XtAppCreateShell(String \fIapplication_name\fP, String +\fIapplication_class\fP, WidgetClass \fIwidget_class\fP, Display +*\fIdisplay\fP, ArgList \fIargs\fP, Cardinal \fInum_args\fP); +.HP +Widget XtVaAppCreateShell(String \fIapplication_name\fP, String +\fIapplication_class\fP, WidgetClass \fIwidget_class\fP, Display +*\fIdisplay\fP, ...\^); .SH ARGUMENTS .IP \fIapplication_name\fP 1i Specifies the name of the application instance. diff --git a/man/XtAppError.man b/man/XtAppError.man index ce0cdf5..d8c548e 100644 --- a/man/XtAppError.man +++ b/man/XtAppError.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtAppE.man,v 1.4 2003/04/28 22:18:18 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,29 +131,16 @@ .SH NAME XtAppError, XtAppSetErrorHandler, XtAppSetWarningHandler, XtAppWarning \- low-level error handlers .SH SYNTAX -void XtAppError(\fIapp_context\fP, \fImessage\fP) -.br - XtAppContext \fIapp_context\fP; -.br - String \fImessage\fP; -.LP -void XtAppSetErrorHandler(\fIapp_context\fP, \fIhandler\fP) -.br - XtAppContext \fIapp_context\fP; -.br - XtErrorHandler \fIhandler\fP; -.LP -void XtAppSetWarningHandler(\fIapp_context\fP, \fIhandler\fP) -.br - XtAppContext \fIapp_context\fP; -.br - XtErrorHandler \fIhandler\fP; -.LP -void XtAppWarning(\fIapp_context\fP, \fImessage\fP) -.br - XtAppContext \fIapp_context\fP; -.br - String \fImessage\fP; +.HP +void XtAppError(XtAppContext \fIapp_context\fP, String \fImessage\fP); +.HP +void XtAppSetErrorHandler(XtAppContext \fIapp_context\fP, XtErrorHandler +\fIhandler\fP); +.HP +void XtAppSetWarningHandler(XtAppContext \fIapp_context\fP, XtErrorHandler +\fIhandler\fP); +.HP +void XtAppWarning(XtAppContext \fIapp_context\fP, String \fImessage\fP); .SH ARGUMENTS .IP \fIapp_context\fP 1i Specifies the application context. diff --git a/man/XtAppErrorMsg.man b/man/XtAppErrorMsg.man index 5412cc9..7212a06 100644 --- a/man/XtAppErrorMsg.man +++ b/man/XtAppErrorMsg.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtAppEM.man,v 1.4 2003/04/28 22:18:18 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,50 +131,20 @@ .SH NAME XtAppErrorMsg, XtAppSetErrorMsgHandler, XtAppSetWarningMsgHandler, XtAppWarningMsg \- high-level error handlers .SH SYNTAX -void XtAppErrorMsg(\fIapp_context\fP, \fIname\fP, \fItype\fP, \fIclass\fP, -\fIdefault\fP, \ \fIparams\fP, \fInum_params\fP) -.br - XtAppContext \fIapp_context\fP; -.br - String \fIname\fP; -.br - String \fItype\fP; -.br - String \fIclass\fP; -.br - String \fIdefault\fP; -.br - String *\fIparams\fP; -.br - Cardinal *\fInum_params\fP; -.LP -void XtAppSetErrorMsgHandler(\fIapp_context\fP, \fImsg_handler\fP) -.br - XtAppContext \fIapp_context\fP; -.br - XtErrorMsgHandler \fImsg_handler\fP; -.LP -void XtAppSetWarningMsgHandler(\fIapp_context\fP, \fImsg_handler\fP) -.br - XtAppContext \fIapp_context\fP; -.br - XtErrorMsgHandler \fImsg_handler\fP; -.LP -void XtAppWarningMsg(\fIapp_context\fP, \fIname\fP, \fItype\fP, \fIclass\fP, \fIdefault\fP, \fIparams\fP, \fInum_params\fP) -.br - XtAppContext \fIapp_context\fP; -.br - String \fIname\fP; -.br - String \fItype\fP; -.br - String \fIclass\fP; -.br - String \fIdefault\fP; -.br - String *\fIparams\fP; -.br - Cardinal *\fInum_params\fP; +.HP +void XtAppErrorMsg(XtAppContext \fIapp_context\fP, String \fIname\fP, String +\fItype\fP, String \fIclass\fP, String \fIdefault\fP, String *\fIparams\fP, +Cardinal *\fInum_params\fP); +.HP +void XtAppSetErrorMsgHandler(XtAppContext \fIapp_context\fP, XtErrorMsgHandler +\fImsg_handler\fP); +.HP +void XtAppSetWarningMsgHandler(XtAppContext \fIapp_context\fP, +XtErrorMsgHandler \fImsg_handler\fP); +.HP +void XtAppWarningMsg(XtAppContext \fIapp_context\fP, String \fIname\fP, String +\fItype\fP, String \fIclass\fP, String \fIdefault\fP, String *\fIparams\fP, +Cardinal *\fInum_params\fP); .SH ARGUMENTS .IP \fIapp_context\fP 1i Specifies the application context. diff --git a/man/XtAppGetErrorDatabase.man b/man/XtAppGetErrorDatabase.man index 5a2a7d1..769d3be 100644 --- a/man/XtAppGetErrorDatabase.man +++ b/man/XtAppGetErrorDatabase.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtAppGEDB.man,v 1.3 2003/04/28 22:18:18 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,23 +131,12 @@ .SH NAME XtAppGetErrorDatabase, XtAppGetErrorDatabaseText \- obtain error database .SH SYNTAX -XrmDatabase *XtAppGetErrorDatabase(\^\fIapp_context\fP\^) -.br - XtAppContext \fIapp_context\fP; -.LP -void XtAppGetErrorDatabaseText(\fIapp_context\fP, \fIname\fP, \fItype\fP, \fIclass\fP, \fIdefault\fP, \fIbuffer_return\fP, \fInbytes\fP, \fIdatabase\fP) -.br - XtAppContext \fIapp_context\fP; -.br - char *\fIname\fP, *\fItype\fP, *\fIclass\fP; -.br - char *\fIdefault\fP; -.br - char *\fIbuffer_return\fP; -.br - int \fInbytes\fP; -.br - XrmDatabase \fIdatabase\fP; +.HP +XrmDatabase *XtAppGetErrorDatabase(\^XtAppContext \fIapp_context\fP); +.HP +void XtAppGetErrorDatabaseText(XtAppContext \fIapp_context\fP, char +*\fIname\fP, char *\fItype\fP, char *\fIclass\fP, char *\fIdefault\fP, char +*\fIbuffer_return\fP, int \fInbytes\fP, XrmDatabase \fIdatabase\fP); .SH ARGUMENTS .IP \fIapp_context\fP 1i Specifies the application context. diff --git a/man/XtAppGetSelectionTimeout.man b/man/XtAppGetSelectionTimeout.man index aeb102c..d1b2632 100644 --- a/man/XtAppGetSelectionTimeout.man +++ b/man/XtAppGetSelectionTimeout.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtAppGSTO.man,v 1.3 2003/04/28 22:18:18 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,15 +131,11 @@ .SH NAME XtAppGetSelectionTimeout, XtAppSetSelectionTimeout \- set and obtain selection timeout values .SH SYNTAX -unsigned long XtAppGetSelectionTimeout(\fIapp_context\fP) -.br - XtAppContext \fIapp_context\fP; -.LP -void XtAppSetSelectionTimeout(\fIapp_context\fP, \fItimeout\fP) -.br - XtAppContext \fIapp_context\fP; -.br - unsigned long \fItimeout\fP; +.HP +unsigned long XtAppGetSelectionTimeout(XtAppContext \fIapp_context\fP); +.HP +void XtAppSetSelectionTimeout(XtAppContext \fIapp_context\fP, unsigned long +\fItimeout\fP); .SH ARGUMENTS .IP \fIapp_context\fP 1i Specifies the application context. diff --git a/man/XtAppInitialize.man b/man/XtAppInitialize.man index f7198c1..37dbde9 100644 --- a/man/XtAppInitialize.man +++ b/man/XtAppInitialize.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtAppInit.man,v 1.6 2003/05/29 21:48:04 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,45 +130,16 @@ .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, -\fIfallback_resources\fP, \fIargs\fP, \fInum_args\fP) -.br - XtAppContext* \fIapp_context_return\fP; -.br - String \fIapplication_class\fP; -.br - XrmOptionDescRec* \fIoptions\fP; -.br - Cardinal \fInum_options\fP; -.br - int* \fIargc_in_out\fP; -.br - String* \fIargv_in_out\fP; -.br - String* \fIfallback_resources\fP; -.br - ArgList \fIargs\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, -\fIfallback_resources\fP, ...) -.br - XtAppContext* \fIapp_context_return\fP; -.br - String \fIapplication_class\fP; -.br - XrmOptionDescRec* \fIoptions\fP; -.br - Cardinal \fInum_options\fP; -.br - int* \fIargc_in_out\fP; -.br - String* \fIargv_in_out\fP; -.br - String* \fIfallback_resources\fP; +.HP +Widget XtAppInitialize(XtAppContext* \fIapp_context_return\fP, String +\fIapplication_class\fP, XrmOptionDescRec* \fIoptions\fP, Cardinal +\fInum_options\fP, int* \fIargc_in_out\fP, String* \fIargv_in_out\fP, String* +\fIfallback_resources\fP, ArgList \fIargs\fP, Cardinal \fInum_args\fP); +.HP +Widget XtVaAppInitialize(XtAppContext* \fIapp_context_return\fP, String +\fIapplication_class\fP, XrmOptionDescRec* \fIoptions\fP, Cardinal +\fInum_options\fP, int* \fIargc_in_out\fP, String* \fIargv_in_out\fP, String* +\fIfallback_resources\fP, ...\^); .SH ARGUMENTS .IP \fIapp_context_return\fP 1i Specifies the application context. @@ -188,7 +159,7 @@ Specifies a pointer to the number of command line parameters. .IP \fIargv_in_out\fP 1i Specifies the command line parameters. .IP \fIfallback_resources\fP 1i -Specifies resource valus to be used if the application class resource +Specifies resource values to be used if the application class resource file cannot be opened or read, or NULL. .IP \fIargs\fP 1i Specifies the argument list to override any other resource specification diff --git a/man/XtAppLock.man b/man/XtAppLock.man index c63be50..8948313 100644 --- a/man/XtAppLock.man +++ b/man/XtAppLock.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtAppLock.man,v 1.3 2003/04/28 22:18:18 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,13 +130,10 @@ .SH NAME XtAppLock, XtAppUnlock \- lock and unlock application context .SH SYNTAX -void XtAppLock(\fIapp_context\fP) -.br - XtAppContext \fIapp_context\fP; -.LP -void XtAppUnlock(\fIapp_context\fP) -.br - XtAppContext \fIapp_context\fP; +.HP +void XtAppLock(XtAppContext \fIapp_context\fP); +.HP +void XtAppUnlock(XtAppContext \fIapp_context\fP); .SH ARGUMENTS .IP \fIapp_context\fP 1i Specifies the application context. diff --git a/man/XtAppNextEvent.man b/man/XtAppNextEvent.man index 2edfc97..7f1c60b 100644 --- a/man/XtAppNextEvent.man +++ b/man/XtAppNextEvent.man @@ -25,7 +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/XtAppNEv.man,v 1.5 2001/01/27 18:20:24 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtAppNEv.man,v 1.6 2003/04/28 22:18:18 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,35 +130,21 @@ .SH NAME XtAppNextEvent, XtAppPending, XtAppPeekEvent, XtAppProcessEvent, XtDispatchEvent, XtAppMainLoop \- query and process events and input .SH SYNTAX -void XtAppNextEvent(\fIapp_context\fP, \fIevent_return\fP) -.br - XtAppContext \fIapp_context\fP; -.br - XEvent *\fIevent_return\fP; -.LP -Boolean XtAppPeekEvent(\fIapp_context\fP, \fIevent_return\fP) -.br - XtAppContext \fIapp_context\fP; -.br - XEvent *\fIevent_return\fP; -.LP -XtInputMask XtAppPending(\fIapp_context\fP) -.br - XtAppContext \fIapp_context\fP; -.LP -void XtAppProcessEvent(\fIapp_context\fP, \fImask\fP) -.br - XtAppContext \fIapp_context\fP; -.br - XtInputMask \fImask\fP; -.LP -Boolean XtDispatchEvent(\fIevent\fP) -.br - XEvent *\fIevent\fP; -.LP -void XtAppMainLoop(\fIapp_context\fP) -.br - XtAppContext \fIapp_context\fP; +.HP +void XtAppNextEvent(XtAppContext \fIapp_context\fP, XEvent +*\fIevent_return\fP); +.HP +Boolean XtAppPeekEvent(XtAppContext \fIapp_context\fP, XEvent +*\fIevent_return\fP); +.HP +XtInputMask XtAppPending(XtAppContext \fIapp_context\fP); +.HP +void XtAppProcessEvent(XtAppContext \fIapp_context\fP, XtInputMask +\fImask\fP); +.HP +Boolean XtDispatchEvent(XEvent *\fIevent\fP); +.HP +void XtAppMainLoop(XtAppContext \fIapp_context\fP); .SH ARGUMENTS .ds Co that identifies the application .IP \fIapp_context\fP 1i diff --git a/man/XtAppReleaseCacheRefs.man b/man/XtAppReleaseCacheRefs.man index a24ab14..97fab6b 100644 --- a/man/XtAppReleaseCacheRefs.man +++ b/man/XtAppReleaseCacheRefs.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtAppRCR.man,v 1.3 2003/04/28 22:18:18 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,11 +130,9 @@ .SH NAME XtAppReleaseCacheRefs \- decrement reference counts for resources .SH SYNTAX -void XtAppReleaseCacheRefs(\fIapp_context\fP, \fIrefs\fP) -.br - XtAppContext \fIapp_context\fP; -.br - XtCacheRef* \fIrefs\fP; +.HP +void XtAppReleaseCacheRefs(XtAppContext \fIapp_context\fP, XtCacheRef* +\fIrefs\fP); .SH ARGUMENTS .IP \fIapp_context\fP 1i Specifies the application context. diff --git a/man/XtAppSetExitFlag.man b/man/XtAppSetExitFlag.man index 1c3c57a..4fd57a5 100644 --- a/man/XtAppSetExitFlag.man +++ b/man/XtAppSetExitFlag.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtAppSEF.man,v 1.3 2003/04/28 22:18:18 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,13 +130,10 @@ .SH NAME XtAppSetExitFlag, XtAppGetExitFlag \- thread support functions .SH SYNTAX -void XtAppSetExitFlag(\fIapp_context\fP) -.br - XtAppContext \fIapp_context\fP; -.LP -Boolean XtAppGetExitFlag(\fIapp_context\fP) -.br - XtAppContext \fIapp_context\fP; +.HP +void XtAppSetExitFlag(XtAppContext \fIapp_context\fP); +.HP +Boolean XtAppGetExitFlag(XtAppContext \fIapp_context\fP); .SH ARGUMENTS .IP \fIapp_context\fP 1i Specifies the application context. diff --git a/man/XtAppSetFallbackResources.man b/man/XtAppSetFallbackResources.man index ad4d131..1815dc5 100644 --- a/man/XtAppSetFallbackResources.man +++ b/man/XtAppSetFallbackResources.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtAppSetFR.man,v 1.7 2003/05/29 21:48:04 herrb Exp $ .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics @@ -129,11 +129,9 @@ .SH NAME XtAppSetFallbackResources \- set fallback resources .SH SYNTAX -void XtAppSetFallbackResources(\fIapp_context\fP, \fIspecification_list\fP) -.br - XtAppContext \fIapp_context\fP; -.br - String* \fIspecification_list\fP; +.HP +void XtAppSetFallbackResources(XtAppContext \fIapp_context\fP, String* +\fIspecification_list\fP); .SH ARGUMENTS .IP \fIapp_context\fP 1i Specifies the application context. @@ -160,7 +158,7 @@ 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 make the application usable (or at least terminate -with helful diagnostic messages) when some problem exists in finding +with helpful diagnostic messages) when some problem exists in finding and loading the application defaults file. .SH "SEE ALSO" .br diff --git a/man/XtAppSetTypeConverter.man b/man/XtAppSetTypeConverter.man index 54b0438..5df422c 100644 --- a/man/XtAppSetTypeConverter.man +++ b/man/XtAppSetTypeConverter.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtAppSTC.man,v 1.4 2003/04/28 22:18:18 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,42 +130,15 @@ .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, -\fIcache_type\fP, \fIdestructor\fP) -.br - XtAppContext \fIapp_context\fP; -.br - String \fIfrom_type\fP; -.br - String \fIto_type\fP; -.br - XtConverter \fIconverter\fP; -.br - XtConvertArgList \fIconvert_args\fP; -.br - Cardinal \fInum_args\fP; -.br - XtCacheType \fIcache_type\fP; -.br - XtDestructor \fIdestructor\fP; -.LP -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; -.br - String \fIto_type\fP; -.br - XtConverter \fIconverter\fP; -.br - XtConvertArgList \fIconvert_args\fP; -.br - Cardinal \fInum_args\fP; -.br - XtCacheType \fIcache_type\fP; -.br - XtDestructor \fIdestructor\fP; +.HP +void XtAppSetTypeConverter(XtAppContext \fIapp_context\fP, String +\fIfrom_type\fP, String \fIto_type\fP, XtConverter \fIconverter\fP, +XtConvertArgList \fIconvert_args\fP, Cardinal \fInum_args\fP, XtCacheType +\fIcache_type\fP, XtDestructor \fIdestructor\fP); +.HP +void XtSetTypeConverter(String \fIfrom_type\fP, String \fIto_type\fP, +XtConverter \fIconverter\fP, XtConvertArgList \fIconvert_args\fP, Cardinal +\fInum_args\fP, XtCacheType \fIcache_type\fP, XtDestructor \fIdestructor\fP); .SH ARGUMENTS .IP \fIapp_context\fP 1i Specifies the application context. diff --git a/man/XtBuildEventMask.man b/man/XtBuildEventMask.man index ff0da31..e198703 100644 --- a/man/XtBuildEventMask.man +++ b/man/XtBuildEventMask.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtBEMask.man,v 1.3 2003/04/28 22:18:18 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,9 +131,8 @@ .SH NAME XtBuildEventMask \- retrieve a widget's event mask .SH SYNTAX -EventMask XtBuildEventMask(\fIw\fP) -.br - Widget \fIw\fP; +.HP +EventMask XtBuildEventMask(Widget \fIw\fP); .SH ARGUMENTS .IP \fIw\fP 1i Specifies the widget. diff --git a/man/XtCallAcceptFocus.man b/man/XtCallAcceptFocus.man index 727e2b5..82e5670 100644 --- a/man/XtCallAcceptFocus.man +++ b/man/XtCallAcceptFocus.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtCallAFoc.man,v 1.3 2003/04/28 22:18:18 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,11 +131,8 @@ .SH NAME XtCallAcceptFocus \- calla widget's accept_focus procedure .SH SYNTAX -Boolean XtCallAcceptFocus(\fIw\fP, \fItime\fP) -.br - Widget \fIw\fP; -.br - Time *\fItime\fP; +.HP +Boolean XtCallAcceptFocus(Widget \fIw\fP, Time *\fItime\fP); .SH ARGUMENTS .IP \fItime\fP 1i Specifies the X time of the event that is causing the accept focus. diff --git a/man/XtCallActionProc.man b/man/XtCallActionProc.man index 27e52ed..1ee0449 100644 --- a/man/XtCallActionProc.man +++ b/man/XtCallActionProc.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtCallActP.man,v 1.4 2003/04/28 22:18:18 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,19 +130,9 @@ .SH NAME XtCallActionProc \- invoke an action procedure directly .SH SYNTAX -void XtCallActionProc(\fIwidget\fP, \fIaction\fP, \fIevent\fP, -\fIparams\fP, \fInum_params\fP) -.br - Widget \fIwidget\fP; -.br - String \fIaction\fP; -.br - XEvent* \fIevent\fP; -.br - String* \fIparams\fP; -.br - Cardinal \fInum_params\fP; -.LP +.HP +void XtCallActionProc(Widget \fIwidget\fP, String \fIaction\fP, XEvent* +\fIevent\fP, String* \fIparams\fP, Cardinal \fInum_params\fP); .SH ARGUMENTS .IP \fIwidget\fP 1i Specifies the widget in which the action is to be invoked. Must be diff --git a/man/XtCallCallbacks.man b/man/XtCallCallbacks.man index 7b73f3d..44a7046 100644 --- a/man/XtCallCallbacks.man +++ b/man/XtCallCallbacks.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtCallCbks.man,v 1.4 2003/04/28 22:18:18 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,30 +130,17 @@ .SH NAME XtCallCallbacks, XtCallCallbackList, XtHasCallbacks \- process callbacks .SH SYNTAX -void XtCallCallbacks(\fIw\fP, \fIcallback_name\fP, \fIcall_data\fP) -.br - Widget \fIw\fP; -.br - String \fIcallback_name\fP; -.br - XtPointer \fIcall_data\fP; -.LP -void XtCallCallbackList(\fIw\fP, \fIcallbacks\fP, \fIcall_data\fP) -.br - Widget \fIw\fP; -.br - XtCallbackList \fIcallbacks\fP; -.br - XtPointer \fIcall_data\fP; +.HP +void XtCallCallbacks(Widget \fIw\fP, String \fIcallback_name\fP, XtPointer +\fIcall_data\fP); +.HP +void XtCallCallbackList(Widget \fIw\fP, XtCallbackList \fIcallbacks\fP, +XtPointer \fIcall_data\fP); .LP typedef enum {XtCallbackNoList, XtCallbackHasNone, XtCallbackHasSome} XtCallbackStatus; -.sp -XtCallbackStatus XtHasCallbacks(\fIw\fP, \fIcallback_name\fP) -.br - Widget \fIw\fP; -.br - String \fIcallback_name\fP; +.HP +XtCallbackStatus XtHasCallbacks(Widget \fIw\fP, String \fIcallback_name\fP); .SH ARGUMENTS .ds Cn \ to be executed or checked .IP \fIcallback_name\fP 1i diff --git a/man/XtClass.man b/man/XtClass.man index 94b1b09..b82ea80 100644 --- a/man/XtClass.man +++ b/man/XtClass.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtClass.man,v 1.3 2003/04/28 22:18:18 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,80 +131,41 @@ .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 -WidgetClass XtClass(\fIw\fP) -.br - Widget \fIw\fP; -.LP -WidgetClass XtSuperclass(\fIw\fP) -.br - Widget \fIw\fP; -.LP -Boolean XtIsSubclass(\fIw\fP, \fIwidget_class\fP) -.br - Widget \fIw\fP; -.br - WidgetClass \fIwidget_class\fP; -.LP -void XtCheckSubclass(\fIwidget\fP, \fIwidget_class\fP, \fImessage\fP) -.br - Widget \fIwidget\fP; -.br - WidgetClass \fIwidget_class\fP; -.br - String \fImessage\fP; -.LP -Boolean XtIsObject(\fIw\fP) -.br - Widget \fIw\fP; -.LP -Boolean XtIsRectObj(\fIw\fP) -.br - Widget \fIw\fP; -.LP -Boolean XtIsWidget(\fIw\fP) -.br - Widget \fIw\fP; -.LP -Boolean XtIsComposite(\fIw\fP) -.br - Widget \fIw\fP; -.LP -Boolean XtIsConstraint(\fIw\fP) -.br - Widget \fIw\fP; -.LP -Boolean XtIsShell(\fIw\fP) -.br - Widget \fIw\fP; -.LP -Boolean XtIsOverrideShell(\fIw\fP) -.br - Widget \fIw\fP; -.LP -Boolean XtIsWMShell(\fIw\fP) -.br - Widget \fIw\fP; -.LP -Boolean XtIsVendorShell(\fIw\fP) -.br - Widget \fIw\fP; -.LP -Boolean XtIsTransientShell(\fIw\fP) -.br - Widget \fIw\fP; -.LP -Boolean XtIsTopLevelShell(\fIw\fP) -.br - Widget \fIw\fP; -.LP -Boolean XtIsApplicationShell(\fIw\fP) -.br - Widget \fIw\fP; -.LP -Boolean XtIsSessionShell(\fIw\fP) -.br - Widget \fIw\fP; -.LP +.HP +WidgetClass XtClass(Widget \fIw\fP); +.HP +WidgetClass XtSuperclass(Widget \fIw\fP); +.HP +Boolean XtIsSubclass(Widget \fIw\fP, WidgetClass \fIwidget_class\fP); +.HP +void XtCheckSubclass(Widget \fIwidget\fP, WidgetClass \fIwidget_class\fP, +String \fImessage\fP); +.HP +Boolean XtIsObject(Widget \fIw\fP); +.HP +Boolean XtIsRectObj(Widget \fIw\fP); +.HP +Boolean XtIsWidget(Widget \fIw\fP); +.HP +Boolean XtIsComposite(Widget \fIw\fP); +.HP +Boolean XtIsConstraint(Widget \fIw\fP, +.HP +Boolean XtIsShell(Widget \fIw\fP); +.HP +Boolean XtIsOverrideShell(Widget \fIw\fP); +.HP +Boolean XtIsWMShell(Widget \fIw\fP); +.HP +Boolean XtIsVendorShell(Widget \fIw\fP); +.HP +Boolean XtIsTransientShell(Widget \fIw\fP); +.HP +Boolean XtIsTopLevelShell(Widget \fIw\fP); +.HP +Boolean XtIsApplicationShell(Widget \fIw\fP); +.HP +Boolean XtIsSessionShell(Widget \fIw\fP); .SH ARGUMENTS .IP \fIw\fP 1i Specifies the widget. diff --git a/man/XtConfigureWidget.man b/man/XtConfigureWidget.man index 323f3af..40596e0 100644 --- a/man/XtConfigureWidget.man +++ b/man/XtConfigureWidget.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtConfWid.man,v 1.4 2003/04/28 22:18:18 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,42 +131,16 @@ .SH NAME XtConfigureWidget, XtMoveWidget, XtResizeWidget \- move and resize widgets .SH SYNTAX -void XtConfigureWidget(\fIw\fP, \fIx\fP, \fIy\fP, \fIwidth\fP, \fIheight\fP, -\fIborder_width\fP) -.br - Widget \fIw\fP; -.br - Position \fIx\fP; -.br - Position \fIy\fP; -.br - Dimension \fIwidth\fP; -.br - Dimension \fIheight\fP; -.br - Dimension \fIborder_width\fP; -.LP -void XtMoveWidget(\fIw\fP, \fIx\fP, \fIy\fP) -.br - Widget \fIw\fP; -.br - Position \fIx\fP; -.br - Position \fIy\fP; -.LP -void XtResizeWidget(\fIw\fP, \fIwidth\fP, \fIheight\fP, \fIborder_width\fP) -.br - Widget \fIw\fP; -.br - Dimension \fIwidth\fP; -.br - Dimension \fIheight\fP; -.br - Dimension \fIborder_width\fP; -.LP -void XtResizeWindow(\fIw\fP) -.br - Widget \fIw\fP; +.HP +void XtConfigureWidget(Widget \fIw\fP, Position \fIx\fP, Position \fIy\fP, +Dimension \fIwidth\fP, Dimension \fIheight\fP, Dimension \fIborder_width\fP); +.HP +void XtMoveWidget(Widget \fIw\fP, Position \fIx\fP, Position \fIy\fP); +.HP +void XtResizeWidget(Widget \fIw\fP, Dimension \fIwidth\fP, Dimension +\fIheight\fP, Dimension \fIborder_width\fP); +.HP +void XtResizeWindow(Widget \fIw\fP); .SH ARGUMENTS .IP \fIwidth\fP 1i .br diff --git a/man/XtConvert.man b/man/XtConvert.man index 32faad3..b96953a 100644 --- a/man/XtConvert.man +++ b/man/XtConvert.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtConvert.man,v 1.4 2003/04/28 22:18:18 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,31 +131,12 @@ .SH NAME XtConvert, XtDirectConvert \- invoke resource converters .SH SYNTAX -void XtConvert(\fIw\fP, \fIfrom_type\fP, \fIfrom\fP, \fIto_type\fP, -\fIto_return\fP) -.br - Widget \fIw\fP; -.br - String \fIfrom_type\fP; -.br - XrmValuePtr \fIfrom\fP; -.br - String \fIto_type\fP; -.br - XrmValuePtr \fIto_return\fP; -.LP -void XtDirectConvert(\fIconverter\fP, \fIargs\fP, \fInum_args\fP, \fIfrom\fP, -\fIto_return\fP) -.br - XtConverter \fIconverter\fP; -.br - XrmValuePtr \fIargs\fP; -.br - Cardinal \fInum_args\fP; -.br - XrmValuePtr \fIfrom\fP; -.br - XrmValuePtr \fIto_return\fP; +.HP +void XtConvert(Widget \fIw\fP, String \fIfrom_type\fP, XrmValuePtr \fIfrom\fP, +String \fIto_type\fP, XrmValuePtr \fIto_return\fP); +.HP +void XtDirectConvert(XtConverter \fIconverter\fP, XrmValuePtr \fIargs\fP, +Cardinal \fInum_args\fP, XrmValuePtr \fIfrom\fP, XrmValuePtr \fIto_return\fP); .SH ARGUMENTS .ds Al that contains the additional arguments needed to perform the conversion (often NULL) diff --git a/man/XtConvertAndStore.man b/man/XtConvertAndStore.man index bd19499..6683934 100644 --- a/man/XtConvertAndStore.man +++ b/man/XtConvertAndStore.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtConvSt.man,v 1.4 2003/04/28 22:18:18 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,35 +130,13 @@ .SH NAME XtConvertAndStore, XtCallConverter \- invoke resource converters .SH SYNTAX -Boolean XtConvertAndStore(\fIwidget\fP, \fIfrom_type\fP, \fIfrom\fP, -\fIto_type\fP, \fIto_in_out\fP) -.br - Widget \fIwidget\fP; -.br - String \fIfrom_type\fP; -.br - XrmValuePtr \fIfrom\fP; -.br - String \fIto_type\fP; -.br - XrmValuePtr \fIto_in_out\fP; -.LP -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; -.br - XtConverter \fIconverter\fP; -.br - XrmValuePtr \fIargs\fP; -.br - Cardinal \fInum_args\fP; -.br - XrmValuePtr \fIfrom\fP; -.br - XrmValuePtr \fIto_in_out\fP; -.br - XtCacheRef* \fIcache_ref_return\fP; +.HP +Boolean XtConvertAndStore(Widget \fIwidget\fP, String \fIfrom_type\fP, +XrmValuePtr \fIfrom\fP, String \fIto_type\fP, XrmValuePtr \fIto_in_out\fP); +.HP +void XtCallConverter(Display* \fIdpy\fP, XtConverter \fIconverter\fP, +XrmValuePtr \fIargs\fP, Cardinal \fInum_args\fP, XrmValuePtr \fIfrom\fP, +XrmValuePtr \fIto_in_out\fP, XtCacheRef* \fIcache_ref_return\fP); .SH ARGUMENTS .IP \fIargs\fP 1i Specifies the argument list that contains the additional arguments needed diff --git a/man/XtCreateApplicationContext.man b/man/XtCreateApplicationContext.man index 9c3d5ce..abbb730 100644 --- a/man/XtCreateApplicationContext.man +++ b/man/XtCreateApplicationContext.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtCreACon.man,v 1.3 2003/04/28 22:18:18 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,17 +131,14 @@ .SH NAME XtCreateApplicationContext, XtDestroyApplicationContext, XtWidgetToApplicationContext, XtToolkitInitialize \- create, destroy, and obtain an application context .SH SYNTAX -XtAppContext XtCreateApplicationContext() -.LP -void XtDestroyApplicationContext(\fIapp_context\fP) -.br - XtAppContext \fIapp_context\fP; -.LP -XtAppContext XtWidgetToApplicationContext(\fIw\fP) -.br - Widget \fIw\fP; -.LP -void XtToolkitInitialize() +.HP +XtAppContext XtCreateApplicationContext(void); +.HP +void XtDestroyApplicationContext(XtAppContext \fIapp_context\fP, +.HP +XtAppContext XtWidgetToApplicationContext(Widget \fIw\fP); +.HP +void XtToolkitInitialize(void); .SH ARGUMENTS .IP \fIapp_context\fP 1i Specifies the application context. diff --git a/man/XtCreateApplicationShell.man b/man/XtCreateApplicationShell.man index 5ab100f..9a4e7ec 100644 --- a/man/XtCreateApplicationShell.man +++ b/man/XtCreateApplicationShell.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtCreASh.man,v 1.4 2003/04/28 22:18:18 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,16 +131,9 @@ .SH NAME XtCreateApplicationShell \- create top-level widget instance .SH SYNTAX -Widget XtCreateApplicationShell(\fIname\fP, \fIwidget_class\fP, -\fIargs\fP, \fInum_args\fP) -.br - String \fIname\fP; -.br - WidgetClass \fIwidget_class\fP; -.br - ArgList \fIargs\fP; -.br - Cardinal \fInum_args\fP; +.HP +Widget XtCreateApplicationShell(String \fIname\fP, WidgetClass +\fIwidget_class\fP, ArgList \fIargs\fP, Cardinal \fInum_args\fP); .SH ARGUMENTS .IP \fIname\fP 1i Specifies the name of the shell. diff --git a/man/XtCreatePopupShell.man b/man/XtCreatePopupShell.man index a7c7835..5ea6985 100644 --- a/man/XtCreatePopupShell.man +++ b/man/XtCreatePopupShell.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtCrePSh.man,v 1.4 2003/04/28 22:18:18 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,26 +131,12 @@ .SH NAME XtCreatePopupShell, XtVaCreatePopupShell \- create a popup shell .SH SYNTAX -Widget XtCreatePopupShell(\fIname\fP, \fIwidget_class\fP, \fIparent\fP, -\fIargs\fP, \fInum_args\fP) -.br - String \fIname\fP; -.br - WidgetClass \fIwidget_class\fP; -.br - Widget \fIparent\fP; -.br - ArgList \fIargs\fP; -.br - Cardinal \fInum_args\fP; -.LP -Widget XtVaCreatePopupShell(\fIname\fP, \fIwidget_class\fP, \fIparent\fP, ...) -.br - String \fIname\fP; -.br - WidgetClass \fIwidget_class\fP; -.br - Widget \fIparent\fP; +.HP +Widget XtCreatePopupShell(String \fIname\fP, WidgetClass \fIwidget_class\fP, +Widget \fIparent\fP, ArgList \fIargs\fP, Cardinal \fInum_args\fP); +.HP +Widget XtVaCreatePopupShell(String \fIname\fP, WidgetClass \fIwidget_class\fP, +Widget \fIparent\fP, ...\^); .SH ARGUMENTS .ds Al to override the resource defaults .IP \fIargs\fP 1i diff --git a/man/XtCreateSelectionRequest.man b/man/XtCreateSelectionRequest.man index 6bfeca4..77b46c2 100644 --- a/man/XtCreateSelectionRequest.man +++ b/man/XtCreateSelectionRequest.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtCreateSR.man,v 1.3 2003/04/28 22:18:18 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,25 +130,13 @@ .SH NAME XtCreateSelectionRequest, XtSendSelectionRequest, XtCancelSelectionRequest \- bundle multiple selection conversion requests into a single request using MULTIPLE target .SH SYNTAX -void XtCreateSelectionRequest(\fIrequestor\fP, \fIselection\fP) -.br - Widget \fIrequestor\fP; -.br - Atom \fIselection\fP; -.LP -void XtSendSelectionRequest(\fIrequestor\fP, \fIselection\fP, \fItime\fP) -.br - Widget \fIrequestor\fP; -.br - Atom \fIselection\fP; -.br - Time \fItime\fP; -.LP -void XtCancelSelectionRequest(\fIrequestor\fP, \fIselection\fP) -.br - Widget \fIrequestor\fP; -.br - Atom \fIselection\fP; +.HP +void XtCreateSelectionRequest(Widget \fIrequestor\fP, Atom \fIselection\fP): +.HP +void XtSendSelectionRequest(Widget \fIrequestor\fP, Atom \fIselection\fP, Time +\fItime\fP); +.HP +void XtCancelSelectionRequest(Widget \fIrequestor\fP, Atom \fIselection\fP); .SH ARGUMENTS .IP \fIrequestor\fP 1i Specifies the widget making the request. Must be of class Core or a diff --git a/man/XtCreateWidget.man b/man/XtCreateWidget.man index 701d3c3..d6867b1 100644 --- a/man/XtCreateWidget.man +++ b/man/XtCreateWidget.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtCreWid.man,v 1.4 2003/04/28 22:18:18 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,51 +131,21 @@ .SH NAME XtCreateWidget, XtVaCreateWidget, XtCreateManagedWidget, XtVaCreateManagedWidget, XtDestroyWidget \- create and destroy widgets .SH SYNTAX -Widget XtCreateWidget(\fIname\fP, \fIwidget_class\fP, \fIparent\fP, -\fIargs\fP, \fInum_args\fP) -.br - String \fIname\fP; -.br - WidgetClass \fIwidget_class\fP; -.br - Widget \fIparent\fP; -.br - ArgList \fIargs\fP; -.br - Cardinal \fInum_args\fP; -.LP -Widget XtVaCreateWidget(\fIname\fP, \fIwidget_class\fP, \fIparent\fP, ...) -.br - String \fIname\fP; -.br - WidgetClass \fIwidget_class\fP; -.br - Widget \fIparent\fP; -.LP -Widget XtCreateManagedWidget(\fIname\fP, \fIwidget_class\fP, \fIparent\fP, -\fIargs\fP, \fInum_args\fP) -.br - String \fIname\fP; -.br - WidgetClass \fIwidget_class\fP; -.br - Widget \fIparent\fP; -.br - ArgList \fIargs\fP; -.br - Cardinal \fInum_args\fP; -.LP -Widget XtVaCreateManagedWidget(\fIname\fP, \fIwidget_class\fP, \fIparent\fP, ...) -.br - String \fIname\fP; -.br - WidgetClass \fIwidget_class\fP; -.br - Widget \fIparent\fP; -.LP -void XtDestroyWidget(\fIw\fP) -.br - Widget \fIw\fP; +.HP +Widget XtCreateWidget(String \fIname\fP, WidgetClass \fIwidget_class\fP, +Widget \fIparent\fP, ArgList \fIargs\fP, Cardinal \fInum_args\fP); +.HP +Widget XtVaCreateWidget(String \fIname\fP, WidgetClass \fIwidget_class\fP, +Widget \fIparent\fP, ...\^); +.HP +Widget XtCreateManagedWidget(String \fIname\fP, WidgetClass +\fIwidget_class\fP, Widget \fIparent\fP, ArgList \fIargs\fP, Cardinal +\fInum_args\fP); +.HP +Widget XtVaCreateManagedWidget(String \fIname\fP, WidgetClass +\fIwidget_class\fP, Widget \fIparent\fP, ...\^); +.HP +void XtDestroyWidget(Widget \fIw\fP); .SH ARGUMENTS .ds Al to override the resource defaults .IP \fIargs\fP 1i diff --git a/man/XtCreateWindow.man b/man/XtCreateWindow.man index 56bb307..f341a27 100644 --- a/man/XtCreateWindow.man +++ b/man/XtCreateWindow.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtCreWin.man,v 1.4 2003/04/28 22:18:18 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,18 +131,10 @@ .SH NAME XtCreateWindow \- window creation convenience function .SH SYNTAX -void XtCreateWindow(\fIw\fP, \fIwindow_class\fP, \fIvisual\fP, -\fIvalue_mask\fP, \fIattributes\fP) -.br - Widget \fIw\fP; -.br - unsigned int \fIwindow_class\fP; -.br - Visual *\fIvisual\fP; -.br - XtValueMask \fIvalue_mask\fP; -.br - XSetWindowAttributes *\fIattributes\fP; +.HP +void XtCreateWindow(Widget \fIw\fP, unsigned int \fIwindow_class\fP, Visual +*\fIvisual\fP, XtValueMask \fIvalue_mask\fP, XSetWindowAttributes +*\fIattributes\fP); .SH ARGUMENTS .IP \fIattributes\fP 1i Specifies the window attributes to use in the diff --git a/man/XtDisplay.man b/man/XtDisplay.man index e237c04..6142018 100644 --- a/man/XtDisplay.man +++ b/man/XtDisplay.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtDisplay.man,v 1.3 2003/04/28 22:18:18 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,29 +130,18 @@ .SH NAME XtDisplay, XtDisplayOfObject, XtScreen, XtScreenOfObject, XtWindow, XtWindowOfObject \- obtain window information about a widget .SH SYNTAX -Display *XtDisplay(\fIw\fP) -.br - Widget \fIw\fP; -.LP -Display *XtDisplayOfObject(\fIobject\fP) -.br - Widget \fIobject\fP; -.LP -Screen *XtScreen(\fIw\fP) -.br - Widget \fIw\fP; -.LP -Screen *XtScreenOfObject(\fIobject\fP) -.br - Widget \fIobject\fP; -.LP -Window XtWindow(\fIw\fP) -.br - Widget \fIw\fP; -.LP -Window XtWindowOfObject(\fIobject\fP) -.br - Widget \fIobject\fP; +.HP +Display *XtDisplay(Widget \fIw\fP); +.HP +Display *XtDisplayOfObject(Widget \fIobject\fP); +.HP +Screen *XtScreen(Widget \fIw\fP); +.HP +Screen *XtScreenOfObject(Widget \fIobject\fP); +.HP +Window XtWindow(Widget \fIw\fP); +.HP +Window XtWindowOfObject(Widget \fIobject\fP); .SH ARGUMENTS .IP \fIw\fP 1i Specifies the widget. diff --git a/man/XtDisplayInitialize.man b/man/XtDisplayInitialize.man index 83b9f82..045e928 100644 --- a/man/XtDisplayInitialize.man +++ b/man/XtDisplayInitialize.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtDisplayI.man,v 1.4 2003/04/28 22:18:18 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,59 +130,22 @@ .SH NAME XtDisplayInitialize, XtOpenDisplay, XtDatabase, XtScreenDatabase, XtCloseDisplay \- initialize, open, or close a display .SH SYNTAX -void XtDisplayInitialize(\fIapp_context\fP, \fIdisplay\fP, -\fIapplication_name\fP, \fIapplication_class\fP, -.br - \fIoptions\fP, \fInum_options\fP, \fIargc\fP, \fIargv\fP) -.br - XtAppContext \fIapp_context\fP; -.br - Display *\fIdisplay\fP; -.br - String \fIapplication_name\fP; -.br - String \fIapplication_class\fP; -.br - XrmOptionDescRec *\fIoptions\fP; -.br - Cardinal \fInum_options\fP; -.br - int *\fIargc\fP; -.br - String *\fIargv\fP; -.LP -Display *XtOpenDisplay(\fIapp_context\fP, \fIdisplay_string\fP, -\fIapplication_name\fP, \fIapplication_class\fP, -.br - \fIoptions\fP, \fInum_options\fP, \fIargc\fP, \fIargv\fP) -.br - XtAppContext \fIapp_context\fP; -.br - String \fIdisplay_string\fP; -.br - String \fIapplication_name\fP; -.br - String \fIapplication_class\fP; -.br - XrmOptionDescRec *\fIoptions\fP; -.br - Cardinal \fInum_options\fP; -.br - int *\fIargc\fP; -.br - String *\fIargv\fP; -.LP -void XtCloseDisplay(\fIdisplay\fP) -.br - Display *\fIdisplay\fP; -.LP -XrmDatabase XtDatabase(\fIdisplay\fP) -.br - Display *\fIdisplay\fP; -.LP -XrmDatabase XtScreenDatabase(\fIscreen\fP) -.br - Screen* \fIscreen\fP; +.HP +void XtDisplayInitialize(XtAppContext \fIapp_context\fP, Display +*\fIdisplay\fP, String \fIapplication_name\fP, String \fIapplication_class\fP, +XrmOptionDescRec *\fIoptions\fP, Cardinal \fInum_options\fP, int *\fIargc\fP, +String *\fIargv\fP); +.HP +Display *XtOpenDisplay(XtAppContext \fIapp_context\fP, String +\fIdisplay_string\fP, String \fIapplication_name\fP, String +\fIapplication_class\fP, XrmOptionDescRec *\fIoptions\fP, Cardinal +\fInum_options\fP, int *\fIargc\fP, String *\fIargv\fP); +.HP +void XtCloseDisplay(Display *\fIdisplay\fP); +.HP +XrmDatabase XtDatabase(Display *\fIdisplay\fP); +.HP +XrmDatabase XtScreenDatabase(Screen* \fIscreen\fP); .SH ARGUMENTS .IP \fIargc\fP 1i Specifies a pointer to the number of command line parameters. diff --git a/man/XtDisplayStringConversionWarning.man b/man/XtDisplayStringConversionWarning.man index b794b8a..f1d5f34 100644 --- a/man/XtDisplayStringConversionWarning.man +++ b/man/XtDisplayStringConversionWarning.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtDStrCW.man,v 1.5 2003/05/29 21:48:05 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,15 +131,12 @@ .SH NAME XtDisplayStringConversionWarning \- issue a conversion warning message .SH SYNTAX -void XtDisplayStringConversionWarning(\fIdisplay\fP, \fIfrom_value\fP, -\fIto_type\fP) -.br - Display* \fIdisplay\fP; -.br - String \fIfrom_value\fP, \fIto_type\fP; +.HP +void XtDisplayStringConversionWarning(Display* \fIdisplay\fP, String +\fIfrom_value\fP, \fIto_type\fP); .SH ARGUMENTS .IP \fIdisplay\fP 1i -Specifies the displaly connection with which the conversion is associated. +Specifies the display connection with which the conversion is associated. .IP \fIfrom_value\fP 1i Specifies the string that could not be converted. .IP \fIto_type\fP 1i diff --git a/man/XtDisplayToApplicationContext.man b/man/XtDisplayToApplicationContext.man index ba8dac0..ec46cec 100644 --- a/man/XtDisplayToApplicationContext.man +++ b/man/XtDisplayToApplicationContext.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtDisACon.man,v 1.3 2003/04/28 22:18:18 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,9 +130,8 @@ .SH NAME XtDisplayToApplicationContext \- obtain an application context .SH SYNTAX -XtAppContext XtDisplayToApplicationContext(\fIdpy\fP) -.br - Display* \fIdpy\fP; +.HP +XtAppContext XtDisplayToApplicationContext(Display* \fIdpy\fP); .SH ARGUMENTS .ds Wi that you want the application context for .IP \fIdpy\fP 1i diff --git a/man/XtError.man b/man/XtError.man index a826a3e..d444bf1 100644 --- a/man/XtError.man +++ b/man/XtError.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtErr.man,v 1.4 2003/04/28 22:18:18 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,21 +130,14 @@ .SH NAME XtError, XtSetErrorHandler, XtSetWarningHandler, XtWarning \- low-level error handlers .SH SYNTAX -void XtError(\fImessage\fP) -.br - String \fImessage\fP; -.LP -void XtSetErrorHandler(\fIhandler\fP) -.br - XtErrorHandler \fIhandler\fP; -.LP -void XtSetWarningHandler(\fIhandler\fP) -.br - XtErrorHandler \fIhandler\fP; -.LP -void XtWarning(\fImessage\fP) -.br - String \fImessage\fP; +.HP +void XtError(String \fImessage\fP); +.HP +void XtSetErrorHandler(XtErrorHandler \fIhandler\fP): +.HP +void XtSetWarningHandler(XtErrorHandler \fIhandler\fP); +.HP +void XtWarning(String \fImessage\fP); .SH ARGUMENTS .IP \fImessage\fP 1i Specifies the nonfatal error message that is to be reported. diff --git a/man/XtErrorMsg.man b/man/XtErrorMsg.man index 6263fe1..0e41edc 100644 --- a/man/XtErrorMsg.man +++ b/man/XtErrorMsg.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtErrM.man,v 1.4 2003/04/28 22:18:18 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,43 +130,16 @@ .SH NAME XtErrorMsg, XtSetErrorMsgHandler, XtWarningMsg, XtSetWarningMsgHandler \- high-level error handlers .SH SYNTAX -void XtErrorMsg(\fIname\fP, \fItype\fP, \fIclass\fP, -\fIdefault\fP, \ \fIparams\fP, \fInum_params\fP) -.br - String \fIname\fP; -.br - String \fItype\fP; -.br - String \fIclass\fP; -.br - String \fIdefault\fP; -.br - String *\fIparams\fP; -.br - Cardinal *\fInum_params\fP; -.LP -void XtSetErrorMsgHandler(\fImsg_handler\fP) -.br - XtErrorMsgHandler \fImsg_handler\fP; -.LP -void XtSetWarningMsgHandler(\fImsg_handler\fP) -.br - XtErrorMsgHandler \fImsg_handler\fP; -.LP -void XtWarningMsg(\fIname\fP, \fItype\fP, \fIclass\fP, -\fIdefault\fP, \fIparams\fP, \fInum_params\fP) -.br - String \fIname\fP; -.br - String \fItype\fP; -.br - String \fIclass\fP; -.br - String \fIdefault\fP; -.br - String *\fIparams\fP; -.br - Cardinal *\fInum_params\fP; +.HP +void XtErrorMsg(String \fIname\fP, String \fItype\fP, String \fIclass\fP, +String \fIdefault\fP, String *\fIparams\fP, Cardinal *\fInum_params\fP); +.HP +void XtSetErrorMsgHandler(XtErrorMsgHandler \fImsg_handler\fP); +.HP +void XtSetWarningMsgHandler(XtErrorMsgHandler \fImsg_handler\fP); +.HP +void XtWarningMsg(String \fIname\fP, String \fItype\fP, String \fIclass\fP, +String \fIdefault\fP, String *\fIparams\fP, Cardinal *\fInum_params\fP); .SH ARGUMENTS .ds Cl .IP \fIclass\fP 1i diff --git a/man/XtFindFile.man b/man/XtFindFile.man index 90c6c46..d644153 100644 --- a/man/XtFindFile.man +++ b/man/XtFindFile.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtFindF.man,v 1.5 2003/04/28 22:18:18 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,16 +130,9 @@ .SH NAME XtFindFile \- search for a file using substitutions in the path list .SH SYNTAX -String XtFindFile(\fIpath\fP, \fIsubstitutions\fP, \fInum_substitutions\fP, -\fIpredicate\fP) -.br - String \fIpath\fP; -.br - Substitution \fIsubstitutions\fP; -.br - Cardinal \fInum_substitutions\fP; -.br - XtFilePredicate \fIpredicate\fP; +.HP +String XtFindFile(String \fIpath\fP, Substitution \fIsubstitutions\fP, +Cardinal \fInum_substitutions\fP, XtFilePredicate \fIpredicate\fP); .SH ARGUMENTS .IP \fIpath\fP 1i Specifies a path of file names, including substitution characters. diff --git a/man/XtGetActionKeysym.man b/man/XtGetActionKeysym.man index df133ac..176e2bf 100644 --- a/man/XtGetActionKeysym.man +++ b/man/XtGetActionKeysym.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtGetActK.man,v 1.3 2003/04/28 22:18:18 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,12 +130,9 @@ .SH NAME XtGetActionKeysym \- obtain corresponding keysym .SH SYNTAX -KeySym XtGetActionKeysym(\fIevent\fP, \fImodifiers_return\fP) -.br - XEvent* \fIevent\fP; -.br - Modifiers* \fImodifiers_return\fP; -.LP +.HP +KeySym XtGetActionKeysym(XEvent* \fIevent\fP, Modifiers* +\fImodifiers_return\fP); .SH ARGUMENTS .IP \fIevent\fP 1i Specifies the event pointer passed to the action procedure by the diff --git a/man/XtGetActionList.man b/man/XtGetActionList.man index da539e6..7434a48 100644 --- a/man/XtGetActionList.man +++ b/man/XtGetActionList.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtGetActL.man,v 1.4 2003/04/28 22:18:18 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,15 +130,9 @@ .SH NAME XtGetActionList \- obtain class action list .SH SYNTAX -void XtGetActionList(\fIwidget_class\fP, \fIactions_return\fP, -\fInum_actions_return\fP) -.br - WidgetClass \fIwidget_class\fP; -.br - XtActionList* \fIactions_return\fP; -.br - Cardinal* \fInum_actions_return\fP; -.LP +.HP +void XtGetActionList(WidgetClass \fIwidget_class\fP, XtActionList* +\fIactions_return\fP, Cardinal* \fInum_actions_return\fP); .SH ARGUMENTS .IP \fIwidget_class\fP 1i Specifies the widget class whose actions are to be returned. diff --git a/man/XtGetApplicationNameAndClass.man b/man/XtGetApplicationNameAndClass.man index 2904734..b552be7 100644 --- a/man/XtGetApplicationNameAndClass.man +++ b/man/XtGetApplicationNameAndClass.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtGetANC.man,v 1.4 2003/04/28 22:18:18 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,14 +130,9 @@ .SH NAME XtGetApplicationNameAndClass \- retrieve application name and class .SH SYNTAX -void XtGetApplicationNameAndClass(\fIdisplay\fP, \fIname_return\fP, -\fIclass_return\fP) -.br - Display* \fIdisplay\fP; -.br - String* \fIname_return\fP; -.br - String* \fIclass_return\fP; +.HP +void XtGetApplicationNameAndClass(Display* \fIdisplay\fP, String* +\fIname_return\fP, String* \fIclass_return\fP); .SH ARGUMENTS .IP \fIdisplay\fP 1i Specifies an open display connection that has been initialized with diff --git a/man/XtGetApplicationResources.man b/man/XtGetApplicationResources.man index 374a049..286a94f 100644 --- a/man/XtGetApplicationResources.man +++ b/man/XtGetApplicationResources.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtGetAres.man,v 1.4 2003/04/28 22:18:18 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,31 +131,13 @@ .SH NAME XtGetApplicationResources, XtVaGetApplicationResources \- obtain application resources .SH SYNTAX -void XtGetApplicationResources(\fIw\fP, \fIbase\fP, \fIresources\fP, -\fInum_resources\fP, \fIargs\fP, \fInum_args\fP) -.br - Widget \fIw\fP; -.br - XtPointer \fIbase\fP; -.br - XtResourceList \fIresources\fP; -.br - Cardinal \fInum_resources\fP; -.br - ArgList \fIargs\fP; -.br - Cardinal \fInum_args\fP; -.LP -void XtVaGetApplicationResources(\fIw\fP, \fIbase\fP, \fIresources\fP, -\fInum_resources\fP,\fI...\fP) -.br - Widget \fIw\fP; -.br - XtPointer \fIbase\fP; -.br - XtResourceList \fIresources\fP; -.br - Cardinal \fInum_resources\fP; +.HP +void XtGetApplicationResources(Widget \fIw\fP, XtPointer \fIbase\fP, +XtResourceList \fIresources\fP, Cardinal \fInum_resources\fP, ArgList +\fIargs\fP, Cardinal \fInum_args\fP); +.HP +void XtVaGetApplicationResources(Widget \fIw\fP, XtPointer \fIbase\fP, +XtResourceList \fIresources\fP, Cardinal \fInum_resources\fP, ...\^); .SH ARGUMENTS .ds Al to override resources obtained from the resource database .IP \fIargs\fP 1i diff --git a/man/XtGetClassExtension.man b/man/XtGetClassExtension.man index 61498fd..73b412b 100644 --- a/man/XtGetClassExtension.man +++ b/man/XtGetClassExtension.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtGetClExt.man,v 1.4 2003/04/28 22:18:18 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,19 +130,10 @@ .SH NAME XtGetClassExtension \- locate a class extension record .SH SYNTAX -XtPointer XtGetClassExtension(\fIobject_class\fP, \fIbyte_offset\fP -\fItype\fP, \fIversion\fP, \fIrecord_size\fP) -.br - WidgetClass \fIobject_class\fP; -.br - Cardinal \fIbyte_offset\fP; -.br - XrmQuark \fItype\fP; -.br - long \fIversion\fP; -.br - Cardinal \fIrecord_size\fP; -.LP +.HP +XtPointer XtGetClassExtension(WidgetClass \fIobject_class\fP, Cardinal +\fIbyte_offset\fP, XrmQuark \fItype\fP, long \fIversion\fP, Cardinal +\fIrecord_size\fP); .SH ARGUMENTS .IP \fIobject_class\fP 1i Specifies the widget class containing the extension list to be searched. diff --git a/man/XtGetDisplays.man b/man/XtGetDisplays.man index 02152ce..3326c28 100644 --- a/man/XtGetDisplays.man +++ b/man/XtGetDisplays.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtGetDisp.man,v 1.3 2003/04/28 22:18:18 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,13 +130,9 @@ .SH NAME XtGetDisplays \- retrieve a list of displays associated with an application context .SH SYNTAX -void XtGetDisplays(\fIapp_context\fP, \fIdpy_return\fP, \fInum_dpy_return\fP) -.br - XtAppContext \fIapp_context\fP; -.br - Display*** \fIdpy_return\fP; -.br - Cardinal* \fInum_dpy_return\fP; +.HP +void XtGetDisplays(XtAppContext \fIapp_context\fP, Display +***\fIdpy_return\fP, Cardinal* \fInum_dpy_return\fP); .SH ARGUMENTS .IP \fIapp_context\fP 1i Specifies the application context. diff --git a/man/XtGetErrorDatabase.man b/man/XtGetErrorDatabase.man index f8e00cf..80d9010 100644 --- a/man/XtGetErrorDatabase.man +++ b/man/XtGetErrorDatabase.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtGEDB.man,v 1.4 2003/04/28 22:18:18 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,20 +131,12 @@ .SH NAME XtGetErrorDatabase, XtGetErrorDatabaseText \- obtain error database .SH SYNTAX -XrmDatabase *XtGetErrorDatabase() -.LP -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; -.br - char *\fIdefault\fP; -.br - char *\fIbuffer_return\fP; -.br - int \fInbytes\fP; -.br - XrmDatabase \fIdatabase\fP; +.HP +XrmDatabase *XtGetErrorDatabase(void); +.HP +void XtGetErrorDatabaseText(char *\fIname\fP, char *\fItype\fP, char +*\fIclass\fP, char *\fIdefault\fP, char *\fIbuffer_return\fP, int +\fInbytes\fP, XrmDatabase \fIdatabase\fP); .SH ARGUMENTS .IP \fIbuffer_return\fP 1i Specifies the buffer into which the error message is to be returned. diff --git a/man/XtGetGC.man b/man/XtGetGC.man index d45ddf2..533c9a8 100644 --- a/man/XtGetGC.man +++ b/man/XtGetGC.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtGetGC.man,v 1.3 2003/04/28 22:18:19 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,19 +131,11 @@ .SH NAME XtGetGC, XtReleaseGC \- obtain and destroy a sharable GC .SH SYNTAX -GC XtGetGC(\fIw\fP, \fIvalue_mask\fP, \fIvalues\fP) -.br - Widget \fIw\fP; -.br - XtGCMask \fIvalue_mask\fP; -.br - XGCValues *\fIvalues\fP; -.LP -void XtReleaseGC(\fIw\fP, \fIgc\fP) -.br - Widget \fIw\fP; -.br - GC \fIgc\fP; +.HP +GC XtGetGC(Widget \fIw\fP, XtGCMask \fIvalue_mask\fP, XGCValues +*\fIvalues\fP); +.HP +void XtReleaseGC(Widget \fIw\fP, GC \fIgc\fP); .SH ARGUMENTS .IP \fIgc\fP 1i Specifies the GC to be deallocated. diff --git a/man/XtGetKeyboardFocusWidget.man b/man/XtGetKeyboardFocusWidget.man index 681b539..2c522e1 100644 --- a/man/XtGetKeyboardFocusWidget.man +++ b/man/XtGetKeyboardFocusWidget.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtGetKFoc.man,v 1.3 2003/04/28 22:18:19 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,9 +130,8 @@ .SH NAME XtGetKeyboardFocusWidget \- extension event handling .SH SYNTAX -Widget XtGetKeyboardFocusWidget(\fIwidget\fP) -.br - Widget \fIwidget\fP; +.HP +Widget XtGetKeyboardFocusWidget(Widget \fIwidget\fP); .SH ARGUMENTS .IP \fIwidget\fP 1i Specifies the widget for this event handler. diff --git a/man/XtGetKeysymTable.man b/man/XtGetKeysymTable.man index 35e991b..c7e94de 100644 --- a/man/XtGetKeysymTable.man +++ b/man/XtGetKeysymTable.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtKeysym.man,v 1.4 2003/04/28 22:18:19 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,25 +131,12 @@ .SH NAME XtGetKeysymTable, XtKeysymToKeycodeList \- query keysyms and keycodes .SH SYNTAX -Keysym* XtGetKeysymTable(\fIdisplay\fP, \fImin_keycode_return\fP, -\fIkeysyms_per_keycode_return\fP) -.br - Display* \fIdisplay\fP; -.br - KeyCode* \fImin_keycode_return\fP; -.br - int* \fIkeysyms_per_keycode_return\fP; -.LP -void XtKeysymToKeycodeList(\fIdisplay\fP, \fIkeysym\fP, -\fIkeycodes_return\fP, \fIkeycount_return\fP) -.br - Display* \fIdisplay\fP; -.br - KeySym \fIkeysym\fP; -.br - KeyCode** \fIkeycodes_return\fP; -.br - Cardinal* \fIkeycount_return\fP; +.HP +Keysym* XtGetKeysymTable(Display* \fIdisplay\fP, KeyCode* +\fImin_keycode_return\fP, int *\fIkeysyms_per_keycode_return\fP); +.HP +void XtKeysymToKeycodeList(Display* \fIdisplay\fP, KeySym \fIkeysym\fP, +KeyCode** \fIkeycodes_return\fP, Cardinal* \fIkeycount_return\fP); .SH ARGUMENTS .IP \fIdisplay\fP 1i Specifies the display whose table is required. diff --git a/man/XtGetResourceList.man b/man/XtGetResourceList.man index f48ee3e..560fb18 100644 --- a/man/XtGetResourceList.man +++ b/man/XtGetResourceList.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtGetRList.man,v 1.4 2003/04/28 22:18:19 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,22 +131,12 @@ .SH NAME XtGetResourceList, XtGetConstraintResourceList \- obtain resource list .SH SYNTAX -void XtGetResourceList(\fIclass\fP, \fIresources_return\fP, \fInum_resources_return\fP); -.br - WidgetClass \fIclass\fP; -.br - XtResourceList *\fIresources_return\fP; -.br - Cardinal *\fInum_resources_return\fP; -.LP -void XtGetConstraintResourceList(\fIclass\fP, \fIresources_return\fP, -\fInum_resources_return\fP); -.br - WidgetClass \fIclass\fP; -.br - XtResourceList *\fIresources_return\fP; -.br - Cardinal *\fInum_resources_return\fP; +.HP +void XtGetResourceList(WidgetClass \fIclass\fP, XtResourceList +*\fIresources_return\fP, Cardinal *\fInum_resources_return\fP); +.HP +void XtGetConstraintResourceList(WidgetClass \fIclass\fP, XtResourceList +*\fIresources_return\fP, Cardinal *\fInum_resources_return\fP); .SH ARGUMENTS .IP \fInum_resources_return\fP 1i Specifies a pointer to where to store the number of entries in the diff --git a/man/XtGetSelectionParameters.man b/man/XtGetSelectionParameters.man index 3125b27..8443326 100644 --- a/man/XtGetSelectionParameters.man +++ b/man/XtGetSelectionParameters.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtGetSP.man,v 1.5 2003/05/29 21:48:05 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,22 +130,11 @@ .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, -\fItype_return\fP, \fIvalue_return\fP, \fIlength_return\fP, \fIformat_return\fP) -.br - Widget \fIowner\fP; -.br - Atom \fIselection\fP; -.br - XtRequestId \fIrequest_id\fP; -.br - Atom* \fItype_return\fP; -.br - XtPointer* \fIvalue_return\fP; -.br - unsigned long* \fIlength_return\fP; -.br - int* \fIformat_return\fP; +.HP +void XtGetSelectionParameters(Widget \fIowner\fP, Atom \fIselection\fP, +XtRequestId \fIrequest_id\fP, Atom *\fItype_return\fP, XtPointer +*\fIvalue_return\fP, unsigned long *\fIlength_return\fP, int +*\fIformat_return\fP); .SH ARGUMENTS .IP \fIowner\fP 1i Specifies the widget that owns the specified selection. @@ -155,7 +144,7 @@ Specifies the selection being processed. Specifies the requestor id in the case of incremental selections, or NULL in the case of atomic transfers. .IP \fItype_return\fP 1i -Specifies a pointer to an atom in whcih the property type of the +Specifies a pointer to an atom in which the property type of the parameters will be stored. .IP \fIvalue_return\fP 1i Specifies a pointer into which a pointer to the parameters are to be diff --git a/man/XtGetSelectionRequest.man b/man/XtGetSelectionRequest.man index 0144bcf..8f498d5 100644 --- a/man/XtGetSelectionRequest.man +++ b/man/XtGetSelectionRequest.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtGetSR.man,v 1.4 2003/04/28 22:18:19 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,14 +130,9 @@ .SH NAME XtGetSelectionRequest \- retrieve the event that triggered the XtConvertSelectionProc .SH SYNTAX -XSelectionRequestEvent* XtGetSelectionRequest(\fIw\fP, \fIselection\fP, -\fIrequest_id\fP) -.br - Widget \fIw\fP; -.br - Atom \fIselection\fP; -.br - XtRequestId \fIrequest_id\fP; +.HP +XSelectionRequestEvent* XtGetSelectionRequest(Widget \fIw\fP, Atom +\fIselection\fP, XtRequestId \fIrequest_id\fP); .SH ARGUMENTS .IP \fIw\fP 1i Specifies the widget. diff --git a/man/XtGetSelectionTimeout.man b/man/XtGetSelectionTimeout.man index 491c7a5..2b33290 100644 --- a/man/XtGetSelectionTimeout.man +++ b/man/XtGetSelectionTimeout.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtGetSTO.man,v 1.3 2003/04/28 22:18:19 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,11 +130,10 @@ .SH NAME XtGetSelectionTimeout, XtSetSelectionTimeout \- set and obtain selection timeout values .SH SYNTAX -unsigned long XtGetSelectionTimeout() -.LP -void XtSetSelectionTimeout(\fItimeout\fP) -.br - unsigned long \fItimeout\fP; +.HP +unsigned long XtGetSelectionTimeout(void); +.HP +void XtSetSelectionTimeout(unsigned long \fItimeout\fP); .SH ARGUMENTS .IP \fItimeout\fP 1i Specifies the selection timeout in milliseconds. diff --git a/man/XtGetSelectionValue.man b/man/XtGetSelectionValue.man index 3976990..c19072a 100644 --- a/man/XtGetSelectionValue.man +++ b/man/XtGetSelectionValue.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtGetSVal.man,v 1.4 2003/04/28 22:18:19 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,37 +131,14 @@ .SH NAME XtGetSelectionValue, XtGetSelectionValues \- obtain selection values .SH SYNTAX -void XtGetSelectionValue(\fIw\fP, \fIselection\fP, \fItarget\fP, -\fIcallback\fP, \fIclient_data\fP, \fItime\fP) -.br - Widget \fIw\fP; -.br - Atom \fIselection\fP; -.br - Atom \fItarget\fP; -.br - XtSelectionCallbackProc \fIcallback\fP; -.br - XtPointer \fIclient_data\fP; -.br - Time \fItime\fP; -.LP -void XtGetSelectionValues(\fIw\fP, \fIselection\fP, \fItargets\fP, -\fIcount\fP, \fIcallback\fP, \fIclient_data\fP, \fItime\fP) -.br - Widget \fIw\fP; -.br - Atom \fIselection\fP; -.br - Atom *\fItargets\fP; -.br - int \fIcount\fP; -.br - XtSelectionCallbackProc \fIcallback\fP; -.br - XtPointer \fIclient_data\fP; -.br - Time \fItime\fP; +.HP +void XtGetSelectionValue(Widget \fIw\fP, Atom \fIselection\fP, Atom +\fItarget\fP, XtSelectionCallbackProc \fIcallback\fP, XtPointer +\fIclient_data\fP, Time \fItime\fP); +.HP +void XtGetSelectionValues(Widget \fIw\fP, Atom \fIselection\fP, Atom +*\fItargets\fP, int \fIcount\fP, XtSelectionCallbackProc \fIcallback\fP, +XtPointer \fIclient_data\fP, Time \fItime\fP); .SH ARGUMENTS .ds Cb \ that is to be called when the selection value has been obtained .IP \fIcallback\fP 1i diff --git a/man/XtGetSelectionValueIncremental.man b/man/XtGetSelectionValueIncremental.man index 0a6c533..0a35c60 100644 --- a/man/XtGetSelectionValueIncremental.man +++ b/man/XtGetSelectionValueIncremental.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtGetSValI.man,v 1.5 2003/05/29 21:48:05 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,37 +130,14 @@ .SH NAME XtGetSelectionValueIncremental, XtGetSelectionValuesIncremental \- obtain selection values .SH SYNTAX -void XtGetSelectionValueIncremental(\fIw\fP, \fIselection\fP, \fItarget\fP, -\fIcallback\fP, \fIclient_data\fP, \fItime\fP) -.br - Widget \fIw\fP; -.br - Atom \fIselection\fP; -.br - Atom \fItarget\fP; -.br - XtSelectionCallbackProc \fIcallback\fP; -.br - XtPointer \fIclient_data\fP; -.br - Time \fItime\fP; -.LP -void XtGetSelectionValuesIncremental(\fIw\fP, \fIselection\fP, \fItargets\fP, -\fIcount\fP, \fIcallback\fP, \fIclient_data\fP, \fItime\fP) -.br - Widget \fIw\fP; -.br - Atom \fIselection\fP; -.br - Atom *\fItargets\fP; -.br - int \fIcount\fP; -.br - XtSelectionCallbackProc \fIcallback\fP; -.br - XtPointer \fIclient_data\fP; -.br - Time \fItime\fP; +.HP +void XtGetSelectionValueIncremental(Widget \fIw\fP, Atom \fIselection\fP, Atom +\fItarget\fP, XtSelectionCallbackProc \fIcallback\fP, XtPointer +\fIclient_data\fP, Time \fItime\fP); +.HP +void XtGetSelectionValuesIncremental(Widget \fIw\fP, Atom \fIselection\fP, +Atom *\fItargets\fP, int \fIcount\fP, XtSelectionCallbackProc \fIcallback\fP, +XtPointer \fIclient_data\fP, Time \fItime\fP); .SH ARGUMENTS .ds Cb \ that is to be called when the selection value has been obtained .IP \fIcallback\fP 1i @@ -217,7 +194,7 @@ The effect is as if each target were specified in a separate call to The callback is called once with the corresponding client data for each target. .ZN XtGetSelectionValuesIncremental does guarantee that all the conversions will use the same selection value -becaues the ownership of the selection cannot change in the middle of the list, +because the ownership of the selection cannot change in the middle of the list, as would be when calling .ZN XtGetSelectionValueIncremental repeatedly. diff --git a/man/XtGetSubresources.man b/man/XtGetSubresources.man index ab64088..a6b6882 100644 --- a/man/XtGetSubresources.man +++ b/man/XtGetSubresources.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtGetSres.man,v 1.4 2003/04/28 22:18:19 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,40 +131,14 @@ .SH NAME XtGetSubresources, XtVaGetSubresources \- obtain subresources .SH SYNTAX -void XtGetSubresources(\fIw\fP, \fIbase\fP, \fIname\fP, \fIclass\fP, -\fIresources\fP, \fInum_resources\fP, \fIargs\fP, \fInum_args\fP) -.br - Widget \fIw\fP; -.br - XtPointer \fIbase\fP; -.br - String \fIname\fP; -.br - String \fIclass\fP; -.br - XtResourceList \fIresources\fP; -.br - Cardinal \fInum_resources\fP; -.br - ArgList \fIargs\fP; -.br - Cardinal \fInum_args\fP; -.LP -void XtVaGetSubresources(\fIw\fP, \fIbase\fP, \fIname\fP, \fIclass\fP, -\fIresources\fP, \fInum_resources\fP, \fI...\fP) -.br - Widget \fIw\fP; -.br - XtPointer \fIbase\fP; -.br - String \fIname\fP; -.br - String \fIclass\fP; -.br - XtResourceList \fIresources\fP; -.br - Cardinal \fInum_resources\fP; -.br +.HP +void XtGetSubresources(Widget \fIw\fP, XtPointer \fIbase\fP, String +\fIname\fP, String \fIclass\fP, XtResourceList \fIresources\fP, Cardinal +\fInum_resources\fP, ArgList \fIargs\fP, Cardinal \fInum_args\fP); +.HP +void XtVaGetSubresources(Widget \fIw\fP, XtPointer \fIbase\fP, String +\fIname\fP, String \fIclass\fP, XtResourceList \fIresources\fP, Cardinal +\fInum_resources\fP); .SH ARGUMENTS .ds Al to override resources obtained from the resource database .IP \fIargs\fP 1i diff --git a/man/XtGrabKey.man b/man/XtGrabKey.man index 14597c6..dc17c74 100644 --- a/man/XtGrabKey.man +++ b/man/XtGrabKey.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtGrabKey.man,v 1.4 2003/04/28 22:18:19 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,104 +130,32 @@ .SH NAME XtGrabKey, XtUngrabKey, XtGrabKeyboard, XtUngrabKeyboard, XtGrabButton, XtUngrabButton, XtGrabPointer, XtUngrabPointer \- manage grabs .SH SYNTAX -void XtGrabKey(\fIwidget\fP, \fIkeycode\fP, \fImodifiers\fP, -\fIowner_events\fP, \fIpointer_mode\fP, \fIkeyboard_mode\fP) -.br - Widget \fIwidget\fP; -.br - KeyCode \fIkeycode\fP; -.br - Modifiers \fImodifiers\fP; -.br - Boolean \fIowner_events\fP; -.br - int \fIpointer_mode\fP; -.br - int \fIkeyboard_mode\fP; -.LP -void XtUngrabKey(\fIwidget\fP, \fIkeycode\fP, \fImodifiers\fP) -.br - Widget \fIwidget\fP; -.br - KeyCode \fIkeycode\fP; -.br - Modifiers \fImodifiers\fP; -.LP -int XtGrabKeyboard(\fIwidget\fP, \fIowner_events\fP, \fIpointer_mode\fP, -\fIkeyboard_mode\fP, \fItime\fP) -.br - Widget \fIwidget\fP; -.br - Boolean \fIowner_events\fP; -.br - int \fIpointer_mode\fP; -.br - int \fIkeyboard_mode\fP; -.br - Time \fItime\fP; -.LP -void XtUngrabKeyboard(\fIwidget\fP, \fItime\fP) -.br - Widget \fIwidget\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, -\fIconfine_to\fP, \fIcursor\fP) -.br - Widget \fIwidget\fP; -.br - int \fIbutton\fP; -.br - Modifiers \fImodifiers\fP; -.br - Boolean \fIowner_events\fP; -.br - unsigned int \fIevent_mask\fP; -.br - int \fIpointer_mode\fP; -.br - int \fIkeyboard_mode\fP; -.br - Window \fIconfine_to\fP; -.br - Cursor \fIcursor\fP; -.LP -void XtUngrabButton(\fIwidget\fP, \fIbutton\fP, \fImodifiers\fP) -.br - Widget \fIwidget\fP; -.br - KeyCode \fIbutton\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, -\fItime\fP) -.br - Widget \fIwidget\fP; -.br - Boolean \fIowner_events\fP; -.br - unsigned int \fIevent_mask\fP; -.br - int \fIpointer_mode\fP; -.br - int \fIkeyboard_mode\fP; -.br - Window \fIconfine_to\fP; -.br - Cursor \fIcursor\fP; -.br - Time \fItime\fP; -.LP -void XtUngrabPointer(\fIwidget\fP, \fItime\fP) -.br - Widget \fIwidget\fP; -.br - Time \fItime\fP; -.LP +.HP +void XtGrabKey(Widget \fIwidget\fP, KeyCode \fIkeycode\fP, Modifiers +\fImodifiers\fP, Boolean \fIowner_events\fP, int \fIpointer_mode\fP, int +\fIkeyboard_mode\fP); +.HP +void XtUngrabKey(Widget \fIwidget\fP, KeyCode \fIkeycode\fP, Modifiers +\fImodifiers\fP); +.HP +int XtGrabKeyboard(Widget \fIwidget\fP, Boolean \fIowner_events\fP, int +\fIpointer_mode\fP, int \fIkeyboard_mode\fP, Time \fItime\fP); +.HP +void XtUngrabKeyboard(Widget \fIwidget\fP, Time \fItime\fP); +.HP +void XtGrabButton(Widget \fIwidget\fP, int \fIbutton\fP, Modifiers +\fImodifiers\fP, Boolean \fIowner_events\fP, unsigned int \fIevent_mask\fP, +int \fIpointer_mode\fP, int \fIkeyboard_mode\fP, Window \fIconfine_to\fP, +Cursor \fIcursor\fP); +.HP +void XtUngrabButton(Widget \fIwidget\fP, KeyCode \fIbutton\fP, Modifiers +\fImodifiers\fP); +.HP +int XtGrabPointer(Widget \fIwidget\fP, Boolean \fIowner_events\fP, unsigned +int \fIevent_mask\fP, int \fIpointer_mode\fP, int \fIkeyboard_mode\fP, Window +\fIconfine_to\fP, Cursor \fIcursor\fP, Time \fItime\fP); +.HP +void XtUngrabPointer(Widget \fIwidget\fP, Time \fItime\fP); .SH ARGUMENTS .IP \fIwidget\fP 1i Specifies the widget in whose window the grab will occur. Must be of diff --git a/man/XtHooksOfDisplay.man b/man/XtHooksOfDisplay.man index 997337d..3b493fe 100644 --- a/man/XtHooksOfDisplay.man +++ b/man/XtHooksOfDisplay.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtHookOD.man,v 1.3 2003/04/28 22:18:19 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,9 +130,8 @@ .SH NAME XtHooksOfDisplay \- external agent access points .SH SYNTAX -Widget XtHooksOfDisplay(\fIdisplay\fP) -.br - Display* \fIdisplay\fP; +.HP +Widget XtHooksOfDisplay(Display* \fIdisplay\fP); .SH ARGUMENTS .IP \fIdisplay\fP 1i Specifies the desired display. diff --git a/man/XtInitialize.man b/man/XtInitialize.man index 0da0bfe..bd87295 100644 --- a/man/XtInitialize.man +++ b/man/XtInitialize.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtInit.man,v 1.4 2003/04/28 22:18:19 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,20 +130,10 @@ .SH NAME XtInitialize \- initialize .SH SYNTAX -Widget XtInitialize(\fIshell_name\fP, \fIapplication_class\fP, -\fIoptions\fP, \fInum_options\fP, \fIargc\fP, \fIargv\fP) -.br - String \fIshell_name\fP; -.br - String \fIapplication_class\fP; -.br - XrmOptionDescRec* \fIoptions\fP; -.br - Cardinal \fInum_options\fP; -.br - int* \fIargc\fP; -.br - char** \fIargv\fP; +.HP +Widget XtInitialize(String \fIshell_name\fP, String \fIapplication_class\fP, +XrmOptionDescRec* \fIoptions\fP, Cardinal \fInum_options\fP, int* \fIargc\fP, +char** \fIargv\fP); .SH ARGUMENTS .IP \fIshell_name\fP 1i Specifies the name of the created shell widget. diff --git a/man/XtInitializeWidgetClass.man b/man/XtInitializeWidgetClass.man index 99f02cf..6ad02d7 100644 --- a/man/XtInitializeWidgetClass.man +++ b/man/XtInitializeWidgetClass.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtInitWC.man,v 1.3 2003/04/28 22:18:19 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,9 +130,8 @@ .SH NAME XtInitializeWidgetClass \- initialize a widget class .SH SYNTAX -void XtInitializeWidgetClass(\fIobject_class\fP) -.br - WidgetClass \fIobject_class\fP; +.HP +void XtInitializeWidgetClass(WidgetClass \fIobject_class\fP); .SH ARGUMENTS .IP \fIobject_class\fP 1i Specifies the object class to initialize. diff --git a/man/XtInsertEventTypeHandler.man b/man/XtInsertEventTypeHandler.man index d01bf21..d19fa76 100644 --- a/man/XtInsertEventTypeHandler.man +++ b/man/XtInsertEventTypeHandler.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtExtEvDis.man,v 1.4 2003/04/28 22:18:18 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -132,62 +132,23 @@ XtInsertEventTypeHandler, XtRemoveEventTypeHandler, XtRegisterExtensionSelector, XtSetEventDispatcher, XtDispatchEventToWidget \- extension event handling .SH SYNTAX -void XtInsertEventTypeHandler(\fIwidget\fP, \fIevent_type\fP, -\fIselect_data\fP, \fIproc\fP, \fIclient_data\fP, \fIposition\fP) -.br - Widget \fIwdget\fP; -.br - int \fIevent_type\fP; -.br - XtPointer \fIselect_data\fP; -.br - XtEventHandler \fIproc\fP; -.br - XtPointer \fIclient_data\fP; -.br - XtListPosition \fIposition\fP; -.LP -void XtRemoveEventTypeHandler(\fIwidget\fP, \fIevent_type\fP, -\fIselect_data\fP, \fIproc\fP, \fIclient_data\fP) -.br - Widget \fIwdget\fP; -.br - int \fIevent_type\fP; -.br - XtPointer \fIselect_data\fP; -.br - XtEventHandler \fIproc\fP; -.br - XtPointer \fIclient_data\fP; -.LP -void XtRegisterExtensionSelector(\fIdisplay\fP, \fImin_event_type\fP, -\fImax_event_type\fP, \fIproc\fP, \fIclient_data\fP) -.br - Display* \fIdisplay\fP; -.br - int \fImin_event_type\fP; -.br - int \fImax_event_type\fP; -.br - XtExtensionSelectProc \fIproc\fP; -.br - XtPointer \fIclient_data\fP; -.LP -XtEventDispatchProc XtSetEventDispatcher(\fIdisplay\fP, \fIevent_type\fP, -\fIproc\fP) -.br - Widget \fIwidget\fP; -.br - int \fIevent_type\fP; -.br - XtEventDispatchProc \fIproc\fP; -.LP -Boolean XtDispatchEventToWidget(\fIwidget\fP, \fIevent\fP) -.br - Widget \fIwidget\fP; -.br - XEvent* \fIevent\fP; -.LP +.HP +void XtInsertEventTypeHandler(Widget \fIwdget\fP, int \fIevent_type\fP, +XtPointer \fIselect_data\fP, XtEventHandler \fIproc\fP, XtPointer +\fIclient_data\fP, XtListPosition \fIposition\fP); +.HP +void XtRemoveEventTypeHandler(Widget \fIwdget\fP, int \fIevent_type\fP, +XtPointer \fIselect_data\fP, XtEventHandler \fIproc\fP, XtPointer +\fIclient_data\fP); +.HP +void XtRegisterExtensionSelector(Display* \fIdisplay\fP, int +\fImin_event_type\fP, int \fImax_event_type\fP, XtExtensionSelectProc +\fIproc\fP, XtPointer \fIclient_data\fP); +.HP +XtEventDispatchProc XtSetEventDispatcher(Widget \fIwidget\fP, int +\fIevent_type\fP, XtEventDispatchProc \fIproc\fP); +.HP +Boolean XtDispatchEventToWidget(Widget \fIwidget\fP, XEvent* \fIevent\fP); .SH ARGUMENTS .IP \fIwidget\fP 1i Specifies the widget for this event handler. diff --git a/man/XtLastEventProcessed.man b/man/XtLastEventProcessed.man index 3bc6529..0d9253c 100644 --- a/man/XtLastEventProcessed.man +++ b/man/XtLastEventProcessed.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtLastProc.man,v 1.3 2003/04/28 22:18:19 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,13 +130,10 @@ .SH NAME XtLastEventProcessed, XtLastTimestampProcessed \- last event, last timestamp processed .SH SYNTAX -XEvent* XtLastEventProcessed(\fIdisplay\fP) -.br - Display* \fIdisplay\fP; -.LP -Time XtLastTimestampProcessed(\fIdisplay\fP) -.br - Display* \fIdisplay\fP; +.HP +XEvent* XtLastEventProcessed(Display* \fIdisplay\fP); +.HP +Time XtLastTimestampProcessed(Display* \fIdisplay\fP); .SH ARGUMENTS .IP \fIdisplay\fP 1i Specifies the open display connection. diff --git a/man/XtMakeGeometryRequest.man b/man/XtMakeGeometryRequest.man index 88cc173..2e7b725 100644 --- a/man/XtMakeGeometryRequest.man +++ b/man/XtMakeGeometryRequest.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtMakGReq.man,v 1.4 2003/04/28 22:18:19 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,23 +131,12 @@ .SH NAME XtMakeGeometryRequest, XtMakeResizeRequest \- make geometry manager request .SH SYNTAX -XtGeometryResult XtMakeGeometryRequest(\fIw\fP, \fIrequest\fP, -\fIreply_return\fP) -.br - Widget \fIw\fP; -.br - XtWidgetGeometry *\fIrequest\fP; -.br - XtWidgetGeometry *\fIreply_return\fP; -.LP -XtGeometryResult XtMakeResizeRequest(\fIw\fP, \fIwidth\fP, \fIheight\fP, -\fIwidth_return\fP, \fIheight_return\fP) -.br - Widget \fIw\fP; -.br - Dimension \fIwidth\fP, \fIheight\fP; -.br - Dimension *\fIwidth_return\fP, *\fIheight_return\fP +.HP +XtGeometryResult XtMakeGeometryRequest(Widget \fIw\fP, XtWidgetGeometry +*\fIrequest\fP, XtWidgetGeometry *\fIreply_return\fP); +.HP +XtGeometryResult XtMakeResizeRequest(Widget \fIw\fP, Dimension \fIwidth\fP, +\fIheight\fP, Dimension *\fIwidth_return\fP, Dimension *\fIheight_return\fP); .SH ARGUMENTS .IP \fIreply_return\fP 1i Returns the allowed widget size or may be NULL diff --git a/man/XtMalloc.man b/man/XtMalloc.man index cc02940..6f25441 100644 --- a/man/XtMalloc.man +++ b/man/XtMalloc.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtMalloc.man,v 1.3 2003/04/28 22:18:19 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,33 +131,18 @@ .SH NAME XtMalloc, XtCalloc, XtRealloc, XtFree, XtNew, XtNewString \- memory management functions .SH SYNTAX -char *XtMalloc(\fIsize\fP); -.br - Cardinal \fIsize\fP; -.LP -char *XtCalloc(\fInum\fP, \fIsize\fP); -.br - Cardinal \fInum\fP; -.br - Cardinal \fIsize\fP; -.LP -char *XtRealloc(\fIptr\fP, \fInum\fP); -.br - char *\fIptr\fP; -.br - Cardinal \fInum\fP; -.LP -void XtFree(\fIptr\fP); -.br - char *\fIptr\fP; -.LP -\fItype\fP *XtNew(\fItype\fP); -.br - \fItype\fP; -.LP -String XtNewString(\fIstring\fP); -.br - String \fIstring\fP; +.HP +char *XtMalloc(Cardinal \fIsize\fP); +.HP +char *XtCalloc(Cardinal \fInum\fP, Cardinal \fIsize\fP); +.HP +char *XtRealloc(char *\fIptr\fP, Cardinal \fInum\fP); +.HP +void XtFree(char *\fIptr\fP); +.HP +\fItype\fP *XtNew(\fItype\fP); +.HP +String XtNewString(String \fIstring\fP); .SH ARGUMENTS .IP \fInum\fP 1i Specifies the number of bytes or array elements. diff --git a/man/XtManageChildren.man b/man/XtManageChildren.man index 0497056..7a304bc 100644 --- a/man/XtManageChildren.man +++ b/man/XtManageChildren.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtManChild.man,v 1.3 2003/04/28 22:18:19 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -132,44 +132,22 @@ XtManageChildren, XtManageChild, XtUnmanageChildren, XtUnmanageChild, XtChangeManagedSet, XtIsManaged \- manage and unmanage children .SH SYNTAX typedef Widget *WidgetList; -.sp -void XtManageChildren(\fIchildren\fP, \fInum_children\fP) -.br - WidgetList \fIchildren\fP; -.br - Cardinal \fInum_children\fP; -.LP -void XtManageChild(\fIchild\fP) -.br - Widget \fIchild\fP; -.LP -void XtUnmanageChildren(\fIchildren\fP, \fInum_children\fP) -.br - WidgetList \fIchildren\fP; -.br - Cardinal \fInum_children\fP; -.LP -void XtUnmanageChild(\fIchild\fP) -.br - Widget \fIchild\fP; -.LP -void XtChangeManagedSet(\fIunmanage_children\fP, \fInum_unmanage_children\fP, \fImanage_children\fP, \fInum_manage_children\fP, \fIpost_unmanage_pre_manage_hook\fP, \fIclient_data\fP) -.br - WidgetList \fIunmanage_children\fP; -.br - Cardinal \fInum_unmanage_children\fP; -.br - WidgetList \fImanage_children\fP; -.br - Cardinal \fInum_manage_children\fP; -.br - XtCSMProc \fIpost_unmanage_pre_manage_hook\fP; -.br - XtPointer \fIclient_data\fP; -.LP -Boolean XtIsManaged(\fIwidget\fP) -.br - Widget \fIwidget\fP +.HP +void XtManageChildren(WidgetList \fIchildren\fP, Cardinal \fInum_children\fP); +.HP +void XtManageChild(Widget \fIchild\fP); +.HP +void XtUnmanageChildren(WidgetList \fIchildren\fP, Cardinal +\fInum_children\fP); +.HP +void XtUnmanageChild(Widget \fIchild\fP); +.HP +void XtChangeManagedSet(WidgetList \fIunmanage_children\fP, Cardinal +\fInum_unmanage_children\fP, WidgetList \fImanage_children\fP, Cardinal +\fInum_manage_children\fP, XtCSMProc \fIpost_unmanage_pre_manage_hook\fP, +XtPointer \fIclient_data\fP); +.HP +Boolean XtIsManaged(Widget \fIwidget\fP); .SH ARGUMENTS .IP \fIchild\fP 1i Specifies the child. diff --git a/man/XtMapWidget.man b/man/XtMapWidget.man index 0098157..3e3c623 100644 --- a/man/XtMapWidget.man +++ b/man/XtMapWidget.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtMapWid.man,v 1.3 2003/04/28 22:18:19 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,19 +131,12 @@ .SH NAME XtMapWidget, XtSetMappedWhenManaged, XtUnmapWidget \- map and unmap widgets .SH SYNTAX -XtMapWidget(\fIw\fP) -.br - Widget \fIw\fP\^; -.LP -void XtSetMappedWhenManaged(\fIw\fP, \fImap_when_managed\fP) -.br - Widget \fIw\fP; -.br - Boolean \fImap_when_managed\fP; -.LP -XtUnmapWidget(\fIw\fP) -.br - Widget \fIw\fP\^; +.HP +int XtMapWidget(Widget \fIw\fP\^); +.HP +void XtSetMappedWhenManaged(Widget \fIw\fP, Boolean \fImap_when_managed\fP); +.HP +int XtUnmapWidget(Widget \fIw\fP\^); .SH ARGUMENTS .IP \fImap_when_managed\fP 1i Specifies a Boolean value that indicates the new value of the map_when_managed diff --git a/man/XtName.man b/man/XtName.man index 82c6d86..2b73aa1 100644 --- a/man/XtName.man +++ b/man/XtName.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtName.man,v 1.3 2003/04/28 22:18:19 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,9 +130,8 @@ .SH NAME XtName \- obtain widget's name .SH SYNTAX -Widget XtName(\fIw\fP) -.br - Widget \fIw\fP; +.HP +Widget XtName(Widget \fIw\fP); .SH ARGUMENTS .IP \fIw\fP 1i Specifies the widget. diff --git a/man/XtNameToWidget.man b/man/XtNameToWidget.man index 82fb843..6a22ea8 100644 --- a/man/XtNameToWidget.man +++ b/man/XtNameToWidget.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtNameTWid.man,v 1.3 2003/04/28 22:18:20 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,17 +131,10 @@ .SH NAME XtNameToWidget, XtWindowToWidget \- translating strings to widgets or widgets to windows .SH SYNTAX -Widget XtNameToWidget(\fIreference\fP, \fInames\fP); -.br - Widget \fIreference\fP; -.br - String \fInames\fP; -.LP -Widget XtWindowToWidget(\fIdisplay\fP, \fIwindow\fP) -.br - Display *\fIdisplay\fP; -.br - Window \fIwindow\fP; +.HP +Widget XtNameToWidget(Widget \fIreference\fP, String \fInames\fP); +.HP +Widget XtWindowToWidget(Display *\fIdisplay\fP, Window \fIwindow\fP); .SH ARGUMENTS .ds Di \ on which the window is defined .IP \fIdisplay\fP 1i diff --git a/man/XtNextEvent.man b/man/XtNextEvent.man index f654bd9..ea34f1e 100644 --- a/man/XtNextEvent.man +++ b/man/XtNextEvent.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtNextEv.man,v 1.5 2003/04/28 22:18:20 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,21 +131,16 @@ .SH NAME XtNextEvent, XtPending, XtPeekEvent, XtProcessEvent, XtMainLoop \- query and process events and input .SH SYNTAX -void XtNextEvent(\fIevent_return\fP) -.br - XEvent *\fIevent_return\fP; -.LP -Boolean XtPeekEvent(\fIevent_return\fP) -.br - XEvent *\fIevent_return\fP; -.LP -Boolean XtPending() -.LP -void XtProcessEvent(\fImask\fP) -.br - XtInputMask \fImask\fP; -.LP -void XtMainLoop() +.HP +void XtNextEvent(XEvent *\fIevent_return\fP); +.HP +Boolean XtPeekEvent(XEvent *\fIevent_return\fP); +.HP +Boolean XtPending(void); +.Hp +void XtProcessEvent(XtInputMask \fImask\fP); +.HP +void XtMainLoop(void); .SH ARGUMENTS .IP \fIevent\fP 1i Specifies a pointer to the event structure that is to be dispatched diff --git a/man/XtOffset.man b/man/XtOffset.man index af7c801..1894dab 100644 --- a/man/XtOffset.man +++ b/man/XtOffset.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtOffset.man,v 1.3 2003/04/28 22:18:20 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,21 +130,12 @@ .SH NAME XtOffset, XtOffsetOf, XtNumber \- determine the byte offset or number of array elements .SH SYNTAX -Cardinal XtOffset(\fIpointer_type\fP, \fIfield_name\fP) -.br - Type \fIpointer_type\fP; -.br - Field \fIfield_name\fP; -.LP -Cardinal XtOffsetOf(\fIstructure_type\fP, \fIfield_name\fP) -.br - Type \fIstructure_type\fP; -.br - Field \fIfield_name\fP; -.LP -Cardinal XtNumber(\fIarray\fP) -.br - ArrayVariable \fIarray\fP; +.HP +Cardinal XtOffset(Type \fIpointer_type\fP, Field \fIfield_name\fP); +.HP +Cardinal XtOffsetOf(Type \fIstructure_type\fP, Field \fIfield_name\fP); +.HP +Cardinal XtNumber(ArrayVariable \fIarray\fP); .SH ARGUMENTS .IP \fIarray\fP 1i Specifies a fixed-size array. diff --git a/man/XtOpenApplication.man b/man/XtOpenApplication.man index 9b3896c..475ae5f 100644 --- a/man/XtOpenApplication.man +++ b/man/XtOpenApplication.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtOpenApp.man,v 1.6 2003/04/28 22:18:20 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,49 +130,17 @@ .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, -\fIfallback_resources\fP, \fIwidget_class\fP, \fIargs\fP, \fInum_args\fP) -.br - XtAppContext* \fIapp_context_return\fP; -.br - String \fIapplication_class\fP; -.br - XrmOptionDescRec* \fIoptions\fP; -.br - Cardinal \fInum_options\fP; -.br - int* \fIargc_in_out\fP; -.br - String* \fIargv_in_out\fP; -.br - String* \fIfallback_resources\fP; -.br - WidgetClass \fIwidget_class\fP; -.br - ArgList \fIargs\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, -\fIfallback_resources\fP, \fIwidget_class\fP, ...) -.br - XtAppContext* \fIapp_context_return\fP; -.br - String \fIapplication_class\fP; -.br - XrmOptionDescRec* \fIoptions\fP; -.br - Cardinal \fInum_options\fP; -.br - int* \fIargc_in_out\fP; -.br - String* \fIargv_in_out\fP; -.br - String* \fIfallback_resources\fP; -.br - WidgetClass \fIwidget_class\fP; +.HP +Widget XtOpenApplication(XtAppContext *\fIapp_context_return\fP, String +\fIapplication_class\fP, XrmOptionDescRec *\fIoptions\fP, Cardinal +\fInum_options\fP, int *\fIargc_in_out\fP, String *\fIargv_in_out\fP, String +*\fIfallback_resources\fP, WidgetClass \fIwidget_class\fP, ArgList \fIargs\fP, +Cardinal \fInum_args\fP); +.HP +Widget XtVaOpenApplication(XtAppContext *\fIapp_context_return\fP, String +\fIapplication_class\fP, XrmOptionDescRec *\fIoptions\fP, Cardinal +\fInum_options\fP, int *\fIargc_in_out\fP, String *\fIargv_in_out\fP, String +*\fIfallback_resources\fP, WidgetClass \fIwidget_class\fP, ...\^); .SH ARGUMENTS .IP \fIapp_context_return\fP 1i Specifies the application context. diff --git a/man/XtOwnSelection.man b/man/XtOwnSelection.man index 04abf11..f16a33b 100644 --- a/man/XtOwnSelection.man +++ b/man/XtOwnSelection.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtOwnSel.man,v 1.4 2003/04/28 22:18:20 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,48 +131,18 @@ .SH NAME XtOwnSelection, XtOwnSelectionIncremental, XtDisownSelection \- set selection owner .SH SYNTAX -Boolean XtOwnSelection(\fIw\fP, \fIselection\fP, \fItime\fP, -\fIconvert_proc\fP, \fIlose_selection\fP, \fIdone_proc\fP) -.br - Widget \fIw\fP; -.br - Atom \fIselection\fP; -.br - Time \fItime\fP; -.br - XtConvertSelectionProc \fIconvert_proc\fP; -.br - XtLoseSelectionProc \fIlose_selection\fP; -.br - XtSelectionDoneProc \fIdone_proc\fP; -.LP -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; -.br - Atom \fIselection\fP; -.br - Time \fItime\fP; -.br - XtConvertSelectionIncrProc \fIconvert_callback\fP; -.br - XtLoseSelectionIncrProc \fIlose_callback\fP; -.br - XtSelectionDoneIncrProc \fIdone_callback\fP; -.br - XtCancelConvertSelectionProc \fIcancel_callback\fP; -.br - XtPointer \fIclient_data\fP; -.LP -void XtDisownSelection(\fIw\fP, \fIselection\fP, \fItime\fP) -.br - Widget \fIw\fP; -.br - Atom \fIselection\fP; -.br - Time \fItime\fP; +.HP +Boolean XtOwnSelection(Widget \fIw\fP, Atom \fIselection\fP, Time \fItime\fP, +XtConvertSelectionProc \fIconvert_proc\fP, XtLoseSelectionProc +\fIlose_selection\fP, XtSelectionDoneProc \fIdone_proc\fP); +.HP +Boolean XtOwnSelectionIncremental(Widget \fIw\fP, Atom \fIselection\fP, Time +\fItime\fP, XtConvertSelectionIncrProc \fIconvert_callback\fP, +XtLoseSelectionIncrProc \fIlose_callback\fP, XtSelectionDoneIncrProc +\fIdone_callback\fP, XtCancelConvertSelectionProc \fIcancel_callback\fP, +XtPointer \fIclient_data\fP); +.HP +void XtDisownSelection(Widget \fIw\fP, Atom \fIselection\fP, Time \fItime\fP); .SH ARGUMENTS .IP \fIconvert_proc\fP 1i Specifies the procedure that is to be called whenever someone requests the diff --git a/man/XtParent.man b/man/XtParent.man index b42e554..8727105 100644 --- a/man/XtParent.man +++ b/man/XtParent.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtParent.man,v 1.3 2003/04/28 22:18:20 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,9 +131,8 @@ .SH NAME XtParent \- obtain widget's parent widget id .SH SYNTAX -Widget XtParent(\fIw\fP) -.br - Widget \fIw\fP; +.HP +Widget XtParent(Widget \fIw\fP); .SH ARGUMENTS .IP \fIw\fP 1i Specifies the widget. diff --git a/man/XtParseAcceleratorTable.man b/man/XtParseAcceleratorTable.man index 0bc24ee..4e84f6f 100644 --- a/man/XtParseAcceleratorTable.man +++ b/man/XtParseAcceleratorTable.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtParATab.man,v 1.3 2003/04/28 22:18:20 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,21 +131,12 @@ .SH NAME XtParseAcceleratorTable, XtInstallAccelerators, XtInstallAllAccelerators \- managing accelerator tables .SH SYNTAX -XtAccelerators XtParseAcceleratorTable(\fIsource\fP) -.br - String \fIsource\fP; -.LP -void XtInstallAccelerators(\fIdestination\fP, \fIsource\fP) -.br - Widget \fIdestination\fP; -.br - Widget \fIsource\fP; -.LP -void XtInstallAllAccelerators(\fIdestination\fP, \fIsource\fP) -.br - Widget \fIdestination\fP; -.br - Widget \fIsource\fP; +.HP +XtAccelerators XtParseAcceleratorTable(String \fIsource\fP); +.HP +void XtInstallAccelerators(Widget \fIdestination\fP, Widget \fIsource\fP); +.HP +void XtInstallAllAccelerators(Widget \fIdestination\fP, Widget \fIsource\fP); .SH ARGUMENTS .ds So to compile .IP \fIsource\fP 1i diff --git a/man/XtParseTranslationTable.man b/man/XtParseTranslationTable.man index c7756e4..a79cd55 100644 --- a/man/XtParseTranslationTable.man +++ b/man/XtParseTranslationTable.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtParTTab.man,v 1.3 2003/04/28 22:18:20 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,25 +131,15 @@ .SH NAME XtParseTranslationTable, XtAugmentTranslations, XtOverrideTranslations, XtUninstallTranslations \- manage translation tables .SH SYNTAX -XtTranslations XtParseTranslationTable(\fItable\fP) -.br - String \fItable\fP; -.LP -void XtAugmentTranslations(\fIw\fP, \fItranslations\fP) -.br - Widget \fIw\fP; -.br - XtTranslations \fItranslations\fP; -.LP -void XtOverrideTranslations(\fIw\fP, \fItranslations\fP) -.br - Widget \fIw\fP; -.br - XtTranslations \fItranslations\fP; -.LP -void XtUninstallTranslations(\fIw\fP) -.br - Widget \fIw\fP; +.HP +XtTranslations XtParseTranslationTable(String \fItable\fP); +.HP +void XtAugmentTranslations(Widget \fIw\fP, XtTranslations \fItranslations\fP); +.HP +void XtOverrideTranslations(Widget \fIw\fP, XtTranslations +\fItranslations\fP); +.HP +void XtUninstallTranslations(Widget \fIw\fP); .SH ARGUMENTS .IP \fItable\fP 1i Specifies the translation table to compile. diff --git a/man/XtPopdown.man b/man/XtPopdown.man index e0362f5..d89edc3 100644 --- a/man/XtPopdown.man +++ b/man/XtPopdown.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtPopdown.man,v 1.3 2003/04/28 22:18:20 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,21 +131,13 @@ .SH NAME XtPopdown, XtCallbackPopdown \- unmap a pop-up .SH SYNTAX -void XtPopdown(\fIpopup_shell\fP) -.br - Widget \fIpopup_shell\fP; -.LP -void XtCallbackPopdown(\fIw\fP, \fIclient_data\fP, \fIcall_data\fP) -.br - Widget \fIw\fP; -.br - XtPointer \fIclient_data\fP; -.br - XtPointer \fIcall_data\fP; -.LP -void MenuPopdown(\fIshell_name\fP) -.br - String \fIshell_name\fP; +.HP +void XtPopdown(Widget \fIpopup_shell\fP); +.HP +void XtCallbackPopdown(Widget \fIw\fP, XtPointer \fIclient_data\fP, XtPointer +\fIcall_data\fP); +.HP +void MenuPopdown(String \fIshell_name\fP); .SH ARGUMENTS .IP \fIcall_data\fP 1i Specifies the callback data, diff --git a/man/XtPopup.man b/man/XtPopup.man index e7098ef..4e7d84c 100644 --- a/man/XtPopup.man +++ b/man/XtPopup.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtPopup.man,v 1.3 2003/04/28 22:18:20 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,43 +131,21 @@ .SH NAME XtPopup, XtPopupSpringLoaded, XtCallbackNone, XtCallbackNonexclusive, XtCallbackExclusive \- map a pop-up .SH SYNTAX -void XtPopup(\fIpopup_shell\fP, \fIgrab_kind\fP) -.br - Widget \fIpopup_shell\fP; -.br - XtGrabKind \fIgrab_kind\fP; -.LP -void XtPopupSpringLoaded(\fIpopup_shell\fP) -.br - Widget \fIpopup_shell\fP; -.LP -void XtCallbackNone(\fIw\fP, \fIclient_data\fP, \fIcall_data\fP) -.br - Widget \fIw\fP; -.br - XtPointer \fIclient_data\fP; -.br - XtPointer \fIcall_data\fP; -.LP -void XtCallbackNonexclusive(\fIw\fP, \fIclient_data\fP, \fIcall_data\fP) -.br - Widget \fIw\fP; -.br - XtPointer \fIclient_data\fP; -.br - XtPointer \fIcall_data\fP; -.LP -void XtCallbackExclusive(\fIw\fP, \fIclient_data\fP, \fIcall_data\fP) -.br - Widget \fIw\fP; -.br - XtPointer \fIclient_data\fP; -.br - XtPointer \fIcall_data\fP; -.LP -void MenuPopup(\fIshell_name\fP) -.br - String \fIshell_name\fP; +.HP +void XtPopup(Widget \fIpopup_shell\fP, XtGrabKind \fIgrab_kind\fP); +.HP +void XtPopupSpringLoaded(Widget \fIpopup_shell\fP); +.HP +void XtCallbackNone(Widget \fIw\fP, XtPointer \fIclient_data\fP, XtPointer +\fIcall_data\fP): +.HP +void XtCallbackNonexclusive(Widget \fIw\fP, XtPointer \fIclient_data\fP, +XtPointer \fIcall_data\fP); +.HP +void XtCallbackExclusive(Widget \fIw\fP, XtPointer \fIclient_data\fP, +XtPointer \fIcall_data\fP); +.HP +void MenuPopup(String \fIshell_name\fP); .SH ARGUMENTS .IP \fIcall_data\fP 1i Specifies the callback data, diff --git a/man/XtProcessLock.man b/man/XtProcessLock.man index c273853..26786b6 100644 --- a/man/XtProcessLock.man +++ b/man/XtProcessLock.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtProcLock.man,v 1.3 2003/04/28 22:18:20 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,9 +130,10 @@ .SH NAME XtProcessLock, XtProcessUnlock \- lock and unlock process .SH SYNTAX -void XtProcessLock() -.LP -void XtProcessUnlock() +.HP +void XtProcessLock(void); +.HP +void XtProcessUnlock(void); .SH DESCRIPTION .ZN XtProcessLock is used to lock all process global data. diff --git a/man/XtQueryGeometry.man b/man/XtQueryGeometry.man index c477171..50b9773 100644 --- a/man/XtQueryGeometry.man +++ b/man/XtQueryGeometry.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtQueryGeo.man,v 1.4 2003/04/28 22:18:20 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,12 +131,9 @@ .SH NAME XtQueryGeometry \- query the preferred geometry of a child widget .SH SYNTAX -XtGeometryResult XtQueryGeometry(\fIw\fP, \fIintended\fP, -\fIpreferred_return\fP) -.br - Widget \fIw\fP\^; -.br - XtWidgetGeometry *\fIintended\fP, *\fIpreferred_return\fP\^; +.HP +XtGeometryResult XtQueryGeometry(Widget \fIw\fP\^, XtWidgetGeometry +*\fIintended\fP, XtWidgetGeometry *\fIpreferred_return\fP\^); .SH ARGUMENTS .IP \fIintended\fP 1i Specifies any changes the parent plans to make to the child's geometry or diff --git a/man/XtRealizeWidget.man b/man/XtRealizeWidget.man index e1acf7b..0b03339 100644 --- a/man/XtRealizeWidget.man +++ b/man/XtRealizeWidget.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtRealize.man,v 1.3 2003/04/28 22:18:20 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,17 +131,12 @@ .SH NAME XtRealizeWidget, XtIsRealized, XtUnrealizeWidget \- realize and unrealize widgets .SH SYNTAX -void XtRealizeWidget(\fIw\fP) -.br - Widget \fIw\fP; -.LP -Boolean XtIsRealized(\fIw\fP) -.br - Widget \fIw\fP; -.LP -void XtUnrealizeWidget(\fIw\fP) -.br - Widget \fIw\fP; +.HP +void XtRealizeWidget(Widget \fIw\fP); +.HP +Boolean XtIsRealized(Widget \fIw\fP); +.HP +void XtUnrealizeWidget(Widget \fIw\fP); .SH ARGUMENTS .IP \fIw\fP 1i Specifies the widget. diff --git a/man/XtRegisterDrawable.man b/man/XtRegisterDrawable.man index 5ab8e17..81b087e 100644 --- a/man/XtRegisterDrawable.man +++ b/man/XtRegisterDrawable.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtRegDraw.man,v 1.3 2003/04/28 22:18:20 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,19 +130,11 @@ .SH NAME XtRegisterDrawable \- register a drawable with the Intrisics event dispatcher .SH SYNTAX -void XtRegisterDrawable(\fIdisplay\fP, \fIdrawable\fP, \fIwidget\fP) -.br - Display* \fIdisplay\fP; -.br - Drawable \fIdrawable\fP; -.br - Widget \fIwidget\fP; -.LP -void XtUnregisterDrawable(\fIdisplay\fP, \fIdrawable\fP) -.br - Display* \fIdisplay\fP; -.br - Drawable \fIdrawable\fP; +.HP +void XtRegisterDrawable(Display* \fIdisplay\fP, Drawable \fIdrawable\fP, +Widget \fIwidget\fP); +.HP +void XtUnregisterDrawable(Display* \fIdisplay\fP, Drawable \fIdrawable\fP); .SH ARGUMENTS .IP \fIdisplay\fP 1i Specifies the drawable's display. diff --git a/man/XtRegisterGrabAction.man b/man/XtRegisterGrabAction.man index 8c7c51a..7292960 100644 --- a/man/XtRegisterGrabAction.man +++ b/man/XtRegisterGrabAction.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtRegGA.man,v 1.4 2003/04/28 22:18:20 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,19 +130,10 @@ .SH NAME XtRegisterGrabAction \- register button and key grabs .SH SYNTAX -void XtRegisterGrabAction(\fIaction_proc\fP, \fIowner_events\fP, -\fIevent_mask\fP, \fIpointer_mode\fP, \fIkeyboard_mode\fP) -.br - XtActionProc \fIaction_proc\fP; -.br - Boolean \fIowner_events\fP; -.br - unsigned int \fIevent_mask\fP; -.br - int \fIpointer_mode\fP; -.br - int \fIkeyboard_mode\fP; -.LP +.HP +void XtRegisterGrabAction(XtActionProc \fIaction_proc\fP, Boolean +\fIowner_events\fP, unsigned int \fIevent_mask\fP, int \fIpointer_mode\fP, int +\fIkeyboard_mode\fP); .SH ARGUMENTS .IP \fIaction_proc\fP 1i Specifies the action procedure to search for in translation tables. diff --git a/man/XtReservePropertyAtom.man b/man/XtReservePropertyAtom.man index e76a81a..30bcc88 100644 --- a/man/XtReservePropertyAtom.man +++ b/man/XtReservePropertyAtom.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtResPA.man,v 1.3 2003/04/28 22:18:20 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,15 +130,10 @@ .SH NAME XtReservePropertyAtom, XtReleasePropertyAtom \- maintain a cache of property atoms .SH SYNTAX -Widget XtReservePropertyAtom(\fIw\fP) -.br - Widget \fIw\fP; -.LP -void XtReleasePropertyAtome(\fIw\fP, \fIatom\fP) -.br - Widget \fIw\fP; -.br - Atom \fIatom\fP; +.HP +Widget XtReservePropertyAtom(Widget \fIw\fP); +.HP +void XtReleasePropertyAtome(Widget \fIw\fP, Atom \fIatom\fP); .SH ARGUMENTS .IP \fIw\fP 1i Specifies the widget used to reserve the atom. diff --git a/man/XtResolvePathname.man b/man/XtResolvePathname.man index 6123c49..132aee7 100644 --- a/man/XtResolvePathname.man +++ b/man/XtResolvePathname.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtResPath.man,v 1.5 2003/04/28 22:18:20 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,18 +130,11 @@ .SH NAME XtResolvePathname \- search for a file using standard substitution .SH SYNTAX -String XtResolvePathname(\fIdisplay\fP, \fItype\fP, \fIfilename\fP, \fIsuffix\fP, -\fIpath\fP, \fIsubstitutions\fP, \fInum_substitutions\fP, \fIpredicate\fP) -.br - Display *\fIdisplay\fP; -.br - String \fItype\fP, \fIfilename\fP, \fIsuffix\fP, \fIpath\fP; -.br - Substitution \fIsubstitutions\fP; -.br - Cardinal \fInum_substitutions\fP; -.br - XtFilePredicate \fIpredicate\fP; +.HP +String XtResolvePathname(Display *\fIdisplay\fP, String \fItype\fP, String +\fIfilename\fP, String \fIsuffix\fP, String \fIpath\fP, Substitution +\fIsubstitutions\fP, Cardinal \fInum_substitutions\fP, XtFilePredicate +\fIpredicate\fP); .SH ARGUMENTS .IP \fIdisplay\fP 1.2i Specifies the display to use to find the language for language substitutions. diff --git a/man/XtSessionGetToken.man b/man/XtSessionGetToken.man index ee81e57..ec111d9 100644 --- a/man/XtSessionGetToken.man +++ b/man/XtSessionGetToken.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtSession.man,v 1.3 2003/04/28 22:18:20 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,15 +131,10 @@ .SH NAME XtSessionGetToken, XtSessionReturnToken \- token management for checkpointing .SH SYNTAX -XtCheckpointToken XtSessionGetToken(\fIw\fP, \fItype\fP) -.br - Widget \fIw\fP; -.br - int \fItype\fP; -.LP -void XtSessionReturntoken(\fItoken\fP) -.br - XtCheckpointToken \fItoken\fP; +.HP +XtCheckpointToken XtSessionGetToken(Widget \fIw\fP, int \fItype\fP); +.HP +void XtSessionReturntoken(XtCheckpointToken \fItoken\fP); .SH ARGUMENTS .IP \fIw\fP 1i Specifies the session widget. diff --git a/man/XtSetArg.man b/man/XtSetArg.man index 01fcd6d..e09f2f2 100644 --- a/man/XtSetArg.man +++ b/man/XtSetArg.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtSetArg.man,v 1.4 2003/04/28 22:18:20 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,24 +131,11 @@ .SH NAME XtSetArg, XtMergeArgLists \- set and merge ArgLists .SH SYNTAX -XtSetArg(\fIarg\fP, \fIname\fP, \fIvalue\fP) -.br - Arg \fIarg\fP; -.br - String \fIname\fP; -.br - XtArgVal \fIvalue\fP; -.LP -ArgList XtMergeArgLists(\fIargs1\fP, \fInum_args1\fP, \fIargs2\fP, -\fInum_args2\fP) -.br - ArgList \fIargs1\fP; -.br - Cardinal \fInum_args1\fP; -.br - ArgList \fIargs2\fP; -.br - Cardinal \fInum_args2\fP; +.HP +int XtSetArg(Arg \fIarg\fP, String \fIname\fP, XtArgVal \fIvalue\fP); +.HP +ArgList XtMergeArgLists(ArgList \fIargs1\fP, Cardinal \fInum_args1\fP, ArgList +\fIargs2\fP, Cardinal \fInum_args2\fP); .SH ARGUMENTS .IP \fIarg\fP 1i Specifies the name-value pair to set. diff --git a/man/XtSetKeyTranslator.man b/man/XtSetKeyTranslator.man index e68b454..6a8b238 100644 --- a/man/XtSetKeyTranslator.man +++ b/man/XtSetKeyTranslator.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtSetKTr.man,v 1.4 2003/04/28 22:18:21 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,45 +131,18 @@ .SH NAME XtSetKeyTranslator, XtTranslateKeycode, XtRegisterCaseConverter, XtConvertCase \- convert KeySym to KeyCodes .SH SYNTAX -void XtSetKeyTranslator(\fIdisplay\fP, \fIproc\fP) -.br - Display *\fIdisplay\fP; -.br - XtKeyProc \fIproc\fP; -.LP -void XtTranslateKeycode(\fIdisplay\fP, \fIkeycode\fP, \fImodifiers\fP, -\fImodifiers_return\fP, \fIkeysym_return\fP) -.br - Display *\fIdisplay\fP; -.br - KeyCode \fIkeycode\fP; -.br - Modifiers \fImodifiers\fP; -.br - Modifiers *\fImodifiers_return\fP; -.br - KeySym *\fIkeysym_return\fP; -.LP -void XtRegisterCaseConverter(\fIdisplay\fP, \fIproc\fP, \fIstart\fP, \fIstop\fP) -.br - Display *\fIdisplay\fP; -.br - XtCaseProc \fIproc\fP; -.br - KeySym \fIstart\fP; -.br - KeySym \fIstop\fP; -.LP -void XtConvertCase(\fIdisplay\fP, \fIkeysym\fP, \fIlower_return\fP, -\fIupper_return\fP) -.br - Display *\fIdisplay\fP; -.br - KeySym \fIkeysym\fP; -.br - KeySym *\fIlower_return\fP; -.br - KeySym *\fIupper_return\fP; +.HP +void XtSetKeyTranslator(Display *\fIdisplay\fP, XtKeyProc \fIproc\fP); +.HP +void XtTranslateKeycode(Display *\fIdisplay\fP, KeyCode \fIkeycode\fP, +Modifiers \fImodifiers\fP, Modifiers *\fImodifiers_return\fP, KeySym +*\fIkeysym_return\fP); +.HP +void XtRegisterCaseConverter(Display *\fIdisplay\fP, XtCaseProc \fIproc\fP, +KeySym \fIstart\fP, KeySym \fIstop\fP); +.HP +void XtConvertCase(Display *\fIdisplay\fP, KeySym \fIkeysym\fP, KeySym +*\fIlower_return\fP, KeySym *\fIupper_return\fP); .SH ARGUMENTS .ds Di .IP \fIdisplay\fP 1i diff --git a/man/XtSetKeyboardFocus.man b/man/XtSetKeyboardFocus.man index 94c6e6c..61eb4ff 100644 --- a/man/XtSetKeyboardFocus.man +++ b/man/XtSetKeyboardFocus.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtSetKFoc.man,v 1.4 2003/04/28 22:18:21 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,9 +131,8 @@ .SH NAME XtSetKeyboardFocus \- focus events on a child widget .SH SYNTAX -XtSetKeyboardFocus(\fIsubtree\fP, \fIdescendant\fP) -.br - Widget \fIsubtree\fP, \fIdescendant\fP; +.HP +XtSetKeyboardFocus(Widget \fIsubtree\fP, Widget \fIdescendant\fP); .SH ARGUMENTS .IP \fIsubtree\fP 1i Specifies either the widget in the subtree structure which is to receive the diff --git a/man/XtSetLanguageProc.man b/man/XtSetLanguageProc.man index b4aa336..b39e5d7 100644 --- a/man/XtSetLanguageProc.man +++ b/man/XtSetLanguageProc.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtSetLangP.man,v 1.4 2003/05/29 21:48:05 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,13 +131,9 @@ .SH NAME XtSetLanguageProc \- set the language procedure .SH SYNTAX -Widget XtSetLanguageProc(\fIapp_context\fP, \fIproc\fP, \fIclient_data\fP) -.br - XtAppContext \fIapp_context\fP; -.br - XtLanguageProc \fIproc\fP; -.br - XtPointer \fIclient_data\fP; +.HP +Widget XtSetLanguageProc(XtAppContext \fIapp_context\fP, XtLanguageProc +\fIproc\fP, XtPointer \fIclient_data\fP); .SH ARGUMENTS .IP \fIapp_context\fP 1i Specifies the application context in which the language procedure @@ -163,9 +159,9 @@ returns the previously registered language procedure. If a language procedure has not yet been registered, the return value is unspecified but if this return value is used in a subsequent call to .ZN XtSetLanguageProc , -it will bcause the default language procedure to be registered. +it will because the default language procedure to be registered. .LP -The default language procdure does the following: +The default language procedure does the following: .IP \(bu 5 Sets the locale according to the environment. On ANSI C-based systems this is done by calling diff --git a/man/XtSetMultiClickTime.man b/man/XtSetMultiClickTime.man index 31b3346..213f424 100644 --- a/man/XtSetMultiClickTime.man +++ b/man/XtSetMultiClickTime.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtClickT.man,v 1.3 2003/04/28 22:18:18 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,15 +130,10 @@ .SH NAME XtSetMultiClickTime, XtGetMultiClickTime \- set and get multi-click times .SH SYNTAX -void XtSetMultiClickTime(\fIdisplay\fP, \fItime\fP) -.br - Display* \fIdisplay\fP; -.br - int \fItime\fP; -.LP -int XtGetMultiClickTime(\fIdisplay\fP) -.br - Display* \fIdisplay\fP; +.HP +void XtSetMultiClickTime(Display* \fIdisplay\fP, int \fItime\fP); +.HP +int XtGetMultiClickTime(Display* \fIdisplay\fP); .SH ARGUMENTS .IP \fIdisplay\fP 1i Specifies the display connection. diff --git a/man/XtSetSelectionParameters.man b/man/XtSetSelectionParameters.man index 4f3d574..ddd865d 100644 --- a/man/XtSetSelectionParameters.man +++ b/man/XtSetSelectionParameters.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtSetSP.man,v 1.5 2003/05/29 21:48:05 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,24 +130,13 @@ .SH NAME XtSetSelectionParameters \- specify target parameters for a selection request with a single target .SH SYNTAX -void XtSetSelectionParameters(\fIrequestor\fP, \fIselection\fP, \fItype\fP, -\fIvalue\fP, \fIlength\fP, \fIformat\fP) -.br - Widget \fIrequestor\fP; -.br - Atom \fIselection\fP; -.br - Atom \fItype\fP; -.br - XtPointer \fIvalue\fP; -.br - unsigned long \fIlength\fP; -.br - int \fIformat\fP; -.LP +.HP +void XtSetSelectionParameters(Widget \fIrequestor\fP, Atom \fIselection\fP, +Atom \fItype\fP, XtPointer \fIvalue\fP, unsigned long \fIlength\fP, int +\fIformat\fP); .SH ARGUMENTS .IP \fIrequestor\fP 1i -Specifies the widget making the request. Must be of clase Core or any +Specifies the widget making the request. Must be of class Core or any subclass thereof. .IP \fIselection\fP 1i Specifies the atom that names the selection. diff --git a/man/XtSetSensitive.man b/man/XtSetSensitive.man index 52cce8e..a90363a 100644 --- a/man/XtSetSensitive.man +++ b/man/XtSetSensitive.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtSetSens.man,v 1.3 2003/04/28 22:18:21 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,15 +131,10 @@ .SH NAME XtSetSensitive, XtIsSensitive \- set and check a widget's sensitivity state .SH SYNTAX -void XtSetSensitive(\fIw\fP, \fIsensitive\fP) -.br - Widget \fIw\fP; -.br - Boolean \fIsensitive\fP; -.LP -Boolean XtIsSensitive(\fIw\fP) -.br - Widget \fIw\fP; +.HP +void XtSetSensitive(Widget \fIw\fP, Boolean \fIsensitive\fP); +.HP +Boolean XtIsSensitive(Widget \fIw\fP); .SH ARGUMENTS .IP \fIsensitive\fP 1i Specifies a Boolean value that indicates whether the widget should receive diff --git a/man/XtSetValues.man b/man/XtSetValues.man index ab60b44..141e0a2 100644 --- a/man/XtSetValues.man +++ b/man/XtSetValues.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtSetVal.man,v 1.4 2003/04/28 22:18:21 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,71 +130,26 @@ .SH NAME XtSetValues, XtVaSetValues, XtSetSubvalues, XtVaSetSubvalues, XtGetValues, XtVaGetValues, XtGetSubvalues, XtVaGetSubvalues \- obtain and set widget resources .SH SYNTAX -void XtSetValues(\fIw\fP, \fIargs\fP, \fInum_args\fP) -.br - Widget \fIw\fP; -.br - ArgList \fIargs\fP; -.br - Cardinal \fInum_args\fP; -.LP -void XtVaSetValues(\fIw\fP, \fI...\fP) -.br - Widget \fIw\fP; -.LP -void XtSetSubvalues(\fIbase\fP, \fIresources\fP, \fInum_resources\fP, -\fIargs\fP, \fInum_args\fP) -.br - XtPointer \fIbase\fP; -.br - XtResourceList \fIresources\fP; -.br - Cardinal \fInum_resources\fP; -.br - ArgList \fIargs\fP; -.br - Cardinal \fInum_args\fP; -.LP -void XtVaSetSubvalues(\fIbase\fP, \fIresources\fP, \fInum_resources\fP, \fI...\fP) -.br - XtPointer \fIbase\fP; -.br - XtResourceList \fIresources\fP; -.br - Cardinal \fInum_resources\fP; -.LP -void XtGetValues(\fIw\fP, \fIargs\fP, \fInum_args\fP) -.br - Widget \fIw\fP; -.br - ArgList \fIargs\fP; -.br - Cardinal \fInum_args\fP; -.LP -void XtVaGetValues(\fIw\fP, \fI...\fP) -.br - Widget \fIw\fP; -.LP -void XtGetSubvalues(\fIbase\fP, \fIresources\fP, \fInum_resources\fP, -\fIargs\fP, \fInum_args\fP) -.br - XtPointer \fIbase\fP; -.br - XtResourceList \fIresources\fP; -.br - Cardinal \fInum_resources\fP; -.br - ArgList \fIargs\fP; -.br - Cardinal \fInum_args\fP; -.LP -void XtVaGetSubvalues(\fIbase\fP, \fIresources\fP, \fInum_resources\fP, \fI...\fP) -.br - XtPointer \fIbase\fP; -.br - XtResourceList \fIresources\fP; -.br - Cardinal \fInum_resources\fP; +.HP +void XtSetValues(Widget \fIw\fP, ArgList \fIargs\fP, Cardinal \fInum_args\fP); +.HP +void XtVaSetValues(Widget \fIw\fP, ...\^); +.HP +void XtSetSubvalues(XtPointer \fIbase\fP, XtResourceList \fIresources\fP, +Cardinal \fInum_resources\fP, ArgList \fIargs\fP, Cardinal \fInum_args\fP); +.HP +void XtVaSetSubvalues(XtPointer \fIbase\fP, XtResourceList \fIresources\fP, +Cardinal \fInum_resources\fP, ...\^); +.HP +void XtGetValues(Widget \fIw\fP, ArgList \fIargs\fP, Cardinal \fInum_args\fP); +.HP +void XtVaGetValues(Widget \fIw\fP, ...\^); +.HP +void XtGetSubvalues(XtPointer \fIbase\fP, XtResourceList \fIresources\fP, +Cardinal \fInum_resources\fP, ArgList \fIargs\fP, Cardinal \fInum_args\fP); +.HP +void XtVaGetSubvalues(XtPointer \fIbase\fP, XtResourceList \fIresources\fP, +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 diff --git a/man/XtSetWMColormapWindows.man b/man/XtSetWMColormapWindows.man index df10a4e..a76950a 100644 --- a/man/XtSetWMColormapWindows.man +++ b/man/XtSetWMColormapWindows.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtSetWMC.man,v 1.3 2003/04/28 22:18:21 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,13 +130,9 @@ .SH NAME XtSetWMColormapWindows \- Set the value of the WM_COLORMAP_WINDOWS property .SH SYNTAX -void XtSetWMColormapWindows(\fIwidget\fP, \fIlist\fP, \fIcount\fP) -.br - Widget \fIwidget\fP; -.br - Widget* \fIlist\fP; -.br - Cardinal \fIcount\fP; +.HP +void XtSetWMColormapWindows(Widget \fIwidget\fP, Widget* \fIlist\fP, Cardinal +\fIcount\fP); .SH ARGUMENTS .IP \fIwidget\fP 1i Specifies the widget on whose window the WM_COLORMAP_WINDOWS property diff --git a/man/XtStringConversionWarning.man b/man/XtStringConversionWarning.man index 1eadc7d..d64daa9 100644 --- a/man/XtStringConversionWarning.man +++ b/man/XtStringConversionWarning.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtStrCW.man,v 1.3 2003/04/28 22:18:21 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,9 +131,8 @@ .SH NAME XtStringConversionWarning \- issue a conversion warning message .SH SYNTAX -void XtStringConversionWarning(\fIsrc\fP, \fIdst_type\fP) -.br - String \fIsrc\fP, \fIdst_type\fP; +.HP +void XtStringConversionWarning(String \fIsrc\fP, String \fIdst_type\fP); .SH ARGUMENTS .IP \fIsrc\fP 1i Specifies the string that could not be converted. diff --git a/man/XtToolkitThreadInitialize.man b/man/XtToolkitThreadInitialize.man index a1b243c..81e56af 100644 --- a/man/XtToolkitThreadInitialize.man +++ b/man/XtToolkitThreadInitialize.man @@ -25,7 +25,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtThreadI.man,v 1.3 2003/04/28 22:18:21 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -130,7 +130,8 @@ .SH NAME XtToolkitThreadInitialize \- initialize the toolkit for multiple threads .SH SYNTAX -Boolean XtToolkitThreadInitialize() +.HP +Boolean XtToolkitThreadInitialize(void); .SH DESCRIPTION If .ZN XtToolkitThreadInitialize diff --git a/man/XtTranslateCoords.man b/man/XtTranslateCoords.man index c82281d..9f40854 100644 --- a/man/XtTranslateCoords.man +++ b/man/XtTranslateCoords.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtTransC.man,v 1.4 2003/04/28 22:18:21 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,14 +131,9 @@ .SH NAME XtTranslateCoords \- translate widget coordinates .SH SYNTAX -void XtTranslateCoords(\fIw\fP, \fIx\fP, \fIy\fP, \fIrootx_return\fP, -\fIrooty_return\fP) -.br - Widget \fIw\fP; -.br - Position \fIx\fP, \fIy\fP; -.br - Position *\fIrootx_return\fP, *\fIrooty_return\fP; +.HP +void XtTranslateCoords(Widget \fIw\fP, Position \fIx\fP, \fIy\fP, Position +*\fIrootx_return\fP, *\fIrooty_return\fP); .SH ARGUMENTS .IP \fIrootx_return\fP 1i .br diff --git a/man/XtVaCreateArgsList.man b/man/XtVaCreateArgsList.man index c4fb01f..e990593 100644 --- a/man/XtVaCreateArgsList.man +++ b/man/XtVaCreateArgsList.man @@ -26,7 +26,7 @@ .\" 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 $ +.\" $XFree86: xc/doc/man/Xt/XtVaCrArgL.man,v 1.3 2003/04/28 22:18:21 herrb Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -131,10 +131,8 @@ .SH NAME XtVaCreateArgsList \- dynamically allocate a varargs list .SH SYNTAX -XtVarArgsList XtVaCreateArgsList(\fIunused\fP, \fI...\fP) -.br - XtPointer \fIunused\fP; -.LP +.HP +XtVarArgsList XtVaCreateArgsList(XtPointer \fIunused\fP, ...\^); .SH ARGUMENTS .IP \fIunused\fP 1i Must be specified as NULL. diff --git a/src/Callback.c b/src/Callback.c index 84129a2..fb03874 100644 --- a/src/Callback.c +++ b/src/Callback.c @@ -58,7 +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 $ */ +/* $XFree86: xc/lib/Xt/Callback.c,v 1.9 2003/04/21 16:34:26 herrb Exp $ */ #include "IntrinsicI.h" @@ -144,20 +144,12 @@ void _XtAddCallbackOnce(callbacks, callback, closure) _XtAddCallback(callbacks, callback, closure); } /* _XtAddCallbackOnce */ -#if NeedFunctionPrototypes void XtAddCallback( Widget widget, _Xconst char* name, XtCallbackProc callback, XtPointer closure ) -#else -void XtAddCallback(widget, name, callback, closure) - Widget widget; - String name; - XtCallbackProc callback; - XtPointer closure; -#endif { InternalCallbackList *callbacks; Widget hookobj; @@ -222,18 +214,11 @@ static void AddCallbacks( *cl++ = *newcallbacks++; } /* AddCallbacks */ -#if NeedFunctionPrototypes void XtAddCallbacks( Widget widget, _Xconst char* name, XtCallbackList xtcallbacks ) -#else -void XtAddCallbacks(widget, name, xtcallbacks) - Widget widget; - String name; - XtCallbackList xtcallbacks; -#endif { InternalCallbackList* callbacks; Widget hookobj; @@ -320,20 +305,12 @@ void _XtRemoveCallback (callbacks, callback, closure) } } /* _XtRemoveCallback */ -#if NeedFunctionPrototypes void XtRemoveCallback ( Widget widget, _Xconst char* name, XtCallbackProc callback, XtPointer closure ) -#else -void XtRemoveCallback (widget, name, callback, closure) - Widget widget; - String name; - XtCallbackProc callback; - XtPointer closure; -#endif { InternalCallbackList *callbacks; Widget hookobj; @@ -365,17 +342,10 @@ void XtRemoveCallback (widget, name, callback, closure) } /* XtRemoveCallback */ -#if NeedFunctionPrototypes void XtRemoveCallbacks (widget, name, xtcallbacks) Widget widget; _Xconst char* name; XtCallbackList xtcallbacks; -#else -void XtRemoveCallbacks (widget, name, xtcallbacks) - Widget widget; - String name; - XtCallbackList xtcallbacks; -#endif { InternalCallbackList *callbacks; Widget hookobj; @@ -461,15 +431,9 @@ void _XtRemoveAllCallbacks (callbacks) } } /* _XtRemoveAllCallbacks */ -#if NeedFunctionPrototypes void XtRemoveAllCallbacks(widget, name) Widget widget; _Xconst char* name; -#else -void XtRemoveAllCallbacks(widget, name) - Widget widget; - String name; -#endif { InternalCallbackList *callbacks; Widget hookobj; @@ -560,18 +524,11 @@ XtCallbackList _XtGetCallbackList(callbacks) return ToList(icl); } -#if NeedFunctionPrototypes void XtCallCallbacks( Widget widget, _Xconst char* name, XtPointer call_data ) -#else -void XtCallCallbacks(widget, name, call_data) - Widget widget; - String name; - XtPointer call_data; -#endif { InternalCallbackList *callbacks; InternalCallbackList icl; @@ -616,16 +573,10 @@ void XtCallCallbacks(widget, name, call_data) } /* XtCallCallbacks */ -#if NeedFunctionPrototypes XtCallbackStatus XtHasCallbacks( Widget widget, _Xconst char* callback_name ) -#else -XtCallbackStatus XtHasCallbacks(widget, callback_name) - Widget widget; - String callback_name; -#endif { InternalCallbackList *callbacks; XtCallbackStatus retval = XtCallbackHasSome; diff --git a/src/Convert.c b/src/Convert.c index 544eb80..256240c 100644 --- a/src/Convert.c +++ b/src/Convert.c @@ -32,7 +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 $ */ +/* $XFree86: xc/lib/Xt/Convert.c,v 3.8 2003/04/21 16:34:26 herrb Exp $ */ /* @@ -171,7 +171,6 @@ typedef CachePtr CacheHashTable[CACHEHASHSIZE]; static CacheHashTable cacheHashTable; -#if NeedFunctionPrototypes void _XtTableAddConverter( ConverterTable table, XrmRepresentation from_type, @@ -183,19 +182,6 @@ void _XtTableAddConverter( XtCacheType cache_type, XtDestructor destructor, _XtBoolean global) -#else -void _XtTableAddConverter(table, from_type, to_type, converter, convert_args, - num_args, new_style, cache_type, destructor, global) - ConverterTable table; - XrmRepresentation from_type, to_type; - XtTypeConverter converter; - XtConvertArgList convert_args; - Cardinal num_args; - Boolean new_style; - XtCacheType cache_type; - XtDestructor destructor; - Boolean global; -#endif { register ConverterPtr *pp; register ConverterPtr p; @@ -234,7 +220,6 @@ void _XtTableAddConverter(table, from_type, to_type, converter, convert_args, } } -#if NeedFunctionPrototypes void XtSetTypeConverter( register _Xconst char* from_type, register _Xconst char* to_type, @@ -244,15 +229,6 @@ void XtSetTypeConverter( XtCacheType cache_type, XtDestructor destructor ) -#else -void XtSetTypeConverter(from_type, to_type, converter, convert_args, num_args, cache_type, destructor) - register String from_type, to_type; - XtTypeConverter converter; - XtConvertArgList convert_args; - Cardinal num_args; - XtCacheType cache_type; - XtDestructor destructor; -#endif { ProcessContext process; XtAppContext app; @@ -281,7 +257,6 @@ void XtSetTypeConverter(from_type, to_type, converter, convert_args, num_args, c UNLOCK_PROCESS; } -#if NeedFunctionPrototypes void XtAppSetTypeConverter( XtAppContext app, register _Xconst char* from_type, @@ -292,16 +267,6 @@ void XtAppSetTypeConverter( XtCacheType cache_type, XtDestructor destructor ) -#else -void XtAppSetTypeConverter(app, from_type, to_type, converter, convert_args, num_args, cache_type, destructor) - XtAppContext app; - register String from_type, to_type; - XtTypeConverter converter; - XtConvertArgList convert_args; - Cardinal num_args; - XtCacheType cache_type; - XtDestructor destructor; -#endif { LOCK_PROCESS; _XtTableAddConverter(app->converterTable, @@ -313,7 +278,6 @@ void XtAppSetTypeConverter(app, from_type, to_type, converter, convert_args, num } /* old interface */ -#if NeedFunctionPrototypes void XtAddConverter( register _Xconst char* from_type, register _Xconst char* to_type, @@ -321,13 +285,6 @@ void XtAddConverter( XtConvertArgList convert_args, Cardinal num_args ) -#else -void XtAddConverter(from_type, to_type, converter, convert_args, num_args) - register String from_type, to_type; - XtConverter converter; - XtConvertArgList convert_args; - Cardinal num_args; -#endif { ProcessContext process; XtAppContext app; @@ -358,7 +315,6 @@ void XtAddConverter(from_type, to_type, converter, convert_args, num_args) } /* old interface */ -#if NeedFunctionPrototypes void XtAppAddConverter( XtAppContext app, register _Xconst char* from_type, @@ -367,14 +323,6 @@ void XtAppAddConverter( XtConvertArgList convert_args, Cardinal num_args ) -#else -void XtAppAddConverter(app, from_type, to_type, converter, convert_args, num_args) - XtAppContext app; - register String from_type, to_type; - XtConverter converter; - XtConvertArgList convert_args; - Cardinal num_args; -#endif { LOCK_PROCESS; _XtTableAddConverter(app->converterTable, @@ -992,7 +940,6 @@ Boolean _XtConvert(widget, from_type, from, to_type, to, cache_ref_return) return False; } -#if NeedFunctionPrototypes void XtConvert( Widget widget, _Xconst char* from_type_str, @@ -1000,14 +947,6 @@ void XtConvert( _Xconst char* to_type_str, XrmValuePtr to ) -#else -void XtConvert(widget, from_type_str, from, to_type_str, to) - Widget widget; - String from_type_str; - XrmValuePtr from; - String to_type_str; - XrmValuePtr to; -#endif { XrmQuark from_type, to_type; WIDGET_TO_APPCON(widget); @@ -1036,7 +975,6 @@ void XtConvert(widget, from_type_str, from, to_type_str, to) UNLOCK_APP(app); } -#if NeedFunctionPrototypes Boolean XtConvertAndStore( Widget object, _Xconst char* from_type_str, @@ -1044,14 +982,6 @@ Boolean XtConvertAndStore( _Xconst char* to_type_str, XrmValuePtr to ) -#else -Boolean XtConvertAndStore(object, from_type_str, from, to_type_str, to) - Widget object; - String from_type_str; - XrmValuePtr from; - String to_type_str; - XrmValuePtr to; -#endif { XrmQuark from_type, to_type; WIDGET_TO_APPCON(object); diff --git a/src/Converters.c b/src/Converters.c index 95a88e0..801279a 100644 --- a/src/Converters.c +++ b/src/Converters.c @@ -32,7 +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 $ */ +/* $XFree86: xc/lib/Xt/Converters.c,v 3.15 2003/05/27 22:26:42 tsi Exp $ */ /* @@ -171,17 +171,11 @@ void _XtConvertInitialize() return True; \ } -#if NeedFunctionPrototypes void XtDisplayStringConversionWarning( Display* dpy, _Xconst char* from, _Xconst char* toType ) -#else -void XtDisplayStringConversionWarning(dpy, from, toType) - Display* dpy; - String from, toType; -#endif { #ifndef NO_MIT_HACKS /* Allow suppression of conversion warnings. %%% Not specified. */ @@ -238,15 +232,10 @@ void XtDisplayStringConversionWarning(dpy, from, toType) UNLOCK_APP(app); } -#if NeedFunctionPrototypes void XtStringConversionWarning( _Xconst char* from, _Xconst char* toType ) -#else -void XtStringConversionWarning(from, toType) - String from, toType; -#endif { String params[2]; Cardinal num_params = 2; @@ -1645,7 +1634,7 @@ Boolean XtCvtStringToCommandArgArray(dpy, args, num_args, fromVal, toVal, XtPointer *closure_ret; { String *strarray, *ptr; - char *src, *src_str; + char *src; char *dst, *dst_str; char *start; int tokens, len; @@ -1656,7 +1645,7 @@ Boolean XtCvtStringToCommandArgArray(dpy, args, num_args, fromVal, toVal, "String to CommandArgArray conversion needs no extra arguments", (String *)NULL, (Cardinal *)NULL); - src = src_str = fromVal->addr; + src = fromVal->addr; dst = dst_str = __XtMalloc((unsigned) strlen(src) + 1); tokens = 0; diff --git a/src/Create.c b/src/Create.c index a172e52..6a95016 100644 --- a/src/Create.c +++ b/src/Create.c @@ -32,7 +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 $ */ +/* $XFree86: xc/lib/Xt/Create.c,v 3.11 2003/04/21 16:34:26 herrb Exp $ */ /* @@ -563,7 +563,6 @@ _XtCreateWidget( return (widget); } -#if NeedFunctionPrototypes Widget XtCreateWidget( _Xconst char* name, @@ -572,15 +571,6 @@ XtCreateWidget( ArgList args, Cardinal num_args ) -#else -Widget -XtCreateWidget(name, widget_class, parent, args, num_args) - String name; - WidgetClass widget_class; - Widget parent; - ArgList args; - Cardinal num_args; -#endif { Widget retval; WIDGET_TO_APPCON(parent); @@ -593,7 +583,6 @@ XtCreateWidget(name, widget_class, parent, args, num_args) } -#if NeedFunctionPrototypes Widget XtCreateManagedWidget( _Xconst char* name, @@ -602,15 +591,6 @@ XtCreateManagedWidget( ArgList args, Cardinal num_args ) -#else -Widget -XtCreateManagedWidget(name, widget_class, parent, args, num_args) - String name; - WidgetClass widget_class; - Widget parent; - ArgList args; - Cardinal num_args; -#endif { register Widget widget; WIDGET_TO_APPCON(parent); @@ -673,7 +653,6 @@ _XtCreatePopupShell(name, widget_class, parent, args, num_args, return(widget); } -#if NeedFunctionPrototypes Widget XtCreatePopupShell( _Xconst char* name, @@ -682,15 +661,6 @@ XtCreatePopupShell( ArgList args, Cardinal num_args ) -#else -Widget -XtCreatePopupShell(name, widget_class, parent, args, num_args) - String name; - WidgetClass widget_class; - Widget parent; - ArgList args; - Cardinal num_args; -#endif { Widget retval; WIDGET_TO_APPCON(parent); @@ -736,7 +706,6 @@ _XtAppCreateShell(name, class, widget_class, display, args, num_args, return shell; } -#if NeedFunctionPrototypes Widget XtAppCreateShell( _Xconst char* name, @@ -746,15 +715,6 @@ XtAppCreateShell( ArgList args, Cardinal num_args ) -#else -Widget -XtAppCreateShell(name, class, widget_class, display, args, num_args) - String name, class; - WidgetClass widget_class; - Display *display; - ArgList args; - Cardinal num_args; -#endif { Widget retval; DPY_TO_APPCON(display); @@ -767,7 +727,6 @@ XtAppCreateShell(name, class, widget_class, display, args, num_args) } /* ARGSUSED */ -#if NeedFunctionPrototypes Widget XtCreateApplicationShell( _Xconst char* name, /* unused in R3 and later */ @@ -775,14 +734,6 @@ XtCreateApplicationShell( ArgList args, Cardinal num_args ) -#else -Widget -XtCreateApplicationShell(name, widget_class, args, num_args) - String name; /* unused in R3 and later */ - WidgetClass widget_class; - ArgList args; - Cardinal num_args; -#endif { Widget retval; Display* dpy; diff --git a/src/Display.c b/src/Display.c index d5f8157..f39bb83 100644 --- a/src/Display.c +++ b/src/Display.c @@ -32,7 +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 $ */ +/* $XFree86: xc/lib/Xt/Display.c,v 3.16 2003/04/21 16:34:26 herrb Exp $ */ /* @@ -230,7 +230,6 @@ static XtPerDisplay InitPerDisplay(dpy, app, name, classname) return pd; } -#if NeedFunctionPrototypes Display *XtOpenDisplay( XtAppContext app, _Xconst char* displayName, @@ -241,16 +240,6 @@ Display *XtOpenDisplay( int *argc, String *argv ) -#else -Display *XtOpenDisplay(app, displayName, applName, className, - urlist, num_urs, argc, argv) - XtAppContext app; - String displayName, applName, className; - XrmOptionDescRec *urlist; - Cardinal num_urs; - int *argc; - String *argv; -#endif { Display *d; XrmDatabase db = 0; @@ -353,7 +342,6 @@ String **argv_in_out, * fallback_resources; return dpy; } -#if NeedFunctionPrototypes void XtDisplayInitialize( XtAppContext app, @@ -365,17 +353,6 @@ XtDisplayInitialize( int *argc, String *argv ) -#else -void -XtDisplayInitialize(app, dpy, name, classname, urlist, num_urs, argc, argv) - XtAppContext app; - Display *dpy; - String name, classname; - XrmOptionDescRec *urlist; - Cardinal num_urs; - int *argc; - String *argv; -#endif { XtPerDisplay pd; XrmDatabase db = 0; @@ -457,26 +434,16 @@ XtAppContext XtCreateApplicationContext() return app; } -#if NeedFunctionPrototypes void XtAppSetExitFlag ( XtAppContext app) -#else -void XtAppSetExitFlag (app) - XtAppContext app; -#endif { LOCK_APP(app); app->exit_flag = TRUE; UNLOCK_APP(app); } -#if NeedFunctionPrototypes Boolean XtAppGetExitFlag ( XtAppContext app) -#else -Boolean XtAppGetExitFlag (app) - XtAppContext app; -#endif { Boolean retval; LOCK_APP(app); @@ -726,13 +693,8 @@ void XtCloseDisplay(dpy) UNLOCK_APP(app); } -#if NeedFunctionPrototypes void _XtCloseDisplays( XtAppContext app) -#else -void _XtCloseDisplays(app) - XtAppContext app; -#endif { int i; @@ -768,13 +730,8 @@ void XtGetApplicationNameAndClass(dpy, name_return, class_return) *class_return = XrmQuarkToString(pd->class); } -#if NeedFunctionPrototypes XtPerDisplay _XtGetPerDisplay ( Display* display) -#else -XtPerDisplay _XtGetPerDisplay (display) - Display* display; -#endif { XtPerDisplay retval; @@ -787,13 +744,8 @@ XtPerDisplay _XtGetPerDisplay (display) return retval; } -#if NeedFunctionPrototypes XtPerDisplayInputRec* _XtGetPerDisplayInput( Display* display) -#else -XtPerDisplayInputRec* _XtGetPerDisplayInput(display) - Display* display; -#endif { XtPerDisplayInputRec* retval; LOCK_PROCESS; @@ -805,17 +757,10 @@ XtPerDisplayInputRec* _XtGetPerDisplayInput(display) return retval; } -#if NeedFunctionPrototypes void XtGetDisplays( XtAppContext app_context, Display*** dpy_return, Cardinal* num_dpy_return) -#else -void XtGetDisplays(app_context, dpy_return, num_dpy_return) - XtAppContext app_context; - Display*** dpy_return; - Cardinal* num_dpy_return; -#endif { int ii; LOCK_APP(app_context); diff --git a/src/Error.c b/src/Error.c index 5dc5224..498ddfd 100644 --- a/src/Error.c +++ b/src/Error.c @@ -32,7 +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 $ */ +/* $XFree86: xc/lib/Xt/Error.c,v 3.14 2003/05/27 22:26:42 tsi Exp $ */ /* @@ -84,7 +84,7 @@ static XtErrorHandler errorHandler = _XtDefaultError; static XtErrorHandler warningHandler = _XtDefaultWarning; #endif /* GLOBALERRORS */ -XrmDatabase *XtGetErrorDatabase() +XrmDatabase *XtGetErrorDatabase(void) { XrmDatabase* retval; #if GLOBALERRORS @@ -113,22 +113,13 @@ XrmDatabase *XtAppGetErrorDatabase(app) return retval; } -#if NeedFunctionPrototypes void XtGetErrorDatabaseText( register _Xconst char* name, register _Xconst char* type, register _Xconst char* class, _Xconst char* defaultp, String buffer, - int nbytes - ) -#else -void XtGetErrorDatabaseText(name,type,class,defaultp, buffer, nbytes) - register String name, type, class; - String defaultp; - String buffer; - int nbytes; -#endif + int nbytes) { #if GLOBALERRORS XtAppGetErrorDatabaseText(NULL, @@ -139,7 +130,6 @@ void XtGetErrorDatabaseText(name,type,class,defaultp, buffer, nbytes) #endif /* GLOBALERRORS */ } -#if NeedFunctionPrototypes void XtAppGetErrorDatabaseText( XtAppContext app, register _Xconst char* name, @@ -148,18 +138,7 @@ void XtAppGetErrorDatabaseText( _Xconst char* defaultp, String buffer, int nbytes, - XrmDatabase db - ) -#else -void XtAppGetErrorDatabaseText(app, name,type,class,defaultp, - buffer, nbytes, db) - XtAppContext app; - register String name, type, class; - String defaultp; - String buffer; - int nbytes; - XrmDatabase db; -#endif + XrmDatabase db) { String str_class; String type_str; @@ -235,7 +214,7 @@ static void DefaultMsg (name,type,class,defaultp,params,num_params,error,fn) String* params; Cardinal* num_params; Bool error; - void (*fn)(String); + void (*fn)(_Xconst _XtString); { #define BIGBUF 1024 #ifdef notyet /* older versions don't, might want to wait until more do */ @@ -344,21 +323,13 @@ void _XtDefaultWarningMsg (name,type,class,defaultp,params,num_params) DefaultMsg (name,type,class,defaultp,params,num_params,False,XtWarning); } -#if NeedFunctionPrototypes void XtErrorMsg( _Xconst char* name, _Xconst char* type, _Xconst char* class, _Xconst char* defaultp, String* params, - Cardinal* num_params - ) -#else -void XtErrorMsg(name,type,class,defaultp,params,num_params) - String name,type,class,defaultp; - String* params; - Cardinal* num_params; -#endif + Cardinal* num_params) { #if GLOBALERRORS LOCK_PROCESS; @@ -371,7 +342,6 @@ void XtErrorMsg(name,type,class,defaultp,params,num_params) #endif /* GLOBALERRORS */ } -#if NeedFunctionPrototypes void XtAppErrorMsg( XtAppContext app, _Xconst char* name, @@ -379,15 +349,7 @@ void XtAppErrorMsg( _Xconst char* class, _Xconst char* defaultp, String* params, - Cardinal* num_params - ) -#else -void XtAppErrorMsg(app, name,type,class,defaultp,params,num_params) - XtAppContext app; - String name,type,class,defaultp; - String* params; - Cardinal* num_params; -#endif + Cardinal* num_params) { #if GLOBALERRORS LOCK_PROCESS; @@ -401,21 +363,13 @@ void XtAppErrorMsg(app, name,type,class,defaultp,params,num_params) #endif /* GLOBALERRORS */ } -#if NeedFunctionPrototypes void XtWarningMsg( _Xconst char* name, _Xconst char* type, _Xconst char* class, _Xconst char* defaultp, String* params, - Cardinal* num_params - ) -#else -void XtWarningMsg(name,type,class,defaultp,params,num_params) - String name,type,class,defaultp; - String* params; - Cardinal* num_params; -#endif + Cardinal* num_params) { #if GLOBALERRORS LOCK_PROCESS; @@ -428,7 +382,6 @@ void XtWarningMsg(name,type,class,defaultp,params,num_params) #endif /* GLOBALERRORS */ } -#if NeedFunctionPrototypes void XtAppWarningMsg( XtAppContext app, _Xconst char* name, @@ -436,15 +389,7 @@ void XtAppWarningMsg( _Xconst char* class, _Xconst char* defaultp, String* params, - Cardinal* num_params - ) -#else -void XtAppWarningMsg(app,name,type,class,defaultp,params,num_params) - XtAppContext app; - String name,type,class,defaultp; - String* params; - Cardinal* num_params; -#endif + Cardinal* num_params) { #if GLOBALERRORS LOCK_PROCESS; @@ -471,15 +416,9 @@ void XtSetErrorMsgHandler(handler) #endif /* GLOBALERRORS */ } -#if NeedFunctionPrototypes XtErrorMsgHandler XtAppSetErrorMsgHandler( XtAppContext app, XtErrorMsgHandler handler) -#else -XtErrorMsgHandler XtAppSetErrorMsgHandler(app,handler) - XtAppContext app; - XtErrorMsgHandler handler; -#endif { XtErrorMsgHandler old; #if GLOBALERRORS @@ -511,15 +450,9 @@ void XtSetWarningMsgHandler(handler) #endif /* GLOBALERRORS */ } -#if NeedFunctionPrototypes XtErrorMsgHandler XtAppSetWarningMsgHandler( XtAppContext app, XtErrorMsgHandler handler) -#else -XtErrorMsgHandler XtAppSetWarningMsgHandler(app,handler) - XtAppContext app; - XtErrorMsgHandler handler; -#endif { XtErrorMsgHandler old; #if GLOBALERRORS @@ -554,14 +487,8 @@ void _XtDefaultWarning(message) return; } -#if NeedFunctionPrototypes void XtError( - _Xconst char* message - ) -#else -void XtError(message) - String message; -#endif + _Xconst char* message) { #if GLOBALERRORS LOCK_PROCESS; @@ -572,16 +499,9 @@ void XtError(message) #endif /* GLOBALERRORS */ } -#if NeedFunctionPrototypes void XtAppError( XtAppContext app, - _Xconst char* message - ) -#else -void XtAppError(app,message) - XtAppContext app; - String message; -#endif + _Xconst char* message) { #if GLOBALERRORS LOCK_PROCESS; @@ -594,14 +514,8 @@ void XtAppError(app,message) #endif /* GLOBALERRORS */ } -#if NeedFunctionPrototypes void XtWarning( - _Xconst char* message - ) -#else -void XtWarning(message) - String message; -#endif + _Xconst char* message) { #if GLOBALERRORS LOCK_PROCESS; @@ -612,16 +526,9 @@ void XtWarning(message) #endif /* GLOBALERRORS */ } -#if NeedFunctionPrototypes void XtAppWarning( XtAppContext app, - _Xconst char* message - ) -#else -void XtAppWarning(app,message) - XtAppContext app; - String message; -#endif + _Xconst char* message) { #if GLOBALERRORS LOCK_PROCESS; @@ -634,12 +541,7 @@ void XtAppWarning(app,message) #endif /* GLOBALERRORS */ } -#if NeedFunctionPrototypes void XtSetErrorHandler(XtErrorHandler handler) -#else -void XtSetErrorHandler(handler) - XtErrorHandler handler; -#endif { #if GLOBALERRORS LOCK_PROCESS; @@ -651,15 +553,9 @@ void XtSetErrorHandler(handler) #endif /* GLOBALERRORS */ } -#if NeedFunctionPrototypes XtErrorHandler XtAppSetErrorHandler( XtAppContext app, XtErrorHandler handler) -#else -XtErrorHandler XtAppSetErrorHandler(app,handler) - XtAppContext app; - XtErrorHandler handler; -#endif { XtErrorHandler old; #if GLOBALERRORS @@ -678,12 +574,7 @@ XtErrorHandler XtAppSetErrorHandler(app,handler) return old; } -#if NeedFunctionPrototypes void XtSetWarningHandler(XtErrorHandler handler) -#else -void XtSetWarningHandler(handler) - XtErrorHandler handler; -#endif { #if GLOBALERRORS LOCK_PROCESS; @@ -695,15 +586,9 @@ void XtSetWarningHandler(handler) #endif /* GLOBALERRORS */ } -#if NeedFunctionPrototypes XtErrorHandler XtAppSetWarningHandler( XtAppContext app, XtErrorHandler handler) -#else -XtErrorHandler XtAppSetWarningHandler(app,handler) - XtAppContext app; - XtErrorHandler handler; -#endif { XtErrorHandler old; #if GLOBALERRORS diff --git a/src/Event.c b/src/Event.c index fa08dd0..e7dadc8 100644 --- a/src/Event.c +++ b/src/Event.c @@ -58,7 +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/Event.c,v 3.10 2001/12/14 19:56:11 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/Event.c,v 3.11 2003/04/21 16:34:27 herrb Exp $ */ #include "IntrinsicI.h" #include "Shell.h" @@ -367,22 +367,12 @@ AddEventHandler(widget, select_data, type, has_type_specifier, other, proc, } } -#if NeedFunctionPrototypes void XtRemoveEventHandler( Widget widget, EventMask eventMask, _XtBoolean other, XtEventHandler proc, - XtPointer closure - ) -#else -void XtRemoveEventHandler(widget, eventMask, other, proc, closure) - Widget widget; - EventMask eventMask; - Boolean other; - XtEventHandler proc; - XtPointer closure; -#endif + XtPointer closure) { WIDGET_TO_APPCON(widget); LOCK_APP(app); @@ -391,22 +381,12 @@ void XtRemoveEventHandler(widget, eventMask, other, proc, closure) UNLOCK_APP(app); } -#if NeedFunctionPrototypes void XtAddEventHandler( Widget widget, EventMask eventMask, _XtBoolean other, XtEventHandler proc, - XtPointer closure - ) -#else -void XtAddEventHandler(widget, eventMask, other, proc, closure) - Widget widget; - EventMask eventMask; - Boolean other; - XtEventHandler proc; - XtPointer closure; -#endif + XtPointer closure) { WIDGET_TO_APPCON(widget); LOCK_APP(app); @@ -415,24 +395,13 @@ void XtAddEventHandler(widget, eventMask, other, proc, closure) UNLOCK_APP(app); } -#if NeedFunctionPrototypes void XtInsertEventHandler( Widget widget, EventMask eventMask, _XtBoolean other, XtEventHandler proc, XtPointer closure, - XtListPosition position - ) -#else -void XtInsertEventHandler(widget, eventMask, other, proc, closure, position) - Widget widget; - EventMask eventMask; - Boolean other; - XtEventHandler proc; - XtPointer closure; - XtListPosition position; -#endif + XtListPosition position) { WIDGET_TO_APPCON(widget); LOCK_APP(app); @@ -441,22 +410,12 @@ void XtInsertEventHandler(widget, eventMask, other, proc, closure, position) UNLOCK_APP(app); } -#if NeedFunctionPrototypes void XtRemoveRawEventHandler( Widget widget, EventMask eventMask, _XtBoolean other, XtEventHandler proc, - XtPointer closure - ) -#else -void XtRemoveRawEventHandler(widget, eventMask, other, proc, closure) - Widget widget; - EventMask eventMask; - Boolean other; - XtEventHandler proc; - XtPointer closure; -#endif + XtPointer closure) { WIDGET_TO_APPCON(widget); LOCK_APP(app); @@ -465,24 +424,13 @@ void XtRemoveRawEventHandler(widget, eventMask, other, proc, closure) UNLOCK_APP(app); } -#if NeedFunctionPrototypes void XtInsertRawEventHandler( Widget widget, EventMask eventMask, _XtBoolean other, XtEventHandler proc, XtPointer closure, - XtListPosition position - ) -#else -void XtInsertRawEventHandler(widget, eventMask, other, proc, closure, position) - Widget widget; - EventMask eventMask; - Boolean other; - XtEventHandler proc; - XtPointer closure; - XtListPosition position; -#endif + XtListPosition position) { WIDGET_TO_APPCON(widget); LOCK_APP(app); @@ -491,22 +439,12 @@ void XtInsertRawEventHandler(widget, eventMask, other, proc, closure, position) UNLOCK_APP(app); } -#if NeedFunctionPrototypes void XtAddRawEventHandler( Widget widget, EventMask eventMask, _XtBoolean other, XtEventHandler proc, - XtPointer closure - ) -#else -void XtAddRawEventHandler(widget, eventMask, other, proc, closure) - Widget widget; - EventMask eventMask; - Boolean other; - XtEventHandler proc; - XtPointer closure; -#endif + XtPointer closure) { WIDGET_TO_APPCON(widget); LOCK_APP(app); @@ -515,21 +453,12 @@ void XtAddRawEventHandler(widget, eventMask, other, proc, closure) UNLOCK_APP(app); } -#if NeedFunctionPrototypes void XtRemoveEventTypeHandler( Widget widget, int type, XtPointer select_data, XtEventHandler proc, XtPointer closure) -#else -void XtRemoveEventTypeHandler(widget, type, select_data, proc, closure) - Widget widget; - int type; - XtPointer select_data; - XtEventHandler proc; - XtPointer closure; -#endif { WIDGET_TO_APPCON(widget); LOCK_APP(app); @@ -538,7 +467,6 @@ void XtRemoveEventTypeHandler(widget, type, select_data, proc, closure) UNLOCK_APP(app); } -#if NeedFunctionPrototypes void XtInsertEventTypeHandler( Widget widget, int type, @@ -546,15 +474,6 @@ void XtInsertEventTypeHandler( XtEventHandler proc, XtPointer closure, XtListPosition position) -#else -void XtInsertEventTypeHandler(widget, type, select_data, proc, closure, position) - Widget widget; - int type; - XtPointer select_data; - XtEventHandler proc; - XtPointer closure; - XtListPosition position; -#endif { WIDGET_TO_APPCON(widget); LOCK_APP(app); @@ -853,15 +772,9 @@ static void CompressExposures(); /* because some compilers allocate all local locals on procedure entry */ #define EHSIZE 4 -#if NeedFunctionPrototypes Boolean XtDispatchEventToWidget( Widget widget, XEvent* event) -#else -Boolean XtDispatchEventToWidget(widget, event) - Widget widget; - XEvent* event; -#endif { register XtEventRec *p; Boolean was_dispatched = False; @@ -1544,18 +1457,10 @@ static XtGrabRec *NewGrabRec(widget, exclusive, spring_loaded) return gl; } -#if NeedFunctionPrototypes void XtAddGrab( Widget widget, _XtBoolean exclusive, - _XtBoolean spring_loaded - ) -#else -void XtAddGrab(widget, exclusive, spring_loaded) - Widget widget; - Boolean exclusive; - Boolean spring_loaded; -#endif + _XtBoolean spring_loaded) { register XtGrabList gl; XtGrabList *grabListPtr; @@ -1718,18 +1623,10 @@ static XtEventDispatchProc* NewDispatcherList() return l; } -#if NeedFunctionPrototypes XtEventDispatchProc XtSetEventDispatcher( Display *dpy, int event_type, - XtEventDispatchProc proc - ) -#else -XtEventDispatchProc XtSetEventDispatcher(dpy, event_type, proc) - Display *dpy; - int event_type; - XtEventDispatchProc proc; -#endif + XtEventDispatchProc proc) { XtEventDispatchProc *list; XtEventDispatchProc old_proc; @@ -1753,23 +1650,12 @@ XtEventDispatchProc XtSetEventDispatcher(dpy, event_type, proc) return old_proc; } -#if NeedFunctionPrototypes void XtRegisterExtensionSelector( Display *dpy, int min_event_type, int max_event_type, XtExtensionSelectProc proc, - XtPointer client_data - ) -#else -void XtRegisterExtensionSelector(dpy, min_event_type, max_event_type, - proc, client_data) - Display *dpy; - int min_event_type; - int max_event_type; - XtExtensionSelectProc proc; - XtPointer client_data; -#endif + XtPointer client_data) { ExtSelectRec *e; XtPerDisplay pd; diff --git a/src/EventUtil.c b/src/EventUtil.c index d14f952..92a1af4 100644 --- a/src/EventUtil.c +++ b/src/EventUtil.c @@ -59,7 +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/EventUtil.c,v 1.6 2001/12/14 19:56:13 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/EventUtil.c,v 1.7 2003/04/21 16:34:27 herrb Exp $ */ #include "IntrinsicI.h" #include "PassivGraI.h" @@ -85,16 +85,9 @@ void _XtFreePerWidgetInput(w, pwi) * This routine gets the passive list associated with the widget * from the context manager. */ -#if NeedFunctionPrototypes XtPerWidgetInput _XtGetPerWidgetInput( Widget widget, - _XtBoolean create - ) -#else -XtPerWidgetInput _XtGetPerWidgetInput(widget, create) - Widget widget; - Boolean create; -#endif + _XtBoolean create) { XtPerWidgetInput pwi = NULL; Display *dpy = widget->core.screen->display; diff --git a/src/Geometry.c b/src/Geometry.c index d07f1e1..f25c2e4 100644 --- a/src/Geometry.c +++ b/src/Geometry.c @@ -58,7 +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/Geometry.c,v 1.12 2001/12/14 19:56:15 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/Geometry.c,v 1.13 2003/04/21 16:34:27 herrb Exp $ */ #include "IntrinsicI.h" #include "ShellP.h" @@ -492,7 +492,6 @@ XtGeometryResult XtMakeGeometryRequest (widget, request, reply) return ((r == XtGeometryDone) ? XtGeometryYes : r); } -#if NeedFunctionPrototypes XtGeometryResult XtMakeResizeRequest( Widget widget, @@ -500,13 +499,6 @@ XtMakeResizeRequest( _XtDimension height, Dimension *replyWidth, Dimension *replyHeight) -#else -XtGeometryResult -XtMakeResizeRequest (widget, width, height, replyWidth, replyHeight) - Widget widget; - Dimension width, height; - Dimension *replyWidth, *replyHeight; -#endif { XtWidgetGeometry request, reply; XtGeometryResult r; @@ -580,37 +572,22 @@ void XtResizeWindow(w) UNLOCK_APP(app); } /* XtResizeWindow */ -#if NeedFunctionPrototypes void XtResizeWidget( Widget w, _XtDimension width, _XtDimension height, - _XtDimension borderWidth - ) -#else -void XtResizeWidget(w, width, height, borderWidth) - Widget w; - Dimension width, height, borderWidth; -#endif + _XtDimension borderWidth) { XtConfigureWidget(w, w->core.x, w->core.y, width, height, borderWidth); } /* XtResizeWidget */ -#if NeedFunctionPrototypes void XtConfigureWidget( Widget w, _XtPosition x, _XtPosition y, _XtDimension width, _XtDimension height, - _XtDimension borderWidth - ) -#else -void XtConfigureWidget(w, x, y, width, height, borderWidth) - Widget w; - Position x, y; - Dimension width, height, borderWidth; -#endif + _XtDimension borderWidth) { XtConfigureHookDataRec req; Widget hookobj; @@ -699,36 +676,21 @@ void XtConfigureWidget(w, x, y, width, height, borderWidth) UNLOCK_APP(app); } /* XtConfigureWidget */ -#if NeedFunctionPrototypes void XtMoveWidget( Widget w, _XtPosition x, - _XtPosition y - ) -#else -void XtMoveWidget(w, x, y) - Widget w; - Position x, y; -#endif + _XtPosition y) { XtConfigureWidget(w, x, y, w->core.width, w->core.height, w->core.border_width); } /* XtMoveWidget */ -#if NeedFunctionPrototypes void XtTranslateCoords( register Widget w, _XtPosition x, _XtPosition y, register Position *rootx, /* return */ - register Position *rooty /* return */ - ) -#else -void XtTranslateCoords(w, x, y, rootx, rooty) - register Widget w; - Position x, y; - register Position *rootx, *rooty; /* return */ -#endif + register Position *rooty) /* return */ { Position garbagex, garbagey; XtAppContext app = XtWidgetToApplicationContext(w); diff --git a/src/Hooks.c b/src/Hooks.c index ad4cc19..71f9ab0 100644 --- a/src/Hooks.c +++ b/src/Hooks.c @@ -25,7 +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/Hooks.c,v 1.3 2001/12/14 19:56:18 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/Hooks.c,v 1.4 2003/04/21 16:34:27 herrb Exp $ */ /*LINTLIBRARY*/ @@ -113,13 +113,8 @@ static void DeleteShellFromHookObj( #define SHELL_INCR 4 -#if NeedFunctionPrototypes void _XtAddShellToHookObj( Widget shell) -#else -void _XtAddShellToHookObj(shell) - Widget shell; -#endif { /* app_con is locked when this function is called */ HookObject ho = (HookObject) XtHooksOfDisplay(XtDisplay(shell)); @@ -136,13 +131,8 @@ void _XtAddShellToHookObj(shell) (XtPointer)ho); } -#if NeedFunctionPrototypes Boolean _XtIsHookObject( Widget widget) -#else -Boolean _XtIsHookObject(widget) - Widget widget; -#endif { return (widget->core.widget_class == hookObjectClass); } diff --git a/src/Initialize.c b/src/Initialize.c index 6c2a300..c79ddc2 100644 --- a/src/Initialize.c +++ b/src/Initialize.c @@ -32,7 +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 $ */ +/* $XFree86: xc/lib/Xt/Initialize.c,v 3.21 2003/04/21 16:34:27 herrb Exp $ */ /* @@ -404,18 +404,10 @@ static String _XtDefaultLanguageProc( return setlocale(LC_ALL, NULL); /* re-query in case overwritten */ } -#if NeedFunctionPrototypes XtLanguageProc XtSetLanguageProc( XtAppContext app, XtLanguageProc proc, - XtPointer closure - ) -#else -XtLanguageProc XtSetLanguageProc(app, proc, closure) - XtAppContext app; - XtLanguageProc proc; - XtPointer closure; -#endif + XtPointer closure) { XtLanguageProc old; @@ -788,7 +780,6 @@ static void ConnectionWatch ( } } -#if NeedFunctionPrototypes void _XtDisplayInitialize( Display *dpy, XtPerDisplay pd, @@ -797,16 +788,6 @@ void _XtDisplayInitialize( Cardinal num_urs, int *argc, char **argv) -#else -void _XtDisplayInitialize(dpy, pd, name, urlist, num_urs, argc, argv) - Display *dpy; - XtPerDisplay pd; - String name; - XrmOptionDescRec *urlist; - Cardinal num_urs; - int *argc; - char **argv; -#endif { Boolean tmp_bool; XrmValue value; @@ -901,18 +882,10 @@ void _XtDisplayInitialize(dpy, pd, name, urlist, num_urs, argc, argv) * Returns: none. */ -#if NeedFunctionPrototypes void XtAppSetFallbackResources( -XtAppContext app_context, -String *specification_list -) -#else -void -XtAppSetFallbackResources(app_context, specification_list) -XtAppContext app_context; -String *specification_list; -#endif + XtAppContext app_context, + String *specification_list) { LOCK_APP(app_context); app_context->fallback_resources = specification_list; @@ -920,27 +893,12 @@ String *specification_list; } -#if NeedFunctionPrototypes Widget XtOpenApplication(XtAppContext *app_context_return, _Xconst char *application_class, XrmOptionDescRec *options, Cardinal num_options, int *argc_in_out, String *argv_in_out, String *fallback_resources, WidgetClass widget_class, ArgList args_in, Cardinal num_args_in) -#else -Widget XtOpenApplication(app_context_return, application_class, - options, num_options, argc_in_out, argv_in_out, - fallback_resources, widget_class, - args_in, num_args_in) - XtAppContext *app_context_return; - String application_class; - XrmOptionDescRec *options; - Cardinal num_options, num_args_in; - int *argc_in_out; - String *argv_in_out, *fallback_resources; - WidgetClass widget_class; - ArgList args_in; -#endif { XtAppContext app_con; Display * dpy; @@ -975,32 +933,17 @@ Widget XtOpenApplication(app_context_return, application_class, } -#if NeedFunctionPrototypes Widget XtAppInitialize( -XtAppContext * app_context_return, -_Xconst char* application_class, -XrmOptionDescRec *options, -Cardinal num_options, -int *argc_in_out, -String *argv_in_out, -String *fallback_resources, -ArgList args_in, -Cardinal num_args_in -) -#else -Widget -XtAppInitialize(app_context_return, application_class, options, num_options, - argc_in_out, argv_in_out, fallback_resources, - args_in, num_args_in) -XtAppContext * app_context_return; -String application_class; -XrmOptionDescRec *options; -Cardinal num_options, num_args_in; -int *argc_in_out; -String *argv_in_out, * fallback_resources; -ArgList args_in; -#endif + XtAppContext * app_context_return, + _Xconst char* application_class, + XrmOptionDescRec *options, + Cardinal num_options, + int *argc_in_out, + String *argv_in_out, + String *fallback_resources, + ArgList args_in, + Cardinal num_args_in) { return XtOpenApplication(app_context_return, application_class, options, num_options, @@ -1011,25 +954,14 @@ ArgList args_in; /*ARGSUSED*/ -#if NeedFunctionPrototypes Widget XtInitialize( -_Xconst char* name, -_Xconst char* classname, -XrmOptionDescRec *options, -Cardinal num_options, -int *argc, -String *argv -) -#else -Widget -XtInitialize(name, classname, options, num_options, argc, argv) -String name, classname; -XrmOptionDescRec *options; -Cardinal num_options; -String *argv; -int *argc; -#endif + _Xconst char* name, + _Xconst char* classname, + XrmOptionDescRec *options, + Cardinal num_options, + int *argc, + String *argv) { Widget root; XtAppContext app_con; diff --git a/src/Intrinsic.c b/src/Intrinsic.c index 2629775..98bfa43 100644 --- a/src/Intrinsic.c +++ b/src/Intrinsic.c @@ -32,7 +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 $ */ +/* $XFree86: xc/lib/Xt/Intrinsic.c,v 3.23 2003/04/21 16:34:27 herrb Exp $ */ /* @@ -96,16 +96,9 @@ Boolean XtIsSubclass(widget, widgetClass) } /* XtIsSubclass */ -#if NeedFunctionPrototypes Boolean _XtCheckSubclassFlag( Widget object, - _XtXtEnum flag - ) -#else -Boolean _XtCheckSubclassFlag(object, flag) - Widget object; - XtEnum flag; -#endif + _XtXtEnum flag) { Boolean retval; @@ -119,19 +112,11 @@ Boolean _XtCheckSubclassFlag(object, flag) } /*_XtVerifySubclass */ -#if NeedFunctionPrototypes Boolean _XtIsSubclassOf( Widget object, WidgetClass widgetClass, WidgetClass superClass, - _XtXtEnum flag - ) -#else -Boolean _XtIsSubclassOf(object, widgetClass, superClass, flag) - Widget object; - WidgetClass widgetClass, superClass; - XtEnum flag; -#endif + _XtXtEnum flag) { LOCK_PROCESS; if (!(object->core.widget_class->core_class.class_inited & flag)) { @@ -152,23 +137,12 @@ Boolean _XtIsSubclassOf(object, widgetClass, superClass, flag) } /*_XtIsSubclassOf */ -#if NeedFunctionPrototypes XtPointer XtGetClassExtension( WidgetClass object_class, Cardinal byte_offset, XrmQuark type, long version, - Cardinal record_size - ) -#else -XtPointer XtGetClassExtension(object_class, byte_offset, type, version, - record_size) - WidgetClass object_class; - Cardinal byte_offset; - XrmQuark type; - long version; - Cardinal record_size; -#endif + Cardinal record_size) { ObjectClassExtension ext; LOCK_PROCESS; @@ -633,16 +607,9 @@ static Widget NameListToWidget(root, names, bindings, } } /* NameListToWidget */ -#if NeedFunctionPrototypes Widget XtNameToWidget( Widget root, - _Xconst char* name - ) -#else -Widget XtNameToWidget(root, name) - Widget root; - String name; -#endif + _Xconst char* name) { XrmName *names; XrmBinding *bindings; @@ -1080,20 +1047,11 @@ static Boolean Resolve(source, len, sub, num, buf, collapse) } -#if NeedFunctionPrototypes String XtFindFile( _Xconst char* path, Substitution substitutions, Cardinal num_substitutions, - XtFilePredicate predicate - ) -#else -String XtFindFile(path, substitutions, num_substitutions, predicate) - String path; - Substitution substitutions; - Cardinal num_substitutions; - XtFilePredicate predicate; -#endif + XtFilePredicate predicate) { char *buf, *buf1, *buf2, *colon; int len; @@ -1348,11 +1306,7 @@ static void FillInLangSubs(subs, pd) * The exact value should be documented in the implementation * notes for any Xt implementation. */ -#if NeedFunctionPrototypes static char *implementation_default_path(void) -#else -static char *implementation_default_path() -#endif { #if defined(WIN32) || defined(__UNIXOS2__) /* if you know how to pass % thru the compiler let me know */ @@ -1384,7 +1338,6 @@ static SubstitutionRec defaultSubs[] = { }; -#if NeedFunctionPrototypes String XtResolvePathname( Display *dpy, _Xconst char* type, @@ -1393,17 +1346,7 @@ String XtResolvePathname( _Xconst char* path, Substitution substitutions, Cardinal num_substitutions, - XtFilePredicate predicate - ) -#else -String XtResolvePathname(dpy, type, filename, suffix, path, substitutions, - num_substitutions, predicate) - Display *dpy; - String type, filename, suffix, path; - Substitution substitutions; - Cardinal num_substitutions; - XtFilePredicate predicate; -#endif + XtFilePredicate predicate) { XtPerDisplay pd; static char *defaultPath = NULL; @@ -1604,11 +1547,7 @@ static XtResource geo_resources[] = { /************************************************************************ This function uses XtGetSubresources to find out if a widget needs to be geo-spied by the caller. */ -#if NeedFunctionPrototypes static Boolean IsTattled (Widget widget) -#else -static Boolean IsTattled (widget) Widget widget ; -#endif { GeoDataRec geo_data ; @@ -1624,12 +1563,7 @@ static Boolean IsTattled (widget) Widget widget ; static int n_tab = 0 ; /* not MT for now */ void -#if NeedFunctionPrototypes _XtGeoTab (int direction) /* +1 or -1 */ -#else -_XtGeoTab (direction) -int direction ; -#endif { n_tab += direction ; } diff --git a/src/Manage.c b/src/Manage.c index 03c1472..04a779b 100644 --- a/src/Manage.c +++ b/src/Manage.c @@ -32,7 +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 $ */ +/* $XFree86: xc/lib/Xt/Manage.c,v 3.11 2003/08/27 21:39:38 tsi Exp $ */ /* @@ -150,7 +150,9 @@ void XtUnmanageChildren (children, num_children) { Widget parent, hookobj; Cardinal ii; +#ifdef XTHREADS XtAppContext app; +#endif if (num_children == 0) return; if (children[0] == NULL) { @@ -159,7 +161,9 @@ void XtUnmanageChildren (children, num_children) (String *)NULL, (Cardinal *)NULL); return; } +#ifdef XTHREADS app = XtWidgetToApplicationContext(children[0]); +#endif LOCK_APP(app); parent = children[0]->core.parent; if (parent->core.being_destroyed) { @@ -302,7 +306,9 @@ void XtManageChildren(children, num_children) Cardinal num_children; { Widget parent, hookobj; +#ifdef XTHREADS XtAppContext app; +#endif if (num_children == 0) return; if (children[0] == NULL) { @@ -311,7 +317,9 @@ void XtManageChildren(children, num_children) (String*)NULL, (Cardinal*)NULL); return; } +#ifdef XTHREADS app = XtWidgetToApplicationContext(children[0]); +#endif LOCK_APP(app); parent = children[0]->core.parent; if (parent->core.being_destroyed) { @@ -342,16 +350,9 @@ void XtManageChild(child) } /* XtManageChild */ -#if NeedFunctionPrototypes void XtSetMappedWhenManaged( Widget widget, - _XtBoolean mapped_when_managed - ) -#else -void XtSetMappedWhenManaged(widget, mapped_when_managed) - Widget widget; - Boolean mapped_when_managed; -#endif + _XtBoolean mapped_when_managed) { Widget hookobj; WIDGET_TO_APPCON(widget); @@ -391,25 +392,13 @@ void XtSetMappedWhenManaged(widget, mapped_when_managed) } /* XtSetMappedWhenManaged */ -#if NeedFunctionPrototypes void XtChangeManagedSet( WidgetList unmanage_children, Cardinal num_unmanage, XtDoChangeProc do_change_proc, XtPointer client_data, WidgetList manage_children, - Cardinal num_manage -) -#else -void XtChangeManagedSet(unmanage_children, num_unmanage, do_change_proc, - client_data, manage_children, num_manage) - WidgetList unmanage_children; - Cardinal num_unmanage; - XtDoChangeProc do_change_proc; - XtPointer client_data; - WidgetList manage_children; - Cardinal num_manage; -#endif + Cardinal num_manage) { WidgetList childp; Widget parent; diff --git a/src/NextEvent.c b/src/NextEvent.c index 098bd16..c588a9c 100644 --- a/src/NextEvent.c +++ b/src/NextEvent.c @@ -58,7 +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/NextEvent.c,v 3.26 2002/06/04 21:55:42 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/NextEvent.c,v 3.27 2003/04/21 16:34:28 herrb Exp $ */ #include "IntrinsicI.h" #include <stdio.h> @@ -540,7 +540,6 @@ ENDILOOP: ; * entering select/poll. It is illegal for drop_lock to be FALSE if * ignoreTimers, ignoreInputs, or ignoreSignals is FALSE. */ -#if NeedFunctionPrototypes int _XtWaitForSomething( XtAppContext app, _XtBoolean ignoreEvents, @@ -552,25 +551,6 @@ int _XtWaitForSomething( _XtBoolean drop_lock, #endif unsigned long *howlong) -#else -int _XtWaitForSomething(app, - ignoreEvents, ignoreTimers, ignoreInputs, ignoreSignals, - block, -#ifdef XTHREADS - drop_lock, -#endif - howlong) - XtAppContext app; - Boolean ignoreEvents; - Boolean ignoreTimers; - Boolean ignoreInputs; - Boolean ignoreSignals; - Boolean block; -#ifdef XTHREADS - Boolean drop_lock; -#endif - unsigned long *howlong; -#endif { wait_times_t wt; wait_fds_t wf; @@ -1216,15 +1196,9 @@ void XtNextEvent(event) XtAppNextEvent(_XtDefaultAppContext(), event); } -#if NeedFunctionPrototypes void _XtRefreshMapping( XEvent* event, _XtBoolean dispatch) -#else -void _XtRefreshMapping(event, dispatch) - XEvent *event; - Boolean dispatch; -#endif { XtPerDisplay pd; diff --git a/src/PassivGrab.c b/src/PassivGrab.c index 4242ea6..9f76806 100644 --- a/src/PassivGrab.c +++ b/src/PassivGrab.c @@ -33,6 +33,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +/* $XFree86: xc/lib/Xt/PassivGrab.c,v 3.7 2003/10/24 15:47:35 tsi Exp $ */ /* @@ -527,18 +528,10 @@ void _XtDestroyServerGrabs(w, closure, call_data) * the grab. The grab will remain in effect until the key is released. */ -#if NeedFunctionPrototypes XtServerGrabPtr _XtCheckServerGrabsOnWidget ( XEvent *event, Widget widget, - _XtBoolean isKeyboard - ) -#else -XtServerGrabPtr _XtCheckServerGrabsOnWidget (event, widget, isKeyboard) - XEvent *event; - Widget widget; - Boolean isKeyboard; -#endif + _XtBoolean isKeyboard) { register XtServerGrabPtr grab; XtServerGrabRec tempGrab; @@ -809,25 +802,13 @@ void UngrabKeyOrButton (widget, keyOrButton, modifiers, isKeyboard) &tempGrab); } -#if NeedFunctionPrototypes void XtGrabKey ( Widget widget, _XtKeyCode keycode, Modifiers modifiers, _XtBoolean owner_events, int pointer_mode, - int keyboard_mode - ) -#else -void XtGrabKey (widget, keycode, modifiers, owner_events, - pointer_mode, keyboard_mode) - Widget widget; - KeyCode keycode; - Modifiers modifiers; - Boolean owner_events; - int pointer_mode; - int keyboard_mode; -#endif + int keyboard_mode) { WIDGET_TO_APPCON(widget); @@ -838,7 +819,6 @@ void XtGrabKey (widget, keycode, modifiers, owner_events, UNLOCK_APP(app); } -#if NeedFunctionPrototypes void XtGrabButton( Widget widget, int button, @@ -848,22 +828,7 @@ void XtGrabButton( int pointer_mode, int keyboard_mode, Window confine_to, - Cursor cursor - ) -#else -void XtGrabButton(widget, button, modifiers, owner_events, - event_mask, pointer_mode, keyboard_mode, - confine_to, cursor) - Widget widget; - int button; - Modifiers modifiers; - Boolean owner_events; - unsigned int event_mask; - int pointer_mode; - int keyboard_mode; - Window confine_to; - Cursor cursor; -#endif + Cursor cursor) { WIDGET_TO_APPCON(widget); @@ -880,18 +845,10 @@ void XtGrabButton(widget, button, modifiers, owner_events, * combination. */ -#if NeedFunctionPrototypes void XtUngrabKey ( Widget widget, _XtKeyCode keycode, - Modifiers modifiers - ) -#else -void XtUngrabKey (widget, keycode, modifiers) - Widget widget; - KeyCode keycode; - Modifiers modifiers; -#endif + Modifiers modifiers) { WIDGET_TO_APPCON(widget); @@ -999,23 +956,12 @@ static void UngrabDevice(widget, time, isKeyboard) /* * Active grab of keyboard. clear any client side grabs so we dont lock */ -#if NeedFunctionPrototypes int XtGrabKeyboard ( Widget widget, _XtBoolean owner_events, int pointer_mode, int keyboard_mode, - Time time - ) -#else -int XtGrabKeyboard (widget, owner_events, - pointer_mode, keyboard_mode, time) - Widget widget; - Boolean owner_events; - int pointer_mode; - int keyboard_mode; - Time time; -#endif + Time time) { int retval; WIDGET_TO_APPCON(widget); @@ -1050,7 +996,6 @@ void XtUngrabKeyboard(widget, time) /* * grab the pointer */ -#if NeedFunctionPrototypes int XtGrabPointer ( Widget widget, _XtBoolean owner_events, @@ -1059,21 +1004,7 @@ int XtGrabPointer ( int keyboard_mode, Window confine_to, Cursor cursor, - Time time - ) -#else -int XtGrabPointer (widget, owner_events, event_mask, - pointer_mode, keyboard_mode, - confine_to, cursor, time) - Widget widget; - Boolean owner_events; - unsigned int event_mask; - int pointer_mode; - int keyboard_mode; - Window confine_to; - Cursor cursor; - Time time; -#endif + Time time) { int retval; WIDGET_TO_APPCON(widget); diff --git a/src/Popup.c b/src/Popup.c index 1549a68..b51151e 100644 --- a/src/Popup.c +++ b/src/Popup.c @@ -46,22 +46,15 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +/* $XFree86: xc/lib/Xt/Popup.c,v 1.4 2003/10/24 15:47:35 tsi Exp $ */ #include "IntrinsicI.h" #include "ShellP.h" -#if NeedFunctionPrototypes void _XtPopup( Widget widget, XtGrabKind grab_kind, - _XtBoolean spring_loaded - ) -#else -void _XtPopup(widget, grab_kind, spring_loaded) - Widget widget; - XtGrabKind grab_kind; - Boolean spring_loaded; -#endif + _XtBoolean spring_loaded) { register ShellWidget shell_widget = (ShellWidget) widget; @@ -93,13 +86,7 @@ void _XtPopup(widget, grab_kind, spring_loaded) } /* _XtPopup */ -#if NeedFunctionPrototypes void XtPopup (Widget widget, XtGrabKind grab_kind) -#else -void XtPopup (widget, grab_kind) - Widget widget; - XtGrabKind grab_kind; -#endif { Widget hookobj; diff --git a/src/Resources.c b/src/Resources.c index d8e5d40..859a801 100644 --- a/src/Resources.c +++ b/src/Resources.c @@ -59,7 +59,7 @@ 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 $ */ +/* $XFree86: xc/lib/Xt/Resources.c,v 1.12 2003/08/27 21:39:38 tsi Exp $ */ /*LINTLIBRARY*/ #include "IntrinsicI.h" @@ -1071,33 +1071,17 @@ XtCacheRef *_XtGetResources(w, args, num_args, typed_args, num_typed_args) } /* _XtGetResources */ -#if NeedFunctionPrototypes void _XtGetSubresources ( - Widget w, - XtPointer base, - const char* name, - const char* class, - XtResourceList resources, - Cardinal num_resources, - ArgList args, + Widget w, /* Widget "parent" of subobject */ + XtPointer base, /* Base address to write to */ + const char* name, /* name of subobject */ + const char* class, /* class of subobject */ + XtResourceList resources, /* resource list for subobject */ + Cardinal num_resources, + ArgList args, /* arg list to override resources */ Cardinal num_args, XtTypedArgList typed_args, - Cardinal num_typed_args - ) -#else -void _XtGetSubresources (w, base, name, class, resources, num_resources, - args, num_args) - Widget w; /* Widget "parent" of subobject */ - XtPointer base; /* Base address to write to */ - String name; /* name of subobject */ - String class; /* class of subobject */ - XtResourceList resources; /* resource list for subobject */ - Cardinal num_resources; - ArgList args; /* arg list to override resources */ - Cardinal num_args; - XtTypedArgsList typed_args; - Cardinal num_typed_args; -#endif + Cardinal num_typed_args) { XrmName *names, names_s[50]; XrmClass *classes, classes_s[50]; @@ -1144,29 +1128,15 @@ void _XtGetSubresources (w, base, name, class, resources, num_resources, UNLOCK_APP(app); } -#if NeedFunctionPrototypes void XtGetSubresources ( - Widget w, - XtPointer base, - _Xconst char* name, - _Xconst char* class, - XtResourceList resources, - Cardinal num_resources, - ArgList args, - Cardinal num_args - ) -#else -void XtGetSubresources (w, base, name, class, resources, num_resources, - args, num_args) - Widget w; /* Widget "parent" of subobject */ - XtPointer base; /* Base address to write to */ - String name; /* name of subobject */ - String class; /* class of subobject */ - XtResourceList resources; /* resource list for subobject */ - Cardinal num_resources; - ArgList args; /* arg list to override resources */ - Cardinal num_args; -#endif + Widget w, /* Widget "parent" of subobject */ + XtPointer base, /* Base address to write to */ + _Xconst char* name, /* name of subobject */ + _Xconst char* class, /* class of subobject */ + XtResourceList resources, /* resource list for subobject */ + Cardinal num_resources, + ArgList args, /* arg list to override resources */ + Cardinal num_args) { _XtGetSubresources (w, base, name, class, resources, num_resources, args, num_args, NULL, 0); } @@ -1189,12 +1159,16 @@ void _XtGetApplicationResources XrmQuarkList quark_args; XrmResourceList* table; Cardinal count, ntyped_args = num_typed_args; +#ifdef XTHREADS XtAppContext app; +#endif if (num_resources == 0) return; +#ifdef XTHREADS if (w == NULL) app = _XtDefaultAppContext(); else app = XtWidgetToApplicationContext(w); +#endif LOCK_APP(app); /* Get full name, class of application */ diff --git a/src/Selection.c b/src/Selection.c index 0a5cd9d..55d496c 100644 --- a/src/Selection.c +++ b/src/Selection.c @@ -58,7 +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/Selection.c,v 3.9 2001/12/14 19:56:29 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/Selection.c,v 3.10 2003/04/21 16:34:28 herrb Exp $ */ #include "IntrinsicI.h" #include "StringDefs.h" @@ -395,11 +395,7 @@ Time time; static XContext selectWindowContext = 0; /* %%% Xlib.h should make this public! */ -typedef int (*xErrorHandler)( -#if NeedFunctionPrototypes - Display*, XErrorEvent* -#endif - ); +typedef int (*xErrorHandler)(Display*, XErrorEvent*); static xErrorHandler oldErrorHandler = NULL; static unsigned long firstProtectRequest; diff --git a/src/SetSens.c b/src/SetSens.c index 96940cd..52e7d77 100644 --- a/src/SetSens.c +++ b/src/SetSens.c @@ -58,7 +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 $ */ +/* $XFree86: xc/lib/Xt/SetSens.c,v 1.4 2003/04/21 16:34:28 herrb Exp $ */ #include "IntrinsicI.h" #include "StringDefs.h" @@ -93,16 +93,9 @@ static void SetAncestorSensitive( } /* SetAncestorSensitive */ -#if NeedFunctionPrototypes void XtSetSensitive( register Widget widget, - _XtBoolean sensitive - ) -#else -void XtSetSensitive(widget, sensitive) - register Widget widget; - Boolean sensitive; -#endif + _XtBoolean sensitive) { Arg args[1]; register Cardinal i; diff --git a/src/Shell.c b/src/Shell.c index 8c600d9..6d65bbb 100644 --- a/src/Shell.c +++ b/src/Shell.c @@ -32,7 +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 $ */ +/* $XFree86: xc/lib/Xt/Shell.c,v 3.17 2003/05/27 22:26:43 tsi Exp $ */ /* @@ -2897,9 +2897,7 @@ static SmProp * CardPack(name, closure) return p; } -static SmProp * ArrayPack(name, closure) - char *name; - XtPointer closure; +static SmProp * ArrayPack(char *name, XtPointer closure) { String prop = *(String *) closure; SmProp *p; @@ -3241,12 +3239,7 @@ static XtCheckpointToken GetToken(widget, type) return token; } -#if NeedFunctionPrototypes XtCheckpointToken XtSessionGetToken(Widget widget) -#else -XtCheckpointToken XtSessionGetToken(widget) - Widget widget; -#endif { SessionShellWidget w = (SessionShellWidget) widget; XtCheckpointToken token = NULL; @@ -3281,12 +3274,7 @@ static Boolean ExamineToken(call_data) return True; } -#if NeedFunctionPrototypes void XtSessionReturnToken(XtCheckpointToken token) -#else -void XtSessionReturnToken(token) - XtCheckpointToken token; -#endif { SessionShellWidget w = (SessionShellWidget) token->widget; Boolean has_some; diff --git a/src/TMaction.c b/src/TMaction.c index a1b7b0a..ac8fcdd 100644 --- a/src/TMaction.c +++ b/src/TMaction.c @@ -59,7 +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 $ */ +/* $XFree86: xc/lib/Xt/TMaction.c,v 3.8 2003/04/21 16:34:28 herrb Exp $ */ /* TMaction.c -- maintains the state table of actions for the translation * manager. @@ -400,18 +400,10 @@ static XtActionProc *TryBindCache(widget, stateTree) * The class record actions field will point to the bind cache header * after this call is made out of coreClassPartInit. */ -#if NeedFunctionPrototypes XtPointer _XtInitializeActionData( register struct _XtActionsRec *actions, register Cardinal count, - _XtBoolean inPlace - ) -#else -XtPointer _XtInitializeActionData(actions, count, inPlace) - register struct _XtActionsRec *actions; - register Cardinal count; - Boolean inPlace; -#endif + _XtBoolean inPlace) { TMClassCache classCache; @@ -953,22 +945,12 @@ void _XtPopupInitialize(app) } -#if NeedFunctionPrototypes void XtCallActionProc( Widget widget, _Xconst char* action, XEvent *event, String *params, - Cardinal num_params - ) -#else -void XtCallActionProc(widget, action, event, params, num_params) - Widget widget; - String action; - XEvent *event; - String *params; - Cardinal num_params; -#endif + Cardinal num_params) { CompiledAction* actionP; XrmQuark q = XrmStringToQuark(action); diff --git a/src/TMgrab.c b/src/TMgrab.c index 9257293..50be71a 100644 --- a/src/TMgrab.c +++ b/src/TMgrab.c @@ -58,7 +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 $ */ +/* $XFree86: xc/lib/Xt/TMgrab.c,v 1.4 2003/04/21 16:34:28 herrb Exp $ */ /*LINTLIBRARY*/ #include "IntrinsicI.h" @@ -277,22 +277,12 @@ void _XtRegisterGrabs(widget) } } -#if NeedFunctionPrototypes void XtRegisterGrabAction( XtActionProc action_proc, _XtBoolean owner_events, unsigned int event_mask, int pointer_mode, - int keyboard_mode - ) -#else -void XtRegisterGrabAction(action_proc, owner_events, event_mask, - pointer_mode, keyboard_mode) - XtActionProc action_proc; - Boolean owner_events; - unsigned int event_mask; - int pointer_mode, keyboard_mode; -#endif + int keyboard_mode) { GrabActionRec* actionP; diff --git a/src/TMkey.c b/src/TMkey.c index 3087407..e338954 100644 --- a/src/TMkey.c +++ b/src/TMkey.c @@ -59,7 +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 $ */ +/* $XFree86: xc/lib/Xt/TMkey.c,v 3.11 2003/04/21 16:34:28 herrb Exp $ */ #define XK_MISCELLANY #define XK_LATIN1 @@ -492,24 +492,12 @@ void _XtBuildKeysymTables(dpy,pd) XFreeModifiermap(modKeymap); } -#if NeedFunctionPrototypes void XtTranslateKeycode ( Display *dpy, _XtKeyCode keycode, Modifiers modifiers, Modifiers *modifiers_return, - KeySym *keysym_return - ) -#else -void XtTranslateKeycode (dpy, keycode, modifiers, - modifiers_return, keysym_return) - - Display *dpy; - KeyCode keycode; - Modifiers modifiers; - Modifiers *modifiers_return; - KeySym *keysym_return; -#endif + KeySym *keysym_return) { XtPerDisplay pd; DPY_TO_APPCON(dpy); @@ -523,23 +511,12 @@ void XtTranslateKeycode (dpy, keycode, modifiers, } /* This code should match XTranslateKey (internal, sigh) in Xlib */ -#if NeedFunctionPrototypes void XtTranslateKey( register Display *dpy, _XtKeyCode keycode, Modifiers modifiers, Modifiers *modifiers_return, - KeySym *keysym_return - ) -#else -void XtTranslateKey(dpy, keycode, modifiers, - modifiers_return, keysym_return) - register Display *dpy; - KeyCode keycode; - Modifiers modifiers; - Modifiers *modifiers_return; - KeySym *keysym_return; -#endif + KeySym *keysym_return) #ifndef XKB { XtPerDisplay pd; diff --git a/src/TMparse.c b/src/TMparse.c index e758e36..ad57d00 100644 --- a/src/TMparse.c +++ b/src/TMparse.c @@ -32,7 +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 $ */ +/* $XFree86: xc/lib/Xt/TMparse.c,v 3.11 2003/05/27 22:26:43 tsi Exp $ */ /* @@ -430,10 +430,10 @@ static void CompileNameValueTable(table) table[i].signature = XrmPermStringToQuark(table[i].name); } -static int OrderEvents(a, b) - EventKey *a, *b; +static int OrderEvents(_Xconst void *a, _Xconst void *b) { - return ((a->signature < b->signature) ? -1 : 1); + return ((((_Xconst EventKey *)a)->signature < + ((_Xconst EventKey *)b)->signature) ? -1 : 1); } static void Compile_XtEventTable(table, count) @@ -448,10 +448,10 @@ static void Compile_XtEventTable(table, count) qsort(table, count, sizeof(EventKey), OrderEvents); } -static int OrderModifiers(a, b) - ModifierRec *a, *b; +static int OrderModifiers(_Xconst void *a, _Xconst void *b) { - return ((a->signature < b->signature) ? -1 : 1); + return ((((_Xconst ModifierRec *)a)->signature < + ((_Xconst ModifierRec *)b)->signature) ? -1 : 1); } static void Compile_XtModifierTable(table, count) @@ -2053,14 +2053,8 @@ XtCvtStringToTranslationTable(dpy, args, num_args, from, to, closure_ret) /* * Parses a user's or applications translation table */ -#if NeedFunctionPrototypes XtAccelerators XtParseAcceleratorTable( - _Xconst char* source - ) -#else -XtAccelerators XtParseAcceleratorTable(source) - String source; -#endif + _Xconst char* source) { Boolean error = FALSE; XtAccelerators ret = @@ -2073,14 +2067,8 @@ XtAccelerators XtParseAcceleratorTable(source) return ret; } -#if NeedFunctionPrototypes XtTranslations XtParseTranslationTable( - _Xconst char* source - ) -#else -XtTranslations XtParseTranslationTable(source) - String source; -#endif + _Xconst char* source) { Boolean error = FALSE; XtTranslations ret = ParseTranslationTable(source, FALSE, XtTableReplace, &error); @@ -2092,7 +2080,7 @@ XtTranslations XtParseTranslationTable(source) return ret; } -void _XtTranslateInitialize() +void _XtTranslateInitialize(void) { LOCK_PROCESS; if (initialized) { diff --git a/src/TMprint.c b/src/TMprint.c index 3b44326..db73700 100644 --- a/src/TMprint.c +++ b/src/TMprint.c @@ -58,7 +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 $ */ +/* $XFree86: xc/lib/Xt/TMprint.c,v 1.7 2003/04/21 16:34:29 herrb Exp $ */ /*LINTLIBRARY*/ #include "IntrinsicI.h" @@ -659,20 +659,11 @@ static void PrintState(sb, tree, branchHead, includeRHS, accelWidget, dpy) UNLOCK_PROCESS; } -#if NeedFunctionPrototypes String _XtPrintXlations( Widget w, XtTranslations xlations, Widget accelWidget, - _XtBoolean includeRHS - ) -#else -String _XtPrintXlations(w, xlations, accelWidget, includeRHS) - Widget w; - XtTranslations xlations; - Widget accelWidget; - Boolean includeRHS; -#endif + _XtBoolean includeRHS) { register Cardinal i; #define STACKPRINTSIZE 250 diff --git a/src/TMstate.c b/src/TMstate.c index 2283e13..7f6646a 100644 --- a/src/TMstate.c +++ b/src/TMstate.c @@ -32,7 +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 $ */ +/* $XFree86: xc/lib/Xt/TMstate.c,v 1.9 2003/04/21 16:34:29 herrb Exp $ */ /* @@ -1400,18 +1400,11 @@ void XtUninstallTranslations(widget) UNLOCK_APP(app); } -#if NeedFunctionPrototypes XtTranslations _XtCreateXlations( TMStateTree *stateTrees, TMShortCard numStateTrees, XtTranslations first, XtTranslations second) -#else -XtTranslations _XtCreateXlations(stateTrees, numStateTrees, first, second) - TMStateTree *stateTrees; - TMShortCard numStateTrees; - XtTranslations first, second; -#endif { XtTranslations xlations; TMShortCard i; diff --git a/src/Threads.c b/src/Threads.c index ef9a3bb..4ef3eec 100644 --- a/src/Threads.c +++ b/src/Threads.c @@ -53,7 +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 $ */ +/* $XFree86: xc/lib/Xt/Threads.c,v 3.7 2003/04/21 16:34:29 herrb Exp $ */ #include "IntrinsicI.h" @@ -165,13 +165,7 @@ ProcessUnlock(void) static void -#if NeedFunctionPrototypes -AppLock( - XtAppContext app) -#else -AppLock(app) - XtAppContext app; -#endif +AppLock(XtAppContext app) { LockPtr app_lock = app->lock_info; #ifdef _XMUTEX_NESTS @@ -201,13 +195,7 @@ AppLock(app) } static void -#if NeedFunctionPrototypes -AppUnlock( - XtAppContext app) -#else -AppUnlock(app) - XtAppContext app; -#endif +AppUnlock(XtAppContext app) { LockPtr app_lock = app->lock_info; #ifdef _XMUTEX_NESTS @@ -231,19 +219,11 @@ AppUnlock(app) } static void -#if NeedFunctionPrototypes YieldAppLock( XtAppContext app, Boolean* push_thread, Boolean* pushed_thread, int* level) -#else -YieldAppLock(app, push_thread, pushed_thread, level) - XtAppContext app; - Boolean* push_thread; - Boolean* pushed_thread; - int* level; -#endif { LockPtr app_lock = app->lock_info; xthread_t self = xthread_self(); @@ -284,17 +264,10 @@ YieldAppLock(app, push_thread, pushed_thread, level) } static void -#if NeedFunctionPrototypes RestoreAppLock( XtAppContext app, int level, Boolean* pushed_thread) -#else -RestoreAppLock(app, level, pushed_thread) - XtAppContext app; - int level; - Boolean* pushed_thread; -#endif { LockPtr app_lock = app->lock_info; xthread_t self = xthread_self(); @@ -343,13 +316,7 @@ RestoreAppLock(app, level, pushed_thread) } static void -#if NeedFunctionPrototypes -FreeAppLock( - XtAppContext app) -#else -FreeAppLock(app) - XtAppContext app; -#endif +FreeAppLock(XtAppContext app) { int ii; LockPtr app_lock = app->lock_info; @@ -374,13 +341,7 @@ FreeAppLock(app) } static void -#if NeedFunctionPrototypes -InitAppLock( - XtAppContext app) -#else -InitAppLock(app) - XtAppContext app; -#endif +InitAppLock(XtAppContext app) { int ii; LockPtr app_lock; @@ -412,13 +373,7 @@ InitAppLock(app) #endif /* defined(XTHREADS) */ -#if NeedFunctionPrototypes -void XtAppLock( - XtAppContext app) -#else -void XtAppLock(app) - XtAppContext app; -#endif +void XtAppLock(XtAppContext app) { #ifdef XTHREADS if(app->lock) @@ -426,13 +381,7 @@ void XtAppLock(app) #endif } -#if NeedFunctionPrototypes -void XtAppUnlock( - XtAppContext app) -#else -void XtAppUnlock(app) - XtAppContext app; -#endif +void XtAppUnlock(XtAppContext app) { #ifdef XTHREADS if(app->unlock) @@ -440,7 +389,7 @@ void XtAppUnlock(app) #endif } -void XtProcessLock() +void XtProcessLock(void) { #ifdef XTHREADS if(_XtProcessLock) @@ -448,7 +397,7 @@ void XtProcessLock() #endif } -void XtProcessUnlock() +void XtProcessUnlock(void) { #ifdef XTHREADS if(_XtProcessUnlock) diff --git a/src/Varargs.c b/src/Varargs.c index 552f72d..35a38f6 100644 --- a/src/Varargs.c +++ b/src/Varargs.c @@ -25,7 +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 $ */ +/* $XFree86: xc/lib/Xt/Varargs.c,v 3.11 2003/04/21 16:34:29 herrb Exp $ */ #include "IntrinsicI.h" #include "VarargsI.h" @@ -64,16 +64,8 @@ _XtCountNestedList( * and the count of the number of those attributes that are typed. * The list is counted recursively. */ -#if NeedFunctionPrototypes void _XtCountVaList(va_list var, int* total_count, int* typed_count) -#else -void -_XtCountVaList(var, total_count, typed_count) - va_list var; - int *total_count; - int *typed_count; -#endif { String attr; @@ -140,13 +132,7 @@ XtVaCreateArgsList(XtPointer unused, ...) } -#if NeedFunctionPrototypes XtTypedArgList _XtVaCreateTypedArgList(va_list var, register int count) -#else -XtTypedArgList _XtVaCreateTypedArgList(var, count) - va_list var; - register int count; -#endif { String attr; XtTypedArgList avlist; @@ -321,19 +307,11 @@ NestedArgtoArg( * to make this representation, priority was given to the wish to retrofit * the release of memory around the existing signature of _XtVaToArgList. */ -#if NeedFunctionPrototypes void _XtFreeArgList( ArgList args, /* as returned by _XtVaToArgList */ int total_count, /* argument count returned by _XtCountVaList */ int typed_count) /* typed arg count returned by _XtCountVaList */ -#else -void -_XtFreeArgList(args, total_count, typed_count) - ArgList args; - int total_count; - int typed_count; -#endif { ArgList p; @@ -357,7 +335,6 @@ static void GetResources(Widget widget, XtResourceList *res_list, * lists and typed arguments. If typed arguments are present, the * ArgList should be freed with _XtFreeArgList. */ -#if NeedFunctionPrototypes void _XtVaToArgList( Widget widget, @@ -365,15 +342,6 @@ _XtVaToArgList( int max_count, ArgList *args_return, Cardinal *num_args_return) -#else -void -_XtVaToArgList(widget, var, max_count, args_return, num_args_return) - Widget widget; - va_list var; - int max_count; - ArgList *args_return; - Cardinal *num_args_return; -#endif { String attr; int count; @@ -510,21 +478,12 @@ static int NestedArgtoTypedArg( * lists. * Note: _XtVaToTypedArgList() does not do type conversions. */ -#if NeedFunctionPrototypes void _XtVaToTypedArgList( va_list var, int max_count, XtTypedArgList *args_return, Cardinal *num_args_return) -#else -void -_XtVaToTypedArgList(var, max_count, args_return, num_args_return) - va_list var; - int max_count; - XtTypedArgList *args_return; - Cardinal *num_args_return; -#endif { XtTypedArgList args = NULL; String attr; diff --git a/src/sharedlib.c b/src/sharedlib.c index 5096c44..17c25fd 100644 --- a/src/sharedlib.c +++ b/src/sharedlib.c @@ -25,7 +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/sharedlib.c,v 3.7 2002/05/31 18:45:46 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/sharedlib.c,v 3.8 2003/04/21 16:34:29 herrb Exp $ */ #if (defined(SUNSHLIB) || defined(AIXSHLIB)) && !defined(SHAREDCODE) #include "IntrinsicI.h" @@ -81,57 +81,31 @@ void XtToolkitInitialize() _XtToolkitInitialize(); } -#if NeedFunctionPrototypes Widget XtInitialize( -_Xconst char* name, -_Xconst char* classname, -XrmOptionDescRec *options, -Cardinal num_options, -int *argc, -String *argv -) -#else -Widget -XtInitialize(name, classname, options, num_options, argc, argv) -String name, classname; -XrmOptionDescRec *options; -Cardinal num_options; -String *argv; -int *argc; -#endif + _Xconst char* name, + _Xconst char* classname, + XrmOptionDescRec *options, + Cardinal num_options, + int *argc, + String *argv) { extern Widget _XtInitialize(); VENDORINIT return _XtInitialize (name, classname, options, num_options, argc, argv); } -#if NeedFunctionPrototypes Widget XtAppInitialize( -XtAppContext * app_context_return, -_Xconst char* application_class, -XrmOptionDescRec *options, -Cardinal num_options, -int *argc_in_out, -String *argv_in_out, -String *fallback_resources, -ArgList args_in, -Cardinal num_args_in -) -#else -Widget -XtAppInitialize(app_context_return, application_class, options, num_options, - argc_in_out, argv_in_out, fallback_resources, - args_in, num_args_in) -XtAppContext * app_context_return; -String application_class; -XrmOptionDescRec *options; -Cardinal num_options, num_args_in; -int *argc_in_out; -String *argv_in_out, * fallback_resources; -ArgList args_in; -#endif + XtAppContext * app_context_return, + _Xconst char* application_class, + XrmOptionDescRec *options, + Cardinal num_options, + int *argc_in_out, + String *argv_in_out, + String *fallback_resources, + ArgList args_in, + Cardinal num_args_in) { extern Widget _XtAppInitialize(); VENDORINIT @@ -161,34 +135,18 @@ XtVaAppInitialize( fallback_resources, var); } -#if NeedFunctionPrototypes Widget XtOpenApplication( -XtAppContext * app_context_return, -_Xconst char* application_class, -XrmOptionDescRec *options, -Cardinal num_options, -int *argc_in_out, -String *argv_in_out, -String *fallback_resources, -WidgetClass widget_class, -ArgList args_in, -Cardinal num_args_in -) -#else -Widget -XtOpenApplication(app_context_return, application_class, options, num_options, - argc_in_out, argv_in_out, fallback_resources, - widget_class, args_in, num_args_in) -XtAppContext * app_context_return; -String application_class; -XrmOptionDescRec *options; -Cardinal num_options, num_args_in; -int *argc_in_out; -String *argv_in_out, * fallback_resources; -WidgetClass widget_class; -ArgList args_in; -#endif + XtAppContext * app_context_return, + _Xconst char* application_class, + XrmOptionDescRec *options, + Cardinal num_options, + int *argc_in_out, + String *argv_in_out, + String *fallback_resources, + WidgetClass widget_class, + ArgList args_in, + Cardinal num_args_in) { extern Widget _XtOpenApplication(); VENDORINIT diff --git a/util/makestrs.man b/util/makestrs.man index 7da5e8b..a946bc7 100644 --- a/util/makestrs.man +++ b/util/makestrs.man @@ -23,7 +23,7 @@ .\" dealing in this Software without prior written authorization from The .\" Open Group. .\" -.\" $XFree86: xc/config/util/makestrs.man,v 3.8 2001/12/14 19:53:22 dawes Exp $ +.\" $XFree86: xc/config/util/makestrs.man,v 3.9 2003/05/29 21:48:03 herrb Exp $ .\" .TH MAKESTRS 1 __xorgversion__ .SH NAME @@ -65,7 +65,7 @@ V Application Binary Interface, i.e. SVR4. may be used in addition to .I -intelabi for situations -where the vendor wishes to maintain binary compatiblity between +where the vendor wishes to maintain binary compatibility between X11R6 public-patch 11 (and earlier) and X11R6 public-patch 12 (and later). .LP .I -functionabi |