Merge lp:~albaguirre/qtubuntu/migrate-to-papi3 into lp:qtubuntu

[Alberto Aguirre]

Migrate to platform-api 3

Migrate to platform-api 3

These branches will form platform-api 3:
https://code.launchpad.net/~mir-team/platform-api/delete-deprecations/+merge/254170
https://code.launchpad.net/~mir-team/platform-api/remove-mirserver/+merge/262284
https://code.launchpad.net/~vorlon/platform-api/lp.1465958/+merge/262277

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~albaguirre/qtubuntu/migrate-to-papi3]

264. By Alberto Aguirre on 2015-06-23

merge lp:qtubuntu

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~albaguirre/qtubuntu/migrate-to-papi3]

265. By Alberto Aguirre on 2015-06-23

Use mirclient api directly to obtain eglNativeDisplay and display mode resolution.

ua_ui_display_xxx apis no longer exist in platform-api 3

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~albaguirre/qtubuntu/migrate-to-papi3]

266. By Alberto Aguirre on 2015-06-24

Cleanup usage of non-existant platform-api headers and types.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

lgtm

review: Approve

[Andreas Pokorny (andreas-pokorny)]

looks reasonable

review: Approve

[Daniel d'Andrada (dandrader)]

looks ok. works fine.

review: Approve

=== modified file 'debian/control'
--- debian/control	2015-06-17 13:46:39 +0000
+++ debian/control	2015-06-24 17:21:38 +0000
@@ -41,7 +41,7 @@
          ${shlibs:Depends},
          libqt5sensors5,
          qtubuntu-sensors,
-         ubuntu-application-api2-touch,
+         ubuntu-application-api3-touch,
 Description: Qt plugins for Ubuntu Platform API (mobile)
  QtUbuntu is a set of Qt5 components for the Ubuntu Platform API. It contains a
  QPA (Qt Platform Abstraction) plugin based on the Ubuntu Platform API and a
@@ -64,7 +64,7 @@
          ${shlibs:Depends},
          libqt5sensors5,
          qtubuntu-sensors,
-         ubuntu-application-api2-desktop,
+         ubuntu-application-api3-desktop,
 Description: Qt plugins for Ubuntu Platform API (desktop)
  QtUbuntu is a set of Qt5 components for the Ubuntu Platform API. It contains a
  QPA (Qt Platform Abstraction) plugin based on the Ubuntu Platform API and a
 
=== modified file 'src/ubuntumirclient/integration.cpp'
--- src/ubuntumirclient/integration.cpp	2015-02-04 16:14:43 +0000
+++ src/ubuntumirclient/integration.cpp	2015-06-24 17:21:38 +0000
@@ -80,7 +80,7 @@
                "rejected the incoming connection, so check its log file");
 
     // Create default screen.
-    mScreen = new UbuntuScreen;
+    mScreen = new UbuntuScreen(u_application_instance_get_mir_connection(mInstance));
     screenAdded(mScreen);
 
     // Initialize input.
 
=== modified file 'src/ubuntumirclient/integration.h'
--- src/ubuntumirclient/integration.h	2014-09-22 17:29:40 +0000
+++ src/ubuntumirclient/integration.h	2015-06-24 17:21:38 +0000
@@ -25,8 +25,6 @@
 // platform-api
 #include <ubuntu/application/description.h>
 #include <ubuntu/application/instance.h>
-#include <ubuntu/application/ui/options.h>
-#include <ubuntu/application/ui/session.h>
 
 class UbuntuClipboard;
 class UbuntuInput;
@@ -75,8 +73,6 @@
     UApplicationOptions* mOptions;
     UApplicationDescription* mDesc;
     UApplicationInstance* mInstance;
-    UAUiSessionProperties* mProps;
-    UAUiSession* mSession;
 };
 
 #endif // UBUNTU_CLIENT_INTEGRATION_H
 
=== modified file 'src/ubuntumirclient/screen.cpp'
--- src/ubuntumirclient/screen.cpp	2015-03-19 16:22:05 +0000
+++ src/ubuntumirclient/screen.cpp	2015-06-24 17:21:38 +0000
@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <mir_toolkit/mir_client_library.h>
+
 // Qt
 #include <QCoreApplication>
 #include <QtCore/qmath.h>
@@ -27,9 +29,7 @@
 #include "logging.h"
 #include "orientationchangeevent_p.h"
 
-// platform-api
-#include <ubuntu/application/ui/display.h>
-#include <ubuntu/application/ui/options.h>
+#include "memory"
 
 static const int kSwapInterval = 1;
 
@@ -104,8 +104,28 @@
 const QEvent::Type OrientationChangeEvent::mType =
         static_cast<QEvent::Type>(QEvent::registerEventType());
 
-
-UbuntuScreen::UbuntuScreen()
+static const MirDisplayOutput *find_active_output(
+    const MirDisplayConfiguration *conf)
+{
+    const MirDisplayOutput *output = NULL;
+    for (uint32_t d = 0; d < conf->num_outputs; d++)
+    {
+        const MirDisplayOutput *out = conf->outputs + d;
+
+        if (out->used &&
+            out->connected &&
+            out->num_modes &&
+            out->current_mode < out->num_modes)
+        {
+            output = out;
+            break;
+        }
+    }
+
+    return output;
+}
+
+UbuntuScreen::UbuntuScreen(MirConnection *connection)
     : mFormat(QImage::Format_RGB32)
     , mDepth(32)
     , mSurfaceFormat()
@@ -115,10 +135,8 @@
     // Initialize EGL.
     ASSERT(eglBindAPI(EGL_OPENGL_ES_API) == EGL_TRUE);
 
-    UAUiDisplay* u_display = ua_ui_display_new_with_index(0);
-    mEglNativeDisplay = ua_ui_display_get_native_type(u_display);
+    mEglNativeDisplay = mir_connection_get_egl_native_display(connection);
     ASSERT((mEglDisplay = eglGetDisplay(mEglNativeDisplay)) != EGL_NO_DISPLAY);
-    ua_ui_display_destroy(u_display);
     ASSERT(eglInitialize(mEglDisplay, nullptr, nullptr) == EGL_TRUE);
 
     // Configure EGL buffers format.
@@ -156,12 +174,20 @@
     eglSwapInterval(mEglDisplay, swapInterval);
 
     // Get screen resolution.
-    UAUiDisplay* display = ua_ui_display_new_with_index(0);
-    const int kScreenWidth = ua_ui_display_query_horizontal_res(display);
-    const int kScreenHeight = ua_ui_display_query_vertical_res(display);
+    auto configDeleter = [](MirDisplayConfiguration *config) { mir_display_config_destroy(config); };
+    using configUp = std::unique_ptr<MirDisplayConfiguration, decltype(configDeleter)>;
+    configUp displayConfig(mir_connection_create_display_config(connection), configDeleter);
+    ASSERT(displayConfig != nullptr);
+
+    auto const displayOutput = find_active_output(displayConfig.get());
+    ASSERT(displayOutput != nullptr);
+
+    const MirDisplayMode *mode = &displayOutput->modes[displayOutput->current_mode];
+    const int kScreenWidth = mode->horizontal_resolution;
+    const int kScreenHeight = mode->vertical_resolution;
     DASSERT(kScreenWidth > 0 && kScreenHeight > 0);
+
     DLOG("ubuntumirclient: screen resolution: %dx%d", kScreenWidth, kScreenHeight);
-    ua_ui_display_destroy(display);
 
     mGeometry = QRect(0, 0, kScreenWidth, kScreenHeight);
 
 
=== modified file 'src/ubuntumirclient/screen.h'
--- src/ubuntumirclient/screen.h	2015-03-19 16:22:05 +0000
+++ src/ubuntumirclient/screen.h	2015-06-24 17:21:38 +0000
@@ -21,11 +21,13 @@
 #include <QSurfaceFormat>
 #include <EGL/egl.h>
 
+struct MirConnection;
+
 class UbuntuScreen : public QObject, public QPlatformScreen
 {
     Q_OBJECT
 public:
-    UbuntuScreen();
+    UbuntuScreen(MirConnection *connection);
     virtual ~UbuntuScreen();
 
     // QPlatformScreen methods.
 
=== modified file 'src/ubuntumirclient/window.cpp'
--- src/ubuntumirclient/window.cpp	2015-06-02 19:31:40 +0000
+++ src/ubuntumirclient/window.cpp	2015-06-24 17:21:38 +0000
@@ -31,7 +31,6 @@
 
 // Platform API
 #include <ubuntu/application/instance.h>
-#include <ubuntu/application/ui/window.h>
 
 #include <EGL/egl.h>
 
@@ -212,6 +211,8 @@
 {
     DLOG("UbuntuWindow::createWindow (this=%p)", this);
 
+    // FIXME: remove this remnant of an old platform-api enum - needs ubuntu-keyboard update
+    const int SCREEN_KEYBOARD_ROLE = 7;
     // Get surface role and flags.
     QVariant roleVariant = window()->property("role");
     int role = roleVariant.isValid() ? roleVariant.toUInt() : 1;  // 1 is the default role for apps.
@@ -260,7 +261,7 @@
             geometry.x(), geometry.y(), geometry.width(), geometry.height(), title.data());
 
     MirSurfaceSpec *spec;
-    if (role == U_ON_SCREEN_KEYBOARD_ROLE)
+    if (role == SCREEN_KEYBOARD_ROLE)
     {
         spec = mir_connection_create_spec_for_input_method(d->connection, geometry.width(),
             geometry.height(), mir_choose_default_pixel_format(d->connection));