mirrors/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland.git synced 2025-10-20 08:51:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

monitor: preferred mode now tries first 3 modes if preferred fails before erroring (#9246)

Browse Source
This commit is contained in:
Ikalco
2025-01-31 06:23:32 -06:00
committed by GitHub
parent ef03f69116
commit e6a9cfab91
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/helpers/Monitor.cpp
View File

@@ -435,7 +435,7 @@ bool CMonitor::applyMonitorRule(SMonitorRule* pMonitorRule, bool force) {
// accumulate requested modes in reverse order (cause inesrting at front is inefficient) // accumulate requested modes in reverse order (cause inesrting at front is inefficient)
std::vector<SP<Aquamarine::SOutputMode>> requestedModes; std::vector<SP<Aquamarine::SOutputMode>> requestedModes;
std::string requestedStr = "preferred"; std::string requestedStr = "unknown";
// use sortFunc, add best 3 to requestedModes in reverse, since we test in reverse // use sortFunc, add best 3 to requestedModes in reverse, since we test in reverse
auto addBest3Modes = [&](auto const& sortFunc) { auto addBest3Modes = [&](auto const& sortFunc) {
@@ -446,13 +446,24 @@ bool CMonitor::applyMonitorRule(SMonitorRule* pMonitorRule, bool force) {
requestedModes.insert(requestedModes.end(), sortedModes.rbegin(), sortedModes.rend()); requestedModes.insert(requestedModes.end(), sortedModes.rbegin(), sortedModes.rend());
}; };
// last fallback is preferred mode, btw this covers resolution == Vector2D() // last fallback is always preferred mode
if (!output->preferredMode()) if (!output->preferredMode())
Debug::log(ERR, "Monitor {} has NO PREFERRED MODE", output->name); Debug::log(ERR, "Monitor {} has NO PREFERRED MODE", output->name);
else else
requestedModes.push_back(output->preferredMode()); requestedModes.push_back(output->preferredMode());
if (RULE->resolution == Vector2D(-1, -1)) { if (RULE->resolution == Vector2D()) {
requestedStr = "preferred";
// fallback to first 3 modes if preferred fails/doesn't exist
requestedModes = output->modes;
if (requestedModes.size() > 3)
requestedModes.erase(requestedModes.begin() + 3, requestedModes.end());
std::ranges::reverse(requestedModes.begin(), requestedModes.end());
if (output->preferredMode())
requestedModes.push_back(output->preferredMode());
} else if (RULE->resolution == Vector2D(-1, -1)) {
requestedStr = "highrr"; requestedStr = "highrr";
// sort prioritizing refresh rate 1st and resolution 2nd, then add best 3 // sort prioritizing refresh rate 1st and resolution 2nd, then add best 3