Synchronised line endinge with release branch

1 files changed, 210 insertions, 210 deletions

diff --git a/libXaw/include/X11/Xaw/XawImP.h b/libXaw/include/X11/Xaw/XawImP.h
index 546b7b777..536e5b4f9 100644
--- a/libXaw/include/X11/Xaw/XawImP.h
+++ b/libXaw/include/X11/Xaw/XawImP.h
@@ -1,210 +1,210 @@
-/*

- * Copyright 1991 by OMRON Corporation

- *

- * 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, and that the name of OMRON not be used in advertising or

- * publicity pertaining to distribution of the software without specific,

- * written prior permission.  OMRON makes no representations about the

- * suitability of this software for any purpose.  It is provided "as is"

- * without express or implied warranty.

- *

- * OMRON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING

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

- * OMRON 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 TORTUOUS ACTION,

- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS

- * SOFTWARE. 

- *

- *	Author:	Seiji Kuwari	OMRON Corporation

- *				kuwa@omron.co.jp

- *				kuwa%omron.co.jp@uunet.uu.net

- */				

-

-/*

-

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

-

-*/

-

-#ifndef _XawImP_h

-#define _XawImP_h

-

-#define XtNinputMethod		"inputMethod"

-#define XtCInputMethod		"InputMethod"

-#define XtNpreeditType		"preeditType"

-#define XtCPreeditType		"PreeditType"

-#define XtNopenIm		"openIm"

-#define XtCOpenIm		"OpenIm"

-#define XtNsharedIc		"sharedIc"

-#define XtCSharedIc		"SharedIc"

-

-#include <X11/Xaw/Text.h>

-

-#define	CIICFocus	(1 << 0)

-#define	CIFontSet	(1 << 1)

-#define	CIFg		(1 << 2)

-#define	CIBg		(1 << 3)

-#define	CIBgPixmap	(1 << 4)

-#define	CICursorP	(1 << 5)

-#define	CILineS		(1 << 6)

-

-typedef	struct _XawImPart {

-    XIM			xim;

-    XrmResourceList	resources;

-    Cardinal		num_resources;

-    Boolean		open_im;

-    Boolean		initialized;

-    Dimension		area_height;

-    String		input_method;

-    String		preedit_type;

-} XawImPart;

-

-typedef struct _XawIcTablePart {

-    Widget		widget;

-    XIC			xic;

-    XIMStyle		input_style;

-    unsigned long	flg;

-    unsigned long	prev_flg;

-    Boolean		ic_focused;

-    XFontSet		font_set;

-    Pixel		foreground;

-    Pixel		background;

-    Pixmap		bg_pixmap;

-    XawTextPosition	cursor_position;

-    unsigned long	line_spacing;

-    Boolean		openic_error;

-    struct _XawIcTablePart *next;

-} XawIcTablePart, *XawIcTableList;

-

-typedef	struct _XawIcPart {

-    XIMStyle		input_style;

-    Boolean		shared_ic;

-    XawIcTableList	shared_ic_table;

-    XawIcTableList	current_ic_table;

-    XawIcTableList	ic_table;

-} XawIcPart;

-

-typedef	struct _contextDataRec {

-    Widget		parent;

-    Widget		ve;

-} contextDataRec;

-

-typedef	struct _contextErrDataRec {

-    Widget		widget;

-    XIM			xim;

-} contextErrDataRec;

-

-void _XawImResizeVendorShell

-(

- Widget			w

- );

-

-Dimension _XawImGetShellHeight

-(

- Widget			w

-);

-

-void _XawImRealize

-(

- Widget			w

- );

-

-void _XawImInitialize

-(

- Widget			w,

- Widget			ext

- );

-

-void _XawImReconnect

-(

- Widget			w

- );

-

-void _XawImRegister

-(

- Widget			w

- );

-

-void _XawImUnregister

-(

- Widget			w

- );

-

-void _XawImSetValues

-(

- Widget			w,

- ArgList		args,

- Cardinal		num_args

- );

-

-void _XawImSetFocusValues

-(

- Widget			w,

- ArgList		args,

- Cardinal		num_args

-);

-

-void _XawImUnsetFocus

-(

- Widget			w

- );

-

-int _XawImWcLookupString

-(

- Widget			w,

- XKeyPressedEvent	*event,

- wchar_t		*buffer_return,

- int			bytes_buffer,

- KeySym			*keysym_return

- );

-

-int _XawLookupString

-(

- Widget			w,

- XKeyEvent		*event,

- char			*buffer_return,

- int			buffer_size,

- KeySym			*keysym_return

- );

-

-int _XawImGetImAreaHeight

-(

- Widget			w

- );

-

-void _XawImCallVendorShellExtResize

-(

- Widget			w

- );

-

-void _XawImDestroy

-(

- Widget			w,

- Widget			ext

- );

-

-#endif	/* _XawImP_h */

+/*
+ * Copyright 1991 by OMRON Corporation
+ *
+ * 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, and that the name of OMRON not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  OMRON makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ *
+ * OMRON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+ * OMRON 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 TORTUOUS ACTION,
+ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE. 
+ *
+ *	Author:	Seiji Kuwari	OMRON Corporation
+ *				kuwa@omron.co.jp
+ *				kuwa%omron.co.jp@uunet.uu.net
+ */				
+
+/*
+
+Copyright 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.
+
+*/
+
+#ifndef _XawImP_h
+#define _XawImP_h
+
+#define XtNinputMethod		"inputMethod"
+#define XtCInputMethod		"InputMethod"
+#define XtNpreeditType		"preeditType"
+#define XtCPreeditType		"PreeditType"
+#define XtNopenIm		"openIm"
+#define XtCOpenIm		"OpenIm"
+#define XtNsharedIc		"sharedIc"
+#define XtCSharedIc		"SharedIc"
+
+#include <X11/Xaw/Text.h>
+
+#define	CIICFocus	(1 << 0)
+#define	CIFontSet	(1 << 1)
+#define	CIFg		(1 << 2)
+#define	CIBg		(1 << 3)
+#define	CIBgPixmap	(1 << 4)
+#define	CICursorP	(1 << 5)
+#define	CILineS		(1 << 6)
+
+typedef	struct _XawImPart {
+    XIM			xim;
+    XrmResourceList	resources;
+    Cardinal		num_resources;
+    Boolean		open_im;
+    Boolean		initialized;
+    Dimension		area_height;
+    String		input_method;
+    String		preedit_type;
+} XawImPart;
+
+typedef struct _XawIcTablePart {
+    Widget		widget;
+    XIC			xic;
+    XIMStyle		input_style;
+    unsigned long	flg;
+    unsigned long	prev_flg;
+    Boolean		ic_focused;
+    XFontSet		font_set;
+    Pixel		foreground;
+    Pixel		background;
+    Pixmap		bg_pixmap;
+    XawTextPosition	cursor_position;
+    unsigned long	line_spacing;
+    Boolean		openic_error;
+    struct _XawIcTablePart *next;
+} XawIcTablePart, *XawIcTableList;
+
+typedef	struct _XawIcPart {
+    XIMStyle		input_style;
+    Boolean		shared_ic;
+    XawIcTableList	shared_ic_table;
+    XawIcTableList	current_ic_table;
+    XawIcTableList	ic_table;
+} XawIcPart;
+
+typedef	struct _contextDataRec {
+    Widget		parent;
+    Widget		ve;
+} contextDataRec;
+
+typedef	struct _contextErrDataRec {
+    Widget		widget;
+    XIM			xim;
+} contextErrDataRec;
+
+void _XawImResizeVendorShell
+(
+ Widget			w
+ );
+
+Dimension _XawImGetShellHeight
+(
+ Widget			w
+);
+
+void _XawImRealize
+(
+ Widget			w
+ );
+
+void _XawImInitialize
+(
+ Widget			w,
+ Widget			ext
+ );
+
+void _XawImReconnect
+(
+ Widget			w
+ );
+
+void _XawImRegister
+(
+ Widget			w
+ );
+
+void _XawImUnregister
+(
+ Widget			w
+ );
+
+void _XawImSetValues
+(
+ Widget			w,
+ ArgList		args,
+ Cardinal		num_args
+ );
+
+void _XawImSetFocusValues
+(
+ Widget			w,
+ ArgList		args,
+ Cardinal		num_args
+);
+
+void _XawImUnsetFocus
+(
+ Widget			w
+ );
+
+int _XawImWcLookupString
+(
+ Widget			w,
+ XKeyPressedEvent	*event,
+ wchar_t		*buffer_return,
+ int			bytes_buffer,
+ KeySym			*keysym_return
+ );
+
+int _XawLookupString
+(
+ Widget			w,
+ XKeyEvent		*event,
+ char			*buffer_return,
+ int			buffer_size,
+ KeySym			*keysym_return
+ );
+
+int _XawImGetImAreaHeight
+(
+ Widget			w
+ );
+
+void _XawImCallVendorShellExtResize
+(
+ Widget			w
+ );
+
+void _XawImDestroy
+(
+ Widget			w,
+ Widget			ext
+ );
+
+#endif	/* _XawImP_h */