*** xc/lib/X11/Imakefile.orig	Mon Aug 26 10:23:31 1996
--- lib/X11/Imakefile	Tue Jan  7 03:28:59 1997
***************
*** 924,929 ****
--- 924,930 ----
  SpecialCLibObjectRule(XKBCvt,$(_NOOP_),$(RCONST_DEFINES))
  SpecialCLibObjectRule(KeyBind,$(ICONFIGFILES),$(XKB_DEFINES))
  SpecialCLibObjectRule(XKBBind,$(ICONFIGFILES),$(XKB_DEFINES))
+ SpecialCLibObjectRule(imConv,$(ICONFIGFILES),$(XKB_DEFINES))
  #endif
  #if HasKrb5
  SpecialCLibObjectRule(k5encode,$(_NOOP_),$(K5INCL))
*** xc/lib/X11/XKBBind.c.orig	Tue Aug 13 15:25:35 1996
--- lib/X11/XKBBind.c	Tue Jan  7 03:28:59 1997
***************
*** 582,589 ****
      LockDisplay(dpy);
      xkbi->desc = desc;
  
!     xkbi->charset = _XkbGetCharset(NULL);
!     _XkbGetConverters(xkbi->charset,&xkbi->cvt);
      UnlockDisplay(dpy);
      oldEvents= xkbi->selected_events;
      if (!(xkbi->xlib_ctrls&XkbLC_IgnoreNewKeyboards)) {
--- 582,588 ----
      LockDisplay(dpy);
      xkbi->desc = desc;
  
!     _XkbGetConverters(_XkbGetCharset(),&xkbi->cvt);
      UnlockDisplay(dpy);
      oldEvents= xkbi->selected_events;
      if (!(xkbi->xlib_ctrls&XkbLC_IgnoreNewKeyboards)) {
*** xc/lib/X11/XKBCvt.c.orig	Tue Aug 27 07:11:24 1996
--- lib/X11/XKBCvt.c	Tue Jan  7 03:28:59 1997
***************
*** 38,43 ****
--- 38,45 ----
  #include <X11/Xlib.h>
  #define NEED_EVENTS
  #include "Xlibint.h"
+ #include "Xlcint.h"
+ #include "XlcPubI.h"
  #include <X11/Xutil.h>
  #include <X11/Xmd.h>
  #define XK_LATIN1
***************
*** 49,55 ****
  #include <ctype.h>
  #include <X11/Xos.h>
  
! #ifdef __sgi
  #define	XKB_EXTEND_LOOKUP_STRING
  #endif
  
--- 51,57 ----
  #include <ctype.h>
  #include <X11/Xos.h>
  
! #ifdef __sgi_not_xconsortium
  #define	XKB_EXTEND_LOOKUP_STRING
  #endif
  
***************
*** 143,148 ****
--- 145,151 ----
      0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
      0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, /* 15 */
      0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff};
+ 
  /* maps Greek keysyms to 8859-7 */
  static unsigned char Const greek[128] =
     {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
***************
*** 491,497 ****
  	register int i;
  	for (i=0;i<sizeof(koi8)/sizeof(unsigned char);i++) {
  	    if (koi8[i]==buffer[0])
! 		return 0xd80|i;
  	}
      }
      return NoSymbol;
--- 494,500 ----
  	register int i;
  	for (i=0;i<sizeof(koi8)/sizeof(unsigned char);i++) {
  	    if (koi8[i]==buffer[0])
! 		return 0x680|i;
  	}
      }
      return NoSymbol;
***************
*** 577,617 ****
  
  int 
  #if NeedFunctionPrototypes
! _XkbGetConverters(char *charset, XkbConverters *cvt_rtrn)
  #else
! _XkbGetConverters(charset, cvt_rtrn)
!     char *charset;
      XkbConverters *cvt_rtrn;
  #endif
  {
      if ( cvt_rtrn ) {
! 	if ( (charset==NULL) || (Strcmp(charset,"ascii")==0) )
  	     *cvt_rtrn = cvt_ascii;
! 	else if (Strcmp(charset,"iso8859-1")==0)
  	     *cvt_rtrn = cvt_latin1;
! 	else if (Strcmp(charset, "iso8859-2")==0)
  	     *cvt_rtrn = cvt_latin2;
! 	else if (Strcmp(charset, "iso8859-3")==0)
  	     *cvt_rtrn = cvt_latin3;
! 	else if (Strcmp(charset, "iso8859-4")==0)
  	     *cvt_rtrn = cvt_latin4;
! 	else if (Strcmp(charset, "iso8859-5")==0)
  	     *cvt_rtrn = cvt_Cyrillic;
! 	else if (Strcmp(charset, "iso8859-6")==0)
  	     *cvt_rtrn = cvt_Arabic;
! 	else if (Strcmp(charset, "iso8859-7")==0)
  	     *cvt_rtrn = cvt_Greek;
! 	else if (Strcmp(charset, "iso8859-8")==0)
  	     *cvt_rtrn = cvt_Hebrew;
! 	else if (Strcmp(charset, "apl")==0)
  	     *cvt_rtrn = cvt_APL;
! 	else if (Strcmp(charset, "jisx0201")==0)
  	     *cvt_rtrn = cvt_X0201;
! 	else if (Strcmp(charset, "kana")==0)
  	     *cvt_rtrn = cvt_kana;
! 	else if (Strcmp(charset, "tis620.2533-1")==0)
  	     *cvt_rtrn = cvt_Thai;
! 	else if (Strcmp(charset, "koi8")==0)
  	     *cvt_rtrn = cvt_Koi8;
  	/* other codesets go here */
  	else *cvt_rtrn = cvt_latin1;
--- 580,630 ----
  
  int 
  #if NeedFunctionPrototypes
! _XkbGetConverters(char *encoding_name, XkbConverters *cvt_rtrn)
  #else
! _XkbGetConverters(encoding_name, cvt_rtrn)
!     char *encoding_name;
      XkbConverters *cvt_rtrn;
  #endif
  {
      if ( cvt_rtrn ) {
! 	if ( (encoding_name==NULL) || 
! 	     (Strcmp(encoding_name,"ascii")==0) ||
! 	     (Strcmp(encoding_name,"string")==0) )
  	     *cvt_rtrn = cvt_ascii;
! 	else if (Strcmp(encoding_name,"iso8859-1")==0)
  	     *cvt_rtrn = cvt_latin1;
! 	else if (Strcmp(encoding_name, "iso8859-2")==0)
  	     *cvt_rtrn = cvt_latin2;
! 	else if (Strcmp(encoding_name, "iso8859-3")==0)
  	     *cvt_rtrn = cvt_latin3;
! 	else if (Strcmp(encoding_name, "iso8859-4")==0)
  	     *cvt_rtrn = cvt_latin4;
! 	else if (Strcmp(encoding_name, "iso8859-5")==0)
  	     *cvt_rtrn = cvt_Cyrillic;
! 	else if (Strcmp(encoding_name, "iso8859-6")==0)
  	     *cvt_rtrn = cvt_Arabic;
! 	else if (Strcmp(encoding_name, "iso8859-7")==0)
  	     *cvt_rtrn = cvt_Greek;
! 	else if (Strcmp(encoding_name, "iso8859-8")==0)
  	     *cvt_rtrn = cvt_Hebrew;
! 	else if (Strcmp(encoding_name, "apl")==0) /* what is this? */
  	     *cvt_rtrn = cvt_APL;
! #if 0
! 	else if (Strcmp(encoding_name, "ja.euc")==0)
! 	     *cvt_rtrn = ???;
! 	else if (Strcmp(encoding_name, "ja.jis")==0)
! 	     *cvt_rtrn = ???;
! 	else if (Strcmp(encoding_name, "ja.sjis")==0)
! 	     *cvt_rtrn = ???;
! #endif 
! 	else if (Strcmp(encoding_name, "jisx0201")==0) /* ??? */
  	     *cvt_rtrn = cvt_X0201;
! 	else if (Strcmp(encoding_name, "kana")==0) /* ??? */
  	     *cvt_rtrn = cvt_kana;
! 	else if (Strcmp(encoding_name, "tactis")==0)
  	     *cvt_rtrn = cvt_Thai;
! 	else if (Strcmp(encoding_name, "koi8-r")==0)
  	     *cvt_rtrn = cvt_Koi8;
  	/* other codesets go here */
  	else *cvt_rtrn = cvt_latin1;
***************
*** 623,639 ****
  
  /***====================================================================***/
  
  #ifdef XKB_EXTEND_LOOKUP_STRING
  #define	CHARSET_FILE	"/usr/lib/X11/input/charsets"
! static char *_XkbKnownLanguages = "c=ascii:da,de,en,es,fi,fr,is,it,nl,no,pt,sv=iso8859-1:hu,pl,cs=iso8859-2:bg,ru=iso8859-5:ar,ara=iso8859-6:el=iso8859-7:th,th_TH,th_TH.TACTIS:tis620.2533-1";
  
  char	*
! #if NeedFunctionPrototypes
! _XkbGetCharset(char *locale)
! #else
! _XkbGetCharset(locale)
!     char *locale;
! #endif
  {
      /*
       * PAGE USAGE TUNING: explicitly initialize to move these to data
--- 636,652 ----
  
  /***====================================================================***/
  
+ /* 
+  * The function _XkbGetCharset seems to be missnamed as what it seems to
+  * be used for is to determine the encoding-name for the locale. ???
+  */
+ 
  #ifdef XKB_EXTEND_LOOKUP_STRING
  #define	CHARSET_FILE	"/usr/lib/X11/input/charsets"
! static char *_XkbKnownLanguages = "c=ascii:da,de,en,es,fi,fr,is,it,nl,no,pt,sv=iso8859-1:hu,pl,cs=iso8859-2:bg,ru=iso8859-5:ar,ara=iso8859-6:el=iso8859-7:th,th_TH,th_TH.TACTIS=tactis";
  
  char	*
! _XkbGetCharset()
  {
      /*
       * PAGE USAGE TUNING: explicitly initialize to move these to data
***************
*** 643,655 ****
      char lang[256];
      char *start,*tmp,*end,*next,*set;
      char *country,*charset;
  
-     if ( locale == NULL ) {
- 	tmp = getenv( "_XKB_CHARSET" );
- 	if ( tmp )
- 	    return tmp;
- 	else locale = setlocale(LC_CTYPE,NULL);
-     }
      if ( locale == NULL )
  	return NULL;
  
--- 656,668 ----
      char lang[256];
      char *start,*tmp,*end,*next,*set;
      char *country,*charset;
+     char *locale;
+ 
+     tmp = getenv( "_XKB_CHARSET" );
+     if ( tmp )
+ 	return tmp;
+     locale = setlocale(LC_CTYPE,NULL);
  
      if ( locale == NULL )
  	return NULL;
  
***************
*** 726,746 ****
  }
  #else
  char	*
! #if NeedFunctionPrototypes
! _XkbGetCharset(char *locale)
! #else
! _XkbGetCharset(locale)
!     char *locale;
! #endif
  {
! char *tmp;
  
-     if ( locale == NULL ) {
- 	tmp = getenv( "_XKB_CHARSET" );
- 	if ( tmp )
- 	    return tmp;
- 	else locale = setlocale(LC_CTYPE,NULL);
-     }
      return NULL;
  }
  #endif
--- 739,757 ----
  }
  #else
  char	*
! _XkbGetCharset()
  {
!     char *tmp;
!     XLCd lcd;
! 
!     tmp = getenv( "_XKB_CHARSET" );
!     if ( tmp )
! 	return tmp;
! 
!     lcd = _XlcCurrentLC();
!     if ( lcd )
! 	return XLC_PUBLIC(lcd,encoding_name);
  
      return NULL;
  }
  #endif
*** xc/lib/X11/XKBlibint.h.orig	Sun Feb  4 10:36:38 1996
--- lib/X11/XKBlibint.h	Tue Jan  7 03:28:59 1997
***************
*** 1,4 ****
! /* $XConsortium: XKBlibint.h /main/11 1996/02/02 14:10:04 kaleb $ */
  /************************************************************
  Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
  
--- 1,4 ----
! /* $XConsortium: XKBlibint.h /main/12 1996/12/27 15:12:48 kaleb $ */
  /************************************************************
  Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
  
***************
*** 82,89 ****
  	XkbDescRec	*desc;
  	XkbMapChangesRec changes;
  	Atom		 composeLED;
- 
- 	char		*charset;
  	XkbConverters	 cvt;
  } XkbInfoRec, *XkbInfoPtr;
  
--- 82,87 ----
***************
*** 342,354 ****
  
  extern char	*_XkbGetCharset(
  #if NeedFunctionPrototypes
! 	char *		/* locale */
  #endif
  );
  extern int	 _XkbGetConverters(
  #if NeedFunctionPrototypes
! 	char *		/* charset */,
! 	XkbConverters *	/* cvt_rtrn */
  #endif
  );
  
--- 340,352 ----
  
  extern char	*_XkbGetCharset(
  #if NeedFunctionPrototypes
!     void
  #endif
  );
  extern int	 _XkbGetConverters(
  #if NeedFunctionPrototypes
!     char *		/* encoding_name */,
!     XkbConverters *	/* cvt_rtrn */
  #endif
  );
  
*** xc/lib/X11/imConv.c.orig	Wed Aug 17 15:50:44 1994
--- lib/X11/imConv.c	Tue Jan  7 03:29:00 1997
***************
*** 38,43 ****
--- 38,47 ----
  #include "Xlcint.h"
  #include "Ximint.h"
  
+ #ifdef XKB
+ #define	XLookupString		_XLookupString
+ #endif
+ 
  /* maps Cyrillic keysyms to 8859-5 */
  static unsigned char cyrillic[128] = {
      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80 - */
***************
*** 122,129 ****
  }
  
  #define BUF_SIZE (20)
- static char local_buf[BUF_SIZE] = {0};	/* Clean up bss */
- static unsigned char look[BUF_SIZE] = {0};	/* Clean up bss */
  
  int
  _XimLookupMBText(ic, event, buffer, nbytes, keysym, status)
--- 126,131 ----
***************
*** 142,147 ****
--- 144,151 ----
      unsigned char c;
      Status	dummy;
      Xim	im = (Xim)ic->core.im;
+     char local_buf[BUF_SIZE];
+     unsigned char look[BUF_SIZE];
  
      count = XLookupString(event, (char *)buffer, nbytes, &symbol, status);
      if (keysym) *keysym = symbol;
***************
*** 197,209 ****
      unsigned char c;
      Status	dummy;
      Xim	im = (Xim)ic->core.im;
  
      count = XLookupString(event, (char *)look, nbytes, &symbol, status);
      if (keysym) *keysym = symbol;
      if ((nbytes == 0) || (symbol == NoSymbol)) {
  	return(count);
      }
!     if (count == 0) { /* Not ISO 8859-1 Encoding */
  	kset = (symbol >> 8) & 0xffffff;
  	for (i = 0; i < codeset_size; i++) {
  	    if (kset == codeset[i].kset) {
--- 201,216 ----
      unsigned char c;
      Status	dummy;
      Xim	im = (Xim)ic->core.im;
+     char local_buf[BUF_SIZE];
+     unsigned char look[BUF_SIZE];
  
      count = XLookupString(event, (char *)look, nbytes, &symbol, status);
      if (keysym) *keysym = symbol;
      if ((nbytes == 0) || (symbol == NoSymbol)) {
  	return(count);
      }
!     if (count == 0) {
! 	/* Not ISO 8859-1 Encoding */
  	kset = (symbol >> 8) & 0xffffff;
  	for (i = 0; i < codeset_size; i++) {
  	    if (kset == codeset[i].kset) {