From ed1f8d70f4ce924538e7f02c530206d57110784c Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Tue, 28 Oct 2008 10:05:37 +0000 Subject: [PATCH] Removed redundant fullscreen argument from DisplayImplementation.createWindow --- src/java/org/lwjgl/opengl/Display.java | 2 +- .../org/lwjgl/opengl/DisplayImplementation.java | 2 +- src/java/org/lwjgl/opengl/LinuxDisplay.java | 4 ++-- src/java/org/lwjgl/opengl/MacOSXDisplay.java | 3 ++- src/java/org/lwjgl/opengl/WindowsDisplay.java | 16 +++++++--------- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/java/org/lwjgl/opengl/Display.java b/src/java/org/lwjgl/opengl/Display.java index ee1e1937..73b7fed3 100644 --- a/src/java/org/lwjgl/opengl/Display.java +++ b/src/java/org/lwjgl/opengl/Display.java @@ -305,7 +305,7 @@ public final class Display { 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); diff --git a/src/java/org/lwjgl/opengl/DisplayImplementation.java b/src/java/org/lwjgl/opengl/DisplayImplementation.java index a1667c5a..fb5505ee 100644 --- a/src/java/org/lwjgl/opengl/DisplayImplementation.java +++ b/src/java/org/lwjgl/opengl/DisplayImplementation.java @@ -47,7 +47,7 @@ import org.lwjgl.LWJGLException; 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(); diff --git a/src/java/org/lwjgl/opengl/LinuxDisplay.java b/src/java/org/lwjgl/opengl/LinuxDisplay.java index 294f6b46..32e851bb 100644 --- a/src/java/org/lwjgl/opengl/LinuxDisplay.java +++ b/src/java/org/lwjgl/opengl/LinuxDisplay.java @@ -417,14 +417,14 @@ final class LinuxDisplay implements DisplayImplementation { 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()); diff --git a/src/java/org/lwjgl/opengl/MacOSXDisplay.java b/src/java/org/lwjgl/opengl/MacOSXDisplay.java index 2f36bab0..0d5da2e7 100644 --- a/src/java/org/lwjgl/opengl/MacOSXDisplay.java +++ b/src/java/org/lwjgl/opengl/MacOSXDisplay.java @@ -94,7 +94,8 @@ final class MacOSXDisplay implements DisplayImplementation { } } - 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 { diff --git a/src/java/org/lwjgl/opengl/WindowsDisplay.java b/src/java/org/lwjgl/opengl/WindowsDisplay.java index 7602130a..ce2b1de7 100644 --- a/src/java/org/lwjgl/opengl/WindowsDisplay.java +++ b/src/java/org/lwjgl/opengl/WindowsDisplay.java @@ -138,7 +138,6 @@ final class WindowsDisplay implements DisplayImplementation { 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 @@ final class WindowsDisplay implements DisplayImplementation { 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 @@ final class WindowsDisplay implements DisplayImplementation { inAppActivate = true; isFocused = active; if (active) { - if (isFullscreen) { + if (Display.isFullscreen()) { restoreDisplayMode(); } if (parent == null) { @@ -268,9 +266,9 @@ final class WindowsDisplay implements DisplayImplementation { 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 @@ final class WindowsDisplay implements DisplayImplementation { 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 @@ final class WindowsDisplay implements DisplayImplementation { } 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) {