Add API to choose an initial state of the window

.gitignore

@@ -1,29 +0,0 @@
-# SPDX-License-Identifier: CC0-1.0
-# SPDX-FileCopyrightText: none
-# Ignore the following files
-.vscode
-*~
-*.[oa]
-*.diff
-*.kate-swp
-*.kdev4
-.kdev_include_paths
-*.kdevelop.pcs
-*.moc
-*.moc.cpp
-*.orig
-*.user
-.*.swp
-.swp.*
-Doxyfile
-Makefile
-avail
-random_seed
-/build*/
-CMakeLists.txt.user*
-.clang-format
-/compile_commands.json
-.clangd
-.idea
-/cmake-build*
-.cache

CMakeLists.txt

@@ -4,14 +4,11 @@
 cmake_minimum_required(VERSION 3.16)
 
 project(layershellqt)
-set(PROJECT_VERSION "5.23.4")
+set(PROJECT_VERSION "5.21.80")
 set(PROJECT_VERSION_MAJOR 5)
 
-set(CMAKE_C_STANDARD 99)
-
 set(QT_MIN_VERSION "5.15.0")
-set(KF5_MIN_VERSION "5.86")
+set(KF5_MIN_VERSION "5.78")
-set(KDE_COMPILERSETTINGS_LEVEL "5.82")
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -36,9 +33,6 @@ find_package(WaylandScanner)
 find_package(QtWaylandScanner)
 find_package(Wayland 1.3 COMPONENTS Client Server)
 find_package(WaylandProtocols)
-find_package(PkgConfig REQUIRED)
-
-pkg_check_modules(XKBCOMMON xkbcommon REQUIRED IMPORTED_TARGET)
 
 set_package_properties(Wayland PROPERTIES
                        TYPE REQUIRED)

src/CMakeLists.txt

@@ -16,18 +16,18 @@ ecm_qt_declare_logging_category(LAYER_SHELL_SOURCES
 )
 
 add_library(LayerShellQtInterface SHARED qwaylandlayersurface.cpp interfaces/window.cpp interfaces/shell.cpp qwaylandlayershellintegration.cpp qwaylandlayershell.cpp ${LAYER_SHELL_SOURCES})
-target_link_libraries(LayerShellQtInterface PRIVATE Qt::Gui Qt::WaylandClientPrivate Qt::XkbCommonSupportPrivate Wayland::Client PkgConfig::XKBCOMMON)
+target_link_libraries(LayerShellQtInterface PRIVATE Qt::Gui Qt::WaylandClientPrivate Qt::XkbCommonSupportPrivate Wayland::Client)
 target_include_directories(LayerShellQtInterface PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/LayerShellQt>"
                                               INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/>"
 )
 
-set_target_properties(LayerShellQtInterface PROPERTIES VERSION   ${LAYERSHELLQT_VERSION}
+set_target_properties(LayerShellQtInterface PROPERTIES VERSION   ${LAYERSHELLQT_VERSION_STRING}
                                                        SOVERSION ${LAYERSHELLQT_SOVERSION}
                                                        EXPORT_NAME Interface
 )
 
 add_library(layer-shell SHARED qwaylandlayershellintegrationplugin.cpp)
-target_link_libraries(layer-shell LayerShellQtInterface Qt::WaylandClient Qt::WaylandClientPrivate Qt::XkbCommonSupportPrivate Wayland::Client PkgConfig::XKBCOMMON)
+target_link_libraries(layer-shell LayerShellQtInterface Qt::WaylandClient Qt::WaylandClientPrivate Qt::XkbCommonSupportPrivate Wayland::Client)
 
 ecm_generate_headers(LayerShellQt_HEADERS
     HEADER_NAMES

src/interfaces/shell.cpp

@@ -18,3 +18,51 @@ void Shell::useLayerShell()
         qCDebug(LAYERSHELLQT) << "Unable to set QT_WAYLAND_SHELL_INTEGRATION=layer-shell";
     }
 }
+
+struct Defaults {
+    QString scope = QStringLiteral("normal");
+    Window::Anchors anchors = {Window::AnchorTop | Window::AnchorBottom | Window::AnchorLeft | Window::AnchorRight};
+    Window::Layer layer = Window::LayerTop;
+    QMargins margins;
+};
+Q_GLOBAL_STATIC(Defaults, s_defaults);
+
+void Shell::setDefaultScope(const QString &scope)
+{
+    s_defaults->scope = scope;
+}
+
+QString Shell::defaultScope()
+{
+    return s_defaults->scope;
+}
+
+void Shell::setDefaultLayer(Window::Layer defaultLayer)
+{
+    s_defaults->layer = defaultLayer;
+}
+
+Window::Layer Shell::defaultLayer()
+{
+    return s_defaults->layer;
+}
+
+void Shell::setDefaultAnchors(Window::Anchors anchors)
+{
+    s_defaults->anchors = anchors;
+}
+
+Window::Anchors Shell::defaultAnchors()
+{
+    return s_defaults->anchors;
+}
+
+void Shell::setDefaultMargins(const QMargins &margins)
+{
+    s_defaults->margins = margins;
+}
+
+QMargins Shell::defaultMargins()
+{
+    return s_defaults->margins;
+}

src/interfaces/shell.h

@@ -20,6 +20,18 @@ class LAYERSHELLQT_EXPORT Shell
 {
 public:
     static void useLayerShell();
+
+    static void setDefaultMargins(const QMargins &margins);
+    static QMargins defaultMargins();
+
+    static void setDefaultScope(const QString &scope);
+    static QString defaultScope();
+
+    static void setDefaultLayer(Window::Layer defaultLayer);
+    static Window::Layer defaultLayer();
+
+    static void setDefaultAnchors(Window::Anchors defaultAnchors);
+    static Window::Anchors defaultAnchors();
 };
 
 }

src/interfaces/window.cpp

@@ -15,134 +15,58 @@ using namespace LayerShellQt;
 class LayerShellQt::WindowPrivate
 {
 public:
-    WindowPrivate(QWindow *window)
+    WindowPrivate(QWaylandLayerSurface *surface)
-        : parentWindow(window)
+        : surface(surface)
     {
     }
 
-    QWindow *parentWindow;
+    QWaylandLayerSurface *const surface;
-    QString scope = QStringLiteral("window");
-    Window::Anchors anchors = {Window::AnchorTop | Window::AnchorBottom | Window::AnchorLeft | Window::AnchorRight};
-    int32_t exclusionZone = 0;
-    Window::KeyboardInteractivity keyboardInteractivity = Window::KeyboardInteractivityExclusive;
-    Window::Layer layer = Window::LayerTop;
-    QMargins margins;
-    QWaylandLayerSurface *getSurface() const;
 };
 
-static QMap<QWindow *, Window *> s_map;
+Window::~Window() = default;
 
-Window::~Window()
+void Window::setAnchor(Anchor anchor)
 {
-    s_map.remove(d->parentWindow);
+    d->surface->setAnchor(anchor);
-}
-
-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;
+    d->surface->setExclusiveZone(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;
+    d->surface->setMargins(margins);
-    if (auto surface = d->getSurface()) {
-        surface->setMargins(margins);
-    }
 }
 
-QMargins Window::margins() const
+void Window::setKeyboardInteractivity(bool enabled)
 {
-    return d->margins;
+    d->surface->setKeyboardInteractivity(enabled);
-}
-
-void Window::setKeyboardInteractivity(KeyboardInteractivity interactivity)
-{
-    d->keyboardInteractivity = interactivity;
-    if (auto surface = d->getSurface()) {
-        surface->setKeyboardInteractivity(interactivity);
-    }
-}
-
-Window::KeyboardInteractivity Window::keyboardInteractivity() const
-{
-    return d->keyboardInteractivity;
 }
 
 void Window::setLayer(Layer layer)
 {
-    d->layer = layer;
+    d->surface->setLayer(layer);
-    if (auto surface = d->getSurface()) {
-        surface->setLayer(layer);
-    }
 }
 
-void Window::setScope(const QString &scope)
+Window::Window(WindowPrivate *d)
+    : d(d)
 {
-    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);
+    auto ww = dynamic_cast<QtWaylandClient::QWaylandWindow *>(window->handle());
-    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;
+        qCDebug(LAYERSHELLQT) << "window not a wayland window" << window;
         return nullptr;
     }
     QWaylandLayerSurface *s = qobject_cast<QWaylandLayerSurface *>(ww->shellSurface());
     if (!s) {
-        qCDebug(LAYERSHELLQT) << "window not using wlr-layer-shell" << parentWindow << ww->shellSurface();
+        qCDebug(LAYERSHELLQT) << "window not using wlr-layer-shell" << window << ww->shellSurface();
         return nullptr;
     }
-    return s;
+
+    return new Window(new WindowPrivate(s));
 }

src/interfaces/window.h

@@ -43,49 +43,16 @@ public:
     };
     Q_ENUM(Layer)
 
-    /**
+    void setAnchor(Anchor anchor);
-     * This enum type is used to specify how the layer surface handles keyboard focus.
-     */
-    enum KeyboardInteractivity {
-        KeyboardInteractivityNone = 0,
-        KeyboardInteractivityExclusive = 1,
-        KeyboardInteractivityOnDemand = 2,
-    };
-    Q_ENUM(KeyboardInteractivity)
-
-    void setAnchors(Anchors anchor);
-    Anchors anchors() const;
-
     void setExclusiveZone(int32_t zone);
-    int32_t exclusionZone() const;
-
     void setMargins(const QMargins &margins);
-    QMargins margins() const;
+    void setKeyboardInteractivity(bool enabled);
-
-    void setKeyboardInteractivity(KeyboardInteractivity interactivity);
-    KeyboardInteractivity keyboardInteractivity() const;
-
     void setLayer(Layer layer);
-    Layer layer() const;
 
-    /**
-     * Sets a string based identifier for this window.
-     * This may be used by a compositor to determine stacking
-     * order within a given layer.
-     *
-     * May also be referred to as a role
-     */
-    void setScope(const QString &scope);
-    QString scope() const;
-
-    /**
-     * Gets the LayerShell Window for a given Qt Window
-     * Ownership is not transferred
-     */
     static Window *get(QWindow *window);
 
 private:
-    Window(QWindow *window);
+    Window(WindowPrivate *d);
     QScopedPointer<WindowPrivate> d;
 };
 

src/qwaylandlayershell.cpp

@@ -10,8 +10,8 @@
 
 namespace LayerShellQt
 {
-QWaylandLayerShell::QWaylandLayerShell(::wl_registry *registry, uint32_t id, uint32_t version)
+QWaylandLayerShell::QWaylandLayerShell(QtWayland::zwlr_layer_shell_v1 *shell)
-    : QtWayland::zwlr_layer_shell_v1(registry, id, version)
+    : QtWayland::zwlr_layer_shell_v1(shell->object())
 {
 }
 

src/qwaylandlayershell_p.h

@@ -20,7 +20,7 @@ namespace LayerShellQt
 class LAYERSHELLQT_EXPORT QWaylandLayerShell : public QtWayland::zwlr_layer_shell_v1
 {
 public:
-    QWaylandLayerShell(::wl_registry *registry, uint32_t id, uint32_t version);
+    QWaylandLayerShell(QtWayland::zwlr_layer_shell_v1 *shell);
     virtual ~QWaylandLayerShell();
 
     QWaylandLayerSurface *createLayerSurface(QtWaylandClient::QWaylandWindow *window);

src/qwaylandlayershellintegration.cpp

@@ -18,10 +18,6 @@ QWaylandLayerShellIntegration::QWaylandLayerShellIntegration()
 {
 }
 
-QWaylandLayerShellIntegration::~QWaylandLayerShellIntegration()
-{
-}
-
 bool QWaylandLayerShellIntegration::initialize(QtWaylandClient::QWaylandDisplay *display)
 {
     QWaylandShellIntegration::initialize(display);
@@ -39,7 +35,7 @@ void QWaylandLayerShellIntegration::registryLayer(void *data, struct wl_registry
     QWaylandLayerShellIntegration *shell = static_cast<QWaylandLayerShellIntegration *>(data);
 
     if (interface == zwlr_layer_shell_v1_interface.name)
-        shell->m_layerShell.reset(new QWaylandLayerShell(registry, id, std::min(version, 4u)));
+        shell->m_layerShell = new QWaylandLayerShell(new QtWayland::zwlr_layer_shell_v1(registry, id, std::min(version, 3u)));
 }
 
 }

src/qwaylandlayershellintegration_p.h

@@ -21,7 +21,6 @@ class LAYERSHELLQT_EXPORT QWaylandLayerShellIntegration : public QtWaylandClient
 {
 public:
     QWaylandLayerShellIntegration();
-    ~QWaylandLayerShellIntegration() override;
 
     bool initialize(QtWaylandClient::QWaylandDisplay *display) override;
     QtWaylandClient::QWaylandShellSurface *createShellSurface(QtWaylandClient::QWaylandWindow *window) override;
@@ -29,7 +28,7 @@ public:
 private:
     static void registryLayer(void *data, struct wl_registry *registry, uint32_t id, const QString &interface, uint32_t version);
 
-    QScopedPointer<QWaylandLayerShell> m_layerShell;
+    QWaylandLayerShell *m_layerShell = nullptr;
 };
 
 }

src/qwaylandlayersurface.cpp

@@ -8,7 +8,6 @@
 #include "interfaces/shell.h"
 #include "qwaylandlayershell_p.h"
 #include "qwaylandlayersurface_p.h"
-#include "layershellqt_logging.h"
 
 #include <QtWaylandClient/private/qwaylandscreen_p.h>
 #include <QtWaylandClient/private/qwaylandsurface_p.h>
@@ -18,35 +17,24 @@ namespace LayerShellQt
 {
 QWaylandLayerSurface::QWaylandLayerSurface(QWaylandLayerShell *shell, QtWaylandClient::QWaylandWindow *window)
     : QtWaylandClient::QWaylandShellSurface(window)
-    , QtWayland::zwlr_layer_surface_v1()
+    , QtWayland::zwlr_layer_surface_v1(
+          shell->get_layer_surface(window->waylandSurface()->object(), window->waylandScreen()->output(), Shell::defaultLayer(), Shell::defaultScope()))
 {
-    LayerShellQt::Window *interface = Window::get(window->window());
+    const auto anchors = Shell::defaultAnchors();
-    Q_ASSERT(interface);
+    set_anchor(anchors);
 
-    // Qt will always assign a screen to a window, but if the compositor has no screens available a dummy QScreen object is created
+    if (!Shell::defaultMargins().isNull()) {
-    // this will not cast to a QWaylandScreen
+        setMargins(Shell::defaultMargins());
-    QtWaylandClient::QWaylandScreen *screen = window->waylandScreen();
-    if (screen->isPlaceholder()) {
-        qCWarning(LAYERSHELLQT) << "Creating a layer shell for placeholder screen. This will be positioned incorrectly";
     }
 
-    init(shell->get_layer_surface(window->waylandSurface()->object(), screen->isPlaceholder() ? nullptr : screen->output(), interface->layer(), interface->scope()));
-
-    Window::Anchors anchors = interface->anchors();
-
-    set_anchor(interface->anchors());
-    setMargins(interface->margins());
-    setKeyboardInteractivity(interface->keyboardInteractivity());
-    setExclusiveZone(interface->exclusionZone());
-
     QSize size = window->surfaceSize();
-    if ((anchors & Window::AnchorLeft) && (anchors & Window::AnchorRight)) {
+    if (anchors & Window::AnchorLeft && anchors & Window::AnchorRight) {
         size.setWidth(0);
     }
-    if ((anchors & Window::AnchorTop) && (anchors & Window::AnchorBottom)) {
+    if (anchors & Window::AnchorTop && anchors & Window::AnchorBottom) {
         size.setHeight(0);
     }
-    if (size.isValid() && size != QSize(0, 0)) {
+    if (size.isValid() && size != QSize(0,0)) {
         set_size(size.width(), size.height());
     }
 }
@@ -97,9 +85,9 @@ void QWaylandLayerSurface::setMargins(const QMargins &margins)
     set_margin(margins.top(), margins.right(), margins.bottom(), margins.left());
 }
 
-void QWaylandLayerSurface::setKeyboardInteractivity(uint32_t interactivity)
+void QWaylandLayerSurface::setKeyboardInteractivity(bool enabled)
 {
-    set_keyboard_interactivity(interactivity);
+    set_keyboard_interactivity(enabled);
 }
 
 void QWaylandLayerSurface::setLayer(uint32_t layer)

src/qwaylandlayersurface_p.h

@@ -33,7 +33,7 @@ public:
     void setAnchor(uint32_t anchor);
     void setExclusiveZone(int32_t zone);
     void setMargins(const QMargins &margins);
-    void setKeyboardInteractivity(uint32_t interactivity);
+    void setKeyboardInteractivity(bool enabled);
     void setLayer(uint32_t layer);
 
     void applyConfigure() override;

src/wlr-layer-shell-unstable-v1.xml

@@ -25,7 +25,7 @@
     THIS SOFTWARE.
   </copyright>
 
-  <interface name="zwlr_layer_shell_v1" version="4">
+  <interface name="zwlr_layer_shell_v1" version="3">
     <description summary="create surfaces that are layers of the desktop">
       Clients can use this interface to assign the surface_layer role to
       wl_surfaces. Such surfaces are assigned to a "layer" of the output and
@@ -100,7 +100,7 @@
     </request>
   </interface>
 
-  <interface name="zwlr_layer_surface_v1" version="4">
+  <interface name="zwlr_layer_surface_v1" version="3">
     <description summary="layer metadata interface">
       An interface that may be implemented by a wl_surface, for surfaces that
       are designed to be rendered as a layer of a stacked desktop-like
@@ -203,85 +203,21 @@
       <arg name="left" type="int"/>
     </request>
 
-    <enum name="keyboard_interactivity">
-      <description summary="types of keyboard interaction possible for a layer shell surface">
-        Types of keyboard interaction possible for layer shell surfaces. The
-        rationale for this is twofold: (1) some applications are not interested
-        in keyboard events and not allowing them to be focused can improve the
-        desktop experience; (2) some applications will want to take exclusive
-        keyboard focus.
-      </description>
-
-      <entry name="none" value="0">
-        <description summary="no keyboard focus is possible">
-          This value indicates that this surface is not interested in keyboard
-          events and the compositor should never assign it the keyboard focus.
-
-          This is the default value, set for newly created layer shell surfaces.
-
-          This is useful for e.g. desktop widgets that display information or
-          only have interaction with non-keyboard input devices.
-        </description>
-      </entry>
-      <entry name="exclusive" value="1">
-        <description summary="request exclusive keyboard focus">
-          Request exclusive keyboard focus if this surface is above the shell surface layer.
-
-          For the top and overlay layers, the seat will always give
-          exclusive keyboard focus to the top-most layer which has keyboard
-          interactivity set to exclusive. If this layer contains multiple
-          surfaces with keyboard interactivity set to exclusive, the compositor
-          determines the one receiving keyboard events in an implementation-
-          defined manner. In this case, no guarantee is made when this surface
-          will receive keyboard focus (if ever).
-
-          For the bottom and background layers, the compositor is allowed to use
-          normal focus semantics.
-
-          This setting is mainly intended for applications that need to ensure
-          they receive all keyboard events, such as a lock screen or a password
-          prompt.
-        </description>
-      </entry>
-      <entry name="on_demand" value="2" since="4">
-        <description summary="request regular keyboard focus semantics">
-          This requests the compositor to allow this surface to be focused and
-          unfocused by the user in an implementation-defined manner. The user
-          should be able to unfocus this surface even regardless of the layer
-          it is on.
-
-          Typically, the compositor will want to use its normal mechanism to
-          manage keyboard focus between layer shell surfaces with this setting
-          and regular toplevels on the desktop layer (e.g. click to focus).
-          Nevertheless, it is possible for a compositor to require a special
-          interaction to focus or unfocus layer shell surfaces (e.g. requiring
-          a click even if focus follows the mouse normally, or providing a
-          keybinding to switch focus between layers).
-
-          This setting is mainly intended for desktop shell components (e.g.
-          panels) that allow keyboard interaction. Using this option can allow
-          implementing a desktop shell that can be fully usable without the
-          mouse.
-        </description>
-      </entry>
-    </enum>
-
     <request name="set_keyboard_interactivity">
       <description summary="requests keyboard events">
-        Set how keyboard events are delivered to this surface. By default,
+        Set to 1 to request that the seat send keyboard events to this layer
-        layer shell surfaces do not receive keyboard events; this request can
+        surface. For layers below the shell surface layer, the seat will use
-        be used to change this.
+        normal focus semantics. For layers above the shell surface layers, the
-
+        seat will always give exclusive keyboard focus to the top-most layer
-        This setting is inherited by child surfaces set by the get_popup
+        which has keyboard interactivity set to true.
-        request.
 
         Layer surfaces receive pointer, touch, and tablet events normally. If
         you do not want to receive them, set the input region on your surface
         to an empty region.
 
-        Keyboard interactivity is double-buffered, see wl_surface.commit.
+        Events is double-buffered, see wl_surface.commit.
       </description>
-      <arg name="keyboard_interactivity" type="uint" enum="keyboard_interactivity"/>
+      <arg name="keyboard_interactivity" type="uint"/>
     </request>
 
     <request name="get_popup">
@@ -366,7 +302,6 @@
       <entry name="invalid_surface_state" value="0" summary="provided surface state is invalid"/>
       <entry name="invalid_size" value="1" summary="size is invalid"/>
       <entry name="invalid_anchor" value="2" summary="anchor bitfield is invalid"/>
-      <entry name="invalid_keyboard_interactivity" value="3" summary="keyboard interactivity is invalid"/>
     </enum>
 
     <enum name="anchor" bitfield="true">

tests/main.cpp

@@ -5,15 +5,8 @@
  */
 
 #include <QCommandLineParser>
-
 #include <QGuiApplication>
-#include <QPainter>
+#include <QQmlApplicationEngine>
-#include <QRasterWindow>
-#include <QTimer>
-#include <QWindow>
-
-#include <QMetaEnum>
-
 #include <interfaces/shell.h>
 #include <interfaces/window.h>
 
@@ -40,15 +33,6 @@ T stringToEnum(QMetaEnum metaEnum, const QString &str)
     return ret;
 }
 
-class BasicWindow : public QRasterWindow
-{
-    void paintEvent(QPaintEvent *)
-    {
-        QPainter p(this);
-        p.fillRect(QRect(0, 0, width(), height()), Qt::red);
-    }
-};
-
 int main(int argc, char **argv)
 {
     Shell::useLayerShell();
@@ -69,40 +53,38 @@ int main(int argc, char **argv)
                                    QStringLiteral("One of ") + enumsToStringList(layerMetaEnum).join(QLatin1String("|")),
                                    QStringLiteral("layer"),
                                    QStringLiteral("LayerTop"));
-    QCommandLineOption widthOption(QStringLiteral("width"), QStringLiteral("Width of the window"), QStringLiteral("pixels"), QStringLiteral("0"));
+    parser.addOptions({marginsOption, scopeOption, anchorsOption, layerOption});
-    QCommandLineOption heightOption(QStringLiteral("height"), QStringLiteral("Height of the window"), QStringLiteral("pixels"), QStringLiteral("0"));
-
-    parser.addOptions({marginsOption, scopeOption, anchorsOption, layerOption, widthOption, heightOption});
     parser.addHelpOption();
     parser.process(app);
 
-    BasicWindow window;
+    static int margins = 0;
-
-    LayerShellQt::Window *layerShell = LayerShellQt::Window::get(&window);
     if (parser.isSet(marginsOption)) {
-        int margins = parser.value(marginsOption).toInt();
+        margins = parser.value(marginsOption).toInt();
-        layerShell->setMargins({margins, margins, margins, margins});
+        Shell::setDefaultMargins({margins, margins, margins, margins});
     }
-
     if (parser.isSet(scopeOption)) {
-        layerShell->setScope(parser.value(scopeOption));
+        Shell::setDefaultScope(parser.value(scopeOption));
     }
     if (parser.isSet(layerOption)) {
-        layerShell->setLayer(Window::Layer(layerMetaEnum.keyToValue(qPrintable(parser.value(layerOption)))));
+        Shell::setDefaultLayer(Window::Layer(layerMetaEnum.keyToValue(qPrintable(parser.value(layerOption)))));
     }
     if (parser.isSet(anchorsOption)) {
-        layerShell->setAnchors(stringToEnum<Window::Anchors>(anchorMetaEnum, parser.value(anchorsOption)));
+        Shell::setDefaultAnchors(stringToEnum<Window::Anchors>(anchorMetaEnum, parser.value(anchorsOption)));
-    }
-    if (parser.isSet(widthOption)) {
-        window.setWidth(parser.value(widthOption).toInt());
-    }
-    if (parser.isSet(heightOption)) {
-        window.setHeight(parser.value(heightOption).toInt());
     }
 
-    window.show();
+    QQmlApplicationEngine engine;
+    engine.loadData(
+        "import QtQuick.Controls 2.10\n"
+        "import QtQuick 2.10\n"
+        "\n"
+        "ApplicationWindow {"
+        "   width: 100; height: 100\n"
+        "   visible: true\n"
+        "   Rectangle { color: 'red'; anchors.fill: parent }"
+        "}"
+
+        ,
+        QStringLiteral("bananaland:/potato.qml"));
 
-    // just so you don't block yourself out whilst testing
-    QTimer::singleShot(5000, &app, &QGuiApplication::quit);
     return app.exec();
 }