mirror of
https://github.com/hyprwm/Hyprland
synced 2024-12-23 03:09:48 +01:00
Merge pull request #706 from DashieTM/main
Add "highest" mode to Monitor for autoconfiguration.
This commit is contained in:
commit
abee2da5bd
2 changed files with 77 additions and 6 deletions
|
@ -460,6 +460,10 @@ void CConfigManager::handleMonitor(const std::string& command, const std::string
|
||||||
|
|
||||||
if (curitem.find("pref") == 0) {
|
if (curitem.find("pref") == 0) {
|
||||||
newrule.resolution = Vector2D();
|
newrule.resolution = Vector2D();
|
||||||
|
} else if(curitem.find("highrr") == 0) {
|
||||||
|
newrule.resolution = Vector2D(-1,-1);
|
||||||
|
} else if(curitem.find("highres") == 0) {
|
||||||
|
newrule.resolution = Vector2D(-1,-2);
|
||||||
} else {
|
} else {
|
||||||
newrule.resolution.x = stoi(curitem.substr(0, curitem.find_first_of('x')));
|
newrule.resolution.x = stoi(curitem.substr(0, curitem.find_first_of('x')));
|
||||||
newrule.resolution.y = stoi(curitem.substr(curitem.find_first_of('x') + 1, curitem.find_first_of('@')));
|
newrule.resolution.y = stoi(curitem.substr(curitem.find_first_of('x') + 1, curitem.find_first_of('@')));
|
||||||
|
|
|
@ -924,7 +924,7 @@ bool CHyprRenderer::applyMonitorRule(CMonitor* pMonitor, SMonitorRule* pMonitorR
|
||||||
pMonitor->vecPosition = pMonitorRule->offset;
|
pMonitor->vecPosition = pMonitorRule->offset;
|
||||||
|
|
||||||
// loop over modes and choose an appropriate one.
|
// loop over modes and choose an appropriate one.
|
||||||
if (pMonitorRule->resolution != Vector2D()) {
|
if (pMonitorRule->resolution != Vector2D() && pMonitorRule->resolution != Vector2D(-1,-1) && pMonitorRule->resolution != Vector2D(-1,-2)) {
|
||||||
if (!wl_list_empty(&pMonitor->output->modes)) {
|
if (!wl_list_empty(&pMonitor->output->modes)) {
|
||||||
wlr_output_mode* mode;
|
wlr_output_mode* mode;
|
||||||
bool found = false;
|
bool found = false;
|
||||||
|
@ -981,12 +981,79 @@ bool CHyprRenderer::applyMonitorRule(CMonitor* pMonitor, SMonitorRule* pMonitorR
|
||||||
} else {
|
} else {
|
||||||
Debug::log(LOG, "Set a custom mode %ix%i@%2f (mode not found in monitor modes)", (int)pMonitorRule->resolution.x, (int)pMonitorRule->resolution.y, (float)pMonitorRule->refreshRate);
|
Debug::log(LOG, "Set a custom mode %ix%i@%2f (mode not found in monitor modes)", (int)pMonitorRule->resolution.x, (int)pMonitorRule->resolution.y, (float)pMonitorRule->refreshRate);
|
||||||
}
|
}
|
||||||
}
|
} else {
|
||||||
} else {
|
wlr_output_set_custom_mode(pMonitor->output, (int)pMonitorRule->resolution.x, (int)pMonitorRule->resolution.y, (int)pMonitorRule->refreshRate * 1000);
|
||||||
wlr_output_set_custom_mode(pMonitor->output, (int)pMonitorRule->resolution.x, (int)pMonitorRule->resolution.y, (int)pMonitorRule->refreshRate * 1000);
|
pMonitor->vecSize = pMonitorRule->resolution;
|
||||||
pMonitor->vecSize = pMonitorRule->resolution;
|
|
||||||
|
|
||||||
Debug::log(LOG, "Setting custom mode for %s", pMonitor->output->name);
|
Debug::log(LOG, "Setting custom mode for %s", pMonitor->output->name);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else if(pMonitorRule->resolution != Vector2D()) {
|
||||||
|
if (!wl_list_empty(&pMonitor->output->modes)) {
|
||||||
|
wlr_output_mode* mode;
|
||||||
|
float currentWidth = 0;
|
||||||
|
float currentHeight = 0;
|
||||||
|
float currentRefresh = 0;
|
||||||
|
bool success = false;
|
||||||
|
|
||||||
|
//(-1,-1) indicates a preference to refreshrate over resolution, (-1,-2) preference to resolution
|
||||||
|
if(pMonitorRule->resolution == Vector2D(-1,-1)) {
|
||||||
|
wl_list_for_each(mode, &pMonitor->output->modes, link) {
|
||||||
|
if( ( mode->width >= currentWidth && mode->height >= currentHeight && mode->refresh >= ( currentRefresh - 1000.f ) ) || mode->refresh > ( currentRefresh + 3000.f ) ) {
|
||||||
|
wlr_output_set_mode(pMonitor->output, mode);
|
||||||
|
if (wlr_output_test(pMonitor->output)) {
|
||||||
|
currentWidth = mode->width;
|
||||||
|
currentHeight = mode->height;
|
||||||
|
currentRefresh = mode->refresh;
|
||||||
|
success = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
wl_list_for_each(mode, &pMonitor->output->modes, link) {
|
||||||
|
if( ( mode->width >= currentWidth && mode->height >= currentHeight && mode->refresh >= ( currentRefresh - 1000.f ) ) || ( mode->width > currentWidth && mode->height > currentHeight ) ) {
|
||||||
|
wlr_output_set_mode(pMonitor->output, mode);
|
||||||
|
if (wlr_output_test(pMonitor->output)) {
|
||||||
|
currentWidth = mode->width;
|
||||||
|
currentHeight = mode->height;
|
||||||
|
currentRefresh = mode->refresh;
|
||||||
|
success = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!success) {
|
||||||
|
Debug::log(LOG, "Monitor %s: REJECTED mode: %ix%i@%2f! Falling back to preferred.",
|
||||||
|
pMonitor->output->name, (int)pMonitorRule->resolution.x, (int)pMonitorRule->resolution.y, (float)pMonitorRule->refreshRate,
|
||||||
|
mode->width, mode->height, mode->refresh / 1000.f);
|
||||||
|
|
||||||
|
const auto PREFERREDMODE = wlr_output_preferred_mode(pMonitor->output);
|
||||||
|
|
||||||
|
if (!PREFERREDMODE) {
|
||||||
|
Debug::log(ERR, "Monitor %s has NO PREFERRED MODE, and an INVALID one was requested: %ix%i@%2f",
|
||||||
|
(int)pMonitorRule->resolution.x, (int)pMonitorRule->resolution.y, (float)pMonitorRule->refreshRate);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Preferred is valid
|
||||||
|
wlr_output_set_mode(pMonitor->output, PREFERREDMODE);
|
||||||
|
|
||||||
|
Debug::log(ERR, "Monitor %s got an invalid requested mode: %ix%i@%2f, using the preferred one instead: %ix%i@%2f",
|
||||||
|
pMonitor->output->name, (int)pMonitorRule->resolution.x, (int)pMonitorRule->resolution.y, (float)pMonitorRule->refreshRate,
|
||||||
|
PREFERREDMODE->width, PREFERREDMODE->height, PREFERREDMODE->refresh / 1000.f);
|
||||||
|
|
||||||
|
pMonitor->refreshRate = PREFERREDMODE->refresh / 1000.f;
|
||||||
|
pMonitor->vecSize = Vector2D(PREFERREDMODE->width, PREFERREDMODE->height);
|
||||||
|
} else {
|
||||||
|
|
||||||
|
Debug::log(LOG, "Monitor %s: Applying highest mode %ix%i@%2f.",
|
||||||
|
pMonitor->output->name, (int)currentWidth, (int)currentHeight, (int)currentRefresh / 1000.f,
|
||||||
|
mode->width, mode->height, mode->refresh / 1000.f);
|
||||||
|
|
||||||
|
pMonitor->refreshRate = currentRefresh / 1000.f;
|
||||||
|
pMonitor->vecSize = Vector2D(currentWidth, currentHeight);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
const auto PREFERREDMODE = wlr_output_preferred_mode(pMonitor->output);
|
const auto PREFERREDMODE = wlr_output_preferred_mode(pMonitor->output);
|
||||||
|
|
Loading…
Reference in a new issue