svn merge ^/branches/released .

1 files changed, 185 insertions, 190 deletions

diff --git a/libXt/include/X11/PassivGraI.h b/libXt/include/X11/PassivGraI.h
index 10591ac4d..cd401cd46 100644
--- a/libXt/include/X11/PassivGraI.h
+++ b/libXt/include/X11/PassivGraI.h
@@ -1,190 +1,185 @@
-/*
-* $Xorg: PassivGraI.h,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $
-*/
-
-/********************************************************
-
-Copyright 1988 by Hewlett-Packard Company
-Copyright 1987, 1988, 1989 by Digital Equipment Corporation, Maynard
-
-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 supporting documentation, and that the names of 
-Hewlett-Packard or Digital not be used in advertising or 
-publicity pertaining to distribution of the 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
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-********************************************************/
-
-/*
-
-Copyright 1987, 1988, 1989, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-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_
-
-
-#define KEYBOARD TRUE
-#define POINTER  FALSE
-
-_XFUNCPROTOBEGIN
-
-typedef enum {
-    XtNoServerGrab, 
-    XtPassiveServerGrab,
-    XtActiveServerGrab,
-    XtPseudoPassiveServerGrab,
-    XtPseudoActiveServerGrab
-}XtServerGrabType;
-
-typedef struct _XtServerGrabRec {
-    struct _XtServerGrabRec 	*next;
-    Widget			widget;
-    unsigned int		ownerEvents:1;
-    unsigned int		pointerMode:1;
-    unsigned int		keyboardMode:1;
-    unsigned int		hasExt:1;
-    unsigned int		confineToIsWidgetWin:1;
-    KeyCode			keybut;
-    unsigned short		modifiers;
-    unsigned short		eventMask;
-} XtServerGrabRec, *XtServerGrabPtr;
-
-typedef struct _XtGrabExtRec {
-    Mask			*pKeyButMask;
-    Mask			*pModifiersMask;
-    Window			confineTo;
-    Cursor			cursor;
-} XtServerGrabExtRec, *XtServerGrabExtPtr;
-
-#define GRABEXT(p) ((XtServerGrabExtPtr)((p)+1))
-
-typedef struct _XtDeviceRec{
-    XtServerGrabRec	grab; 	/* need copy in order to protect
-				   during grab */
-    XtServerGrabType	grabType;
-}XtDeviceRec, *XtDevice;
-
-#define XtMyAncestor	0
-#define XtMyDescendant	1
-#define XtMyCousin	2
-#define XtMySelf	3
-#define XtUnrelated	4
-typedef char XtGeneology; /* do not use an enum makes PerWidgetInput larger */
-
-typedef struct {
-    Widget		focusKid;
-    XtServerGrabPtr	keyList, ptrList;
-    Widget		queryEventDescendant;
-    unsigned int	map_handler_added:1;
-    unsigned int	realize_handler_added:1;
-    unsigned int	active_handler_added:1;
-    unsigned int	haveFocus:1;
-    XtGeneology		focalPoint;
-}XtPerWidgetInputRec, *XtPerWidgetInput;
-
-typedef struct XtPerDisplayInputRec{
-    XtGrabList 	grabList;
-    XtDeviceRec keyboard, pointer;
-    KeyCode	activatingKey;
-    Widget 	*trace;
-    int		traceDepth, traceMax;
-    Widget 	focusWidget;
-}XtPerDisplayInputRec, *XtPerDisplayInput;
-
-#define IsServerGrab(g) ((g == XtPassiveServerGrab) ||\
-			 (g == XtActiveServerGrab))
-
-#define IsAnyGrab(g) ((g == XtPassiveServerGrab) ||\
-		      (g == XtActiveServerGrab)  ||\
-		      (g == XtPseudoPassiveServerGrab))
-
-#define IsEitherPassiveGrab(g) ((g == XtPassiveServerGrab) ||\
-				(g == XtPseudoPassiveServerGrab))
-
-#define IsPseudoGrab(g) ((g == XtPseudoPassiveServerGrab))
-
-extern void _XtDestroyServerGrabs(
-    Widget		/* w */,
-    XtPointer		/* pwi */, /*XtPerWidgetInput*/
-    XtPointer		/* call_data */
-);
-
-extern XtPerWidgetInput _XtGetPerWidgetInput(
-    Widget	/* widget */,
-    _XtBoolean	/* create */
-);
-
-extern XtServerGrabPtr _XtCheckServerGrabsOnWidget(
-    XEvent*		/* event */,
-    Widget		/* widget */,
-    _XtBoolean		/* isKeyboard */
-);
-
-/*
-extern XtGrabList* _XtGetGrabList( XtPerDisplayInput );
-*/
-
-#define _XtGetGrabList(pdi) (&(pdi)->grabList)
-
-extern void _XtFreePerWidgetInput(
-    Widget		/* w */,
-    XtPerWidgetInput	/* pwi */
-);
-
-extern Widget _XtProcessKeyboardEvent(
-    XKeyEvent*		/* event */,
-    Widget		/* widget */,
-    XtPerDisplayInput	/* pdi */
-);
-
-extern Widget _XtProcessPointerEvent(
-    XButtonEvent*	/* event */,
-    Widget		/* widget */,
-    XtPerDisplayInput	/* pdi */
-);
-
-extern void _XtRegisterPassiveGrabs(
-    Widget		/* widget */
-);
-
-extern void _XtClearAncestorCache(
-    Widget		/* widget */
-);
-
-_XFUNCPROTOEND
-
-#endif /* _PDI_h_ */
+/********************************************************

+

+Copyright 1988 by Hewlett-Packard Company

+Copyright 1987, 1988, 1989 by Digital Equipment Corporation, Maynard

+

+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 supporting documentation, and that the names of 

+Hewlett-Packard or Digital not be used in advertising or 

+publicity pertaining to distribution of the 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

+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR

+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,

+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,

+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS

+SOFTWARE.

+

+********************************************************/

+

+/*

+

+Copyright 1987, 1988, 1989, 1998  The Open Group

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation.

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of The Open Group shall not be

+used in advertising or otherwise to promote the sale, use or other dealings

+in this Software without prior written authorization from The Open Group.

+

+*/

+

+#ifndef _PDI_h_

+#define _PDI_h_

+

+

+#define KEYBOARD TRUE

+#define POINTER  FALSE

+

+_XFUNCPROTOBEGIN

+

+typedef enum {

+    XtNoServerGrab, 

+    XtPassiveServerGrab,

+    XtActiveServerGrab,

+    XtPseudoPassiveServerGrab,

+    XtPseudoActiveServerGrab

+}XtServerGrabType;

+

+typedef struct _XtServerGrabRec {

+    struct _XtServerGrabRec 	*next;

+    Widget			widget;

+    unsigned int		ownerEvents:1;

+    unsigned int		pointerMode:1;

+    unsigned int		keyboardMode:1;

+    unsigned int		hasExt:1;

+    unsigned int		confineToIsWidgetWin:1;

+    KeyCode			keybut;

+    unsigned short		modifiers;

+    unsigned short		eventMask;

+} XtServerGrabRec, *XtServerGrabPtr;

+

+typedef struct _XtGrabExtRec {

+    Mask			*pKeyButMask;

+    Mask			*pModifiersMask;

+    Window			confineTo;

+    Cursor			cursor;

+} XtServerGrabExtRec, *XtServerGrabExtPtr;

+

+#define GRABEXT(p) ((XtServerGrabExtPtr)((p)+1))

+

+typedef struct _XtDeviceRec{

+    XtServerGrabRec	grab; 	/* need copy in order to protect

+				   during grab */

+    XtServerGrabType	grabType;

+}XtDeviceRec, *XtDevice;

+

+#define XtMyAncestor	0

+#define XtMyDescendant	1

+#define XtMyCousin	2

+#define XtMySelf	3

+#define XtUnrelated	4

+typedef char XtGeneology; /* do not use an enum makes PerWidgetInput larger */

+

+typedef struct {

+    Widget		focusKid;

+    XtServerGrabPtr	keyList, ptrList;

+    Widget		queryEventDescendant;

+    unsigned int	map_handler_added:1;

+    unsigned int	realize_handler_added:1;

+    unsigned int	active_handler_added:1;

+    unsigned int	haveFocus:1;

+    XtGeneology		focalPoint;

+}XtPerWidgetInputRec, *XtPerWidgetInput;

+

+typedef struct XtPerDisplayInputRec{

+    XtGrabList 	grabList;

+    XtDeviceRec keyboard, pointer;

+    KeyCode	activatingKey;

+    Widget 	*trace;

+    int		traceDepth, traceMax;

+    Widget 	focusWidget;

+}XtPerDisplayInputRec, *XtPerDisplayInput;

+

+#define IsServerGrab(g) ((g == XtPassiveServerGrab) ||\

+			 (g == XtActiveServerGrab))

+

+#define IsAnyGrab(g) ((g == XtPassiveServerGrab) ||\

+		      (g == XtActiveServerGrab)  ||\

+		      (g == XtPseudoPassiveServerGrab))

+

+#define IsEitherPassiveGrab(g) ((g == XtPassiveServerGrab) ||\

+				(g == XtPseudoPassiveServerGrab))

+

+#define IsPseudoGrab(g) ((g == XtPseudoPassiveServerGrab))

+

+extern void _XtDestroyServerGrabs(

+    Widget		/* w */,

+    XtPointer		/* pwi */, /*XtPerWidgetInput*/

+    XtPointer		/* call_data */

+);

+

+extern XtPerWidgetInput _XtGetPerWidgetInput(

+    Widget	/* widget */,

+    _XtBoolean	/* create */

+);

+

+extern XtServerGrabPtr _XtCheckServerGrabsOnWidget(

+    XEvent*		/* event */,

+    Widget		/* widget */,

+    _XtBoolean		/* isKeyboard */

+);

+

+/*

+extern XtGrabList* _XtGetGrabList( XtPerDisplayInput );

+*/

+

+#define _XtGetGrabList(pdi) (&(pdi)->grabList)

+

+extern void _XtFreePerWidgetInput(

+    Widget		/* w */,

+    XtPerWidgetInput	/* pwi */

+);

+

+extern Widget _XtProcessKeyboardEvent(

+    XKeyEvent*		/* event */,

+    Widget		/* widget */,

+    XtPerDisplayInput	/* pdi */

+);

+

+extern Widget _XtProcessPointerEvent(

+    XButtonEvent*	/* event */,

+    Widget		/* widget */,

+    XtPerDisplayInput	/* pdi */

+);

+

+extern void _XtRegisterPassiveGrabs(

+    Widget		/* widget */

+);

+

+extern void _XtClearAncestorCache(

+    Widget		/* widget */

+);

+

+_XFUNCPROTOEND

+

+#endif /* _PDI_h_ */