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

[Daniel d'Andrada]

Implement support for application state

Adapted code contribution from Sam Segers.

Also brought QWindowSystemInterface::handleWindowActivated() calls together, so they are all made from the same part of the code to ease tracking.

Tested on Nexus 4. Works as expected.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:290
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/280/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/71
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/71/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

+ case ApplicationState:
+ return true;
+ break;
no need to break if you return.

- QWindowSystemInterface::handleWindowActivated(window(), Qt::ActiveWindowFocusReason);
that is a weird line to exist. Alberto added it, with comment "Ignore unfocusing events", would like to know why.

Otherwise code looks ok, need to test

review: Needs Fixing

[lp:~dandrader/qtubuntu/useApplicationStateAPI]

291. By Daniel d'Andrada on 2015-11-20

Remove redundant break

[Daniel d'Andrada (dandrader)]

> + case ApplicationState:
> + return true;
> + break;
> no need to break if you return.

Fixed.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:291
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/281/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/72
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/72/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

Tested on Bq, found no regression in the random selection of app I tried.

review: Approve

=== modified file 'src/ubuntumirclient/input.cpp'
--- src/ubuntumirclient/input.cpp	2015-11-17 12:47:45 +0000
+++ src/ubuntumirclient/input.cpp	2015-11-20 15:43:39 +0000
@@ -240,9 +240,16 @@
             if (focused) {
                 mPendingFocusGainedEvents--;
                 ubuntuEvent->window->handleSurfaceFocused();
+                QWindowSystemInterface::handleWindowActivated(ubuntuEvent->window->window(), Qt::ActiveWindowFocusReason);
+                if (qGuiApp->applicationState() == Qt::ApplicationInactive) {
+                    QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationActive);
+                }
             } else if(!mPendingFocusGainedEvents) {
                 DLOG("[ubuntumirclient QPA] No windows have focus");
                 QWindowSystemInterface::handleWindowActivated(nullptr, Qt::ActiveWindowFocusReason);
+                if (qGuiApp->applicationState() == Qt::ApplicationActive) {
+                    QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationInactive);
+                }
             }
         }
         break;

=== modified file 'src/ubuntumirclient/integration.cpp'
--- src/ubuntumirclient/integration.cpp	2015-10-22 14:17:32 +0000
+++ src/ubuntumirclient/integration.cpp	2015-11-20 15:43:39 +0000
@@ -46,8 +46,11 @@
     Q_UNUSED(options)
     Q_UNUSED(context)
     DASSERT(context != NULL);
-    QCoreApplication::postEvent(QCoreApplication::instance(),
-                                new QEvent(QEvent::ApplicationActivate));
+    if (qGuiApp->focusWindow()) {
+        QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationActive);
+    } else {
+        QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationInactive);
+    }
 }
 
 static void aboutToStopCallback(UApplicationArchive *archive, void* context)
@@ -61,8 +64,7 @@
     } else {
         qWarning("UbuntuClientIntegration aboutToStopCallback(): no input context");
     }
-    QCoreApplication::postEvent(QCoreApplication::instance(),
-                                new QEvent(QEvent::ApplicationDeactivate));
+    QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationSuspended);
 }
 
 UbuntuClientIntegration::UbuntuClientIntegration()
@@ -175,6 +177,9 @@
     case OpenGL:
         return true;
 
+    case ApplicationState:
+        return true;
+
     case ThreadedOpenGL:
         if (qEnvironmentVariableIsEmpty("QTUBUNTU_NO_THREADED_OPENGL")) {
             return true;

=== modified file 'src/ubuntumirclient/window.cpp'
--- src/ubuntumirclient/window.cpp	2015-11-17 13:42:24 +0000
+++ src/ubuntumirclient/window.cpp	2015-11-20 15:43:39 +0000
@@ -534,7 +534,6 @@
     // Therefore let's ensure we are up to date with the system clipboard now that we are getting
     // focused again.
     mClipboard->requestDBusClipboardContents();
-    QWindowSystemInterface::handleWindowActivated(window(), Qt::ActiveWindowFocusReason);
 }
 
 void UbuntuWindow::setWindowState(Qt::WindowState state)