vioken · zccrs · Oct 10, 2024 · Oct 9, 2024 · Oct 9, 2024 · Oct 9, 2024
diff --git a/examples/blur/Main.qml b/examples/blur/Main.qml
@@ -45,14 +45,14 @@ Item {
                     cursorDelegate: Cursor {
                         id: cursorItem
 
-                        required property QtObject outputCurosr
+                        required property QtObject outputCursor
                         readonly property point position: parent.mapFromGlobal(cursor.position.x, cursor.position.y)
 
-                        cursor: outputCurosr.cursor
-                        output: outputCurosr.output.output
+                        cursor: outputCursor.cursor
+                        output: outputCursor.output.output
                         x: position.x - hotSpot.x
                         y: position.y - hotSpot.y
-                        visible: valid && outputCurosr.visible
+                        visible: valid && outputCursor.visible
                         OutputLayer.enabled: true
                         OutputLayer.keepLayer: true
                         OutputLayer.flags: OutputLayer.Cursor

diff --git a/examples/outputcopy/PrimaryOutputDelegate.qml b/examples/outputcopy/PrimaryOutputDelegate.qml
@@ -17,14 +17,14 @@ OutputItem {
     cursorDelegate: Cursor {
         id: cursorItem
 
-        required property QtObject outputCurosr
+        required property QtObject outputCursor
         readonly property point position: parent.mapFromGlobal(cursor.position.x, cursor.position.y)
 
-        cursor: outputCurosr.cursor
-        output: outputCurosr.output.output
+        cursor: outputCursor.cursor
+        output: outputCursor.output.output
         x: position.x - hotSpot.x
         y: position.y - hotSpot.y
-        visible: valid && outputCurosr.visible
+        visible: valid && outputCursor.visible
         OutputLayer.enabled: true
         OutputLayer.keepLayer: true
         OutputLayer.flags: OutputLayer.Cursor

diff --git a/examples/outputviewport/Main.qml b/examples/outputviewport/Main.qml
@@ -45,14 +45,14 @@ Item {
                     cursorDelegate: Cursor {
                         id: cursorItem
 
-                        required property QtObject outputCurosr
+                        required property QtObject outputCursor
                         readonly property point position: parent.mapFromGlobal(cursor.position.x, cursor.position.y)
 
-                        cursor: outputCurosr.cursor
-                        output: outputCurosr.output.output
+                        cursor: outputCursor.cursor
+                        output: outputCursor.output.output
                         x: position.x - hotSpot.x
                         y: position.y - hotSpot.y
-                        visible: valid && outputCurosr.visible
+                        visible: valid && outputCursor.visible
                         OutputLayer.enabled: true
                         OutputLayer.keepLayer: true
                         OutputLayer.flags: OutputLayer.Cursor

diff --git a/examples/surface-delegate/Main.qml b/examples/surface-delegate/Main.qml
@@ -119,14 +119,14 @@ Item {
                     cursorDelegate: Cursor {
                         id: cursorItem
 
-                        required property QtObject outputCurosr
+                        required property QtObject outputCursor
                         readonly property point position: parent.mapFromGlobal(cursor.position.x, cursor.position.y)
 
-                        cursor: outputCurosr.cursor
-                        output: outputCurosr.output.output
+                        cursor: outputCursor.cursor
+                        output: outputCursor.output.output
                         x: position.x - hotSpot.x
                         y: position.y - hotSpot.y
-                        visible: valid && outputCurosr.visible
+                        visible: valid && outputCursor.visible
                         OutputLayer.enabled: true
                         OutputLayer.keepLayer: true
                         OutputLayer.flags: OutputLayer.Cursor

diff --git a/examples/tinywl-new/PrimaryOutput.qml b/examples/tinywl-new/PrimaryOutput.qml
@@ -17,14 +17,14 @@ OutputItem {
     cursorDelegate: Cursor {
         id: cursorItem
 
-        required property QtObject outputCurosr
+        required property QtObject outputCursor
         readonly property point position: parent.mapFromGlobal(cursor.position.x, cursor.position.y)
 
-        cursor: outputCurosr.cursor
-        output: outputCurosr.output.output
+        cursor: outputCursor.cursor
+        output: outputCursor.output.output
         x: position.x - hotSpot.x
         y: position.y - hotSpot.y
-        visible: valid && outputCurosr.visible
+        visible: valid && outputCursor.visible
         OutputLayer.enabled: !outputCursor.output.forceSoftwareCursor
         OutputLayer.keepLayer: true
         OutputLayer.outputs: [screenViewport]

diff --git a/examples/tinywl-new/output.h b/examples/tinywl-new/output.h
@@ -9,7 +9,8 @@
 #include <QObject>
 #include <QQmlComponent>
 #include <woutputviewport.h>
-Q_MOC_INCLUDE(<woutputitem_p.h>)
+
+Q_MOC_INCLUDE(<woutputitem.h>)
 
 Q_DECLARE_LOGGING_CATEGORY(qLcLayerShell)
 

diff --git a/src/server/protocols/woutputmanagerv1.cpp b/src/server/protocols/woutputmanagerv1.cpp
@@ -3,7 +3,6 @@
 
 #include "woutputmanagerv1.h"
 #include "woutputitem.h"
-#include "woutputitem_p.h"
 #include "private/wglobal_p.h"
 
 #include <qwoutput.h>
@@ -122,16 +121,14 @@ void WOutputManagerV1::newOutput(WOutput *output)
     W_D(WOutputManagerV1);
     const auto *wlr_output = output->nativeHandle();
 
-    auto *attached = output->findChild<WOutputItemAttached*>(QString(), Qt::FindDirectChildrenOnly);
-    if (!attached)
-        attached = WOutputItem::qmlAttachedProperties(output);
+    auto outputItem = WOutputItem::getOutputItem(output);
 
     WOutputState state {
         .output = output,
         .enabled = wlr_output->enabled,
         .mode = wlr_output->current_mode,
-        .x = attached ? static_cast<int32_t>(attached->item()->x()) : 0,
-        .y = attached ? static_cast<int32_t>(attached->item()->y()) : 0,
+        .x = outputItem ? static_cast<int32_t>(outputItem->x()) : 0,
+        .y = outputItem ? static_cast<int32_t>(outputItem->y()) : 0,
         .customModeSize = {  wlr_output->width,  wlr_output->height },
         .customModeRefresh =  wlr_output->refresh,
         .transform = static_cast<WOutput::Transform>(wlr_output->transform),

diff --git a/src/server/qtquick/private/woutputitem_p.h b/src/server/qtquick/private/woutputitem_p.h
@@ -6,38 +6,10 @@
 #include "woutputitem.h"
 #include "wcursor.h"
 
-#include <qwoutput.h>
-#include <qwtexture.h>
-
-#include <QQmlEngine>
-#include <QQuickTextureFactory>
-
 QW_USE_NAMESPACE
 WAYLIB_SERVER_BEGIN_NAMESPACE
 
-class WAYLIB_SERVER_EXPORT WOutputItemAttached : public QObject
-{
-    friend class WOutputItem;
-    Q_OBJECT
-    Q_PROPERTY(WAYLIB_SERVER_NAMESPACE::WOutputItem* item READ item NOTIFY itemChanged FINAL)
-    QML_ANONYMOUS
-
-public:
-    explicit WOutputItemAttached(QObject *parent = nullptr);
-
-    WOutputItem *item() const;
-
-Q_SIGNALS:
-    void itemChanged();
-
-private:
-    void setItem(WOutputItem *positioner);
-
-private:
-    WOutputItem *m_positioner = nullptr;
-};
-
-class Q_DECL_HIDDEN WOutputCursor : public QObject
+class WAYLIB_SERVER_EXPORT WOutputCursor : public QObject
 {
     friend class WOutputItem;
     friend class WOutputItemPrivate;

diff --git a/src/server/qtquick/woutputitem.cpp b/src/server/qtquick/woutputitem.cpp
@@ -16,24 +16,6 @@
 QW_USE_NAMESPACE
 WAYLIB_SERVER_BEGIN_NAMESPACE
 
-WOutputItemAttached::WOutputItemAttached(QObject *parent)
-    : QObject(parent)
-{
-
-}
-
-WOutputItem *WOutputItemAttached::item() const
-{
-    return m_positioner;
-}
-
-void WOutputItemAttached::setItem(WOutputItem *positioner)
-{
-    if (m_positioner == positioner)
-        return;
-    m_positioner = positioner;
-    Q_EMIT itemChanged();
-}
 
 #define DATA_OF_WOUPTUT "_WOutputItem"
 class Q_DECL_HIDDEN WOutputItemPrivate : public WObjectPrivate
@@ -142,7 +124,7 @@ void WOutputItemPrivate::updateCursors()
 
             Q_ASSERT(q->window());
             auto obj = cursorDelegate->createWithInitialProperties({
-                {"outputCurosr", QVariant::fromValue(oc)},
+                {"outputCursor", QVariant::fromValue(oc)},
                 {"parent", QVariant::fromValue(q->window()->contentItem())},
             }, qmlContext(q));
             oc->item = qobject_cast<QQuickItem*>(obj);
@@ -244,17 +226,6 @@ WOutputItem::~WOutputItem()
 
 }
 
-WOutputItemAttached *WOutputItem::qmlAttachedProperties(QObject *target)
-{
-    auto output = qobject_cast<WOutput*>(target);
-    if (!output)
-        return nullptr;
-    auto attached = new WOutputItemAttached(output);
-    attached->setItem(getOutputItem(output));
-
-    return attached;
-}
-
 WOutputItem *WOutputItem::getOutputItem(WOutput *output)
 {
     return qvariant_cast<WOutputItem*>(output->property(DATA_OF_WOUPTUT)) ;
@@ -266,11 +237,6 @@ WOutput *WOutputItem::output() const
     return d->output.get();
 }
 
-inline static WOutputItemAttached *getAttached(WOutput *output)
-{
-    return output->findChild<WOutputItemAttached*>(QString(), Qt::FindDirectChildrenOnly);
-}
-
 void WOutputItem::setOutput(WOutput *newOutput)
 {
     W_D(WOutputItem);
@@ -279,11 +245,7 @@ void WOutputItem::setOutput(WOutput *newOutput)
     d->output = newOutput;
 
     if (newOutput) {
-        if (auto attached = getAttached(newOutput)) {
-            attached->setItem(this);
-        } else {
-            newOutput->setProperty(DATA_OF_WOUPTUT, QVariant::fromValue(this));
-        }
+        newOutput->setProperty(DATA_OF_WOUPTUT, QVariant::fromValue(this));
     }
 
     if (isComponentComplete()) {

diff --git a/src/server/qtquick/woutputitem.h b/src/server/qtquick/woutputitem.h
@@ -8,14 +8,13 @@
 #include <QQuickItem>
 
 Q_MOC_INCLUDE(<wquickoutputlayout.h>)
-Q_MOC_INCLUDE(<woutputitem_p.h>)
 
 WAYLIB_SERVER_BEGIN_NAMESPACE
 
 class WQuickSeat;
 class WOutput;
+class WOutputCursor;
 class WQuickOutputLayout;
-class WOutputItemAttached;
 class WOutputItemPrivate;
 class WAYLIB_SERVER_EXPORT WOutputItem : public WQuickObserver, public WObject
 {
@@ -27,13 +26,11 @@ class WAYLIB_SERVER_EXPORT WOutputItem : public WQuickObserver, public WObject
     Q_PROPERTY(QQmlComponent* cursorDelegate READ cursorDelegate WRITE setCursorDelegate NOTIFY cursorDelegateChanged)
     Q_PROPERTY(QList<QQuickItem*> cursorItems READ cursorItems NOTIFY cursorItemsChanged)
     QML_NAMED_ELEMENT(OutputItem)
-    QML_ATTACHED(WOutputItemAttached)
 
 public:
     explicit WOutputItem(QQuickItem *parent = nullptr);
     ~WOutputItem();
 
-    static WOutputItemAttached *qmlAttachedProperties(QObject *target);
     static WOutputItem *getOutputItem(WOutput *output);
 
     WOutput *output() const;