Added Wayland selection support.

This commit is contained in:
Laszlo Agocs 2011-05-06 18:36:43 +02:00
parent 82444f5dff
commit 4973c2669a
13 changed files with 367 additions and 3 deletions

View File

@ -112,6 +112,7 @@ protected:
friend class QBaseApplication; friend class QBaseApplication;
friend class QDragManager; friend class QDragManager;
friend class QMimeSource; friend class QMimeSource;
friend class QPlatformClipboard;
private: private:
Q_DISABLE_COPY(QClipboard) Q_DISABLE_COPY(QClipboard)

View File

@ -42,6 +42,8 @@
#ifndef QT_NO_CLIPBOARD #ifndef QT_NO_CLIPBOARD
#include <QtGui/private/qapplication_p.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QClipboardData class QClipboardData
@ -100,6 +102,11 @@ bool QPlatformClipboard::supportsMode(QClipboard::Mode mode) const
return mode == QClipboard::Clipboard; return mode == QClipboard::Clipboard;
} }
void QPlatformClipboard::emitChanged(QClipboard::Mode mode)
{
QApplication::clipboard()->emitChanged(mode);
}
QT_END_NAMESPACE QT_END_NAMESPACE
#endif //QT_NO_CLIPBOARD #endif //QT_NO_CLIPBOARD

View File

@ -62,6 +62,7 @@ public:
virtual const QMimeData *mimeData(QClipboard::Mode mode = QClipboard::Clipboard ) const; virtual const QMimeData *mimeData(QClipboard::Mode mode = QClipboard::Clipboard ) const;
virtual void setMimeData(QMimeData *data, QClipboard::Mode mode = QClipboard::Clipboard); virtual void setMimeData(QMimeData *data, QClipboard::Mode mode = QClipboard::Clipboard);
virtual bool supportsMode(QClipboard::Mode mode) const; virtual bool supportsMode(QClipboard::Mode mode) const;
void emitChanged(QClipboard::Mode mode);
}; };
QT_END_NAMESPACE QT_END_NAMESPACE

View File

@ -0,0 +1,242 @@
/****************************************************************************
**
** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the plugins of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** No Commercial Usage
** This file contains pre-release code and may not be distributed.
** You may use this file in accordance with the terms and conditions
** contained in the Technology Preview License Agreement accompanying
** this package.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** If you have questions regarding the use of this file, please contact
** Nokia at qt-info@nokia.com.
**
**
**
**
**
**
**
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include "qwaylandclipboard.h"
#include "qwaylanddisplay.h"
#include "qwaylandinputdevice.h"
#include <QtGui/QPlatformNativeInterface>
#include <QtGui/QApplication>
#include <QtCore/QMimeData>
#include <QtCore/QStringList>
#include <QtCore/QFile>
#include <QtCore/QtDebug>
static QWaylandClipboard *clipboard;
class QWaylandSelection
{
public:
QWaylandSelection(QWaylandDisplay *display, QMimeData *data);
~QWaylandSelection();
private:
static uint32_t getTime();
static void send(void *data, struct wl_selection *selection, const char *mime_type, int fd);
static void cancelled(void *data, struct wl_selection *selection);
static const struct wl_selection_listener selectionListener;
QMimeData *mMimeData;
struct wl_selection *mSelection;
};
const struct wl_selection_listener QWaylandSelection::selectionListener = {
QWaylandSelection::send,
QWaylandSelection::cancelled
};
uint32_t QWaylandSelection::getTime()
{
struct timeval tv;
gettimeofday(&tv, 0);
return tv.tv_sec * 1000 + tv.tv_usec / 1000;
}
QWaylandSelection::QWaylandSelection(QWaylandDisplay *display, QMimeData *data)
: mMimeData(data), mSelection(0)
{
struct wl_shell *shell = display->wl_shell();
mSelection = wl_shell_create_selection(shell);
wl_selection_add_listener(mSelection, &selectionListener, this);
foreach (const QString &format, data->formats())
wl_selection_offer(mSelection, format.toLatin1().constData());
wl_selection_activate(mSelection,
display->inputDevices().at(0)->wl_input_device(),
getTime());
}
QWaylandSelection::~QWaylandSelection()
{
if (mSelection) {
clipboard->unregisterSelection(this);
wl_selection_destroy(mSelection);
}
delete mMimeData;
}
void QWaylandSelection::send(void *data,
struct wl_selection *selection,
const char *mime_type,
int fd)
{
Q_UNUSED(selection);
QWaylandSelection *self = static_cast<QWaylandSelection *>(data);
QString mimeType = QString::fromLatin1(mime_type);
QByteArray content = self->mMimeData->data(mimeType);
if (!content.isEmpty()) {
QFile f;
if (f.open(fd, QIODevice::WriteOnly))
f.write(content);
}
close(fd);
}
void QWaylandSelection::cancelled(void *data, struct wl_selection *selection)
{
Q_UNUSED(selection);
delete static_cast<QWaylandSelection *>(data);
}
QWaylandClipboard::QWaylandClipboard(QWaylandDisplay *display)
: mDisplay(display), mSelection(0), mMimeDataIn(0), mOffer(0)
{
clipboard = this;
}
QWaylandClipboard::~QWaylandClipboard()
{
if (mOffer)
wl_selection_offer_destroy(mOffer);
delete mMimeDataIn;
qDeleteAll(mSelections);
}
void QWaylandClipboard::unregisterSelection(QWaylandSelection *selection)
{
mSelections.removeOne(selection);
}
void QWaylandClipboard::syncCallback(void *data)
{
*static_cast<bool *>(data) = true;
}
void QWaylandClipboard::forceRoundtrip(struct wl_display *display)
{
bool done = false;
wl_display_sync_callback(display, syncCallback, &done);
wl_display_iterate(display, WL_DISPLAY_WRITABLE);
while (!done)
wl_display_iterate(display, WL_DISPLAY_READABLE);
}
const QMimeData *QWaylandClipboard::mimeData(QClipboard::Mode mode) const
{
Q_ASSERT(mode == QClipboard::Clipboard);
if (!mMimeDataIn)
mMimeDataIn = new QMimeData;
mMimeDataIn->clear();
if (!mOfferedMimeTypes.isEmpty() && mOffer) {
foreach (const QString &mimeType, mOfferedMimeTypes) {
int pipefd[2];
if (pipe(pipefd) == -1) {
qWarning("QWaylandClipboard::mimedata: pipe() failed");
break;
}
QByteArray mimeTypeBa = mimeType.toLatin1();
wl_selection_offer_receive(mOffer, mimeTypeBa.constData(), pipefd[1]);
QByteArray content;
forceRoundtrip(mDisplay->wl_display());
char buf[256];
int n;
close(pipefd[1]);
while ((n = read(pipefd[0], &buf, sizeof buf)) > 0)
content.append(buf, n);
close(pipefd[0]);
mMimeDataIn->setData(mimeType, content);
}
}
return mMimeDataIn;
}
void QWaylandClipboard::setMimeData(QMimeData *data, QClipboard::Mode mode)
{
Q_ASSERT(mode == QClipboard::Clipboard);
if (!mDisplay->inputDevices().isEmpty()) {
if (!data)
data = new QMimeData;
mSelection = new QWaylandSelection(mDisplay, data);
} else {
qWarning("QWaylandClipboard::setMimeData: No input devices");
}
}
bool QWaylandClipboard::supportsMode(QClipboard::Mode mode) const
{
return mode == QClipboard::Clipboard;
}
const struct wl_selection_offer_listener QWaylandClipboard::selectionOfferListener = {
QWaylandClipboard::offer,
QWaylandClipboard::keyboardFocus
};
void QWaylandClipboard::createSelectionOffer(uint32_t id)
{
mOfferedMimeTypes.clear();
if (mOffer)
wl_selection_offer_destroy(mOffer);
mOffer = 0;
struct wl_selection_offer *offer = wl_selection_offer_create(mDisplay->wl_display(), id, 1);
wl_selection_offer_add_listener(offer, &selectionOfferListener, this);
}
void QWaylandClipboard::offer(void *data,
struct wl_selection_offer *selection_offer,
const char *type)
{
Q_UNUSED(selection_offer);
QWaylandClipboard *self = static_cast<QWaylandClipboard *>(data);
self->mOfferedMimeTypes.append(QString::fromLatin1(type));
}
void QWaylandClipboard::keyboardFocus(void *data,
struct wl_selection_offer *selection_offer,
wl_input_device *input_device)
{
QWaylandClipboard *self = static_cast<QWaylandClipboard *>(data);
if (!input_device) {
wl_selection_offer_destroy(selection_offer);
self->mOffer = 0;
return;
}
self->mOffer = selection_offer;
self->emitChanged(QClipboard::Clipboard);
}

View File

@ -0,0 +1,86 @@
/****************************************************************************
**
** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the plugins of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** No Commercial Usage
** This file contains pre-release code and may not be distributed.
** You may use this file in accordance with the terms and conditions
** contained in the Technology Preview License Agreement accompanying
** this package.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** If you have questions regarding the use of this file, please contact
** Nokia at qt-info@nokia.com.
**
**
**
**
**
**
**
**
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef QWAYLANDCLIPBOARD_H
#define QWAYLANDCLIPBOARD_H
#include <QtGui/QPlatformClipboard>
#include <QtCore/QStringList>
class QWaylandDisplay;
class QWaylandSelection;
struct wl_selection_offer;
class QWaylandClipboard : public QPlatformClipboard
{
public:
QWaylandClipboard(QWaylandDisplay *display);
~QWaylandClipboard();
const QMimeData *mimeData(QClipboard::Mode mode = QClipboard::Clipboard) const;
void setMimeData(QMimeData *data, QClipboard::Mode mode = QClipboard::Clipboard);
bool supportsMode(QClipboard::Mode mode) const;
void unregisterSelection(QWaylandSelection *selection);
void createSelectionOffer(uint32_t id);
private:
static void offer(void *data,
struct wl_selection_offer *selection_offer,
const char *type);
static void keyboardFocus(void *data,
struct wl_selection_offer *selection_offer,
struct wl_input_device *input_device);
static const struct wl_selection_offer_listener selectionOfferListener;
static void syncCallback(void *data);
static void forceRoundtrip(struct wl_display *display);
QWaylandDisplay *mDisplay;
QWaylandSelection *mSelection;
mutable QMimeData *mMimeDataIn;
QList<QWaylandSelection *> mSelections;
QStringList mOfferedMimeTypes;
struct wl_selection_offer *mOffer;
};
#endif // QWAYLANDCLIPBOARD_H

View File

@ -45,6 +45,7 @@
#include "qwaylandscreen.h" #include "qwaylandscreen.h"
#include "qwaylandcursor.h" #include "qwaylandcursor.h"
#include "qwaylandinputdevice.h" #include "qwaylandinputdevice.h"
#include "qwaylandclipboard.h"
#ifdef QT_WAYLAND_GL_SUPPORT #ifdef QT_WAYLAND_GL_SUPPORT
#include "gl_integration/qwaylandglintegration.h" #include "gl_integration/qwaylandglintegration.h"
@ -52,6 +53,7 @@
#include <QtCore/QAbstractEventDispatcher> #include <QtCore/QAbstractEventDispatcher>
#include <QtGui/QApplication> #include <QtGui/QApplication>
#include <QtGui/private/qapplication_p.h>
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
@ -249,7 +251,6 @@ void QWaylandDisplay::displayHandleGlobal(uint32_t id,
uint32_t version) uint32_t version)
{ {
Q_UNUSED(version); Q_UNUSED(version);
if (interface == "wl_output") { if (interface == "wl_output") {
struct wl_output *output = wl_output_create(mDisplay, id, 1); struct wl_output *output = wl_output_create(mDisplay, id, 1);
wl_output_add_listener(output, &outputListener, this); wl_output_add_listener(output, &outputListener, this);
@ -264,5 +265,9 @@ void QWaylandDisplay::displayHandleGlobal(uint32_t id,
QWaylandInputDevice *inputDevice = QWaylandInputDevice *inputDevice =
new QWaylandInputDevice(mDisplay, id); new QWaylandInputDevice(mDisplay, id);
mInputDevices.append(inputDevice); mInputDevices.append(inputDevice);
} else if (interface == "wl_selection_offer") {
QPlatformIntegration *plat = QApplicationPrivate::platformIntegration();
QWaylandClipboard *clipboard = static_cast<QWaylandClipboard *>(plat->clipboard());
clipboard->createSelectionOffer(id);
} }
} }

View File

@ -80,6 +80,7 @@ public:
void frameCallback(wl_display_frame_func_t func, struct wl_surface *surface, void *data); void frameCallback(wl_display_frame_func_t func, struct wl_surface *surface, void *data);
struct wl_display *wl_display() const { return mDisplay; } struct wl_display *wl_display() const { return mDisplay; }
struct wl_shell *wl_shell() const { return mShell; }
QList<QWaylandInputDevice *> inputDevices() const { return mInputDevices; } QList<QWaylandInputDevice *> inputDevices() const { return mInputDevices; }

View File

@ -60,6 +60,7 @@ public:
QWaylandInputDevice(struct wl_display *display, uint32_t id); QWaylandInputDevice(struct wl_display *display, uint32_t id);
void attach(QWaylandBuffer *buffer, int x, int y); void attach(QWaylandBuffer *buffer, int x, int y);
void handleWindowDestroyed(QWaylandWindow *window); void handleWindowDestroyed(QWaylandWindow *window);
struct wl_input_device *wl_input_device() const { return mInputDevice; }
private: private:
struct wl_display *mDisplay; struct wl_display *mDisplay;

View File

@ -45,6 +45,7 @@
#include "qwaylandshmsurface.h" #include "qwaylandshmsurface.h"
#include "qwaylandshmwindow.h" #include "qwaylandshmwindow.h"
#include "qwaylandnativeinterface.h" #include "qwaylandnativeinterface.h"
#include "qwaylandclipboard.h"
#include "qgenericunixfontdatabase.h" #include "qgenericunixfontdatabase.h"
@ -64,6 +65,7 @@ QWaylandIntegration::QWaylandIntegration(bool useOpenGL)
, mDisplay(new QWaylandDisplay()) , mDisplay(new QWaylandDisplay())
, mUseOpenGL(useOpenGL) , mUseOpenGL(useOpenGL)
, mNativeInterface(new QWaylandNativeInterface) , mNativeInterface(new QWaylandNativeInterface)
, mClipboard(0)
{ {
} }
@ -132,3 +134,10 @@ bool QWaylandIntegration::hasOpenGL() const
return false; return false;
#endif #endif
} }
QPlatformClipboard *QWaylandIntegration::clipboard() const
{
if (!mClipboard)
mClipboard = new QWaylandClipboard(mDisplay);
return mClipboard;
}

View File

@ -65,6 +65,8 @@ public:
QPlatformNativeInterface *nativeInterface() const; QPlatformNativeInterface *nativeInterface() const;
QPlatformClipboard *clipboard() const;
private: private:
bool hasOpenGL() const; bool hasOpenGL() const;
@ -72,6 +74,7 @@ private:
QWaylandDisplay *mDisplay; QWaylandDisplay *mDisplay;
bool mUseOpenGL; bool mUseOpenGL;
QPlatformNativeInterface *mNativeInterface; QPlatformNativeInterface *mNativeInterface;
mutable QPlatformClipboard *mClipboard;
}; };
QT_END_NAMESPACE QT_END_NAMESPACE

View File

@ -6,6 +6,8 @@ DESTDIR = $$QT.gui.plugins/platforms
DEFINES += Q_PLATFORM_WAYLAND DEFINES += Q_PLATFORM_WAYLAND
DEFINES += $$QMAKE_DEFINES_WAYLAND DEFINES += $$QMAKE_DEFINES_WAYLAND
QT += core-private gui-private opengl-private
SOURCES = main.cpp \ SOURCES = main.cpp \
qwaylandintegration.cpp \ qwaylandintegration.cpp \
qwaylandnativeinterface.cpp \ qwaylandnativeinterface.cpp \
@ -15,7 +17,8 @@ SOURCES = main.cpp \
qwaylanddisplay.cpp \ qwaylanddisplay.cpp \
qwaylandwindow.cpp \ qwaylandwindow.cpp \
qwaylandscreen.cpp \ qwaylandscreen.cpp \
qwaylandshmwindow.cpp qwaylandshmwindow.cpp \
qwaylandclipboard.cpp
HEADERS = qwaylandintegration.h \ HEADERS = qwaylandintegration.h \
qwaylandnativeinterface.h \ qwaylandnativeinterface.h \
@ -25,7 +28,8 @@ HEADERS = qwaylandintegration.h \
qwaylandscreen.h \ qwaylandscreen.h \
qwaylandshmsurface.h \ qwaylandshmsurface.h \
qwaylandbuffer.h \ qwaylandbuffer.h \
qwaylandshmwindow.h qwaylandshmwindow.h \
qwaylandclipboard.h
INCLUDEPATH += $$QMAKE_INCDIR_WAYLAND INCLUDEPATH += $$QMAKE_INCDIR_WAYLAND
LIBS += $$QMAKE_LIBS_WAYLAND LIBS += $$QMAKE_LIBS_WAYLAND

View File

@ -3,6 +3,8 @@ TARGET = xcb
include(../../qpluginbase.pri) include(../../qpluginbase.pri)
QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms
QT += core-private gui-private
SOURCES = \ SOURCES = \
qxcbconnection.cpp \ qxcbconnection.cpp \
qxcbintegration.cpp \ qxcbintegration.cpp \

View File

@ -3,6 +3,8 @@ TARGET = qxlib
include(../../qpluginbase.pri) include(../../qpluginbase.pri)
DESTDIR = $$QT.gui.plugins/platforms DESTDIR = $$QT.gui.plugins/platforms
QT += core-private gui-private opengl-private
SOURCES = \ SOURCES = \
main.cpp \ main.cpp \
qxlibintegration.cpp \ qxlibintegration.cpp \