Re: [9fans] OSX Drawterm hangs on close

[underspecified <underspecified@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1015 bytes --]

Greetings,

I came across this message while catching up on mailing lists.
This is a problem we were having that I recently fixed in Acme SAC for OS-X.
Basically, the problem was that there was no handler catching kEventAppQuit.

I am attaching a patch that creates a basic event handler and calls
exit(0) on any quit events.
This should prevent drawterm from hanging when being closed in any way
not using the menu
(system logouts, using the task switcher, etc.). My source for
drawterm might be a bit out of date,
so be careful when applying.

Take care,

--underspecified

On Wed, Apr 9, 2008 at 6:09 AM, Skip Tavakkolian <9nut@9netics.com> wrote:
> why do you feel compelled to state the obvious?
>
>> Also realize that Cocoa is written in Objective-C, not C, so you need
>> to learn a new language to get your hands on it. You CAN write a C
>> wrapper around the Objective-C (it was originally a C preprocessor),
>> but I don't think elite Mac programmers would recommend it.
>
>
>

[-- Attachment #2: quit_event.diff --]
[-- Type: application/octet-stream, Size: 2432 bytes --]

diff -ru drawterm.orig/gui-osx/screen.c drawterm.new/gui-osx/screen.c
--- drawterm.orig/gui-osx/screen.c	2007-10-26 02:31:32.000000000 +0900
+++ drawterm.new/gui-osx/screen.c	2008-06-24 17:22:16.000000000 +0900
@@ -138,6 +138,7 @@
 	ksleep(&rend, isready, 0);
 }
 
+static OSStatus ApplicationQuitEventHandler(EventHandlerCallRef nextHandler, EventRef event, void *userData);
 static OSStatus MainWindowEventHandler(EventHandlerCallRef nextHandler, EventRef event, void *userData);
 static OSStatus MainWindowCommandHandler(EventHandlerCallRef nextHandler, EventRef event, void *userData);
 
@@ -192,6 +193,9 @@
 	if(PasteboardCreate(kPasteboardClipboard, &appleclip) != noErr)
 		sysfatal("pasteboard create failed");
 
+	const EventTypeSpec quit_events[] = {
+		{ kEventClassApplication, kEventAppQuit }
+	};
 	const EventTypeSpec commands[] = {
 		{ kEventClassWindow, kEventWindowClosed },
 		{ kEventClassWindow, kEventWindowBoundsChanged },
@@ -208,6 +212,13 @@
 		{ kEventClassMouse, kEventMouseWheelMoved },
 	};
 
+	InstallApplicationEventHandler (
+								NewEventHandlerUPP (ApplicationQuitEventHandler),
+								GetEventTypeCount(quit_events),
+								quit_events,
+								NULL,
+								NULL);
+
  	InstallApplicationEventHandler (
  								NewEventHandlerUPP (MainWindowEventHandler),
 								GetEventTypeCount(events),
@@ -496,6 +507,13 @@
 	return result;
 }
 
+// catch quit events to handle quits from menu, Cmd+Q, applescript, and task switcher
+static OSStatus ApplicationQuitEventHandler(EventHandlerCallRef nextHandler, EventRef event, void *userData)
+{
+	exit(0);
+//	QuitApplicationEventLoop();
+	return noErr;
+}
 
 //default window command handler (from menus)
 static OSStatus MainWindowCommandHandler(EventHandlerCallRef nextHandler,
@@ -543,11 +561,23 @@
 
 		switch (kind)
 		{
+			// send a quit carbon event instead of directly calling cleanexit 
+			// so that all quits are done in ApplicationQuitEventHandler
 			case kEventWindowClosed:
-				theWindow = NULL;
-				exit(0); // only one window
+				{
+				EventRef quitEvent;
+				CreateEvent(NULL,
+							kEventClassApplication,
+							kEventAppQuit,
+							0,
+							kEventAttributeNone,
+							&quitEvent);
+				EventTargetRef target;
+				target = GetApplicationEventTarget();
+				SendEventToEventTarget(quitEvent, target);
+				}
 				break;
-
+				
 			//resize window
 			case kEventWindowBoundsChanged:
 				window_resized();