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 --git a/src/ChangeLog b/src/ChangeLog
index c69c37ce50467298c43565273fa96302d75621f5..d7b616e2868c9cb9f8f1ecae3bead01682ec350f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/macterm.c b/src/macterm.c
index c00c288001c4412d64682e9c9f8c5d77b952a09f..e9cb1b07de77f04495d9a83f1912042cca034358 100644 (file)
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -12610,7 +12610,9 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected)
 
 #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 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected)
          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) */