diff --git a/appmenu/menuimporter.cpp b/appmenu/menuimporter.cpp index 319c8f0b..edae0918 100644 --- a/appmenu/menuimporter.cpp +++ b/appmenu/menuimporter.cpp @@ -1,192 +1,160 @@ /* This file is part of the KDE project. Copyright (c) 2011 Lionel Chauvin Copyright (c) 2011,2012 Cédric Bellegarde Copyright (c) 2016 Kai Uwe Broulik Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "menuimporter.h" #include "menuimporteradaptor.h" +#include "dbusmenutypes_p.h" #include #include #include #include #include static const char* DBUS_SERVICE = "com.canonical.AppMenu.Registrar"; static const char* DBUS_OBJECT_PATH = "/com/canonical/AppMenu/Registrar"; -// Marshalling code for DBusMenuLayoutItem -QDBusArgument &operator<<(QDBusArgument &argument, const DBusMenuLayoutItem &obj) -{ - argument.beginStructure(); - argument << obj.id << obj.properties; - argument.beginArray(qMetaTypeId()); - Q_FOREACH(const DBusMenuLayoutItem& child, obj.children) { - argument << QDBusVariant(QVariant::fromValue(child)); - } - argument.endArray(); - argument.endStructure(); - return argument; -} - -const QDBusArgument &operator>>(const QDBusArgument &argument, DBusMenuLayoutItem &obj) -{ - argument.beginStructure(); - argument >> obj.id >> obj.properties; - argument.beginArray(); - while (!argument.atEnd()) { - QDBusVariant dbusVariant; - argument >> dbusVariant; - QDBusArgument childArgument = dbusVariant.variant().value(); - - DBusMenuLayoutItem child; - childArgument >> child; - obj.children.append(child); - } - argument.endArray(); - argument.endStructure(); - return argument; -} - MenuImporter::MenuImporter(QObject* parent) : QObject(parent) , m_serviceWatcher(new QDBusServiceWatcher(this)) { qDBusRegisterMetaType(); m_serviceWatcher->setConnection(QDBusConnection::sessionBus()); m_serviceWatcher->setWatchMode(QDBusServiceWatcher::WatchForUnregistration); connect(m_serviceWatcher, &QDBusServiceWatcher::serviceUnregistered, this, &MenuImporter::slotServiceUnregistered); QDBusConnection::sessionBus().connect(QString(), QString(), QStringLiteral("com.canonical.dbusmenu"), QStringLiteral("LayoutUpdated"), this, SLOT(slotLayoutUpdated(uint,int))); } MenuImporter::~MenuImporter() { QDBusConnection::sessionBus().unregisterService(DBUS_SERVICE); QDBusConnection::sessionBus().disconnect(QString(), QString(), QStringLiteral("com.canonical.dbusmenu"), QStringLiteral("LayoutUpdated"), this, SLOT(slotLayoutUpdated(uint,int))); } bool MenuImporter::connectToBus() { if (!QDBusConnection::sessionBus().registerService(DBUS_SERVICE)) { return false; } new MenuImporterAdaptor(this); QDBusConnection::sessionBus().registerObject(DBUS_OBJECT_PATH, this); return true; } void MenuImporter::RegisterWindow(WId id, const QDBusObjectPath& path) { KWindowInfo info(id, NET::WMWindowType, NET::WM2WindowClass); NET::WindowTypes mask = NET::AllTypesMask; // Menu can try to register, right click in gimp for exemple if (info.windowType(mask) & (NET::Menu|NET::DropdownMenu|NET::PopupMenu)) { return; } if (path.path().isEmpty()) //prevent bad dbusmenu usage return; QString service = message().service(); QString classClass = info.windowClassClass(); m_windowClasses.insert(id, classClass); m_menuServices.insert(id, service); m_menuPaths.insert(id, path); if (!m_serviceWatcher->watchedServices().contains(service)) { m_serviceWatcher->addWatchedService(service); } emit WindowRegistered(id, service, path); } void MenuImporter::UnregisterWindow(WId id) { m_menuServices.remove(id); m_menuPaths.remove(id); m_windowClasses.remove(id); emit WindowUnregistered(id); } QString MenuImporter::GetMenuForWindow(WId id, QDBusObjectPath& path) { path = m_menuPaths.value(id); return m_menuServices.value(id); } void MenuImporter::slotServiceUnregistered(const QString& service) { WId id = m_menuServices.key(service); m_menuServices.remove(id); m_menuPaths.remove(id); m_windowClasses.remove(id); emit WindowUnregistered(id); m_serviceWatcher->removeWatchedService(service); } void MenuImporter::slotLayoutUpdated(uint /*revision*/, int parentId) { // Fake unity-panel-service weird behavior of calling aboutToShow on // startup. This is necessary for Firefox menubar to work correctly at // startup. // See: https://bugs.launchpad.net/plasma-idget-menubar/+bug/878165 if (parentId == 0) { //root menu fakeUnityAboutToShow(message().service(), QDBusObjectPath(message().path())); } } void MenuImporter::fakeUnityAboutToShow(const QString &service, const QDBusObjectPath &menuObjectPath) { QDBusMessage msg = QDBusMessage::createMethodCall(service, menuObjectPath.path(), QStringLiteral("com.canonical.dbusmenu"), QStringLiteral("GetLayout")); msg.setArguments({0, 1, QStringList()}); QDBusPendingReply reply = QDBusConnection::sessionBus().asyncCall(msg); QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(reply, this); QObject::connect(watcher, &QDBusPendingCallWatcher::finished, this, [=](QDBusPendingCallWatcher *watcher) { QDBusPendingReply reply = *watcher; if (reply.isError()) { qWarning() << "Call to GetLayout failed:" << reply.error().message(); } else { const DBusMenuLayoutItem &root = reply.argumentAt<1>(); for (const auto &item : root.children) { QDBusMessage msg = QDBusMessage::createMethodCall(service, menuObjectPath.path(), QStringLiteral("com.canonical.dbusmenu"), QStringLiteral("AboutToShow")); msg.setArguments({item.id}); QDBusConnection::sessionBus().asyncCall(msg); } } watcher->deleteLater(); }); } diff --git a/appmenu/menuimporter.h b/appmenu/menuimporter.h index d8d104e6..d0ec1e82 100644 --- a/appmenu/menuimporter.h +++ b/appmenu/menuimporter.h @@ -1,95 +1,83 @@ /* This file is part of the KDE project. Copyright (c) 2011 Lionel Chauvin Copyright (c) 2011,2012 Cédric Bellegarde Copyright (c) 2016 Kai Uwe Broulik Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #ifndef MENUIMPORTER_H #define MENUIMPORTER_H // Qt #include #include #include #include #include // For WId class QDBusObjectPath; class QDBusPendingCallWatcher; class QDBusServiceWatcher; class QMenu; -/** - * Represents an item with its children. GetLayout() returns a - * DBusMenuLayoutItemList. - */ -struct DBusMenuLayoutItem -{ - int id; - QVariantMap properties; - QList children; -}; -Q_DECLARE_METATYPE(DBusMenuLayoutItem) - class MenuImporter : public QObject, protected QDBusContext { Q_OBJECT public: MenuImporter(QObject*); ~MenuImporter() override; bool connectToBus(); bool serviceExist(WId id) { return m_menuServices.contains(id); } QString serviceForWindow(WId id) { return m_menuServices.value(id); } bool pathExist(WId id) { return m_menuPaths.contains(id); } QString pathForWindow(WId id) { return m_menuPaths.value(id).path(); } QList ids() { return m_menuServices.keys(); } void fakeUnityAboutToShow(const QString &service, const QDBusObjectPath &menuObjectPath); Q_SIGNALS: void WindowRegistered(WId id, const QString& service, const QDBusObjectPath&); void WindowUnregistered(WId id); public Q_SLOTS: Q_NOREPLY void RegisterWindow(WId id, const QDBusObjectPath& path); Q_NOREPLY void UnregisterWindow(WId id); QString GetMenuForWindow(WId id, QDBusObjectPath& path); private Q_SLOTS: void slotServiceUnregistered(const QString& service); void slotLayoutUpdated(uint revision, int parentId); private: QDBusServiceWatcher* m_serviceWatcher; QHash m_menuServices; QHash m_menuPaths; QHash m_windowClasses; }; #endif /* MENUIMPORTER_H */ diff --git a/dataengines/CMakeLists.txt b/dataengines/CMakeLists.txt index a0b14dd3..9fcdb57a 100644 --- a/dataengines/CMakeLists.txt +++ b/dataengines/CMakeLists.txt @@ -1,43 +1,41 @@ add_subdirectory(applicationjobs) if (KF5Activities_FOUND) add_subdirectory(activities) endif () add_subdirectory(apps) add_subdirectory(devicenotifications) add_subdirectory(dict) add_subdirectory(executable) add_subdirectory(favicons) add_subdirectory(filebrowser) if (KF5NetworkManagerQt_FOUND) add_subdirectory(geolocation) endif () add_subdirectory(hotplug) add_subdirectory(keystate) add_subdirectory(mpris2) #add_subdirectory(network) add_subdirectory(notifications) add_subdirectory(packagekit) add_subdirectory(places) add_subdirectory(powermanagement) add_subdirectory(soliddevice) add_subdirectory(time) add_subdirectory(weather) -if (TARGET dbusmenu-qt5) - add_subdirectory(statusnotifieritem) -endif () +add_subdirectory(statusnotifieritem) add_subdirectory(share) if(Boost_FOUND AND KdepimLibs_FOUND) if(Akonadi_FOUND) # add_subdirectory(akonadi) endif() # add_subdirectory(calendar) # add_subdirectory(rss) endif() if(NOT WIN32) add_subdirectory(mouse) add_subdirectory(systemmonitor) endif()