java-game-lib-cvs Mailing List for Lightweight Java Game Library

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

Modified Files:
	org_lwjgl_input_Mouse.c 
Log Message:
Mac OS X: Don't hide mouse mouse when already hidden (because the cursor state is counted)

Index: org_lwjgl_input_Mouse.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/macosx/org_lwjgl_input_Mouse.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- org_lwjgl_input_Mouse.c	11 Nov 2004 16:03:17 -0000	1.1
+++ org_lwjgl_input_Mouse.c	15 Nov 2004 15:28:53 -0000	1.2
@@ -43,12 +43,18 @@
 #include <ApplicationServices/ApplicationServices.h>
 #include "common_tools.h"
 
+static bool is_grabbed;
+
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_MacOSXDisplay_nGrabMouse(JNIEnv *env, jobject this, jboolean grab) {
-	CGAssociateMouseAndMouseCursorPosition(grab == JNI_TRUE ? FALSE : TRUE);
-	if (grab == JNI_TRUE)
-		CGDisplayHideCursor(kCGDirectMainDisplay);
-	else
-		CGDisplayShowCursor(kCGDirectMainDisplay);
+	bool new_grabbed = grab == JNI_TRUE;
+	if (is_grabbed != new_grabbed) {
+		is_grabbed = new_grabbed;
+		CGAssociateMouseAndMouseCursorPosition(is_grabbed ? FALSE : TRUE);
+		if (is_grabbed)
+			CGDisplayHideCursor(kCGDirectMainDisplay);
+		else
+			CGDisplayShowCursor(kCGDirectMainDisplay);
+	}
 }
 
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_MacOSXDisplay_nWarpCursor(JNIEnv *env, jobject this, jint x, jint y) {

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18601/src/java/org/lwjgl/opengl

Modified Files:
	MacOSXDisplay.java 
Log Message:
Mac OS X: Don't hide mouse mouse when already hidden (because the cursor state is counted)

Index: MacOSXDisplay.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- MacOSXDisplay.java	15 Nov 2004 14:38:00 -0000	1.5
+++ MacOSXDisplay.java	15 Nov 2004 15:28:52 -0000	1.6
@@ -270,9 +270,9 @@
 	}
 
 	public void grabMouse(boolean grab) {
-		nGrabMouse(grab);
 		mouse_queue.setGrabbed(grab);
 		warpCursor();
+		nGrabMouse(grab);
 	}
 
 	private native void nWarpCursor(int x, int y);
@@ -294,7 +294,7 @@
 			  with another setCursor.
 		   2. When the cursor is moving in the top pixel row (y = 0 in AWT coordinates) in fullscreen 
 		   	  mode, no mouse moved events are reported, even though mouse pressed/released and dragged
-			  are reported
+			  events are reported
 		*/
 		return 0;
 	}

Update of /cvsroot/java-game-lib/LWJGL/src/native/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8028/src/native/common

Modified Files:
	.cvsignore 
Log Message:


Index: .cvsignore
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- .cvsignore	7 Nov 2004 16:35:17 -0000	1.3
+++ .cvsignore	15 Nov 2004 14:39:28 -0000	1.4
@@ -13,3 +13,4 @@
 org_lwjgl_opengl_GLContext.h
 org_lwjgl_opengl_Pbuffer.h
 org_lwjgl_Sys.h
+org_lwjgl_opengl_Display.h

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

Added Files:
	org_lwjgl_opengl_Display.m 
Log Message:
Mac OS X: Add missing file and disable native cursors because of AWT bugs

--- NEW FILE: org_lwjgl_opengl_Display.m ---
/* 
 * Copyright (c) 2002-2004 LWJGL Project
 * All rights reserved.
 * 
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are 
 * met:
 * 
 * * Redistributions of source code must retain the above copyright 
 *   notice, this list of conditions and the following disclaimer.
 *
 * * Redistributions in binary form must reproduce the above copyright
 *   notice, this list of conditions and the following disclaimer in the
 *   documentation and/or other materials provided with the distribution.
 *
 * * Neither the name of 'LWJGL' nor the names of 
 *   its contributors may be used to endorse or promote products derived 
 *   from this software without specific prior written permission.
 * 
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

/**
 * $Id: org_lwjgl_opengl_Display.m,v 1.1 2004/11/15 14:38:00 elias_naur Exp $
 *
 * Mac OS Xspecific display functions.
 *
 * @author elias_naur <eli...@us...>
 * @version $Revision: 1.1 $
 */

#import <Cocoa/Cocoa.h>
#import <OpenGL/OpenGL.h>
#import <Carbon/Carbon.h>
#import <jawt_md.h>
#import <jni.h>
#import <unistd.h>
#import "common_tools.h"

#define WAIT_DELAY 100

static NSOpenGLContext *gl_context;

JNIEXPORT void JNICALL Java_org_lwjgl_opengl_MacOSXDisplay_createContext(JNIEnv *env, jobject this, jobject pixel_format) {
	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];

	size_t bpp = CGDisplayBitsPerPixel(kCGDirectMainDisplay);
	
	jclass cls_pixel_format = (*env)->GetObjectClass(env, pixel_format);
	int alpha = (int)(*env)->GetIntField(env, pixel_format, (*env)->GetFieldID(env, cls_pixel_format, "alpha", "I"));
	int depth = (int)(*env)->GetIntField(env, pixel_format, (*env)->GetFieldID(env, cls_pixel_format, "depth", "I"));
	int stencil = (int)(*env)->GetIntField(env, pixel_format, (*env)->GetFieldID(env, cls_pixel_format, "stencil", "I"));
	int samples = (int)(*env)->GetIntField(env, pixel_format, (*env)->GetFieldID(env, cls_pixel_format, "samples", "I"));
	int num_aux_buffers = (int)(*env)->GetIntField(env, pixel_format, (*env)->GetFieldID(env, cls_pixel_format, "num_aux_buffers", "I"));
	int accum_bpp = (int)(*env)->GetIntField(env, pixel_format, (*env)->GetFieldID(env, cls_pixel_format, "accum_bpp", "I"));
	int accum_alpha = (int)(*env)->GetIntField(env, pixel_format, (*env)->GetFieldID(env, cls_pixel_format, "accum_alpha", "I"));
	bool stereo = (bool)(*env)->GetBooleanField(env, pixel_format, (*env)->GetFieldID(env, cls_pixel_format, "stereo", "Z"));

	NSOpenGLPixelFormatAttribute attribs[] = {
		NSOpenGLPFAAccelerated,
		NSOpenGLPFADoubleBuffer,
		NSOpenGLPFAColorSize, bpp,
		NSOpenGLPFAAlphaSize, alpha,
		NSOpenGLPFADepthSize, depth,
		NSOpenGLPFAStencilSize, stencil,
		NSOpenGLPFAAccumSize, accum_bpp + accum_alpha,
		NSOpenGLPFASampleBuffers, samples > 0 ? 1 : 0,
		NSOpenGLPFASamples, samples,
		NSOpenGLPFAAuxBuffers, num_aux_buffers,
		NSOpenGLPFAWindow,
		0,
		0
	};

	if (stereo)
		attribs[19] = NSOpenGLPFAStereo;
	NSOpenGLPixelFormat* fmt = [[NSOpenGLPixelFormat alloc] initWithAttributes:attribs];

	if (fmt == nil) {
		throwException(env, "Could not create pixel format");
		[pool release];
		return;
	}

	gl_context = [[NSOpenGLContext alloc] initWithFormat:fmt shareContext:nil];

	[fmt release];
	if (gl_context == nil)
		throwException(env, "Could not create context");
	[pool release];
}

JNIEXPORT void JNICALL Java_org_lwjgl_opengl_MacOSXDisplay_updateContext(JNIEnv *env, jobject this) {
	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
	[gl_context update];
	[pool release];
}

static void setView(JNIEnv *env, jobject canvas) {
	JAWT awt;
	JAWT_DrawingSurface* ds;
	JAWT_DrawingSurfaceInfo* dsi;
	JAWT_MacOSXDrawingSurfaceInfo* dsi_mac;
	jboolean result = JNI_FALSE;
	jint lock = 0;

	// get the AWT
	awt.version = JAWT_VERSION_1_4;
	NSView *view;
	while (true) {
		result = JAWT_GetAWT(env, &awt);
		if (result == JNI_FALSE) {
			throwException(env, "Could not get the JAWT interface");
			return;
		}

		ds = awt.GetDrawingSurface(env, canvas);
		if (ds == NULL) {
			throwException(env, "Could not get the drawing surface");
			return;
		}

		lock = ds->Lock(ds);
		if((lock & JAWT_LOCK_ERROR) != 0) {
			awt.FreeDrawingSurface(ds);
			throwException(env, "Could not lock the drawing surface");
			return;
		}

		dsi = ds->GetDrawingSurfaceInfo(ds);
		if (dsi != NULL) {
			dsi_mac = (JAWT_MacOSXDrawingSurfaceInfo*)dsi->platformInfo;
			view = dsi_mac->cocoaViewRef;
			if ([view lockFocusIfCanDraw] == YES)
				break;
			view = NULL;
			ds->FreeDrawingSurfaceInfo(dsi);
		}

		printfDebug("Could not get drawing surface info, retrying... \n");
		ds->Unlock(ds);
		awt.FreeDrawingSurface(ds);
		usleep(WAIT_DELAY);
	}

//	[gl_context clearDrawable];
	[gl_context setView:view];

	[view unlockFocus];

	ds->FreeDrawingSurfaceInfo(dsi);
	ds->Unlock(ds);
	awt.FreeDrawingSurface(ds);
}

JNIEXPORT void JNICALL Java_org_lwjgl_opengl_MacOSXDisplay_setVSyncEnabled(JNIEnv *env, jobject this, jboolean vsync) {
	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
	long vsync_value = vsync  == JNI_TRUE ? 1 : 0;
	[gl_context setValues:&vsync_value forParameter:NSOpenGLCPSwapInterval];
	[pool release];
}

JNIEXPORT void JNICALL Java_org_lwjgl_opengl_MacOSXDisplay_swapBuffers(JNIEnv *env, jobject this) {
	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
	[gl_context flushBuffer];
	[pool release];
}
  
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_MacOSXDisplay_setView(JNIEnv *env, jobject this, jobject canvas) {
	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
	if (canvas != NULL) {
		setView(env, canvas);
	} else {
		[gl_context clearDrawable];
	}
	[pool release];
}

JNIEXPORT void JNICALL Java_org_lwjgl_opengl_MacOSXDisplay_makeCurrent(JNIEnv *env, jobject this) {
	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
	[gl_context makeCurrentContext];
	[pool release];
}

JNIEXPORT void JNICALL Java_org_lwjgl_opengl_MacOSXDisplay_destroyContext(JNIEnv *env, jobject this) {
	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
	if (gl_context != nil) {
		[gl_context clearDrawable];
		[gl_context release];
		gl_context = nil;
	}
	[pool release];
}

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7628/src/java/org/lwjgl/opengl

Modified Files:
	MacOSXDisplay.java 
Log Message:
Mac OS X: Add missing file and disable native cursors because of AWT bugs

Index: MacOSXDisplay.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- MacOSXDisplay.java	12 Nov 2004 13:23:20 -0000	1.4
+++ MacOSXDisplay.java	15 Nov 2004 14:38:00 -0000	1.5
@@ -280,10 +280,23 @@
 	private native void nGrabMouse(boolean grab);
 
 	public int getNativeCursorCaps() {
+		/*
 		int cursor_colors = Toolkit.getDefaultToolkit().getMaximumCursorColors();
 		boolean supported = cursor_colors >= Short.MAX_VALUE && getMaxCursorSize() > 0;
 		int caps = supported ? Mouse.CURSOR_8_BIT_ALPHA | Mouse.CURSOR_ONE_BIT_TRANSPARENCY: 0;
 		return caps;
+		*/
+		/* Return no capability, as there are two unsolved bugs (both reported to apple along with
+		   minimal test case):
+		   1. When a custom cursor (or some standard) java.awt.Cursor is assigned to a
+		      Componennt, it is reset to the default pointer cursor when the window is de-
+			  activated and the re-activated. The Cursor can not be reset to the custom cursor,
+			  with another setCursor.
+		   2. When the cursor is moving in the top pixel row (y = 0 in AWT coordinates) in fullscreen 
+		   	  mode, no mouse moved events are reported, even though mouse pressed/released and dragged
+			  are reported
+		*/
+		return 0;
 	}
 	
 	public void setNativeCursor(Object handle) throws LWJGLException {