From 5272588270bd7cc3470eca07077909bc0993f826 Mon Sep 17 00:00:00 2001 From: Fabio Lenherr Date: Thu, 22 Sep 2022 00:45:56 +0200 Subject: [PATCH] fix silly mistakes --- src/render/Renderer.cpp | 124 ++++++++++++++++++++-------------------- 1 file changed, 63 insertions(+), 61 deletions(-) diff --git a/src/render/Renderer.cpp b/src/render/Renderer.cpp index 8b16316c..db7cf0ef 100644 --- a/src/render/Renderer.cpp +++ b/src/render/Renderer.cpp @@ -981,76 +981,78 @@ bool CHyprRenderer::applyMonitorRule(CMonitor* pMonitor, SMonitorRule* pMonitorR } 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); } + } else { + 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; + } + } 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; - } + //(-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; - } - } - } + } } + } 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); + 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); + 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); + 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); if (!PREFERREDMODE) {