Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
	src/compositor/wayland_wrapper/qwlcompositor.cpp

Change-Id: Ica26e33eb2b77ed5be0e84e8f4256d2e85abfaf5

1 files changed, 40 insertions, 19 deletions

diff --git a/src/client/qwaylanddisplay.cpp b/src/client/qwaylanddisplay.cpp
index 4475356b0..edaac8fed 100644
--- a/src/client/qwaylanddisplay.cpp
+++ b/src/client/qwaylanddisplay.cpp
@@ -56,6 +56,7 @@
 
 #include "qwaylandwindowmanagerintegration_p.h"
 #include "qwaylandshellintegration_p.h"
+#include "qwaylandclientbufferintegration_p.h"
 
 #include "qwaylandextendedoutput_p.h"
 #include "qwaylandextendedsurface_p.h"
@@ -126,8 +127,6 @@ void QWaylandDisplay::setLastKeyboardFocusInputDevice(QWaylandInputDevice *devic
     mLastKeyboardFocusInputDevice = device;
 }
 
-static QWaylandDisplay *display = 0;
-
 QWaylandDisplay::QWaylandDisplay(QWaylandIntegration *waylandIntegration)
     : mWaylandIntegration(waylandIntegration)
     , mLastKeyboardFocusInputDevice(0)
@@ -140,7 +139,6 @@ QWaylandDisplay::QWaylandDisplay(QWaylandIntegration *waylandIntegration)
     , mTextInputManager(0)
     , mHardwareIntegration(0)
 {
-    display = this;
     qRegisterMetaType<uint32_t>("uint32_t");
 
     mEventThreadObject = new QWaylandEventThread(0);
@@ -169,6 +167,8 @@ QWaylandDisplay::QWaylandDisplay(QWaylandIntegration *waylandIntegration)
 
 QWaylandDisplay::~QWaylandDisplay(void)
 {
+    qDeleteAll(mScreens);
+    mScreens.clear();
     delete mDndSelectionHandler.take();
     mEventThread->quit();
     mEventThread->wait();
@@ -177,20 +177,17 @@ QWaylandDisplay::~QWaylandDisplay(void)
 
 void QWaylandDisplay::flushRequests()
 {
-    if (wl_display_dispatch_queue_pending(mDisplay, mEventQueue) == -1 && (errno == EPIPE || errno == ECONNRESET)) {
-        qWarning("The Wayland connection broke. Did the Wayland compositor die?");
-        ::exit(1);
-    }
+    if (wl_display_dispatch_queue_pending(mDisplay, mEventQueue) < 0)
+        mEventThreadObject->checkErrorAndExit();
+
     wl_display_flush(mDisplay);
 }
 
 
 void QWaylandDisplay::blockingReadEvents()
 {
-    if (wl_display_dispatch_queue(mDisplay, mEventQueue) == -1 && (errno == EPIPE || errno == ECONNRESET)) {
-        qWarning("The Wayland connection broke. Did the Wayland compositor die?");
-        ::exit(1);
-    }
+    if (wl_display_dispatch_queue(mDisplay, mEventQueue) < 0)
+        mEventThreadObject->checkErrorAndExit();
 }
 
 QWaylandScreen *QWaylandDisplay::screenForOutput(struct wl_output *output) const
@@ -229,37 +226,39 @@ void QWaylandDisplay::registry_global(uint32_t id, const QString &interface, uin
     struct ::wl_registry *registry = object();
 
     if (interface == QStringLiteral("wl_output")) {
-        mScreens.append(new QWaylandScreen(this, id));
+        QWaylandScreen *screen = new QWaylandScreen(this, id);
+        mScreens.append(screen);
         // We need to get the output events before creating surfaces
         forceRoundTrip();
+        mWaylandIntegration->screenAdded(screen);
     } else if (interface == QStringLiteral("wl_compositor")) {
-        mCompositor.init(registry, id);
+        mCompositor.init(registry, id, 3);
     } else if (interface == QStringLiteral("wl_shm")) {
         mShm = static_cast<struct wl_shm *>(wl_registry_bind(registry, id, &wl_shm_interface,1));
     } else if (interface == QStringLiteral("xdg_shell")
                && qEnvironmentVariableIsSet("QT_WAYLAND_USE_XDG_SHELL")) {
         mShellXdg.reset(new QWaylandXdgShell(registry,id));
     } else if (interface == QStringLiteral("wl_shell")){
-        mShell.reset(new QtWayland::wl_shell(registry, id));
+        mShell.reset(new QtWayland::wl_shell(registry, id, 1));
     } else if (interface == QStringLiteral("wl_seat")) {
         QWaylandInputDevice *inputDevice = new QWaylandInputDevice(this, id);
         mInputDevices.append(inputDevice);
     } else if (interface == QStringLiteral("wl_data_device_manager")) {
         mDndSelectionHandler.reset(new QWaylandDataDeviceManager(this, id));
     } else if (interface == QStringLiteral("qt_output_extension")) {
-        mOutputExtension.reset(new QtWayland::qt_output_extension(registry, id));
+        mOutputExtension.reset(new QtWayland::qt_output_extension(registry, id, 1));
         foreach (QPlatformScreen *screen, screens())
             static_cast<QWaylandScreen *>(screen)->createExtendedOutput();
     } else if (interface == QStringLiteral("qt_surface_extension")) {
-        mWindowExtension.reset(new QtWayland::qt_surface_extension(registry, id));
+        mWindowExtension.reset(new QtWayland::qt_surface_extension(registry, id, 1));
     } else if (interface == QStringLiteral("qt_sub_surface_extension")) {
-        mSubSurfaceExtension.reset(new QtWayland::qt_sub_surface_extension(registry, id));
+        mSubSurfaceExtension.reset(new QtWayland::qt_sub_surface_extension(registry, id, 1));
     } else if (interface == QStringLiteral("qt_touch_extension")) {
         mTouchExtension.reset(new QWaylandTouchExtension(this, id));
     } else if (interface == QStringLiteral("qt_key_extension")) {
         mQtKeyExtension.reset(new QWaylandQtKeyExtension(this, id));
     } else if (interface == QStringLiteral("wl_text_input_manager")) {
-        mTextInputManager.reset(new QtWayland::wl_text_input_manager(registry, id));
+        mTextInputManager.reset(new QtWayland::wl_text_input_manager(registry, id, 1));
     } else if (interface == QStringLiteral("qt_hardware_integration")) {
         mHardwareIntegration.reset(new QWaylandHardwareIntegration(registry, id));
         // make a roundtrip here since we need to receive the events sent by
@@ -276,7 +275,17 @@ void QWaylandDisplay::registry_global(uint32_t id, const QString &interface, uin
 void QWaylandDisplay::registry_global_remove(uint32_t id)
 {
     for (int i = 0, ie = mGlobals.count(); i != ie; ++i) {
-        if (mGlobals[i].id == id) {
+        RegistryGlobal &global = mGlobals[i];
+        if (global.id == id) {
+            if (global.interface == QStringLiteral("wl_output")) {
+                foreach (QWaylandScreen *screen, mScreens) {
+                    if (screen->outputId() == id) {
+                        delete screen;
+                        mScreens.removeOne(screen);
+                        break;
+                    }
+                }
+            }
             mGlobals.removeAt(i);
             break;
         }
@@ -337,4 +346,16 @@ QtWayland::xdg_shell *QWaylandDisplay::shellXdg()
     return mShellXdg.data();
 }
 
+bool QWaylandDisplay::supportsWindowDecoration() const
+{
+    static bool disabled = qgetenv("QT_WAYLAND_DISABLE_WINDOWDECORATION").toInt();
+    // Stop early when disabled via the environment. Do not try to load the integration in
+    // order to play nice with SHM-only, buffer integration-less systems.
+    if (disabled)
+        return false;
+
+    static bool integrationSupport = clientBufferIntegration() && clientBufferIntegration()->supportsWindowDecoration();
+    return integrationSupport;
+}
+
 QT_END_NAMESPACE