Skip to content

fix(output): keep copy mode when switching display parameters #1331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Groveer wants to merge 1 commit into from
Closed

fix(output): keep copy mode when switching display parameters #1331

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 35 additions & 17 deletions src/seat/helper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1079,26 +1079,42 @@ void Helper::onOutputTestOrApply(wlr_output_configuration_v1 *config, bool onlyT
}

if (m_mode == OutputMode::Copy) {
// Output-management positions describe independent outputs. Convert copy
// proxies before applying the requested layout so their target-output
// binding cannot keep them overlapping the copy source at (0, 0).
for (int i = 0; i < m_outputList.size(); ++i) {
Output *copyOutput = m_outputList.at(i);
if (copyOutput->isSource()) {
continue;
// A refresh-rate / mode switch is a display-parameter change, not a
// topology change. Keep copy mode unless an output is enabled/disabled.
Comment thread
sourcery-ai[bot] marked this conversation as resolved.
bool topologyChanged = false;
for (const auto &state : std::as_const(states)) {
if (state.enabled != state.output->isEnabled()) {
topologyChanged = true;
break;
}

removeOutputFromRootContainer(copyOutput);
Output *normalOutput = createNormalOutput(copyOutput->output());
copyOutput->deleteLater();
m_outputList.replace(i, normalOutput);
}
}

if (m_mode != OutputMode::Extension) {
if (topologyChanged) {
// Output-management positions describe independent outputs. Convert copy
// proxies before applying the requested layout so their target-output
// binding cannot keep them overlapping the copy source at (0, 0).
for (int i = 0; i < m_outputList.size(); ++i) {
Output *copyOutput = m_outputList.at(i);
if (copyOutput->isSource()) {
continue;
}

removeOutputFromRootContainer(copyOutput);
Output *normalOutput = createNormalOutput(copyOutput->output());
copyOutput->deleteLater();
m_outputList.replace(i, normalOutput);
}

if (m_mode != OutputMode::Extension) {
m_mode = OutputMode::Extension;
Q_EMIT outputModeChanged();
}
}
} else if (m_mode != OutputMode::Extension) {
m_mode = OutputMode::Extension;
Q_EMIT outputModeChanged();
}

if (m_outputManagerHelper) {
m_outputManagerHelper->clearCopyModeRestoreIntent();
}
Expand Down Expand Up @@ -1278,9 +1294,11 @@ void Helper::onOutputCommitFinished(wlr_output_configuration_v1 *config, bool su
bool ok = m_pendingOutputConfig.allSuccess;
if (ok) {
m_outputManagerHelper->storeSingleOutputConfig();
// An output-management enable/disable transaction describes an
// extension/single-output topology, never a copy topology.
m_outputManagerHelper->storeCopyOutputConfig(false);
// Only clear the persisted copy configuration when copy mode was
// actually left; a pure refresh-rate switch keeps it.
if (m_mode != OutputMode::Copy) {
m_outputManagerHelper->storeCopyOutputConfig(false);
}

const auto enabledOutputCount = std::count_if(
m_pendingOutputConfig.states.cbegin(),
Expand Down
Loading