f12ad42
*** tgif-4.1.35/convxim.c	Sun Jan 16 07:23:33 2000
f12ad42
--- tgif-4.1.35-overthespot_fix/convxim.c	Mon Aug 14 09:38:15 2000
f12ad42
***************
f12ad42
*** 106,111 ****
f12ad42
--- 106,112 ----
f12ad42
      char	buf[80];
f12ad42
      XIMStyles *    styles;
f12ad42
      Bool	style_flag;
f12ad42
+     int         style_attr;
f12ad42
      int	i;
f12ad42
      XPoint spot;
f12ad42
      XRectangle s_rect;
f12ad42
***************
f12ad42
*** 171,179 ****
f12ad42
  	if (overthespot) {
f12ad42
  	  for(i = 0; i < (int)(styles->count_styles); i ++){
f12ad42
  	    if(styles->supported_styles[i] ==
f12ad42
! 	       (XIMPreeditPosition | XIMStatusArea)){
f12ad42
  	      style_flag = True;
f12ad42
  	      style_type = OVERTHESPOT;
f12ad42
  	      Msg(TgLoadString(STID_OVERTHESPOT_CONV));
f12ad42
  	    }
f12ad42
  	  }
f12ad42
--- 172,183 ----
f12ad42
  	if (overthespot) {
f12ad42
  	  for(i = 0; i < (int)(styles->count_styles); i ++){
f12ad42
  	    if(styles->supported_styles[i] ==
f12ad42
! 	       (XIMPreeditPosition | XIMStatusArea)
f12ad42
! 	       || (styles->supported_styles[i] ==
f12ad42
! 		   (XIMPreeditPosition | XIMStatusNothing))){
f12ad42
  	      style_flag = True;
f12ad42
  	      style_type = OVERTHESPOT;
f12ad42
+ 	      style_attr = styles->supported_styles[i];
f12ad42
  	      Msg(TgLoadString(STID_OVERTHESPOT_CONV));
f12ad42
  	    }
f12ad42
  	  }
f12ad42
***************
f12ad42
*** 218,224 ****
f12ad42
  					XNFontSet, XIMfs,
f12ad42
  					NULL);
f12ad42
  	ic = XCreateIC(im,
f12ad42
! 	        XNInputStyle , XIMPreeditPosition | XIMStatusArea,
f12ad42
  		XNClientWindow, win,
f12ad42
  		XNFocusWindow, win,
f12ad42
  		XNPreeditAttributes, preedit_attr,
f12ad42
--- 222,228 ----
f12ad42
  					XNFontSet, XIMfs,
f12ad42
  					NULL);
f12ad42
  	ic = XCreateIC(im,
f12ad42
! 	        XNInputStyle , style_attr,
f12ad42
  		XNClientWindow, win,
f12ad42
  		XNFocusWindow, win,
f12ad42
  		XNPreeditAttributes, preedit_attr,