2b1219cfdd
In the current implementation we cannot use a LayerShellQt before the shell surface is created. At the moment a shell surface is created, the constructor is run and then QtWayland commits the current state. This means the compositor configures the window before a client has any chance to set anchors or margins. This works whilst we're just being a simple fullscreen window, but won't scale for plasmashell in the future. This patch makes LayerShellQt::Window always creatable, and we can set and cache properties before the platform window is created, just like one can on QWindow and XDGShell properties. This also makes it less potentially crashy as ::get always returns a valid result, and sets up the public API to be QML-able as an attached property in future. Co-authored on Aleix's patch for the unit test
148 lines
3.2 KiB
C++
148 lines
3.2 KiB
C++
/*
|
|
* SPDX-FileCopyrightText: 2021 Aleix Pol Gonzalez <aleixpol@blue-systems.com>
|
|
*
|
|
* SPDX-License-Identifier: LGPL-3.0-or-later
|
|
*/
|
|
|
|
#include "window.h"
|
|
#include "../qwaylandlayersurface_p.h"
|
|
#include <layershellqt_logging.h>
|
|
#include <private/qwaylandshellsurface_p.h>
|
|
#include <private/qwaylandwindow_p.h>
|
|
|
|
using namespace LayerShellQt;
|
|
|
|
class LayerShellQt::WindowPrivate
|
|
{
|
|
public:
|
|
WindowPrivate(QWindow *window)
|
|
: parentWindow(window)
|
|
{
|
|
}
|
|
|
|
QWindow *parentWindow;
|
|
QString scope = QStringLiteral("window");
|
|
Window::Anchors anchors = {Window::AnchorTop | Window::AnchorBottom | Window::AnchorLeft | Window::AnchorRight};
|
|
int32_t exclusionZone = 0;
|
|
bool keyboardInteractivity = true;
|
|
Window::Layer layer = Window::LayerTop;
|
|
QMargins margins;
|
|
QWaylandLayerSurface *getSurface() const;
|
|
};
|
|
|
|
static QMap<QWindow *, Window *> s_map;
|
|
|
|
Window::~Window()
|
|
{
|
|
s_map.remove(d->parentWindow);
|
|
}
|
|
|
|
void Window::setAnchors(Anchors anchors)
|
|
{
|
|
d->anchors = anchors;
|
|
if (auto surface = d->getSurface()) {
|
|
surface->setAnchor(anchors);
|
|
}
|
|
}
|
|
|
|
Window::Anchors Window::anchors() const
|
|
{
|
|
return d->anchors;
|
|
}
|
|
|
|
void Window::setExclusiveZone(int32_t zone)
|
|
{
|
|
d->exclusionZone = zone;
|
|
if (auto surface = d->getSurface()) {
|
|
surface->setExclusiveZone(zone);
|
|
}
|
|
}
|
|
|
|
int32_t Window::exclusionZone() const
|
|
{
|
|
return d->exclusionZone;
|
|
}
|
|
|
|
void Window::setMargins(const QMargins &margins)
|
|
{
|
|
d->margins = margins;
|
|
if (auto surface = d->getSurface()) {
|
|
surface->setMargins(margins);
|
|
}
|
|
}
|
|
|
|
QMargins Window::margins() const
|
|
{
|
|
return d->margins;
|
|
}
|
|
|
|
void Window::setKeyboardInteractivity(bool enabled)
|
|
{
|
|
d->keyboardInteractivity = enabled;
|
|
if (auto surface = d->getSurface()) {
|
|
surface->setKeyboardInteractivity(enabled);
|
|
}
|
|
}
|
|
|
|
bool Window::keyboardInteractivity() const
|
|
{
|
|
return d->keyboardInteractivity;
|
|
}
|
|
|
|
void Window::setLayer(Layer layer)
|
|
{
|
|
d->layer = layer;
|
|
if (auto surface = d->getSurface()) {
|
|
surface->setLayer(layer);
|
|
}
|
|
}
|
|
|
|
void Window::setScope(const QString &scope)
|
|
{
|
|
d->scope = scope;
|
|
// this is static and must be set before the platform window is created
|
|
}
|
|
|
|
QString Window::scope() const
|
|
{
|
|
return d->scope;
|
|
}
|
|
|
|
Window::Layer Window::layer() const
|
|
{
|
|
return d->layer;
|
|
}
|
|
|
|
Window::Window(QWindow *window)
|
|
: QObject(window)
|
|
, d(new WindowPrivate(window))
|
|
{
|
|
s_map.insert(d->parentWindow, this);
|
|
}
|
|
|
|
Window *Window::get(QWindow *window)
|
|
{
|
|
auto layerShellWindow = s_map.value(window);
|
|
if (layerShellWindow) {
|
|
return layerShellWindow;
|
|
}
|
|
return new Window(window);
|
|
}
|
|
|
|
QWaylandLayerSurface *WindowPrivate::getSurface() const
|
|
{
|
|
if (!parentWindow) {
|
|
return nullptr;
|
|
}
|
|
auto ww = dynamic_cast<QtWaylandClient::QWaylandWindow *>(parentWindow->handle());
|
|
if (!ww) {
|
|
qCDebug(LAYERSHELLQT) << "window not a wayland window" << parentWindow;
|
|
return nullptr;
|
|
}
|
|
QWaylandLayerSurface *s = qobject_cast<QWaylandLayerSurface *>(ww->shellSurface());
|
|
if (!s) {
|
|
qCDebug(LAYERSHELLQT) << "window not using wlr-layer-shell" << parentWindow << ww->shellSurface();
|
|
return nullptr;
|
|
}
|
|
return s;
|
|
}
|