svn merge ^/branches/released .

1 files changed, 122 insertions, 128 deletions

diff --git a/libXmu/include/X11/Xmu/Xmu.h b/libXmu/include/X11/Xmu/Xmu.h
index c503a41b8..8ab9d7913 100644
--- a/libXmu/include/X11/Xmu/Xmu.h
+++ b/libXmu/include/X11/Xmu/Xmu.h
@@ -1,128 +1,122 @@
-/* $Xorg: Xmu.h,v 1.4 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/Xmu.h,v 1.9 2001/12/14 19:55:59 dawes Exp $ */
-
-/*
- * The interfaces described by this header file are for miscellaneous utilities
- * and are not part of the Xlib standard.
- */
-
-#ifndef _XMU_H_
-#define _XMU_H_
-
-#include <X11/Intrinsic.h>
-#include <X11/Xmu/Atoms.h>		/* _XA_... */
-#include <X11/Xmu/CharSet.h>		/* CopyISOLatin1Lowered */
-#include <X11/Xmu/Converters.h>		/* CvtStringTo... */
-#include <X11/Xmu/Drawing.h>		/* DrawRoundedRect, DrawLogo */
-#include <X11/Xmu/Error.h>		/* PrintDefaultError */
-#include <X11/Xmu/StdSel.h>		/* ConvertStandardSelection */
-
-/*
- * clip lists
- */
-typedef struct _XmuSegment {
-  int x1, x2;
-  struct _XmuSegment *next;
-} XmuSegment;
-
-typedef struct _XmuScanline {   
-  int y;
-  XmuSegment *segment;
-  struct _XmuScanline *next;
-} XmuScanline;
-                              
-typedef struct _XmuArea {
-  XmuScanline *scanline;     
-} XmuArea;
-
-#define XmuCreateArea()		XmuNewArea(0, 0, 0, 0)
-#define XmuAreaOr(dst, src)	XmuAreaOrXor((dst), (src), True)
-#define XmuAreaXor(dst, src)	XmuAreaOrXor((dst), (src), False)
-
-#define XmuDestroyArea(a)					\
-		  do {						\
-		    XmuDestroyScanlineList((a)->scanline);	\
-		    XtFree((char *)(a));			\
-		  } while (0)
-
-#define FreeArea(a)						\
-		  do {						\
-		    XmuDestroyScanlineList((a)->scanline);	\
-		    a->scanline = (Scanline *)0;		\
-		  } while (0)
-
-#define XmuValidSegment(s)	((s)->x1 < (s)->x2)
-#define XmuSegmentEqu(s1, s2)	((s1)->x1 == (s2)->x1 && (s1)->x2 == (s2)->x2)
-#define XmuDestroySegment(s)	XtFree((char *)(s))
-
-#define XmuDestroyScanline(s)					\
-		  do {						\
-		    XmuDestroySegmentList((s)->segment);	\
-		    XtFree((char*)(s));				\
-		  } while (0)
-
-XmuArea *XmuNewArea(int, int, int, int);
-XmuArea *XmuAreaDup(XmuArea*);
-XmuArea *XmuAreaCopy(XmuArea*, XmuArea*);
-XmuArea *XmuAreaNot(XmuArea*, int, int, int, int);
-XmuArea *XmuAreaOrXor(XmuArea*, XmuArea*, Bool);
-XmuArea *XmuAreaAnd(XmuArea*, XmuArea*);
-Bool XmuValidArea(XmuArea*);
-Bool XmuValidScanline(XmuScanline*);
-Bool XmuScanlineEqu(XmuScanline*, XmuScanline*);
-XmuSegment *XmuNewSegment(int, int);
-void XmuDestroySegmentList(XmuSegment*);
-XmuScanline *XmuScanlineCopy(XmuScanline*, XmuScanline*);
-Bool XmuAppendSegment(XmuSegment*, XmuSegment*);
-XmuScanline *XmuOptimizeScanline(XmuScanline*);
-XmuScanline *XmuScanlineNot(XmuScanline *scanline, int, int);
-XmuScanline *XmuScanlineOr(XmuScanline*, XmuScanline*);
-XmuScanline *XmuScanlineAnd(XmuScanline*, XmuScanline*);
-XmuScanline *XmuScanlineXor(XmuScanline*, XmuScanline*);
-XmuScanline *XmuNewScanline(int, int, int);
-void XmuDestroyScanlineList(XmuScanline*);
-XmuArea *XmuOptimizeArea(XmuArea *area);
-
-#ifndef notdef
-XmuScanline *XmuScanlineOrSegment(XmuScanline*, XmuSegment*);
-XmuScanline *XmuScanlineAndSegment(XmuScanline*, XmuSegment*);
-XmuScanline *XmuScanlineXorSegment(XmuScanline*, XmuSegment*);
-#endif /* notdef */
-
-#ifndef _SYSUTIL_H_
-int XmuSnprintf(char *str, int size, _Xconst char *fmt, ...)
-#if defined(__GNUC__) && \
-    ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ > 4)))
-__attribute((format(printf,3,4)))
-#endif
-;
-#endif
-
-#endif /* _XMU_H_ */
-
+/* 

+

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

+

+*/

+

+/*

+ * The interfaces described by this header file are for miscellaneous utilities

+ * and are not part of the Xlib standard.

+ */

+

+#ifndef _XMU_H_

+#define _XMU_H_

+

+#include <X11/Xfuncproto.h>

+#include <X11/Intrinsic.h>

+#include <X11/Xmu/Atoms.h>		/* _XA_... */

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

+#include <X11/Xmu/Converters.h>		/* CvtStringTo... */

+#include <X11/Xmu/Drawing.h>		/* DrawRoundedRect, DrawLogo */

+#include <X11/Xmu/Error.h>		/* PrintDefaultError */

+#include <X11/Xmu/StdSel.h>		/* ConvertStandardSelection */

+

+/*

+ * clip lists

+ */

+typedef struct _XmuSegment {

+  int x1, x2;

+  struct _XmuSegment *next;

+} XmuSegment;

+

+typedef struct _XmuScanline {   

+  int y;

+  XmuSegment *segment;

+  struct _XmuScanline *next;

+} XmuScanline;

+                              

+typedef struct _XmuArea {

+  XmuScanline *scanline;     

+} XmuArea;

+

+#define XmuCreateArea()		XmuNewArea(0, 0, 0, 0)

+#define XmuAreaOr(dst, src)	XmuAreaOrXor((dst), (src), True)

+#define XmuAreaXor(dst, src)	XmuAreaOrXor((dst), (src), False)

+

+#define XmuDestroyArea(a)					\

+		  do {						\

+		    XmuDestroyScanlineList((a)->scanline);	\

+		    XtFree((char *)(a));			\

+		  } while (0)

+

+#define FreeArea(a)						\

+		  do {						\

+		    XmuDestroyScanlineList((a)->scanline);	\

+		    a->scanline = (Scanline *)0;		\

+		  } while (0)

+

+#define XmuValidSegment(s)	((s)->x1 < (s)->x2)

+#define XmuSegmentEqu(s1, s2)	((s1)->x1 == (s2)->x1 && (s1)->x2 == (s2)->x2)

+#define XmuDestroySegment(s)	XtFree((char *)(s))

+

+#define XmuDestroyScanline(s)					\

+		  do {						\

+		    XmuDestroySegmentList((s)->segment);	\

+		    XtFree((char*)(s));				\

+		  } while (0)

+

+XmuArea *XmuNewArea(int, int, int, int);

+XmuArea *XmuAreaDup(XmuArea*);

+XmuArea *XmuAreaCopy(XmuArea*, XmuArea*);

+XmuArea *XmuAreaNot(XmuArea*, int, int, int, int);

+XmuArea *XmuAreaOrXor(XmuArea*, XmuArea*, Bool);

+XmuArea *XmuAreaAnd(XmuArea*, XmuArea*);

+Bool XmuValidArea(XmuArea*);

+Bool XmuValidScanline(XmuScanline*);

+Bool XmuScanlineEqu(XmuScanline*, XmuScanline*);

+XmuSegment *XmuNewSegment(int, int);

+void XmuDestroySegmentList(XmuSegment*);

+XmuScanline *XmuScanlineCopy(XmuScanline*, XmuScanline*);

+Bool XmuAppendSegment(XmuSegment*, XmuSegment*);

+XmuScanline *XmuOptimizeScanline(XmuScanline*);

+XmuScanline *XmuScanlineNot(XmuScanline *scanline, int, int);

+XmuScanline *XmuScanlineOr(XmuScanline*, XmuScanline*);

+XmuScanline *XmuScanlineAnd(XmuScanline*, XmuScanline*);

+XmuScanline *XmuScanlineXor(XmuScanline*, XmuScanline*);

+XmuScanline *XmuNewScanline(int, int, int);

+void XmuDestroyScanlineList(XmuScanline*);

+XmuArea *XmuOptimizeArea(XmuArea *area);

+

+#ifndef notdef

+XmuScanline *XmuScanlineOrSegment(XmuScanline*, XmuSegment*);

+XmuScanline *XmuScanlineAndSegment(XmuScanline*, XmuSegment*);

+XmuScanline *XmuScanlineXorSegment(XmuScanline*, XmuSegment*);

+#endif /* notdef */

+

+#ifndef _SYSUTIL_H_

+int XmuSnprintf(char *str, int size, _Xconst char *fmt, ...)

+    _X_ATTRIBUTE_PRINTF(3,4);

+#endif

+

+#endif /* _XMU_H_ */

+