[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3141] trunk/LWJGL/src/java/org/lwjgl/opengl

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

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.