[Java-game-lib-cvs] CVS: LWJGL/src/native/macosx org_lwjgl_opengl_Window.cpp,1.5,1.6

Update of /cvsroot/java-game-lib/LWJGL/src/native/macosx
In directory sc8-pr-cvs1:/tmp/cvs-serv12310/macosx

Modified Files:
	org_lwjgl_opengl_Window.cpp 
Log Message:


Index: org_lwjgl_opengl_Window.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/macosx/org_lwjgl_opengl_Window.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/macosx/org_lwjgl_opengl_Window.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- org_lwjgl_opengl_Window.cpp	26 Sep 2003 13:59:50 -0000	1.5
+++ org_lwjgl_opengl_Window.cpp	26 Sep 2003 18:36:54 -0000	1.6
@@ -95,13 +95,13 @@
 //	dumpRootMenu();
 }
 
-static pascal OSStatus doWindowClose(EventHandlerCallRef next_handler, EventRef event, void *user_data) {
+static pascal OSStatus doQuit(EventHandlerCallRef next_handler, EventRef event, void *user_data) {
 printf("Close requested\n");
 	close_requested = true;
 	return noErr;
 }
 
-static void registerEventHandlers(void) {
+static void registerEventHandlers(JNIEnv *env) {
 	/*EventTargetRef event_target = GetWindowEventTarget(win_ref);
 	status = InstallStandardEventHandler(event_target);
 	if (noErr != status) {
@@ -109,12 +109,28 @@
 		throwException(env, "Could not install default window event handler");
 		return;
 	}*/
-	EventTypeSpec eventType;
-	eventType.eventClass = kEventClassWindow;
-	eventType.eventKind  = kEventWindowClose;
-	EventHandlerUPP handlerUPP = NewEventHandlerUPP(doWindowClose);
-	InstallWindowEventHandler(win_ref, handlerUPP, 1, &eventType, NULL, NULL);
-	DisposeEventHandlerUPP(handlerUPP);
+	EventTypeSpec event_types[1];
+	OSStatus err;
+	EventHandlerUPP handler_upp = NewEventHandlerUPP(doQuit);
+	event_types[0].eventClass = kEventClassWindow;
+	event_types[0].eventKind  = kEventWindowClose;
+	err = InstallWindowEventHandler(win_ref, handler_upp, 1, event_types, NULL, NULL);
+	if (noErr != err) {
+		DisposeEventHandlerUPP(handler_upp);
+		throwException(env, "Could not register window event handler");
+		return;
+	}
+	event_types[0].eventClass = kEventClassApplication;
+	event_types[0].eventKind = kEventAppQuit;
+	/*event_types[1].eventClass = kEventClassAppleEvent;
+	event_types[1].eventKind = kEventAppleEvent;*/
+	err = InstallApplicationEventHandler(handler_upp, 1, event_types, NULL, NULL);
+	if (noErr != err) {
+		DisposeEventHandlerUPP(handler_upp);
+		throwException(env, "Could not register application event handler");
+		return;
+	}
+	DisposeEventHandlerUPP(handler_upp);
 }
 
 
@@ -124,10 +140,11 @@
 	return saved;
 }
 
-OSErr aehandler(const AppleEvent * theAppleEvent, AppleEvent * reply, SInt32 handlerRefcon) {
+/*OSErr aehandler(const AppleEvent * theAppleEvent, AppleEvent * reply, SInt32 handlerRefcon) {
 	printf("handler called\n");
 	return noErr;
 }
+*/
 
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Window_nCreate(JNIEnv *env, jclass clazz, jstring title, jint x, jint y, jint width, jint height, jboolean fullscreen, jint bpp, jint alpha, jint depth, jint stencil, jobject ext_set) {
 	Rect rect;
@@ -157,11 +174,13 @@
 	}*/
 	/*ProcessSerialNumber PSN;
  	GetCurrentProcess(&PSN);
- 	SetFrontProcess(&PSN);
- 	EventQueueRef queue = GetCurrentEventQueue();
-	if (queue == NULL)
-		printf("null event queue\n");*/
-
+ 	SetFrontProcess(&PSN);*/
+ 	EventLoopRef queue = GetCurrentEventLoop();
+	EventLoopRef main = GetMainEventLoop();
+	QuitEventLoop(queue);
+	QuitEventLoop(main);
+	/*if (queue == main)
+		printf("equals\n");*/
 	SetRect(&rect, x, y, x + width, y + height);
 	close_requested = false;
 	
@@ -170,7 +189,7 @@
 		throwException(env, "Could not create window");
 		return;
 	}
-	registerEventHandlers();
+	registerEventHandlers(env);
 	setWindowTitle(env, title);
 	const RGBColor background_color = { 0, 0, 0 };
 	SetWindowContentColor(win_ref, &background_color);
@@ -183,14 +202,13 @@
 	SelectWindow(win_ref);
 	InitCursor();
 //QuitApplicationEventLoop();
-DebugPrintAllWindowGroups();
 //RunApplicationEventLoop();
 }
 
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Window_update
   (JNIEnv *env, jclass clazz) 
 {
-	EventRef event;
+	/*EventRef event;
 	OSStatus err;
 	int num_events = GetNumEventsInQueue(GetCurrentEventQueue());
 	for (int i = 0; i < num_events; i++) {
@@ -203,7 +221,7 @@
 		err = ReceiveNextEvent(0, NULL, 0, true, &event);
 	/*	if (kind == kEventClassAppleEvent)
 			AEProcessAppleEvent(event);*/
-	        ReleaseEvent(event);
+	  /*      ReleaseEvent(event);
 	}
 	//RunCurrentEventLoop(0);
 /*	if (eventLoopTimedOutErr != RunCurrentEventLoop(0))