Refactor Window Manager interaction (Qt 6 version)

CMakeLists.txt

@@ -29,17 +29,16 @@ 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)

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.
 

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,8 @@
 set(PROJECT lxqt-panel)
 
+# TODO
+add_subdirectory(backends)
+
 set(PRIV_HEADERS
     panelpluginsmodel.h
     windownotifier.h
@@ -18,6 +21,12 @@ 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.
@@ -26,6 +35,9 @@ set(PUB_HEADERS
     pluginsettings.h
     ilxqtpanelplugin.h
     ilxqtpanel.h
+
+    backends/ilxqttaskbarabstractbackend.h
+    backends/lxqttaskbartypes.h
 )
 
 set(SOURCES
@@ -45,6 +57,11 @@ set(SOURCES
     config/configstyling.cpp
     config/configpluginswidget.cpp
     config/addplugindialog.cpp
+
+    backends/ilxqttaskbarabstractbackend.cpp
+
+    backends/lxqttaskbardummybackend.cpp
+    backends/xcb/lxqttaskbarbackend_x11.cpp
 )
 
 set(UI
@@ -74,7 +91,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 +119,7 @@ add_executable(${PROJECT}
 target_link_libraries(${PROJECT}
     ${LIBRARIES}
     ${QTX_LIBRARIES}
-    KF5::WindowSystem
+    KF6::WindowSystem
     ${STATIC_PLUGINS}
 )
 

panel/backends/CMakeLists.txt

@@ -0,0 +1 @@
+add_subdirectory(xcb)

panel/backends/ilxqttaskbarabstractbackend.cpp

@@ -0,0 +1,25 @@
+#include "../panel/backends/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