svn merge ^/branches/released .

1 files changed, 122 insertions, 125 deletions

diff --git a/libXmu/src/StrToShap.c b/libXmu/src/StrToShap.c
index 3f17c01e9..d047ff944 100644
--- a/libXmu/src/StrToShap.c
+++ b/libXmu/src/StrToShap.c
@@ -1,125 +1,122 @@
-/* $Xorg: StrToShap.c,v 1.5 2001/02/09 02:03:53 xorgcvs Exp $ */
-
-/* 
- 
-Copyright 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.
-
-*/
-/* $XFree86: xc/lib/Xmu/StrToShap.c,v 1.6 2001/01/17 19:42:57 dawes Exp $ */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <string.h>
-#include <X11/Intrinsic.h>
-#include "Converters.h"
-#include "CharSet.h"
-
-/* ARGSUSED */
-#define	done(type, value) \
-	{							\
-	    if (toVal->addr != NULL) {				\
-		if (toVal->size < sizeof(type)) {		\
-		    toVal->size = sizeof(type);			\
-		    return False;				\
-		}						\
-		*(type*)(toVal->addr) = (value);		\
-	    }							\
-	    else {						\
-		static type static_val;				\
-		static_val = (value);				\
-		toVal->addr = (XtPointer)&static_val;		\
-	    }							\
-	    toVal->size = sizeof(type);				\
-	    return True;					\
-	}
-
-
-/*ARGSUSED*/
-Boolean
-XmuCvtStringToShapeStyle(Display *dpy, XrmValue *args, Cardinal *num_args,
-			 XrmValue *from, XrmValue *toVal, XtPointer *data)
-{
-  String name = (String)from->addr;
-
-  if (XmuCompareISOLatin1(name, XtERectangle) == 0)
-    done(int, XmuShapeRectangle);
-  if (XmuCompareISOLatin1(name, XtEOval) == 0)
-    done(int, XmuShapeOval);
-  if (XmuCompareISOLatin1(name, XtEEllipse) == 0)
-    done(int, XmuShapeEllipse);
-  if (XmuCompareISOLatin1(name, XtERoundedRectangle) == 0)
-    done(int, XmuShapeRoundedRectangle);
-
-  XtDisplayStringConversionWarning(dpy, name, XtRShapeStyle);
-
-  return (False);
-}
-
-/*ARGSUSED*/
-Boolean
-XmuCvtShapeStyleToString(Display *dpy, XrmValue *args, Cardinal *num_args,
-			 XrmValue *fromVal, XrmValue *toVal, XtPointer *data)
-{
-  static char *buffer;
-  Cardinal size;
-
-  switch (*(int *)fromVal->addr)
-    {
-    case XmuShapeRectangle:
-      buffer = XtERectangle;
-      break;
-    case XmuShapeOval:
-      buffer = XtEOval;
-      break;
-    case XmuShapeEllipse:
-      buffer = XtEEllipse;
-      break;
-    case XmuShapeRoundedRectangle:
-      buffer = XtERoundedRectangle;
-      break;
-    default:
-      XtAppWarning(XtDisplayToApplicationContext(dpy),
-		   "Cannot convert ShapeStyle to String");
-      toVal->addr = NULL;
-      toVal->size = 0;
-
-      return (False);
-	    }
-
-  size = strlen(buffer) + 1;
-  if (toVal->addr != NULL)
-    {
-      if (toVal->size <= size)
-	{
-	  toVal->size = size;
-	  return (False);
-	}
-      strcpy((char *)toVal->addr, buffer);
-    }
-  else
-    toVal->addr = (XPointer)buffer;
-  toVal->size = size;
-
-  return (True);
-}
+/* 

+ 

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

+

+*/

+

+#ifdef HAVE_CONFIG_H

+#include <config.h>

+#endif

+#include <string.h>

+#include <X11/Intrinsic.h>

+#include "Converters.h"

+#include "CharSet.h"

+

+/* ARGSUSED */

+#define	done(type, value) \

+	{							\

+	    if (toVal->addr != NULL) {				\

+		if (toVal->size < sizeof(type)) {		\

+		    toVal->size = sizeof(type);			\

+		    return False;				\

+		}						\

+		*(type*)(toVal->addr) = (value);		\

+	    }							\

+	    else {						\

+		static type static_val;				\

+		static_val = (value);				\

+		toVal->addr = (XtPointer)&static_val;		\

+	    }							\

+	    toVal->size = sizeof(type);				\

+	    return True;					\

+	}

+

+

+/*ARGSUSED*/

+Boolean

+XmuCvtStringToShapeStyle(Display *dpy, XrmValue *args, Cardinal *num_args,

+			 XrmValue *from, XrmValue *toVal, XtPointer *data)

+{

+  String name = (String)from->addr;

+

+  if (XmuCompareISOLatin1(name, XtERectangle) == 0)

+    done(int, XmuShapeRectangle);

+  if (XmuCompareISOLatin1(name, XtEOval) == 0)

+    done(int, XmuShapeOval);

+  if (XmuCompareISOLatin1(name, XtEEllipse) == 0)

+    done(int, XmuShapeEllipse);

+  if (XmuCompareISOLatin1(name, XtERoundedRectangle) == 0)

+    done(int, XmuShapeRoundedRectangle);

+

+  XtDisplayStringConversionWarning(dpy, name, XtRShapeStyle);

+

+  return (False);

+}

+

+/*ARGSUSED*/

+Boolean

+XmuCvtShapeStyleToString(Display *dpy, XrmValue *args, Cardinal *num_args,

+			 XrmValue *fromVal, XrmValue *toVal, XtPointer *data)

+{

+  static char *buffer;

+  Cardinal size;

+

+  switch (*(int *)fromVal->addr)

+    {

+    case XmuShapeRectangle:

+      buffer = XtERectangle;

+      break;

+    case XmuShapeOval:

+      buffer = XtEOval;

+      break;

+    case XmuShapeEllipse:

+      buffer = XtEEllipse;

+      break;

+    case XmuShapeRoundedRectangle:

+      buffer = XtERoundedRectangle;

+      break;

+    default:

+      XtAppWarning(XtDisplayToApplicationContext(dpy),

+		   "Cannot convert ShapeStyle to String");

+      toVal->addr = NULL;

+      toVal->size = 0;

+

+      return (False);

+	    }

+

+  size = strlen(buffer) + 1;

+  if (toVal->addr != NULL)

+    {

+      if (toVal->size <= size)

+	{

+	  toVal->size = size;

+	  return (False);

+	}

+      strcpy((char *)toVal->addr, buffer);

+    }

+  else

+    toVal->addr = (XPointer)buffer;

+  toVal->size = size;

+

+  return (True);

+}