cry/Hyprland
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cm: allow force disabling WCG and HDR per monitor (#12733)

Browse source
This commit is contained in:
UjinT34 2025-12-28 16:44:04 +03:00 • committed by GitHub
parent a8452705d6
commit 6a055fc747
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/helpers/Monitor.cpp
View file

@ -1973,11 +1973,22 @@ void CMonitor::onCursorMovedOnMonitor() {
} }
bool CMonitor::supportsWideColor() { bool CMonitor::supportsWideColor() {
return m_supportsWideColor || m_output->parsedEDID.supportsBT2020; switch (m_supportsWideColor) {
case -1: return false;
case 1: return true;
default: return m_output->parsedEDID.supportsBT2020;
}
} }
bool CMonitor::supportsHDR() { bool CMonitor::supportsHDR() {
return supportsWideColor() && (m_supportsHDR || (m_output->parsedEDID.hdrMetadata.has_value() ? m_output->parsedEDID.hdrMetadata->supportsPQ : false)); if (!supportsWideColor())
return false;
switch (m_supportsHDR) {
case -1: return false;
case 1: return true;
default: return m_output->parsedEDID.hdrMetadata.has_value() ? m_output->parsedEDID.hdrMetadata->supportsPQ : false;
}
} }
float CMonitor::minLuminance(float defaultValue) { float CMonitor::minLuminance(float defaultValue) {

12
src/helpers/Monitor.hpp
View file

@ -55,10 +55,10 @@ struct SMonitorRule {
float sdrBrightness = 1.0f; // SDR -> HDR float sdrBrightness = 1.0f; // SDR -> HDR
Desktop::CReservedArea reservedArea; Desktop::CReservedArea reservedArea;
bool supportsWideColor = false; // false does nothing, true overrides EDID int supportsWideColor = 0; // 0 - auto, 1 - force enable, -1 - force disable
bool supportsHDR = false; // false does nothing, true overrides EDID int supportsHDR = 0; // 0 - auto, 1 - force enable, -1 - force disable
float sdrMinLuminance = 0.2f; // SDR -> HDR float sdrMinLuminance = 0.2f; // SDR -> HDR
int sdrMaxLuminance = 80; // SDR -> HDR int sdrMaxLuminance = 80; // SDR -> HDR
// Incorrect values will result in reduced luminance range or incorrect tonemapping. Shouldn't damage the HW. Use with care in case of a faulty monitor firmware. // Incorrect values will result in reduced luminance range or incorrect tonemapping. Shouldn't damage the HW. Use with care in case of a faulty monitor firmware.
float minLuminance = -1.0f; // >= 0 overrides EDID float minLuminance = -1.0f; // >= 0 overrides EDID
@ -368,8 +368,8 @@ class CMonitor {
CHyprSignalListener commit; CHyprSignalListener commit;
} m_listeners; } m_listeners;
bool m_supportsWideColor = false; int m_supportsWideColor = 0;
bool m_supportsHDR = false; int m_supportsHDR = 0;
float m_minLuminance = -1.0f; float m_minLuminance = -1.0f;
int m_maxLuminance = -1; int m_maxLuminance = -1;
int m_maxAvgLuminance = -1; int m_maxAvgLuminance = -1;