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

[Jan Djärv]

Index: emacs/src/xterm.c
diff -c emacs/src/xterm.c:1.819 emacs/src/xterm.c:1.820
*** emacs/src/xterm.c:1.819     Tue Nov 11 02:47:44 2003
--- emacs/src/xterm.c   Fri Nov 14 14:13:01 2003
***************
*** 3209,3224 ****
      {
      case EnterNotify:
      case LeaveNotify:
!       if (event->xcrossing.detail != NotifyInferior
!           && event->xcrossing.focus
!           && ! (frame->output_data.x->focus_state & FOCUS_EXPLICIT))
!         nr_events = x_focus_changed ((event->type == EnterNotify
!                                       ? FocusIn : FocusOut),
!                                      FOCUS_IMPLICIT,
!                                      dpyinfo,
!                                      frame,
!                                      bufp,
!                                      numchars);
        break;
  
      case FocusIn:
--- 3209,3230 ----
      {
      case EnterNotify:
      case LeaveNotify:
!       {
!         struct frame *focus_frame = dpyinfo->x_focus_event_frame;
!         int focus_state
!           = focus_frame ? focus_frame->output_data.x->focus_state : 0;
! 
!         if (event->xcrossing.detail != NotifyInferior
!             && event->xcrossing.focus
!             && ! (focus_state & FOCUS_EXPLICIT))
!           nr_events = x_focus_changed ((event->type == EnterNotify
!                                         ? FocusIn : FocusOut),
!                                        FOCUS_IMPLICIT,
!                                        dpyinfo,
!                                        frame,
!                                        bufp,
!                                        numchars);
!       }
        break;
  
      case FocusIn: