From ab55c0276f066069fe28475f42bf148f15315b36 Mon Sep 17 00:00:00 2001 From: David Redondo Date: Wed, 29 Jun 2022 13:46:05 +0200 Subject: [PATCH] Provide extra information about outputs to effects Adds output manufacturer, model and serial number to EffectScreen. --- src/effects.cpp | 15 +++++++++++++++ src/effects.h | 3 +++ src/libkwineffects/CMakeLists.txt | 2 +- src/libkwineffects/kwineffects.h | 7 +++++++ 4 files changed, 26 insertions(+), 1 deletion(-) diff --git a/src/effects.cpp b/src/effects.cpp index be0f1c506c..4ab1d62271 100644 --- a/src/effects.cpp +++ b/src/effects.cpp @@ -1885,6 +1885,21 @@ QString EffectScreenImpl::name() const return m_platformOutput->name(); } +QString EffectScreenImpl::manufacturer() const +{ + return m_platformOutput->manufacturer(); +} + +QString EffectScreenImpl::model() const +{ + return m_platformOutput->model(); +} + +QString EffectScreenImpl::serialNumber() const +{ + return m_platformOutput->serialNumber(); +} + qreal EffectScreenImpl::devicePixelRatio() const { return m_platformOutput->scale(); diff --git a/src/effects.h b/src/effects.h index a31d7331e4..31831df262 100644 --- a/src/effects.h +++ b/src/effects.h @@ -362,6 +362,9 @@ public: Output *platformOutput() const; QString name() const override; + QString manufacturer() const override; + QString model() const override; + QString serialNumber() const override; qreal devicePixelRatio() const override; QRect geometry() const override; int refreshRate() const override; diff --git a/src/libkwineffects/CMakeLists.txt b/src/libkwineffects/CMakeLists.txt index 2924900234..c475f5ab24 100644 --- a/src/libkwineffects/CMakeLists.txt +++ b/src/libkwineffects/CMakeLists.txt @@ -5,7 +5,7 @@ ecm_setup_version(${PROJECT_VERSION} VARIABLE_PREFIX KWINEFFECTS VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kwineffects_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KWinEffectsConfigVersion.cmake" - SOVERSION 13 + SOVERSION 14 ) ### effects lib ### diff --git a/src/libkwineffects/kwineffects.h b/src/libkwineffects/kwineffects.h index 3b9bebee45..209dff3d5d 100644 --- a/src/libkwineffects/kwineffects.h +++ b/src/libkwineffects/kwineffects.h @@ -1941,6 +1941,9 @@ class KWINEFFECTS_EXPORT EffectScreen : public QObject Q_PROPERTY(QRect geometry READ geometry NOTIFY geometryChanged) Q_PROPERTY(qreal devicePixelRatio READ devicePixelRatio NOTIFY devicePixelRatioChanged) Q_PROPERTY(QString name READ name CONSTANT) + Q_PROPERTY(QString manufacturer READ manufacturer CONSTANT) + Q_PROPERTY(QString model READ model CONSTANT) + Q_PROPERTY(QString serialNumber READ serialNumber CONSTANT) Q_PROPERTY(qreal refreshRate READ refreshRate CONSTANT) public: @@ -1982,6 +1985,10 @@ public: Q_ENUM(Transform) virtual Transform transform() const = 0; + virtual QString manufacturer() const = 0; + virtual QString model() const = 0; + virtual QString serialNumber() const = 0; + Q_SIGNALS: /** * Notifies that the display will be dimmed in @p time ms.