1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	src/client/qwaylandwindow.cpp
	src/client/qwaylandwindow_p.h
	src/compositor/compositor_api/qwaylandpointer.cpp

Change-Id: Icbc22a1ae3cdd9cde438742817d07fccf97f647b
This commit is contained in:
Liang Qi 2017-09-27 14:30:08 +02:00
commit bd668a31d6
6 changed files with 133 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/wayland/qwaylandintegration.cpp
View File

@ -359,7 +359,7 @@ void QWaylandIntegration::initializeServerBufferIntegration()
disableHardwareIntegration = disableHardwareIntegration || !mDisplay->hardwareIntegration();
if (disableHardwareIntegration) {
QByteArray serverBufferIntegrationName = qgetenv("QT_WAYLAND_SERVER_BUFFER_INTEGRATION");
QString targetKey = QString::fromLocal8Bit(serverBufferIntegrationName);
targetKey = QString::fromLocal8Bit(serverBufferIntegrationName);
} else {
targetKey = mDisplay->hardwareIntegration()->serverBufferIntegration();
}

6
src/plugins/platforms/wayland/qwaylandscreen.cpp
View File

@ -185,6 +185,12 @@ QWaylandScreen * QWaylandScreen::waylandScreenFromWindow(QWindow *window)
return static_cast<QWaylandScreen *>(platformScreen);
}
QWaylandScreen *QWaylandScreen::fromWlOutput(::wl_output *output)
{
auto wlOutput = static_cast<QtWayland::wl_output *>(wl_output_get_user_data(output));
return static_cast<QWaylandScreen *>(wlOutput);
}
void QWaylandScreen::output_mode(uint32_t flags, int width, int height, int refresh)
{
if (!(flags & WL_OUTPUT_MODE_CURRENT))

1
src/plugins/platforms/wayland/qwaylandscreen_p.h
View File

@ -102,6 +102,7 @@ public:
::wl_output *output() { return object(); }
static QWaylandScreen *waylandScreenFromWindow(QWindow *window);
static QWaylandScreen *fromWlOutput(::wl_output *output);
private:
void output_mode(uint32_t flags, int width, int height, int refresh) override;

97
src/plugins/platforms/wayland/qwaylandwindow.cpp
View File

@ -69,6 +69,8 @@
#include <QtCore/QDebug>
#include <wayland-client-core.h>
QT_BEGIN_NAMESPACE
namespace QtWaylandClient {
@ -78,15 +80,13 @@ QWaylandWindow *QWaylandWindow::mMouseGrab = 0;
QWaylandWindow::QWaylandWindow(QWindow *window)
: QObject()
, QPlatformWindow(window)
, mScreen(QWaylandScreen::waylandScreenFromWindow(window))
, mDisplay(mScreen->display())
, mDisplay(waylandScreen()->display())
, mShellSurface(0)
, mSubSurfaceWindow(0)
, mWindowDecoration(0)
, mMouseEventsInContentArea(false)
, mMousePressedInContentArea(Qt::NoButton)
, mWaitingForFrameSync(false)
, mFrameCallback(nullptr)
, mRequestResizeSent(false)
, mCanResize(true)
, mResizeDirty(false)
@ -100,6 +100,7 @@ QWaylandWindow::QWaylandWindow(QWindow *window)
{
static WId id = 1;
mWindowId = id++;
connect(qApp, &QGuiApplication::screenRemoved, this, &QWaylandWindow::handleScreenRemoved);
initializeWlSurface();
}
@ -349,9 +350,31 @@ void QWaylandWindow::sendExposeEvent(const QRect &rect)
QWindowSystemInterface::handleExposeEvent(window(), rect);
}
static QVector<QPointer<QWaylandWindow>> activePopups;
void QWaylandWindow::closePopups(QWaylandWindow *parent)
{
while (!activePopups.isEmpty()) {
auto popup = activePopups.takeLast();
if (popup.isNull())
continue;
if (popup.data() == parent)
return;
popup->reset();
}
}
QWaylandScreen *QWaylandWindow::calculateScreenFromSurfaceEvents() const
{
return mScreens.isEmpty() ? waylandScreen() : mScreens.first();
}
void QWaylandWindow::setVisible(bool visible)
{
if (visible) {
if (window()->type() == Qt::Popup)
activePopups << this;
initWindow();
mDisplay->flushRequests();
@ -365,6 +388,8 @@ void QWaylandWindow::setVisible(bool visible)
// case 'this' will be deleted. When that happens, we must abort right away.
QPointer<QWaylandWindow> deleteGuard(this);
QWindowSystemInterface::flushWindowSystemEvents();
if (!deleteGuard.isNull() && window()->type() == Qt::Popup)
closePopups(this);
if (!deleteGuard.isNull())
reset();
}
@ -480,14 +505,63 @@ void QWaylandWindow::requestResize()
QWindowSystemInterface::flushWindowSystemEvents();
}
void QWaylandWindow::surface_enter(wl_output *output)
{
QWaylandScreen *oldScreen = calculateScreenFromSurfaceEvents();
auto addedScreen = QWaylandScreen::fromWlOutput(output);
if (mScreens.contains(addedScreen)) {
qWarning() << "Unexpected wl_surface.enter received for output with id:"
<< wl_proxy_get_id(reinterpret_cast<wl_proxy *>(output))
<< "screen name:" << addedScreen->name() << "screen model:" << addedScreen->model();
return;
}
mScreens.append(addedScreen);
QWaylandScreen *newScreen = calculateScreenFromSurfaceEvents();
if (oldScreen != newScreen) //currently this will only happen if the first wl_surface.enter is for a non-primary screen
QWindowSystemInterface::handleWindowScreenChanged(window(), newScreen->QPlatformScreen::screen());
}
void QWaylandWindow::surface_leave(wl_output *output)
{
QWaylandScreen *oldScreen = calculateScreenFromSurfaceEvents();
auto *removedScreen = QWaylandScreen::fromWlOutput(output);
bool wasRemoved = mScreens.removeOne(removedScreen);
if (!wasRemoved) {
qWarning() << "Unexpected wl_surface.leave received for output with id:"
<< wl_proxy_get_id(reinterpret_cast<wl_proxy *>(output))
<< "screen name:" << removedScreen->name() << "screen model:" << removedScreen->model();
return;
}
QWaylandScreen *newScreen = calculateScreenFromSurfaceEvents();
if (oldScreen != newScreen)
QWindowSystemInterface::handleWindowScreenChanged(window(), newScreen->QPlatformScreen::screen());
}
void QWaylandWindow::handleScreenRemoved(QScreen *qScreen)
{
QWaylandScreen *oldScreen = calculateScreenFromSurfaceEvents();
bool wasRemoved = mScreens.removeOne(static_cast<QWaylandScreen *>(qScreen->handle()));
if (wasRemoved) {
QWaylandScreen *newScreen = calculateScreenFromSurfaceEvents();
if (oldScreen != newScreen)
QWindowSystemInterface::handleWindowScreenChanged(window(), newScreen->QPlatformScreen::screen());
}
}
void QWaylandWindow::attach(QWaylandBuffer *buffer, int x, int y)
{
mFrameCallback = nullptr;
if (mFrameCallback) {
wl_callback_destroy(mFrameCallback);
mFrameCallback = nullptr;
}
if (buffer) {
auto callback = frame();
wl_callback_add_listener(callback, &QWaylandWindow::callbackListener, this);
mFrameCallback = callback;
mFrameCallback = frame();
wl_callback_add_listener(mFrameCallback, &QWaylandWindow::callbackListener, this);
mWaitingForFrameSync = true;
buffer->setBusy();
@ -530,8 +604,6 @@ void QWaylandWindow::frameCallback(void *data, struct wl_callback *callback, uin
QWaylandWindow *self = static_cast<QWaylandWindow*>(data);
self->mWaitingForFrameSync = false;
wl_callback_destroy(callback);
self->mFrameCallback.testAndSetRelaxed(callback, nullptr);
if (self->mUpdateRequested) {
QWindowPrivate *w = QWindowPrivate::get(self->window());
self->mUpdateRequested = false;
@ -568,6 +640,11 @@ QWaylandSubSurface *QWaylandWindow::subSurfaceWindow() const
return mSubSurfaceWindow;
}
QWaylandScreen *QWaylandWindow::waylandScreen() const
{
return static_cast<QWaylandScreen *>(QPlatformWindow::screen());
}
void QWaylandWindow::handleContentOrientationChange(Qt::ScreenOrientation orientation)
{
if (mDisplay->compositorVersion() < 2)
@ -832,7 +909,7 @@ void QWaylandWindow::handleMouseEventWithDecoration(QWaylandInputDevice *inputDe
#if QT_CONFIG(cursor)
void QWaylandWindow::setMouseCursor(QWaylandInputDevice *device, const QCursor &cursor)
{
device->setCursor(cursor, mScreen);
device->setCursor(cursor, waylandScreen());
}
void QWaylandWindow::restoreMouseCursor(QWaylandInputDevice *device)

15
src/plugins/platforms/wayland/qwaylandwindow_p.h
View File

@ -53,7 +53,6 @@
#include <QtCore/QWaitCondition>
#include <QtCore/QMutex>
#include <QtCore/QAtomicPointer>
#include <QtGui/QIcon>
#include <QtCore/QVariant>
@ -143,7 +142,7 @@ public:
QWaylandDisplay *display() const { return mDisplay; }
QWaylandShellSurface *shellSurface() const;
QWaylandSubSurface *subSurfaceWindow() const;
QWaylandScreen *waylandScreen() const { return mScreen; }
QWaylandScreen *waylandScreen() const;
void handleContentOrientationChange(Qt::ScreenOrientation orientation) override;
void setOrientationMask(Qt::ScreenOrientations mask);
@ -210,7 +209,10 @@ public slots:
void requestResize();
protected:
QWaylandScreen *mScreen;
void surface_enter(struct ::wl_output *output) override;
void surface_leave(struct ::wl_output *output) override;
QVector<QWaylandScreen *> mScreens; //As seen by wl_surface.enter/leave events. Chronological order.
QWaylandDisplay *mDisplay;
QWaylandShellSurface *mShellSurface;
QWaylandSubSurface *mSubSurfaceWindow;
@ -222,7 +224,7 @@ protected:
WId mWindowId;
bool mWaitingForFrameSync;
QAtomicPointer<struct wl_callback> mFrameCallback;
struct ::wl_callback *mFrameCallback = nullptr;
QWaitCondition mFrameSyncWait;
QMutex mResizeLock;
@ -245,6 +247,9 @@ protected:
QWaylandShmBackingStore *mBackingStore;
private slots:
void handleScreenRemoved(QScreen *qScreen);
private:
bool setWindowStateInternal(Qt::WindowStates flags);
void setGeometry_helper(const QRect &rect);
@ -254,6 +259,8 @@ private:
bool shouldCreateSubSurface() const;
void reset(bool sendDestroyEvent = true);
void sendExposeEvent(const QRect &rect);
static void closePopups(QWaylandWindow *parent);
QWaylandScreen *calculateScreenFromSurfaceEvents() const;
void handleMouseEventWithDecoration(QWaylandInputDevice *inputDevice, const QWaylandPointerEvent &e);

27
tests/auto/wayland/client/tst_client.cpp
View File

@ -142,6 +142,7 @@ private slots:
void backingStore();
void touchDrag();
void mouseDrag();
void dontCrashOnMultipleCommits();
private:
MockCompositor *compositor;
@ -333,6 +334,32 @@ void tst_WaylandClient::mouseDrag()
QTRY_VERIFY(window.dragStarted);
}
void tst_WaylandClient::dontCrashOnMultipleCommits()
{
auto window = new TestWindow();
window->show();
QRect rect(QPoint(), window->size());
QBackingStore backingStore(window);
backingStore.resize(rect.size());
backingStore.beginPaint(rect);
QPainter p(backingStore.paintDevice());
p.fillRect(rect, Qt::magenta);
p.end();
backingStore.endPaint();
backingStore.flush(rect);
backingStore.flush(rect);
backingStore.flush(rect);
compositor->processWaylandEvents();
delete window;
QTRY_VERIFY(!compositor->surface());
}
int main(int argc, char **argv)
{
setenv("XDG_RUNTIME_DIR", ".", 1);