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

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

Modified Files:
	AWTGLCanvas.java 
Log Message:
Corrected AWTGLCanvas documentation

Index: AWTGLCanvas.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- AWTGLCanvas.java	9 Apr 2005 17:35:37 -0000	1.11
+++ AWTGLCanvas.java	30 Apr 2005 15:37:42 -0000	1.12
@@ -192,7 +192,7 @@
 	
 	/**
 	 * Make the canvas' context current. It is highly recommended that the context
-	 * is only made current inside the AWT thread (for example in an overridden paint()).
+	 * is only made current inside the AWT thread (for example in an overridden paintGL()).
 	 */
 	public synchronized void makeCurrent() throws LWJGLException {
 		if (context == null)
@@ -222,6 +222,10 @@
 	protected void paintGL() {
 	}
 
+	/**
+	 * The default paint() operation makes the context current and calls paintGL() which should
+	 * be overridden to do GL operations.
+	 */
 	public final void paint(Graphics g) {
 		try {
 			if (peer_info == null)

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

Modified Files:
	Window.h context.c org_lwjgl_input_Mouse.c 
	org_lwjgl_opengl_Display.c 
Log Message:
Win32: Compile fixes

Index: Window.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/Window.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- Window.h	23 Feb 2005 11:42:04 -0000	1.24
+++ Window.h	29 Apr 2005 15:20:19 -0000	1.25
@@ -54,10 +54,6 @@
 		#define WINDOW_H_API
 	#else
 		#define WINDOW_H_API extern
-		extern bool		isFullScreen;				// Whether we're fullscreen or not
-		extern bool		isMinimized;				// Whether we're minimized or not
-		extern bool		isFocused;					// Whether we're focused or not
-		extern bool		isDirty;					  // Whether we're dirty or not
 	#endif /* _PRIVATE_WINDOW_H_ */
 
 	WINDOW_H_API HWND getCurrentHWND();
@@ -72,6 +68,7 @@
 
 	WINDOW_H_API void handleMessages(void);
 
+	WINDOW_H_API bool getCurrentFullscreen();
 	/*
 	 * Handle native Win32 messages
 	 */

Index: org_lwjgl_opengl_Display.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_Display.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- org_lwjgl_opengl_Display.c	29 Apr 2005 15:08:16 -0000	1.22
+++ org_lwjgl_opengl_Display.c	29 Apr 2005 15:20:19 -0000	1.23
@@ -63,6 +63,10 @@
 
 #define WINDOWCLASSNAME "LWJGL"
 
+bool getCurrentFullscreen() {
+	return isFullScreen;
+}
+
 HDC getCurrentHDC() {
 	return display_hdc;
 }
@@ -378,7 +382,7 @@
 		return;
 	}
 
-	getWindowFlags(&windowflags, &exstyle, isFullscreen, getBooleanProperty(env, "org.lwjgl.opengl.Window.undecorated"));
+	getWindowFlags(&windowflags, &exstyle, isFullScreen, getBooleanProperty(env, "org.lwjgl.opengl.Window.undecorated"));
 	
 	// If we're not a fullscreen window, adjust the height to account for the
 	// height of the title bar:

Index: org_lwjgl_input_Mouse.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Mouse.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- org_lwjgl_input_Mouse.c	29 Apr 2005 15:08:16 -0000	1.13
+++ org_lwjgl_input_Mouse.c	29 Apr 2005 15:20:19 -0000	1.14
@@ -363,7 +363,7 @@
 	int left_border_width;
 	int bottom_border_width;
 
-	getWindowFlags(&windowflags, &extyle, isFullscreen, getBooleanProperty(env, "org.lwjgl.opengl.Window.undecorated"));
+	getWindowFlags(&windowflags, &exstyle, getCurrentFullscreen(), getBooleanProperty(env, "org.lwjgl.opengl.Window.undecorated"));
 	if (!GetClientRect(getCurrentHWND(), &client_rect)) {
 		printfDebugJava(env, "GetClientRect failed");
 		return;
@@ -383,7 +383,7 @@
 	bottom_border_width = adjusted_client_rect.bottom - client_rect.bottom;
 	
 	transformed_x = window_rect.left + left_border_width + x;
-	transformed_y = window_rect.bottom - bottom_border_width - y;
+	transformed_y = window_rect.bottom - bottom_border_width - 1 - y;
 	if (!SetCursorPos(transformed_x, transformed_y))
 		printfDebugJava(env, "SetCursorPos failed");
 }

Index: context.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/context.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- context.c	29 Apr 2005 15:08:15 -0000	1.6
+++ context.c	29 Apr 2005 15:20:19 -0000	1.7
@@ -140,7 +140,7 @@
 	DWORD exstyle, windowflags;
 	HWND new_hwnd;
 	
-	getWindowFlags(&windowflags, &exstyle, fullscreen, indecorated);
+	getWindowFlags(&windowflags, &exstyle, fullscreen, undecorated);
 
 	// If we're not a fullscreen window, adjust the height to account for the
 	// height of the title bar (unless undecorated)

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

Modified Files:
	context.c context.h org_lwjgl_input_Mouse.c 
	org_lwjgl_opengl_Display.c 
Log Message:
Win32: Fix Mouse.setCursorLocation()

Index: context.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/context.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- context.c	30 Mar 2005 10:46:21 -0000	1.5
+++ context.c	29 Apr 2005 15:08:15 -0000	1.6
@@ -110,18 +110,8 @@
 	}
 }
 
-/*
- * Create a window with the specified title, position, size, and
- * fullscreen attribute. The window will have DirectInput associated
- * with it.
- * 
- * Returns true for success, or false for failure
- */
-HWND createWindow(LPCTSTR window_class_name, int x, int y, int width, int height, bool fullscreen, bool undecorated)
-{
-	RECT clientSize;
-	int exstyle, windowflags;
-	HWND new_hwnd;
+void getWindowFlags(DWORD *windowflags_return, DWORD *exstyle_return, bool fullscreen, bool undecorated) {
+	DWORD exstyle, windowflags;
 	if (fullscreen) {
 		exstyle = WS_EX_APPWINDOW | WS_EX_TOPMOST;
 		windowflags = WS_POPUP;
@@ -133,6 +123,24 @@
 		windowflags = WS_OVERLAPPED | WS_BORDER | WS_CAPTION | WS_MINIMIZEBOX | WS_SYSMENU;
 	}
 	windowflags = windowflags | WS_CLIPCHILDREN | WS_CLIPSIBLINGS;
+	*windowflags_return = windowflags;
+	*exstyle_return = exstyle;
+}
+
+/*
+ * Create a window with the specified title, position, size, and
+ * fullscreen attribute. The window will have DirectInput associated
+ * with it.
+ * 
+ * Returns true for success, or false for failure
+ */
+HWND createWindow(LPCTSTR window_class_name, int x, int y, int width, int height, bool fullscreen, bool undecorated)
+{
+	RECT clientSize;
+	DWORD exstyle, windowflags;
+	HWND new_hwnd;
+	
+	getWindowFlags(&windowflags, &exstyle, fullscreen, indecorated);
 
 	// If we're not a fullscreen window, adjust the height to account for the
 	// height of the title bar (unless undecorated)

Index: org_lwjgl_opengl_Display.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_Display.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- org_lwjgl_opengl_Display.c	18 Apr 2005 07:31:07 -0000	1.21
+++ org_lwjgl_opengl_Display.c	29 Apr 2005 15:08:16 -0000	1.22
@@ -371,24 +371,14 @@
 }
 
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Win32Display_reshape(JNIEnv *env, jobject self, jint x, jint y, jint width, jint height) {
-	int exstyle, windowflags;
+	DWORD exstyle, windowflags;
 	RECT clientSize;
 
 	if (isFullScreen) {
 		return;
 	}
 
-	if (isFullScreen) {
-		exstyle = WS_EX_APPWINDOW | WS_EX_TOPMOST;
-		windowflags = WS_POPUP;
-	} else if (getBooleanProperty(env, "org.lwjgl.opengl.Window.undecorated")) {
-		exstyle = WS_EX_APPWINDOW;
-		windowflags = WS_POPUP;
-	} else {
-		exstyle = WS_EX_APPWINDOW;
-		windowflags = WS_OVERLAPPED | WS_BORDER | WS_CAPTION | WS_MINIMIZEBOX | WS_SYSMENU;
-	}
-	windowflags = windowflags | WS_CLIPCHILDREN | WS_CLIPSIBLINGS;
+	getWindowFlags(&windowflags, &exstyle, isFullscreen, getBooleanProperty(env, "org.lwjgl.opengl.Window.undecorated"));
 	
 	// If we're not a fullscreen window, adjust the height to account for the
 	// height of the title bar:

Index: org_lwjgl_input_Mouse.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Mouse.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- org_lwjgl_input_Mouse.c	12 Apr 2005 12:04:36 -0000	1.12
+++ org_lwjgl_input_Mouse.c	29 Apr 2005 15:08:16 -0000	1.13
@@ -354,14 +354,36 @@
 
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Win32Display_setCursorPosition
 (JNIEnv * env, jobject self, jint x, jint y) {
+	DWORD windowflags, exstyle;
 	int transformed_x, transformed_y;
 	RECT window_rect;
+	RECT client_rect;
+	RECT adjusted_client_rect;
+
+	int left_border_width;
+	int bottom_border_width;
+
+	getWindowFlags(&windowflags, &extyle, isFullscreen, getBooleanProperty(env, "org.lwjgl.opengl.Window.undecorated"));
+	if (!GetClientRect(getCurrentHWND(), &client_rect)) {
+		printfDebugJava(env, "GetClientRect failed");
+		return;
+	}
+
+	adjusted_client_rect = client_rect;
+	if (!AdjustWindowRectEx(&adjusted_client_rect, windowflags, FALSE, exstyle)) {
+		printfDebugJava(env, "AdjustWindowRectEx failed");
+		return;
+	}
+	
 	if (!GetWindowRect(getCurrentHWND(), &window_rect)) {
 		printfDebugJava(env, "GetWindowRect failed");
 		return;
 	}
-	transformed_x = window_rect.left + x;
-	transformed_y = window_rect.bottom - y;
+	left_border_width = -adjusted_client_rect.left;
+	bottom_border_width = adjusted_client_rect.bottom - client_rect.bottom;
+	
+	transformed_x = window_rect.left + left_border_width + x;
+	transformed_y = window_rect.bottom - bottom_border_width - y;
 	if (!SetCursorPos(transformed_x, transformed_y))
 		printfDebugJava(env, "SetCursorPos failed");
 }

Index: context.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/context.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- context.h	24 Feb 2005 13:24:08 -0000	1.2
+++ context.h	29 Apr 2005 15:08:16 -0000	1.3
@@ -79,6 +79,11 @@
  */
 extern HWND createDummyWindow(int x, int y);
 
+/**
+ * Return appropriate window and extended style flags from the given fullscreen and undecorated property
+ */
+extern void getWindowFlags(DWORD *windowflags_return, DWORD *exstyle_return, bool fullscreen, bool undecorated);
+
 /*
  * Create a window with the specified position, size, and
  * fullscreen attribute. The window will have DirectInput associated

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

Modified Files:
	MacOSXContextImplementation.java MacOSXDisplay.java 
	MacOSXGLCanvas.java 
Log Message:
Mac OS X: Added a workaround for the 'white screen' problem

Index: MacOSXContextImplementation.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/MacOSXContextImplementation.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- MacOSXContextImplementation.java	23 Feb 2005 12:12:47 -0000	1.3
+++ MacOSXContextImplementation.java	28 Apr 2005 12:55:23 -0000	1.4
@@ -81,6 +81,18 @@
 
 	private static native void clearDrawable(ByteBuffer handle) throws LWJGLException;
 
+	static void resetView(PeerInfo peer_info, Context context) throws LWJGLException {
+		ByteBuffer peer_handle = peer_info.lockAndGetHandle();
+		try {
+			synchronized (context) {
+				clearDrawable(context.getHandle());
+				setView(peer_handle, context.getHandle());
+			}
+		} finally {
+			peer_info.unlock();
+		}
+	}
+	
 	public void makeCurrent(PeerInfo peer_info, ByteBuffer handle) throws LWJGLException {
 		ByteBuffer peer_handle = peer_info.lockAndGetHandle();
 		try {

Index: MacOSXDisplay.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- MacOSXDisplay.java	12 Apr 2005 11:45:06 -0000	1.27
+++ MacOSXDisplay.java	28 Apr 2005 12:55:23 -0000	1.28
@@ -208,7 +208,36 @@
 	}
 
 	public void update() {
-		if (frame.getCanvas().syncShouldUpdateContext()) {
+		boolean should_update = frame.getCanvas().syncShouldUpdateContext();
+		/*
+		 * Workaround for the "white screen in fullscreen mode" problem
+		 *
+		 * Sometimes, switching from windowed mode to fullscreen or simply creating the Display
+		 * in fullscreen mode will result in the context not being bound to the window correctly.
+		 * The program runs fine, but the canvas background (white) is shown instead of the context
+		 * front buffer.
+		 *
+		 * I've discovered that re-binding the context with another setView() won't fix the problem, while a
+		 * clearDrawable() followed by a setView() does work. A straightforward workaround would be
+		 * to simply run the combination at every update(). This is not sufficient, since the clearDrawable()
+		 * call makes the the background appear shortly, causing visual artifacts.
+		 * What we really need is a way to detect that a setView() failed, and then do the magic combo. I've not
+		 * been able to find such a detection so alternatively I'm triggering the combo if the display is fullscreen
+		 * (I've not seen the white screen problem in windowed mode) and if the canvas has gotten a paint message or
+		 * if its update flag was set.
+		 *
+		 * My testing seems to indicate that the workaround works, since I've not seen the problem after the fix.
+		 *
+		 * - elias
+		 */
+		if (Display.isFullscreen() && (frame.getCanvas().syncCanvasPainted() || should_update)) {
+			try {
+				MacOSXContextImplementation.resetView(Display.getContext().getPeerInfo(), Display.getContext());
+			} catch (LWJGLException e) {
+				LWJGLUtil.log("Failed to reset context: " + e);
+			}
+		}
+		if (should_update) {
 			Display.getContext().update();
 			/* This is necessary to make sure the context won't "forget" about the view size */
 			GL11.glViewport(0, 0, frame.getCanvas().syncGetWidth(), frame.getCanvas().syncGetHeight());

Index: MacOSXGLCanvas.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/MacOSXGLCanvas.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- MacOSXGLCanvas.java	23 Feb 2005 11:11:07 -0000	1.7
+++ MacOSXGLCanvas.java	28 Apr 2005 12:55:23 -0000	1.8
@@ -50,6 +50,7 @@
 	private int width;
 	private int height;
 	private boolean context_update;
+	private boolean canvas_painted;
 	private boolean dirty;
 
 	public void update(Graphics g) {
@@ -59,6 +60,7 @@
 	public void paint(Graphics g) {
 		synchronized ( this ) {
 			dirty = true;
+			canvas_painted = true;
 		}
 	}
 
@@ -75,6 +77,15 @@
 		setUpdate();
 	}
 
+	public boolean syncCanvasPainted() {
+		boolean result;
+		synchronized (this) {
+			result = canvas_painted;
+			canvas_painted = false;
+		}
+		return result;
+	}
+
 	public boolean syncIsDirty() {
 		boolean result;
 		synchronized ( this ) {

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

Modified Files:
	Mouse.java 
Log Message:
Removed cached width and height from Mouse

Index: Mouse.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input/Mouse.java,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- Mouse.java	28 Apr 2005 10:52:03 -0000	1.82
+++ Mouse.java	28 Apr 2005 11:57:38 -0000	1.83
@@ -59,9 +59,6 @@
  * @version $Revision$
  */
 public class Mouse {
-	/** Mouse constraint */
-	private static int width, height;
-
 	/** Has the mouse been created? */
 	private static boolean		created;
 
@@ -299,8 +296,8 @@
 			x = poll_coord1;
 			y = poll_coord2;
 		}
-		x = Math.min(width - 1, Math.max(0, x));
-		y = Math.min(height - 1, Math.max(0, y));
+		x = Math.min(Display.getDisplayMode().getWidth() - 1, Math.max(0, x));
+		y = Math.min(Display.getDisplayMode().getHeight() - 1, Math.max(0, y));
 		dwheel += poll_dwheel;
 		read();
 	}
@@ -373,8 +370,8 @@
 				event_x = readBuffer.get();
 				event_y = readBuffer.get();
 			}
-			event_x = Math.min(width - 1, Math.max(0, event_x));
-			event_y = Math.min(height - 1, Math.max(0, event_y));
+			event_x = Math.min(Display.getDisplayMode().getWidth() - 1, Math.max(0, event_x));
+			event_y = Math.min(Display.getDisplayMode().getHeight() - 1, Math.max(0, event_y));
 			event_dwheel = readBuffer.get();
 			return true;
 		} else

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

Modified Files:
	Mouse.java 
Log Message:
Remove unused code

Index: Mouse.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input/Mouse.java,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- Mouse.java	28 Apr 2005 10:36:51 -0000	1.81
+++ Mouse.java	28 Apr 2005 10:52:03 -0000	1.82
@@ -209,8 +209,6 @@
 
 	private static void resetMouse() {
 		dx = dy = dwheel = 0;
-		width = Display.getDisplayMode().getWidth();
-		height = Display.getDisplayMode().getHeight();
 		readBuffer.position(readBuffer.limit());
 	}
 

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

Modified Files:
	Mouse.java 
Log Message:
Fon't reset the cursor position in resetMouse()

Index: Mouse.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input/Mouse.java,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- Mouse.java	28 Apr 2005 10:31:32 -0000	1.80
+++ Mouse.java	28 Apr 2005 10:36:51 -0000	1.81
@@ -212,7 +212,6 @@
 		width = Display.getDisplayMode().getWidth();
 		height = Display.getDisplayMode().getHeight();
 		readBuffer.position(readBuffer.limit());
-		setCursorPosition(width/2, height/2);
 	}
 
 	/**

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

Modified Files:
	Mouse.java 
Log Message:
Allow setCursorPosition when mouse is grabbed

Index: Mouse.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input/Mouse.java,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- Mouse.java	28 Apr 2005 09:57:44 -0000	1.79
+++ Mouse.java	28 Apr 2005 10:31:32 -0000	1.80
@@ -174,22 +174,21 @@
 	}
 
 	/**
-	 * Set the position of the native cursor. This method is only valid when
-	 * the cursor is not grabbed and native cursors are supported.
+	 * Set the position of the cursor. If the cursor is not grabbed,
+	 * the native cursor is moved to the new position.
 	 *
 	 * @param x The x coordinate of the new cursor position in OpenGL coordinates relative
 	 *			to the window origin.
 	 * @param y The y coordinate of the new cursor position in OpenGL coordinates relative
 	 *			to the window origin.
 	 */
-	public static void setCursorPosition(int x, int y) {
-		if ((Cursor.getCapabilities() & Cursor.CURSOR_ONE_BIT_TRANSPARENCY) == 0)
-			throw new IllegalStateException("Mouse doesn't support native cursors");
-		if (isGrabbed())
-			throw new IllegalStateException("Cursor is grabbed");
+	public static void setCursorPosition(int new_x, int new_y) {
 		if (!isCreated())
 			throw new IllegalStateException("Mouse is not created");
-		Display.getImplementation().setCursorPosition(x, y);
+		x = event_x = new_x;
+		y = event_y = new_y;
+		if (!isGrabbed() && (Cursor.getCapabilities() & Cursor.CURSOR_ONE_BIT_TRANSPARENCY) != 0)
+			Display.getImplementation().setCursorPosition(x, y);
 	}
 	
 	/**
@@ -212,11 +211,8 @@
 		dx = dy = dwheel = 0;
 		width = Display.getDisplayMode().getWidth();
 		height = Display.getDisplayMode().getHeight();
-		x = width / 2;
-		y = height / 2;
 		readBuffer.position(readBuffer.limit());
-		if (!isGrabbed() && (Cursor.getCapabilities() & Cursor.CURSOR_ONE_BIT_TRANSPARENCY) != 0)
-			setCursorPosition(x, y);
+		setCursorPosition(width/2, height/2);
 	}
 
 	/**

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

Modified Files:
	org_lwjgl_input_Mouse.c 
Log Message:
Fix cursor jumping after Mouse.setGrabbed()

Index: org_lwjgl_input_Mouse.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Mouse.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- org_lwjgl_input_Mouse.c	12 Apr 2005 11:45:06 -0000	1.35
+++ org_lwjgl_input_Mouse.c	28 Apr 2005 09:57:45 -0000	1.36
@@ -201,6 +201,7 @@
 
 static void reset(void) {
 	initEventQueue(&event_queue, EVENT_SIZE);
+	accum_dx = accum_dy = 0;
 }
 
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nCreateMouse
@@ -360,7 +361,6 @@
 	
 	setGrab(new_grab == JNI_TRUE ? true : false);
 	reset();
-	accum_dx = accum_dy = 0;
 	XQueryPointer(getDisplay(), getCurrentWindow(), &root_return, &child_return, &root_x, &root_y, &win_x, &win_y, &mask_return);
 	doHandlePointerMotion(root_x, root_y, win_x, win_y);
 }

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

Modified Files:
	Mouse.java 
Log Message:
Fix cursor jumping after Mouse.setGrabbed()

Index: Mouse.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input/Mouse.java,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- Mouse.java	12 Apr 2005 11:56:59 -0000	1.78
+++ Mouse.java	28 Apr 2005 09:57:44 -0000	1.79
@@ -214,9 +214,9 @@
 		height = Display.getDisplayMode().getHeight();
 		x = width / 2;
 		y = height / 2;
-		readBuffer.clear();
+		readBuffer.position(readBuffer.limit());
 		if (!isGrabbed() && (Cursor.getCapabilities() & Cursor.CURSOR_ONE_BIT_TRANSPARENCY) != 0)
-		setCursorPosition(x, y);
+			setCursorPosition(x, y);
 	}
 
 	/**

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

Modified Files:
	org_lwjgl_opengl_AWTSurfaceLock.c 
Log Message:
Moved AWTSurfaceLock retry-loop to java to avoid non-standard sleep functions

Index: org_lwjgl_opengl_AWTSurfaceLock.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_AWTSurfaceLock.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- org_lwjgl_opengl_AWTSurfaceLock.c	21 Feb 2005 14:46:47 -0000	1.3
+++ org_lwjgl_opengl_AWTSurfaceLock.c	27 Apr 2005 20:30:14 -0000	1.4
@@ -39,63 +39,49 @@
 
 #include <jni.h>
 #include <jawt.h>
-#ifdef _WIN32
-#include <windows.h>
-#else
-#include <unistd.h>
-#endif
 #include "org_lwjgl_opengl_AWTSurfaceLock.h"
 #include "awt_tools.h"
 #include "common_tools.h"
 
-#define WAIT_DELAY 100
-
 JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_AWTSurfaceLock_createHandle
   (JNIEnv *env, jclass clazz) {
 	return newJavaManagedByteBuffer(env, sizeof(AWTSurfaceLock));
 }
 
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_AWTSurfaceLock_lockAndInitHandle
+JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_AWTSurfaceLock_lockAndInitHandle
   (JNIEnv *env, jclass clazz, jobject lock_buffer_handle, jobject canvas) {
 	JAWT awt;
 	JAWT_DrawingSurface* ds;
 	JAWT_DrawingSurfaceInfo *dsi;
 	AWTSurfaceLock *awt_lock = (AWTSurfaceLock *)(*env)->GetDirectBufferAddress(env, lock_buffer_handle);
 	awt.version = JAWT_VERSION_1_4;
-	while (true) {
-		if (JAWT_GetAWT(env, &awt) == 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;
-		}
-
-		if((ds->Lock(ds) & JAWT_LOCK_ERROR) != 0) {
-			awt.FreeDrawingSurface(ds);
-			throwException(env, "Could not lock the drawing surface");
-			return;
-		}
+	if (JAWT_GetAWT(env, &awt) == JNI_FALSE) {
+		throwException(env, "Could not get the JAWT interface");
+		return JNI_FALSE;
+	}
 
-		dsi = ds->GetDrawingSurfaceInfo(ds);
-		if (dsi != NULL)
-			break;
+	ds = awt.GetDrawingSurface(env, canvas);
+	if (ds == NULL) {
+		throwException(env, "Could not get the drawing surface");
+		return JNI_FALSE;
+	}
 
-		printfDebug("Could not get drawing surface info, retrying... \n");
-		ds->Unlock(ds);
+	if((ds->Lock(ds) & JAWT_LOCK_ERROR) != 0) {
 		awt.FreeDrawingSurface(ds);
-#ifdef _WIN32
-		Sleep(WAIT_DELAY);
-#else
-		usleep(WAIT_DELAY*1000);
-#endif
+		throwException(env, "Could not lock the drawing surface");
+		return JNI_FALSE;
 	}
-	awt_lock->awt = awt;
-	awt_lock->ds = ds;
-	awt_lock->dsi = dsi;
+
+	dsi = ds->GetDrawingSurfaceInfo(ds);
+	if (dsi != NULL) {
+		awt_lock->awt = awt;
+		awt_lock->ds = ds;
+		awt_lock->dsi = dsi;
+		return JNI_TRUE;
+  	}
+	ds->Unlock(ds);
+	awt.FreeDrawingSurface(ds);
+	return JNI_FALSE;
 }
 
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_AWTSurfaceLock_nUnlock

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

Modified Files:
	AWTSurfaceLock.java 
Log Message:
Moved AWTSurfaceLock retry-loop to java to avoid non-standard sleep functions

Index: AWTSurfaceLock.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/AWTSurfaceLock.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- AWTSurfaceLock.java	21 Feb 2005 14:46:42 -0000	1.2
+++ AWTSurfaceLock.java	27 Apr 2005 20:30:13 -0000	1.3
@@ -35,6 +35,7 @@
 
 import org.lwjgl.BufferUtils;
 import org.lwjgl.LWJGLException;
+import org.lwjgl.LWJGLUtil;
 import org.lwjgl.Sys;
 
 import java.awt.Canvas;
@@ -46,6 +47,8 @@
  * @version $Revision$
  */
 final class AWTSurfaceLock {
+	private final static int WAIT_DELAY_MILLIS = 100;
+	
 	private final ByteBuffer lock_buffer;
 
 	public AWTSurfaceLock() {
@@ -54,10 +57,17 @@
 	private static native ByteBuffer createHandle();
 
 	public ByteBuffer lockAndGetHandle(Canvas canvas) throws LWJGLException {
-		lockAndInitHandle(lock_buffer, canvas);
+		while (!lockAndInitHandle(lock_buffer, canvas)) {
+			LWJGLUtil.log("Could not get drawing surface info, retrying...");
+			try {
+				Thread.sleep(WAIT_DELAY_MILLIS);
+			} catch (InterruptedException e) {
+				LWJGLUtil.log("Interrupted while retrying: " + e);
+			}
+		}
 		return lock_buffer;
 	}
-	private static native void lockAndInitHandle(ByteBuffer lock_buffer, Canvas canvas) throws LWJGLException;
+	private static native boolean lockAndInitHandle(ByteBuffer lock_buffer, Canvas canvas) throws LWJGLException;
 
 	protected void unlock() throws LWJGLException {
 		nUnlock(lock_buffer);

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

Modified Files:
	LinuxDisplay.java 
Log Message:
Linux: try to work around crash on opengl library unload

Index: LinuxDisplay.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- LinuxDisplay.java	25 Apr 2005 07:26:07 -0000	1.24
+++ LinuxDisplay.java	25 Apr 2005 07:47:28 -0000	1.25
@@ -66,6 +66,7 @@
 	 */
 	static void incDisplay() throws LWJGLException {
 		if (display_connection_usage_count == 0) {
+			GLContext.loadOpenGLLibrary();
 			openDisplay();
 		}
 		display_connection_usage_count++;
@@ -77,6 +78,7 @@
 			throw new InternalError("display_connection_usage_count < 0: " + display_connection_usage_count);
 		if (display_connection_usage_count == 0) {
 			closeDisplay();
+			GLContext.unloadOpenGLLibrary();	
 		}
 	}
 

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

Modified Files:
	LinuxDisplay.java 
Log Message:
Linux: Fixed crash

Index: LinuxDisplay.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- LinuxDisplay.java	12 Apr 2005 11:45:06 -0000	1.23
+++ LinuxDisplay.java	25 Apr 2005 07:26:07 -0000	1.24
@@ -306,17 +306,33 @@
 	
 	public int getMinCursorSize() {
 		lockAWT();
-		int min_size = nGetMinCursorSize();
-		unlockAWT();
-		return min_size;
+		try {
+			incDisplay();
+			int min_size = nGetMinCursorSize();
+			decDisplay();
+			return min_size;
+		} catch (LWJGLException e) {
+			LWJGLUtil.log("Exception occurred in getMinCursorSize: " + e);
+			return 0;
+		} finally {
+			unlockAWT();
+		}
 	}
 	private static native int nGetMinCursorSize();
 
 	public int getMaxCursorSize() {
 		lockAWT();
-		int max_size = nGetMaxCursorSize();
-		unlockAWT();
-		return max_size;
+		try {
+			incDisplay();
+			int max_size = nGetMaxCursorSize();
+			decDisplay();
+			return max_size;
+		} catch (LWJGLException e) {
+			LWJGLUtil.log("Exception occurred in getMaxCursorSize: " + e);
+			return 0;
+		} finally {
+			unlockAWT();
+		}
 	}
 	private static native int nGetMaxCursorSize();
 	

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

Modified Files:
	org_lwjgl_input_Keyboard.c 
Log Message:
Linux: If a keysym has no LWJGL mapping, try the unshifted keysym instead

Index: org_lwjgl_input_Keyboard.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Keyboard.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- org_lwjgl_input_Keyboard.c	13 Apr 2005 12:55:21 -0000	1.20
+++ org_lwjgl_input_Keyboard.c	19 Apr 2005 07:18:17 -0000	1.21
@@ -578,6 +578,11 @@
 	unsigned char keycode;
 	KeySym keysym = mapEventToKeySym(event);
 	keycode = mapKeySymToLWJGLKeyCode(keysym);
+	if (keycode == org_lwjgl_input_Keyboard_KEY_NONE) {
+		// Try unshifted keysym mapping
+		keysym = XLookupKeysym(event, 0);
+		keycode = mapKeySymToLWJGLKeyCode(keysym);
+	}
 	return keycode;
 }
 

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

Modified Files:
	org_lwjgl_opengl_Display.c 
Log Message:
Win32: Ignore SC_*MENU messages (triggered on ALT and F10 and made LWJGL apps appear to hang)

Index: org_lwjgl_opengl_Display.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_Display.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- org_lwjgl_opengl_Display.c	30 Mar 2005 10:46:21 -0000	1.20
+++ org_lwjgl_opengl_Display.c	18 Apr 2005 07:31:07 -0000	1.21
@@ -134,6 +134,9 @@
 		case WM_SYSCOMMAND:
 		{
 			switch (wParam) {
+			case SC_KEYMENU:
+			case SC_MOUSEMENU:
+				// Ignore system menu retrieval
 			case SC_SCREENSAVE:
 			case SC_MONITORPOWER:
 				return 0L;

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

Modified Files:
	MacOSXFrame.java 
Log Message:
Mac OS X: Fix potential NPE

Index: MacOSXFrame.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/MacOSXFrame.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- MacOSXFrame.java	23 Feb 2005 11:11:07 -0000	1.11
+++ MacOSXFrame.java	18 Apr 2005 06:47:41 -0000	1.12
@@ -89,6 +89,7 @@
 		requestFocus();
 		canvas.requestFocus();
 		canvas.initializeCanvas();
+		updateBounds();
 	}
 
 	public void resize(int x, int y, int width, int height) {

Update of /cvsroot/java-game-lib/LWJGL/www
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14624

Modified Files:
	installation.php 
Log Message:
fixed typo

Index: installation.php
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/www/installation.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- installation.php	3 Jan 2005 06:34:04 -0000	1.9
+++ installation.php	17 Apr 2005 08:01:48 -0000	1.10
@@ -30,7 +30,7 @@
 600, 800, Game</pre>
 	</li>
 	<li>
-		Should you wish to place the dll's in some other directory than you're class files (say /native as opposed to /classes) you could do so, by using the java.library.path property. For example:<br/><br/>
+		Should you wish to place the dll's in some other directory than your class files (say /native as opposed to /classes) you could do so, by using the java.library.path property. For example:<br/><br/>
 		<pre>java -cp classes; -Djava.library.path=native org.lwjgl.test.WindowCreationTest</pre>
 	</li>
 </ul>

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

Modified Files:
	org_lwjgl_opengl_Display.c 
Log Message:
Linux: Added support for LWJGL_DISABLE_NETWM environment which will override the NetWM detection

Index: org_lwjgl_opengl_Display.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_opengl_Display.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- org_lwjgl_opengl_Display.c	29 Mar 2005 11:31:22 -0000	1.27
+++ org_lwjgl_opengl_Display.c	14 Apr 2005 10:10:46 -0000	1.28
@@ -333,12 +333,19 @@
 	setRepeatMode(env, AutoRepeatModeDefault);
 }
 
+static bool isNetWMForceDisabled() {
+	char *supported_env = getenv("LWJGL_DISABLE_NETWM");
+	return supported_env != NULL;
+}
+
 static bool isNetWMFullscreenSupported(JNIEnv *env) {
 	unsigned long nitems;
 	Atom actual_type;
 	int actual_format;
 	unsigned long bytes_after;
 	Atom *supported_list;
+	if (isNetWMForceDisabled())
+		return false;
 	Atom netwm_supported_atom = XInternAtom(getDisplay(), "_NET_SUPPORTED", False);
 	int result = XGetWindowProperty(getDisplay(), RootWindow(getDisplay(), getCurrentScreen()), netwm_supported_atom, 0, 10000, False, AnyPropertyType, &actual_type, &actual_format, &nitems, &bytes_after, (void *)&supported_list);
 	if (result != Success) {

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

Modified Files:
	org_lwjgl_input_Keyboard.c 
Log Message:
Linux: Added XK_ISO_Left_Tab as an alias for KEY_TAB

Index: org_lwjgl_input_Keyboard.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Keyboard.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- org_lwjgl_input_Keyboard.c	13 Apr 2005 12:21:53 -0000	1.19
+++ org_lwjgl_input_Keyboard.c	13 Apr 2005 12:55:21 -0000	1.20
@@ -196,6 +196,7 @@
 	switch (keysym) {
 		case XK_BackSpace:
 			return org_lwjgl_input_Keyboard_KEY_BACK;
+		case XK_ISO_Left_Tab:
 		case XK_Tab:
 			return org_lwjgl_input_Keyboard_KEY_TAB;
 		case XK_Return:

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

Modified Files:
	org_lwjgl_input_Keyboard.c 
Log Message:
Linux: ignore vendor-specific keysyms

Index: org_lwjgl_input_Keyboard.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Keyboard.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- org_lwjgl_input_Keyboard.c	11 Apr 2005 10:00:09 -0000	1.18
+++ org_lwjgl_input_Keyboard.c	13 Apr 2005 12:21:53 -0000	1.19
@@ -522,11 +522,16 @@
 		(0x11000000 <= keysym && keysym <= 0x1100FFFF);
 }
 
+static bool isNoSymbolOrVendorSpecific(KeySym keysym) {
+	return keysym == NoSymbol || (keysym & (1 << 28)) != 0;
+}
+
 static KeySym getKeySym(XKeyEvent *event, int group, int index) {
 	KeySym keysym = XLookupKeysym(event, group*2 + index);
-	if (keysym == NoSymbol && index == 1)
+	if (isNoSymbolOrVendorSpecific(keysym) && index == 1) {
 		keysym = XLookupKeysym(event, group*2 + 0);
-	if (keysym == NoSymbol && group == 1)
+	}
+	if (isNoSymbolOrVendorSpecific(keysym) && group == 1)
 		keysym = getKeySym(event, 0, index);
 	return keysym;
 }

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

Modified Files:
	org_lwjgl_fmod3_FMOD.c 
Log Message:
removed debug

Index: org_lwjgl_fmod3_FMOD.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FMOD.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- org_lwjgl_fmod3_FMOD.c	12 Apr 2005 18:57:00 -0000	1.10
+++ org_lwjgl_fmod3_FMOD.c	12 Apr 2005 19:13:35 -0000	1.11
@@ -53,7 +53,6 @@
  * Signature: ()Ljava/lang/String;
  */
 JNIEXPORT jstring JNICALL Java_org_lwjgl_fmod3_FMOD_getNativeLibraryVersion(JNIEnv * env, jclass clazz) {
-	printfDebug("getNativeLibrary: %s", VERSION);
   return NewStringNative(env, VERSION);
 }
 

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

Modified Files:
	org_lwjgl_fmod3_FMOD.c 
Log Message:
ignore fmod load path

Index: org_lwjgl_fmod3_FMOD.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FMOD.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- org_lwjgl_fmod3_FMOD.c	16 Mar 2005 21:18:41 -0000	1.9
+++ org_lwjgl_fmod3_FMOD.c	12 Apr 2005 18:57:00 -0000	1.10
@@ -53,6 +53,7 @@
  * Signature: ()Ljava/lang/String;
  */
 JNIEXPORT jstring JNICALL Java_org_lwjgl_fmod3_FMOD_getNativeLibraryVersion(JNIEnv * env, jclass clazz) {
+	printfDebug("getNativeLibrary: %s", VERSION);
   return NewStringNative(env, VERSION);
 }
 
@@ -75,10 +76,10 @@
 		lib_str = concatenate(path_str, "fmod.dll");
 #endif
 #ifdef _X11
-    lib_str = concatenate(path_str, "libfmod.so");
+		lib_str = concatenate(path_str, "libfmod.so");
 #endif
 #ifdef _MACOSX
-    lib_str = concatenate(path_str, "fmod_cfm.shlb");
+		lib_str = concatenate(path_str, "ignored");
 #endif	
 		printfDebug("Testing '%s'\n", lib_str);
 		fmod_create(env, lib_str);

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

Modified Files:
	extfmod3.h 
Log Message:
use "dynamic" header on mac


Index: extfmod3.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/fmod3/extfmod3.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- extfmod3.h	19 Sep 2004 11:17:07 -0000	1.6
+++ extfmod3.h	12 Apr 2005 18:53:40 -0000	1.7
@@ -36,7 +36,11 @@
 #include <jni.h>
 #include "../common_tools.h"
 
+#ifdef _MACOSX
+#include "fmoddyn_mac.h"
+#else
 #include "fmoddyn.h"
+#endif
 #include "fmod_errors.h"
 
 // Called to create an FMOD instance

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

Modified Files:
	extfmod3.c 
Log Message:
please mac compilation

Index: extfmod3.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/fmod3/extfmod3.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- extfmod3.c	19 Sep 2004 11:17:07 -0000	1.2
+++ extfmod3.c	12 Apr 2005 18:54:21 -0000	1.3
@@ -42,26 +42,26 @@
 FMOD_INSTANCE * fmod_instance = NULL;
 
 // jnienvs
-JNIEnv *mixer_jnienv;
-JNIEnv *stream_jnienv;
+JNIEnv *mixer_jnienv = NULL;
+JNIEnv *stream_jnienv = NULL;
 
 // FMusic cached fields
-jmethodID music_instcallback;
-jmethodID music_ordercallback;
-jmethodID music_rowcallback;
-jmethodID music_zxxcallback;
-jclass fmusic;
+jmethodID music_instcallback = NULL;
+jmethodID music_ordercallback = NULL;
+jmethodID music_rowcallback = NULL;
+jmethodID music_zxxcallback= NULL;
+jclass fmusic = NULL;
 
 // FSound cached fields
-jmethodID sound_dspcallback;
-jmethodID sound_stream_endcallback;
-jmethodID sound_stream_synccallback;
-jmethodID sound_stream_callback;
-jmethodID sound_metadata_callback;
-jclass fsound;
+jmethodID sound_dspcallback = NULL;
+jmethodID sound_stream_endcallback = NULL;
+jmethodID sound_stream_synccallback = NULL;
+jmethodID sound_stream_callback = NULL;
+jmethodID sound_metadata_callback = NULL;
+jclass fsound = NULL;
 
 // size of dsp buffer (in bytes)
-int fsound_dsp_buffer_size;
+int fsound_dsp_buffer_size = 0;
 
 #ifdef _WIN32
 /**
@@ -80,7 +80,7 @@
 void fmod_create(JNIEnv *env, const char* path) {
   // try to create an instance using the supplied path
   fmod_instance = FMOD_CreateInstance((char *)path);
-  
+
   // if we got one, we need to locate and cache jni stuff used for callbacks
   if (fmod_instance != NULL) {
     
@@ -115,7 +115,7 @@
 				fsound_dsp_buffer_size = 4;
 				break;
 		}
-  }
+  	}
 }
 
 /**