Adapted to new event handling. It is now also possible to abort out of

jackjansen · jackjansen · commit 3757523f1e5c · 1997-06-20T16:19:14.000Z
an AESend with command-. (unless specifically disabled, of course).
diff --git a/Mac/Modules/ae/AEmodule.c b/Mac/Modules/ae/AEmodule.c
@@ -72,7 +72,12 @@ AEEventHandlerUPP upp_GenericEventHandler;
 
 static pascal Boolean AEIdleProc(EventRecord *theEvent, long *sleepTime, RgnHandle *mouseRgn)
 {
-	PyMac_Yield();
+	if ( PyOS_InterruptOccurred() )
+		return 1;
+	if ( PyMac_HandleEvent(theEvent) < 0 ) {
+		fprintf(stderr, "Exception in user event handler during AE processing\n");
+		PyErr_Clear();
+	}
 	return 0;
 }
 
diff --git a/Mac/Modules/ae/aesupport.py b/Mac/Modules/ae/aesupport.py
@@ -111,7 +111,12 @@ def passInput(self, name):
 
 static pascal Boolean AEIdleProc(EventRecord *theEvent, long *sleepTime, RgnHandle *mouseRgn)
 {
-	PyMac_Yield();
+	if ( PyOS_InterruptOccurred() )
+		return 1;
+	if ( PyMac_HandleEvent(theEvent) < 0 ) {
+		fprintf(stderr, "Exception in user event handler during AE processing\\n");
+		PyErr_Clear();
+	}
 	return 0;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,12 @@ AEEventHandlerUPP upp_GenericEventHandler;`
`72`	`72`
`73`	`73`	`static pascal Boolean AEIdleProc(EventRecord theEvent, long sleepTime, RgnHandle *mouseRgn)`
`74`	`74`	`{`
`75`		`- PyMac_Yield();`
	`75`	`+ if ( PyOS_InterruptOccurred() )`
	`76`	`+ return 1;`
	`77`	`+ if ( PyMac_HandleEvent(theEvent) < 0 ) {`
	`78`	`+ fprintf(stderr, "Exception in user event handler during AE processing\n");`
	`79`	`+ PyErr_Clear();`
	`80`	`+ }`
`76`	`81`	`return 0;`
`77`	`82`	`}`
`78`	`83`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,12 @@ def passInput(self, name):`
`111`	`111`
`112`	`112`	`static pascal Boolean AEIdleProc(EventRecord theEvent, long sleepTime, RgnHandle *mouseRgn)`
`113`	`113`	`{`
`114`		`- PyMac_Yield();`
	`114`	`+ if ( PyOS_InterruptOccurred() )`
	`115`	`+ return 1;`
	`116`	`+ if ( PyMac_HandleEvent(theEvent) < 0 ) {`
	`117`	`+ fprintf(stderr, "Exception in user event handler during AE processing\\n");`
	`118`	`+ PyErr_Clear();`
	`119`	`+ }`
`115`	`120`	`return 0;`
`116`	`121`	`}`
`117`	`122`