diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/X11/EventI.h | 12 | ||||
-rw-r--r-- | include/X11/Intrinsic.h | 104 | ||||
-rw-r--r-- | include/X11/IntrinsicI.h | 40 | ||||
-rw-r--r-- | include/X11/IntrinsicP.h | 21 | ||||
-rw-r--r-- | include/X11/ResourceI.h | 15 | ||||
-rw-r--r-- | include/X11/SelectionI.h | 12 | ||||
-rw-r--r-- | include/X11/TranslateI.h | 38 |
7 files changed, 153 insertions, 89 deletions
diff --git a/include/X11/EventI.h b/include/X11/EventI.h index 11e4e75..00858e7 100644 --- a/include/X11/EventI.h +++ b/include/X11/EventI.h @@ -30,13 +30,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 @@ -111,6 +111,10 @@ extern void _XtRefreshMapping( _XtBoolean /* dispatch */ ); +extern void _XtSendFocusEvent( + Widget /* child */, + int /* type */); + extern EventMask _XtConvertTypeToMask( int /* eventType */ ); diff --git a/include/X11/Intrinsic.h b/include/X11/Intrinsic.h index 603ecc0..7709a38 100644 --- a/include/X11/Intrinsic.h +++ b/include/X11/Intrinsic.h @@ -5,13 +5,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 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 @@ -1014,6 +1014,10 @@ extern void XtRemoveInput( XtInputId /* id */ ); +extern XtSignalId XtAddSignal( + XtSignalCallbackProc /* proc */, + XtPointer /* closure */); + extern XtSignalId XtAppAddSignal( XtAppContext /* app_context */, XtSignalCallbackProc /* proc */, @@ -1072,20 +1076,36 @@ extern void XtRemoveBlockHook( #define XtIsComposite(widget) (_XtCheckSubclassFlag(widget, (XtEnum)0x08)) #define XtIsConstraint(widget) (_XtCheckSubclassFlag(widget, (XtEnum)0x10)) #define XtIsShell(widget) (_XtCheckSubclassFlag(widget, (XtEnum)0x20)) + +#undef XtIsOverrideShell +extern Boolean XtIsOverrideShell(Widget /* object */); #define XtIsOverrideShell(widget) \ (_XtIsSubclassOf(widget, (WidgetClass)overrideShellWidgetClass, \ (WidgetClass)shellWidgetClass, (XtEnum)0x20)) + #define XtIsWMShell(widget) (_XtCheckSubclassFlag(widget, (XtEnum)0x40)) + +#undef XtIsVendorShell +extern Boolean XtIsVendorShell(Widget /* object */); #define XtIsVendorShell(widget) \ (_XtIsSubclassOf(widget, (WidgetClass)vendorShellWidgetClass, \ (WidgetClass)wmShellWidgetClass, (XtEnum)0x40)) + +#undef XtIsTransientShell +extern Boolean XtIsTransientShell(Widget /* object */); #define XtIsTransientShell(widget) \ (_XtIsSubclassOf(widget, (WidgetClass)transientShellWidgetClass, \ (WidgetClass)wmShellWidgetClass, (XtEnum)0x40)) #define XtIsTopLevelShell(widget) (_XtCheckSubclassFlag(widget, (XtEnum)0x80)) + +#undef XtIsApplicationShell +extern Boolean XtIsApplicationShell(Widget /* object */); #define XtIsApplicationShell(widget) \ (_XtIsSubclassOf(widget, (WidgetClass)applicationShellWidgetClass, \ (WidgetClass)topLevelShellWidgetClass, (XtEnum)0x80)) + +#undef XtIsSessionShell +extern Boolean XtIsSessionShell(Widget /* object */); #define XtIsSessionShell(widget) \ (_XtIsSubclassOf(widget, (WidgetClass)sessionShellWidgetClass, \ (WidgetClass)topLevelShellWidgetClass, (XtEnum)0x80)) @@ -1212,7 +1232,12 @@ extern Widget XtParent( #endif /*_XtIntrinsicP_h*/ +#undef XtMapWidget +extern void XtMapWidget(Widget /* w */); #define XtMapWidget(widget) XMapWindow(XtDisplay(widget), XtWindow(widget)) + +#undef XtUnmapWidget +extern void XtUnmapWidget(Widget /* w */); #define XtUnmapWidget(widget) \ XUnmapWindow(XtDisplay(widget), XtWindow(widget)) @@ -1867,6 +1892,9 @@ extern void _XtFree( /* implementation-private */ #endif /* ifdef XTTRACEMEMORY */ #define XtNew(type) ((type *) XtMalloc((unsigned) sizeof(type))) + +#undef XtNewString +extern String XtNewString(String /* str */); #define XtNewString(str) \ ((str) != NULL ? (strcpy(XtMalloc((unsigned)strlen(str) + 1), str)) : NULL) @@ -1975,7 +2003,7 @@ extern String XtResolvePathname( *****************************************************************/ #define XT_CONVERT_FAIL (Atom)0x80000001 - + extern void XtDisownSelection( Widget /* widget */, Atom /* selection */, @@ -2246,7 +2274,7 @@ extern void XtAppUnlock( extern Boolean XtCvtStringToAcceleratorTable( Display* /* dpy */, XrmValuePtr /* args */, /* none */ - Cardinal* /* num_args */, + Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ @@ -2255,7 +2283,7 @@ extern Boolean XtCvtStringToAcceleratorTable( extern Boolean XtCvtStringToAtom( Display* /* dpy */, XrmValuePtr /* args */, /* Display */ - Cardinal* /* num_args */, + Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ @@ -2264,7 +2292,7 @@ extern Boolean XtCvtStringToAtom( extern Boolean XtCvtStringToBool( Display* /* dpy */, XrmValuePtr /* args */, /* none */ - Cardinal* /* num_args */, + Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ @@ -2273,7 +2301,7 @@ extern Boolean XtCvtStringToBool( extern Boolean XtCvtStringToBoolean( Display* /* dpy */, XrmValuePtr /* args */, /* none */ - Cardinal* /* num_args */, + Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ @@ -2282,7 +2310,7 @@ extern Boolean XtCvtStringToBoolean( extern Boolean XtCvtStringToCommandArgArray( Display* /* dpy */, XrmValuePtr /* args */, /* none */ - Cardinal* /* num_args */, + Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ @@ -2291,7 +2319,7 @@ extern Boolean XtCvtStringToCommandArgArray( extern Boolean XtCvtStringToCursor( Display* /* dpy */, XrmValuePtr /* args */, /* Display */ - Cardinal* /* num_args */, + Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ @@ -2300,7 +2328,7 @@ extern Boolean XtCvtStringToCursor( extern Boolean XtCvtStringToDimension( Display* /* dpy */, XrmValuePtr /* args */, /* none */ - Cardinal* /* num_args */, + Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ @@ -2309,7 +2337,7 @@ extern Boolean XtCvtStringToDimension( extern Boolean XtCvtStringToDirectoryString( Display* /* dpy */, XrmValuePtr /* args */, /* none */ - Cardinal* /* num_args */, + Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ @@ -2318,7 +2346,7 @@ extern Boolean XtCvtStringToDirectoryString( extern Boolean XtCvtStringToDisplay( Display* /* dpy */, XrmValuePtr /* args */, /* none */ - Cardinal* /* num_args */, + Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ @@ -2327,7 +2355,7 @@ extern Boolean XtCvtStringToDisplay( extern Boolean XtCvtStringToFile( Display* /* dpy */, XrmValuePtr /* args */, /* none */ - Cardinal* /* num_args */, + Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ @@ -2336,7 +2364,7 @@ extern Boolean XtCvtStringToFile( extern Boolean XtCvtStringToFloat( Display* /* dpy */, XrmValuePtr /* args */, /* none */ - Cardinal* /* num_args */, + Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ @@ -2345,7 +2373,7 @@ extern Boolean XtCvtStringToFloat( extern Boolean XtCvtStringToFont( Display* /* dpy */, XrmValuePtr /* args */, /* Display */ - Cardinal* /* num_args */, + Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ @@ -2354,7 +2382,7 @@ extern Boolean XtCvtStringToFont( extern Boolean XtCvtStringToFontSet( Display* /* dpy */, XrmValuePtr /* args */, /* Display, locale */ - Cardinal* /* num_args */, + Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ @@ -2363,7 +2391,7 @@ extern Boolean XtCvtStringToFontSet( extern Boolean XtCvtStringToFontStruct( Display* /* dpy */, XrmValuePtr /* args */, /* Display */ - Cardinal* /* num_args */, + Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ @@ -2372,7 +2400,7 @@ extern Boolean XtCvtStringToFontStruct( extern Boolean XtCvtStringToGravity( Display* /* dpy */, XrmValuePtr /* args */, - Cardinal* /* num_args */, + Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ @@ -2381,7 +2409,7 @@ extern Boolean XtCvtStringToGravity( extern Boolean XtCvtStringToInitialState( Display* /* dpy */, XrmValuePtr /* args */, /* none */ - Cardinal* /* num_args */, + Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ @@ -2390,7 +2418,7 @@ extern Boolean XtCvtStringToInitialState( extern Boolean XtCvtStringToInt( Display* /* dpy */, XrmValuePtr /* args */, /* none */ - Cardinal* /* num_args */, + Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ @@ -2399,7 +2427,7 @@ extern Boolean XtCvtStringToInt( extern Boolean XtCvtStringToPixel( Display* /* dpy */, XrmValuePtr /* args */, /* Screen, Colormap */ - Cardinal* /* num_args */, + Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ @@ -2410,7 +2438,7 @@ extern Boolean XtCvtStringToPixel( extern Boolean XtCvtStringToRestartStyle( Display* /* dpy */, XrmValuePtr /* args */, /* none */ - Cardinal* /* num_args */, + Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ @@ -2419,7 +2447,7 @@ extern Boolean XtCvtStringToRestartStyle( extern Boolean XtCvtStringToShort( Display* /* dpy */, XrmValuePtr /* args */, /* none */ - Cardinal* /* num_args */, + Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ @@ -2428,7 +2456,7 @@ extern Boolean XtCvtStringToShort( extern Boolean XtCvtStringToTranslationTable( Display* /* dpy */, XrmValuePtr /* args */, /* none */ - Cardinal* /* num_args */, + Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ @@ -2437,7 +2465,7 @@ extern Boolean XtCvtStringToTranslationTable( extern Boolean XtCvtStringToUnsignedChar( Display* /* dpy */, XrmValuePtr /* args */, /* none */ - Cardinal* /* num_args */, + Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ @@ -2446,7 +2474,7 @@ extern Boolean XtCvtStringToUnsignedChar( extern Boolean XtCvtStringToVisual( Display* /* dpy */, XrmValuePtr /* args */, /* Screen, depth */ - Cardinal* /* num_args */, + Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ @@ -2457,7 +2485,7 @@ extern Boolean XtCvtStringToVisual( extern Boolean XtCvtIntToBool( Display* /* dpy */, XrmValuePtr /* args */, /* none */ - Cardinal* /* num_args */, + Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ @@ -2466,7 +2494,7 @@ extern Boolean XtCvtIntToBool( extern Boolean XtCvtIntToBoolean( Display* /* dpy */, XrmValuePtr /* args */, /* none */ - Cardinal* /* num_args */, + Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ @@ -2475,7 +2503,7 @@ extern Boolean XtCvtIntToBoolean( extern Boolean XtCvtIntToColor( Display* /* dpy */, XrmValuePtr /* args */, /* Screen, Colormap */ - Cardinal* /* num_args */, + Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ @@ -2486,7 +2514,7 @@ extern Boolean XtCvtIntToColor( extern Boolean XtCvtIntToFloat( Display* /* dpy */, XrmValuePtr /* args */, /* none */ - Cardinal* /* num_args */, + Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ @@ -2495,7 +2523,7 @@ extern Boolean XtCvtIntToFloat( extern Boolean XtCvtIntToFont( Display* /* dpy */, XrmValuePtr /* args */, /* none */ - Cardinal* /* num_args */, + Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ @@ -2504,7 +2532,7 @@ extern Boolean XtCvtIntToFont( extern Boolean XtCvtIntToPixel( Display* /* dpy */, XrmValuePtr /* args */, /* none */ - Cardinal* /* num_args */, + Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ @@ -2513,7 +2541,7 @@ extern Boolean XtCvtIntToPixel( extern Boolean XtCvtIntToPixmap( Display* /* dpy */, XrmValuePtr /* args */, /* none */ - Cardinal* /* num_args */, + Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ @@ -2524,7 +2552,7 @@ extern Boolean XtCvtIntToPixmap( extern Boolean XtCvtIntToShort( Display* /* dpy */, XrmValuePtr /* args */, /* none */ - Cardinal* /* num_args */, + Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ @@ -2533,7 +2561,7 @@ extern Boolean XtCvtIntToShort( extern Boolean XtCvtIntToUnsignedChar( Display* /* dpy */, XrmValuePtr /* args */, /* none */ - Cardinal* /* num_args */, + Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ @@ -2544,7 +2572,7 @@ extern Boolean XtCvtIntToUnsignedChar( extern Boolean XtCvtColorToPixel( Display* /* dpy */, XrmValuePtr /* args */, /* none */ - Cardinal* /* num_args */, + Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ diff --git a/include/X11/IntrinsicI.h b/include/X11/IntrinsicI.h index 9ce362c..6cdbc70 100644 --- a/include/X11/IntrinsicI.h +++ b/include/X11/IntrinsicI.h @@ -29,13 +29,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 @@ -117,16 +117,18 @@ SOFTWARE. #ifdef UNALIGNED #define XtMemmove(dst, src, size) \ - if (size == sizeof(int)) \ - *((int *) (dst)) = *((int *) (src)); \ - else if (size == sizeof(char)) \ - *((char *) (dst)) = *((char *) (src)); \ - else if (size == sizeof(short)) \ - *((short *) (dst)) = *((short *) (src)); \ - else \ - (void) memcpy((char *) (dst), (char *) (src), (int) (size)) - -#define XtBZero(dst, size) \ + if ((char *)(dst) != (char *)(src)) { \ + if (size == sizeof(int)) \ + *((int *) (dst)) = *((int *) (src)); \ + else if (size == sizeof(char)) \ + *((char *) (dst)) = *((char *) (src)); \ + else if (size == sizeof(short)) \ + *((short *) (dst)) = *((short *) (src)); \ + else \ + (void) memcpy((char *) (dst), (char *) (src), (int) (size)); \ + } + +#define XtBZero(dst, size) \ if (size == sizeof(int)) \ *((int *) (dst)) = 0; \ else \ @@ -141,7 +143,9 @@ SOFTWARE. #else #define XtMemmove(dst, src, size) \ - (void) memcpy((char *) (dst), (char *) (src), (int) (size)) + if ((char *)(dst) != (char *)(src)) { \ + (void) memcpy((char *) (dst), (char *) (src), (int) (size)); \ + } #define XtBZero(dst, size) \ bzero((char *) (dst), (int) (size)) @@ -164,7 +168,7 @@ SOFTWARE. : XtMalloc((unsigned)(size))) #define XtStackFree(pointer, stack_cache_array) \ - if ((pointer) != ((XtPointer)(stack_cache_array))) XtFree(pointer); else + { if ((pointer) != ((XtPointer)(stack_cache_array))) XtFree(pointer); } /*************************************************************** * @@ -225,7 +229,7 @@ extern void _XtGClistFree(Display *dpy, XtPerDisplay pd); extern void _XtGeoTab (int); extern void _XtGeoTrace ( - Widget widget, + Widget widget, ... ); @@ -233,7 +237,7 @@ extern void _XtGeoTrace ( #else /* XT_GEO_TATTLER */ -#define CALLGEOTAT(f) +#define CALLGEOTAT(f) #endif /* XT_GEO_TATTLER */ diff --git a/include/X11/IntrinsicP.h b/include/X11/IntrinsicP.h index aa0155d..517c55d 100644 --- a/include/X11/IntrinsicP.h +++ b/include/X11/IntrinsicP.h @@ -29,13 +29,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 @@ -212,30 +212,37 @@ typedef struct _XtTMRec { #define XtParent(widget) ((widget)->core.parent) #undef XtIsRectObj +extern Boolean XtIsRectObj(Widget); #define XtIsRectObj(obj) \ (((Object)(obj))->object.widget_class->core_class.class_inited & 0x02) #undef XtIsWidget +extern Boolean XtIsWidget(Widget); #define XtIsWidget(obj) \ (((Object)(obj))->object.widget_class->core_class.class_inited & 0x04) #undef XtIsComposite +extern Boolean XtIsComposite(Widget); #define XtIsComposite(obj) \ (((Object)(obj))->object.widget_class->core_class.class_inited & 0x08) #undef XtIsConstraint +extern Boolean XtIsConstraint(Widget); #define XtIsConstraint(obj) \ (((Object)(obj))->object.widget_class->core_class.class_inited & 0x10) #undef XtIsShell +extern Boolean XtIsShell(Widget); #define XtIsShell(obj) \ (((Object)(obj))->object.widget_class->core_class.class_inited & 0x20) #undef XtIsWMShell +extern Boolean XtIsWMShell(Widget); #define XtIsWMShell(obj) \ (((Object)(obj))->object.widget_class->core_class.class_inited & 0x40) #undef XtIsTopLevelShell +extern Boolean XtIsTopLevelShell(Widget); #define XtIsTopLevelShell(obj) \ (((Object)(obj))->object.widget_class->core_class.class_inited & 0x80) @@ -266,6 +273,12 @@ extern void _XtInherit( void ); +extern void _XtHandleFocus( + Widget /* widget */, + XtPointer /* client_data */, + XEvent * /* event */, + Boolean * /* cont */); + extern void XtCreateWindow( Widget /* widget */, unsigned int /* window_class */, diff --git a/include/X11/ResourceI.h b/include/X11/ResourceI.h index 488a160..d6ed1df 100644 --- a/include/X11/ResourceI.h +++ b/include/X11/ResourceI.h @@ -29,13 +29,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 @@ -61,6 +61,13 @@ SOFTWARE. #define StringToName(string) XrmStringToName(string) #define StringToClass(string) XrmStringToClass(string) +extern void _XtDependencies( + XtResourceList * /* class_resp */, + Cardinal * /* class_num_resp */, + XrmResourceList * /* super_res */, + Cardinal /* super_num_res */, + Cardinal /* super_widget_size */); + extern void _XtResourceDependencies( WidgetClass /* wc */ ); diff --git a/include/X11/SelectionI.h b/include/X11/SelectionI.h index fdc3c91..e589aec 100644 --- a/include/X11/SelectionI.h +++ b/include/X11/SelectionI.h @@ -29,13 +29,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 @@ -65,7 +65,7 @@ typedef struct _RequestRec { int format; XtPointer value; unsigned long bytelength; - int offset; + unsigned long offset; XtIntervalId timeout; XSelectionRequestEvent event; /* for XtGetSelectionRequest */ Boolean allSent; @@ -110,7 +110,7 @@ typedef struct _ParamRec { typedef struct _ParamInfoRec { unsigned int count; Param paramlist; -} ParamInfoRec, *ParamInfo; +} ParamInfoRec, *ParamInfo; typedef struct _QueuedRequestRec { Atom selection; diff --git a/include/X11/TranslateI.h b/include/X11/TranslateI.h index f67f6e2..1224875 100644 --- a/include/X11/TranslateI.h +++ b/include/X11/TranslateI.h @@ -29,13 +29,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 @@ -159,7 +159,7 @@ typedef struct _TMSimpleStateTreeRec{ TMShortCard unused; /* to ensure same alignment */ TMBranchHeadRec *branchHeadTbl; XrmQuark *quarkTbl; /* table of quarkified rhs*/ -}TMSimpleStateTreeRec, *TMSimpleStateTree; +}TMSimpleStateTreeRec, *TMSimpleStateTree; /* NOTE: elements of this structure must match those of * TMSimpleStateTreeRec and TMParseStateTreeRec. @@ -175,7 +175,7 @@ typedef struct _TMComplexStateTreeRec{ TMBranchHeadRec *branchHeadTbl; XrmQuark *quarkTbl; /* table of quarkified rhs*/ StatePtr *complexBranchHeadTbl; -}TMComplexStateTreeRec, *TMComplexStateTree; +}TMComplexStateTreeRec, *TMComplexStateTree; /* NOTE: elements of this structure must match those of * TMSimpleStateTreeRec and TMComplexStateTreeRec. @@ -198,7 +198,7 @@ typedef struct _TMParseStateTreeRec{ TMShortCard quarkTblSize; /*total size of quarkTbl */ TMShortCard complexBranchHeadTblSize; StatePtr head; -}TMParseStateTreeRec, *TMParseStateTree; +}TMParseStateTreeRec, *TMParseStateTree; typedef union _TMStateTreeRec{ TMSimpleStateTreeRec simple; @@ -242,13 +242,13 @@ typedef struct _TranslationData{ }TranslationData; /* - * ATranslations is returned by GetValues for translations that contain + * ATranslations is returned by GetValues for translations that contain * accelerators. The TM can differentiate between this and TranslationData * (that don't have a bindTbl) by looking at the first field (hasBindings) - * of either structure. All ATranslationData structures associated with a - * widget are chained off the BindData record of the widget. + * of either structure. All ATranslationData structures associated with a + * widget are chained off the BindData record of the widget. */ -typedef struct _ATranslationData{ +typedef struct _ATranslationData{ unsigned char hasBindings; /* must be first */ unsigned char operation; struct _TranslationData *xlations; /* actual translations */ @@ -371,7 +371,7 @@ extern TMGlobalRec _XtGlobalTM; if (pd->keysyms == NULL) \ _XtBuildKeysymTables(dpy, pd) -/* +/* * Internal Functions */ @@ -498,6 +498,10 @@ extern Boolean _XtCvtMergeTranslations( XtPointer* /* closure_ret */ ); +void _XtRemoveStateTreeByIndex( + XtTranslations /* xlations */, + TMShortCard /* i */); + void _XtFreeTranslations( XtAppContext /* app */, XrmValuePtr /* toVal */, @@ -509,7 +513,7 @@ void _XtFreeTranslations( extern TMShortCard _XtGetModifierIndex( Event* /* event */ ); - + extern TMShortCard _XtGetQuarkIndex( TMParseStateTree /* stateTreePtr */, XrmQuark /* quark */ @@ -558,6 +562,10 @@ extern String _XtPrintActions( XrmQuark* /* quarkTbl */ ); +extern String _XtPrintState( + TMStateTree /* stateTree */, + TMBranchHead /* branchHead */); + extern String _XtPrintEventSeq( EventSeqPtr /* eventSeq */, Display* /* dpy */ @@ -567,10 +575,10 @@ typedef Boolean (*_XtTraversalProc)( StatePtr /* state */, XtPointer /* data */ ); - + extern void _XtTraverseStateTree( TMStateTree /* tree */, - _XtTraversalProc /* func */, + _XtTraversalProc /* func */, XtPointer /* data */ ); |