# HG changeset patch
# User Andrew Choi <akochoi@shaw.ca>
# Date 1028489346 0
# Node ID 0139d2dce2306335b4632b20d945a2ad9004d00c
# Parent  d729c9804513e015b07bd46293f6524104162e7d
2002-08-04  Andrew Choi  <akochoi@shaw.ca>

        * macterm.c (XTread_socket): Check that FrontNonFloatingWindow
        returns a valid window pointer before proceeding for keyDown and
        autoKey events.

diff -r d729c9804513 -r 0139d2dce230 src/ChangeLog
--- a/src/ChangeLog	Sun Aug 04 16:18:54 2002 +0000
+++ b/src/ChangeLog	Sun Aug 04 19:29:06 2002 +0000
@@ -1,3 +1,9 @@
+2002-08-04  Andrew Choi  <akochoi@shaw.ca>
+
+	* macterm.c (XTread_socket): Check that FrontNonFloatingWindow
+	returns a valid window pointer before proceeding for keyDown and
+	autoKey events.
+
 2002-08-03  Andrew Choi  <akochoi@shaw.ca>
 
 	* macterm.c (USE_CARBON_EVENTS): New macro.
diff -r d729c9804513 -r 0139d2dce230 src/macterm.c
--- a/src/macterm.c	Sun Aug 04 16:18:54 2002 +0000
+++ b/src/macterm.c	Sun Aug 04 19:29:06 2002 +0000
@@ -12610,7 +12610,9 @@
 
 #if USE_CARBON_EVENTS
   rneResult = ReceiveNextEvent (0, NULL, 
-				expected ? TicksToEventTime(app_sleep_time) : 0,
+				expected
+				? TicksToEventTime (app_sleep_time)
+				: 0,
 				true, &eventRef);
   if (!rneResult)
     {
@@ -12869,6 +12871,13 @@
 	  int keycode = (er.message & keyCodeMask) >> 8;
 	  int xkeysym;
 	  
+	  if (!IsValidWindowPtr (FrontNonFloatingWindow ()))
+	    {
+	      SysBeep (1);
+	      UNBLOCK_INPUT;
+	      return 0;
+	    }
+
 	  ObscureCursor ();
 
 	  if (keycode == 0x33)  /* delete key (charCode translated to 0x8) */