renderer: add windowrule type suppressvrr #10300
Open
+72
−35
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- `suppressvrr` is a type of `windowrule` - whenever a matching window is visible on-screen in the current workspace of a monitor, that particular monitor will necessarily prevent VRR from being enabled. - this rule works in conjunction with misc:vrr and per-monitor vrr settings and gets applied last in the vrr logic - example usage: `windowrule = suppressvrr, class:nemo` will prevent VRR on any monitors that currently display a nemo window - as a small optimization, a workspace that has a fullscreen window will either necessarily suppress VRR or not depending on whether that particular window was matched for `suppressvrr`. Whether other windows in that workspace match for `suppressvrr` is irrelevant to this logic.
salcodes1
changed the title
vaxerski
reviewed
May 7, 2025
| @@ -710,6 +715,9 @@ void Events::listener_mapWindow(void* owner, void* data) { | |||
|
|
|||
| if (PMONITOR && PWINDOW->isX11OverrideRedirect()) | |||
| PWINDOW->m_X11SurfaceScaledBy = PMONITOR->m_scale; | |||
|
|
|||
| // VRR should update | |||
| g_pConfigManager->ensureVRR(PWINDOW->m_monitor.lock()); | |||
| @@ -847,6 +855,9 @@ void Events::listener_unmapWindow(void* owner, void* data) { | |||
|
|
|||
| // update lastwindow after focus | |||
| PWINDOW->onUnmap(); | |||
|
|
|||
| // VRR should update | |||
| g_pConfigManager->ensureVRR(PMONITOR); | |||
| const auto PWORKSPACE = m->m_activeWorkspace; | ||
| if (PWORKSPACE) { | ||
| auto vrrSuppressingWindows = 0; | ||
| std::optional<bool> fullscreenWindowSuppressing = std::nullopt; |
There was a problem hiding this comment.
can just be a bool = false and set to true in the loop if a matching window is found
| m->m_output->state->setAdaptiveSync(false); | ||
| } | ||
| for (auto const& w : g_pCompositor->m_windows) { | ||
| if (w->m_isMapped && w->workspaceID() == PWORKSPACE->m_id && !w->isHidden()) { |
| } | ||
| for (auto const& w : g_pCompositor->m_windows) { | ||
| if (w->m_isMapped && w->workspaceID() == PWORKSPACE->m_id && !w->isHidden()) { | ||
| if (w->m_suppressVrr) |
There was a problem hiding this comment.
other windows dont matter, only the fs one
| vrrSuppressingWindows++; | ||
|
|
||
| if (w->isFullscreen()) | ||
| fullscreenWindowSuppressing = w->m_suppressVrr; |
| // whether that window is `suppressvrr` or not; | ||
| // * if there doesn't exist one, then disable VRR for at least one visible window that is `suppressvrr` | ||
|
|
||
| if (fullscreenWindowSuppressing == true || (fullscreenWindowSuppressing == std::nullopt && vrrSuppressingWindows > 0)) { |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Describe your PR, what does it fix/add?
Aims to enable functionality described in #10147 .
From commit message:
suppressvrris a type ofwindowrulemisc:vrrand per-monitor VRR settings and gets applied last in the vrr logicwindowrule = suppressvrr, class:nemowill prevent VRR on any monitors that currently display a nemo windowsuppressvrr. Whether other windows in that workspace match forsuppressvrror not is irrelevant to this logic.Is there anything you want to mention? (unchecked code, possible bugs, found problems, breaking compatibility, etc.)
As this is my first contribution to the project, I am not sure whether I put the additional calls to
ensureVRRin the correct, canonical places. For now, I added the calls inside the listeners for mapping/unmapping.Is it ready for merging, or does it need work?
Should be good to go afaik, aside from the question raised above.