NEWT ScreenMode: Use unified ScreenMode in impl; X11Screen: Be verbose if TO reached, ie not successfully changed mode.

2 files changed, 7 insertions, 7 deletions

diff --git a/src/newt/classes/jogamp/newt/ScreenImpl.java b/src/newt/classes/jogamp/newt/ScreenImpl.java
index 252be7cfd..6ea9aff38 100644
--- a/src/newt/classes/jogamp/newt/ScreenImpl.java
+++ b/src/newt/classes/jogamp/newt/ScreenImpl.java
@@ -346,32 +346,32 @@ public abstract class ScreenImpl extends Screen implements ScreenModeListener {
         try {
             long t0=0, t1=0;
             if(DEBUG) {
-                System.err.println("Screen.setCurrentScreenMode ("+(System.currentTimeMillis()-t0)+"): 0.0 "+screenMode);
+                System.err.println("Screen.setCurrentScreenMode ("+(System.currentTimeMillis()-t0)+"): 0.0 "+smU);
                 t0 = System.currentTimeMillis();
             }                
 
             sms.fireScreenModeChangeNotify(smU);
 
             if(DEBUG) {
-                System.err.println("Screen.setCurrentScreenMode ("+(System.currentTimeMillis()-t0)+"): 0.1 "+screenMode);
+                System.err.println("Screen.setCurrentScreenMode ("+(System.currentTimeMillis()-t0)+"): 0.1 "+smU);
                 t1 = System.currentTimeMillis();
             }
 
             success = setCurrentScreenModeImpl(smU);                    
             if(success) {
-                setScreenSize(screenMode.getRotatedWidth(), screenMode.getRotatedHeight());
+                setScreenSize(smU.getRotatedWidth(), smU.getRotatedHeight());
             }
             
             if(DEBUG) {
                 t1 = System.currentTimeMillis() - t1;
-                System.err.println("Screen.setCurrentScreenMode ("+(System.currentTimeMillis()-t0)+"): X.0 "+screenMode+", success: "+success);
+                System.err.println("Screen.setCurrentScreenMode ("+(System.currentTimeMillis()-t0)+"): X.0 "+smU+", success: "+success);
             }
 
             sms.fireScreenModeChanged(smU, success);
                             
             if(DEBUG) {
                 t0 = System.currentTimeMillis() - t0;
-                System.err.println("Screen.setCurrentScreenMode ("+(System.currentTimeMillis()-t0)+"): X.X "+screenMode+", success: "+success+
+                System.err.println("Screen.setCurrentScreenMode ("+(System.currentTimeMillis()-t0)+"): X.X "+smU+", success: "+success+
                                    " - dt0 "+t0+"ms, dt1 "+t1+"ms");
             }
         } finally {
diff --git a/src/newt/classes/jogamp/newt/driver/x11/X11Screen.java b/src/newt/classes/jogamp/newt/driver/x11/X11Screen.java
index d4eac9b07..463c62eba 100644
--- a/src/newt/classes/jogamp/newt/driver/x11/X11Screen.java
+++ b/src/newt/classes/jogamp/newt/driver/x11/X11Screen.java
@@ -247,9 +247,9 @@ public class X11Screen extends ScreenImpl {
             }            
         }).booleanValue();
         
-        if(DEBUG && done) {
+        if(DEBUG || !done) {
             System.err.println("X11Screen.setCurrentScreenModeImpl: TO ("+SCREEN_MODE_CHANGE_TIMEOUT+") reached: "+
-                               (System.currentTimeMillis()-t0)+"ms");
+                               (System.currentTimeMillis()-t0)+"ms; Current: "+getCurrentScreenMode()+"; Desired: "+screenMode);
         }
         return done;
     }