merge XFree86 4.3.0.1 to -CURRENT

12 files changed, 104 insertions, 56 deletions

diff --git a/include/X11/ConvertI.h b/include/X11/ConvertI.h
index b773b6f..13689ab 100644
--- a/include/X11/ConvertI.h
+++ b/include/X11/ConvertI.h
@@ -46,6 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
+/* $XFree86: xc/lib/Xt/ConvertI.h,v 1.3 2001/12/14 19:56:09 dawes Exp $ */
 
 /* Representation types */
 
@@ -101,3 +102,5 @@ extern Boolean _XtConvert(
 #endif			  
 );
 
+void _XtConvertInitialize(void);
+
diff --git a/include/X11/EventI.h b/include/X11/EventI.h
index aabdc08..73c9770 100644
--- a/include/X11/EventI.h
+++ b/include/X11/EventI.h
@@ -47,6 +47,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
+/* $XFree86: xc/lib/Xt/EventI.h,v 1.3 2001/12/14 19:56:12 dawes Exp $ */
 
 /* 
  * Event.h - exported types and functions for toolkit event handler
@@ -62,6 +63,8 @@ SOFTWARE.
 
 typedef struct _XtGrabRec  *XtGrabList;
 
+#include "PassivGraI.h"
+
 extern void _XtEventInitialize(
 #if NeedFunctionPrototypes
     void
@@ -124,4 +127,16 @@ extern EventMask _XtConvertTypeToMask(
 #endif
 );
 
+/* EventUtil.c */
+extern Widget _XtFindRemapWidget(XEvent *event, Widget widget,
+				 EventMask mask, XtPerDisplayInput pdi);
+extern void _XtUngrabBadGrabs(XEvent *event, Widget widget,
+				 EventMask mask, XtPerDisplayInput pdi);
+extern void _XtFillAncestorList(Widget **listPtr, int *maxElemsPtr,
+				int *numElemsPtr, Widget start,
+				Widget breakWidget);
+
+/* NextEvent.c */
+extern Boolean XtAppPeekEvent_SkipTimer;
+
 #endif /* _Event_h_ */
diff --git a/include/X11/InitialI.h b/include/X11/InitialI.h
index 9a01356..0fe1d25 100644
--- a/include/X11/InitialI.h
+++ b/include/X11/InitialI.h
@@ -46,6 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
+/* $XFree86: xc/lib/Xt/InitialI.h,v 3.10 2001/12/14 19:56:18 dawes Exp $ */
 
 #ifndef _XtinitialI_h
 #define _XtinitialI_h
@@ -80,6 +81,7 @@ SOFTWARE.
 #endif
 #endif
 
+#include <X11/Xos.h>
 #include <X11/Xpoll.h>
 
 typedef struct _TimerEventRec {
@@ -199,6 +201,9 @@ typedef struct _XtAppStruct {
 #endif
 } XtAppStruct;
 
+extern void _XtHeapInit(Heap* heap);
+extern void _XtHeapFree(Heap* heap);
+
 #ifdef XTTRACEMEMORY
 
 
@@ -457,4 +462,10 @@ extern void _XtFreeWWTable(
 #endif
 );
 
+extern String _XtGetUserName(String dest, int len);
+extern XrmDatabase _XtPreparseCommandLine(XrmOptionDescRec *urlist,
+			Cardinal num_urs, int argc, String *argv,
+			String *applName, String *displayName,
+			String *language);
+
 #endif /* _XtinitialI_h */
diff --git a/include/X11/Intrinsic.h b/include/X11/Intrinsic.h
index bae18eb..3d41150 100644
--- a/include/X11/Intrinsic.h
+++ b/include/X11/Intrinsic.h
@@ -48,6 +48,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
+/* $XFree86: xc/lib/Xt/Intrinsic.h,v 3.8 2001/12/14 19:56:22 dawes Exp $ */
 
 #ifndef _XtIntrinsic_h
 #define _XtIntrinsic_h
@@ -60,15 +61,7 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xos.h>		/* for R4 compatibility */
 #else
 #include <X11/Xosdefs.h>
-#ifndef X_NOT_STDC_ENV
 #include <string.h>		/* for XtNewString */
-#else
-#ifdef SYSV
-#include <string.h>
-#else
-#include <strings.h>
-#endif /* SYSV else */
-#endif /* !X_NOT_STDC_ENV else */
 #endif /* XT_BC else */
 
 #define XtSpecificationRelease 6
@@ -101,9 +94,7 @@ typedef char *String;
 
 #endif /* NeedFunctionPrototypes */
 
-#ifndef NULL
-#define NULL 0
-#endif
+#include <stddef.h>
 
 #ifdef VMS
 #define externalref globalref
@@ -750,13 +741,8 @@ extern void XtDisplayStringConversionWarning(
 #endif
 );
 
-#ifdef __STDC__
 externalref XtConvertArgRec const colorConvertArgs[];
 externalref XtConvertArgRec const screenConvertArg[];
-#else
-externalref XtConvertArgRec colorConvertArgs[];
-externalref XtConvertArgRec screenConvertArg[];
-#endif
 
 extern void XtAppAddConverter( /* obsolete */
 #if NeedFunctionPrototypes
@@ -2057,25 +2043,11 @@ extern void XtGetConstraintResourceList(
 #define XtDefaultFont		"XtDefaultFont"
 #define XtDefaultFontSet	"XtDefaultFontSet"
 
-#if defined(CRAY) || defined(__arm)
-#if __STDC__
+#if defined(CRAY)
 #define XtOffset(p_type,field) _Offsetof(p_type,field)
-#else
-#ifdef CRAY2
-#define XtOffset(p_type,field) \
-	(sizeof(int)*((unsigned int)&(((p_type)NULL)->field)))
-
-#else	/* !CRAY2 */
-
-#define XtOffset(p_type,field) ((unsigned int)&(((p_type)NULL)->field))
-
-#endif	/* !CRAY2 */
-#endif  /* __STDC__ */
-#else	/* ! (CRAY || __arm) */
-
+#else	/* ! CRAY */
 #define XtOffset(p_type,field) \
 	((Cardinal) (((char *) (&(((p_type)NULL)->field))) - ((char *) NULL)))
-
 #endif /* !CRAY */
 
 #ifdef offsetof
diff --git a/include/X11/IntrinsicI.h b/include/X11/IntrinsicI.h
index 3771dca..d1e000c 100644
--- a/include/X11/IntrinsicI.h
+++ b/include/X11/IntrinsicI.h
@@ -46,6 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
+/* $XFree86: xc/lib/Xt/IntrinsicI.h,v 3.8 2001/12/14 19:56:25 dawes Exp $ */
 
 #ifndef _XtintrinsicI_h
 #define _XtintrinsicI_h
@@ -64,14 +65,6 @@ SOFTWARE.
 
 #include "ConvertI.h"
 #include "TranslateI.h"
-#include "CallbackI.h"
-#include "EventI.h"
-#include "HookObjI.h"
-#include "PassivGraI.h"
-#include "ThreadsI.h"
-#include "InitialI.h"
-#include "ResourceI.h"
-#include "StringDefs.h"
 
 #define RectObjClassFlag	0x02
 #define WidgetClassFlag		0x04
@@ -233,16 +226,17 @@ extern void _XtAddShellToHookObj(
 #endif
 );
 
+/* GCManager.c */
+extern void _XtGClistFree(Display *dpy, XtPerDisplay pd);
+
 /** GeoTattler stuff */
 
 #ifdef XT_GEO_TATTLER
 
 extern void _XtGeoTab ();
 extern void _XtGeoTrace (
-#if NeedVarargsPrototypes
 			    Widget widget, 
 			    ...
-#endif
 );
 
 #define CALLGEOTAT(f) f
diff --git a/include/X11/PassivGraI.h b/include/X11/PassivGraI.h
index ee240cf..178c5ef 100644
--- a/include/X11/PassivGraI.h
+++ b/include/X11/PassivGraI.h
@@ -51,6 +51,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
+/* $XFree86: xc/lib/Xt/PassivGraI.h,v 1.3 2001/12/14 19:56:27 dawes Exp $ */
 
 #ifndef _PDI_h_
 #define _PDI_h_
@@ -192,4 +193,10 @@ extern void _XtRegisterPassiveGrabs(
 #endif
 );
 
+extern void _XtClearAncestorCache(
+#if NeedFunctionPrototypes
+    Widget		/* widget */
+#endif
+);
+
 #endif /* _PDI_h_ */
diff --git a/include/X11/ResConfigP.h b/include/X11/ResConfigP.h
index b717fd6..60f9414 100644
--- a/include/X11/ResConfigP.h
+++ b/include/X11/ResConfigP.h
@@ -52,10 +52,15 @@ dealings in this Software without prior written authorization from the IBM
 Corporation.
 
 ******************************************************************/
+/* $XFree86: xc/lib/Xt/ResConfigP.h,v 3.7 2001/12/20 19:40:59 tsi Exp $ */
 
 #ifndef _RESCONFIGP_H
 #define _RESCONFIGP_H
 
+#include <X11/Xfuncproto.h>
+
+_XFUNCPROTOBEGIN
+
 /*
  * Atom names for resource configuration management customization tool.
  */
@@ -70,4 +75,6 @@ extern void _XtResourceConfigurationEH(
 #endif
 );
 
+_XFUNCPROTOEND
+
 #endif
diff --git a/include/X11/ResourceI.h b/include/X11/ResourceI.h
index 35c39eb..7a9d5a0 100644
--- a/include/X11/ResourceI.h
+++ b/include/X11/ResourceI.h
@@ -46,6 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
+/* $XFree86: xc/lib/Xt/ResourceI.h,v 1.5 2001/12/14 19:56:28 dawes Exp $ */
 
 /****************************************************************
  *
@@ -53,6 +54,9 @@ SOFTWARE.
  *
  ****************************************************************/
 
+#ifndef _XtresourceI_h
+#define _XtresourceI_h
+
 #define StringToQuark(string) XrmStringToQuark(string)
 #define StringToName(string) XrmStringToName(string)
 #define StringToClass(string) XrmStringToClass(string)
@@ -86,3 +90,12 @@ extern void _XtCopyFromParent(
     XrmValue*		/* value */
 #endif
 );
+
+extern void _XtCopyToArg(char *src, XtArgVal *dst, unsigned int size);
+extern void _XtCopyFromArg(XtArgVal src, char *dst, unsigned int size);
+extern XrmResourceList* _XtCreateIndirectionTable(XtResourceList resources,
+						  Cardinal num_resources);
+extern void _XtResourceListInitialize(void);
+
+
+#endif /* _XtresourceI_h */
diff --git a/include/X11/ThreadsI.h b/include/X11/ThreadsI.h
index 93cda63..3b51e07 100644
--- a/include/X11/ThreadsI.h
+++ b/include/X11/ThreadsI.h
@@ -53,6 +53,11 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
+/* $XFree86: xc/lib/Xt/ThreadsI.h,v 3.5 2001/12/14 19:56:31 dawes Exp $ */
+
+#ifndef _XtThreadsI_h
+#define _XtThreadsI_h
+
 #ifdef XTHREADS
 
 typedef struct _LockRec *LockPtr;
@@ -132,3 +137,4 @@ extern void (*_XtInitAppLock)(
 #define DPY_TO_APPCON(d)
 
 #endif /* !defined(XTHREADS) */
+#endif /* _XtThreadsI_h */
diff --git a/include/X11/TranslateI.h b/include/X11/TranslateI.h
index 760e6e6..bb86ee2 100644
--- a/include/X11/TranslateI.h
+++ b/include/X11/TranslateI.h
@@ -46,6 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
+/* $XFree86: xc/lib/Xt/TranslateI.h,v 1.3 2001/12/14 19:56:32 dawes Exp $ */
 
 /* 
  * TranslateI.h - Header file private to translation management
@@ -70,8 +71,13 @@ typedef unsigned short TMShortCard;
 typedef unsigned long TMLongCard;
 typedef short TMShortInt;
 
-typedef Boolean (*MatchProc)();
-    /* Event *parsed, TMEventPtr incoming */
+typedef struct _TMTypeMatchRec *TMTypeMatch;
+typedef struct _TMModifierMatchRec *TMModifierMatch;
+typedef struct _TMEventRec *TMEventPtr;
+
+typedef Boolean (*MatchProc)(TMTypeMatch typeMatch,
+			     TMModifierMatch modMatch,
+			     TMEventPtr eventSeq);
 
 typedef struct _ModToKeysymTable {
     Modifiers mask;
@@ -122,14 +128,14 @@ typedef struct _TMModifierMatchRec{
     TMLongCard	 modifierMask;
     LateBindingsPtr lateModifiers;
     Boolean	 standard;
-}TMModifierMatchRec, *TMModifierMatch;
+}TMModifierMatchRec;
 
 typedef struct _TMTypeMatchRec{
     TMLongCard	 eventType;
     TMLongCard	 eventCode;
     TMLongCard	 eventCodeMask;
     MatchProc	 matchEvent;
-}TMTypeMatchRec, *TMTypeMatch;
+}TMTypeMatchRec;
 
 typedef struct _TMBranchHeadRec {
     unsigned int	isSimple:1;
@@ -284,7 +290,7 @@ typedef EventSeqPtr EventPtr;
 typedef struct _TMEventRec {
     XEvent *xev;
     Event event;
-}TMEventRec,*TMEventPtr;
+}TMEventRec;
 
 typedef struct _ActionHookRec {
     struct _ActionHookRec* next; /* must remain first */
@@ -446,7 +452,16 @@ extern void _XtTranslateEvent(
 #endif
 );
 
-extern void _XtBuildKeysymTables();
+#include "CallbackI.h"
+#include "EventI.h"
+#include "HookObjI.h"
+#include "PassivGraI.h"
+#include "ThreadsI.h"
+#include "InitialI.h"
+#include "ResourceI.h"
+#include "StringDefs.h"
+
+extern void _XtBuildKeysymTables(Display *dpy, XtPerDisplay pd);
 
 #ifndef NO_MIT_HACKS
 extern void  _XtDisplayTranslations(
@@ -653,3 +668,7 @@ extern void _XtUnmergeTranslations(
     XtTranslations 	/* xlations */
 #endif
 );
+
+/* TMKey.c */
+extern void _XtAllocTMContext(XtPerDisplay pd);
+
diff --git a/include/X11/VarargsI.h b/include/X11/VarargsI.h
index 114905b..6e4bd60 100644
--- a/include/X11/VarargsI.h
+++ b/include/X11/VarargsI.h
@@ -25,17 +25,12 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
+/* $XFree86: xc/lib/Xt/VarargsI.h,v 3.6 2001/12/14 19:56:32 dawes Exp $ */
 
 #ifndef _VarargsI_h_ 
 #define _VarargsI_h_ 
 
-#if NeedVarargsPrototypes
-# include <stdarg.h>
-# define Va_start(a,b) va_start(a,b)
-#else
-# include <varargs.h>
-# define Va_start(a,b) va_start(a)
-#endif
+#include <stdarg.h>
  
 /* private routines */
 
diff --git a/include/X11/Xtos.h b/include/X11/Xtos.h
index a512d1e..3b1b91d 100644
--- a/include/X11/Xtos.h
+++ b/include/X11/Xtos.h
@@ -48,6 +48,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
+/* $XFree86: xc/lib/Xt/Xtos.h,v 3.10 2002/04/04 14:05:35 eich Exp $ */
 
 #ifndef _Xtos_h
 #define _Xtos_h
@@ -60,7 +61,12 @@ SOFTWARE.
 #define WORD64
 #endif
 
-#ifdef __alpha
+#if defined(__alpha) || defined(__alpha__) || \
+    defined(__ia64__) || defined(ia64) || \
+    defined(__sparc64__) || \
+    defined(__s390x__) || \
+    (defined(__hppa__) && defined(__LP64__)) || \
+    defined(__x86_64__) || defined(x86_64)
 #define LONG64
 #endif