Merge lp:~dandrader/qtubuntu/shellRotation into lp:qtubuntu

[Daniel d'Andrada]

Flip screen dimensions to compensate for a rotated window

And unify logging switch in input.cpp

Part of the "shell rotation" feature.

For its changes to have any effect it needs all other branches present in this PPA:
https://launchpad.net/~unity-team/+archive/ubuntu/demo-stuff

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:251
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/178/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-vivid-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-vivid-armhf-ci/4/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-ci/178/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

+ } break;
break on new line please;

+ // The window aspect ratio differ's from the screen one. This means that
+ // unity8 has rotated the window in its scene.
Only for phone though, for tablet/desktop case this will be far from correct. Dash on desktop with this is rotated 90 degrees with this change. We can't regress the desktop.

Instead of guessing based on window & screen geometry, we need a better way to notify Qt that the Screen orientation actually changed. Mir's DisplayConfiguration is an option, if we can make it work.

You're welcome to find a hack to fix tablet/desktop case, but this is definitely something we need to fix properly when Mir allows us to.

review: Needs Fixing

[Daniel d'Andrada (dandrader)]

On 19/11/14 15:32, Gerry Boland wrote:
> [...]
> Only for phone though, for tablet/desktop case this will be far from correct. Dash on desktop with this is rotated 90 degrees with this change. We can't regress the desktop.
>

Dash on desktop is rotated 90 degrees because in OrientedShell.qml,
"primaryOrientation: Qt.PortraitOrientation".

[Daniel d'Andrada (dandrader)]

On 19/11/14 16:03, Daniel d'Andrada wrote:
> On 19/11/14 15:32, Gerry Boland wrote:
>> [...]
>> Only for phone though, for tablet/desktop case this will be far from correct. Dash on desktop with this is rotated 90 degrees with this change. We can't regress the desktop.
>>
> Dash on desktop is rotated 90 degrees because in OrientedShell.qml,
> "primaryOrientation: Qt.PortraitOrientation".
>
Or maybe not. I've to actually try the stuff on something other than
phone to stop guessing.

[Gerry Boland (gerboland)]

+ } break;
break on new line please;

Code is functional otherwise, so ok to approve

[Daniel d'Andrada (dandrader)]

> + } break;
> break on new line please;

Done.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:252
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/179/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-vivid-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-vivid-armhf-ci/5/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-ci/179/rebuild

review: Approve (continuous-integration)

[lp:~dandrader/qtubuntu/shellRotation]

251. By Robert Carr on 2014-12-12

Utilize repeat_count value from Mir in constructing QKeyEvents. Fixes: #1349416
Approved by: Daniel d'Andrada, PS Jenkins bot

252. By Gerry Boland on 2014-12-12

Fix raster-based (QWidget) application rendering.

Replace the QOpenGLPainter-based renderer with a CPU-bound pixmap one (on advice from Qt developers due to (a) it being unreliable and (b) not rendering perfectly).
Approved by: Michael Zanetti, PS Jenkins bot

253. By CI Train Bot Account on 2014-12-12

Releasing 0.60+15.04.20141212-0ubuntu1

254. By Daniel d'Andrada on 2015-01-12

Flip screen dimensions to compensate for a rotated window

And unify logging switch in input.cpp

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:254
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/181/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-vivid-armhf-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-vivid-armhf-ci/7/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-ci/181/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

FTBFS: http://pastebin.ubuntu.com/10518473/

review: Needs Fixing

[lp:~dandrader/qtubuntu/shellRotation]

255. By Daniel d'Andrada on 2015-03-04

Adapt to changes in Qt's platform API

[Daniel d'Andrada (dandrader)]

> FTBFS: http://pastebin.ubuntu.com/10518473/

Fixed.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:255
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/198/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-vivid-armhf-ci/24
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-vivid-armhf-ci/24/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-ci/198/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

LGTM. LP claims debian/changelog has a conflict, but trying manually it merges fine

review: Approve

[lp:~dandrader/qtubuntu/shellRotation]

256. By Daniel d'Andrada on 2015-03-19

Merge trunk

[ Alberto Aguirre ]
* Port qtubuntu to direct mirclient usage for window creation and
  input handling.
[ Daniel d'Andrada ]
* Port qtubuntu to direct mirclient usage for window creation and
  input handling.
[ Robert Carr ]
* Port qtubuntu to direct mirclient usage for window creation and
  input handling.
* No-change rebuild against Qt 5.4.1.
* No-change rebuild against Qt 5.4.0.

257. By Daniel d'Andrada on 2015-03-19

Remove unused variable

[Michał Sawicz (saviq)]

Are these changes backwards-compatible? If not, we need to add versioned Breaks/Depends as needed.

review: Needs Information

[Daniel d'Andrada (dandrader)]

> Are these changes backwards-compatible? If not, we need to add versioned
> Breaks/Depends as needed.

Yes, they are.
If you install only qtubuntu/shellRotation, without unity8/shellRotation and qtmir/supportedOrientations, it all keeps working normally.

=== modified file 'debian/changelog'
--- debian/changelog	2015-03-18 10:12:48 +0000
+++ debian/changelog	2015-03-19 16:22:37 +0000
@@ -1,3 +1,9 @@
+qtubuntu (0.61) UNRELEASED; urgency=medium
+
+  * Flip screen dimensions to compensate for a rotated window
+
+ -- Daniel d'Andrada <[e-mail]>  Fri, 31 Oct 2014 16:39:11 -0200
+
 qtubuntu (0.60+15.04.20150318-0ubuntu1) vivid; urgency=medium
 
   [ Alberto Aguirre ]

=== modified file 'src/ubuntumirclient/input.cpp'
--- src/ubuntumirclient/input.cpp	2015-02-17 17:39:47 +0000
+++ src/ubuntumirclient/input.cpp	2015-03-19 16:22:37 +0000
@@ -219,7 +219,14 @@
         break;
     case mir_event_type_resize:
     {
+        Q_ASSERT(ubuntuEvent->window->screen() == mIntegration->screen());
+
         auto resizeEvent = mir_event_get_resize_event(nativeEvent);
+
+        mIntegration->screen()->handleWindowSurfaceResize(
+                mir_resize_event_get_width(resizeEvent),
+                mir_resize_event_get_height(resizeEvent));
+
         ubuntuEvent->window->handleSurfaceResize(mir_resize_event_get_width(resizeEvent),
             mir_resize_event_get_height(resizeEvent));
         break;

=== modified file 'src/ubuntumirclient/screen.cpp'
--- src/ubuntumirclient/screen.cpp	2014-09-09 14:10:21 +0000
+++ src/ubuntumirclient/screen.cpp	2015-03-19 16:22:37 +0000
@@ -34,6 +34,24 @@
 static const int kSwapInterval = 1;
 
 #if !defined(QT_NO_DEBUG)
+
+static const char *orientationToStr(Qt::ScreenOrientation orientation) {
+    switch (orientation) {
+        case Qt::PrimaryOrientation:
+            return "primary";
+        case Qt::PortraitOrientation:
+            return "portrait";
+        case Qt::LandscapeOrientation:
+            return "landscape";
+        case Qt::InvertedPortraitOrientation:
+            return "inverted portrait";
+        case Qt::InvertedLandscapeOrientation:
+            return "inverted landscape";
+        default:
+            return "INVALID!";
+    }
+}
+
 static void printEglConfig(EGLDisplay display, EGLConfig config) {
   DASSERT(display != EGL_NO_DISPLAY);
   DASSERT(config != nullptr);
@@ -146,12 +164,11 @@
     ua_ui_display_destroy(display);
 
     mGeometry = QRect(0, 0, kScreenWidth, kScreenHeight);
-    mAvailableGeometry = QRect(0, 0, kScreenWidth, kScreenHeight);
 
     DLOG("QUbuntuScreen::QUbuntuScreen (this=%p)", this);
 
     // Set the default orientation based on the initial screen dimmensions.
-    mNativeOrientation = (mAvailableGeometry.width() >= mAvailableGeometry.height()) ? Qt::LandscapeOrientation : Qt::PortraitOrientation;
+    mNativeOrientation = (mGeometry.width() >= mGeometry.height()) ? Qt::LandscapeOrientation : Qt::PortraitOrientation;
 
     // If it's a landscape device (i.e. some tablets), start in landscape, otherwise portrait
     mCurrentOrientation = (mNativeOrientation == Qt::LandscapeOrientation) ? Qt::LandscapeOrientation : Qt::PortraitOrientation;
@@ -168,22 +185,22 @@
     OrientationChangeEvent* oReadingEvent = static_cast<OrientationChangeEvent*>(event);
     switch (oReadingEvent->mOrientation) {
         case QOrientationReading::LeftUp: {
-            mCurrentOrientation = (mNativeOrientation == Qt::LandscapeOrientation) ?
+            mCurrentOrientation = (screen()->primaryOrientation() == Qt::LandscapeOrientation) ?
                         Qt::InvertedPortraitOrientation : Qt::LandscapeOrientation;
             break;
         }
         case QOrientationReading::TopUp: {
-            mCurrentOrientation = (mNativeOrientation == Qt::LandscapeOrientation) ?
+            mCurrentOrientation = (screen()->primaryOrientation() == Qt::LandscapeOrientation) ?
                         Qt::LandscapeOrientation : Qt::PortraitOrientation;
             break;
         }
         case QOrientationReading::RightUp: {
-            mCurrentOrientation = (mNativeOrientation == Qt::LandscapeOrientation) ?
+            mCurrentOrientation = (screen()->primaryOrientation() == Qt::LandscapeOrientation) ?
                         Qt::PortraitOrientation : Qt::InvertedLandscapeOrientation;
             break;
         }
         case QOrientationReading::TopDown: {
-            mCurrentOrientation = (mNativeOrientation == Qt::LandscapeOrientation) ?
+            mCurrentOrientation = (screen()->primaryOrientation() == Qt::LandscapeOrientation) ?
                         Qt::InvertedLandscapeOrientation : Qt::InvertedPortraitOrientation;
             break;
         }
@@ -194,6 +211,39 @@
     }
 
     // Raise the event signal so that client apps know the orientation changed
+    DLOG("UbuntuScreen::customEvent - handling orientation change to %s", orientationToStr(mCurrentOrientation));
     QWindowSystemInterface::handleScreenOrientationChange(screen(), mCurrentOrientation);
-    DLOG("UbuntuScreen::customEvent - handling orientation change to %d", mCurrentOrientation);
+}
+
+void UbuntuScreen::handleWindowSurfaceResize(int windowWidth, int windowHeight)
+{
+    if ((windowWidth > windowHeight && mGeometry.width() < mGeometry.height())
+     || (windowWidth < windowHeight && mGeometry.width() > mGeometry.height())) {
+
+        // The window aspect ratio differ's from the screen one. This means that
+        // unity8 has rotated the window in its scene.
+        // As there's no way to express window rotation in Qt's API, we have
+        // Flip QScreen's dimensions so that orientation properties match
+        // (primaryOrientation particularly).
+        // FIXME: This assumes a phone scenario. Won't work, or make sense,
+        //        on the desktop
+
+        QRect currGeometry = mGeometry;
+        mGeometry.setWidth(currGeometry.height());
+        mGeometry.setHeight(currGeometry.width());
+
+        DLOG("UbuntuScreen::handleWindowSurfaceResize - new screen geometry (w=%d, h=%d)",
+            mGeometry.width(), mGeometry.height());
+        QWindowSystemInterface::handleScreenGeometryChange(screen(),
+                                                           mGeometry /* newGeometry */,
+                                                           mGeometry /* newAvailableGeometry */);
+
+        if (mGeometry.width() < mGeometry.height()) {
+            mCurrentOrientation = Qt::PortraitOrientation;
+        } else {
+            mCurrentOrientation = Qt::LandscapeOrientation;
+        }
+        DLOG("UbuntuScreen::handleWindowSurfaceResize - new orientation %s",orientationToStr(mCurrentOrientation));
+        QWindowSystemInterface::handleScreenOrientationChange(screen(), mCurrentOrientation);
+    }
 }

=== modified file 'src/ubuntumirclient/screen.h'
--- src/ubuntumirclient/screen.h	2014-08-25 15:24:02 +0000
+++ src/ubuntumirclient/screen.h	2015-03-19 16:22:37 +0000
@@ -32,7 +32,7 @@
     QImage::Format format() const override { return mFormat; }
     int depth() const override { return mDepth; }
     QRect geometry() const override { return mGeometry; }
-    QRect availableGeometry() const override { return mAvailableGeometry; }
+    QRect availableGeometry() const override { return mGeometry; }
     Qt::ScreenOrientation nativeOrientation() const override { return mNativeOrientation; }
     Qt::ScreenOrientation orientation() const override { return mNativeOrientation; }
 
@@ -41,13 +41,13 @@
     EGLDisplay eglDisplay() const { return mEglDisplay; }
     EGLConfig eglConfig() const { return mEglConfig; }
     EGLNativeDisplayType eglNativeDisplay() const { return mEglNativeDisplay; }
+    void handleWindowSurfaceResize(int width, int height);
 
     // QObject methods.
     void customEvent(QEvent* event);
 
 private:
     QRect mGeometry;
-    QRect mAvailableGeometry;
     Qt::ScreenOrientation mNativeOrientation;
     Qt::ScreenOrientation mCurrentOrientation;
     QImage::Format mFormat;