svn merge ^/branches/released .

1 files changed, 190 insertions, 193 deletions

diff --git a/libXt/src/RectObj.c b/libXt/src/RectObj.c
index 0835d5b47..0d03fd502 100644
--- a/libXt/src/RectObj.c
+++ b/libXt/src/RectObj.c
@@ -1,193 +1,190 @@
-/* $Xorg: RectObj.c,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ */
-
-/***********************************************************
-
-Copyright 1987, 1988, 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.
-
-
-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,
-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 name of 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.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xt/RectObj.c,v 1.2 2001/08/22 22:52:19 dawes Exp $ */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include "IntrinsicI.h"
-#include "StringDefs.h"
-#include "CreateI.h"
-
-/******************************************************************
- *
- * Rectangle Object Resources
- *
- ******************************************************************/
-
-static void XtCopyAncestorSensitive(Widget, int, XrmValue *);
-
-static XtResource resources[] = {
-
-    {XtNancestorSensitive, XtCSensitive, XtRBoolean, sizeof(Boolean),
-      XtOffsetOf(RectObjRec,rectangle.ancestor_sensitive),XtRCallProc,
-      (XtPointer)XtCopyAncestorSensitive},
-    {XtNx, XtCPosition, XtRPosition, sizeof(Position),
-         XtOffsetOf(RectObjRec,rectangle.x), XtRImmediate, (XtPointer)0},
-    {XtNy, XtCPosition, XtRPosition, sizeof(Position),
-         XtOffsetOf(RectObjRec,rectangle.y), XtRImmediate, (XtPointer)0},
-    {XtNwidth, XtCWidth, XtRDimension, sizeof(Dimension),
-         XtOffsetOf(RectObjRec,rectangle.width), XtRImmediate, (XtPointer)0},
-    {XtNheight, XtCHeight, XtRDimension, sizeof(Dimension),
-         XtOffsetOf(RectObjRec,rectangle.height), XtRImmediate, (XtPointer)0},
-    {XtNborderWidth, XtCBorderWidth, XtRDimension, sizeof(Dimension),
-         XtOffsetOf(RectObjRec,rectangle.border_width), XtRImmediate,
-	 (XtPointer)1},
-    {XtNsensitive, XtCSensitive, XtRBoolean, sizeof(Boolean),
-         XtOffsetOf(RectObjRec,rectangle.sensitive), XtRImmediate,
-	 (XtPointer)True}
-    };
-
-static void RectClassPartInitialize(WidgetClass);
-static void RectSetValuesAlmost(Widget, Widget, XtWidgetGeometry *, XtWidgetGeometry *);
-
-externaldef(rectobjclassrec) RectObjClassRec rectObjClassRec = {
-  {
-    /* superclass	  */	(WidgetClass)&objectClassRec,
-    /* class_name	  */	"Rect",
-    /* widget_size	  */	sizeof(RectObjRec),
-    /* class_initialize   */    NULL,
-    /* class_part_initialize*/	RectClassPartInitialize,
-    /* class_inited       */	FALSE,
-    /* initialize	  */	NULL,
-    /* initialize_hook    */	NULL,
-    /* realize		  */	NULL,
-    /* actions		  */	NULL,
-    /* num_actions	  */	0,
-    /* resources	  */	resources,
-    /* num_resources	  */	XtNumber(resources),
-    /* xrm_class	  */	NULLQUARK,
-    /* compress_motion	  */	FALSE,
-    /* compress_exposure  */	TRUE,
-    /* compress_enterleave*/ 	FALSE,
-    /* visible_interest	  */	FALSE,
-    /* destroy		  */	NULL,
-    /* resize		  */	NULL,
-    /* expose		  */	NULL,
-    /* set_values	  */	NULL,
-    /* set_values_hook    */	NULL,
-    /* set_values_almost  */	RectSetValuesAlmost,
-    /* get_values_hook    */	NULL,
-    /* accept_focus	  */	NULL,
-    /* version		  */	XtVersion,
-    /* callback_offsets   */    NULL,
-    /* tm_table           */    NULL,
-    /* query_geometry	    */  NULL,
-    /* display_accelerator  */	NULL,
-    /* extension	    */  NULL
-  }
-};
-
-externaldef(rectObjClass)
-WidgetClass rectObjClass = (WidgetClass)&rectObjClassRec;
-
-/*ARGSUSED*/
-static void XtCopyAncestorSensitive(
-    Widget      widget,
-    int		offset,
-    XrmValue    *value)
-{
-    static Boolean  sensitive;
-    Widget parent = widget->core.parent;
-
-    sensitive = (parent->core.ancestor_sensitive & parent->core.sensitive);
-    value->addr = (XPointer)(&sensitive);
-}
-
-
-/*
- * Start of rectangle object methods
- */
-
-
-static void RectClassPartInitialize(
-    register WidgetClass wc)
-{
-    register RectObjClass roc = (RectObjClass)wc;
-    register RectObjClass super = ((RectObjClass)roc->rect_class.superclass);
-
-    /* We don't need to check for null super since we'll get to object
-       eventually, and it had better define them!  */
-
-
-    if (roc->rect_class.resize == XtInheritResize) {
-	roc->rect_class.resize = super->rect_class.resize;
-    }
-
-    if (roc->rect_class.expose == XtInheritExpose) {
-	roc->rect_class.expose = super->rect_class.expose;
-    }
-
-    if (roc->rect_class.set_values_almost == XtInheritSetValuesAlmost) {
-	roc->rect_class.set_values_almost = super->rect_class.set_values_almost;
-    }
-
-
-    if (roc->rect_class.query_geometry == XtInheritQueryGeometry) {
-	roc->rect_class.query_geometry = super->rect_class.query_geometry;
-    }
-}
-
-/*
- * Why there isn't an Initialize Method:
- *
- * Initialization of the RectObj non-Resource field is done by the
- * intrinsics in _XtCreateWidget in order that the field is initialized
- * for use by converters during instance resource resolution.
- */
-
-/*ARGSUSED*/
-static void RectSetValuesAlmost(
-    Widget		old,
-    Widget		new,
-    XtWidgetGeometry    *request,
-    XtWidgetGeometry    *reply)
-{
-    *request = *reply;
-}
+/***********************************************************

+

+Copyright 1987, 1988, 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.

+

+

+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,

+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 name of 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.

+

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

+

+#ifdef HAVE_CONFIG_H

+#include <config.h>

+#endif

+#include "IntrinsicI.h"

+#include "StringDefs.h"

+#include "CreateI.h"

+

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

+ *

+ * Rectangle Object Resources

+ *

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

+

+static void XtCopyAncestorSensitive(Widget, int, XrmValue *);

+

+static XtResource resources[] = {

+

+    {XtNancestorSensitive, XtCSensitive, XtRBoolean, sizeof(Boolean),

+      XtOffsetOf(RectObjRec,rectangle.ancestor_sensitive),XtRCallProc,

+      (XtPointer)XtCopyAncestorSensitive},

+    {XtNx, XtCPosition, XtRPosition, sizeof(Position),

+         XtOffsetOf(RectObjRec,rectangle.x), XtRImmediate, (XtPointer)0},

+    {XtNy, XtCPosition, XtRPosition, sizeof(Position),

+         XtOffsetOf(RectObjRec,rectangle.y), XtRImmediate, (XtPointer)0},

+    {XtNwidth, XtCWidth, XtRDimension, sizeof(Dimension),

+         XtOffsetOf(RectObjRec,rectangle.width), XtRImmediate, (XtPointer)0},

+    {XtNheight, XtCHeight, XtRDimension, sizeof(Dimension),

+         XtOffsetOf(RectObjRec,rectangle.height), XtRImmediate, (XtPointer)0},

+    {XtNborderWidth, XtCBorderWidth, XtRDimension, sizeof(Dimension),

+         XtOffsetOf(RectObjRec,rectangle.border_width), XtRImmediate,

+	 (XtPointer)1},

+    {XtNsensitive, XtCSensitive, XtRBoolean, sizeof(Boolean),

+         XtOffsetOf(RectObjRec,rectangle.sensitive), XtRImmediate,

+	 (XtPointer)True}

+    };

+

+static void RectClassPartInitialize(WidgetClass);

+static void RectSetValuesAlmost(Widget, Widget, XtWidgetGeometry *, XtWidgetGeometry *);

+

+externaldef(rectobjclassrec) RectObjClassRec rectObjClassRec = {

+  {

+    /* superclass	  */	(WidgetClass)&objectClassRec,

+    /* class_name	  */	"Rect",

+    /* widget_size	  */	sizeof(RectObjRec),

+    /* class_initialize   */    NULL,

+    /* class_part_initialize*/	RectClassPartInitialize,

+    /* class_inited       */	FALSE,

+    /* initialize	  */	NULL,

+    /* initialize_hook    */	NULL,

+    /* realize		  */	NULL,

+    /* actions		  */	NULL,

+    /* num_actions	  */	0,

+    /* resources	  */	resources,

+    /* num_resources	  */	XtNumber(resources),

+    /* xrm_class	  */	NULLQUARK,

+    /* compress_motion	  */	FALSE,

+    /* compress_exposure  */	TRUE,

+    /* compress_enterleave*/ 	FALSE,

+    /* visible_interest	  */	FALSE,

+    /* destroy		  */	NULL,

+    /* resize		  */	NULL,

+    /* expose		  */	NULL,

+    /* set_values	  */	NULL,

+    /* set_values_hook    */	NULL,

+    /* set_values_almost  */	RectSetValuesAlmost,

+    /* get_values_hook    */	NULL,

+    /* accept_focus	  */	NULL,

+    /* version		  */	XtVersion,

+    /* callback_offsets   */    NULL,

+    /* tm_table           */    NULL,

+    /* query_geometry	    */  NULL,

+    /* display_accelerator  */	NULL,

+    /* extension	    */  NULL

+  }

+};

+

+externaldef(rectObjClass)

+WidgetClass rectObjClass = (WidgetClass)&rectObjClassRec;

+

+/*ARGSUSED*/

+static void XtCopyAncestorSensitive(

+    Widget      widget,

+    int		offset,

+    XrmValue    *value)

+{

+    static Boolean  sensitive;

+    Widget parent = widget->core.parent;

+

+    sensitive = (parent->core.ancestor_sensitive & parent->core.sensitive);

+    value->addr = (XPointer)(&sensitive);

+}

+

+

+/*

+ * Start of rectangle object methods

+ */

+

+

+static void RectClassPartInitialize(

+    register WidgetClass wc)

+{

+    register RectObjClass roc = (RectObjClass)wc;

+    register RectObjClass super = ((RectObjClass)roc->rect_class.superclass);

+

+    /* We don't need to check for null super since we'll get to object

+       eventually, and it had better define them!  */

+

+

+    if (roc->rect_class.resize == XtInheritResize) {

+	roc->rect_class.resize = super->rect_class.resize;

+    }

+

+    if (roc->rect_class.expose == XtInheritExpose) {

+	roc->rect_class.expose = super->rect_class.expose;

+    }

+

+    if (roc->rect_class.set_values_almost == XtInheritSetValuesAlmost) {

+	roc->rect_class.set_values_almost = super->rect_class.set_values_almost;

+    }

+

+

+    if (roc->rect_class.query_geometry == XtInheritQueryGeometry) {

+	roc->rect_class.query_geometry = super->rect_class.query_geometry;

+    }

+}

+

+/*

+ * Why there isn't an Initialize Method:

+ *

+ * Initialization of the RectObj non-Resource field is done by the

+ * intrinsics in _XtCreateWidget in order that the field is initialized

+ * for use by converters during instance resource resolution.

+ */

+

+/*ARGSUSED*/

+static void RectSetValuesAlmost(

+    Widget		old,

+    Widget		new,

+    XtWidgetGeometry    *request,

+    XtWidgetGeometry    *reply)

+{

+    *request = *reply;

+}