1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-01 08:17:38 +00:00

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.
This commit is contained in:
Andrew Choi 2002-08-04 19:29:06 +00:00
parent 3a321ddb31
commit 44fab9c1c6
2 changed files with 16 additions and 1 deletions

View File

@ -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.

View File

@ -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) */