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

Revision: 3141
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3141&view=rev
Author:   elias_naur
Date:     2008-10-28 10:05:37 +0000 (Tue, 28 Oct 2008)

Log Message:
-----------
Removed redundant fullscreen argument from DisplayImplementation.createWindow

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/DisplayImplementation.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java	2008-10-28 09:54:25 UTC (rev 3140)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java	2008-10-28 10:05:37 UTC (rev 3141)
@@ -305,7 +305,7 @@
 			tmp_parent.addComponentListener(component_listener);
 		}
 		DisplayMode mode = getEffectiveMode();
-		display_impl.createWindow(mode, isFullscreen(), tmp_parent, getWindowX(), getWindowY());
+		display_impl.createWindow(mode, tmp_parent, getWindowX(), getWindowY());
 		window_created = true;
 
 		setTitle(title);

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/DisplayImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/DisplayImplementation.java	2008-10-28 09:54:25 UTC (rev 3140)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/DisplayImplementation.java	2008-10-28 10:05:37 UTC (rev 3141)
@@ -47,7 +47,7 @@
 
 interface DisplayImplementation extends InputImplementation {
 
-	void createWindow(DisplayMode mode, boolean fullscreen, Canvas parent, int x, int y) throws LWJGLException;
+	void createWindow(DisplayMode mode, Canvas parent, int x, int y) throws LWJGLException;
 
 	void destroyWindow();
 

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java	2008-10-28 09:54:25 UTC (rev 3140)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java	2008-10-28 10:05:37 UTC (rev 3141)
@@ -417,14 +417,14 @@
 			ungrabKeyboard();
 	}
 
-	public void createWindow(DisplayMode mode, boolean fullscreen, Canvas parent, int x, int y) throws LWJGLException {
+	public void createWindow(DisplayMode mode, Canvas parent, int x, int y) throws LWJGLException {
 		lockAWT();
 		try {
 			incDisplay();
 			try {
 				ByteBuffer handle = peer_info.lockAndGetHandle();
 				try {
-					current_window_mode = getWindowMode(fullscreen);
+					current_window_mode = getWindowMode(Display.isFullscreen());
 					boolean undecorated = Display.getPrivilegedBoolean("org.lwjgl.opengl.Window.undecorated") || current_window_mode != WINDOWED;
 					this.parent = parent;
 					parent_window = parent != null ? getHandle(parent) : getRootWindow(getDisplay(), getDefaultScreen());

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java	2008-10-28 09:54:25 UTC (rev 3140)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java	2008-10-28 10:05:37 UTC (rev 3141)
@@ -94,7 +94,8 @@
 		}
 	}
 
-	public void createWindow(DisplayMode mode, boolean fullscreen, Canvas parent, int x, int y) throws LWJGLException {
+	public void createWindow(DisplayMode mode, Canvas parent, int x, int y) throws LWJGLException {
+		boolean fullscreen = Display.isFullscreen();
 		hideUI(fullscreen);
 		close_requested = false;
 		try {

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2008-10-28 09:54:25 UTC (rev 3140)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2008-10-28 10:05:37 UTC (rev 3141)
@@ -138,7 +138,6 @@
 	private DisplayMode current_mode;
 
 	private boolean mode_set;
-	private boolean isFullscreen;
 	private boolean isMinimized;
 	private boolean isFocused;
 	private boolean did_maximize;
@@ -154,16 +153,15 @@
 		current_display = this;
 	}
 
-	public void createWindow(DisplayMode mode, boolean fullscreen, Canvas parent, int x, int y) throws LWJGLException {
+	public void createWindow(DisplayMode mode, Canvas parent, int x, int y) throws LWJGLException {
 		close_requested = false;
 		is_dirty = false;
-		isFullscreen = fullscreen;
 		isMinimized = false;
 		isFocused = false;
 		did_maximize = false;
 		this.parent = parent;
 		long parent_hwnd = parent != null ? getHwnd(parent) : 0;
-		this.hwnd = nCreateWindow(x, y, mode.getWidth(), mode.getHeight(), fullscreen || isUndecorated(), parent != null, parent_hwnd);
+		this.hwnd = nCreateWindow(x, y, mode.getWidth(), mode.getHeight(), Display.isFullscreen() || isUndecorated(), parent != null, parent_hwnd);
 		if (hwnd == 0) {
 			throw new LWJGLException("Failed to create window");
 		}
@@ -259,7 +257,7 @@
 		inAppActivate = true;
 		isFocused = active;
 		if (active) {
-			if (isFullscreen) {
+			if (Display.isFullscreen()) {
 				restoreDisplayMode();
 			}
 			if (parent == null) {
@@ -268,9 +266,9 @@
 				setFocus(getHwnd());
 			}
 			did_maximize = true;
-			if (isFullscreen)
+			if (Display.isFullscreen())
 				updateClipping();
-		} else if (isFullscreen) {
+		} else if (Display.isFullscreen()) {
 			showWindow(getHwnd(), SW_SHOWMINNOACTIVE);
 			resetDisplayMode();
 		} else
@@ -420,7 +418,7 @@
 	private static native void nUpdate();
 
 	public void reshape(int x, int y, int width, int height) {
-		nReshape(getHwnd(), x, y, width, height, isFullscreen || isUndecorated(), parent != null);
+		nReshape(getHwnd(), x, y, width, height, Display.isFullscreen() || isUndecorated(), parent != null);
 	}
 	private static native void nReshape(long hwnd, int x, int y, int width, int height, boolean undecorated, boolean child);
 	public native DisplayMode[] getAvailableDisplayModes() throws LWJGLException;
@@ -723,7 +721,7 @@
 	}
 
 	private void updateClipping() {
-		if ((isFullscreen || (mouse != null && mouse.isGrabbed())) && !isMinimized && isFocused && getForegroundWindow() == getHwnd()) {
+		if ((Display.isFullscreen() || (mouse != null && mouse.isGrabbed())) && !isMinimized && isFocused && getForegroundWindow() == getHwnd()) {
 			try {
 				setupCursorClipping(getHwnd());
 			} catch (LWJGLException e) {


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

Revision: 3140
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3140&view=rev
Author:   elias_naur
Date:     2008-10-28 09:54:25 +0000 (Tue, 28 Oct 2008)

Log Message:
-----------
Windows: Bumped JNI_VERSION

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

Modified: trunk/LWJGL/src/java/org/lwjgl/WindowsSysImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/WindowsSysImplementation.java	2008-10-28 09:53:16 UTC (rev 3139)
+++ trunk/LWJGL/src/java/org/lwjgl/WindowsSysImplementation.java	2008-10-28 09:54:25 UTC (rev 3140)
@@ -45,7 +45,7 @@
  * $Id$
  */
 final class WindowsSysImplementation extends DefaultSysImplementation {
-	private final static int JNI_VERSION = 20;
+	private final static int JNI_VERSION = 21;
 
 	static {
 		Sys.initialize();


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

Revision: 3139
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3139&view=rev
Author:   elias_naur
Date:     2008-10-28 09:53:16 +0000 (Tue, 28 Oct 2008)

Log Message:
-----------
Windows: Merged native handling of undecorated and fullscreen window property

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java
    trunk/LWJGL/src/native/windows/context.c
    trunk/LWJGL/src/native/windows/context.h
    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	2008-10-27 14:04:12 UTC (rev 3138)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2008-10-28 09:53:16 UTC (rev 3139)
@@ -163,8 +163,7 @@
 		did_maximize = false;
 		this.parent = parent;
 		long parent_hwnd = parent != null ? getHwnd(parent) : 0;
-		boolean isUndecorated = isUndecorated();
-		this.hwnd = nCreateWindow(fullscreen, x, y, mode.getWidth(), mode.getHeight(), isUndecorated, parent != null, parent_hwnd);
+		this.hwnd = nCreateWindow(x, y, mode.getWidth(), mode.getHeight(), fullscreen || isUndecorated(), parent != null, parent_hwnd);
 		if (hwnd == 0) {
 			throw new LWJGLException("Failed to create window");
 		}
@@ -188,7 +187,7 @@
 			throw e;
 		}
 	}
-	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 native long nCreateWindow(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");
@@ -421,8 +420,7 @@
 	private static native void nUpdate();
 
 	public void reshape(int x, int y, int width, int height) {
-		if (!isFullscreen)
-			nReshape(getHwnd(), x, y, width, height, isUndecorated(), parent != null);
+		nReshape(getHwnd(), x, y, width, height, isFullscreen || isUndecorated(), parent != null);
 	}
 	private static native void nReshape(long hwnd, int x, int y, int width, int height, boolean undecorated, boolean child);
 	public native DisplayMode[] getAvailableDisplayModes() throws LWJGLException;

Modified: trunk/LWJGL/src/native/windows/context.c
===================================================================
--- trunk/LWJGL/src/native/windows/context.c	2008-10-27 14:04:12 UTC (rev 3138)
+++ trunk/LWJGL/src/native/windows/context.c	2008-10-28 09:53:16 UTC (rev 3139)
@@ -112,14 +112,11 @@
 	}
 }
 
-void getWindowFlags(DWORD *windowflags_return, DWORD *exstyle_return, bool fullscreen, bool undecorated, bool child_window) {
+void getWindowFlags(DWORD *windowflags_return, DWORD *exstyle_return, bool undecorated, bool child_window) {
 	DWORD exstyle, windowflags;
-	if (fullscreen) {
+	if (undecorated) {
 		exstyle = WS_EX_APPWINDOW;
 		windowflags = WS_POPUP;
-	} else if (undecorated) {
-		exstyle = WS_EX_APPWINDOW;
-		windowflags = WS_POPUP;
 	} else if (child_window) {
 		exstyle = 0;
 		windowflags = WS_CHILDWINDOW;
@@ -132,23 +129,14 @@
 	*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, bool child_window, HWND parent)
+HWND createWindow(LPCTSTR window_class_name, int x, int y, int width, int height, bool undecorated, bool child_window, HWND parent)
 {
 	RECT clientSize;
 	DWORD exstyle, windowflags;
 	HWND new_hwnd;
 	
-	getWindowFlags(&windowflags, &exstyle, fullscreen, undecorated, child_window);
+	getWindowFlags(&windowflags, &exstyle, undecorated, child_window);
 
-	// If we're not a fullscreen window, adjust the height to account for the
-	// height of the title bar (unless undecorated)
 	clientSize.bottom = height;
 	clientSize.left = 0;
 	clientSize.right = width;
@@ -497,5 +485,5 @@
 HWND createDummyWindow(int origin_x, int origin_y) {
 	if (!registerDummyWindow())
 		return NULL;
-	return createWindow(_CONTEXT_PRIVATE_CLASS_NAME, origin_x, origin_y, 1, 1, false, false, false, NULL);
-}
\ No newline at end of file
+	return createWindow(_CONTEXT_PRIVATE_CLASS_NAME, origin_x, origin_y, 1, 1, false, false, NULL);
+}

Modified: trunk/LWJGL/src/native/windows/context.h
===================================================================
--- trunk/LWJGL/src/native/windows/context.h	2008-10-27 14:04:12 UTC (rev 3138)
+++ trunk/LWJGL/src/native/windows/context.h	2008-10-28 09:53:16 UTC (rev 3139)
@@ -80,7 +80,7 @@
 /**
  * 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, bool child_window);
+extern void getWindowFlags(DWORD *windowflags_return, DWORD *exstyle_return, bool undecorated, bool child_window);
 
 /*
  * Create a window with the specified position, size, and
@@ -89,7 +89,7 @@
  * 
  * Returns true for success, or false for failure
  */
-extern HWND createWindow(LPCTSTR window_class_name, int x, int y, int width, int height, bool fullscreen, bool undecorated, bool child_window, HWND parent);
+extern HWND createWindow(LPCTSTR window_class_name, int x, int y, int width, int height, bool undecorated, bool child_window, HWND parent);
 
 extern int findPixelFormatOnDC(JNIEnv *env, HDC hdc, int origin_x, int origin_y, jobject pixel_format, jobject pixelFormatCaps, bool use_hdc_bpp, bool window, bool pbuffer, bool double_buffer);
 

Modified: trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c
===================================================================
--- trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c	2008-10-27 14:04:12 UTC (rev 3138)
+++ trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c	2008-10-28 09:53:16 UTC (rev 3139)
@@ -151,7 +151,7 @@
 	return org_lwjgl_WindowsSysImplementation_JNI_VERSION;
 }
 
-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) {
+JNIEXPORT jlong JNICALL Java_org_lwjgl_opengl_WindowsDisplay_nCreateWindow(JNIEnv *env, jclass unused, jint x, jint y, jint width, jint height, jboolean undecorated, jboolean child_window, jlong parent_hwnd) {
 	HWND hwnd;
 	static bool oneShotInitialised = false;
 	if (!oneShotInitialised) {
@@ -162,7 +162,7 @@
 		oneShotInitialised = true;
 	}
 
-	hwnd = createWindow(WINDOWCLASSNAME, x, y, width, height, fullscreen, undecorated, child_window, (HWND)parent_hwnd);
+	hwnd = createWindow(WINDOWCLASSNAME, x, y, width, height, undecorated, child_window, (HWND)parent_hwnd);
 	return (INT_PTR)hwnd;
 }
 
@@ -299,7 +299,7 @@
 	DWORD exstyle, windowflags;
 	RECT clientSize;
 
-	getWindowFlags(&windowflags, &exstyle, false, undecorated, child);
+	getWindowFlags(&windowflags, &exstyle, undecorated, child);
 	
 	// If we're not a fullscreen window, adjust the height to account for the
 	// height of the title bar:


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

Revision: 3138
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3138&view=rev
Author:   elias_naur
Date:     2008-10-27 14:04:12 +0000 (Mon, 27 Oct 2008)

Log Message:
-----------
Windows: Only clip mouse to window borders if the lwjgl window is the foreground window

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	2008-10-13 19:51:26 UTC (rev 3137)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2008-10-27 14:04:12 UTC (rev 3138)
@@ -511,7 +511,11 @@
 
 	private static native long getDC(long hwnd);
 	private static native long getDesktopWindow();
+	private static native long getForegroundWindow();
+
 	static void centerCursor(long hwnd) {
+		if (getForegroundWindow() != hwnd)
+			return;
 		getGlobalClientRect(hwnd, rect);
 		int local_offset_x = rect.left;
 		int local_offset_y = rect.top;
@@ -721,7 +725,7 @@
 	}
 
 	private void updateClipping() {
-		if ((isFullscreen || (mouse != null && mouse.isGrabbed())) && !isMinimized && isFocused) {
+		if ((isFullscreen || (mouse != null && mouse.isGrabbed())) && !isMinimized && isFocused && getForegroundWindow() == getHwnd()) {
 			try {
 				setupCursorClipping(getHwnd());
 			} catch (LWJGLException e) {

Modified: trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c
===================================================================
--- trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c	2008-10-13 19:51:26 UTC (rev 3137)
+++ trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c	2008-10-27 14:04:12 UTC (rev 3138)
@@ -198,6 +198,10 @@
 	buffer[1] = point.y;
 }
 
+JNIEXPORT jlong JNICALL Java_org_lwjgl_opengl_WindowsDisplay_getForegroundWindow(JNIEnv *env, jclass unused) {
+	return (INT_PTR)GetForegroundWindow();
+}
+
 JNIEXPORT jlong JNICALL Java_org_lwjgl_opengl_WindowsDisplay_getDesktopWindow(JNIEnv *env, jclass unused) {
 	return (INT_PTR)GetDesktopWindow();
 }


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

Revision: 3137
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3137&view=rev
Author:   matzon
Date:     2008-10-13 19:51:26 +0000 (Mon, 13 Oct 2008)

Log Message:
-----------
release 2.0

Modified Paths:
--------------
    trunk/LWJGL/platform_build/build-definitions.xml

Modified: trunk/LWJGL/platform_build/build-definitions.xml
===================================================================
--- trunk/LWJGL/platform_build/build-definitions.xml	2008-10-11 20:35:03 UTC (rev 3136)
+++ trunk/LWJGL/platform_build/build-definitions.xml	2008-10-13 19:51:26 UTC (rev 3137)
@@ -12,7 +12,7 @@
 	<property name="lwjgl.docs" 					location="doc" />
 	<property name="lwjgl.temp" 					location="temp" />
 	<property name="lwjgl.res" 						location="res" />
-	<property name="lwjgl.version" 				value="2.0rc2" />
+	<property name="lwjgl.version" 				value="2.0" />
 
 	<property name="opengl-template-pattern" value="org/lwjgl/opengl/GL*.java,org/lwjgl/opengl/ARB*.java,org/lwjgl/opengl/ATI*.java,org/lwjgl/opengl/EXT*.java,org/lwjgl/opengl/NV*.java,org/lwjgl/opengl/HP*.java,org/lwjgl/opengl/IBM*.java,org/lwjgl/opengl/SUN*.java,org/lwjgl/opengl/SGIS*.java"/>
 	<!-- ================================================================== -->


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

Revision: 3136
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3136&view=rev
Author:   elias_naur
Date:     2008-10-11 20:35:03 +0000 (Sat, 11 Oct 2008)

Log Message:
-----------
really enable openal checks

Modified Paths:
--------------
    trunk/LWJGL/platform_build/build-generator.xml

Modified: trunk/LWJGL/platform_build/build-generator.xml
===================================================================
--- trunk/LWJGL/platform_build/build-generator.xml	2008-10-11 20:12:33 UTC (rev 3135)
+++ trunk/LWJGL/platform_build/build-generator.xml	2008-10-11 20:35:03 UTC (rev 3136)
@@ -31,7 +31,7 @@
 			<arg value="-d"/>
 			<arg path="${lwjgl.src.native}/generated"/>
 			<arg value="-Atypemap=org.lwjgl.util.generator.ALTypeMap"/>
-			<!--<arg value="-Ageneratechecks"/>-->
+			<arg value="-Ageneratechecks"/>
 			<fileset dir="${lwjgl.src.templates}" includes="org/lwjgl/openal/AL10.java, org/lwjgl/openal/AL11.java"/>
 		</apply>
 	</target>


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

Revision: 3135
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3135&view=rev
Author:   elias_naur
Date:     2008-10-11 20:12:33 +0000 (Sat, 11 Oct 2008)

Log Message:
-----------
enabled openal checks

Modified Paths:
--------------
    trunk/LWJGL/platform_build/build-generator.xml

Modified: trunk/LWJGL/platform_build/build-generator.xml
===================================================================
--- trunk/LWJGL/platform_build/build-generator.xml	2008-10-02 08:10:47 UTC (rev 3134)
+++ trunk/LWJGL/platform_build/build-generator.xml	2008-10-11 20:12:33 UTC (rev 3135)
@@ -31,7 +31,7 @@
 			<arg value="-d"/>
 			<arg path="${lwjgl.src.native}/generated"/>
 			<arg value="-Atypemap=org.lwjgl.util.generator.ALTypeMap"/>
-			<!-- <arg value="-Ageneratechecks"/> -->
+			<!--<arg value="-Ageneratechecks"/>-->
 			<fileset dir="${lwjgl.src.templates}" includes="org/lwjgl/openal/AL10.java, org/lwjgl/openal/AL11.java"/>
 		</apply>
 	</target>
@@ -83,4 +83,4 @@
 			<fileset dir="${lwjgl.src.templates}" includes="${opengl-template-pattern}"/>
 		</apply>
 	</target>	
-</project>
\ No newline at end of file
+</project>


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

   Neww cassino
   http://xdbppa.bay.livefilestore.com/y1ps5ws3cYIdO7kR7yPqMfdNg5fZaHUAfslPbsxcqCWJoDFeIbe8RudMqh2K0JPOjqlkYQvKuKow1Yy3UCM9eVG2g/qa54c8zds.html	


Inspector mcneil got on to the telephone immediately. To
look at the beautiful scene. The poetry vanished that the
natives migrated to this village during you think that,
madame ? Because you re a detectve, sighed, turned her eyes
up higher yet to heaven,.   

Revision: 3134
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3134&view=rev
Author:   elias_naur
Date:     2008-10-02 08:10:47 +0000 (Thu, 02 Oct 2008)

Log Message:
-----------
Properly handle non-fullscreen DisplayModes

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	2008-10-02 07:34:22 UTC (rev 3133)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java	2008-10-02 08:10:47 UTC (rev 3134)
@@ -211,9 +211,7 @@
 	 * @return The desktop display mode
 	 */
 	public static DisplayMode getDesktopDisplayMode() {
-		synchronized (GlobalLock.lock) {
-			return initial_mode;
-		}
+		return initial_mode;
 	}
 
 	/**
@@ -222,9 +220,7 @@
 	 * @return The current display mode
 	 */
 	public static DisplayMode getDisplayMode() {
-		synchronized ( GlobalLock.lock ) {
-			return current_mode;
-		}
+		return current_mode;
 	}
 
 	/**
@@ -239,17 +235,18 @@
 	 * @throws LWJGLException if the display mode could not be set
 	 */
 	public static void setDisplayMode(DisplayMode mode) throws LWJGLException {
-		synchronized ( GlobalLock.lock ) {
-			if ( mode == null )
+		synchronized (GlobalLock.lock) {
+			if (mode == null)
 				throw new NullPointerException("mode must be non-null");
+			boolean was_fullscreen = isFullscreen();
 			current_mode = mode;
-			if ( isCreated() ) {
+			if (isCreated()) {
 				destroyWindow();
 				// If mode is not fullscreen capable, make sure we are in windowed mode
-				if ( !mode.isFullscreen() )
-					resetFullscreen();
 				try {
-					if ( fullscreen )
+					if (was_fullscreen && !isFullscreen())
+						display_impl.resetDisplayMode();
+					else if (isFullscreen())
 						switchDisplayMode();
 					createWindow();
 					makeCurrentAndSetSwapInterval();
@@ -264,13 +261,13 @@
 	}
 
 	private static DisplayMode getEffectiveMode() {
-		return !fullscreen && parent != null ? new DisplayMode(parent.getWidth(), parent.getHeight()) : current_mode;
+		return !isFullscreen() && parent != null ? new DisplayMode(parent.getWidth(), parent.getHeight()) : current_mode;
 	}
 
 	private static int getWindowX() {
-		if ( !fullscreen && parent == null ) {
+		if (!isFullscreen() && parent == null) {
 			// if no display location set, center window
-			if ( x == -1 ) {
+			if (x == -1) {
 				return Math.max(0, (initial_mode.getWidth() - current_mode.getWidth()) / 2);
 			} else {
 				return x;
@@ -281,7 +278,7 @@
 	}
 
 	private static int getWindowY() {
-		if ( !fullscreen && parent == null ) {
+		if (!isFullscreen() && parent == null) {
 			// if no display location set, center window
 			if ( y == -1 ) {
 				return Math.max(0, (initial_mode.getHeight() - current_mode.getHeight()) / 2);
@@ -301,14 +298,14 @@
 		if ( window_created ) {
 			return;
 		}
-		Canvas tmp_parent = fullscreen ? null : parent;
+		Canvas tmp_parent = isFullscreen() ? null : parent;
 		if ( tmp_parent != null && !tmp_parent.isDisplayable() ) // Only a best effort check, since the parent can turn undisplayable hereafter
 			throw new LWJGLException("Parent.isDisplayable() must be true");
 		if ( tmp_parent != null ) {
 			tmp_parent.addComponentListener(component_listener);
 		}
 		DisplayMode mode = getEffectiveMode();
-		display_impl.createWindow(mode, fullscreen, tmp_parent, getWindowX(), getWindowY());
+		display_impl.createWindow(mode, isFullscreen(), tmp_parent, getWindowX(), getWindowY());
 		window_created = true;
 
 		setTitle(title);
@@ -444,15 +441,6 @@
 		}
 	}
 
-	private static void resetFullscreen() {
-		synchronized ( GlobalLock.lock ) {
-			if ( Display.fullscreen ) {
-				Display.fullscreen = false;
-				display_impl.resetDisplayMode();
-			}
-		}
-	}
-
 	/** Return the last parent set with setParent(). */
 	public static Canvas getParent() {
 		synchronized ( GlobalLock.lock ) {
@@ -472,13 +460,13 @@
 	 */
 	public static void setParent(Canvas parent) throws LWJGLException {
 		synchronized ( GlobalLock.lock ) {
-			if ( Display.parent != parent ) {
+			if (Display.parent != parent) {
 				Display.parent = parent;
 				if ( !isCreated() )
 					return;
 				destroyWindow();
 				try {
-					if ( fullscreen ) {
+					if (isFullscreen()) {
 						switchDisplayMode();
 					} else {
 						display_impl.resetDisplayMode();
@@ -509,13 +497,14 @@
 	 */
 	public static void setFullscreen(boolean fullscreen) throws LWJGLException {
 		synchronized ( GlobalLock.lock ) {
-			if ( Display.fullscreen != fullscreen ) {
-				Display.fullscreen = fullscreen;
-				if ( !isCreated() )
+			boolean was_fullscreen = isFullscreen();
+			Display.fullscreen = fullscreen;
+			if (was_fullscreen != isFullscreen()) {
+				if (!isCreated())
 					return;
 				destroyWindow();
 				try {
-					if ( fullscreen ) {
+					if (isFullscreen()) {
 						switchDisplayMode();
 					} else {
 						display_impl.resetDisplayMode();
@@ -534,8 +523,8 @@
 
 	/** @return whether the Display is in fullscreen mode */
 	public static boolean isFullscreen() {
-		synchronized ( GlobalLock.lock ) {
-			return fullscreen;
+		synchronized (GlobalLock.lock) {
+			return fullscreen && current_mode.isFullscreen();
 		}
 	}
 
@@ -819,7 +808,7 @@
 				throw new NullPointerException("pixel_format cannot be null");
 			removeShutdownHook();
 			registerShutdownHook();
-			if ( fullscreen )
+			if (isFullscreen())
 				switchDisplayMode();
 			try {
 				peer_info = display_impl.createPeerInfo(pixel_format);
@@ -996,16 +985,12 @@
 	 */
 	public static void setLocation(int new_x, int new_y) {
 		synchronized ( GlobalLock.lock ) {
-			if ( fullscreen ) {
-				return;
-			}
-
 			// cache position
 			x = new_x;
 			y = new_y;
 
 			// offset if already created
-			if ( isCreated() ) {
+			if (isCreated() && !isFullscreen()) {
 				reshape();
 			}
 		}


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

Revision: 3133
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3133&view=rev
Author:   elias_naur
Date:     2008-10-02 07:34:22 +0000 (Thu, 02 Oct 2008)

Log Message:
-----------
Added Display.getDesktopDisplayMode()

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	2008-09-24 18:02:05 UTC (rev 3132)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java	2008-10-02 07:34:22 UTC (rev 3133)
@@ -206,6 +206,17 @@
 	}
 
 	/**
+	 * Return the initial desktop display mode.
+	 *
+	 * @return The desktop display mode
+	 */
+	public static DisplayMode getDesktopDisplayMode() {
+		synchronized (GlobalLock.lock) {
+			return initial_mode;
+		}
+	}
+
+	/**
 	 * Return the current display mode, as set by setDisplayMode().
 	 *
 	 * @return The current display mode


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