Merge lp:~gerboland/unity-mir/fix-screenshots into lp:unity-mir

[Gerry Boland]

Remove unnecessary Application id, use app_id instead. Fix screenshots to remove white padding pixels. Application only focused when it creates its surface.

Remove unnecessary Application id, use app_id instead. This is needed for lenses to obtain app screenshots.

Fix screenshots to remove white padding pixels, which are due to current implementation detail where all qtubuntu applications are fullscreen, and just draw under the panel.

Application only focused when it creates its surface. Helps shell timings for animations.

[Albert Astals Cid (aacid)]

Looks good, i understand m_panelHeight is just a "hack" for the moment, right?

[Gerry Boland (gerboland)]

> Looks good, i understand m_panelHeight is just a "hack" for the moment, right?

Yep. When platform-api/qtubuntu create surfaces more correctly, this can go away.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:32
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/1/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-i386-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-mir-ci/1/rebuild

review: Needs Fixing (continuous-integration)

[lp:~gerboland/unity-mir/fix-screenshots]

33. By Gerry Boland on 2013-08-14

Merge trunk and fix commit

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:33
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/3/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-ci/3/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-i386-ci/3

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-mir-ci/3/rebuild

review: Approve (continuous-integration)

[lp:~gerboland/unity-mir/fix-screenshots]

34. By Gerry Boland on 2013-08-15

Merge trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:34
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/10/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-ci/10
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-ci/10/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-i386-ci/10

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-mir-ci/10/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

To test, please use the Unity8 in lp:~gerboland/unity8/u8m-animation-fixes

[Michał Sawicz (saviq)]

Yup, works.

review: Approve

=== modified file 'src/modules/Unity/ApplicationManager/application.cpp'
--- src/modules/Unity/ApplicationManager/application.cpp	2013-08-09 13:16:13 +0000
+++ src/modules/Unity/ApplicationManager/application.cpp	2013-08-15 15:37:10 +0000
@@ -37,7 +37,6 @@
     DASSERT(desktopData != NULL);
     DLOG("Application::Application (this=%p, desktopData=%p, pid=%lld, stage=%d, state=%d",
          this, desktopData, pid, static_cast<int>(stage), static_cast<int>(state));
-    m_id = qrand();
 }
 
 Application::~Application()
@@ -46,11 +45,6 @@
     delete m_desktopData;
 }
 
-int Application::id() const
-{
-    return m_id;
-}
-
 QString Application::desktopFile() const
 {
     return m_desktopData->file();

=== modified file 'src/modules/Unity/ApplicationManager/application.h'
--- src/modules/Unity/ApplicationManager/application.h	2013-08-09 13:16:13 +0000
+++ src/modules/Unity/ApplicationManager/application.h	2013-08-15 15:37:10 +0000
@@ -35,7 +35,6 @@
     Q_OBJECT
     Q_ENUMS(Stage)
     Q_ENUMS(State)
-    Q_PROPERTY(int id READ id CONSTANT)
     Q_PROPERTY(QString desktopFile READ desktopFile CONSTANT)
     Q_PROPERTY(QString appId READ appId CONSTANT)
     Q_PROPERTY(QString name READ name CONSTANT)
@@ -54,7 +53,6 @@
     Application(DesktopFileReader* desktopData, qint64 pid, Stage stage, State state);
     ~Application();
 
-    int id() const;
     QString desktopFile() const;
     QString appId() const;
     QString name() const;
@@ -81,7 +79,6 @@
     void setSession(const std::shared_ptr<mir::shell::ApplicationSession>& session);
     void setSessionName(const QString& name);
 
-    int m_id;
     DesktopFileReader* m_desktopData;
     qint64 m_pid;
     Stage m_stage;

=== modified file 'src/modules/Unity/ApplicationManager/application_list_model.cpp'
--- src/modules/Unity/ApplicationManager/application_list_model.cpp	2013-08-15 12:40:41 +0000
+++ src/modules/Unity/ApplicationManager/application_list_model.cpp	2013-08-15 15:37:10 +0000
@@ -122,10 +122,10 @@
     return nullptr;
 }
 
-Application* ApplicationListModel::getApplicationWithId(const int id)
+Application* ApplicationListModel::getApplicationWithAppId(const QString &appId)
 {
     for (Application *app : m_applications) {
-        if (app->m_id == id) {
+        if (app->appId() == appId) {
             return app;
         }
     }

=== modified file 'src/modules/Unity/ApplicationManager/application_list_model.h'
--- src/modules/Unity/ApplicationManager/application_list_model.h	2013-08-09 13:16:13 +0000
+++ src/modules/Unity/ApplicationManager/application_list_model.h	2013-08-15 15:37:10 +0000
@@ -51,7 +51,7 @@
 
     Application* getApplicationWithSession(const std::shared_ptr<mir::shell::Session> &session);
     Application* getApplicationWithSession(const mir::shell::Session *session);
-    Application* getApplicationWithId(const int id);
+    Application* getApplicationWithAppId(const QString &appId);
     Application* getApplicationWithPid(const int pid);
     Application* getLastExecutedApplication();
 

=== modified file 'src/modules/Unity/ApplicationManager/application_manager.cpp'
--- src/modules/Unity/ApplicationManager/application_manager.cpp	2013-08-09 13:16:13 +0000
+++ src/modules/Unity/ApplicationManager/application_manager.cpp	2013-08-15 15:37:10 +0000
@@ -283,11 +283,11 @@
 {
     DLOG("ApplicationManager::sessionFocused (this=%p, application=%s)", this, session->name().c_str());
     Application* application = m_mainStageApplications->getApplicationWithSession(session);
-    if (application && application != m_mainStageFocusedApplication) {
-        m_mainStageFocusedApplication = application;
-        m_mainStageFocusedApplication->setFocus(true);
-        Q_EMIT mainStageFocusedApplicationChanged();
-        m_dbusWindowStack->FocusedWindowChanged(0, application->name(), application->stage());
+
+    // Don't give application focus until it has created it's surface, when it is set as state "Running"
+    if (application && application->state() != Application::Starting
+            && application != m_mainStageFocusedApplication) {
+        setFocused(application);
     }
 }
 
@@ -313,5 +313,16 @@
         application->setState(Application::Running);
 
         m_dbusWindowStack->WindowCreated(0, application->name());
+
+        // only when Session creates a Surface will we actually mark it focused
+        setFocused(application);
     }
 }
+
+void ApplicationManager::setFocused(Application *application)
+{
+    m_mainStageFocusedApplication = application;
+    m_mainStageFocusedApplication->setFocus(true);
+    Q_EMIT mainStageFocusedApplicationChanged();
+    m_dbusWindowStack->FocusedWindowChanged(0, application->name(), application->stage());
+}

=== modified file 'src/modules/Unity/ApplicationManager/application_manager.h'
--- src/modules/Unity/ApplicationManager/application_manager.h	2013-08-09 13:16:13 +0000
+++ src/modules/Unity/ApplicationManager/application_manager.h	2013-08-15 15:37:10 +0000
@@ -101,6 +101,8 @@
     void sessionCreatedSurface(mir::shell::ApplicationSession const*, std::shared_ptr<mir::shell::Surface> const&);
 
 private:
+    void setFocused(Application *application);
+
     ApplicationListModel* m_mainStageApplications;
     Application* m_mainStageFocusedApplication; // remove as Mir has API for this
     ShellServerConfiguration* m_mirServer;

=== modified file 'src/modules/Unity/ApplicationManager/applicationscreenshotprovider.cpp'
--- src/modules/Unity/ApplicationManager/applicationscreenshotprovider.cpp	2013-08-09 13:16:13 +0000
+++ src/modules/Unity/ApplicationManager/applicationscreenshotprovider.cpp	2013-08-15 15:37:10 +0000
@@ -26,10 +26,29 @@
 // mir
 #include "mirserver/mir/shell/application_session.h"
 
+// fallback grid unit used if GRID_UNIT_PX is not in the environment.
+const int defaultGridUnitPx = 8;
+
 ApplicationScreenshotProvider::ApplicationScreenshotProvider(ApplicationManager *appManager)
     : QQuickImageProvider(QQuickImageProvider::Image)
     , m_appManager(appManager)
+    , m_panelHeight(54)
 {
+    // See below to explain why this is needed for now.
+    int gridUnitPx = defaultGridUnitPx;
+
+    QByteArray gridUnitString = qgetenv("GRID_UNIT_PX");
+    if (!gridUnitString.isEmpty()) {
+        bool ok;
+        int value = gridUnitString.toInt(&ok);
+        if (ok) {
+            gridUnitPx = value;
+        }
+    }
+
+    int densityPixelPx = qFloor( (float)gridUnitPx / defaultGridUnitPx );
+
+    m_panelHeight = 3 * gridUnitPx + 2 * densityPixelPx;
 }
 
 QQmlImageProviderBase::Flags ApplicationScreenshotProvider::flags() const
@@ -38,14 +57,14 @@
     return QQmlImageProviderBase::ForceAsynchronousImageLoading;
 }
 
-QImage ApplicationScreenshotProvider::requestImage(const QString & id, QSize * size,
-                                                     const QSize & requestedSize)
+QImage ApplicationScreenshotProvider::requestImage(const QString &appId, QSize * size,
+                                                     const QSize &requestedSize)
 {
-    DLOG("ApplicationScreenshotProvider::requestPixmap (this=%p, id=%s)", this, id.toLatin1().constData());
+    DLOG("ApplicationScreenshotProvider::requestPixmap (this=%p, id=%s)", this, appId.toLatin1().constData());
 
-    Application* app = m_appManager->mainStageApplications()->getApplicationWithId(id.toInt());
+    Application* app = m_appManager->mainStageApplications()->getApplicationWithAppId(appId);
     if (app == NULL) {
-        LOG("ApplicationScreenshotProvider - app with id %d not found", id.toInt());
+        LOG("ApplicationScreenshotProvider - app with appId %s not found", appId.toLatin1().constData());
         return QImage();
     }
 
@@ -54,6 +73,15 @@
         return QImage();
     }
 
+    /* Workaround for bug https://bugs.launchpad.net/qtubuntu/+bug/1209216 - currently all qtubuntu
+     * based applications are allocated a fullscreen Mir surface, but draw in a geometry excluding
+     * the panel's rectangle. Mir snapshots thus have a white rectangle which the panel hides.
+     * So need to clip this rectangle from the snapshot. */
+    int yOffset = 0;
+    if (!app->fullscreen()) {
+        yOffset = m_panelHeight;
+    }
+
     QMutex mutex;
     QWaitCondition wait;
     mutex.lock();
@@ -66,9 +94,9 @@
             DLOG("ApplicationScreenshotProvider - Mir snapshot ready with size %d x %d",
                  snapshot.size.height.as_int(), snapshot.size.width.as_int());
 
-            image = QImage( (const uchar*)snapshot.pixels,
+            image = QImage( (const uchar*)snapshot.pixels, // since we mirror, no need to offset starting position
                             snapshot.size.width.as_int(),
-                            snapshot.size.height.as_int(),
+                            snapshot.size.height.as_int() - yOffset,
                             QImage::Format_ARGB32_Premultiplied).mirrored();
             wait.wakeOne();
         });

=== modified file 'src/modules/Unity/ApplicationManager/applicationscreenshotprovider.h'
--- src/modules/Unity/ApplicationManager/applicationscreenshotprovider.h	2013-08-09 13:16:13 +0000
+++ src/modules/Unity/ApplicationManager/applicationscreenshotprovider.h	2013-08-15 15:37:10 +0000
@@ -26,10 +26,11 @@
     explicit ApplicationScreenshotProvider(ApplicationManager *appManager);
 
     Flags flags() const override;
-    QImage requestImage(const QString & id, QSize * size, const QSize & requestedSize) override;
+    QImage requestImage(const QString &appId, QSize *size, const QSize &requestedSize) override;
 
 private:
     ApplicationManager* m_appManager;
+    int m_panelHeight;
 };
 
 #endif // APPLICATIONSCREENSHOTPROVIDER_H