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

[drm] Fix KConfigGroup resolution for edid overwrite

Browse source 
If one of the edid group identifiers cannot be used as it's empty,
replace it by "unknown".

REVIEW: 123848
This commit is contained in:
Martin Gräßlin 2015-05-19 08:27:38 +02:00
parent 9d580a628f
commit 6581bc62a3
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
backends/drm/drm_backend.cpp
View file

@ -631,7 +631,10 @@ void DrmOutput::init(drmModeConnector *connector)
// the size might be completely borked. E.g. Samsung SyncMaster 2494HS reports 160x90 while in truth it's 520x292 // the size might be completely borked. E.g. Samsung SyncMaster 2494HS reports 160x90 while in truth it's 520x292
// as this information is used to calculate DPI info, it's going to result in everything being huge // as this information is used to calculate DPI info, it's going to result in everything being huge
KSharedConfig::Ptr config = KSharedConfig::openConfig(KWIN_CONFIG); KSharedConfig::Ptr config = KSharedConfig::openConfig(KWIN_CONFIG);
KConfigGroup group = config->group("EdidOverwrite").group(m_edid.eisaId).group(m_edid.monitorName).group(m_edid.serialNumber); const QByteArray unknown = QByteArrayLiteral("unkown");
KConfigGroup group = config->group("EdidOverwrite").group(m_edid.eisaId.isEmpty() ? unknown : m_edid.eisaId)
.group(m_edid.monitorName.isEmpty() ? unknown : m_edid.monitorName)
.group(m_edid.serialNumber.isEmpty() ? unknown : m_edid.serialNumber);
if (group.hasKey("PhysicalSize")) { if (group.hasKey("PhysicalSize")) {
const QSize overwriteSize = group.readEntry("PhysicalSize", physicalSize); const QSize overwriteSize = group.readEntry("PhysicalSize", physicalSize);
qCWarning(KWIN_DRM) << "Overwriting monitor physical size for" << m_edid.eisaId << "/" << m_edid.monitorName << "/" << m_edid.serialNumber << " from " << physicalSize << "to " << overwriteSize; qCWarning(KWIN_DRM) << "Overwriting monitor physical size for" << m_edid.eisaId << "/" << m_edid.monitorName << "/" << m_edid.serialNumber << " from " << physicalSize << "to " << overwriteSize;