aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Compositor.cpp4
-rw-r--r--src/config/ConfigManager.cpp32
-rw-r--r--src/events/Misc.cpp4
-rw-r--r--src/events/Monitors.cpp6
-rw-r--r--src/helpers/Monitor.cpp63
-rw-r--r--src/helpers/Monitor.hpp23
-rw-r--r--src/managers/KeybindManager.cpp4
-rw-r--r--src/render/Renderer.cpp87
8 files changed, 123 insertions, 100 deletions
diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index a5550f2f..db2e5f4a 100644
--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
@@ -395,8 +395,8 @@ void CCompositor::cleanup() {
for (auto& m : m_vMonitors) {
g_pHyprOpenGL->destroyMonitorResources(m.get());
- wlr_output_state_set_enabled(&m->outputState, false);
- wlr_output_commit_state(m->output, &m->outputState);
+ wlr_output_state_set_enabled(m->state.wlr(), false);
+ m->state.commit();
}
m_vMonitors.clear();
diff --git a/src/config/ConfigManager.cpp b/src/config/ConfigManager.cpp
index 0e98b977..187d44b6 100644
--- a/src/config/ConfigManager.cpp
+++ b/src/config/ConfigManager.cpp
@@ -2317,28 +2317,24 @@ void CConfigManager::ensureVRR(CMonitor* pMonitor) {
if (USEVRR == 0) {
if (m->vrrActive) {
- wlr_output_state_set_adaptive_sync_enabled(&m->outputState, 0);
+ wlr_output_state_set_adaptive_sync_enabled(m->state.wlr(), 0);
- if (!wlr_output_commit_state(m->output, &m->outputState))
+ if (!m->state.commit())
Debug::log(ERR, "Couldn't commit output {} in ensureVRR -> false", m->output->name);
-
- pMonitor->clearState();
}
m->vrrActive = false;
return;
} else if (USEVRR == 1) {
if (!m->vrrActive) {
- wlr_output_state_set_adaptive_sync_enabled(&m->outputState, 1);
+ wlr_output_state_set_adaptive_sync_enabled(m->state.wlr(), 1);
- if (!wlr_output_test_state(m->output, &m->outputState)) {
+ if (!m->state.test()) {
Debug::log(LOG, "Pending output {} does not accept VRR.", m->output->name);
- wlr_output_state_set_adaptive_sync_enabled(&m->outputState, 0);
+ wlr_output_state_set_adaptive_sync_enabled(m->state.wlr(), 0);
}
- if (!wlr_output_commit_state(m->output, &m->outputState))
+ if (!m->state.commit())
Debug::log(ERR, "Couldn't commit output {} in ensureVRR -> true", m->output->name);
-
- pMonitor->clearState();
}
m->vrrActive = true;
return;
@@ -2354,25 +2350,21 @@ void CConfigManager::ensureVRR(CMonitor* pMonitor) {
const auto WORKSPACEFULL = PWORKSPACE->m_bHasFullscreenWindow && PWORKSPACE->m_efFullscreenMode == FULLSCREEN_FULL;
if (WORKSPACEFULL && m->output->adaptive_sync_status == WLR_OUTPUT_ADAPTIVE_SYNC_DISABLED) {
- wlr_output_state_set_adaptive_sync_enabled(&m->outputState, 1);
+ wlr_output_state_set_adaptive_sync_enabled(m->state.wlr(), 1);
- if (!wlr_output_test_state(m->output, &m->outputState)) {
+ if (!m->state.test()) {
Debug::log(LOG, "Pending output {} does not accept VRR.", m->output->name);
- wlr_output_state_set_adaptive_sync_enabled(&m->outputState, 0);
+ wlr_output_state_set_adaptive_sync_enabled(m->state.wlr(), 0);
}
- if (!wlr_output_commit_state(m->output, &m->outputState))
+ if (!m->state.commit())
Debug::log(ERR, "Couldn't commit output {} in ensureVRR -> true", m->output->name);
- pMonitor->clearState();
-
} else if (!WORKSPACEFULL && m->output->adaptive_sync_status == WLR_OUTPUT_ADAPTIVE_SYNC_ENABLED) {
- wlr_output_state_set_adaptive_sync_enabled(&m->outputState, 0);
+ wlr_output_state_set_adaptive_sync_enabled(m->state.wlr(), 0);
- if (!wlr_output_commit_state(m->output, &m->outputState))
+ if (!m->state.commit())
Debug::log(ERR, "Couldn't commit output {} in ensureVRR -> false", m->output->name);
-
- pMonitor->clearState();
}
}
};
diff --git a/src/events/Misc.cpp b/src/events/Misc.cpp
index b186236a..d4f3a803 100644
--- a/src/events/Misc.cpp
+++ b/src/events/Misc.cpp
@@ -183,9 +183,9 @@ void Events::listener_powerMgrSetMode(wl_listener* listener, void* data) {
return;
}
- wlr_output_state_set_enabled(&PMONITOR->outputState, EVENT->mode == 1);
+ wlr_output_state_set_enabled(PMONITOR->state.wlr(), EVENT->mode == 1);
- if (!wlr_output_commit_state(EVENT->output, &PMONITOR->outputState))
+ if (!PMONITOR->state.commit())
Debug::log(ERR, "Couldn't set power mode");
}
diff --git a/src/events/Monitors.cpp b/src/events/Monitors.cpp
index 56f1d757..ddbc81f7 100644
--- a/src/events/Monitors.cpp
+++ b/src/events/Monitors.cpp
@@ -209,10 +209,10 @@ void Events::listener_monitorDestroy(void* owner, void* data) {
}
void Events::listener_monitorStateRequest(void* owner, void* data) {
- const auto PMONITOR = (CMonitor*)owner;
- const auto E = (wlr_output_event_request_state*)data;
+ //const auto PMONITOR = (CMonitor*)owner;
+ //const auto E = (wlr_output_event_request_state*)data;
- wlr_output_commit_state(PMONITOR->output, E->state);
+ // TODO: maybe don't ignore?
}
void Events::listener_monitorDamage(void* owner, void* data) {
diff --git a/src/helpers/Monitor.cpp b/src/helpers/Monitor.cpp
index 11f37704..f9cc5472 100644
--- a/src/helpers/Monitor.cpp
+++ b/src/helpers/Monitor.cpp
@@ -8,14 +8,12 @@ int ratHandler(void* data) {
return 1;
}
-CMonitor::CMonitor() {
+CMonitor::CMonitor() : state(this) {
wlr_damage_ring_init(&damage);
- wlr_output_state_init(&outputState);
}
CMonitor::~CMonitor() {
wlr_damage_ring_finish(&damage);
- wlr_output_state_finish(&outputState);
hyprListener_monitorDestroy.removeCallback();
hyprListener_monitorFrame.removeCallback();
@@ -45,8 +43,8 @@ void CMonitor::onConnect(bool noRule) {
tearingState.canTear = wlr_backend_is_drm(output->backend); // tearing only works on drm
if (m_bEnabled) {
- wlr_output_state_set_enabled(&outputState, true);
- wlr_output_commit_state(output, &outputState);
+ wlr_output_state_set_enabled(state.wlr(), true);
+ state.commit();
return;
}
@@ -65,8 +63,8 @@ void CMonitor::onConnect(bool noRule) {
// if it's disabled, disable and ignore
if (monitorRule.disabled) {
- wlr_output_state_set_scale(&outputState, 1);
- wlr_output_state_set_transform(&outputState, WL_OUTPUT_TRANSFORM_NORMAL);
+ wlr_output_state_set_scale(state.wlr(), 1);
+ wlr_output_state_set_transform(state.wlr(), WL_OUTPUT_TRANSFORM_NORMAL);
auto PREFSTATE = wlr_output_preferred_mode(output);
@@ -74,9 +72,9 @@ void CMonitor::onConnect(bool noRule) {
wlr_output_mode* mode;
wl_list_for_each(mode, &output->modes, link) {
- wlr_output_state_set_mode(&outputState, mode);
+ wlr_output_state_set_mode(state.wlr(), mode);
- if (!wlr_output_test_state(output, &outputState))
+ if (!wlr_output_test_state(output, state.wlr()))
continue;
PREFSTATE = mode;
@@ -85,13 +83,13 @@ void CMonitor::onConnect(bool noRule) {
}
if (PREFSTATE)
- wlr_output_state_set_mode(&outputState, PREFSTATE);
+ wlr_output_state_set_mode(state.wlr(), PREFSTATE);
else
Debug::log(WARN, "No mode found for disabled output {}", output->name);
- wlr_output_state_set_enabled(&outputState, 0);
+ wlr_output_state_set_enabled(state.wlr(), 0);
- if (!wlr_output_commit_state(output, &outputState))
+ if (!state.commit())
Debug::log(ERR, "Couldn't commit disabled state on output {}", output->name);
m_bEnabled = false;
@@ -132,13 +130,13 @@ void CMonitor::onConnect(bool noRule) {
m_bEnabled = true;
- wlr_output_state_set_enabled(&outputState, 1);
+ wlr_output_state_set_enabled(state.wlr(), 1);
// set mode, also applies
if (!noRule)
g_pHyprRenderer->applyMonitorRule(this, &monitorRule, true);
- if (!wlr_output_commit_state(output, &outputState))
+ if (!state.commit())
Debug::log(WARN, "wlr_output_commit_state failed in CMonitor::onCommit");
wlr_damage_ring_set_bounds(&damage, vecTransformedSize.x, vecTransformedSize.y);
@@ -286,9 +284,9 @@ void CMonitor::onDisconnect(bool destroy) {
if (!destroy)
wlr_output_layout_remove(g_pCompositor->m_sWLROutputLayout, output);
- wlr_output_state_set_enabled(&outputState, false);
+ wlr_output_state_set_enabled(state.wlr(), false);
- if (!wlr_output_commit_state(output, &outputState))
+ if (!state.commit())
Debug::log(WARN, "wlr_output_commit_state failed in CMonitor::onDisconnect");
if (g_pCompositor->m_pLastMonitor == this)
@@ -683,12 +681,31 @@ void CMonitor::updateMatrix() {
}
}
-void CMonitor::clearState() {
- if (outputState.buffer)
- wlr_output_state_finish(&outputState);
- else // free(gamma_lut) should be unnecessary as it shouldn't be non-null for buffer-less commits?
- pixman_region32_fini(&outputState.damage);
+CMonitorState::CMonitorState(CMonitor* owner) {
+ m_pOwner = owner;
+ wlr_output_state_init(&m_state);
+}
+
+CMonitorState::~CMonitorState() {
+ wlr_output_state_finish(&m_state);
+}
+
+wlr_output_state* CMonitorState::wlr() {
+ return &m_state;
+}
+
+void CMonitorState::clear() {
+ wlr_output_state_finish(&m_state);
+ m_state = {0};
+ wlr_output_state_init(&m_state);
+}
+
+bool CMonitorState::commit() {
+ bool ret = wlr_output_commit_state(m_pOwner->output, &m_state);
+ clear();
+ return ret;
+}
- outputState = {0};
- wlr_output_state_init(&outputState);
+bool CMonitorState::test() {
+ return wlr_output_test_state(m_pOwner->output, &m_state);
}
diff --git a/src/helpers/Monitor.hpp b/src/helpers/Monitor.hpp
index 4681419c..43de8d12 100644
--- a/src/helpers/Monitor.hpp
+++ b/src/helpers/Monitor.hpp
@@ -25,6 +25,25 @@ struct SMonitorRule {
std::optional<int> vrr;
};
+class CMonitor;
+
+// Class for wrapping the wlr state
+class CMonitorState {
+ public:
+ CMonitorState(CMonitor* owner);
+ ~CMonitorState();
+
+ wlr_output_state* wlr();
+ void clear();
+ // commit() will also clear()
+ bool commit();
+ bool test();
+
+ private:
+ wlr_output_state m_state = {0};
+ CMonitor* m_pOwner;
+};
+
class CMonitor {
public:
CMonitor();
@@ -51,6 +70,8 @@ class CMonitor {
drmModeModeInfo customDrmMode = {};
+ CMonitorState state;
+
// WLR stuff
wlr_damage_ring damage;
wlr_output* output = nullptr;
@@ -63,7 +84,6 @@ class CMonitor {
bool gammaChanged = false;
float xwaylandScale = 1.f;
std::array<float, 9> projMatrix = {0};
- wlr_output_state outputState = {0}; // TODO: write a wrapper for this garbage
bool dpmsStatus = true;
bool vrrActive = false; // this can be TRUE even if VRR is not active in the case that this display does not support it.
@@ -128,7 +148,6 @@ class CMonitor {
void moveTo(const Vector2D& pos);
Vector2D middle();
void updateMatrix();
- void clearState();
bool m_bEnabled = false;
bool m_bRenderingInitPassed = false;
diff --git a/src/managers/KeybindManager.cpp b/src/managers/KeybindManager.cpp
index 7d31a039..9ffcf2d0 100644
--- a/src/managers/KeybindManager.cpp
+++ b/src/managers/KeybindManager.cpp
@@ -1852,11 +1852,11 @@ void CKeybindManager::dpms(std::string arg) {
if (!port.empty() && m->szName != port)
continue;
- wlr_output_state_set_enabled(&m->outputState, enable);
+ wlr_output_state_set_enabled(m->state.wlr(), enable);
m->dpmsStatus = enable;
- if (!wlr_output_commit_state(m->output, &m->outputState)) {
+ if (!m->state.commit()) {
Debug::log(ERR, "Couldn't commit output {}", m->szName);
}
diff --git a/src/render/Renderer.cpp b/src/render/Renderer.cpp
index b338dfb4..15dac3cc 100644
--- a/src/render/Renderer.cpp
+++ b/src/render/Renderer.cpp
@@ -903,9 +903,9 @@ bool CHyprRenderer::attemptDirectScanout(CMonitor* pMonitor) {
return false;
// finally, we should be GTG.
- wlr_output_state_set_buffer(&pMonitor->outputState, &PSURFACE->buffer->base);
+ wlr_output_state_set_buffer(pMonitor->state.wlr(), &PSURFACE->buffer->base);
- if (!wlr_output_test_state(pMonitor->output, &pMonitor->outputState))
+ if (!wlr_output_test_state(pMonitor->output, pMonitor->state.wlr()))
return false;
timespec now;
@@ -913,7 +913,7 @@ bool CHyprRenderer::attemptDirectScanout(CMonitor* pMonitor) {
wlr_surface_send_frame_done(PSURFACE, &now);
wlr_presentation_surface_scanned_out_on_output(PSURFACE, pMonitor->output);
- if (wlr_output_commit_state(pMonitor->output, &pMonitor->outputState)) {
+ if (pMonitor->state.commit()) {
if (!m_pLastScanout) {
m_pLastScanout = PCANDIDATE;
Debug::log(LOG, "Entered a direct scanout to {:x}: \"{}\"", (uintptr_t)PCANDIDATE, PCANDIDATE->m_szTitle);
@@ -1014,15 +1014,15 @@ void CHyprRenderer::renderMonitor(CMonitor* pMonitor) {
const auto PGAMMACTRL = wlr_gamma_control_manager_v1_get_control(g_pCompositor->m_sWLRGammaCtrlMgr, pMonitor->output);
- if (!wlr_gamma_control_v1_apply(PGAMMACTRL, &pMonitor->outputState)) {
+ if (!wlr_gamma_control_v1_apply(PGAMMACTRL, pMonitor->state.wlr())) {
Debug::log(ERR, "Could not apply gamma control to {}", pMonitor->szName);
return;
}
- if (!wlr_output_test_state(pMonitor->output, &pMonitor->outputState)) {
+ if (!wlr_output_test_state(pMonitor->output, pMonitor->state.wlr())) {
Debug::log(ERR, "Output test failed for setting gamma to {}", pMonitor->szName);
// aka rollback
- wlr_gamma_control_v1_apply(nullptr, &pMonitor->outputState);
+ wlr_gamma_control_v1_apply(nullptr, pMonitor->state.wlr());
wlr_gamma_control_v1_send_failed_and_destroy(PGAMMACTRL);
}
}
@@ -1151,6 +1151,8 @@ void CHyprRenderer::renderMonitor(CMonitor* pMonitor) {
if (UNLOCK_SC)
wlr_output_lock_software_cursors(pMonitor->output, false);
+ pMonitor->state.clear();
+
return;
}
@@ -1237,20 +1239,16 @@ void CHyprRenderer::renderMonitor(CMonitor* pMonitor) {
EMIT_HOOK_EVENT("render", RENDER_POST);
- pMonitor->outputState.tearing_page_flip = shouldTear;
+ pMonitor->state.wlr()->tearing_page_flip = shouldTear;
- if (!wlr_output_commit_state(pMonitor->output, &pMonitor->outputState)) {
+ if (!pMonitor->state.commit()) {
if (UNLOCK_SC)
wlr_output_lock_software_cursors(pMonitor->output, false);
- pMonitor->clearState();
-
return;
}
- pMonitor->clearState();
-
if (shouldTear)
pMonitor->tearingState.busy = true;
@@ -1342,7 +1340,7 @@ void CHyprRenderer::outputMgrApplyTest(wlr_output_configuration_v1* config, bool
continue;
}
- wlr_output_state_set_enabled(&PMONITOR->outputState, head->state.enabled);
+ wlr_output_state_set_enabled(PMONITOR->state.wlr(), head->state.enabled);
if (head->state.mode)
commandForCfg +=
@@ -1356,10 +1354,10 @@ void CHyprRenderer::outputMgrApplyTest(wlr_output_configuration_v1* config, bool
if (!test) {
g_pConfigManager->parseKeyword("monitor", commandForCfg, true);
- wlr_output_state_set_adaptive_sync_enabled(&PMONITOR->outputState, head->state.adaptive_sync_enabled);
+ wlr_output_state_set_adaptive_sync_enabled(PMONITOR->state.wlr(), head->state.adaptive_sync_enabled);
}
- ok = wlr_output_test_state(OUTPUT, &PMONITOR->outputState);
+ ok = wlr_output_test_state(OUTPUT, PMONITOR->state.wlr());
if (!ok)
break;
@@ -1769,10 +1767,10 @@ bool CHyprRenderer::applyMonitorRule(CMonitor* pMonitor, SMonitorRule* pMonitorR
pMonitor->scale = DEFAULTSCALE;
}
- wlr_output_state_set_scale(&pMonitor->outputState, pMonitor->scale);
+ wlr_output_state_set_scale(pMonitor->state.wlr(), pMonitor->scale);
pMonitor->setScale = pMonitor->scale;
- wlr_output_state_set_transform(&pMonitor->outputState, pMonitorRule->transform);
+ wlr_output_state_set_transform(pMonitor->state.wlr(), pMonitorRule->transform);
pMonitor->transform = pMonitorRule->transform;
const auto WLRREFRESHRATE = (wlr_backend_is_wl(pMonitor->output->backend) || wlr_backend_is_x11(pMonitor->output->backend)) ? 0 : pMonitorRule->refreshRate * 1000;
@@ -1787,9 +1785,9 @@ bool CHyprRenderer::applyMonitorRule(CMonitor* pMonitor, SMonitorRule* pMonitorR
// if delta of refresh rate, w and h chosen and mode is < 1 we accept it
if (DELTALESSTHAN(mode->width, pMonitorRule->resolution.x, 1) && DELTALESSTHAN(mode->height, pMonitorRule->resolution.y, 1) &&
DELTALESSTHAN(mode->refresh / 1000.f, pMonitorRule->refreshRate, 1)) {
- wlr_output_state_set_mode(&pMonitor->outputState, mode);
+ wlr_output_state_set_mode(pMonitor->state.wlr(), mode);
- if (!wlr_output_test_state(pMonitor->output, &pMonitor->outputState)) {
+ if (!wlr_output_test_state(pMonitor->output, pMonitor->state.wlr())) {
Debug::log(LOG, "Monitor {}: REJECTED available mode: {}x{}@{:2f}!", pMonitor->output->name, mode->width, mode->height, mode->refresh / 1000.f);
continue;
}
@@ -1807,11 +1805,11 @@ bool CHyprRenderer::applyMonitorRule(CMonitor* pMonitor, SMonitorRule* pMonitorR
}
if (!found) {
- wlr_output_state_set_custom_mode(&pMonitor->outputState, (int)pMonitorRule->resolution.x, (int)pMonitorRule->resolution.y, WLRREFRESHRATE);
+ wlr_output_state_set_custom_mode(pMonitor->state.wlr(), (int)pMonitorRule->resolution.x, (int)pMonitorRule->resolution.y, WLRREFRESHRATE);
pMonitor->vecSize = pMonitorRule->resolution;
pMonitor->refreshRate = pMonitorRule->refreshRate;
- if (!wlr_output_test_state(pMonitor->output, &pMonitor->outputState)) {
+ if (!wlr_output_test_state(pMonitor->output, pMonitor->state.wlr())) {
Debug::log(ERR, "Custom resolution FAILED, falling back to preferred");
const auto PREFERREDMODE = wlr_output_preferred_mode(pMonitor->output);
@@ -1823,7 +1821,7 @@ bool CHyprRenderer::applyMonitorRule(CMonitor* pMonitor, SMonitorRule* pMonitorR
}
// Preferred is valid
- wlr_output_state_set_mode(&pMonitor->outputState, PREFERREDMODE);
+ wlr_output_state_set_mode(pMonitor->state.wlr(), PREFERREDMODE);
Debug::log(ERR, "Monitor {} got an invalid requested mode: {:X0}@{:2f}, using the preferred one instead: {}x{}@{:2f}", pMonitor->output->name,
pMonitorRule->resolution, (float)pMonitorRule->refreshRate, PREFERREDMODE->width, PREFERREDMODE->height, PREFERREDMODE->refresh / 1000.f);
@@ -1845,7 +1843,7 @@ bool CHyprRenderer::applyMonitorRule(CMonitor* pMonitor, SMonitorRule* pMonitorR
} else {
auto* mode = wlr_drm_connector_add_mode(pMonitor->output, &pMonitorRule->drmMode);
if (mode) {
- wlr_output_state_set_mode(&pMonitor->outputState, mode);
+ wlr_output_state_set_mode(pMonitor->state.wlr(), mode);
pMonitor->customDrmMode = pMonitorRule->drmMode;
} else {
Debug::log(ERR, "wlr_drm_connector_add_mode failed");
@@ -1853,13 +1851,13 @@ bool CHyprRenderer::applyMonitorRule(CMonitor* pMonitor, SMonitorRule* pMonitorR
}
}
} else {
- wlr_output_state_set_custom_mode(&pMonitor->outputState, (int)pMonitorRule->resolution.x, (int)pMonitorRule->resolution.y, WLRREFRESHRATE);
+ wlr_output_state_set_custom_mode(pMonitor->state.wlr(), (int)pMonitorRule->resolution.x, (int)pMonitorRule->resolution.y, WLRREFRESHRATE);
}
pMonitor->vecSize = pMonitorRule->resolution;
pMonitor->refreshRate = pMonitorRule->refreshRate;
- if (fail || !wlr_output_test_state(pMonitor->output, &pMonitor->outputState)) {
+ if (fail || !wlr_output_test_state(pMonitor->output, pMonitor->state.wlr())) {
Debug::log(ERR, "Custom resolution FAILED, falling back to preferred");
const auto PREFERREDMODE = wlr_output_preferred_mode(pMonitor->output);
@@ -1871,7 +1869,7 @@ bool CHyprRenderer::applyMonitorRule(CMonitor* pMonitor, SMonitorRule* pMonitorR
}
// Preferred is valid
- wlr_output_state_set_mode(&pMonitor->outputState, PREFERREDMODE);
+ wlr_output_state_set_mode(pMonitor->state.wlr(), PREFERREDMODE);
Debug::log(ERR, "Monitor {} got an invalid requested mode: {:X0}@{:2f}, using the preferred one instead: {}x{}@{:2f}", pMonitor->output->name,
pMonitorRule->resolution, (float)pMonitorRule->refreshRate, PREFERREDMODE->width, PREFERREDMODE->height, PREFERREDMODE->refresh / 1000.f);
@@ -1895,8 +1893,8 @@ bool CHyprRenderer::applyMonitorRule(CMonitor* pMonitor, SMonitorRule* pMonitorR
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_state_set_mode(&pMonitor->outputState, mode);
- if (wlr_output_test_state(pMonitor->output, &pMonitor->outputState)) {
+ wlr_output_state_set_mode(pMonitor->state.wlr(), mode);
+ if (wlr_output_test_state(pMonitor->output, pMonitor->state.wlr())) {
currentWidth = mode->width;
currentHeight = mode->height;
currentRefresh = mode->refresh;
@@ -1908,8 +1906,8 @@ bool CHyprRenderer::applyMonitorRule(CMonitor* pMonitor, SMonitorRule* pMonitorR
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_state_set_mode(&pMonitor->outputState, mode);
- if (wlr_output_test_state(pMonitor->output, &pMonitor->outputState)) {
+ wlr_output_state_set_mode(pMonitor->state.wlr(), mode);
+ if (wlr_output_test_state(pMonitor->output, pMonitor->state.wlr())) {
currentWidth = mode->width;
currentHeight = mode->height;
currentRefresh = mode->refresh;
@@ -1932,7 +1930,7 @@ bool CHyprRenderer::applyMonitorRule(CMonitor* pMonitor, SMonitorRule* pMonitorR
}
// Preferred is valid
- wlr_output_state_set_mode(&pMonitor->outputState, PREFERREDMODE);
+ wlr_output_state_set_mode(pMonitor->state.wlr(), PREFERREDMODE);
Debug::log(ERR, "Monitor {} got an invalid requested mode: {:X0}@{:2f}, using the preferred one instead: {}x{}@{:2f}", pMonitor->output->name,
pMonitorRule->resolution, (float)pMonitorRule->refreshRate, PREFERREDMODE->width, PREFERREDMODE->height, PREFERREDMODE->refresh / 1000.f);
@@ -1957,9 +1955,9 @@ bool CHyprRenderer::applyMonitorRule(CMonitor* pMonitor, SMonitorRule* pMonitorR
wlr_output_mode* mode;
wl_list_for_each(mode, &pMonitor->output->modes, link) {
- wlr_output_state_set_mode(&pMonitor->outputState, mode);
+ wlr_output_state_set_mode(pMonitor->state.wlr(), mode);
- if (!wlr_output_test_state(pMonitor->output, &pMonitor->outputState)) {
+ if (!wlr_output_test_state(pMonitor->output, pMonitor->state.wlr())) {
Debug::log(LOG, "Monitor {}: REJECTED available mode: {}x{}@{:2f}!", pMonitor->output->name, mode->width, mode->height, mode->refresh / 1000.f);
continue;
}
@@ -1975,7 +1973,7 @@ bool CHyprRenderer::applyMonitorRule(CMonitor* pMonitor, SMonitorRule* pMonitorR
}
} else {
// Preferred is valid
- wlr_output_state_set_mode(&pMonitor->outputState, PREFERREDMODE);
+ wlr_output_state_set_mode(pMonitor->state.wlr(), PREFERREDMODE);
pMonitor->vecSize = Vector2D(PREFERREDMODE->width, PREFERREDMODE->height);
pMonitor->refreshRate = PREFERREDMODE->refresh / 1000.f;
@@ -1984,8 +1982,8 @@ bool CHyprRenderer::applyMonitorRule(CMonitor* pMonitor, SMonitorRule* pMonitorR
}
}
- pMonitor->vrrActive = pMonitor->outputState.adaptive_sync_enabled // disabled here, will be tested in CConfigManager::ensureVRR()
- || pMonitor->createdByUser; // wayland backend doesn't allow for disabling adaptive_sync
+ pMonitor->vrrActive = pMonitor->state.wlr()->adaptive_sync_enabled // disabled here, will be tested in CConfigManager::ensureVRR()
+ || pMonitor->createdByUser; // wayland backend doesn't allow for disabling adaptive_sync
pMonitor->vecPixelSize = pMonitor->vecSize;
@@ -2002,7 +2000,7 @@ bool CHyprRenderer::applyMonitorRule(CMonitor* pMonitor, SMonitorRule* pMonitorR
Vector2D logicalZero = pMonitor->vecPixelSize / scaleZero;
if (logicalZero == logicalZero.round()) {
pMonitor->scale = scaleZero;
- wlr_output_state_set_scale(&pMonitor->outputState, pMonitor->scale);
+ wlr_output_state_set_scale(pMonitor->state.wlr(), pMonitor->scale);
} else {
for (size_t i = 1; i < 90; ++i) {
double scaleUp = (searchScale + i) / 120.0;
@@ -2045,7 +2043,7 @@ bool CHyprRenderer::applyMonitorRule(CMonitor* pMonitor, SMonitorRule* pMonitorR
double logicalX = std::round(pMonitor->vecPixelSize.x / pMonitor->scale);
logicalX += 0.1;
- wlr_output_state_set_scale(&pMonitor->outputState, pMonitor->vecPixelSize.x / logicalX);
+ wlr_output_state_set_scale(pMonitor->state.wlr(), pMonitor->vecPixelSize.x / logicalX);
}
}
@@ -2064,9 +2062,9 @@ bool CHyprRenderer::applyMonitorRule(CMonitor* pMonitor, SMonitorRule* pMonitorR
pMonitor->drmFormat = DRM_FORMAT_INVALID;
for (auto& fmt : formats[(int)!pMonitorRule->enable10bit]) {
- wlr_output_state_set_render_format(&pMonitor->outputState, fmt.second);
+ wlr_output_state_set_render_format(pMonitor->state.wlr(), fmt.second);
- if (!wlr_output_test_state(pMonitor->output, &pMonitor->outputState)) {
+ if (!wlr_output_test_state(pMonitor->output, pMonitor->state.wlr())) {
Debug::log(ERR, "output {} failed basic test on format {}", pMonitor->szName, fmt.first);
} else {
Debug::log(LOG, "output {} succeeded basic test on format {}", pMonitor->szName, fmt.first);
@@ -2080,11 +2078,8 @@ bool CHyprRenderer::applyMonitorRule(CMonitor* pMonitor, SMonitorRule* pMonitorR
pMonitor->enabled10bit = set10bit;
- if (!wlr_output_commit_state(pMonitor->output, &pMonitor->outputState)) {
+ if (!pMonitor->state.commit())
Debug::log(ERR, "Couldn't commit output named {}", pMonitor->output->name);
- }
-
- pMonitor->clearState();
int x, y;
wlr_output_transformed_resolution(pMonitor->output, &x, &y);
@@ -2449,7 +2444,7 @@ bool CHyprRenderer::beginRender(CMonitor* pMonitor, CRegion& damage, eRenderMode
}
if (!buffer) {
- if (!wlr_output_configure_primary_swapchain(pMonitor->output, &pMonitor->outputState, &pMonitor->output->swapchain))
+ if (!wlr_output_configure_primary_swapchain(pMonitor->output, pMonitor->state.wlr(), &pMonitor->output->swapchain))
return false;
m_pCurrentWlrBuffer = wlr_swapchain_acquire(pMonitor->output->swapchain, &m_iLastBufferAge);
@@ -2493,7 +2488,7 @@ void CHyprRenderer::endRender() {
glFlush();
if (m_eRenderMode == RENDER_MODE_NORMAL) {
- wlr_output_state_set_buffer(&PMONITOR->outputState, m_pCurrentWlrBuffer);
+ wlr_output_state_set_buffer(PMONITOR->state.wlr(), m_pCurrentWlrBuffer);
unsetEGL(); // flush the context
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 02:12:54 +0000