From 875eb7d9c2a06118b211b69fee30b5b14fbab9f8 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Wed, 16 Jan 1991 14:04:51 +0000 Subject: [PATCH] Mac version now looks ahead in event queue instead of eating events. Much better! --- Parser/intrcheck.c | 45 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 10 deletions(-) diff --git a/Parser/intrcheck.c b/Parser/intrcheck.c index 8c351149bc6..267931857c6 100644 --- a/Parser/intrcheck.c +++ b/Parser/intrcheck.c @@ -27,26 +27,52 @@ intrcheck() #ifdef THINK_C +/* This is for THINK C 4.0. + For 3.0, you may have to remove the signal stuff. */ + #include +#include +#include "sigtype.h" + +static int interrupted; + +static SIGTYPE +intcatcher(sig) + int sig; +{ + interrupted = 1; + signal(SIGINT, intcatcher); +} void initintr() { + if (signal(SIGINT, SIG_IGN) != SIG_IGN) + signal(SIGINT, intcatcher); } int intrcheck() { - /* Static to make it faster only */ - static EventRecord e; + register EvQElPtr q; - /* XXX This fails if the user first types ahead and then - decides to interrupt -- repeating Command-. until the - event queue overflows may work though. */ - if (EventAvail(keyDownMask|autoKeyMask, &e) && - (e.modifiers & cmdKey) && - (e.message & charCodeMask) == '.') { - (void) GetNextEvent(keyDownMask|autoKeyMask, &e); + /* This is like THINK C 4.0's . + I'm not sure why FlushEvents must be called from asm{}. */ + for (q = (EvQElPtr)EventQueue.qHead; q; q = (EvQElPtr)q->qLink) { + if (q->evtQWhat == keyDown && + (char)q->evtQMessage == '.' && + (q->evtQModifiers & cmdKey) != 0) { + + asm { + moveq #keyDownMask,d0 + _FlushEvents + } + interrupted = 1; + break; + } + } + if (interrupted) { + interrupted = 0; return 1; } return 0; @@ -63,7 +89,6 @@ intrcheck() #include #include - #include "sigtype.h" static int interrupted;