Refactor/dir

.obs/workflows.yml

@@ -1,42 +1,43 @@
 test_build:
   steps:
     - link_package:
-        source_project: vioken
+        source_project: deepin:Develop:dde
         source_package: %{SCM_REPOSITORY_NAME}
-        target_project: vioken:CI
+        target_project: deepin:CI
 
     - configure_repositories:
-        project: vioken:CI
+        project: deepin:CI
         repositories:
-          - name: deepin_ci
+          - name: deepin_develop
             paths:
-              - target_project: vioken
+              - target_project: deepin:CI
                 target_repository: deepin_develop
             architectures:
               - x86_64
               - aarch64
 
-          - name: deepin_testing
-            paths:
-              - target_project: vioken
-                target_repository: deepin_23_testing
-            architectures:
-              - x86_64
-              - aarch64
-
           - name: debian
             paths:
-              - target_project: vioken
-                target_repository: Debian_Sid_standard
+              - target_project: deepin:CI
+                target_repository: debian_sid
             architectures:
               - x86_64
+
   filters:
     event: pull_request
 
+tag_build:
+  steps:
+    - trigger_services:
+        project: deepin:Unstable:dde
+        package: %{SCM_REPOSITORY_NAME}
+  filters:
+    event: tag_push
+
 commit_build:
   steps:
     - trigger_services:
-        project: vioken
+        project: deepin:Develop:dde
         package: %{SCM_REPOSITORY_NAME}
   filters:
     event: push

src/treeland/CMakeLists.txt

@@ -54,20 +54,20 @@ add_subdirectory(treeland-fake-session)
 set(TREELAND_SOURCES
     treeland.h
     treeland.cpp
-    socketmanager.h
-    socketmanager.cpp
-    waylandsocketproxy.h
-    waylandsocketproxy.cpp
-    treelandhelper.h
-    treelandhelper.cpp
-    helper.h
-    helper.cpp
-    foreigntoplevelmanagerv1.h
-    foreigntoplevelmanagerv1.cpp
-    shortcutmanager.h
-    shortcutmanager.cpp
-    extforeigntoplevellist.h
-    extforeigntoplevellist.cpp
+    utils/treelandhelper.h
+    utils/treelandhelper.cpp
+    utils/helper.h
+    utils/helper.cpp
+    utils/waylandsocketproxy.h
+    utils/waylandsocketproxy.cpp
+    quick/socketmanager.h
+    quick/socketmanager.cpp
+    quick/foreigntoplevelmanagerv1.h
+    quick/foreigntoplevelmanagerv1.cpp
+    quick/shortcutmanager.h
+    quick/shortcutmanager.cpp
+    quick/extforeigntoplevellist.h
+    quick/extforeigntoplevellist.cpp
     protocols/foreign_toplevel_manager_impl.cpp
     protocols/shortcut_manager_impl.cpp
     protocols/socket_manager_impl.cpp
@@ -108,7 +108,7 @@ target_compile_definitions(treeland
     WLR_USE_UNSTABLE
 )
 
-set_source_files_properties(QmlHelper.qml
+set_source_files_properties(qml/QmlHelper.qml
     PROPERTIES
         QT_QML_SINGLETON_TYPE TRUE
 )
@@ -120,23 +120,29 @@ qt_add_qml_module(treeland
         ${TREELAND_SOURCES}
         ${DBUS_INTERFACE}
     QML_FILES
-        Main.qml
-        CloseAnimation.qml
-        OutputDelegate.qml
-        QmlHelper.qml
-        StackToplevelHelper.qml
-        StackWorkspace.qml
-        TiledToplevelHelper.qml
-        TiledWorkspace.qml
-        WindowDecoration.qml
-        XdgSurface.qml
-        InputPopupSurface.qml
-        LayerSurface.qml
-        MiniDock.qml
+        qml/Main.qml
+        qml/CloseAnimation.qml
+        qml/OutputDelegate.qml
+        qml/QmlHelper.qml
+        qml/StackToplevelHelper.qml
+        qml/StackWorkspace.qml
+        qml/TiledToplevelHelper.qml
+        qml/TiledWorkspace.qml
+        qml/WindowDecoration.qml
+        qml/XdgSurface.qml
+        qml/InputPopupSurface.qml
+        qml/LayerSurface.qml
+        qml/MiniDock.qml
     RESOURCE_PREFIX
         /qt/qml
 )
 
+target_include_directories(treeland
+    PRIVATE
+        quick
+        utils
+)
+
 target_link_libraries(treeland
     PRIVATE
         common

src/treeland/data/treeland-personalization-manager-v1.xml

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<protocol name="treeland_personalization_manager_v1">
+    <copyright>
+        Copyright © 2023 Uniontech
+
+        Permission is hereby granted, free of charge, to any person obtaining a
+        copy of this software and associated documentation files (the "Software"),
+        to deal in the Software without restriction, including without limitation
+        the rights to use, copy, modify, merge, publish, distribute, sublicense,
+        and/or sell copies of the Software, and to permit persons to whom the
+        Software is furnished to do so, subject to the following conditions:
+
+        The above copyright notice and this permission notice (including the next
+        paragraph) shall be included in all copies or substantial portions of the
+        Software.
+
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+        THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+        FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+        DEALINGS IN THE SOFTWARE.
+    </copyright>
+    <interface name="treeland_personalization_manager_v1" version="1">
+        <description summary="personalization manager">
+            This interface allows a client to customized display effects.
+
+            Warning! The protocol described in this file is currently in the testing
+            phase. Backward compatible changes may be added together with the
+            corresponding interface version bump. Backward incompatible changes can
+            only be done by creating a new major version of the extension.
+        </description>
+        <request name="get_wallpaper_context">
+            <arg name="id" type="new_id" interface="treeland_wallpaper_context_v1" />
+        </request>
+        <request name="get_window_context">
+            <arg name="surface" type="object" interface="wl_surface" />
+            <arg name="id" type="new_id" interface="treeland_window_context_v1" />
+        </request>
+    </interface>
+    <interface name="treeland_wallpaper_context_v1" version="1">
+        <description summary="client wallpaper context">
+            This interface allows a client set window wallpaper.
+
+            Warning! The protocol described in this file is currently in the testing
+            phase. Backward compatible changes may be added together with the
+            corresponding interface version bump. Backward incompatible changes can
+            only be done by creating a new major version of the extension.
+        </description>
+        <request name="destroy" type="destructor">
+            <description summary="destroy the context object">
+                Destroy the context object.
+            </description>
+        </request>
+    </interface>
+    <interface name="treeland_window_context_v1" version="1">
+        <description summary="client window context">
+            This interface allows a client set window properties.
+
+            Warning! The protocol described in this file is currently in the testing
+            phase. Backward compatible changes may be added together with the
+            corresponding interface version bump. Backward incompatible changes can
+            only be done by creating a new major version of the extension.
+        </description>
+        <request name="set_radius">
+            <description summary="the radius which represents the toplevel">
+                The radius of the surface specified in this request corresponds to the place where
+                the app using this protocol represents the given toplevel.
+            </description>
+
+            <arg name="x" type="int" />
+            <arg name="y" type="int" />
+        </request>
+        <request name="set_no_titlebar">
+            <description summary="toplevel doesn't need titlebar">
+                When the value is non-zero, the toplevel titlebar will be disabled.
+            </description>
+
+            <arg name="value" type="int" />
+        </request>
+        <request name="destroy" type="destructor">
+            <description summary="destroy the context object">
+                Destroy the context object.
+            </description>
+        </request>
+        <enum name="error">
+            <entry name="invalid_radius" value="0"
+                summary="the provided radius is invalid" />
+        </enum>
+    </interface>
+</protocol>

src/treeland/protocols/ext_foreign_toplevel_list_impl.cpp

@@ -4,7 +4,7 @@
 #include "ext_foreign_toplevel_list_impl.h"
 
 #include "ext-foreign-toplevel-list-server-protocol.h"
-#include "extforeigntoplevellist.h"
+#include "quick/extforeigntoplevellist.h"
 #include "utils.h"
 
 #include <pixman.h>

src/treeland/protocols/shortcut_manager_impl.cpp

@@ -9,7 +9,7 @@
 
 #include "utils.h"
 #include "shortcut-server-protocol.h"
-#include "shortcutmanager.h"
+#include "quick/shortcutmanager.h"
 
 static std::map<struct wl_resource*, QMetaObject::Connection> CLIENT_CONNECT;
 

src/treeland/protocols/socket_manager_impl.cpp

@@ -3,7 +3,7 @@
 
 #include "socket_manager_impl.h"
 #include "treeland.h"
-#include "socketmanager.h"
+#include "quick/socketmanager.h"
 #include "utils.h"
 
 #include <cstdint>

src/treeland/extforeigntoplevellist.h → src/treeland/quick/extforeigntoplevellist.h

@@ -5,7 +5,7 @@
 
 #include "ext-foreign-toplevel-list-server-protocol.h"
 #include "protocols/ext_foreign_toplevel_list_impl.h"
-#include "treelandhelper.h"
+#include "utils/treelandhelper.h"
 
 #include <wxdgsurface.h>
 #include <wquickwaylandserver.h>

src/treeland/foreigntoplevelmanagerv1.h → src/treeland/quick/foreigntoplevelmanagerv1.h

@@ -6,7 +6,7 @@
 #include "foreign-toplevel-manager-server-protocol.h"
 #include "protocols/foreign_toplevel_manager_impl.h"
 #include "treeland.h"
-#include "treelandhelper.h"
+#include "utils/treelandhelper.h"
 
 #include <qtmetamacros.h>
 #include <wxdgsurface.h>

src/treeland/shortcutmanager.h → src/treeland/quick/shortcutmanager.h

@@ -11,7 +11,7 @@
 
 #include "shortcut-server-protocol.h"
 
-#include "treelandhelper.h"
+#include "utils/treelandhelper.h"
 
 class ShortcutManager : public Waylib::Server::WQuickWaylandServerInterface {
     Q_OBJECT
@@ -37,4 +37,4 @@ class ShortcutManager : public Waylib::Server::WQuickWaylandServerInterface {
 private:
     ztreeland_shortcut_manager_v1 *m_impl;
     TreeLandHelper *m_helper;
-};
+};

src/treeland/treeland.cpp

@@ -5,8 +5,8 @@
 #include "MessageHandler.h"
 #include "Messages.h"
 #include "SocketWriter.h"
-#include "treelandhelper.h"
-#include "waylandsocketproxy.h"
+#include "utils/treelandhelper.h"
+#include "utils/waylandsocketproxy.h"
 #include "SignalHandler.h"
 
 #include <WServer>

src/treeland/treeland.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "waylandsocketproxy.h"
+#include "utils/waylandsocketproxy.h"
 
 #include <QGuiApplication>
 #include <QLocalSocket>