From: Richard M. Stallman <rms@gnu.org>
Date: Sat, 19 Feb 1994 22:56:21 +0000 (+0000)
Subject: (XTread_socket--cases KeyPress, EnterNotify, LeaveNotify)
X-Git-Tag: emacs-19.34~9842
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1dea5a83198dec385b06f00be3272964b64b4ebf;p=emacs.git

(XTread_socket--cases KeyPress, EnterNotify, LeaveNotify)
(cases FocusIn, FocusOut): Use x_any_window_to_frame.
---

diff --git a/src/xterm.c b/src/xterm.c
index 7a4a718374d..6be11f7e9a9 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -3144,7 +3144,7 @@ XTread_socket (sd, bufp, numchars, waitp, expected)
 
 #ifdef HAVE_X11
 	case KeyPress:
-	  f = x_window_to_frame (event.xkey.window);
+	  f = x_any_window_to_frame (event.xkey.window);
 
 	  if (f != 0)
 	    {
@@ -3337,7 +3337,7 @@ XTread_socket (sd, bufp, numchars, waitp, expected)
 	     then a mere LeaveNotify is enough to free you.  */
 
 	case EnterNotify:
-	  f = x_window_to_frame (event.xcrossing.window);
+	  f = x_any_window_to_frame (event.xcrossing.window);
 
 	  if (event.xcrossing.focus)		/* Entered Window */
 	    {
@@ -3358,7 +3358,7 @@ XTread_socket (sd, bufp, numchars, waitp, expected)
 	  break;
 
 	case FocusIn:
-	  f = x_window_to_frame (event.xfocus.window);
+	  f = x_any_window_to_frame (event.xfocus.window);
 	  if (event.xfocus.detail != NotifyPointer) 
 	    x_focus_event_frame = f;
 	  if (f)
@@ -3370,7 +3370,7 @@ XTread_socket (sd, bufp, numchars, waitp, expected)
 
 
 	case LeaveNotify:
-	  f = x_window_to_frame (event.xcrossing.window);
+	  f = x_any_window_to_frame (event.xcrossing.window);
 
 	  if (event.xcrossing.focus)
 	    {
@@ -3392,7 +3392,7 @@ XTread_socket (sd, bufp, numchars, waitp, expected)
 	  break;
 
 	case FocusOut:
-	  f = x_window_to_frame (event.xfocus.window);
+	  f = x_any_window_to_frame (event.xfocus.window);
 	  if (event.xfocus.detail != NotifyPointer
 	      && f == x_focus_event_frame)
 	    x_focus_event_frame = 0;