From 44fab9c1c6d383dbf846bca886e13bf00446bdc0 Mon Sep 17 00:00:00 2001 From: Andrew Choi Date: Sun, 4 Aug 2002 19:29:06 +0000 Subject: [PATCH] 2002-08-04 Andrew Choi * macterm.c (XTread_socket): Check that FrontNonFloatingWindow returns a valid window pointer before proceeding for keyDown and autoKey events. --- src/ChangeLog | 6 ++++++ src/macterm.c | 11 ++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index c69c37ce50..d7b616e286 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2002-08-04 Andrew Choi + + * macterm.c (XTread_socket): Check that FrontNonFloatingWindow + returns a valid window pointer before proceeding for keyDown and + autoKey events. + 2002-08-03 Andrew Choi * macterm.c (USE_CARBON_EVENTS): New macro. diff --git a/src/macterm.c b/src/macterm.c index c00c288001..e9cb1b07de 100644 --- 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) */ -- 2.39.2