yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Provide extra information about outputs to effects

Browse source 
Adds output manufacturer, model and serial number to EffectScreen.
This commit is contained in:
David Redondo 2022-06-29 13:46:05 +02:00
parent 499474ed66
commit ab55c0276f
4 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/effects.cpp
View file

@ -1885,6 +1885,21 @@ QString EffectScreenImpl::name() const
return m_platformOutput->name(); 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 qreal EffectScreenImpl::devicePixelRatio() const
{ {
return m_platformOutput->scale(); return m_platformOutput->scale();

3
src/effects.h
View file

@ -362,6 +362,9 @@ public:
Output *platformOutput() const; Output *platformOutput() const;
QString name() const override; QString name() const override;
QString manufacturer() const override;
QString model() const override;
QString serialNumber() const override;
qreal devicePixelRatio() const override; qreal devicePixelRatio() const override;
QRect geometry() const override; QRect geometry() const override;
int refreshRate() const override; int refreshRate() const override;

2
src/libkwineffects/CMakeLists.txt
View file

@ -5,7 +5,7 @@ ecm_setup_version(${PROJECT_VERSION}
VARIABLE_PREFIX KWINEFFECTS VARIABLE_PREFIX KWINEFFECTS
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kwineffects_version.h" VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kwineffects_version.h"
PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KWinEffectsConfigVersion.cmake" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KWinEffectsConfigVersion.cmake"
SOVERSION 13 SOVERSION 14
) )
### effects lib ### ### effects lib ###

7
src/libkwineffects/kwineffects.h
View file

@ -1941,6 +1941,9 @@ class KWINEFFECTS_EXPORT EffectScreen : public QObject
Q_PROPERTY(QRect geometry READ geometry NOTIFY geometryChanged) Q_PROPERTY(QRect geometry READ geometry NOTIFY geometryChanged)
Q_PROPERTY(qreal devicePixelRatio READ devicePixelRatio NOTIFY devicePixelRatioChanged) Q_PROPERTY(qreal devicePixelRatio READ devicePixelRatio NOTIFY devicePixelRatioChanged)
Q_PROPERTY(QString name READ name CONSTANT) 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) Q_PROPERTY(qreal refreshRate READ refreshRate CONSTANT)
public: public:
@ -1982,6 +1985,10 @@ public:
Q_ENUM(Transform) Q_ENUM(Transform)
virtual Transform transform() const = 0; virtual Transform transform() const = 0;
virtual QString manufacturer() const = 0;
virtual QString model() const = 0;
virtual QString serialNumber() const = 0;
Q_SIGNALS: Q_SIGNALS:
/** /**
* Notifies that the display will be dimmed in @p time ms. * Notifies that the display will be dimmed in @p time ms.