NEWT/ScreenMode: Fix Bug 456 - Reset to orig ScreenMode when exit (normal or ctrl-c) ; Generics Coding

3 files changed, 121 insertions, 11 deletions

diff --git a/src/test/com/jogamp/opengl/test/junit/newt/ManualScreenMode03NEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/ManualScreenMode03NEWT.java
new file mode 100644
index 000000000..29ec443f7
--- /dev/null
+++ b/src/test/com/jogamp/opengl/test/junit/newt/ManualScreenMode03NEWT.java
@@ -0,0 +1,110 @@
+/**
+ * Copyright 2011 JogAmp Community. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ * 
+ *    1. Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ * 
+ *    2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * The views and conclusions contained in the software and documentation are those of the
+ * authors and should not be interpreted as representing official policies, either expressed
+ * or implied, of JogAmp Community.
+ */
+ 
+package com.jogamp.opengl.test.junit.newt;
+
+import java.io.IOException;
+import javax.media.opengl.GLCapabilities;
+import javax.media.opengl.GLProfile;
+
+import com.jogamp.opengl.util.Animator;
+
+import com.jogamp.newt.Display;
+import com.jogamp.newt.NewtFactory;
+import com.jogamp.newt.Screen;
+import com.jogamp.newt.ScreenMode;
+import com.jogamp.newt.opengl.GLWindow;
+import com.jogamp.newt.util.ScreenModeUtil;
+import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2;
+import com.jogamp.opengl.test.junit.util.UITestCase;
+import java.util.List;
+import javax.media.nativewindow.util.Dimension;
+
+/**
+ * Manual testing the ScreenImpl shutdown hook, 
+ * which shall reset the ScreenMode to it's original state
+ * when the application exists (normal or ctrl-c).
+ */
+public class ManualScreenMode03NEWT extends UITestCase {
+    static int waitTime = 7000; // 1 sec
+    
+    static GLWindow createWindow(Screen screen, GLCapabilities caps, int width, int height, boolean onscreen, boolean undecorated) {
+        caps.setOnscreen(onscreen);
+
+        GLWindow window = GLWindow.create(screen, caps);
+        window.setSize(width, height);
+        window.addGLEventListener(new GearsES2());
+        window.setVisible(true);
+        return window;
+    }
+
+    public void run() {
+        int width  = 640;
+        int height = 480;
+        GLProfile glp = GLProfile.getDefault();
+        GLCapabilities caps = new GLCapabilities(glp);
+        Display display = NewtFactory.createDisplay(null); // local display
+        Screen screen  = NewtFactory.createScreen(display, 0); // screen 0
+        GLWindow window = createWindow(screen, caps, width, height, true /* onscreen */, false /* undecorated */);
+
+        List<ScreenMode> screenModes = screen.getScreenModes();
+        if(null==screenModes) {
+            // no support ..
+            System.err.println("Your platform has no ScreenMode change support, sorry");
+            return;
+        }
+        Animator animator = new Animator(window);
+        animator.start();
+
+        ScreenMode smCurrent = screen.getCurrentScreenMode();
+        ScreenMode smOrig = screen.getOriginalScreenMode();
+        System.err.println("[0] current/orig: "+smCurrent);
+
+        screenModes = ScreenModeUtil.filterByRate(screenModes, smOrig.getMonitorMode().getRefreshRate());
+        screenModes = ScreenModeUtil.filterByRotation(screenModes, 0);
+        screenModes = ScreenModeUtil.filterByResolution(screenModes, new Dimension(801, 601));
+        screenModes = ScreenModeUtil.getHighestAvailableBpp(screenModes);
+
+        ScreenMode sm = (ScreenMode) screenModes.get(0);
+        System.err.println("[0] set current: "+sm);
+        screen.setCurrentScreenMode(sm);
+
+        System.err.print("[0] post setting .. wait <");
+        try {
+            Thread.sleep(waitTime);
+        } catch (InterruptedException e) {
+        }
+        System.err.println("done>");
+        System.exit(0);
+    }
+
+    public static void main(String args[]) throws IOException {
+        ManualScreenMode03NEWT t = new ManualScreenMode03NEWT();
+        t.run();
+    }
+}
diff --git a/src/test/com/jogamp/opengl/test/junit/newt/TestScreenMode01NEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/TestScreenMode01NEWT.java
index 60384b1c2..c84db6081 100644
--- a/src/test/com/jogamp/opengl/test/junit/newt/TestScreenMode01NEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/newt/TestScreenMode01NEWT.java
@@ -46,7 +46,7 @@ import com.jogamp.newt.Window;
 import com.jogamp.newt.ScreenMode;
 import com.jogamp.newt.opengl.GLWindow;
 import com.jogamp.newt.util.ScreenModeUtil;
-import com.jogamp.opengl.test.junit.jogl.demos.gl2.Gears;
+import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2;
 import com.jogamp.opengl.test.junit.util.UITestCase;
 import java.util.List;
 import javax.media.nativewindow.util.Dimension;
@@ -55,8 +55,8 @@ public class TestScreenMode01NEWT extends UITestCase {
     static GLProfile glp;
     static int width, height;
     
-    static int waitTimeShort = 1000; // 1 sec
-    static int waitTimeLong = 5000; // 5 sec
+    static int waitTimeShort = 2000; // 2 sec
+    static int waitTimeLong = 8000; // 8 sec
     
     
 
@@ -74,7 +74,7 @@ public class TestScreenMode01NEWT extends UITestCase {
 
         GLWindow window = GLWindow.create(screen, caps);
         window.setSize(width, height);
-        window.addGLEventListener(new Gears());
+        window.addGLEventListener(new GearsES2());
         Assert.assertNotNull(window);
         window.setVisible(true);
         return window;
@@ -126,7 +126,7 @@ public class TestScreenMode01NEWT extends UITestCase {
         GLWindow window = createWindow(screen, caps, width, height, true /* onscreen */, false /* undecorated */);
         Assert.assertNotNull(window);
 
-        List screenModes = screen.getScreenModes();
+        List<ScreenMode> screenModes = screen.getScreenModes();
         if(null==screenModes) {
             // no support ..
             System.err.println("Your platform has no ScreenMode change support, sorry");
@@ -225,7 +225,7 @@ public class TestScreenMode01NEWT extends UITestCase {
         animator.start();
 
         ScreenMode smOrig = screen.getOriginalScreenMode();
-        List screenModes = screen.getScreenModes();
+        List<ScreenMode> screenModes = screen.getScreenModes();
         if(null==screenModes) {
             // no support ..
             destroyWindow(window);
diff --git a/src/test/com/jogamp/opengl/test/junit/newt/TestScreenMode02NEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/TestScreenMode02NEWT.java
index 26b64945f..a9157a9ee 100644
--- a/src/test/com/jogamp/opengl/test/junit/newt/TestScreenMode02NEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/newt/TestScreenMode02NEWT.java
@@ -46,7 +46,7 @@ import com.jogamp.newt.Window;
 import com.jogamp.newt.ScreenMode;
 import com.jogamp.newt.opengl.GLWindow;
 import com.jogamp.newt.util.ScreenModeUtil;
-import com.jogamp.opengl.test.junit.jogl.demos.gl2.Gears;
+import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2;
 import com.jogamp.opengl.test.junit.util.UITestCase;
 import java.util.List;
 import javax.media.nativewindow.util.Dimension;
@@ -55,8 +55,8 @@ public class TestScreenMode02NEWT extends UITestCase {
     static GLProfile glp;
     static int width, height;
     
-    static int waitTimeShort = 1000; // 1 sec
-    static int waitTimeLong = 5000; // 5 sec
+    static int waitTimeShort = 2000; // 2 sec
+    static int waitTimeLong = 8000; // 8 sec
 
     @BeforeClass
     public static void initClass() {
@@ -72,7 +72,7 @@ public class TestScreenMode02NEWT extends UITestCase {
 
         GLWindow window = GLWindow.create(screen, caps);
         window.setSize(width, height);
-        window.addGLEventListener(new Gears());
+        window.addGLEventListener(new GearsES2());
         Assert.assertNotNull(window);
         window.setVisible(true);
         Assert.assertTrue(window.isVisible());
@@ -98,7 +98,7 @@ public class TestScreenMode02NEWT extends UITestCase {
         GLWindow window = createWindow(screen, caps, width, height, true /* onscreen */, false /* undecorated */);
         Assert.assertNotNull(window);
 
-        List screenModes = screen.getScreenModes();
+        List<ScreenMode> screenModes = screen.getScreenModes();
         if(null==screenModes) {
             // no support ..
             System.err.println("Your platform has no ScreenMode change support, sorry");