Added libX11-1.2.2.tar.gz.

1 files changed, 26 insertions, 48 deletions

diff --git a/libX11/src/xlibi18n/ICWrap.c b/libX11/src/xlibi18n/ICWrap.c
index b51da6f41..3708229b9 100644
--- a/libX11/src/xlibi18n/ICWrap.c
+++ b/libX11/src/xlibi18n/ICWrap.c
@@ -13,30 +13,30 @@
  * 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 names of OMRON, NTT Software, NTT, and
- * Open Software Foundation not be used in advertising or publicity 
- * pertaining to distribution of the software without specific, 
+ * Open Software Foundation not be used in advertising or publicity
+ * pertaining to distribution of the software without specific,
  * written prior permission. OMRON, NTT Software, NTT, and Open Software
  * Foundation make no representations about the suitability of this
  * software for any purpose.  It is provided "as is" without express or
  * implied warranty.
  *
- * OMRON, NTT SOFTWARE, NTT, AND OPEN SOFTWARE FOUNDATION 
- * DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT 
+ * OMRON, NTT SOFTWARE, NTT, AND OPEN SOFTWARE FOUNDATION
+ * DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT
  * SHALL OMRON, NTT SOFTWARE, NTT, OR OPEN SOFTWARE FOUNDATION BE
- * LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 
+ * 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.
- * 
+ *
  *	Authors: Li Yuhong		OMRON Corporation
  *		 Tatsuya Kato		NTT Software Corporation
  *		 Hiroshi Kuribayashi	OMRON Coproration
  *		 Muneiyoshi Suzuki	Nippon Telegraph and Telephone Co.
- * 
- *		 M. Collins		OSF  
+ *
+ *		 M. Collins		OSF
  *		 Takashi Fujiwara	FUJITSU LIMITED
- */				
+ */
 /*
 
 Copyright 1991, 1998  The Open Group
@@ -224,7 +224,7 @@ XGetIMValues(XIM im, ...)
 }
 
 /*
- * Create an input context within the input method, 
+ * Create an input context within the input method,
  * and return a pointer to the input context.
  */
 
@@ -235,7 +235,7 @@ XCreateIC(XIM im, ...)
     int     total_count;
     XIMArg *args;
     XIC     ic;
-  
+
     /*
      * so count the stuff dangling here
      */
@@ -263,8 +263,7 @@ XCreateIC(XIM im, ...)
  * Free the input context.
  */
 void
-XDestroyIC(ic)
-    XIC ic;
+XDestroyIC(XIC ic)
 {
     XIM im = ic->core.im;
     XIC *prev;
@@ -283,7 +282,7 @@ XDestroyIC(ic)
 
 char *
 XGetICValues(XIC ic, ...)
-{ 
+{
     va_list var;
     int     total_count;
     XIMArg *args;
@@ -346,8 +345,7 @@ XSetICValues(XIC ic, ...)
  * argument.
  */
 void
-XSetICFocus(ic)
-    XIC ic;
+XSetICFocus(XIC ic)
 {
   if (ic && ic->core.im)
       (*ic->methods->set_focus) (ic);
@@ -358,8 +356,7 @@ XSetICFocus(ic)
  * argument.
  */
 void
-XUnsetICFocus(ic)
-    XIC ic;
+XUnsetICFocus(XIC ic)
 {
   if (ic->core.im)
       (*ic->methods->unset_focus) (ic);
@@ -369,15 +366,13 @@ XUnsetICFocus(ic)
  * Return the XIM associated with the input context.
  */
 XIM
-XIMOfIC(ic)
-    XIC ic;
+XIMOfIC(XIC ic)
 {
     return ic->core.im;
 }
 
 char *
-XmbResetIC(ic)
-    XIC ic;
+XmbResetIC(XIC ic)
 {
     if (ic->core.im)
 	return (*ic->methods->mb_reset)(ic);
@@ -385,8 +380,7 @@ XmbResetIC(ic)
 }
 
 wchar_t *
-XwcResetIC(ic)
-    XIC ic;
+XwcResetIC(XIC ic)
 {
     if (ic->core.im)
 	return (*ic->methods->wc_reset)(ic);
@@ -394,8 +388,7 @@ XwcResetIC(ic)
 }
 
 char *
-Xutf8ResetIC(ic)
-    XIC ic;
+Xutf8ResetIC(XIC ic)
 {
     if (ic->core.im) {
 	if (ic->methods->utf8_reset)
@@ -407,13 +400,8 @@ Xutf8ResetIC(ic)
 }
 
 int
-XmbLookupString(ic, ev, buffer, nbytes, keysym, status)
-    XIC ic;
-    register XKeyEvent *ev;
-    char *buffer;
-    int nbytes;
-    KeySym *keysym;
-    Status *status;
+XmbLookupString(XIC ic, XKeyEvent *ev, char *buffer, int nbytes,
+		KeySym *keysym, Status *status)
 {
     if (ic->core.im)
 	return (*ic->methods->mb_lookup_string) (ic, ev, buffer, nbytes,
@@ -422,13 +410,8 @@ XmbLookupString(ic, ev, buffer, nbytes, keysym, status)
 }
 
 int
-XwcLookupString(ic, ev, buffer, nchars, keysym, status)
-    XIC ic;
-    register XKeyEvent *ev;
-    wchar_t *buffer;
-    int nchars;
-    KeySym *keysym;
-    Status *status;
+XwcLookupString(XIC ic, XKeyEvent *ev, wchar_t *buffer, int nchars,
+		KeySym *keysym, Status *status)
 {
     if (ic->core.im)
 	return (*ic->methods->wc_lookup_string) (ic, ev, buffer, nchars,
@@ -437,13 +420,8 @@ XwcLookupString(ic, ev, buffer, nchars, keysym, status)
 }
 
 int
-Xutf8LookupString(ic, ev, buffer, nbytes, keysym, status)
-    XIC ic;
-    register XKeyEvent *ev;
-    char *buffer;
-    int nbytes;
-    KeySym *keysym;
-    Status *status;
+Xutf8LookupString(XIC ic, XKeyEvent *ev, char *buffer, int nbytes,
+		  KeySym *keysym, Status *status)
 {
     if (ic->core.im) {
 	if (ic->methods->utf8_lookup_string)