[Emacs-diffs] Changes to emacs/src/xfns.c

[Dave Love]

Index: emacs/src/xfns.c
diff -c emacs/src/xfns.c:1.578 emacs/src/xfns.c:1.579
*** emacs/src/xfns.c:1.578      Tue Apr  1 05:04:38 2003
--- emacs/src/xfns.c    Wed May 21 18:12:15 2003
***************
*** 2120,2126 ****
  static XIMStyle best_xim_style P_ ((XIMStyles *, XIMStyles *));
  
  
! /* Supported XIM styles, ordered by preferenc.  */
  
  static XIMStyle supported_xim_styles[] =
  {
--- 2120,2126 ----
  static XIMStyle best_xim_style P_ ((XIMStyles *, XIMStyles *));
  
  
! /* Supported XIM styles, ordered by preference.  */
  
  static XIMStyle supported_xim_styles[] =
  {
***************
*** 2578,2586 ****
  
  #ifdef HAVE_X_I18N
    FRAME_XIC (f) = NULL;
! #ifdef USE_XIM
!   create_frame_xic (f);
! #endif
  #endif
  
    f->output_data.x->wm_hints.input = True;
--- 2578,2585 ----
  
  #ifdef HAVE_X_I18N
    FRAME_XIC (f) = NULL;
!   if (use_xim)
!     create_frame_xic (f);
  #endif
  
    f->output_data.x->wm_hints.input = True;
***************
*** 2657,2687 ****
  
  #ifdef HAVE_X_I18N
    FRAME_XIC (f) = NULL;
! #ifdef USE_XIM
!   BLOCK_INPUT;
!   create_frame_xic (f);
!   if (FRAME_XIC (f))
!     {
!       /* XIM server might require some X events. */
!       unsigned long fevent = NoEventMask;
!       XGetICValues(FRAME_XIC (f), XNFilterEvents, &fevent, NULL);
! 
!       if (fevent != NoEventMask)
!         {
!           XSetWindowAttributes attributes;
!           XWindowAttributes wattr;
!           unsigned long attribute_mask;
! 
!           XGetWindowAttributes (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
!                                 &wattr);
!           attributes.event_mask = wattr.your_event_mask | fevent;
!           attribute_mask = CWEventMask;
!           XChangeWindowAttributes (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
!                                    attribute_mask, &attributes);
!         }
!     }
!   UNBLOCK_INPUT;
! #endif
  #endif
  }
  
--- 2656,2687 ----
  
  #ifdef HAVE_X_I18N
    FRAME_XIC (f) = NULL;
! if (use_xim)
!   {
!     BLOCK_INPUT;
!     create_frame_xic (f);
!     if (FRAME_XIC (f))
!       {
!       /* XIM server might require some X events. */
!       unsigned long fevent = NoEventMask;
!       XGetICValues(FRAME_XIC (f), XNFilterEvents, &fevent, NULL);
! 
!       if (fevent != NoEventMask)
!         {
!           XSetWindowAttributes attributes;
!           XWindowAttributes wattr;
!           unsigned long attribute_mask;
! 
!           XGetWindowAttributes (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
!                                 &wattr);
!           attributes.event_mask = wattr.your_event_mask | fevent;
!           attribute_mask = CWEventMask;
!           XChangeWindowAttributes (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
!                                    attribute_mask, &attributes);
!         }
!       }
!     UNBLOCK_INPUT;
!   }
  #endif
  }
  
***************
*** 2721,2739 ****
                     attribute_mask, &attributes);
  
  #ifdef HAVE_X_I18N
! #ifdef USE_XIM
!   create_frame_xic (f);
!   if (FRAME_XIC (f))
      {
!       /* XIM server might require some X events. */
!       unsigned long fevent = NoEventMask;
!       XGetICValues(FRAME_XIC (f), XNFilterEvents, &fevent, NULL);
!       attributes.event_mask |= fevent;
!       attribute_mask = CWEventMask;
!       XChangeWindowAttributes (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
!                              attribute_mask, &attributes);
      }
- #endif
  #endif /* HAVE_X_I18N */
  
    validate_x_resource_name ();
--- 2721,2740 ----
                     attribute_mask, &attributes);
  
  #ifdef HAVE_X_I18N
!   if use_xim
      {
!       create_frame_xic (f);
!       if (FRAME_XIC (f))
!       {
!         /* XIM server might require some X events. */
!         unsigned long fevent = NoEventMask;
!         XGetICValues(FRAME_XIC (f), XNFilterEvents, &fevent, NULL);
!         attributes.event_mask |= fevent;
!         attribute_mask = CWEventMask;
!         XChangeWindowAttributes (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
!                                  attribute_mask, &attributes);
!       }
      }
  #endif /* HAVE_X_I18N */
  
    validate_x_resource_name ();