From: Jan Djärv <jan.h.d@swipnet.se>
Date: Fri, 14 Nov 2003 19:13:02 +0000 (+0000)
Subject: * xterm.c (x_detect_focus_change): Do not change focus frame for
X-Git-Tag: ttn-vms-21-2-B4~8364
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0b03cc78b8ef965c1966d345718f8d2e59b8c112;p=emacs.git

* xterm.c (x_detect_focus_change): Do not change focus frame for
Enter/LeaveNotify if the current focus frame has explicit focus.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 5071d548027..41aa2cd35fa 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-14  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* xterm.c (x_detect_focus_change): Do not change focus frame for
+	Enter/LeaveNotify if the current focus frame has explicit focus.
+
 2003-11-14  Kim F. Storm  <storm@cua.dk>
 
 	* dispnew.c (update_text_area): Fix redisplay error when hscroll
diff --git a/src/xterm.c b/src/xterm.c
index 638ce463065..85beb00eb52 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -3209,16 +3209,22 @@ x_detect_focus_change (dpyinfo, event, bufp, numchars)
     {
     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);
+      {
+        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: