svn merge ^/branches/released .

1 files changed, 370 insertions, 373 deletions

diff --git a/libXaw/include/X11/Xaw/Text.h b/libXaw/include/X11/Xaw/Text.h
index af80ffcdb..1f9b04915 100644
--- a/libXaw/include/X11/Xaw/Text.h
+++ b/libXaw/include/X11/Xaw/Text.h
@@ -1,373 +1,370 @@
-/* $Xorg: Text.h,v 1.4 2001/02/09 02:03:46 xorgcvs Exp $ */
-
-/***********************************************************
-
-Copyright 1987, 1988, 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.
-
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xaw/Text.h,v 1.14 2001/01/17 19:42:34 dawes Exp $ */
-
-#ifndef _XawText_h
-#define _XawText_h
-
-#include <X11/Xaw/Simple.h>
-
-/*
-
- Class: 	textWidgetClass
- Class Name:	Text
- Superclass:	Simple
-
- Resources added by the Text widget:
-
- Name		     Class	     RepType		Default Value
- ----		     -----	     -------		-------------
- autoFill	    AutoFill	     Boolean		False
- bottomMargin	    Margin	     Position		2
- displayPosition    TextPosition     XawTextPosition	0
- insertPosition	    TextPosition     XawTextPosition	0
- justify	    JustifyMode	     JustifyMode	left
- leftColumn	    Column	     Column		0
- rightColumn	    Column	     Column		0
- leftMargin	    Margin	     Position		2
- rightMargin	    Margin	     Position		4
- positionCallback   Callback	     Callback		NULL
- scrollHorizontal   Scroll	     Boolean		False
- scrollVertical     Scroll	     Boolean		False
- selectTypes        SelectTypes      Pointer            see documentation
- textSink	    TextSink	     Widget		NULL
- textSource	    TextSource	     Widget		NULL
- topMargin	    Margin	     Position		2
- unrealizeCallback  Callback	     Callback		NULL
- wrap		    Wrap	     XawTextWrapMode	XawTextWrapNever
-
-*/
-
-typedef long XawTextPosition;
-
-#ifndef notdef
-typedef enum {
-  XawtextScrollNever,
-  XawtextScrollWhenNeeded,
-  XawtextScrollAlways
-} XawTextScrollMode;
-
-typedef enum {
-  XawtextResizeNever,
-  XawtextResizeWidth,
-  XawtextResizeHeight,
-  XawtextResizeBoth
-} XawTextResizeMode;
-#endif
-
-typedef enum {
-  XawtextWrapNever,
-  XawtextWrapLine,
-  XawtextWrapWord
-} XawTextWrapMode;
-
-typedef enum {
-  XawsdLeft,
-  XawsdRight
-} XawTextScanDirection;
-
-typedef enum {
-  XawtextRead,
-  XawtextAppend,
-  XawtextEdit
-} XawTextEditType;
-
-typedef enum {
-  XawselectNull,
-  XawselectPosition,
-  XawselectChar,
-  XawselectWord,
-  XawselectLine,
-  XawselectParagraph,
-  XawselectAll,
-  XawselectAlphaNumeric
-} XawTextSelectType;
-
-typedef enum {
-    XawjustifyLeft,
-    XawjustifyRight,
-    XawjustifyCenter,
-    XawjustifyFull
-} XawTextJustifyMode;
-
-typedef struct {
-    int  firstPos;
-    int  length;
-    char *ptr;
-    unsigned long format;
-} XawTextBlock, *XawTextBlockPtr;
-
-#ifndef OLDXAW
-typedef struct {
-    int line_number;
-    int column_number;
-    XawTextPosition insert_position;
-    XawTextPosition last_position;
-    Boolean overwrite_mode;
-} XawTextPositionInfo;
-
-typedef struct {
-    XawTextPosition left, right;
-    XawTextBlock *block;
-} XawTextPropertyInfo;
-
-typedef struct _XawTextAnchor XawTextAnchor;
-typedef struct _XawTextEntity XawTextEntity;
-typedef struct _XawTextProperty XawTextProperty;
-typedef struct _XawTextPropertyList XawTextPropertyList;
-#endif
-
-#include <X11/Xaw/TextSink.h>
-#include <X11/Xaw/TextSrc.h>
-
-#define XtEtextScrollNever "never"
-#define XtEtextScrollWhenNeeded "whenneeded"
-#define XtEtextScrollAlways "always"
-#define XtEtextResizeNever "never"
-#define XtEtextResizeWidth "width"
-#define XtEtextResizeHeight "height"
-#define XtEtextResizeBoth "both"
-
-#define XtEtextWrapNever	"never"
-#define XtEtextWrapLine		"line"
-#define XtEtextWrapWord		"word"
-
-#define XtNautoFill "autoFill"
-#define XtNbottomMargin "bottomMargin"
-#define XtNdialogHOffset "dialogHOffset"
-#define XtNdialogVOffset "dialogVOffset"
-#define XtNdisplayCaret "displayCaret"
-#define XtNdisplayPosition "displayPosition"
-#define XtNleftMargin "leftMargin"
-#define XtNrightMargin "rightMargin"
-#define XtNpositionCallback "positionCallback"
-#define XtNscrollVertical "scrollVertical"
-#define XtNscrollHorizontal "scrollHorizontal"
-#define XtNselectTypes "selectTypes"
-#define XtNtopMargin "topMargin"
-#define XtNwrap "wrap"
-
-#define XtCColumn		"Column"
-#define XtNleftColumn		"leftColumn"
-#define XtNrightColumn		"rightColumn"
-
-#define XtCJustifyMode		XtCJustify
-#define XtNjustifyMode		XtNjustify
-#define XtEtextJustifyLeft	"left"
-#define XtEtextJustifyRight	"right"
-#define XtEtextJustifyCenter	"center"
-#define XtEtextJustifyFull	"full"
-
-#define XtCAutoFill "AutoFill"
-#define XtCSelectTypes "SelectTypes"
-#define XtCWrap "Wrap"
-#ifndef notdef
-#define XtCScroll		"Scroll"
-#endif
-
-#ifndef _XtStringDefs_h_
-#define XtNinsertPosition "insertPosition"
-#ifndef notdef
-#define XtNresize "resize"
-#define XtCResize "Resize"
-#endif
-#define XtNselection		"selection"
-#endif
-
-/* return Error code for XawTextSearch */
-#define XawTextSearchError      (-12345L)
-
-/* return codes from XawTextReplace */
-#define XawReplaceError	       -1
-#define XawEditDone		0
-#define XawEditError		1
-#define XawPositionError	2
-
-/* XrmQuark is not unsigned long */
-#define XawTextFormat(tw,fmt) ((unsigned long)_XawTextFormat(tw) == (fmt))
-
-extern unsigned long FMT8BIT;
-extern unsigned long XawFmt8Bit;
-extern unsigned long XawFmtWide;
-
-extern WidgetClass textWidgetClass;
-
-typedef struct _TextClassRec *TextWidgetClass;
-typedef struct _TextRec      *TextWidget;
-
-_XFUNCPROTOBEGIN
-
-XrmQuark _XawTextFormat
-(
- TextWidget		tw
- );
-
-void XawTextDisplay
-(
- Widget			w
- );
-
-void XawTextEnableRedisplay
-(
- Widget			w
- );
-
-void XawTextDisableRedisplay
-(
- Widget			w
- );
-
-void XawTextSetSelectionArray
-(
- Widget			w,
- XawTextSelectType	*sarray
- );
-
-void XawTextGetSelectionPos
-(
- Widget			w,
- XawTextPosition	*begin_return,
- XawTextPosition	*end_return
- );
-
-void XawTextSetSource
-(
- Widget			w,
- Widget			source,
- XawTextPosition	top
- );
-
-int XawTextReplace
-(
- Widget			w,
- XawTextPosition	start,
- XawTextPosition	end,
- XawTextBlock		*text
- );
-
-XawTextPosition XawTextTopPosition
-(
- Widget			w
- );
-
-XawTextPosition XawTextLastPosition
-(
- Widget			w
- );
-
-void XawTextSetInsertionPoint
-(
- Widget			w,
- XawTextPosition	position
- );
-
-XawTextPosition XawTextGetInsertionPoint
-(
- Widget			w
- );
-
-void XawTextUnsetSelection
-(
- Widget			w
- );
-
-void XawTextSetSelection
-(
- Widget			w,
- XawTextPosition	left,
- XawTextPosition	right
- );
-
-void XawTextInvalidate
-(
- Widget			w,
- XawTextPosition	from,
- XawTextPosition	to
-);
-
-Widget XawTextGetSource
-(
- Widget			w
- );
-
-Widget XawTextGetSink
-(
- Widget			w
- );
-
-XawTextPosition XawTextSearch
-(
- Widget			w,
-#if NeedWidePrototypes
- int			dir,
-#else
- XawTextScanDirection	dir,
-#endif
- XawTextBlock		*text
- );
-
-void XawTextDisplayCaret
-(
- Widget			w,
-#if NeedWidePrototypes
- int			visible
-#else
- Boolean		visible
-#endif
- );
-
-_XFUNCPROTOEND
-
-/*
- * For R3 compatability only
- */
-#include <X11/Xaw/AsciiSrc.h>
-#include <X11/Xaw/AsciiSink.h>
-
-#endif /* _XawText_h */
+/***********************************************************

+

+Copyright 1987, 1988, 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.

+

+

+Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.

+

+                        All Rights Reserved

+

+Permission to use, copy, modify, and distribute this software and its 

+documentation for any purpose and without fee is hereby granted, 

+provided that the above copyright notice appear in all copies and that

+both that copyright notice and this permission notice appear in 

+supporting documentation, and that the name of Digital not be

+used in advertising or publicity pertaining to distribution of the

+software without specific, written prior permission.  

+

+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING

+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL

+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR

+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,

+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,

+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS

+SOFTWARE.

+

+******************************************************************/

+

+#ifndef _XawText_h

+#define _XawText_h

+

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

+

+/*

+

+ Class: 	textWidgetClass

+ Class Name:	Text

+ Superclass:	Simple

+

+ Resources added by the Text widget:

+

+ Name		     Class	     RepType		Default Value

+ ----		     -----	     -------		-------------

+ autoFill	    AutoFill	     Boolean		False

+ bottomMargin	    Margin	     Position		2

+ displayPosition    TextPosition     XawTextPosition	0

+ insertPosition	    TextPosition     XawTextPosition	0

+ justify	    JustifyMode	     JustifyMode	left

+ leftColumn	    Column	     Column		0

+ rightColumn	    Column	     Column		0

+ leftMargin	    Margin	     Position		2

+ rightMargin	    Margin	     Position		4

+ positionCallback   Callback	     Callback		NULL

+ scrollHorizontal   Scroll	     Boolean		False

+ scrollVertical     Scroll	     Boolean		False

+ selectTypes        SelectTypes      Pointer            see documentation

+ textSink	    TextSink	     Widget		NULL

+ textSource	    TextSource	     Widget		NULL

+ topMargin	    Margin	     Position		2

+ unrealizeCallback  Callback	     Callback		NULL

+ wrap		    Wrap	     XawTextWrapMode	XawTextWrapNever

+

+*/

+

+typedef long XawTextPosition;

+

+#ifndef notdef

+typedef enum {

+  XawtextScrollNever,

+  XawtextScrollWhenNeeded,

+  XawtextScrollAlways

+} XawTextScrollMode;

+

+typedef enum {

+  XawtextResizeNever,

+  XawtextResizeWidth,

+  XawtextResizeHeight,

+  XawtextResizeBoth

+} XawTextResizeMode;

+#endif

+

+typedef enum {

+  XawtextWrapNever,

+  XawtextWrapLine,

+  XawtextWrapWord

+} XawTextWrapMode;

+

+typedef enum {

+  XawsdLeft,

+  XawsdRight

+} XawTextScanDirection;

+

+typedef enum {

+  XawtextRead,

+  XawtextAppend,

+  XawtextEdit

+} XawTextEditType;

+

+typedef enum {

+  XawselectNull,

+  XawselectPosition,

+  XawselectChar,

+  XawselectWord,

+  XawselectLine,

+  XawselectParagraph,

+  XawselectAll,

+  XawselectAlphaNumeric

+} XawTextSelectType;

+

+typedef enum {

+    XawjustifyLeft,

+    XawjustifyRight,

+    XawjustifyCenter,

+    XawjustifyFull

+} XawTextJustifyMode;

+

+typedef struct {

+    int  firstPos;

+    int  length;

+    char *ptr;

+    unsigned long format;

+} XawTextBlock, *XawTextBlockPtr;

+

+#ifndef OLDXAW

+typedef struct {

+    int line_number;

+    int column_number;

+    XawTextPosition insert_position;

+    XawTextPosition last_position;

+    Boolean overwrite_mode;

+} XawTextPositionInfo;

+

+typedef struct {

+    XawTextPosition left, right;

+    XawTextBlock *block;

+} XawTextPropertyInfo;

+

+typedef struct _XawTextAnchor XawTextAnchor;

+typedef struct _XawTextEntity XawTextEntity;

+typedef struct _XawTextProperty XawTextProperty;

+typedef struct _XawTextPropertyList XawTextPropertyList;

+#endif

+

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

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

+

+#define XtEtextScrollNever "never"

+#define XtEtextScrollWhenNeeded "whenneeded"

+#define XtEtextScrollAlways "always"

+#define XtEtextResizeNever "never"

+#define XtEtextResizeWidth "width"

+#define XtEtextResizeHeight "height"

+#define XtEtextResizeBoth "both"

+

+#define XtEtextWrapNever	"never"

+#define XtEtextWrapLine		"line"

+#define XtEtextWrapWord		"word"

+

+#define XtNautoFill "autoFill"

+#define XtNbottomMargin "bottomMargin"

+#define XtNdialogHOffset "dialogHOffset"

+#define XtNdialogVOffset "dialogVOffset"

+#define XtNdisplayCaret "displayCaret"

+#define XtNdisplayPosition "displayPosition"

+#define XtNleftMargin "leftMargin"

+#define XtNrightMargin "rightMargin"

+#define XtNpositionCallback "positionCallback"

+#define XtNscrollVertical "scrollVertical"

+#define XtNscrollHorizontal "scrollHorizontal"

+#define XtNselectTypes "selectTypes"

+#define XtNtopMargin "topMargin"

+#define XtNwrap "wrap"

+

+#define XtCColumn		"Column"

+#define XtNleftColumn		"leftColumn"

+#define XtNrightColumn		"rightColumn"

+

+#define XtCJustifyMode		XtCJustify

+#define XtNjustifyMode		XtNjustify

+#define XtEtextJustifyLeft	"left"

+#define XtEtextJustifyRight	"right"

+#define XtEtextJustifyCenter	"center"

+#define XtEtextJustifyFull	"full"

+

+#define XtCAutoFill "AutoFill"

+#define XtCSelectTypes "SelectTypes"

+#define XtCWrap "Wrap"

+#ifndef notdef

+#define XtCScroll		"Scroll"

+#endif

+

+#ifndef _XtStringDefs_h_

+#define XtNinsertPosition "insertPosition"

+#ifndef notdef

+#define XtNresize "resize"

+#define XtCResize "Resize"

+#endif

+#define XtNselection		"selection"

+#endif

+

+/* return Error code for XawTextSearch */

+#define XawTextSearchError      (-12345L)

+

+/* return codes from XawTextReplace */

+#define XawReplaceError	       -1

+#define XawEditDone		0

+#define XawEditError		1

+#define XawPositionError	2

+

+/* XrmQuark is not unsigned long */

+#define XawTextFormat(tw,fmt) ((unsigned long)_XawTextFormat(tw) == (fmt))

+

+extern unsigned long FMT8BIT;

+extern unsigned long XawFmt8Bit;

+extern unsigned long XawFmtWide;

+

+extern WidgetClass textWidgetClass;

+

+typedef struct _TextClassRec *TextWidgetClass;

+typedef struct _TextRec      *TextWidget;

+

+_XFUNCPROTOBEGIN

+

+XrmQuark _XawTextFormat

+(

+ TextWidget		tw

+ );

+

+void XawTextDisplay

+(

+ Widget			w

+ );

+

+void XawTextEnableRedisplay

+(

+ Widget			w

+ );

+

+void XawTextDisableRedisplay

+(

+ Widget			w

+ );

+

+void XawTextSetSelectionArray

+(

+ Widget			w,

+ XawTextSelectType	*sarray

+ );

+

+void XawTextGetSelectionPos

+(

+ Widget			w,

+ XawTextPosition	*begin_return,

+ XawTextPosition	*end_return

+ );

+

+void XawTextSetSource

+(

+ Widget			w,

+ Widget			source,

+ XawTextPosition	top

+ );

+

+int XawTextReplace

+(

+ Widget			w,

+ XawTextPosition	start,

+ XawTextPosition	end,

+ XawTextBlock		*text

+ );

+

+XawTextPosition XawTextTopPosition

+(

+ Widget			w

+ );

+

+XawTextPosition XawTextLastPosition

+(

+ Widget			w

+ );

+

+void XawTextSetInsertionPoint

+(

+ Widget			w,

+ XawTextPosition	position

+ );

+

+XawTextPosition XawTextGetInsertionPoint

+(

+ Widget			w

+ );

+

+void XawTextUnsetSelection

+(

+ Widget			w

+ );

+

+void XawTextSetSelection

+(

+ Widget			w,

+ XawTextPosition	left,

+ XawTextPosition	right

+ );

+

+void XawTextInvalidate

+(

+ Widget			w,

+ XawTextPosition	from,

+ XawTextPosition	to

+);

+

+Widget XawTextGetSource

+(

+ Widget			w

+ );

+

+Widget XawTextGetSink

+(

+ Widget			w

+ );

+

+XawTextPosition XawTextSearch

+(

+ Widget			w,

+#if NeedWidePrototypes

+ int			dir,

+#else

+ XawTextScanDirection	dir,

+#endif

+ XawTextBlock		*text

+ );

+

+void XawTextDisplayCaret

+(

+ Widget			w,

+#if NeedWidePrototypes

+ int			visible

+#else

+ Boolean		visible

+#endif

+ );

+

+_XFUNCPROTOEND

+

+/*

+ * For R3 compatability only

+ */

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

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

+

+#endif /* _XawText_h */