[Java-game-lib-cvs] SF.net SVN: java-game-lib: [3065] trunk/LWJGL/src

[<eli...@us...>]

Revision: 3065
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3065&view=rev
Author:   elias_naur
Date:     2008-05-05 09:46:16 -0700 (Mon, 05 May 2008)

Log Message:
-----------
Windows: Generalized WindowsDispaly.nCreateWindow

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/WindowsSysImplementation.java
    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/WindowsSysImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/WindowsSysImplementation.java	2008-05-02 11:05:49 UTC (rev 3064)
+++ trunk/LWJGL/src/java/org/lwjgl/WindowsSysImplementation.java	2008-05-05 16:46:16 UTC (rev 3065)
@@ -45,7 +45,7 @@
  * $Id$
  */
 final class WindowsSysImplementation extends DefaultSysImplementation {
-	private final static int JNI_VERSION = 18;
+	private final static int JNI_VERSION = 19;
 
 	static {
 		Sys.initialize();

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2008-05-02 11:05:49 UTC (rev 3064)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2008-05-05 16:46:16 UTC (rev 3065)
@@ -164,7 +164,7 @@
 		this.parent = parent;
 		long parent_hwnd = parent != null ? getHwnd(parent) : 0;
 		boolean isUndecorated = isUndecorated();
-		this.hwnd = nCreateWindow(mode, fullscreen, x, y, isUndecorated, parent != null, parent_hwnd);
+		this.hwnd = nCreateWindow(fullscreen, x, y, mode.getWidth(), mode.getHeight(), isUndecorated, parent != null, parent_hwnd);
 		if (hwnd == 0) {
 			throw new LWJGLException("Failed to create window");
 		}
@@ -187,7 +187,7 @@
 			throw e;
 		}
 	}
-	private native long nCreateWindow(DisplayMode mode, boolean fullscreen, int x, int y, boolean undecorated, boolean child_window, long parent_hwnd) throws LWJGLException;
+	private native long nCreateWindow(boolean fullscreen, int x, int y, int width, int height, boolean undecorated, boolean child_window, long parent_hwnd) throws LWJGLException;
 
 	private static boolean isUndecorated() {
 		return Display.getPrivilegedBoolean("org.lwjgl.opengl.Window.undecorated"); 

Modified: trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c
===================================================================
--- trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c	2008-05-02 11:05:49 UTC (rev 3064)
+++ trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c	2008-05-05 16:46:16 UTC (rev 3065)
@@ -158,12 +158,7 @@
 		(*env)->DeleteGlobalRef(env, display_class_global);
 }
 
-JNIEXPORT jlong JNICALL Java_org_lwjgl_opengl_WindowsDisplay_nCreateWindow(JNIEnv *env, jobject self, jobject mode, jboolean fullscreen, jint x, jint y, jboolean undecorated, jboolean child_window, jlong parent_hwnd) {
-	jclass cls_displayMode = (*env)->GetObjectClass(env, mode);
-	jfieldID fid_width = (*env)->GetFieldID(env, cls_displayMode, "width", "I");
-	jfieldID fid_height = (*env)->GetFieldID(env, cls_displayMode, "height", "I");
-	int width = (*env)->GetIntField(env, mode, fid_width);
-	int height = (*env)->GetIntField(env, mode, fid_height);
+JNIEXPORT jlong JNICALL Java_org_lwjgl_opengl_WindowsDisplay_nCreateWindow(JNIEnv *env, jobject self, jboolean fullscreen, jint x, jint y, jint width, jint height, jboolean undecorated, jboolean child_window, jlong parent_hwnd) {
 	HWND hwnd;
 	static bool oneShotInitialised = false;
 	if (!oneShotInitialised) {


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