From c74be6eeeb273cd7530ac7e94c3128cb5fa1e420 Mon Sep 17 00:00:00 2001 From: Rami Santina Date: Mon, 18 Oct 2010 23:06:50 +0300 Subject: Added Screen Rotation manipulation API (with X11 impl) Added screen rotation change capability with impl for X11 (using Xrandr) com.jogamp.newt.Screen: added 2 methods which cover screen roation lifecycle setScreenRotation(int rot): Change the Screen Rotation to one of the rotations defined in ScreenMode, namely: ROTATE_0, ROTATE_90, ROTATE_180, ROTATE_270 int getCurrentScreenRotation(): Get the Current screen rotation returns -1 if not implemented natively. +++++++++++++++++++++++++ Notes: 1- At init the original rotation is called natively and cached, when screen is destroyed the rotation is reverted. 2- On X11 with Nvidia: you need to edit /etc/X11/xorg.conf: Add the following line: Option "RandRRotation" "on" in Section "Device" after BoardName. +++++++++++++++ Added TestScreenMode02NEWT which includes 4 tests 1- Rotate 90 2- Rotate 180 3- Rotate 270 4- Rotate with screen mode change should fail if screen rotation not implemented natively. (4) withh fail if screen mode not impl natively as well. --- src/newt/classes/com/jogamp/newt/Screen.java | 13 ++- .../classes/com/jogamp/newt/impl/ScreenImpl.java | 22 ++++- .../classes/com/jogamp/newt/impl/ScreenMode.java | 5 + .../com/jogamp/newt/impl/ScreenModeStatus.java | 25 ++++- .../com/jogamp/newt/impl/x11/X11Screen.java | 36 ++++++- src/newt/native/X11Window.c | 106 ++++++++++++++++++++- 6 files changed, 196 insertions(+), 11 deletions(-) (limited to 'src/newt') diff --git a/src/newt/classes/com/jogamp/newt/Screen.java b/src/newt/classes/com/jogamp/newt/Screen.java index 14de2f0da..ab4b9f0b4 100644 --- a/src/newt/classes/com/jogamp/newt/Screen.java +++ b/src/newt/classes/com/jogamp/newt/Screen.java @@ -30,8 +30,6 @@ package com.jogamp.newt; import com.jogamp.newt.impl.Debug; import com.jogamp.newt.impl.ScreenMode; -import com.jogamp.newt.impl.ScreensModeState; - import javax.media.nativewindow.AbstractGraphicsScreen; public interface Screen { @@ -101,4 +99,15 @@ public interface Screen { * @param rate the desired rate should be one of the available rates. */ void setScreenMode(int modeIndex, short rate); + + /** Change the Screen Rotation to + * one of the rotations defined in ScreenMode + * @param rot rotation id, example ScreenMode.ROTATE_0 + */ + public void setScreenRotation(int rot); + + /** Get the Current screen rotation + * returns -1 if not implemented natively + */ + public int getCurrentScreenRotation(); } diff --git a/src/newt/classes/com/jogamp/newt/impl/ScreenImpl.java b/src/newt/classes/com/jogamp/newt/impl/ScreenImpl.java index 793c278a1..4535213da 100644 --- a/src/newt/classes/com/jogamp/newt/impl/ScreenImpl.java +++ b/src/newt/classes/com/jogamp/newt/impl/ScreenImpl.java @@ -122,7 +122,7 @@ public abstract class ScreenImpl implements Screen { String screenFQN = display.getFQName()+idx; setScreenFQN(screenFQN); ScreenModeStatus screenModeStatus = new ScreenModeStatus(screenFQN , - getDesktopScreenModeIndex(), getCurrentScreenRate()); + getDesktopScreenModeIndex(), getCurrentScreenRate(),getCurrentScreenRotation()); screenModeStatus.setScreenModes(screenModes); screensModeState.setScreenModeController(screenModeStatus); @@ -130,6 +130,7 @@ public abstract class ScreenImpl implements Screen { private void resetScreenMode() { ScreenModeStatus sms = screensModeState.getScreenModeController(getScreenFQN()); + /**Revert the screen mode and rate * to original state of creation */ @@ -137,6 +138,12 @@ public abstract class ScreenImpl implements Screen { setScreenMode(sms.getOriginalScreenMode(), sms.getOriginalScreenRate()); } + /**Revert Screen Rotation + * to original value + */ + if(!sms.isOriginalRotation()) { + setScreenRotation(sms.getOriginalScreenRotation()); + } } public synchronized final void destroy() { @@ -219,6 +226,19 @@ public abstract class ScreenImpl implements Screen { return -1; } + + public void setScreenRotation(int rot) { + + } + + public int getCurrentScreenRotation() { + ScreenModeStatus sms = screensModeState.getScreenModeController(getScreenFQN()); + if(sms != null) { + return sms.getCurrentScreenRotation(); + } + return -1; + } + /** get the screens mode state handler * which contain the screen mode controller of each screen * @return the ScreensModeState static object diff --git a/src/newt/classes/com/jogamp/newt/impl/ScreenMode.java b/src/newt/classes/com/jogamp/newt/impl/ScreenMode.java index 22ed07250..74dd8ebcd 100644 --- a/src/newt/classes/com/jogamp/newt/impl/ScreenMode.java +++ b/src/newt/classes/com/jogamp/newt/impl/ScreenMode.java @@ -1,6 +1,11 @@ package com.jogamp.newt.impl; public class ScreenMode { + public static final int ROTATE_0 = 0; + public static final int ROTATE_90 = 90; + public static final int ROTATE_180 = 180; + public static final int ROTATE_270 = 270; + private int index; private int width; private int height; diff --git a/src/newt/classes/com/jogamp/newt/impl/ScreenModeStatus.java b/src/newt/classes/com/jogamp/newt/impl/ScreenModeStatus.java index b5b95da6a..2ea77c33e 100644 --- a/src/newt/classes/com/jogamp/newt/impl/ScreenModeStatus.java +++ b/src/newt/classes/com/jogamp/newt/impl/ScreenModeStatus.java @@ -6,18 +6,34 @@ public class ScreenModeStatus { private int currentScreenMode = -1; private short currentScreenRate = -1; - + private int currentScreenRotation = -1; + private int originalScreenMode = -1; private short originalScreenRate = -1; + private int originalScreenRotation = -1; public ScreenModeStatus(String screenFQN, int originalScreenMode, - short originalScreenRate) { + short originalScreenRate, int originalScreenRotation) { this.screenFQN = screenFQN; this.originalScreenMode = originalScreenMode; this.originalScreenRate = originalScreenRate; + this.originalScreenRotation = originalScreenRotation; this.currentScreenMode = originalScreenMode; this.currentScreenRate = originalScreenRate; + this.currentScreenRotation = originalScreenRotation; + } + + public void setCurrentScreenRotation(int currentScreenRotation) { + this.currentScreenRotation = currentScreenRotation; + } + + public int getCurrentScreenRotation() { + return currentScreenRotation; + } + + public int getOriginalScreenRotation() { + return originalScreenRotation; } public int getCurrentScreenMode() { @@ -57,6 +73,11 @@ public class ScreenModeStatus { return true; return false; } + public boolean isOriginalRotation(){ + if(currentScreenRotation == originalScreenRotation) + return true; + return false; + } public int getOriginalScreenMode() { return originalScreenMode; diff --git a/src/newt/classes/com/jogamp/newt/impl/x11/X11Screen.java b/src/newt/classes/com/jogamp/newt/impl/x11/X11Screen.java index 79ccf5a7d..f01ffdea4 100644 --- a/src/newt/classes/com/jogamp/newt/impl/x11/X11Screen.java +++ b/src/newt/classes/com/jogamp/newt/impl/x11/X11Screen.java @@ -98,7 +98,7 @@ public class X11Screen extends ScreenImpl { } - setScreenMode0(display.getHandle(), idx, selectedMode, selectedRate); + setScreenMode0(display.getHandle(), idx, selectedMode, selectedRate, getCurrentScreenRotation()); sms.setCurrentScreenMode(selectedMode); sms.setCurrentScreenRate(selectedRate); } @@ -145,6 +145,35 @@ public class X11Screen extends ScreenImpl { return screenMode; } + public void setScreenRotation(int rot) { + if(!isRotationValid(rot)){ + return; + } + ScreenModeStatus sms = screensModeState.getScreenModeController(getScreenFQN()); + setScreenRotation0(display.getHandle(), idx, rot); + sms.setCurrentScreenRotation(rot); + } + + /** Check if this rotation is valid for platform + * @param rot user requested rotation angle + * @return true if is valid + */ + private boolean isRotationValid(int rot){ + if((rot == ScreenMode.ROTATE_0) || (rot == ScreenMode.ROTATE_90) || + (rot == ScreenMode.ROTATE_180) || (rot == ScreenMode.ROTATE_270)) { + return true; + } + return false; + } + + public int getCurrentScreenRotation() { + int rotation = super.getCurrentScreenRotation(); + if(rotation == -1){ + rotation = getCurrentScreenRotation0(display.getHandle(), idx); + } + return rotation; + } + //---------------------------------------------------------------------- // Internals only // @@ -156,7 +185,10 @@ public class X11Screen extends ScreenImpl { private native int getDesktopScreenModeIndex0(long display, int screen_index); private native short getCurrentScreenRate0(long display, int screen_index); - private native void setScreenMode0(long display, int screen_index, int mode_index, short freq); + private native int getCurrentScreenRotation0(long display, int screen_index); + private native void setScreenRotation0(long display, int screen_index, int rot); + + private native void setScreenMode0(long display, int screen_index, int mode_index, short freq, int rot); private native int[] getScreenMode0(long display, int screen_index, int mode_index); private native int getNumScreenModes0(long display, int screen_index); diff --git a/src/newt/native/X11Window.c b/src/newt/native/X11Window.c index 26bce0c63..7fcbd83da 100644 --- a/src/newt/native/X11Window.c +++ b/src/newt/native/X11Window.c @@ -756,16 +756,30 @@ JNIEXPORT jint JNICALL Java_com_jogamp_newt_impl_x11_X11Screen_getDesktopScreenM return (jint)original_size_id; } -static void X11Screen_changeScreenMode(Display* dpy, Window root, int screen_indx, XRRScreenSize *xrrs, int screenModeIndex, short freq) +static void X11Screen_changeScreenMode(Display* dpy, Window root, int screen_indx, XRRScreenSize *xrrs, int screenModeIndex, short freq, int rotation) { int num_rates; //number of available rates for selected mode index short *rates = XRRRates(dpy, screen_indx, screenModeIndex, &num_rates); XRRScreenConfiguration *conf = XRRGetScreenInfo(dpy, root); + int rot = RR_Rotate_0; + + if(rotation == 90) + { + rot = RR_Rotate_90; + } + else if(rotation == 180) + { + rot = RR_Rotate_180; + } + else if(rotation == 270) + { + rot = RR_Rotate_270; + } // Change the resolution DBG_PRINT("\nCHANGED TO %i x %i PIXELS, %i Hz\n\n", xrrs[screenModeIndex].width, xrrs[screenModeIndex].height, selectedFreq); - XRRSetScreenConfigAndRate(dpy, conf, root, screenModeIndex, RR_Rotate_0, freq, CurrentTime); + XRRSetScreenConfigAndRate(dpy, conf, root, screenModeIndex, rot, freq, CurrentTime); //free XRRFreeScreenConfigInfo(conf); @@ -777,7 +791,7 @@ static void X11Screen_changeScreenMode(Display* dpy, Window root, int screen_ind * Signature: (JIIS)V */ JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_x11_X11Screen_setScreenMode0 - (JNIEnv *env, jobject object, jlong display, jint scrn_indx, jint mode_indx, jshort freq) + (JNIEnv *env, jobject object, jlong display, jint scrn_indx, jint mode_indx, jshort freq, jint rotation) { Display *dpy = (Display *) (intptr_t) display; Window root = RootWindow(dpy, (int)scrn_indx); @@ -792,7 +806,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_x11_X11Screen_setScreenMode0 return; } - X11Screen_changeScreenMode(dpy, root, (int)scrn_indx, xrrs, screenModeIndex, (short)freq); + X11Screen_changeScreenMode(dpy, root, (int)scrn_indx, xrrs, screenModeIndex, (short)freq, (int)rotation); } #define NUM_SCREEN_MODE_PROPERTIES 3 @@ -885,6 +899,90 @@ JNIEXPORT jshort JNICALL Java_com_jogamp_newt_impl_x11_X11Screen_getCurrentScree return original_rate; } +/* + * Class: com_jogamp_newt_impl_x11_X11Screen + * Method: getCurrentScreenRotation0 + * Signature: (JI)I + */ +JNIEXPORT jint JNICALL Java_com_jogamp_newt_impl_x11_X11Screen_getCurrentScreenRotation0 + (JNIEnv *env, jobject object, jlong display, jint scrn_indx) +{ + Display *dpy = (Display *) (intptr_t) display; + Window root = RootWindow(dpy, (int)scrn_indx); + + //get current resolutions and frequencies + XRRScreenConfiguration *conf = XRRGetScreenInfo(dpy, root); + + Rotation rotation; + XRRConfigCurrentConfiguration(conf, &rotation); + + //free + XRRFreeScreenConfigInfo(conf); + + int rot = -1; + + if(rotation == RR_Rotate_0) { + rot = 0; + } + else if(rotation == RR_Rotate_90) { + rot = 90; + } + else if(rotation == RR_Rotate_180) { + rot = 180; + } + else if(rotation == RR_Rotate_270) { + rot = 270; + } + + return rot; +} + +/* + * Class: com_jogamp_newt_impl_x11_X11Screen + * Method: setScreenRotation0 + * Signature: (JII)V + */ +JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_x11_X11Screen_setScreenRotation0 + (JNIEnv *env, jobject object, jlong display, jint scrn_indx, jint rotation) +{ + Display *dpy = (Display *) (intptr_t) display; + Window root = RootWindow(dpy, (int)scrn_indx); + + int rot = -1; + + if(rotation == 0) + { + rot = RR_Rotate_0; + } + else if(rotation == 90) + { + rot = RR_Rotate_90; + } + else if(rotation == 180) + { + rot = RR_Rotate_180; + } + else if(rotation == 270) + { + rot = RR_Rotate_270; + } + else + { + return; + } + + XRRScreenConfiguration *conf = XRRGetScreenInfo(dpy, root); + + Rotation current_rotation; + SizeID current_mode_id = XRRConfigCurrentConfiguration(conf, ¤t_rotation); + short current_rate = XRRConfigCurrentRate(conf); + + XRRSetScreenConfigAndRate(dpy, conf, root, current_mode_id, rot, current_rate, CurrentTime); + + //free + XRRFreeScreenConfigInfo(conf); +} + /** * Window */ -- cgit v1.2.3