svn merge ^/branches/released .

1 files changed, 269 insertions, 272 deletions

diff --git a/libXaw/src/Sme.c b/libXaw/src/Sme.c
index a4af577d8..462353b56 100644
--- a/libXaw/src/Sme.c
+++ b/libXaw/src/Sme.c
@@ -1,272 +1,269 @@
-/* $Xorg: Sme.c,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ */
-
-/*
-Copyright 1989, 1994, 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/Xaw/Sme.c,v 1.6 2001/01/17 19:42:31 dawes Exp $ */
-
-/*
- * Date:    September 26, 1989
- *
- * By:      Chris D. Peterson
- *          MIT X Consortium 
- *          kit@expo.lcs.mit.edu
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <stdio.h>
-#include <X11/IntrinsicP.h>
-#include <X11/StringDefs.h>
-#include <X11/Xaw/Cardinals.h>
-#include <X11/Xaw/SmeP.h>
-#include <X11/Xaw/XawInit.h>
-#include "Private.h"
-
-/*
- * Class Methods
- */
-static void Highlight(Widget);
-static void Notify(Widget);
-static void Unhighlight(Widget);
-static void XawSmeClassPartInitialize(WidgetClass);
-static void XawSmeInitialize(Widget, Widget, ArgList, Cardinal*);
-static XtGeometryResult XawSmeQueryGeometry(Widget, XtWidgetGeometry*,
-					    XtWidgetGeometry*);
-
-/*
- * Initialization
- */
-#define offset(field) XtOffsetOf(SmeRec, sme.field)
-static XtResource resources[] = {
-  {
-    XtNcallback,
-    XtCCallback,
-    XtRCallback,
-    sizeof(XtPointer),
-    offset(callbacks),
-    XtRCallback,
-    NULL
-  },
-  {
-    XtNinternational,
-    XtCInternational,
-    XtRBoolean,
-    sizeof(Boolean),
-    offset(international),
-    XtRImmediate,
-    (XtPointer)False
-  },
-};   
-#undef offset
-
-#define Superclass	(&rectObjClassRec)
-SmeClassRec smeClassRec = {
-  /* rectangle */
-  {
-    (WidgetClass)Superclass,		/* superclass */
-    "Sme",				/* class_name */
-    sizeof(SmeRec),			/* widget_size */
-    XawInitializeWidgetSet,		/* class_initialize */
-    XawSmeClassPartInitialize,		/* class_part_initialize */
-    False,				/* class_initialized */
-    XawSmeInitialize,			/* initialize */
-    NULL,				/* initialize_hook */
-    NULL,				/* realize */
-    NULL,				/* actions */
-    0,					/* num_actions */
-    resources,				/* resources */
-    XtNumber(resources),		/* num_resources */
-    NULLQUARK,				/* xrm_class */
-    False,				/* compress_motion */
-    False,				/* compress_exposure */
-    False,				/* compress_enterleave */
-    False,				/* visible_interest */
-    NULL,				/* destroy */
-    NULL,				/* resize */
-    NULL,				/* expose */
-    NULL,				/* set_values */
-    NULL,				/* set_values_hook */
-    XtInheritSetValuesAlmost,		/* set_values_almost */
-    NULL,				/* get_values_hook */
-    NULL,				/* accept_focus */
-    XtVersion,				/* intrinsics_version */
-    NULL,				/* callback offsets */
-    NULL,				/* tm_table */
-    XawSmeQueryGeometry,		/* query_geometry */
-    NULL,				/* display_accelerator */
-    NULL,				/* extension */
-  },
-  /* sme */
-  {
-    Highlight,				/* highlight */
-    Unhighlight,			/* unhighlight */
-    Notify,				/* notify */
-    NULL,				/* extension */
-  }
-};
-
-WidgetClass smeObjectClass = (WidgetClass)&smeClassRec;
-
-/*
- * Implementation
- */
-/*
- * Function:
- *	XawSmeClassPartInitialize
- *
- * Parameters:
- *	cclass - widget classs of this widget
- *
- * Description:
- *	Handles inheritance of class functions.
- */
-static void
-XawSmeClassPartInitialize(WidgetClass cclass)
-{
-    SmeObjectClass m_ent, superC;
-
-    m_ent = (SmeObjectClass)cclass;
-    superC = (SmeObjectClass)m_ent->rect_class.superclass;
-
-    if (m_ent->sme_class.highlight == XtInheritHighlight) 
-	m_ent->sme_class.highlight = superC->sme_class.highlight;
-
-    if (m_ent->sme_class.unhighlight == XtInheritUnhighlight)
-	m_ent->sme_class.unhighlight = superC->sme_class.unhighlight;
-
-    if (m_ent->sme_class.notify == XtInheritNotify) 
-	m_ent->sme_class.notify = superC->sme_class.notify;
-}
-
-/*
- * Function:
- *	XawSmeInitialize
- *
- * Parameters:
- *	request - widget requested by the argument list
- *	cnew	- new widget with both resource and non  resource values
- * 
- * Description:
- *	Initializes the simple menu widget entry
- */
-/*ARGSUSED*/
-static void
-XawSmeInitialize(Widget request, Widget cnew,
-		 ArgList args, Cardinal *num_args)
-{
-    SmeObject entry = (SmeObject)cnew;
-
-    entry->rectangle.border_width = 0;
-}
-
-/*
- * Function:
- *	Highlight
- *
- * Parameters:
- *	w - menu entry
- *
- * Description:
- *	Default highlight proceedure for menu entries.
- */
-/*ARGSUSED*/
-static void
-Highlight(Widget w)
-{
-}
-
-/*
- * Function:
- *	Unhighlight
- *
- * Parameters:
- *	w - menu entry
- *
- * Description:
- *	Default unhighlight proceedure for menu entries.
- */
-/*ARGSUSED*/
-static void
-Unhighlight(Widget w)
-{
-}
-
-/*
- * Function:
- *	Notify
- *
- * Parameters:
- *	w - menu entry
- *
- * Description:
- *	Calls the callback proceedures for this entry.
- */
-static void
-Notify(Widget w)
-{
-    XtCallCallbacks(w, XtNcallback, NULL);
-}
-
-/*
- * Function:
- *	QueryGeometry
- *
- * Parameeters:
- *	w	   - menu entry object
- *	itended	   - intended and return geometry info
- *	return_val -
- * 
- * Description:
- *	Returns the preferred geometry for this widget.
- *
- * Returns:
- *	Geometry Result
- *
- * Note:
- *	See the Intrinsics manual for details on what this function is for.
- */
-static XtGeometryResult
-XawSmeQueryGeometry(Widget w, XtWidgetGeometry *intended,
-		    XtWidgetGeometry *return_val)
-{
-    SmeObject entry = (SmeObject)w;
-    Dimension width;
-    XtGeometryResult ret_val = XtGeometryYes;
-    XtGeometryMask mode = intended->request_mode;
-
-    width = 1;
-
-    if (((mode & CWWidth) && intended->width != width) || !(mode & CWWidth)) {
-	return_val->request_mode |= CWWidth;
-	return_val->width = width;
-	mode = return_val->request_mode;
-	
-	if ((mode & CWWidth) && width == XtWidth(entry))
-	    return (XtGeometryNo);
-	return (XtGeometryAlmost);
-    }
-
-    return (ret_val);
-}
+/*

+Copyright 1989, 1994, 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.

+ */

+

+/*

+ * Date:    September 26, 1989

+ *

+ * By:      Chris D. Peterson

+ *          MIT X Consortium 

+ *          kit@expo.lcs.mit.edu

+ */

+

+#ifdef HAVE_CONFIG_H

+#include <config.h>

+#endif

+#include <stdio.h>

+#include <X11/IntrinsicP.h>

+#include <X11/StringDefs.h>

+#include <X11/Xaw/Cardinals.h>

+#include <X11/Xaw/SmeP.h>

+#include <X11/Xaw/XawInit.h>

+#include "Private.h"

+

+/*

+ * Class Methods

+ */

+static void Highlight(Widget);

+static void Notify(Widget);

+static void Unhighlight(Widget);

+static void XawSmeClassPartInitialize(WidgetClass);

+static void XawSmeInitialize(Widget, Widget, ArgList, Cardinal*);

+static XtGeometryResult XawSmeQueryGeometry(Widget, XtWidgetGeometry*,

+					    XtWidgetGeometry*);

+

+/*

+ * Initialization

+ */

+#define offset(field) XtOffsetOf(SmeRec, sme.field)

+static XtResource resources[] = {

+  {

+    XtNcallback,

+    XtCCallback,

+    XtRCallback,

+    sizeof(XtPointer),

+    offset(callbacks),

+    XtRCallback,

+    NULL

+  },

+  {

+    XtNinternational,

+    XtCInternational,

+    XtRBoolean,

+    sizeof(Boolean),

+    offset(international),

+    XtRImmediate,

+    (XtPointer)False

+  },

+};   

+#undef offset

+

+#define Superclass	(&rectObjClassRec)

+SmeClassRec smeClassRec = {

+  /* rectangle */

+  {

+    (WidgetClass)Superclass,		/* superclass */

+    "Sme",				/* class_name */

+    sizeof(SmeRec),			/* widget_size */

+    XawInitializeWidgetSet,		/* class_initialize */

+    XawSmeClassPartInitialize,		/* class_part_initialize */

+    False,				/* class_initialized */

+    XawSmeInitialize,			/* initialize */

+    NULL,				/* initialize_hook */

+    NULL,				/* realize */

+    NULL,				/* actions */

+    0,					/* num_actions */

+    resources,				/* resources */

+    XtNumber(resources),		/* num_resources */

+    NULLQUARK,				/* xrm_class */

+    False,				/* compress_motion */

+    False,				/* compress_exposure */

+    False,				/* compress_enterleave */

+    False,				/* visible_interest */

+    NULL,				/* destroy */

+    NULL,				/* resize */

+    NULL,				/* expose */

+    NULL,				/* set_values */

+    NULL,				/* set_values_hook */

+    XtInheritSetValuesAlmost,		/* set_values_almost */

+    NULL,				/* get_values_hook */

+    NULL,				/* accept_focus */

+    XtVersion,				/* intrinsics_version */

+    NULL,				/* callback offsets */

+    NULL,				/* tm_table */

+    XawSmeQueryGeometry,		/* query_geometry */

+    NULL,				/* display_accelerator */

+    NULL,				/* extension */

+  },

+  /* sme */

+  {

+    Highlight,				/* highlight */

+    Unhighlight,			/* unhighlight */

+    Notify,				/* notify */

+    NULL,				/* extension */

+  }

+};

+

+WidgetClass smeObjectClass = (WidgetClass)&smeClassRec;

+

+/*

+ * Implementation

+ */

+/*

+ * Function:

+ *	XawSmeClassPartInitialize

+ *

+ * Parameters:

+ *	cclass - widget classs of this widget

+ *

+ * Description:

+ *	Handles inheritance of class functions.

+ */

+static void

+XawSmeClassPartInitialize(WidgetClass cclass)

+{

+    SmeObjectClass m_ent, superC;

+

+    m_ent = (SmeObjectClass)cclass;

+    superC = (SmeObjectClass)m_ent->rect_class.superclass;

+

+    if (m_ent->sme_class.highlight == XtInheritHighlight) 

+	m_ent->sme_class.highlight = superC->sme_class.highlight;

+

+    if (m_ent->sme_class.unhighlight == XtInheritUnhighlight)

+	m_ent->sme_class.unhighlight = superC->sme_class.unhighlight;

+

+    if (m_ent->sme_class.notify == XtInheritNotify) 

+	m_ent->sme_class.notify = superC->sme_class.notify;

+}

+

+/*

+ * Function:

+ *	XawSmeInitialize

+ *

+ * Parameters:

+ *	request - widget requested by the argument list

+ *	cnew	- new widget with both resource and non  resource values

+ * 

+ * Description:

+ *	Initializes the simple menu widget entry

+ */

+/*ARGSUSED*/

+static void

+XawSmeInitialize(Widget request, Widget cnew,

+		 ArgList args, Cardinal *num_args)

+{

+    SmeObject entry = (SmeObject)cnew;

+

+    entry->rectangle.border_width = 0;

+}

+

+/*

+ * Function:

+ *	Highlight

+ *

+ * Parameters:

+ *	w - menu entry

+ *

+ * Description:

+ *	Default highlight proceedure for menu entries.

+ */

+/*ARGSUSED*/

+static void

+Highlight(Widget w)

+{

+}

+

+/*

+ * Function:

+ *	Unhighlight

+ *

+ * Parameters:

+ *	w - menu entry

+ *

+ * Description:

+ *	Default unhighlight proceedure for menu entries.

+ */

+/*ARGSUSED*/

+static void

+Unhighlight(Widget w)

+{

+}

+

+/*

+ * Function:

+ *	Notify

+ *

+ * Parameters:

+ *	w - menu entry

+ *

+ * Description:

+ *	Calls the callback proceedures for this entry.

+ */

+static void

+Notify(Widget w)

+{

+    XtCallCallbacks(w, XtNcallback, NULL);

+}

+

+/*

+ * Function:

+ *	QueryGeometry

+ *

+ * Parameeters:

+ *	w	   - menu entry object

+ *	itended	   - intended and return geometry info

+ *	return_val -

+ * 

+ * Description:

+ *	Returns the preferred geometry for this widget.

+ *

+ * Returns:

+ *	Geometry Result

+ *

+ * Note:

+ *	See the Intrinsics manual for details on what this function is for.

+ */

+static XtGeometryResult

+XawSmeQueryGeometry(Widget w, XtWidgetGeometry *intended,

+		    XtWidgetGeometry *return_val)

+{

+    SmeObject entry = (SmeObject)w;

+    Dimension width;

+    XtGeometryResult ret_val = XtGeometryYes;

+    XtGeometryMask mode = intended->request_mode;

+

+    width = 1;

+

+    if (((mode & CWWidth) && intended->width != width) || !(mode & CWWidth)) {

+	return_val->request_mode |= CWWidth;

+	return_val->width = width;

+	mode = return_val->request_mode;

+	

+	if ((mode & CWWidth) && width == XtWidth(entry))

+	    return (XtGeometryNo);

+	return (XtGeometryAlmost);

+    }

+

+    return (ret_val);

+}