svn merge ^/branches/released .

1 files changed, 152 insertions, 154 deletions

diff --git a/libXaw/src/Private.h b/libXaw/src/Private.h
index a76207a4d..672062aeb 100644
--- a/libXaw/src/Private.h
+++ b/libXaw/src/Private.h
@@ -1,154 +1,152 @@
-/*
- * Copyright (c) 1998 by The XFree86 Project, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * 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 XFREE86 PROJECT 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 XFree86 Project 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
- * XFree86 Project.
- */
-
-/* $XFree86: xc/lib/Xaw/Private.h,v 3.9 1999/05/16 10:12:48 dawes Exp $ */
-
-#ifndef _XawPrivate_h
-#define _XawPrivate_h
-
-#define XawMax(a, b) ((a) > (b) ? (a) : (b))
-#define XawMin(a, b) ((a) < (b) ? (a) : (b))
-#define XawAbs(a)    ((a) < 0 ? -(a) : (a))
-
-#define XawStackAlloc(size, stk_buffer)		\
-((size) <= sizeof(stk_buffer)			\
- ? (XtPointer)(stk_buffer)			\
- : XtMalloc((unsigned)(size)))
-
-#define XawStackFree(pointer, stk_buffer)	\
-do {						\
-  if ((pointer) != (XtPointer)(stk_buffer))	\
-    XtFree((char *)pointer);			\
-} while (0)
-
-#ifndef XtX
-#define XtX(w)            (((RectObj)w)->rectangle.x)
-#endif
-#ifndef XtY
-#define XtY(w)            (((RectObj)w)->rectangle.y)
-#endif
-#ifndef XtWidth
-#define XtWidth(w)        (((RectObj)w)->rectangle.width)
-#endif
-#ifndef XtHeight
-#define XtHeight(w)       (((RectObj)w)->rectangle.height)
-#endif
-#ifndef XtBorderWidth
-#define XtBorderWidth(w)  (((RectObj)w)->rectangle.border_width)
-#endif
-
-#ifndef OLDXAW
-#define XAW_PRIV_VAR_PREFIX '$'
-
-typedef Bool (*XawParseBooleanProc)(Widget, String, XEvent*, Bool*);
-
-typedef struct _XawActionVarList XawActionVarList;
-typedef struct _XawActionResList XawActionResList;
-
-/* Boolean expressions */
-Bool XawParseBoolean(Widget, String, XEvent*, Bool*);
-Bool XawBooleanExpression(Widget, String, XEvent*);
-
-/* actions */
-void XawPrintActionErrorMsg(String, Widget, String*, Cardinal*);
-XawActionResList *XawGetActionResList(WidgetClass);
-XawActionVarList *XawGetActionVarList(Widget);
-
-void XawSetValuesAction(Widget, XEvent*, String*, Cardinal*);
-void XawGetValuesAction(Widget, XEvent*, String*, Cardinal*);
-void XawDeclareAction(Widget, XEvent*, String*, Cardinal*);
-void XawCallProcAction(Widget, XEvent*, String*, Cardinal*);
-
-/* display lists */
-#define	XAWDL_CONVERT_ERROR	(XtPointer)-1
-typedef struct _XawDL _XawDisplayList;
-typedef struct _XawDLClass XawDLClass, XawDisplayListClass;
-
-typedef void (*XawDisplayListProc)(Widget, XtPointer, XtPointer,
-				   XEvent*, Region);
-typedef void *(*XawDLArgsInitProc)(String, String*, Cardinal*,
-				   Screen*, Colormap, int);
-typedef void *(*XawDLDataInitProc)(String,
-				   Screen*, Colormap, int);
-typedef void (*XawDLArgsDestructor)(Display*, String, XtPointer,
-				    String*, Cardinal*);
-typedef void (*XawDLDataDestructor)(Display*, String, XtPointer);
-
-void XawRunDisplayList(Widget, _XawDisplayList*, XEvent*, Region);
-void XawDisplayListInitialize(void);
-
-_XawDisplayList *XawCreateDisplayList(String, Screen*, Colormap, int);
-void XawDestroyDisplayList(_XawDisplayList*);
-String XawDisplayListString(_XawDisplayList*);
-XawDLClass *XawGetDisplayListClass(String);
-XawDLClass *XawCreateDisplayListClass(String,
-				      XawDLArgsInitProc, XawDLArgsDestructor,
-				      XawDLDataInitProc, XawDLDataDestructor);
-Bool XawDeclareDisplayListProc(XawDLClass*, String, XawDisplayListProc);
-
-/* pixmaps */
-typedef struct _XawArgVal {
-  String name;
-  String value;
-} XawArgVal;
-
-typedef struct _XawParams {
-  String name;
-  String type;
-  String ext;
-  XawArgVal **args;
-  Cardinal num_args;
-} XawParams;
-
-typedef struct _XawPixmap {
-  String name;
-  Pixmap pixmap;
-  Pixmap mask;
-  Dimension width;
-  Dimension height;
-} XawPixmap;
-
-typedef Bool (*XawPixmapLoader)(XawParams*, Screen*, Colormap, int,
-				   Pixmap*, Pixmap*,
-				   Dimension*, Dimension*);
-Bool XawPixmapsInitialize(void);
-Bool XawAddPixmapLoader(String, String, XawPixmapLoader);
-XawPixmap *XawLoadPixmap(String, Screen*, Colormap, int);
-XawPixmap *XawPixmapFromXPixmap(Pixmap, Screen*, Colormap, int);
-XawParams *XawParseParamsString(String name);
-void XawFreeParamsStruct(XawParams *params);
-XawArgVal *XawFindArgVal(XawParams *params, String name);
-void XawReshapeWidget(Widget, XawPixmap*);
-#endif /* OLDXAW */
-
-/* misc */
-void XawTypeToStringWarning(Display*, String);
-
-/* OS.c */
-int _XawGetPageSize(void);
-
-#endif /* _XawPrivate_h */
+/*

+ * Copyright (c) 1998 by The XFree86 Project, Inc.

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the "Software"),

+ * to deal in the Software without restriction, including without limitation

+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, subject to the following conditions:

+ *

+ * 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 XFREE86 PROJECT 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 XFree86 Project 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

+ * XFree86 Project.

+ */

+

+#ifndef _XawPrivate_h

+#define _XawPrivate_h

+

+#define XawMax(a, b) ((a) > (b) ? (a) : (b))

+#define XawMin(a, b) ((a) < (b) ? (a) : (b))

+#define XawAbs(a)    ((a) < 0 ? -(a) : (a))

+

+#define XawStackAlloc(size, stk_buffer)		\

+((size) <= sizeof(stk_buffer)			\

+ ? (XtPointer)(stk_buffer)			\

+ : XtMalloc((unsigned)(size)))

+

+#define XawStackFree(pointer, stk_buffer)	\

+do {						\

+  if ((pointer) != (XtPointer)(stk_buffer))	\

+    XtFree((char *)pointer);			\

+} while (0)

+

+#ifndef XtX

+#define XtX(w)            (((RectObj)w)->rectangle.x)

+#endif

+#ifndef XtY

+#define XtY(w)            (((RectObj)w)->rectangle.y)

+#endif

+#ifndef XtWidth

+#define XtWidth(w)        (((RectObj)w)->rectangle.width)

+#endif

+#ifndef XtHeight

+#define XtHeight(w)       (((RectObj)w)->rectangle.height)

+#endif

+#ifndef XtBorderWidth

+#define XtBorderWidth(w)  (((RectObj)w)->rectangle.border_width)

+#endif

+

+#ifndef OLDXAW

+#define XAW_PRIV_VAR_PREFIX '$'

+

+typedef Bool (*XawParseBooleanProc)(Widget, String, XEvent*, Bool*);

+

+typedef struct _XawActionVarList XawActionVarList;

+typedef struct _XawActionResList XawActionResList;

+

+/* Boolean expressions */

+Bool XawParseBoolean(Widget, String, XEvent*, Bool*);

+Bool XawBooleanExpression(Widget, String, XEvent*);

+

+/* actions */

+void XawPrintActionErrorMsg(String, Widget, String*, Cardinal*);

+XawActionResList *XawGetActionResList(WidgetClass);

+XawActionVarList *XawGetActionVarList(Widget);

+

+void XawSetValuesAction(Widget, XEvent*, String*, Cardinal*);

+void XawGetValuesAction(Widget, XEvent*, String*, Cardinal*);

+void XawDeclareAction(Widget, XEvent*, String*, Cardinal*);

+void XawCallProcAction(Widget, XEvent*, String*, Cardinal*);

+

+/* display lists */

+#define	XAWDL_CONVERT_ERROR	(XtPointer)-1

+typedef struct _XawDL _XawDisplayList;

+typedef struct _XawDLClass XawDLClass, XawDisplayListClass;

+

+typedef void (*XawDisplayListProc)(Widget, XtPointer, XtPointer,

+				   XEvent*, Region);

+typedef void *(*XawDLArgsInitProc)(String, String*, Cardinal*,

+				   Screen*, Colormap, int);

+typedef void *(*XawDLDataInitProc)(String,

+				   Screen*, Colormap, int);

+typedef void (*XawDLArgsDestructor)(Display*, String, XtPointer,

+				    String*, Cardinal*);

+typedef void (*XawDLDataDestructor)(Display*, String, XtPointer);

+

+void XawRunDisplayList(Widget, _XawDisplayList*, XEvent*, Region);

+void XawDisplayListInitialize(void);

+

+_XawDisplayList *XawCreateDisplayList(String, Screen*, Colormap, int);

+void XawDestroyDisplayList(_XawDisplayList*);

+String XawDisplayListString(_XawDisplayList*);

+XawDLClass *XawGetDisplayListClass(String);

+XawDLClass *XawCreateDisplayListClass(String,

+				      XawDLArgsInitProc, XawDLArgsDestructor,

+				      XawDLDataInitProc, XawDLDataDestructor);

+Bool XawDeclareDisplayListProc(XawDLClass*, String, XawDisplayListProc);

+

+/* pixmaps */

+typedef struct _XawArgVal {

+  String name;

+  String value;

+} XawArgVal;

+

+typedef struct _XawParams {

+  String name;

+  String type;

+  String ext;

+  XawArgVal **args;

+  Cardinal num_args;

+} XawParams;

+

+typedef struct _XawPixmap {

+  String name;

+  Pixmap pixmap;

+  Pixmap mask;

+  Dimension width;

+  Dimension height;

+} XawPixmap;

+

+typedef Bool (*XawPixmapLoader)(XawParams*, Screen*, Colormap, int,

+				   Pixmap*, Pixmap*,

+				   Dimension*, Dimension*);

+Bool XawPixmapsInitialize(void);

+Bool XawAddPixmapLoader(String, String, XawPixmapLoader);

+XawPixmap *XawLoadPixmap(String, Screen*, Colormap, int);

+XawPixmap *XawPixmapFromXPixmap(Pixmap, Screen*, Colormap, int);

+XawParams *XawParseParamsString(String name);

+void XawFreeParamsStruct(XawParams *params);

+XawArgVal *XawFindArgVal(XawParams *params, String name);

+void XawReshapeWidget(Widget, XawPixmap*);

+#endif /* OLDXAW */

+

+/* misc */

+void XawTypeToStringWarning(Display*, String);

+

+/* OS.c */

+int _XawGetPageSize(void);

+

+#endif /* _XawPrivate_h */