svn merge ^/branches/released .

1 files changed, 306 insertions, 310 deletions

diff --git a/libXmu/src/WidgetNode.c b/libXmu/src/WidgetNode.c
index 08253b406..f790d103a 100644
--- a/libXmu/src/WidgetNode.c
+++ b/libXmu/src/WidgetNode.c
@@ -1,310 +1,306 @@
-/* $Xorg: WidgetNode.c,v 1.5 2001/02/09 02:03:53 xorgcvs Exp $ */
-
-/*
- 
-Copyright 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/Xmu/WidgetNode.c,v 1.12 2002/09/19 13:21:58 tsi Exp $ */
-
-/*
- * Author:  Jim Fulton, MIT X Consortium
- */
-
-
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <stdio.h>
-#include <stdlib.h>
-#include <X11/Xos.h>
-#include <X11/IntrinsicP.h>
-#include <X11/Xmu/CharSet.h>
-#include <X11/Xmu/WidgetNode.h>
-
-/*
- * Prototypes
- */
-static char *binsearch(char*, char*, int, int,
-		       int (*__compar)(_Xconst void*, _Xconst void*));
-static int compare_resource_entries(_Xconst void *a,  _Xconst void *b);
-static XmuWidgetNode *find_resource(XmuWidgetNode*, char*, Bool);
-static void mark_resource_owner(XmuWidgetNode*);
-/*
- * Implementation
- */
-static char *
-binsearch(char *key, char *base, int nelems, int elemsize,
-	  int (*compar)(_Xconst void*, _Xconst void*))
-     /*
-      * key		- template of object to find
-      * base		- beginning of array
-      * nelems		- number of elements in array
-      * elemsize	- sizeof an element
-      * compar		- qsort-style compare function
-      */
-{
-    int lower = 0, upper = nelems - 1;
-
-    while (lower <= upper) {
-	int middle = (lower + upper) / 2;
-	char *p = base + middle * elemsize;
-	int res = (*compar) (p, key);
-
-	if (res < 0) {
-	    lower = middle + 1;
-	} else if (res == 0) {
-	    return p;
-	} else {
-	    upper = middle - 1;
-	}
-    }
-
-    return NULL;
-}
-
-
-static int
-compare_resource_entries(register _Xconst void *a,
-			 register _Xconst void *b)
-{
-    return strcmp (((XtResourceList)a)->resource_name,
-		   ((XtResourceList)b)->resource_name);
-}
-
-
-static XmuWidgetNode *
-find_resource(XmuWidgetNode *node, char *name, Bool cons)
-{
-    register XmuWidgetNode *sup;
-    XtResource res;
-
-#define reslist ((char *) (cons ? sup->constraints : sup->resources))
-#define nreslist (int) (cons ? sup->nconstraints : sup->nresources)
-
-    res.resource_name = name;
-    for (sup = node->superclass; 
-	 sup && (XtResourceList) binsearch ((char *) &res,
-					    reslist, nreslist,
-					    sizeof(XtResource),
-					    compare_resource_entries);
-	 node = sup, sup = sup->superclass) ;
-
-#undef reslist
-#undef nreslist
-
-    return node;
-}
-
-
-static void
-mark_resource_owner(register XmuWidgetNode *node)
-{
-    register Cardinal i;
-    XtResourceList childres;
-
-    childres = node->resources;
-    for (i = 0; i < node->nresources; i++, childres++) {
-	node->resourcewn[i] = find_resource (node, childres->resource_name,
-					     False);
-    }
-
-    childres = node->constraints;
-    for (i = 0; i < node->nconstraints; i++, childres++) {
-	node->constraintwn[i] = find_resource (node, childres->resource_name,
-						True);
-    }
-}
-
-
-/*
- * 			       Public Interfaces
- */
-
-void
-XmuWnInitializeNodes(XmuWidgetNode *nodearray, int nnodes)
-{
-    int i;
-    XmuWidgetNode *wn;
-
-    /*
-     * Assume that the node array is in alphabetic order, so we need to
-     * search backwards to make sure that the children are listed forward.
-     */
-    for (i = nnodes - 1, wn = nodearray + (nnodes - 1); i >= 0; i--, wn--) {
-	WidgetClass superclass = XmuWnSuperclass(wn);
-	int j;
-	XmuWidgetNode *swn;
-	int lablen = strlen (wn->label);
-	int namelen = strlen (XmuWnClassname(wn));
-
-	wn->lowered_label = XtMalloc (lablen + namelen + 2);
-#if 0
-	/* XtMalloc exits if failed */
-	if (!wn->lowered_label) {
-	    fprintf (stderr,
-		     "%s:  unable to allocate %d bytes for widget name\n",
-		     "XmuWnInitializeNodes", lablen + namelen + 2);
-	    exit (1);
-	}
-#endif
-	wn->lowered_classname = wn->lowered_label + (lablen + 1);
-	XmuCopyISOLatin1Lowered (wn->lowered_label, wn->label);
-	XmuCopyISOLatin1Lowered (wn->lowered_classname, XmuWnClassname(wn));
-	wn->superclass = NULL;
-	wn->have_resources = False;
-	wn->resources = NULL;
-	wn->resourcewn = NULL;
-	wn->nresources = 0;
-	wn->constraints = NULL;
-	wn->constraintwn = NULL;
-	wn->nconstraints = 0;
-	wn->data = (XtPointer) NULL;
-
-	/*
-	 * walk up the superclass chain
-	 */
-	while (superclass) {
-	    for (j = 0, swn = nodearray; j < nnodes; j++, swn++) {
-		if (superclass == XmuWnClass(swn)) {
-		    wn->superclass = swn;
-		    goto done;		/* stupid C language */
-	        }
-	    }
-	    /*
-	     * Hmm, we have a hidden superclass (such as in core in R4); just
-	     * ignore it and keep on walking
-	     */
-	    superclass = superclass->core_class.superclass;
-	}
-      done: 
-	if (wn->superclass) {
-	    wn->siblings = wn->superclass->children;
-	    wn->superclass->children = wn;
-	}
-    }
-
-    return;
-}
-
-
-void
-XmuWnFetchResources(XmuWidgetNode *node, Widget toplevel,
-		    XmuWidgetNode *topnode)
-{
-    Widget dummy;
-    XmuWidgetNode *wn;
-
-    if (node->have_resources) return;
-
-    dummy = XtCreateWidget (node->label, XmuWnClass(node), toplevel,
-			    NULL, 0);
-    if (dummy) XtDestroyWidget (dummy);
-
-
-    /*
-     * walk up tree geting resources; since we've instantiated the widget,
-     * we know that all of our superclasses have been initialized
-     */
-    for (wn = node; wn && !wn->have_resources; wn = wn->superclass) {
-	XtGetResourceList (XmuWnClass(wn), &wn->resources, &wn->nresources);
-	if (wn->resources) {
-	    qsort ((char *) wn->resources, wn->nresources,
-		   sizeof(XtResource), compare_resource_entries);
-	}
-	wn->resourcewn = (XmuWidgetNode **) XtCalloc (wn->nresources,
-						  sizeof (XmuWidgetNode *));
-	if (!wn->resourcewn) {
-	    fprintf (stderr,
-		     "%s:  unable to calloc %d %ld byte widget node ptrs\n",
-		     "XmuWnFetchResources", wn->nresources,
-		     (unsigned long)sizeof (XmuWidgetNode *));
-	    exit (1);
-	}
-
-	XtGetConstraintResourceList (XmuWnClass(wn), &wn->constraints,
-				     &wn->nconstraints);
-	if (wn->constraints) {
-	    qsort ((char *) wn->constraints, wn->nconstraints,
-		   sizeof(XtResource), compare_resource_entries);
-	}
-	wn->constraintwn = (XmuWidgetNode **)
-	  XtCalloc (wn->nconstraints, sizeof (XmuWidgetNode *));
-	if (!wn->constraintwn) {
-	    fprintf (stderr,
-		     "%s:  unable to calloc %d %ld byte widget node ptrs\n",
-		     "XmuWnFetchResources", wn->nconstraints,
-		     (unsigned long)sizeof (XmuWidgetNode *));
-	    exit (1);
-	}
-
-	wn->have_resources = True;
-	if (wn == topnode) break;
-    }
-
-
-    /*
-     * Walk up tree removing all resources that appear in superclass; we can
-     * mash the resource list in place since it was copied out of widget.
-     */
-    for (wn = node; wn; wn = wn->superclass) {
-	mark_resource_owner (wn);
-	if (wn == topnode) break;
-    }
-
-    return;
-}
-
-
-int
-XmuWnCountOwnedResources(XmuWidgetNode *node, XmuWidgetNode *ownernode,
-			 Bool cons)
-{
-    register int i;
-    XmuWidgetNode **wn = (cons ? node->constraintwn : node->resourcewn);
-    int nmatches = 0;
-
-    for (i = (cons ? node->nconstraints : node->nresources); i > 0; i--, wn++)
-      if (*wn == ownernode) nmatches++;
-    return nmatches;
-}
-
-
-XmuWidgetNode *
-XmuWnNameToNode(XmuWidgetNode *nodelist, int nnodes, _Xconst char *name)
-{
-    int i;
-    XmuWidgetNode *wn;
-    char tmp[1024];
-
-    XmuNCopyISOLatin1Lowered(tmp, name, sizeof(tmp));
-    for (i = 0, wn = nodelist; i < nnodes; i++, wn++) {
-	if (strcmp (tmp, wn->lowered_label) == 0 ||
-	    strcmp (tmp, wn->lowered_classname) == 0) {
-	  return wn;
-	}
-    }
-    return NULL;
-}
+/*

+ 

+Copyright 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.

+

+*/

+

+/*

+ * Author:  Jim Fulton, MIT X Consortium

+ */

+

+

+

+#ifdef HAVE_CONFIG_H

+#include <config.h>

+#endif

+#include <stdio.h>

+#include <stdlib.h>

+#include <X11/Xos.h>

+#include <X11/IntrinsicP.h>

+#include <X11/Xmu/CharSet.h>

+#include <X11/Xmu/WidgetNode.h>

+

+/*

+ * Prototypes

+ */

+static char *binsearch(char*, char*, int, int,

+		       int (*__compar)(_Xconst void*, _Xconst void*));

+static int compare_resource_entries(_Xconst void *a,  _Xconst void *b);

+static XmuWidgetNode *find_resource(XmuWidgetNode*, char*, Bool);

+static void mark_resource_owner(XmuWidgetNode*);

+/*

+ * Implementation

+ */

+static char *

+binsearch(char *key, char *base, int nelems, int elemsize,

+	  int (*compar)(_Xconst void*, _Xconst void*))

+     /*

+      * key		- template of object to find

+      * base		- beginning of array

+      * nelems		- number of elements in array

+      * elemsize	- sizeof an element

+      * compar		- qsort-style compare function

+      */

+{

+    int lower = 0, upper = nelems - 1;

+

+    while (lower <= upper) {

+	int middle = (lower + upper) / 2;

+	char *p = base + middle * elemsize;

+	int res = (*compar) (p, key);

+

+	if (res < 0) {

+	    lower = middle + 1;

+	} else if (res == 0) {

+	    return p;

+	} else {

+	    upper = middle - 1;

+	}

+    }

+

+    return NULL;

+}

+

+

+static int

+compare_resource_entries(register _Xconst void *a,

+			 register _Xconst void *b)

+{

+    return strcmp (((XtResourceList)a)->resource_name,

+		   ((XtResourceList)b)->resource_name);

+}

+

+

+static XmuWidgetNode *

+find_resource(XmuWidgetNode *node, char *name, Bool cons)

+{

+    register XmuWidgetNode *sup;

+    XtResource res;

+

+#define reslist ((char *) (cons ? sup->constraints : sup->resources))

+#define nreslist (int) (cons ? sup->nconstraints : sup->nresources)

+

+    res.resource_name = name;

+    for (sup = node->superclass; 

+	 sup && (XtResourceList) binsearch ((char *) &res,

+					    reslist, nreslist,

+					    sizeof(XtResource),

+					    compare_resource_entries);

+	 node = sup, sup = sup->superclass) ;

+

+#undef reslist

+#undef nreslist

+

+    return node;

+}

+

+

+static void

+mark_resource_owner(register XmuWidgetNode *node)

+{

+    register Cardinal i;

+    XtResourceList childres;

+

+    childres = node->resources;

+    for (i = 0; i < node->nresources; i++, childres++) {

+	node->resourcewn[i] = find_resource (node, childres->resource_name,

+					     False);

+    }

+

+    childres = node->constraints;

+    for (i = 0; i < node->nconstraints; i++, childres++) {

+	node->constraintwn[i] = find_resource (node, childres->resource_name,

+						True);

+    }

+}

+

+

+/*

+ * 			       Public Interfaces

+ */

+

+void

+XmuWnInitializeNodes(XmuWidgetNode *nodearray, int nnodes)

+{

+    int i;

+    XmuWidgetNode *wn;

+

+    /*

+     * Assume that the node array is in alphabetic order, so we need to

+     * search backwards to make sure that the children are listed forward.

+     */

+    for (i = nnodes - 1, wn = nodearray + (nnodes - 1); i >= 0; i--, wn--) {

+	WidgetClass superclass = XmuWnSuperclass(wn);

+	int j;

+	XmuWidgetNode *swn;

+	int lablen = strlen (wn->label);

+	int namelen = strlen (XmuWnClassname(wn));

+

+	wn->lowered_label = XtMalloc (lablen + namelen + 2);

+#if 0

+	/* XtMalloc exits if failed */

+	if (!wn->lowered_label) {

+	    fprintf (stderr,

+		     "%s:  unable to allocate %d bytes for widget name\n",

+		     "XmuWnInitializeNodes", lablen + namelen + 2);

+	    exit (1);

+	}

+#endif

+	wn->lowered_classname = wn->lowered_label + (lablen + 1);

+	XmuCopyISOLatin1Lowered (wn->lowered_label, wn->label);

+	XmuCopyISOLatin1Lowered (wn->lowered_classname, XmuWnClassname(wn));

+	wn->superclass = NULL;

+	wn->have_resources = False;

+	wn->resources = NULL;

+	wn->resourcewn = NULL;

+	wn->nresources = 0;

+	wn->constraints = NULL;

+	wn->constraintwn = NULL;

+	wn->nconstraints = 0;

+	wn->data = (XtPointer) NULL;

+

+	/*

+	 * walk up the superclass chain

+	 */

+	while (superclass) {

+	    for (j = 0, swn = nodearray; j < nnodes; j++, swn++) {

+		if (superclass == XmuWnClass(swn)) {

+		    wn->superclass = swn;

+		    goto done;		/* stupid C language */

+	        }

+	    }

+	    /*

+	     * Hmm, we have a hidden superclass (such as in core in R4); just

+	     * ignore it and keep on walking

+	     */

+	    superclass = superclass->core_class.superclass;

+	}

+      done: 

+	if (wn->superclass) {

+	    wn->siblings = wn->superclass->children;

+	    wn->superclass->children = wn;

+	}

+    }

+

+    return;

+}

+

+

+void

+XmuWnFetchResources(XmuWidgetNode *node, Widget toplevel,

+		    XmuWidgetNode *topnode)

+{

+    Widget dummy;

+    XmuWidgetNode *wn;

+

+    if (node->have_resources) return;

+

+    dummy = XtCreateWidget (node->label, XmuWnClass(node), toplevel,

+			    NULL, 0);

+    if (dummy) XtDestroyWidget (dummy);

+

+

+    /*

+     * walk up tree geting resources; since we've instantiated the widget,

+     * we know that all of our superclasses have been initialized

+     */

+    for (wn = node; wn && !wn->have_resources; wn = wn->superclass) {

+	XtGetResourceList (XmuWnClass(wn), &wn->resources, &wn->nresources);

+	if (wn->resources) {

+	    qsort ((char *) wn->resources, wn->nresources,

+		   sizeof(XtResource), compare_resource_entries);

+	}

+	wn->resourcewn = (XmuWidgetNode **) XtCalloc (wn->nresources,

+						  sizeof (XmuWidgetNode *));

+	if (!wn->resourcewn) {

+	    fprintf (stderr,

+		     "%s:  unable to calloc %d %ld byte widget node ptrs\n",

+		     "XmuWnFetchResources", wn->nresources,

+		     (unsigned long)sizeof (XmuWidgetNode *));

+	    exit (1);

+	}

+

+	XtGetConstraintResourceList (XmuWnClass(wn), &wn->constraints,

+				     &wn->nconstraints);

+	if (wn->constraints) {

+	    qsort ((char *) wn->constraints, wn->nconstraints,

+		   sizeof(XtResource), compare_resource_entries);

+	}

+	wn->constraintwn = (XmuWidgetNode **)

+	  XtCalloc (wn->nconstraints, sizeof (XmuWidgetNode *));

+	if (!wn->constraintwn) {

+	    fprintf (stderr,

+		     "%s:  unable to calloc %d %ld byte widget node ptrs\n",

+		     "XmuWnFetchResources", wn->nconstraints,

+		     (unsigned long)sizeof (XmuWidgetNode *));

+	    exit (1);

+	}

+

+	wn->have_resources = True;

+	if (wn == topnode) break;

+    }

+

+

+    /*

+     * Walk up tree removing all resources that appear in superclass; we can

+     * mash the resource list in place since it was copied out of widget.

+     */

+    for (wn = node; wn; wn = wn->superclass) {

+	mark_resource_owner (wn);

+	if (wn == topnode) break;

+    }

+

+    return;

+}

+

+

+int

+XmuWnCountOwnedResources(XmuWidgetNode *node, XmuWidgetNode *ownernode,

+			 Bool cons)

+{

+    register int i;

+    XmuWidgetNode **wn = (cons ? node->constraintwn : node->resourcewn);

+    int nmatches = 0;

+

+    for (i = (cons ? node->nconstraints : node->nresources); i > 0; i--, wn++)

+      if (*wn == ownernode) nmatches++;

+    return nmatches;

+}

+

+

+XmuWidgetNode *

+XmuWnNameToNode(XmuWidgetNode *nodelist, int nnodes, _Xconst char *name)

+{

+    int i;

+    XmuWidgetNode *wn;

+    char tmp[1024];

+

+    XmuNCopyISOLatin1Lowered(tmp, name, sizeof(tmp));

+    for (i = 0, wn = nodelist; i < nnodes; i++, wn++) {

+	if (strcmp (tmp, wn->lowered_label) == 0 ||

+	    strcmp (tmp, wn->lowered_classname) == 0) {

+	  return wn;

+	}

+    }

+    return NULL;

+}