From fcde10714ad9040fca6ec7e8980d3b70edb9ced7 Mon Sep 17 00:00:00 2001 From: Aleix Pol Date: Fri, 18 Jun 2021 19:27:34 +0200 Subject: [PATCH] Partly Revert "Support xdg_activation_v1 on SNI invokations" This reverts commit changes that didn't belong in 6545d5584d01c452121efcb12305d7f1fde84b4d. --- libnotificationmanager/server.cpp | 14 +------------- libnotificationmanager/server_p.h | 1 - libtaskmanager/declarative/pipewiresourceitem.cpp | 8 +------- libtaskmanager/declarative/pipewiresourceitem.h | 6 +----- .../declarative/pipewiresourcestream.cpp | 15 ++------------- libtaskmanager/declarative/pipewiresourcestream.h | 9 +++++---- 6 files changed, 10 insertions(+), 43 deletions(-) diff --git a/libnotificationmanager/server.cpp b/libnotificationmanager/server.cpp index 83d8ea393..a40d588ed 100644 --- a/libnotificationmanager/server.cpp +++ b/libnotificationmanager/server.cpp @@ -26,7 +26,6 @@ #include "debug.h" -#include #include using namespace NotificationManager; @@ -78,18 +77,7 @@ void Server::closeNotification(uint notificationId, CloseReason reason) void Server::invokeAction(uint notificationId, const QString &actionName) { - QWindow *window = nullptr; - const int launchedSerial = KWindowSystem::lastInputSerial(window); - connect(KWindowSystem::self(), - &KWindowSystem::xdgActivationTokenArrived, - this, - [this, launchedSerial, notificationId, actionName](int tokenSerial, const QString &token) { - if (tokenSerial == launchedSerial) { - emit d->ActivationToken(notificationId, token); - emit d->ActionInvoked(notificationId, actionName); - } - }); - KWindowSystem::requestXdgActivationToken(window, launchedSerial, {}); + emit d->ActionInvoked(notificationId, actionName); } void Server::reply(const QString &dbusService, uint notificationId, const QString &text) diff --git a/libnotificationmanager/server_p.h b/libnotificationmanager/server_p.h index 099f50925..7b82d7828 100644 --- a/libnotificationmanager/server_p.h +++ b/libnotificationmanager/server_p.h @@ -80,7 +80,6 @@ Q_SIGNALS: // DBus void NotificationClosed(uint id, uint reason); void ActionInvoked(uint id, const QString &actionKey); - void ActivationToken(uint id, const QString &activationToken); // non-standard // This is manually emitted as targeted signal in sendReplyText() void NotificationReplied(uint id, const QString &text); diff --git a/libtaskmanager/declarative/pipewiresourceitem.cpp b/libtaskmanager/declarative/pipewiresourceitem.cpp index a59c2a86b..899a22468 100644 --- a/libtaskmanager/declarative/pipewiresourceitem.cpp +++ b/libtaskmanager/declarative/pipewiresourceitem.cpp @@ -119,7 +119,7 @@ void PipeWireSourceItem::setNodeId(uint nodeId) return nullptr; }; } else { - m_stream.reset(new PipeWireSourceStream(true, this)); + m_stream.reset(new PipeWireSourceStream(this)); m_stream->createStream(m_nodeId); if (!m_stream->error().isEmpty()) { m_stream.reset(nullptr); @@ -130,7 +130,6 @@ void PipeWireSourceItem::setNodeId(uint nodeId) connect(m_stream.data(), &PipeWireSourceStream::dmabufTextureReceived, this, &PipeWireSourceItem::updateTextureDmaBuf); connect(m_stream.data(), &PipeWireSourceStream::imageTextureReceived, this, &PipeWireSourceItem::updateTextureImage); - connect(m_stream.data(), &PipeWireSourceStream::streamChanged, this, &PipeWireSourceItem::streamChanged); } Q_EMIT nodeIdChanged(nodeId); @@ -304,8 +303,3 @@ void PipeWireSourceItem::componentComplete() m_stream->setActive(isVisible()); QQuickItem::componentComplete(); } - -QSize PipeWireSourceItem::sourceSize() const -{ - return m_stream ? m_stream->size() : QSize(); -} diff --git a/libtaskmanager/declarative/pipewiresourceitem.h b/libtaskmanager/declarative/pipewiresourceitem.h index 5bb1db2b2..dbd4b6bb9 100644 --- a/libtaskmanager/declarative/pipewiresourceitem.h +++ b/libtaskmanager/declarative/pipewiresourceitem.h @@ -40,9 +40,6 @@ class PipeWireSourceItem : public QQuickItem Q_OBJECT /// Specify the pipewire node id that we want to play Q_PROPERTY(uint nodeId READ nodeId WRITE setNodeId NOTIFY nodeIdChanged) - - /// Reports the original size of the stream - Q_PROPERTY(QSize sourceSize READ sourceSize NOTIFY streamChanged) public: PipeWireSourceItem(QQuickItem *parent = nullptr); ~PipeWireSourceItem() override; @@ -55,19 +52,18 @@ public: { return m_nodeId; } - QSize sourceSize() const; void componentComplete() override; void releaseResources() override; Q_SIGNALS: - void streamChanged(); void nodeIdChanged(uint nodeId); private: void itemChange(ItemChange change, const ItemChangeData &data) override; void updateTextureDmaBuf(const QVector &plane, uint32_t format); void updateTextureImage(const QImage &image); + void setSize(const QSize &size); uint m_nodeId = 0; std::function m_createNextTexture; diff --git a/libtaskmanager/declarative/pipewiresourcestream.cpp b/libtaskmanager/declarative/pipewiresourcestream.cpp index d9a56fb84..0118b1c2b 100644 --- a/libtaskmanager/declarative/pipewiresourcestream.cpp +++ b/libtaskmanager/declarative/pipewiresourcestream.cpp @@ -81,10 +81,6 @@ void PipeWireSourceStream::onStreamParamChanged(void *data, uint32_t id, const s uint8_t paramsBuffer[1024]; spa_pod_builder pod_builder = SPA_POD_BUILDER_INIT(paramsBuffer, sizeof(paramsBuffer)); - int extraTypes = 0; - if (pw->m_dmaBufSupported) { - extraTypes += 1 << SPA_DATA_DmaBuf; - } const spa_pod *param = (spa_pod *)spa_pod_builder_add_object(&pod_builder, SPA_TYPE_OBJECT_ParamBuffers, SPA_PARAM_Buffers, @@ -99,9 +95,8 @@ void PipeWireSourceStream::onStreamParamChanged(void *data, uint32_t id, const s SPA_PARAM_BUFFERS_align, SPA_POD_Int(16), SPA_PARAM_BUFFERS_dataType, - SPA_POD_Int((1 << SPA_DATA_MemPtr) | (1 << SPA_DATA_MemFd) | extraTypes)); + SPA_POD_Int((1 << SPA_DATA_MemPtr) | (1 << SPA_DATA_MemFd) | (1 << SPA_DATA_DmaBuf))); pw_stream_update_params(pw->pwStream, ¶m, 1); - Q_EMIT pw->streamChanged(); } static void onProcess(void *data) @@ -110,14 +105,8 @@ static void onProcess(void *data) stream->process(); } -QSize PipeWireSourceStream::size() const -{ - return QSize(videoFormat.size.width, videoFormat.size.height); -} - -PipeWireSourceStream::PipeWireSourceStream(bool dmaBufSupported, QObject *parent) +PipeWireSourceStream::PipeWireSourceStream(QObject *parent) : QObject(parent) - , m_dmaBufSupported(dmaBufSupported) { pwStreamEvents.version = PW_VERSION_STREAM_EVENTS; pwStreamEvents.process = &onProcess; diff --git a/libtaskmanager/declarative/pipewiresourcestream.h b/libtaskmanager/declarative/pipewiresourcestream.h index 6e9e6edbd..01a68c4f7 100644 --- a/libtaskmanager/declarative/pipewiresourcestream.h +++ b/libtaskmanager/declarative/pipewiresourcestream.h @@ -54,7 +54,7 @@ class PipeWireSourceStream : public QObject { Q_OBJECT public: - explicit PipeWireSourceStream(bool dmaBufSupported, QObject *parent); + explicit PipeWireSourceStream(QObject *parent); ~PipeWireSourceStream(); static void onStreamParamChanged(void *data, uint32_t id, const struct spa_pod *format); @@ -67,7 +67,10 @@ public: return m_error; } - QSize size() const; + QSize size() const + { + return QSize(videoFormat.size.width, videoFormat.size.height); + } bool createStream(uint nodeid); void stop(); void setActive(bool active); @@ -79,7 +82,6 @@ Q_SIGNALS: void streamReady(); void startStreaming(); void stopStreaming(); - void streamChanged(); void dmabufTextureReceived(const QVector &planes, uint32_t format); void imageTextureReceived(const QImage &image); @@ -96,6 +98,5 @@ private: bool m_stopped = false; spa_video_info_raw videoFormat; - const bool m_dmaBufSupported = false; QString m_error; };