Wlroots taskbar

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

@@ -0,0 +1,13 @@
+[Desktop Entry]
+Type=Application
+TryExec=lxqt-panel
+
+# NOTE: KWin wants absolute path here, make sure it's correct
+Exec=/usr/local/bin/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

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,8 +1,16 @@
 set(PROJECT lxqt-panel)
 
-# TODO
+# Window Manager abstraction backend
 add_subdirectory(backends)
 
+# TODO: allow compile time selection via CMake variables
+set(PANEL_BACKENDS
+    lxqt-panel-backend-wlroots
+    lxqt-panel-backend-wayland
+    lxqt-panel-backend-xcb
+)
+
+
 set(PRIV_HEADERS
     panelpluginsmodel.h
     windownotifier.h
@@ -21,12 +29,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 +37,6 @@ set(PUB_HEADERS
     pluginsettings.h
     ilxqtpanelplugin.h
     ilxqtpanel.h
-
-    backends/ilxqttaskbarabstractbackend.h
-    backends/lxqttaskbartypes.h
 )
 
 set(SOURCES
@@ -57,11 +56,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
@@ -120,6 +114,7 @@ target_link_libraries(${PROJECT}
     ${LIBRARIES}
     ${QTX_LIBRARIES}
     KF6::WindowSystem
+    ${PANEL_BACKENDS}
     LayerShellQt::Interface
     ${STATIC_PLUGINS}
 )

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
+    ilxqttaskbarabstractbackend.h
+    ilxqttaskbarabstractbackend.cpp
+
+    lxqttaskbardummybackend.h
+    lxqttaskbardummybackend.cpp
+)
+
+target_link_libraries(lxqt-panel-backend-common
+    Qt6::Gui
+)
+
+add_subdirectory(wayland)
 add_subdirectory(xcb)

panel/backends/ilxqttaskbarabstractbackend.cpp

@@ -1,4 +1,31 @@
-#include "../panel/backends/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 */
+
+#include "ilxqttaskbarabstractbackend.h"
 
 
 ILXQtTaskbarAbstractBackend::ILXQtTaskbarAbstractBackend(QObject *parent)

panel/backends/ilxqttaskbarabstractbackend.h

@@ -1,3 +1,31 @@
+/* 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 ILXQTTASKBARABSTRACTBACKEND_H
 #define ILXQTTASKBARABSTRACTBACKEND_H
 

panel/backends/lxqttaskbardummybackend.cpp

@@ -1,3 +1,31 @@
+/* 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 "lxqttaskbardummybackend.h"
 
 #include <QIcon>

panel/backends/lxqttaskbardummybackend.h

@@ -1,3 +1,31 @@
+/* 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 LXQTTASKBARDUMMYBACKEND_H
 #define LXQTTASKBARDUMMYBACKEND_H
 

panel/backends/lxqttaskbartypes.h

@@ -1,3 +1,31 @@
+/* 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 LXQTTASKBARTYPES_H
 #define LXQTTASKBARTYPES_H
 
@@ -50,7 +78,7 @@ enum class LXQtTaskBarWindowLayer
 
 enum class LXQtTaskBarWorkspace
 {
-    ShowOnAll = -1
+    ShowOnAll = 0 // Virtual destops have 1-based indexes
 };
 
 #endif // LXQTTASKBARTYPES_H

panel/backends/wayland/CMakeLists.txt

@@ -0,0 +1,30 @@
+project(lxqt-panel-backend-wayland)
+
+find_package(Qt6 ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS WaylandClient Concurrent)
+
+add_library(lxqt-panel-backend-wayland STATIC
+    lxqttaskbarbackendwayland.h
+    lxqttaskbarplasmawindowmanagment.h
+    lxqtplasmavirtualdesktop.h
+
+    lxqttaskbarbackendwayland.cpp
+    lxqttaskbarplasmawindowmanagment.cpp
+    lxqtplasmavirtualdesktop.cpp
+)
+
+qt6_generate_wayland_protocol_client_sources(lxqt-panel-backend-wayland
+FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/protocols/plasma-window-management.xml
+)
+
+qt6_generate_wayland_protocol_client_sources(lxqt-panel-backend-wayland
+FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/protocols/org-kde-plasma-virtual-desktop.xml
+)
+
+target_link_libraries(lxqt-panel-backend-wayland
+    Qt6::GuiPrivate
+    Qt6::WaylandClient
+    Qt6::Concurrent
+    lxqt-panel-backend-common
+)