wip: doesn't seem right

Author: BLumia

src/protocol/plugin-manager-v1.xml

@@ -118,21 +118,9 @@
       <arg name="xembed_winid"  type="int"/>
       <arg name="plugin_id"     type="string"/>
       <arg name="item_key"      type="string"/>
-      <arg name="callback" type="new_id" interface="plugin_manager_callback_v1"/>
+      <arg name="callback" type="new_id" interface="wl_callback"/>
     </request>
   </interface>
-  <interface name="plugin_manager_callback_v1" version="1">
-    <description summary="callback for plugin manager operations">
-      This interface is used for receiving completion notifications for asynchronous operations.
-    </description>
-    <request name="destroy" type="destructor">
-    </request>
-    <event name="done">
-      <description summary="operation completed">
-        This event indicates that the requested operation has been completed by the compositor.
-      </description>
-    </event>
-  </interface>
   <interface name="plugin_popup" version="1">
     <request name="destroy" type="destructor">
     </request>

src/tray-wayland-integration/CMakeLists.txt

@@ -7,6 +7,7 @@ if(Qt${QT_VERSION_MAJOR}_VERSION VERSION_GREATER_EQUAL 6.10)
   find_package(Qt${QT_VERSION_MAJOR} COMPONENTS GuiPrivate WaylandClientPrivate REQUIRED)
 endif()
 find_package(Dtk${DTK_VERSION_MAJOR} REQUIRED COMPONENTS Gui Widget)
+pkg_search_module(WaylandClient REQUIRED IMPORTED_TARGET wayland-client)
 
 find_package(ECM REQUIRED MO_MODULE)
 set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${ECM_MODULE_PATH}")
@@ -53,6 +54,7 @@ PRIVATE
     Qt${QT_VERSION_MAJOR}::WaylandClient
     Qt${QT_VERSION_MAJOR}::WaylandClientPrivate
     Wayland::Client
+    PkgConfig::WaylandClient
 )
 
 set_target_properties(dockpluginmanager PROPERTIES

src/tray-wayland-integration/pluginmanagerintegration.cpp

@@ -6,6 +6,8 @@
 #include "plugin.h"
 #include "pluginsurface_p.h"
 
+#include <wayland-client-protocol.h>
+#include <private/qwayland-wayland.h>
 #include <qwayland-plugin-manager-v1.h>
 #include <QtWaylandClient/private/qwaylandwindow_p.h>
 
@@ -48,10 +50,9 @@ void PluginManagerIntegration::requestMessage(const QString &plugin_id, const QS
     request_message(plugin_id, item_key, msg);
 }
 
-PluginManagerCallback *PluginManagerIntegration::moveXembedWindow(uint32_t xembedWinId, const QString &pluginId, const QString &itemKey)
+struct ::wl_callback *PluginManagerIntegration::moveXembedWindow(uint32_t xembedWinId, const QString &pluginId, const QString &itemKey)
 {
-    auto callback = new PluginManagerCallback();
-    move_xembed_window(xembedWinId, pluginId, itemKey);
+    auto callback = move_xembed_window(xembedWinId, pluginId, itemKey);
     return callback;
 }
 
@@ -130,17 +131,4 @@ bool PluginManagerIntegration::tryCreatePopupForSubWindow(QWindow *window)
     return false;
 }
 
-PluginManagerCallback::PluginManagerCallback()
-{
-}
-
-PluginManagerCallback::~PluginManagerCallback()
-{
-}
-
-void PluginManagerCallback::plugin_manager_callback_v1_done()
-{
-    Q_EMIT done();
-}
-
 }

src/tray-wayland-integration/pluginmanagerintegration_p.h

@@ -5,11 +5,11 @@
 #pragma once
 
 #include "qwayland-plugin-manager-v1.h"
+#include <wayland-client-protocol.h>
 
 #include <QtWaylandClient/private/qwaylandshellintegration_p.h>
 
 namespace Plugin {
-class PluginManagerCallback;
 class PluginManagerIntegration : public QtWaylandClient::QWaylandShellIntegrationTemplate<PluginManagerIntegration>, public QtWayland::plugin_manager_v1
 {
     Q_OBJECT
@@ -21,7 +21,7 @@ class PluginManagerIntegration : public QtWaylandClient::QWaylandShellIntegratio
 
 public:
     void requestMessage(const QString &plugin_id, const QString &item_key, const QString &msg);
-    PluginManagerCallback *moveXembedWindow(uint32_t xembedWinId, const QString &pluginId, const QString &itemKey);
+    struct ::wl_callback *moveXembedWindow(uint32_t xembedWinId, const QString &pluginId, const QString &itemKey);
 
 Q_SIGNALS:
     void eventMessage(const QString &msg);
@@ -45,18 +45,4 @@ class PluginManagerIntegration : public QtWaylandClient::QWaylandShellIntegratio
     static PluginManagerIntegration *s_instance;
 };
 
-class PluginManagerCallback : public QObject, public QtWayland::plugin_manager_callback_v1
-{
-    Q_OBJECT
-public:
-    PluginManagerCallback();
-    ~PluginManagerCallback();
-
-Q_SIGNALS:
-    void done();
-
-protected:
-    void plugin_manager_callback_v1_done() override;
-};
-
 }

src/tray-wayland-integration/pluginsurface_p.h

@@ -5,6 +5,8 @@
 #pragma once
 
 #include "plugin.h"
+
+#include <wayland-client-protocol.h>
 #include "qwayland-plugin-manager-v1.h"
 
 #include <QtWaylandClient/private/qwaylandshellsurface_p.h>