Wayland taskbar support v2

autostart/CMakeLists.txt

@@ -1,9 +1,9 @@
-file(GLOB DESKTOP_FILES_IN *.desktop.in)
+set(AUTOSTART_DESKTOP_FILES_IN lxqt-panel.desktop.in)
 
 # Translations **********************************
 lxqt_translate_desktop(DESKTOP_FILES
     SOURCES
-        ${DESKTOP_FILES_IN}
+        ${AUTOSTART_DESKTOP_FILES_IN}
     USE_YAML
 )
 add_custom_target(lxqt_panel_autostart_desktop_files ALL DEPENDS ${DESKTOP_FILES})
@@ -14,3 +14,12 @@ install(FILES
     DESTINATION "${LXQT_ETC_XDG_DIR}/autostart"
     COMPONENT Runtime
 )
+
+configure_file(lxqt-panel_wayland.desktop.in lxqt-panel_wayland.desktop @ONLY)
+
+install(FILES
+    "${CMAKE_CURRENT_BINARY_DIR}/lxqt-panel_wayland.desktop"
+    DESTINATION "/usr/share/applications"
+    RENAME "lxqt-panel.desktop"
+    COMPONENT Runtime
+)

autostart/lxqt-panel_wayland.desktop.in

@@ -0,0 +1,14 @@
+[Desktop Entry]
+Type=Application
+TryExec=lxqt-panel
+NoDisplay=true
+
+# NOTE: KWin wants absolute path here, get it from CMake install path
+Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/lxqt-panel
+
+# NOTE: adding KDE to make it work under Plasma Wayland session
+OnlyShowIn=LXQt;KDE
+X-LXQt-Module=true
+
+# Make KWin recognize us as priviledged client
+X-KDE-Wayland-Interfaces=org_kde_plasma_window_management

panel/CMakeLists.txt

@@ -1,6 +1,6 @@
 set(PROJECT lxqt-panel)
 
-# TODO
+# Window Manager backends
 add_subdirectory(backends)
 
 set(PRIV_HEADERS
@@ -21,12 +21,6 @@ set(PRIV_HEADERS
     config/configstyling.h
     config/configpluginswidget.h
     config/addplugindialog.h
-
-    backends/ilxqttaskbarabstractbackend.h
-    backends/lxqttaskbartypes.h
-
-    backends/lxqttaskbardummybackend.h
-    backends/xcb/lxqttaskbarbackend_x11.h
 )
 
 # using LXQt namespace in the public headers.
@@ -35,9 +29,6 @@ set(PUB_HEADERS
     pluginsettings.h
     ilxqtpanelplugin.h
     ilxqtpanel.h
-
-    backends/ilxqttaskbarabstractbackend.h
-    backends/lxqttaskbartypes.h
 )
 
 set(SOURCES
@@ -57,11 +48,6 @@ set(SOURCES
     config/configstyling.cpp
     config/configpluginswidget.cpp
     config/addplugindialog.cpp
-
-    backends/ilxqttaskbarabstractbackend.cpp
-
-    backends/lxqttaskbardummybackend.cpp
-    backends/xcb/lxqttaskbarbackend_x11.cpp
 )
 
 set(UI
@@ -122,6 +108,7 @@ target_link_libraries(${PROJECT}
     KF6::WindowSystem
     LayerShellQt::Interface
     ${STATIC_PLUGINS}
+    lxqt-panel-backend-common
 )
 
 set_property(TARGET ${PROJECT} PROPERTY ENABLE_EXPORTS TRUE)

panel/backends/CMakeLists.txt

@@ -1 +1,19 @@
+# Common interface for Window Manager abstraction backend
+# This also contains dummy backend
+
+add_library(lxqt-panel-backend-common STATIC
+
+    lxqttaskbartypes.h
+    ilxqtabstractwmiface.h
+    ilxqtabstractwmiface.cpp
+
+    lxqtdummywmbackend.h
+    lxqtdummywmbackend.cpp
+)
+
+target_link_libraries(lxqt-panel-backend-common
+    Qt6::Gui
+)
+
+add_subdirectory(wayland)
 add_subdirectory(xcb)

panel/backends/ilxqtabstractwmiface.cpp

@@ -0,0 +1,52 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * LXQt - a lightweight, Qt based, desktop toolset
+ * https://lxqt.org
+ *
+ * Copyright: 2023 LXQt team
+ * Authors:
+ *  Filippo Gentile <[email protected]>
+ *
+ * This program or library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+
+#include "ilxqtabstractwmiface.h"
+
+ILXQtAbstractWMInterface::ILXQtAbstractWMInterface(QObject *parent)
+    : QObject(parent)
+{
+
+}
+
+void ILXQtAbstractWMInterface::moveApplicationToPrevNextDesktop(WId windowId, bool next)
+{
+    int count = getWorkspacesCount();
+    if (count <= 1)
+        return;
+
+    int targetWorkspace = getWindowWorkspace(windowId) + (next ? 1 : -1);
+
+    // Wrap around
+    if (targetWorkspace > count)
+        targetWorkspace = 1; //Ids are 1-based
+    else if (targetWorkspace < 1)
+        targetWorkspace = count;
+
+    setWindowOnWorkspace(windowId, targetWorkspace);
+}

panel/backends/ilxqttaskbarabstractbackend.h → panel/backends/ilxqtabstractwmiface.h

@@ -1,19 +1,48 @@
-#ifndef ILXQTTASKBARABSTRACTBACKEND_H
-#define ILXQTTASKBARABSTRACTBACKEND_H
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * LXQt - a lightweight, Qt based, desktop toolset
+ * https://lxqt.org
+ *
+ * Copyright: 2023 LXQt team
+ * Authors:
+ *  Filippo Gentile <[email protected]>
+ *
+ * This program or library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+
+#ifndef ILXQT_ABSTRACT_WM_INTERFACE_H
+#define ILXQT_ABSTRACT_WM_INTERFACE_H
 
 #include <QObject>
 
+#include "../lxqtpanelglobals.h"
 #include "lxqttaskbartypes.h"
 
 class QIcon;
 class QScreen;
 
-class ILXQtTaskbarAbstractBackend : public QObject
+class LXQT_PANEL_API ILXQtAbstractWMInterface : public QObject
 {
     Q_OBJECT
 
 public:
-    explicit ILXQtTaskbarAbstractBackend(QObject *parent = nullptr);
+    explicit ILXQtAbstractWMInterface(QObject *parent = nullptr);
 
     // Backend
     virtual bool supportsAction(WId windowId, LXQtTaskBarBackendAction action) const = 0;
@@ -96,4 +125,28 @@ class ILXQtTaskbarAbstractBackend : public QObject
     void activeWindowChanged(WId windowId);
 };
 
-#endif // ILXQTTASKBARABSTRACTBACKEND_H
+class LXQT_PANEL_API ILXQtWMBackendLibrary
+{
+public:
+    /**
+     Destroys the ILXQtWMBackendLibrary object.
+     **/
+    virtual ~ILXQtWMBackendLibrary() {}
+
+    /**
+    Returns the score of this backend for current detected environment.
+    This is used to select correct backend at runtime
+     **/
+    virtual int getBackendScore(const QString& key) const = 0;
+
+    /**
+    Returns the root component object of the backend. When the library is finally unloaded, the root component will automatically be deleted.
+     **/
+    virtual ILXQtAbstractWMInterface* instance() const = 0;
+};
+
+
+Q_DECLARE_INTERFACE(ILXQtWMBackendLibrary,
+                    "lxqt.org/Panel/WMInterface/1.0")
+
+#endif // ILXQT_ABSTRACT_WM_INTERFACE_H