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

[backends/wayland] Simplify WaylandScreens by basing on ShellSurface size

Browse source 
It's a screen for a nested setup - no need for integrating with Wayland's
output for that.
This commit is contained in:
Martin Gräßlin 2015-11-17 09:28:42 +01:00
parent 9381d3f88c
commit df71c5b61b
2 changed files with 11 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
backends/wayland/screens_wayland.cpp
View file

@ -20,7 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "screens_wayland.h"
#include "wayland_backend.h"
#include <KWayland/Client/output.h>
#include "logging.h"
#include "main.h"
@ -42,65 +41,36 @@ WaylandScreens::~WaylandScreens()
void WaylandScreens::init()
{
Screens::init();
connect(m_backend, &Wayland::WaylandBackend::outputsChanged,
connect(m_backend, &Wayland::WaylandBackend::shellSurfaceSizeChanged,
this, &WaylandScreens::startChangedTimer);
updateCount();
}
QRect WaylandScreens::geometry(int screen) const
{
if (screen >= m_geometries.size()) {
return QRect();
if (screen == 0) {
return QRect(QPoint(0, 0), size(screen));
}
return m_geometries.at(screen);
return QRect();
}
QSize WaylandScreens::size(int screen) const
{
return geometry(screen).size();
if (screen == 0) {
return m_backend->shellSurfaceSize();
}
return QSize();
}
int WaylandScreens::number(const QPoint &pos) const
{
int bestScreen = 0;
int minDistance = INT_MAX;
for (int i = 0; i < m_geometries.size(); ++i) {
const QRect &geo = m_geometries.at(i);
if (geo.contains(pos)) {
return i;
}
int distance = QPoint(geo.topLeft() - pos).manhattanLength();
distance = qMin(distance, QPoint(geo.topRight() - pos).manhattanLength());
distance = qMin(distance, QPoint(geo.bottomRight() - pos).manhattanLength());
distance = qMin(distance, QPoint(geo.bottomLeft() - pos).manhattanLength());
if (distance < minDistance) {
minDistance = distance;
bestScreen = i;
}
}
return bestScreen;
Q_UNUSED(pos)
return 0;
}
void WaylandScreens::updateCount()
{
m_geometries.clear();
int count = 0;
const QList<KWayland::Client::Output*> &outputs = m_backend->outputs();
for (auto it = outputs.begin(); it != outputs.end(); ++it) {
if ((*it)->pixelSize().isEmpty()) {
continue;
}
count++;
m_geometries.append(QRect((*it)->globalPosition(), (*it)->pixelSize()));
}
if (m_geometries.isEmpty()) {
// we need a fake screen
m_geometries.append(QRect(0, 0, displayWidth(), displayHeight()));
setCount(1);
return;
}
setCount(m_geometries.count());
emit changed();
setCount(1);
}
}

1
backends/wayland/screens_wayland.h
View file

@ -45,7 +45,6 @@ protected Q_SLOTS:
void updateCount() override;
private:
Wayland::WaylandBackend *m_backend;
QList<QRect> m_geometries;
};
}