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

Revision: 2718
          http://svn.sourceforge.net/java-game-lib/?rev=2718&view=rev
Author:   matzon
Date:     2007-01-04 15:28:33 -0800 (Thu, 04 Jan 2007)

Log Message:
-----------
osx cursor animation emulation enabled

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/input/Mouse.java

Modified: trunk/LWJGL/src/java/org/lwjgl/input/Mouse.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/input/Mouse.java	2007-01-04 14:12:36 UTC (rev 2717)
+++ trunk/LWJGL/src/java/org/lwjgl/input/Mouse.java	2007-01-04 23:28:33 UTC (rev 2718)
@@ -136,8 +136,9 @@
 
 	private static InputImplementation implementation;
   
-	/** Whether we're running windows - which need to manually update cursor animation */
-	private static final boolean isWindows = LWJGLUtil.getPlatform() == LWJGLUtil.PLATFORM_WINDOWS;
+	/** Whether we need cursor animation emulation */
+	private static final boolean emulateCursorAnimation = 	LWJGLUtil.getPlatform() == LWJGLUtil.PLATFORM_WINDOWS || 
+								LWJGLUtil.getPlatform() == LWJGLUtil.PLATFORM_MACOSX;
 
 	/**
 	 * Mouse cannot be constructed.
@@ -584,7 +585,7 @@
 	 * shouldn't be called otherwise
 	 */
 	public static synchronized void updateCursor() {
-		if (isWindows && currentCursor != null && currentCursor.hasTimedOut()) {
+		if (emulateCursorAnimation && currentCursor != null && currentCursor.hasTimedOut()) {
 			currentCursor.nextCursor();
 			try {
 				setNativeCursor(currentCursor);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2717
          http://svn.sourceforge.net/java-game-lib/?rev=2717&view=rev
Author:   elias_naur
Date:     2007-01-04 06:12:36 -0800 (Thu, 04 Jan 2007)

Log Message:
-----------
Windows: Clear the window with OpenGL to replace UpdateWindow(HWND) and run message loop once in Display.create().

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java	2007-01-04 14:00:45 UTC (rev 2716)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java	2007-01-04 14:12:36 UTC (rev 2717)
@@ -734,6 +734,9 @@
 		GL11.glMatrixMode(GL11.GL_MODELVIEW);
 		GL11.glLoadIdentity();
 		GL11.glViewport(0, 0, current_mode.getWidth(), current_mode.getHeight());
+		// Clear window to avoid the desktop "showing through"
+		GL11.glClear(GL11.GL_COLOR_BUFFER_BIT);
+		update();
 	}
 
 	static DisplayImplementation getImplementation() {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2716
          http://svn.sourceforge.net/java-game-lib/?rev=2716&view=rev
Author:   elias_naur
Date:     2007-01-04 06:00:45 -0800 (Thu, 04 Jan 2007)

Log Message:
-----------
Windows: Don't use UpdateWindow after all. Instead, don't use a background brush at all to avoid windows clearing windows with non OpenGL drawing commands. Hopefully this will improve compatibility (The NeHe tutorials also don't specify a background brush).

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java
    trunk/LWJGL/src/native/windows/context.c
    trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2007-01-04 13:44:23 UTC (rev 2715)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2007-01-04 14:00:45 UTC (rev 2716)
@@ -136,7 +136,6 @@
 		showWindow(getHwnd(), SW_SHOWDEFAULT);
 		setForegroundWindow(getHwnd());
 		setFocus(getHwnd());
-		updateWindow(getHwnd());
 	}
 	private native void nCreateWindow(DisplayMode mode, boolean fullscreen, int x, int y) throws LWJGLException;
 
@@ -182,7 +181,6 @@
 	private static native void showWindow(long hwnd, int mode);
 	private static native void setForegroundWindow(long hwnd);
 	private static native void setFocus(long hwnd);
-	private static native void updateWindow(long hwnd);
 
 	private void restoreDisplayMode() {
 		try {

Modified: trunk/LWJGL/src/native/windows/context.c
===================================================================
--- trunk/LWJGL/src/native/windows/context.c	2007-01-04 13:44:23 UTC (rev 2715)
+++ trunk/LWJGL/src/native/windows/context.c	2007-01-04 14:00:45 UTC (rev 2716)
@@ -55,6 +55,7 @@
 bool registerWindow(WNDPROC win_proc, LPCTSTR class_name)
 {
 	WNDCLASS windowClass;
+	memset(&windowClass, 0, sizeof(windowClass));
 	windowClass.style = CS_OWNDC;
 	windowClass.lpfnWndProc = win_proc;
 	windowClass.cbClsExtra = 0;
@@ -62,7 +63,7 @@
 	windowClass.hInstance = dll_handle;
 	windowClass.hIcon = LoadIcon(NULL, IDI_APPLICATION);
 	windowClass.hCursor = LoadCursor(NULL, IDC_ARROW);
-	windowClass.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH);
+	windowClass.hbrBackground = NULL;
 	windowClass.lpszMenuName = NULL;
 	windowClass.lpszClassName = class_name;
 

Modified: trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c
===================================================================
--- trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c	2007-01-04 13:44:23 UTC (rev 2715)
+++ trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c	2007-01-04 14:00:45 UTC (rev 2716)
@@ -247,11 +247,6 @@
 	setGammaRamp(env, gamma_buffer);
 }
 
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_WindowsDisplay_updateWindow(JNIEnv *env, jclass unused, jlong hwnd_ptr) {
-	HWND hwnd = (HWND)(INT_PTR)hwnd_ptr;
-	UpdateWindow(hwnd);
-}
-
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_WindowsDisplay_showWindow(JNIEnv *env, jclass unused, jlong hwnd_ptr, jint mode) {
 	HWND hwnd = (HWND)(INT_PTR)hwnd_ptr;
 	ShowWindow(hwnd, mode);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2715
          http://svn.sourceforge.net/java-game-lib/?rev=2715&view=rev
Author:   elias_naur
Date:     2007-01-04 05:44:23 -0800 (Thu, 04 Jan 2007)

Log Message:
-----------
Windows: Re-add UpdateWindow to make sure fullscreen windows are cleared faster

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java
    trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2007-01-03 09:16:13 UTC (rev 2714)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2007-01-04 13:44:23 UTC (rev 2715)
@@ -136,6 +136,7 @@
 		showWindow(getHwnd(), SW_SHOWDEFAULT);
 		setForegroundWindow(getHwnd());
 		setFocus(getHwnd());
+		updateWindow(getHwnd());
 	}
 	private native void nCreateWindow(DisplayMode mode, boolean fullscreen, int x, int y) throws LWJGLException;
 
@@ -181,6 +182,7 @@
 	private static native void showWindow(long hwnd, int mode);
 	private static native void setForegroundWindow(long hwnd);
 	private static native void setFocus(long hwnd);
+	private static native void updateWindow(long hwnd);
 
 	private void restoreDisplayMode() {
 		try {

Modified: trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c
===================================================================
--- trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c	2007-01-03 09:16:13 UTC (rev 2714)
+++ trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c	2007-01-04 13:44:23 UTC (rev 2715)
@@ -247,6 +247,11 @@
 	setGammaRamp(env, gamma_buffer);
 }
 
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_WindowsDisplay_updateWindow(JNIEnv *env, jclass unused, jlong hwnd_ptr) {
+	HWND hwnd = (HWND)(INT_PTR)hwnd_ptr;
+	UpdateWindow(hwnd);
+}
+
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_WindowsDisplay_showWindow(JNIEnv *env, jclass unused, jlong hwnd_ptr, jint mode) {
 	HWND hwnd = (HWND)(INT_PTR)hwnd_ptr;
 	ShowWindow(hwnd, mode);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.