feat: add brightness control for Treeland compositor

1. Implement color control protocol support for brightness adjustment
2. Add scale factor consideration in screen dimension calculations
3. Improve Wayland output management with proper event handling
4. Add brightness synchronization between compositor and display
settings

Log: Added brightness control support for Treeland compositor

Influence:
1. Test brightness adjustment on monitors with Treeland compositor
2. Verify screen resolution calculations account for scale factor
3. Check monitor detection and removal with brightness controls
4. Test multi-monitor setup with individual brightness settings
5. Verify brightness changes persist across display configuration
changes

feat: 为 Treeland 合成器添加亮度控制功能

1. 实现颜色控制协议支持亮度调节
2. 在屏幕尺寸计算中考虑缩放因子
3. 改进 Wayland 输出管理，完善事件处理
4. 添加合成器与显示设置之间的亮度同步

Log: 新增 Treeland 合成器的亮度控制支持

Influence:
1. 在 Treeland 合成器环境下测试显示器亮度调节
2. 验证屏幕分辨率计算是否考虑缩放因子
3. 检查带亮度控制的显示器检测和移除功能
4. 测试多显示器环境下的独立亮度设置
5. 验证亮度变更在显示配置更改后是否持久化

PMS: BUG-344299

Author: caixr23

debian/control

@@ -27,6 +27,7 @@ Build-Depends:
  qt6-wayland-dev,
  qt6-wayland-private-dev,
  qt6-wayland-dev-tools,
+ wlr-protocols,
  treeland-protocols(>=0.4.1),
  systemd,
  libdareader-dev,

src/plugin-display/CMakeLists.txt

@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.18)
 ###########################################
 function(ws_generate_local type input_file output_name)
     pkg_get_variable(WAYLAND_SCANNER wayland-scanner wayland_scanner)
+    message(${input_file})
     execute_process(COMMAND ${WAYLAND_SCANNER}
         ${type}-header
         ${input_file}
@@ -16,19 +17,27 @@ function(ws_generate_local type input_file output_name)
 endfunction()
 
 find_package(PkgConfig REQUIRED)
+find_package(TreelandProtocols REQUIRED)
 pkg_check_modules(WaylandClient REQUIRED IMPORTED_TARGET wayland-client)
+pkg_check_modules(WLR_PROTOCOLS REQUIRED wlr-protocols)
+
+execute_process(
+    COMMAND pkg-config --variable=pkgdatadir wlr-protocols
+    OUTPUT_VARIABLE WLR_PROTOCOLS_XML_DIR
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+)
 
 ws_generate_local(client
-    ${CMAKE_CURRENT_SOURCE_DIR}/wayland/libwayqt/protocols/wlr-output-management-unstable-v1.xml
+    ${WLR_PROTOCOLS_XML_DIR}/unstable/wlr-output-management-unstable-v1.xml
     wlr-output-management-unstable-v1-client-protocol)
 
 ws_generate_local(client
-    ${CMAKE_CURRENT_SOURCE_DIR}/wayland/libwayqt/protocols/treeland-output-management.xml
+    ${TREELAND_PROTOCOLS_DATA_DIR}/treeland-output-manager-v1.xml
     treeland-output-management-client-protocol)
 
 file(GLOB_RECURSE LIBWAYQT_SRCS
     "wayland/libwayqt/*.cpp"
-    "wayland/libwayqt/*.hpp"
+    "wayland/libwayqt/*.h"
 )
 
 add_library(libwayqt6

src/plugin-display/operation/dccscreen.cpp

@@ -317,12 +317,12 @@ int DccScreen::y() const
 
 int DccScreen::width() const
 {
-    return d_ptrDccScreen->monitor()->w();
+    return d_ptrDccScreen->monitor()->scale() > 0 ? (d_ptrDccScreen->monitor()->w() / d_ptrDccScreen->monitor()->scale()) : d_ptrDccScreen->monitor()->w();
 }
 
 int DccScreen::height() const
 {
-    return d_ptrDccScreen->monitor()->h();
+    return d_ptrDccScreen->monitor()->scale() > 0 ? (d_ptrDccScreen->monitor()->h() / d_ptrDccScreen->monitor()->scale()) : d_ptrDccScreen->monitor()->h();
 }
 
 QSize DccScreen::bestResolution() const

src/plugin-display/operation/displaymodule.cpp

@@ -1,9 +1,9 @@
-// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 #include "displaymodule.h"
 
-#include "WayQtUtils.hpp"
+#include "WayQtUtils.h"
 #include "dccfactory.h"
 #include "dccscreen.h"
 #include "private/concatscreen.h"

src/plugin-display/operation/private/displayworker.cpp

@@ -1,4 +1,4 @@
-//SPDX-FileCopyrightText: 2018 - 2024 UnionTech Software Technology Co., Ltd.
+//SPDX-FileCopyrightText: 2018 - 2026 UnionTech Software Technology Co., Ltd.
 //
 //SPDX-License-Identifier: GPL-3.0-or-later
 #include "displayworker.h"
@@ -12,11 +12,11 @@
 #include <QJsonObject>
 #include <QLoggingCategory>
 
-#include <Registry.hpp>
-#include <WayQtUtils.hpp>
-#include <OutputManager.hpp>
-#include <Output.hpp>
-#include <TreeLandOutputManager.hpp>
+#include <Registry.h>
+#include <WayQtUtils.h>
+#include <OutputManager.h>
+#include <Output.h>
+#include <TreeLandOutputManager.h>
 
 Q_LOGGING_CATEGORY(DdcDisplayWorker, "dcc-display-worker")
 
@@ -41,14 +41,8 @@ DisplayWorker::DisplayWorker(DisplayModel *model, QObject *parent, bool isSync)
 
     if (WQt::Utils::isTreeland()) {
         m_reg = new WQt::Registry(WQt::Wayland::display(), this);
+        connect(m_reg, &WQt::Registry::interfaceRegistered, this, &DisplayWorker::onInterfaceRegistered);
         m_reg->setup();
-        auto *opMgr = m_reg->outputManager();
-        if (!opMgr) {
-            qFatal("Unable to start the output manager");
-        }
-        connect(opMgr, &WQt::OutputManager::done, this, [this]() {
-            onWlMonitorListChanged();
-        });
     } else {
         connect(m_displayInter, &DisplayDBusProxy::WallpaperURlsChanged, this, &DisplayWorker::updateWallpaper);
         connect(m_displayInter, &DisplayDBusProxy::WorkspaceSwitched, this, &DisplayWorker::updateWallpaper);
@@ -84,20 +78,7 @@ DisplayWorker::~DisplayWorker()
 
 void DisplayWorker::active()
 {
-    if (WQt::Utils::isTreeland()) {
-        m_reg->outputManager()->waitForDone();
-        onWlMonitorListChanged();
-
-        m_model->setDisplayMode(EXTEND_MODE); // TODO: use dconfig
-        auto *treelandOpMgr = m_reg->treeLandOutputManager();
-        m_model->setPrimary(treelandOpMgr->mPrimaryOutput);
-        connect(treelandOpMgr, &WQt::TreeLandOutputManager::primaryOutputChanged, this, [this](){
-            m_model->setPrimary(m_reg->treeLandOutputManager()->mPrimaryOutput);
-        });
-
-        m_model->setResolutionRefreshEnable(true);
-        m_model->setBrightnessEnable(false); // TODO: support gamma effects
-    } else {
+    if (!WQt::Utils::isTreeland()) {
         //    m_model->setAllowEnableMultiScaleRatio(
         //        valueByQSettings<bool>(DCC_CONFIG_FILES,
         //                               "Display",
@@ -234,6 +215,11 @@ void DisplayWorker::onWlMonitorListChanged()
         if (isNew)
             wlMonitorAdded(head);
     }
+    for (auto output : m_reg->waylandOutputs()) {
+        wlOutputAdded(output);
+    }
+    connect(m_reg, &WQt::Registry::outputAdded, this, &DisplayWorker::wlOutputAdded);
+    connect(m_reg, &WQt::Registry::outputRemoved, this, &DisplayWorker::wlOutputRemoved);
 }
 
 void DisplayWorker::updateWallpaper()
@@ -248,6 +234,17 @@ void DisplayWorker::updateMonitorWallpaper(Monitor *mon)
     mon->setWallpaper(m_displayInter->GetCurrentWorkspaceBackgroundForMonitor(mon->name()));
 }
 
+void DisplayWorker::onBrightnessChanged(const treeland_output_color_control_v1 *colorControl, double brightness)
+{
+    brightness = qBound(0.0, brightness / 100.0, 1.0);
+    for (auto it(m_control_monitors.cbegin()); it != m_control_monitors.cend(); ++it) {
+        if (it.value() == colorControl) {
+            it.key()->setBrightness(brightness);
+            return;
+        }
+    }
+}
+
 void DisplayWorker::onMonitorsBrightnessChanged(const BrightnessMap &brightness)
 {
     if (brightness.isEmpty())
@@ -283,6 +280,39 @@ void DisplayWorker::onGetScreenScalesFinished(QDBusPendingCallWatcher *w)
     w->deleteLater();
 }
 
+void DisplayWorker::onInterfaceRegistered(WQt::Registry::Interface interface)
+{
+    switch (interface) {
+    case WQt::Registry::OutputManagerInterface: {
+        auto *opMgr = m_reg->outputManager();
+        if (!opMgr) {
+            qCFatal(DdcDisplayWorker) << "Unable to start the output manager";
+        }
+        connect(opMgr, &WQt::OutputManager::done, this, &DisplayWorker::onWlOutputManagerDone);
+    } break;
+    case WQt::Registry::TreeLandOutputManagerInterface: {
+        connect(m_reg->treeLandOutputManager(), &WQt::TreeLandOutputManager::brightnessChanged, this, &DisplayWorker::onBrightnessChanged);
+    } break;
+    default:
+        break;
+    }
+}
+
+void DisplayWorker::onWlOutputManagerDone()
+{
+    onWlMonitorListChanged();
+
+    m_model->setDisplayMode(EXTEND_MODE); // TODO: use dconfig
+    auto *treelandOpMgr = m_reg->treeLandOutputManager();
+    m_model->setPrimary(treelandOpMgr->mPrimaryOutput);
+    connect(treelandOpMgr, &WQt::TreeLandOutputManager::primaryOutputChanged, this, [this](){
+        m_model->setPrimary(m_reg->treeLandOutputManager()->mPrimaryOutput);
+    });
+
+    m_model->setResolutionRefreshEnable(true);
+    m_model->setBrightnessEnable(false); // TODO: support gamma effects
+}
+
 #ifndef DCC_DISABLE_ROTATE
 
 constexpr static int wlRotate2dcc(int wlRotate) {
@@ -511,6 +541,13 @@ void DisplayWorker::setMonitorBrightness(Monitor *mon, const double brightness)
         auto *gammaConfig = m_wl_gammaConfig->value(mon);
         gammaConfig->brightness = brightness;
         gammaEffect->setConfiguration(*gammaConfig);
+#else
+        for (auto it(m_control_monitors.cbegin()); it != m_control_monitors.cend(); ++it) {
+            if (it.key() == mon) {
+                m_reg->treeLandOutputManager()->setBrightness(it.value(), brightness * 100.0);
+                break;
+            }
+        }
 #endif
     } else {
         m_displayInter->SetAndSaveBrightness(mon->name(), std::max(brightness, m_model->minimumBrightnessScale())).waitForFinished();
@@ -544,7 +581,7 @@ void DisplayWorker::setMonitorPosition(QHash<Monitor *, QPair<int, int>> monitor
 
 void DisplayWorker::setUiScale(const double value)
 {
-    qDebug() << "set display scale:" << value;
+    qCDebug(DdcDisplayWorker) << "set display scale:" << value;
     double rv = value;
     if (rv < 0)
         rv = m_model->uiScale();
@@ -563,7 +600,7 @@ void DisplayWorker::setUiScale(const double value)
             cfgHead->setScale(rv);
         }
         opCfg->apply();
-        connect(opCfg, &WQt::OutputConfiguration::succeeded, this, [ this, rv ]() {
+        connect(opCfg, &WQt::OutputConfiguration::succeeded, this, [this, rv]() {
             m_model->setUIScale(rv);
         });
     } else {
@@ -876,10 +913,42 @@ void DisplayWorker::wlMonitorRemoved(WQt::OutputHead *head)
     head->deleteLater();
 
     m_wl_monitors.remove(monitor);
+    if (m_control_monitors.contains(monitor)) {
+        m_reg->treeLandOutputManager()->destroyColorControl(m_control_monitors.value(monitor));
+        m_control_monitors.remove(monitor);
+    }
 
     monitor->deleteLater();
 }
 
+void DisplayWorker::wlOutputAdded(WQt::Output *output)
+{
+    connect(output, &WQt::Output::done, this, &DisplayWorker::updateControl);
+}
+
+void DisplayWorker::wlOutputRemoved(WQt::Output *output)
+{
+    Q_UNUSED(output);
+    // TODO:
+}
+
+void DisplayWorker::updateControl()
+{
+    for (auto output : m_reg->waylandOutputs()) {
+        if (output->isReady()) {
+            for (auto it(m_wl_monitors.cbegin()); it != m_wl_monitors.cend(); ++it) {
+                if (it.key()->name() == output->name()) {
+                    if (!m_control_monitors.contains(it.key())) {
+                        auto control = m_reg->treeLandOutputManager()->getColorControl(output->get());
+                        m_control_monitors.insert(it.key(), control);
+                    }
+                    break;
+                }
+            }
+        }
+    }
+}
+
 void DisplayWorker::setAmbientLightAdjustBrightness(bool able)
 {
     m_displayInter->setAmbientLightAdjustBrightness(able);

src/plugin-display/operation/private/displayworker.h

@@ -1,9 +1,10 @@
-//SPDX-FileCopyrightText: 2018 - 2024 UnionTech Software Technology Co., Ltd.
+//SPDX-FileCopyrightText: 2018 - 2026 UnionTech Software Technology Co., Ltd.
 //
 //SPDX-License-Identifier: GPL-3.0-or-later
 #ifndef DISPLAYWORKER_H
 #define DISPLAYWORKER_H
 
+#include "Registry.h"
 #include "displaydbusproxy.h"
 #include "monitor.h"
 
@@ -29,6 +30,7 @@ namespace WQt {
     class Registry;
     class OutputHead;
 }
+struct treeland_output_color_control_v1;
 
 namespace dccV25 {
 class DisplayModel;
@@ -76,10 +78,14 @@ private Q_SLOTS:
     void onGetScreenScalesFinished(QDBusPendingCallWatcher *w);
 
     // for wlroots-based compositors
+    void onInterfaceRegistered(WQt::Registry::Interface interface);
+    void onWlOutputManagerDone();
     void onWlMonitorListChanged();
     void updateWallpaper();
     void updateMonitorWallpaper(Monitor *mon);
 
+    void onBrightnessChanged(const treeland_output_color_control_v1 *colorControl, double brightness);
+
 private:
     void monitorAdded(const QString &path);
     void monitorRemoved(const QString &path);
@@ -88,6 +94,11 @@ private Q_SLOTS:
     void wlMonitorAdded(WQt::OutputHead *head);
     void wlMonitorRemoved(WQt::OutputHead *head);
 
+    void wlOutputAdded(WQt::Output *output);
+    void wlOutputRemoved(WQt::Output *output);
+
+    void updateControl();
+
 Q_SIGNALS:
     void requestUpdateModeList();
 
@@ -99,6 +110,7 @@ private Q_SLOTS:
     // for wlroots-based compositors
     WQt::Registry *m_reg { nullptr };
     QMap<Monitor *, WQt::OutputHead *> m_wl_monitors;
+    QMap<Monitor *, treeland_output_color_control_v1 *> m_control_monitors;
 #if GAMMA_SUPPORT
     QMap<Monitor *, DFL::GammaEffects *> *m_wl_gammaEffects;
     QMap<Monitor *, DFL::GammaEffectsConfig *> *m_wl_gammaConfig;

src/plugin-display/wayland/libwayqt/Output.cpp

@@ -1,31 +1,10 @@
-/**
- * The MIT License (MIT)
- *
- * Copyright (c) 2021 Marcus Britanicus (https://gitlab.com/marcusbritanicus)
- * Copyright (c) 2021 Abrar (https://gitlab.com/s96Abrar)
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- **/
+// SPDX-FileCopyrightText: 2026 UnionTech Software Technology Co., Ltd.
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 #include "wayland-client-protocol.h"
 
-#include "Output.hpp"
+#include "Output.h"
 #include <wayland-client.h>
 
 #include <QCoreApplication>
@@ -96,16 +75,9 @@ int32_t WQt::Output::scale()
     return mScale;
 }
 
-void WQt::Output::waitForReady()
+bool WQt::Output::isReady() const
 {
-    if (mDone) {
-        return;
-    }
-
-    do {
-        QThread::usleep(100);
-        qApp->processEvents();
-    } while (not mDone);
+    return mDone;
 }
 
 wl_output *WQt::Output::get()
@@ -153,6 +125,7 @@ void WQt::Output::handleDone(void *data, struct wl_output *)
     Output *output = reinterpret_cast<WQt::Output *>(data);
 
     output->mDone = true;
+    Q_EMIT output->done();
 }
 
 void WQt::Output::handleScale(void *data, struct wl_output *, int32_t scale)