Wayland taskbar support

.ci/install.sh

@@ -0,0 +1,64 @@
+set -ex
+
+#source shared-ci/prepare-archlinux.sh
+
+cat >> /etc/pacman.conf <<EOF
+[lxqt2wip]
+SigLevel = Optional TrustAll
+Server = https://archlive-aur.sourceforge.io/lxqt2wip/x86_64
+EOF
+
+# Needed to allow updating archlinux-keyring package (see below).
+# This also enables usage of third-party keys [1].
+pacman-key --init
+
+# Update the keyring first to allow installing packages signed by newer keys [2].
+# This may be needed when `pacman -Syu` below or other pacman commands in individual LXQt
+# components uses packages signed by newer keys.
+pacman -Sy --noconfirm archlinux-keyring
+
+pacman -Syu --noconfirm
+
+# [1] https://gitlab.archlinux.org/archlinux/archlinux-docker/-/issues/18
+# [2] https://github.com/lxqt/lxqt-panel/pull/1781#issuecomment-1111755255
+
+# See *depends in https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=lxqt-panel-git
+packages=(
+    alsa-lib
+    cmake
+    git
+    libpulse
+    libstatgrab
+    libxcomposite
+    libxtst
+    lm_sensors
+    menu-cache
+    qt6-base
+    qt6-tools
+#   kwindowsystem
+#   solid
+)
+pacman -S --noconfirm --needed ${packages[@]}
+
+# Enable testing repo only to checkout KF6Solid, KF6WindowSystem and layer-shell-qt
+cat >> /etc/pacman.conf <<EOF
+[core-testing]
+Include = /etc/pacman.d/mirrorlist
+[extra-testing]
+Include = /etc/pacman.d/mirrorlist
+EOF
+pacman -Sy --noconfirm
+
+lxqt2wip_packages=(
+    layer-shell-qt
+    kwindowsystem
+    solid
+    libdbusmenu-lxqt-git
+    lxqt2-build-tools-git
+    lxqt-menu-data-git
+    libqt6xdg-git
+    liblxqt-git
+    lxqt-globalkeys-git
+    libsysstat-git
+)
+pacman -S --noconfirm ${lxqt2wip_packages[@]}

.github/workflows/test.yml

@@ -7,12 +7,14 @@ jobs:
     runs-on: ubuntu-20.04
     container: archlinux:base-devel
     steps:
-    - name: Checkout the repo
-      uses: actions/checkout@v2
-    - name: Checkout shared CI repo
-      uses: actions/checkout@v2
-      with:
-        repository: lxqt/ci
-        path: shared-ci
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    - name: Install dependencies
+      run: bash ./.ci/install.sh
+
+    - name: Configure
+      run: cmake -B build -S .
+
     - name: Build
-      run: bash ./.ci/build.sh
+      run: cmake --build build

CMakeLists.txt

@@ -29,21 +29,22 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTORCC ON)
 
-set(REQUIRED_QT_VERSION "5.15.0")
-set(KF5_MINIMUM_VERSION "5.101.0")
-set(LXQT_GLOBALKEYS_MINIMUM_VERSION "1.4.0")
-set(LXQT_MINIMUM_VERSION "1.4.0")
-
-find_package(Qt5DBus ${REQUIRED_QT_VERSION} REQUIRED)
-find_package(Qt5LinguistTools ${REQUIRED_QT_VERSION} REQUIRED)
-find_package(Qt5Widgets ${REQUIRED_QT_VERSION} REQUIRED)
-find_package(Qt5X11Extras ${REQUIRED_QT_VERSION} REQUIRED)
-find_package(Qt5Xml ${REQUIRED_QT_VERSION} REQUIRED)
-find_package(KF5WindowSystem ${KF5_MINIMUM_VERSION} REQUIRED)
+set(REQUIRED_QT_VERSION "6.6.0")
+set(KF6_MINIMUM_VERSION "6.0.0")
+set(LXQT_GLOBALKEYS_MINIMUM_VERSION "2.0.0")
+set(LXQT_MINIMUM_VERSION "2.0.0")
+
+find_package(Qt6DBus ${REQUIRED_QT_VERSION} REQUIRED)
+find_package(Qt6LinguistTools ${REQUIRED_QT_VERSION} REQUIRED)
+find_package(Qt6Widgets ${REQUIRED_QT_VERSION} REQUIRED)
+find_package(Qt6Xml ${REQUIRED_QT_VERSION} REQUIRED)
+find_package(KF6WindowSystem ${KF6_MINIMUM_VERSION} REQUIRED)
 find_package(lxqt ${LXQT_MINIMUM_VERSION} REQUIRED)
 find_package(lxqt-globalkeys-ui ${LXQT_GLOBALKEYS_MINIMUM_VERSION} REQUIRED)
 find_package(lxqt-menu-data ${LXQT_MINIMUM_VERSION} REQUIRED)
 
+find_package(LayerShellQt REQUIRED)
+
 # Patch Version
 set(LXQT_PANEL_PATCH_VERSION 0)
 set(LXQT_PANEL_VERSION ${LXQT_MAJOR_VERSION}.${LXQT_MINOR_VERSION}.${LXQT_PANEL_PATCH_VERSION})

README.md

@@ -33,7 +33,7 @@ As indicated by the name, a volume control. Technically Alsa, OSS and PulseAudio
 
 ### Compiling source code
 
-The runtime dependencies are libxcomposite, libdbusmenu-qt5, KGuiAddons, KWindowSystem, Solid, menu-cache, [lxqt-menu-data](https://github.com/lxqt/lxqt-menu-data), [liblxqt](https://github.com/lxqt/liblxqt) and [lxqt-globalkeys](https://github.com/lxqt/lxqt-globalkeys).
+The runtime dependencies are libxcomposite, libdbusmenu-lxqt, KGuiAddons, KWindowSystem, Solid, menu-cache, [lxqt-menu-data](https://github.com/lxqt/lxqt-menu-data), [liblxqt](https://github.com/lxqt/liblxqt) and [lxqt-globalkeys](https://github.com/lxqt/lxqt-globalkeys).
 Several plugins or features thereof are optional and need additional runtime dependencies. Namely these are (plugin / feature in parenthesis) Alsa library (Alsa support in plugin-volume), PulseAudio client library (PulseAudio support in plugin-volume), lm-sensors (plugin-sensors), libstatgrab (plugin-cpuload, plugin-networkmonitor), [libsysstat](https://github.com/lxqt/libsysstat) (plugin-sysstat). All of them are enabled by default and have to be disabled by CMake variables as required, see below.
 In addition CMake and [lxqt-build-tools](https://github.com/lxqt/lxqt-build-tools) are mandatory build dependencies. Git is optionally needed to pull latest VCS checkouts.
 

autostart/CMakeLists.txt

@@ -14,3 +14,10 @@ install(FILES
     DESTINATION "${LXQT_ETC_XDG_DIR}/autostart"
     COMPONENT Runtime
 )
+
+install(FILES
+    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

cmake/BuildPlugin.cmake

@@ -36,12 +36,12 @@ MACRO (BUILD_LXQT_PLUGIN NAME)
         set (PLUGIN_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/${PROGRAM})
     endif (NOT DEFINED PLUGIN_DIR)
 
-    set(QTX_LIBRARIES Qt5::Widgets)
+    set(QTX_LIBRARIES Qt6::Widgets)
     if(QT_USE_QTXML)
-        set(QTX_LIBRARIES ${QTX_LIBRARIES} Qt5::Xml)
+        set(QTX_LIBRARIES ${QTX_LIBRARIES} Qt6::Xml)
     endif()
     if(QT_USE_QTDBUS)
-        set(QTX_LIBRARIES ${QTX_LIBRARIES} Qt5::DBus)
+        set(QTX_LIBRARIES ${QTX_LIBRARIES} Qt6::DBus)
     endif()
 
     list(FIND STATIC_PLUGINS ${NAME} IS_STATIC)
@@ -52,7 +52,7 @@ MACRO (BUILD_LXQT_PLUGIN NAME)
     else() # static
         add_library(${NAME} STATIC ${SRC}) # build statically linked lib
     endif()
-    target_link_libraries(${NAME} ${QTX_LIBRARIES} lxqt ${LIBRARIES} KF5::WindowSystem)
+    target_link_libraries(${NAME} ${QTX_LIBRARIES} lxqt ${LIBRARIES} KF6::WindowSystem)
 
     install(FILES ${CONFIG_FILES}  DESTINATION ${PLUGIN_SHARE_DIR})
     install(FILES ${DESKTOP_FILES} DESTINATION ${PROG_SHARE_DIR})

panel/CMakeLists.txt

@@ -1,5 +1,15 @@
 set(PROJECT lxqt-panel)
 
+# Window Manager abstraction backend
+add_subdirectory(backends)
+
+# TODO: allow compile time selection via CMake variables
+set(PANEL_BACKENDS
+    lxqt-panel-backend-wayland
+    lxqt-panel-backend-xcb
+)
+
+
 set(PRIV_HEADERS
     panelpluginsmodel.h
     windownotifier.h
@@ -74,7 +84,7 @@ endif ()
 
 project(${PROJECT})
 
-set(QTX_LIBRARIES Qt5::Widgets Qt5::Xml Qt5::DBus)
+set(QTX_LIBRARIES Qt6::Widgets Qt6::Xml Qt6::DBus)
 
 # Translations
 lxqt_translate_ts(QM_FILES SOURCES
@@ -102,7 +112,9 @@ add_executable(${PROJECT}
 target_link_libraries(${PROJECT}
     ${LIBRARIES}
     ${QTX_LIBRARIES}
-    KF5::WindowSystem
+    KF6::WindowSystem
+    ${PANEL_BACKENDS}
+    LayerShellQt::Interface
     ${STATIC_PLUGINS}
 )
 

panel/backends/CMakeLists.txt

@@ -0,0 +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

@@ -0,0 +1,25 @@
+#include "ilxqttaskbarabstractbackend.h"
+
+
+ILXQtTaskbarAbstractBackend::ILXQtTaskbarAbstractBackend(QObject *parent)
+    : QObject(parent)
+{
+
+}
+
+void ILXQtTaskbarAbstractBackend::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

@@ -0,0 +1,97 @@
+#ifndef ILXQTTASKBARABSTRACTBACKEND_H
+#define ILXQTTASKBARABSTRACTBACKEND_H
+
+#include <QObject>
+
+#include "lxqttaskbartypes.h"
+
+class QIcon;
+class QScreen;
+
+class ILXQtTaskbarAbstractBackend : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit ILXQtTaskbarAbstractBackend(QObject *parent = nullptr);
+
+    // Backend
+    virtual bool supportsAction(WId windowId, LXQtTaskBarBackendAction action) const = 0;
+
+    // Windows
+    virtual bool reloadWindows() = 0;
+
+    virtual QVector<WId> getCurrentWindows() const = 0;
+
+    virtual QString getWindowTitle(WId windowId) const = 0;
+
+    virtual bool applicationDemandsAttention(WId windowId) const = 0;
+
+    virtual QIcon getApplicationIcon(WId windowId, int fallbackDevicePixels) const = 0;
+
+    virtual QString getWindowClass(WId windowId) const = 0;
+
+    virtual LXQtTaskBarWindowLayer getWindowLayer(WId windowId) const = 0;
+    virtual bool setWindowLayer(WId windowId, LXQtTaskBarWindowLayer layer) = 0;
+
+    virtual LXQtTaskBarWindowState getWindowState(WId windowId) const = 0;
+    virtual bool setWindowState(WId windowId, LXQtTaskBarWindowState state, bool set = true) = 0;
+
+    virtual bool isWindowActive(WId windowId) const = 0;
+    virtual bool raiseWindow(WId windowId, bool onCurrentWorkSpace) = 0;
+
+    virtual bool closeWindow(WId windowId) = 0;
+
+    virtual WId getActiveWindow() const = 0;
+
+    // Workspaces
+    // NOTE: indexes are 1-based, 0 means "Show on All desktops"
+    virtual int getWorkspacesCount() const = 0;
+    virtual QString getWorkspaceName(int idx) const = 0;
+
+    virtual int getCurrentWorkspace() const = 0;
+    virtual bool setCurrentWorkspace(int idx) = 0;
+
+    virtual int getWindowWorkspace(WId windowId) const = 0;
+    virtual bool setWindowOnWorkspace(WId windowId, int idx) = 0;
+
+    virtual void moveApplicationToPrevNextDesktop(WId windowId, bool next); // Default implementation
+    virtual void moveApplicationToPrevNextMonitor(WId windowId, bool next, bool raiseOnCurrentDesktop) = 0;
+
+    virtual bool isWindowOnScreen(QScreen *screen, WId windowId) const = 0;
+
+    // X11 Specific
+    virtual void moveApplication(WId windowId) = 0;
+    virtual void resizeApplication(WId windowId) = 0;
+
+    virtual void refreshIconGeometry(WId windowId, const QRect &geom) = 0;
+
+    // Panel internal
+    virtual bool isAreaOverlapped(const QRect& area) const = 0;
+
+    // Show Destop TODO: split in multiple interfeces, this is becoming big
+    // NOTE: KWindowSystem already has these functions
+    // However on Wayland they are only compatible with KWin
+    // because internally it uses org_kde_plasma_window_management protocol
+    // We make this virtual so it can be implemented also for other compositors
+    virtual bool isShowingDesktop() const = 0;
+    virtual bool showDesktop(bool value) = 0;
+
+signals:
+    void reloaded();
+
+    // Windows
+    void windowAdded(WId windowId);
+    void windowRemoved(WId windowId);
+    void windowPropertyChanged(WId windowId, int prop);
+
+    // Workspaces
+    void workspacesCountChanged();
+    void workspaceNameChanged(int idx);
+    void currentWorkspaceChanged(int idx);
+
+    // TODO: needed?
+    void activeWindowChanged(WId windowId);
+};
+
+#endif // ILXQTTASKBARABSTRACTBACKEND_H