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