/[emacs]/emacs/src/xfns.c
ViewVC logotype

Diff of /emacs/src/xfns.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.539.2.7 by handa, Fri Sep 27 04:50:23 2002 UTC revision 1.539.2.8 by fx, Sat Oct 5 14:38:51 2002 UTC
# Line 3431  static XFontSet xic_create_xfontset P_ ( Line 3431  static XFontSet xic_create_xfontset P_ (
3431  static XIMStyle best_xim_style P_ ((XIMStyles *, XIMStyles *));  static XIMStyle best_xim_style P_ ((XIMStyles *, XIMStyles *));
3432    
3433    
3434  /* Supported XIM styles, ordered by preferenc.  */  /* Supported XIM styles, ordered by preference.  */
3435    
3436  static XIMStyle supported_xim_styles[] =  static XIMStyle supported_xim_styles[] =
3437  {  {
# Line 3887  x_window (f, window_prompting, minibuffe Line 3887  x_window (f, window_prompting, minibuffe
3887    
3888  #ifdef HAVE_X_I18N  #ifdef HAVE_X_I18N
3889    FRAME_XIC (f) = NULL;    FRAME_XIC (f) = NULL;
3890  #ifdef USE_XIM    if (use_xim)
3891    create_frame_xic (f);      create_frame_xic (f);
 #endif  
3892  #endif  #endif
3893    
3894    f->output_data.x->wm_hints.input = True;    f->output_data.x->wm_hints.input = True;
# Line 3992  x_window (f) Line 3991  x_window (f)
3991                       attribute_mask, &attributes);                       attribute_mask, &attributes);
3992    
3993  #ifdef HAVE_X_I18N  #ifdef HAVE_X_I18N
3994  #ifdef USE_XIM    if use_xim
   create_frame_xic (f);  
   if (FRAME_XIC (f))  
3995      {      {
3996        /* XIM server might require some X events. */        create_frame_xic (f);
3997        unsigned long fevent = NoEventMask;        if (FRAME_XIC (f))
3998        XGetICValues(FRAME_XIC (f), XNFilterEvents, &fevent, NULL);          {
3999        attributes.event_mask |= fevent;            /* XIM server might require some X events. */
4000        attribute_mask = CWEventMask;            unsigned long fevent = NoEventMask;
4001        XChangeWindowAttributes (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),            XGetICValues(FRAME_XIC (f), XNFilterEvents, &fevent, NULL);
4002                                 attribute_mask, &attributes);            attributes.event_mask |= fevent;
4003              attribute_mask = CWEventMask;
4004              XChangeWindowAttributes (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
4005                                       attribute_mask, &attributes);
4006            }
4007      }      }
 #endif  
4008  #endif /* HAVE_X_I18N */  #endif /* HAVE_X_I18N */
4009        
4010    validate_x_resource_name ();    validate_x_resource_name ();

Legend:
Removed from v.1.539.2.7  
changed lines
  Added in v.1.539.2.8

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26