yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Drop Platform::enabledOutputs()

Browse source 
At the moment, a platform should provide two output lists - one that
lists all available outputs, and the other one that contains only
enabled outputs. In general, this amounts to some boilerplate code and
forces backends to be implemented in some certain way, which sometimes
is inconvenient, e.g. if an output is disabled or enabled, it will be
simpler if we only change Output::isEnabled(), otherwise we need to
start accounting for corner cases such as the order in which
Output::isEnabled() and Platform::enabledOutputs() are changed, etc.
This commit is contained in:
Vlad Zahorodnii 2022-07-21 12:23:43 +03:00
parent 2629007eef
commit a198516871
22 changed files with 94 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
autotests/integration/kwin_wayland_test.cpp
View file

@ -140,7 +140,7 @@ void WaylandTestApplication::performStartup()
createInput();
createVirtualInputDevices();
if (!platform()->enabledOutputs().isEmpty()) {
if (!platform()->outputs().isEmpty()) {
continueStartupWithScreens();
} else {
connect(platform(), &Platform::screensQueried, this, &WaylandTestApplication::continueStartupWithScreens);

6
autotests/integration/screens_test.cpp
View file

@ -152,7 +152,7 @@ void ScreensTest::testCurrent_data()
void ScreensTest::testCurrent()
{
QFETCH(int, currentId);
Output *output = kwinApp()->platform()->enabledOutputs().at(currentId);
Output *output = workspace()->outputs().at(currentId);
// Disable "active screen follows mouse"
auto group = kwinApp()->config()->group("Windows");
@ -197,7 +197,7 @@ void ScreensTest::testCurrentWithFollowsMouse()
KWin::Cursors::self()->mouse()->setPos(cursorPos);
QFETCH(int, expectedId);
Output *expected = kwinApp()->platform()->enabledOutputs().at(expectedId);
Output *expected = workspace()->outputs().at(expectedId);
QCOMPARE(workspace()->activeOutput(), expected);
}
@ -234,7 +234,7 @@ void ScreensTest::testCurrentPoint()
workspace()->setActiveOutput(cursorPos);
QFETCH(int, expectedId);
Output *expected = kwinApp()->platform()->enabledOutputs().at(expectedId);
Output *expected = workspace()->outputs().at(expectedId);
QCOMPARE(workspace()->activeOutput(), expected);
}

5
src/backends/drm/drm_backend.cpp
View file

@ -108,11 +108,6 @@ Outputs DrmBackend::outputs() const
return m_outputs;
}
Outputs DrmBackend::enabledOutputs() const
{
return m_enabledOutputs;
}
void DrmBackend::createDpmsFilter()
{
if (m_dpmsFilter) {

1
src/backends/drm/drm_backend.h
View file

@ -54,7 +54,6 @@ public:
bool initialize() override;
Outputs outputs() const override;
Outputs enabledOutputs() const override;
void enableOutput(DrmAbstractOutput *output, bool enable);

26
src/backends/libinput/connection.cpp
View file

@ -522,14 +522,15 @@ void Connection::applyScreenToDevice(Device *device)
}
Output *deviceOutput = nullptr;
const QVector<Output *> outputs = kwinApp()->platform()->enabledOutputs();
const QVector<Output *> outputs = kwinApp()->platform()->outputs();
// let's try to find a screen for it
if (outputs.count() == 1) {
deviceOutput = outputs.constFirst();
}
if (!deviceOutput && !device->outputName().isEmpty()) {
if (!device->outputName().isEmpty()) {
// we have an output name, try to find a screen with matching name
for (Output *output : outputs) {
if (!output->isEnabled()) {
continue;
}
if (output->name() == device->outputName()) {
deviceOutput = output;
break;
@ -540,6 +541,9 @@ void Connection::applyScreenToDevice(Device *device)
// do we have an internal screen?
Output *internalOutput = nullptr;
for (Output *output : outputs) {
if (!output->isEnabled()) {
continue;
}
if (output->isInternal()) {
internalOutput = output;
break;
@ -556,6 +560,9 @@ void Connection::applyScreenToDevice(Device *device)
}
// let's compare all screens for size
for (Output *output : outputs) {
if (!output->isEnabled()) {
continue;
}
if (testScreenMatches(output)) {
deviceOutput = output;
break;
@ -566,9 +573,14 @@ void Connection::applyScreenToDevice(Device *device)
if (internalOutput) {
// we have an internal id, so let's use that
deviceOutput = internalOutput;
} else if (!outputs.isEmpty()) {
} else {
for (Output *output : outputs) {
// just take first screen, we have no clue
deviceOutput = outputs.constFirst();
if (output->isEnabled()) {
deviceOutput = output;
break;
}
}
}
}
}

5
src/backends/libinput/device.cpp
View file

@ -647,8 +647,11 @@ void Device::setOutputName(const QString &name)
setOutput(nullptr);
return;
}
auto outputs = kwinApp()->platform()->enabledOutputs();
auto outputs = kwinApp()->platform()->outputs();
for (int i = 0; i < outputs.count(); ++i) {
if (!outputs[i]->isEnabled()) {
continue;
}
if (outputs[i]->name() == name) {
setOutput(outputs[i]);
break;

5
src/backends/virtual/virtual_backend.cpp
View file

@ -87,11 +87,6 @@ Outputs VirtualBackend::outputs() const
return m_outputs;
}
Outputs VirtualBackend::enabledOutputs() const
{
return m_outputsEnabled;
}
void VirtualBackend::setVirtualOutputs(int count, QVector<QRect> geometries, QVector<int> scales)
{
Q_ASSERT(geometries.size() == 0 || geometries.size() == count);

1
src/backends/virtual/virtual_backend.h
View file

@ -44,7 +44,6 @@ public:
Q_INVOKABLE void setVirtualOutputs(int count, QVector<QRect> geometries = QVector<QRect>(), QVector<int> scales = QVector<int>());
Outputs outputs() const override;
Outputs enabledOutputs() const override;
QVector<CompositingType> supportedCompositors() const override
{

4
src/backends/virtual/virtual_egl_backend.cpp
View file

@ -120,10 +120,12 @@ void VirtualEglBackend::init()
setSupportsBufferAge(false);
initWayland();
const auto outputs = m_backend->enabledOutputs();
const auto outputs = m_backend->outputs();
for (Output *output : outputs) {
if (output->isEnabled()) {
addOutput(output);
}
}
connect(m_backend, &VirtualBackend::outputEnabled, this, &VirtualEglBackend::addOutput);
connect(m_backend, &VirtualBackend::outputDisabled, this, &VirtualEglBackend::removeOutput);

4
src/backends/virtual/virtual_qpainter_backend.cpp
View file

@ -50,11 +50,13 @@ VirtualQPainterBackend::VirtualQPainterBackend(VirtualBackend *backend)
connect(backend, &VirtualBackend::outputEnabled, this, &VirtualQPainterBackend::addOutput);
connect(backend, &VirtualBackend::outputDisabled, this, &VirtualQPainterBackend::removeOutput);
const auto outputs = backend->enabledOutputs();
const auto outputs = backend->outputs();
for (Output *output : outputs) {
if (output->isEnabled()) {
addOutput(output);
}
}
}
VirtualQPainterBackend::~VirtualQPainterBackend() = default;

11
src/backends/wayland/wayland_backend.cpp
View file

@ -942,17 +942,6 @@ Outputs WaylandBackend::outputs() const
return m_outputs;
}
Outputs WaylandBackend::enabledOutputs() const
{
Outputs ret;
for (auto o : m_outputs) {
if (o->isEnabled()) {
ret << o;
}
}
return ret;
}
void WaylandBackend::addConfiguredOutput(WaylandOutput *output)
{
m_outputs << output;

1
src/backends/wayland/wayland_backend.h
View file

@ -289,7 +289,6 @@ public:
WaylandOutput *getOutputAt(const QPointF &globalPosition);
WaylandOutput *findOutput(KWayland::Client::Surface *nativeSurface) const;
Outputs outputs() const override;
Outputs enabledOutputs() const override;
QVector<WaylandOutput *> waylandOutputs() const
{
return m_outputs;

7
src/backends/x11/standalone/x11_standalone_platform.cpp
View file

@ -638,11 +638,6 @@ Outputs X11StandalonePlatform::outputs() const
return m_outputs;
}
Outputs X11StandalonePlatform::enabledOutputs() const
{
return m_outputs;
}
RenderLoop *X11StandalonePlatform::renderLoop() const
{
return m_renderLoop.get();
@ -660,7 +655,7 @@ static int currentRefreshRate()
return refreshRate;
}
const QVector<Output *> outputs = kwinApp()->platform()->enabledOutputs();
const QVector<Output *> outputs = kwinApp()->platform()->outputs();
if (outputs.isEmpty()) {
return 60000;
}

1
src/backends/x11/standalone/x11_standalone_platform.h
View file

@ -65,7 +65,6 @@ public:
RenderLoop *renderLoop() const;
Outputs outputs() const override;
Outputs enabledOutputs() const override;
private:
/**

7
src/backends/x11/windowed/x11_windowed_backend.cpp
View file

@ -696,9 +696,4 @@ Outputs X11WindowedBackend::outputs() const
return m_outputs;
}
Outputs X11WindowedBackend::enabledOutputs() const
{
return m_outputs;
}
}
} // namespace KWin

1
src/backends/x11/windowed/x11_windowed_backend.h
View file

@ -131,7 +131,6 @@ public:
X11WindowedInputDevice *touchDevice() const;
Outputs outputs() const override;
Outputs enabledOutputs() const override;
Q_SIGNALS:
void sizeChanged();

4
src/backends/x11/windowed/x11_windowed_qpainter_backend.cpp
View file

@ -50,10 +50,12 @@ X11WindowedQPainterBackend::X11WindowedQPainterBackend(X11WindowedBackend *backe
: QPainterBackend()
, m_backend(backend)
{
const auto outputs = m_backend->enabledOutputs();
const auto outputs = m_backend->outputs();
for (Output *output : outputs) {
if (output->isEnabled()) {
addOutput(output);
}
}
connect(backend, &X11WindowedBackend::outputEnabled, this, &X11WindowedQPainterBackend::addOutput);
connect(backend, &X11WindowedBackend::outputDisabled, this, &X11WindowedQPainterBackend::removeOutput);

4
src/colors/colormanager.cpp
View file

@ -26,10 +26,12 @@ ColorManager::ColorManager()
{
Platform *platform = kwinApp()->platform();
const QVector<Output *> outputs = platform->enabledOutputs();
const QVector<Output *> outputs = platform->outputs();
for (Output *output : outputs) {
if (output->isEnabled()) {
handleOutputEnabled(output);
}
}
connect(platform, &Platform::outputEnabled, this, &ColorManager::handleOutputEnabled);
connect(platform, &Platform::outputDisabled, this, &ColorManager::handleOutputDisabled);

19
src/platform.cpp
View file

@ -49,7 +49,15 @@ Platform::Platform(QObject *parent)
{
connect(this, &Platform::outputDisabled, this, [this](Output *output) {
if (m_primaryOutput == output) {
setPrimaryOutput(enabledOutputs().value(0, nullptr));
Output *primary = nullptr;
const auto candidates = outputs();
for (Output *output : candidates) {
if (output->isEnabled()) {
primary = output;
break;
}
}
setPrimaryOutput(primary);
}
});
connect(this, &Platform::outputEnabled, this, [this](Output *output) {
@ -170,7 +178,14 @@ void Platform::requestOutputsChange(KWaylandServer::OutputConfigurationV2Interfa
if (requestedPrimaryOutput && requestedPrimaryOutput->isEnabled()) {
setPrimaryOutput(requestedPrimaryOutput);
} else {
auto defaultPrimaryOutput = enabledOutputs().constFirst();
Output *defaultPrimaryOutput = nullptr;
const auto candidates = outputs();
for (Output *output : candidates) {
if (output->isEnabled()) {
defaultPrimaryOutput = output;
break;
}
}
qCWarning(KWIN_CORE) << "Requested invalid primary screen, using" << defaultPrimaryOutput;
setPrimaryOutput(defaultPrimaryOutput);
}

6
src/platform.h
View file

@ -300,16 +300,10 @@ public:
return m_supportsGammaControl;
}
// outputs with connections (org_kde_kwin_outputdevice)
virtual Outputs outputs() const
{
return Outputs();
}
// actively compositing outputs (wl_output)
virtual Outputs enabledOutputs() const
{
return Outputs();
}
Output *findOutput(const QUuid &uuid) const;
Output *findOutput(const QString &name) const;

6
src/wayland_server.cpp
View file

@ -290,13 +290,11 @@ void WaylandServer::initPlatform()
const QVector<Output *> outputs = kwinApp()->platform()->outputs();
for (Output *output : outputs) {
handleOutputAdded(output);
}
const QVector<Output *> enabledOutputs = kwinApp()->platform()->enabledOutputs();
for (Output *output : enabledOutputs) {
if (output->isEnabled()) {
handleOutputEnabled(output);
}
}
}
void WaylandServer::handleOutputAdded(Output *output)
{

9
src/workspace.cpp
View file

@ -209,10 +209,12 @@ void Workspace::init()
connect(platform, &Platform::outputEnabled, this, &Workspace::slotOutputEnabled);
connect(platform, &Platform::outputDisabled, this, &Workspace::slotOutputDisabled);
const QVector<Output *> outputs = platform->enabledOutputs();
const QVector<Output *> outputs = platform->outputs();
for (Output *output : outputs) {
if (output->isEnabled()) {
slotOutputEnabled(output);
}
}
Screens *screens = Screens::self();
screens->init();
@ -1572,7 +1574,7 @@ QString Workspace::supportInformation() const
} else {
support.append(QStringLiteral(" no\n"));
}
const QVector<Output *> outputs = kwinApp()->platform()->enabledOutputs();
const QVector<Output *> outputs = kwinApp()->platform()->outputs();
support.append(QStringLiteral("Number of Screens: %1\n\n").arg(outputs.count()));
for (int i = 0; i < outputs.count(); ++i) {
const auto output = outputs[i];
@ -1580,6 +1582,8 @@ QString Workspace::supportInformation() const
support.append(QStringLiteral("Screen %1:\n").arg(i));
support.append(QStringLiteral("---------\n"));
support.append(QStringLiteral("Name: %1\n").arg(output->name()));
support.append(QStringLiteral("Enabled: %1\n").arg(output->isEnabled()));
if (output->isEnabled()) {
support.append(QStringLiteral("Geometry: %1,%2,%3x%4\n")
.arg(geo.x())
.arg(geo.y())
@ -1603,6 +1607,7 @@ QString Workspace::supportInformation() const
}
support.append(QStringLiteral("Adaptive Sync: %1\n").arg(vrr));
}
}
support.append(QStringLiteral("\nCompositing\n"));
support.append(QStringLiteral("===========\n"));
if (effects) {