diff --git a/.obs/workflows.yml b/.obs/workflows.yml index f6dda8a68..8c18fe035 100644 --- a/.obs/workflows.yml +++ b/.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 diff --git a/src/treeland/CMakeLists.txt b/src/treeland/CMakeLists.txt index 6d4a59c5e..36c647580 100644 --- a/src/treeland/CMakeLists.txt +++ b/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 diff --git a/src/treeland/data/treeland-personalization-manager-v1.xml b/src/treeland/data/treeland-personalization-manager-v1.xml new file mode 100644 index 000000000..f9fc02a49 --- /dev/null +++ b/src/treeland/data/treeland-personalization-manager-v1.xml @@ -0,0 +1,92 @@ + + + + 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. + + + + 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. + + + + + + + + + + + + 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. + + + + Destroy the context object. + + + + + + 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. + + + + The radius of the surface specified in this request corresponds to the place where + the app using this protocol represents the given toplevel. + + + + + + + + When the value is non-zero, the toplevel titlebar will be disabled. + + + + + + + Destroy the context object. + + + + + + + \ No newline at end of file diff --git a/src/treeland/protocols/ext_foreign_toplevel_list_impl.cpp b/src/treeland/protocols/ext_foreign_toplevel_list_impl.cpp index 26845e1d7..0a8f2b844 100644 --- a/src/treeland/protocols/ext_foreign_toplevel_list_impl.cpp +++ b/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 diff --git a/src/treeland/protocols/shortcut_manager_impl.cpp b/src/treeland/protocols/shortcut_manager_impl.cpp index 52b54b7bd..f41c31bf3 100644 --- a/src/treeland/protocols/shortcut_manager_impl.cpp +++ b/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 CLIENT_CONNECT; diff --git a/src/treeland/protocols/socket_manager_impl.cpp b/src/treeland/protocols/socket_manager_impl.cpp index 7f6158116..0597111e0 100644 --- a/src/treeland/protocols/socket_manager_impl.cpp +++ b/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 diff --git a/src/treeland/CloseAnimation.qml b/src/treeland/qml/CloseAnimation.qml similarity index 100% rename from src/treeland/CloseAnimation.qml rename to src/treeland/qml/CloseAnimation.qml diff --git a/src/treeland/InputPopupSurface.qml b/src/treeland/qml/InputPopupSurface.qml similarity index 100% rename from src/treeland/InputPopupSurface.qml rename to src/treeland/qml/InputPopupSurface.qml diff --git a/src/treeland/LayerSurface.qml b/src/treeland/qml/LayerSurface.qml similarity index 100% rename from src/treeland/LayerSurface.qml rename to src/treeland/qml/LayerSurface.qml diff --git a/src/treeland/Main.qml b/src/treeland/qml/Main.qml similarity index 100% rename from src/treeland/Main.qml rename to src/treeland/qml/Main.qml diff --git a/src/treeland/MiniDock.qml b/src/treeland/qml/MiniDock.qml similarity index 100% rename from src/treeland/MiniDock.qml rename to src/treeland/qml/MiniDock.qml diff --git a/src/treeland/OutputDelegate.qml b/src/treeland/qml/OutputDelegate.qml similarity index 100% rename from src/treeland/OutputDelegate.qml rename to src/treeland/qml/OutputDelegate.qml diff --git a/src/treeland/QmlHelper.qml b/src/treeland/qml/QmlHelper.qml similarity index 100% rename from src/treeland/QmlHelper.qml rename to src/treeland/qml/QmlHelper.qml diff --git a/src/treeland/StackToplevelHelper.qml b/src/treeland/qml/StackToplevelHelper.qml similarity index 100% rename from src/treeland/StackToplevelHelper.qml rename to src/treeland/qml/StackToplevelHelper.qml diff --git a/src/treeland/StackWorkspace.qml b/src/treeland/qml/StackWorkspace.qml similarity index 100% rename from src/treeland/StackWorkspace.qml rename to src/treeland/qml/StackWorkspace.qml diff --git a/src/treeland/TiledToplevelHelper.qml b/src/treeland/qml/TiledToplevelHelper.qml similarity index 100% rename from src/treeland/TiledToplevelHelper.qml rename to src/treeland/qml/TiledToplevelHelper.qml diff --git a/src/treeland/TiledWorkspace.qml b/src/treeland/qml/TiledWorkspace.qml similarity index 100% rename from src/treeland/TiledWorkspace.qml rename to src/treeland/qml/TiledWorkspace.qml diff --git a/src/treeland/WindowDecoration.qml b/src/treeland/qml/WindowDecoration.qml similarity index 100% rename from src/treeland/WindowDecoration.qml rename to src/treeland/qml/WindowDecoration.qml diff --git a/src/treeland/XdgSurface.qml b/src/treeland/qml/XdgSurface.qml similarity index 100% rename from src/treeland/XdgSurface.qml rename to src/treeland/qml/XdgSurface.qml diff --git a/src/treeland/extforeigntoplevellist.cpp b/src/treeland/quick/extforeigntoplevellist.cpp similarity index 100% rename from src/treeland/extforeigntoplevellist.cpp rename to src/treeland/quick/extforeigntoplevellist.cpp diff --git a/src/treeland/extforeigntoplevellist.h b/src/treeland/quick/extforeigntoplevellist.h similarity index 98% rename from src/treeland/extforeigntoplevellist.h rename to src/treeland/quick/extforeigntoplevellist.h index ec2ffb75f..2e8e897af 100644 --- a/src/treeland/extforeigntoplevellist.h +++ b/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 #include diff --git a/src/treeland/foreigntoplevelmanagerv1.cpp b/src/treeland/quick/foreigntoplevelmanagerv1.cpp similarity index 100% rename from src/treeland/foreigntoplevelmanagerv1.cpp rename to src/treeland/quick/foreigntoplevelmanagerv1.cpp diff --git a/src/treeland/foreigntoplevelmanagerv1.h b/src/treeland/quick/foreigntoplevelmanagerv1.h similarity index 98% rename from src/treeland/foreigntoplevelmanagerv1.h rename to src/treeland/quick/foreigntoplevelmanagerv1.h index 52a52369c..54067ff9a 100644 --- a/src/treeland/foreigntoplevelmanagerv1.h +++ b/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 #include diff --git a/src/treeland/shortcutmanager.cpp b/src/treeland/quick/shortcutmanager.cpp similarity index 100% rename from src/treeland/shortcutmanager.cpp rename to src/treeland/quick/shortcutmanager.cpp diff --git a/src/treeland/shortcutmanager.h b/src/treeland/quick/shortcutmanager.h similarity index 95% rename from src/treeland/shortcutmanager.h rename to src/treeland/quick/shortcutmanager.h index 3dcced1a7..521b35781 100644 --- a/src/treeland/shortcutmanager.h +++ b/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; -}; \ No newline at end of file +}; diff --git a/src/treeland/socketmanager.cpp b/src/treeland/quick/socketmanager.cpp similarity index 100% rename from src/treeland/socketmanager.cpp rename to src/treeland/quick/socketmanager.cpp diff --git a/src/treeland/socketmanager.h b/src/treeland/quick/socketmanager.h similarity index 100% rename from src/treeland/socketmanager.h rename to src/treeland/quick/socketmanager.h diff --git a/src/treeland/treeland.cpp b/src/treeland/treeland.cpp index d74afe747..31570409f 100644 --- a/src/treeland/treeland.cpp +++ b/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 diff --git a/src/treeland/treeland.h b/src/treeland/treeland.h index 360a43dcd..112929fe3 100644 --- a/src/treeland/treeland.h +++ b/src/treeland/treeland.h @@ -3,7 +3,7 @@ #pragma once -#include "waylandsocketproxy.h" +#include "utils/waylandsocketproxy.h" #include #include diff --git a/src/treeland/helper.cpp b/src/treeland/utils/helper.cpp similarity index 100% rename from src/treeland/helper.cpp rename to src/treeland/utils/helper.cpp diff --git a/src/treeland/helper.h b/src/treeland/utils/helper.h similarity index 100% rename from src/treeland/helper.h rename to src/treeland/utils/helper.h diff --git a/src/treeland/treelandhelper.cpp b/src/treeland/utils/treelandhelper.cpp similarity index 100% rename from src/treeland/treelandhelper.cpp rename to src/treeland/utils/treelandhelper.cpp diff --git a/src/treeland/treelandhelper.h b/src/treeland/utils/treelandhelper.h similarity index 100% rename from src/treeland/treelandhelper.h rename to src/treeland/utils/treelandhelper.h diff --git a/src/treeland/waylandsocketproxy.cpp b/src/treeland/utils/waylandsocketproxy.cpp similarity index 100% rename from src/treeland/waylandsocketproxy.cpp rename to src/treeland/utils/waylandsocketproxy.cpp diff --git a/src/treeland/waylandsocketproxy.h b/src/treeland/utils/waylandsocketproxy.h similarity index 100% rename from src/treeland/waylandsocketproxy.h rename to src/treeland/utils/waylandsocketproxy.h