From e762931d67171773e4e20a32ba525c101a7f01e0 Mon Sep 17 00:00:00 2001 From: Pier Luigi Fiorini Date: Fri, 5 Jan 2024 11:59:12 +0100 Subject: [PATCH] Move Wayland protocols all in one place --- .../liri-color-picker-unstable-v1.xml | 0 .../protocols/liri-shell-unstable-v1.xml | 0 ...oreign-toplevel-management-unstable-v1.xml | 0 src/imports/compositor/CMakeLists.txt | 4 +- src/imports/shell/CMakeLists.txt | 2 +- src/imports/shell/liri-shell-unstable-v1.xml | 159 ------------------ src/imports/taskmanager/CMakeLists.txt | 2 +- 7 files changed, 4 insertions(+), 163 deletions(-) rename {src/imports/compositor => data}/protocols/liri-color-picker-unstable-v1.xml (100%) rename {src/imports/compositor => data}/protocols/liri-shell-unstable-v1.xml (100%) rename {src/imports/taskmanager => data/protocols}/wlr-foreign-toplevel-management-unstable-v1.xml (100%) delete mode 100644 src/imports/shell/liri-shell-unstable-v1.xml diff --git a/src/imports/compositor/protocols/liri-color-picker-unstable-v1.xml b/data/protocols/liri-color-picker-unstable-v1.xml similarity index 100% rename from src/imports/compositor/protocols/liri-color-picker-unstable-v1.xml rename to data/protocols/liri-color-picker-unstable-v1.xml diff --git a/src/imports/compositor/protocols/liri-shell-unstable-v1.xml b/data/protocols/liri-shell-unstable-v1.xml similarity index 100% rename from src/imports/compositor/protocols/liri-shell-unstable-v1.xml rename to data/protocols/liri-shell-unstable-v1.xml diff --git a/src/imports/taskmanager/wlr-foreign-toplevel-management-unstable-v1.xml b/data/protocols/wlr-foreign-toplevel-management-unstable-v1.xml similarity index 100% rename from src/imports/taskmanager/wlr-foreign-toplevel-management-unstable-v1.xml rename to data/protocols/wlr-foreign-toplevel-management-unstable-v1.xml diff --git a/src/imports/compositor/CMakeLists.txt b/src/imports/compositor/CMakeLists.txt index 454540f4..62299f35 100644 --- a/src/imports/compositor/CMakeLists.txt +++ b/src/imports/compositor/CMakeLists.txt @@ -50,8 +50,8 @@ ecm_qt_declare_logging_category( aurora_generate_wayland_protocol_server_sources(LiriShellCompositorQmlPlugin FILES - ${CMAKE_CURRENT_SOURCE_DIR}/protocols/liri-color-picker-unstable-v1.xml - ${CMAKE_CURRENT_SOURCE_DIR}/protocols/liri-shell-unstable-v1.xml + ${PROJECT_SOURCE_DIR}/data/protocols/liri-color-picker-unstable-v1.xml + ${PROJECT_SOURCE_DIR}/data/protocols/liri-shell-unstable-v1.xml ) target_compile_definitions(LiriShellCompositorQmlPlugin diff --git a/src/imports/shell/CMakeLists.txt b/src/imports/shell/CMakeLists.txt index c1cbc930..f2dc5518 100644 --- a/src/imports/shell/CMakeLists.txt +++ b/src/imports/shell/CMakeLists.txt @@ -29,7 +29,7 @@ ecm_qt_declare_logging_category( aurora_generate_wayland_protocol_client_sources(ShellQmlPlugin FILES - liri-shell-unstable-v1.xml + ${PROJECT_SOURCE_DIR}/data/protocols/liri-shell-unstable-v1.xml wlr-layer-shell-unstable-v1.xml ) diff --git a/src/imports/shell/liri-shell-unstable-v1.xml b/src/imports/shell/liri-shell-unstable-v1.xml deleted file mode 100644 index ca8c69de..00000000 --- a/src/imports/shell/liri-shell-unstable-v1.xml +++ /dev/null @@ -1,159 +0,0 @@ - - - - - SPDX-License-Identifier: MIT - ]]> - - - - This interface is bound by a special client called shell helper - that is responsible for helping the compositor draw its user interface. - It can only be bound once and only shell helper is allowed. - - - - - The client calls this request to register a shortcut - with the compositor. - This will create a zliri_shortcut_v1 object that will emit - the activated event. - - - - - - - - Tell the compositor that the shell has created all - the layer surfaces and it can hide the splash screen - revealing the desktop. - - - - - - Ask the compositor to quit. - This is usually called from the logout dialog. - - - - - - The compositor will emit this event when it wants to show - the logout dialog. - - - - - - When the power off or suspend button is pressed, the compositor - will throw this event and the client will show the shutdown - dialog. - - - - - - During the shutdown, the compositor emits this event in order - to let the client exit cleanly. - - - - - - - The activated event is emitted every time this shortcut is activated - by the compositor. - - - - - The shortcut was actiavated. - - - - - - - This request destroys the shortcut. - - - - - - - With this interface, the compositor asks the client to display - either a text or a progress inside the on-screen display surface. - - - - - Show an icon with text on screen. - - - - - - - - Show an icon with a progress bar on screen. - The value can be an integer number from 0 to 100. - - - - - - - - - Modal dialogs, in the context of the shell, appear in front of any - application window or any other shell surface, and remain on screen - until confirmed or dismissed. - - As soon as the shell client creates a modal dialog, it gets a liri_modal - object by calling zliri_modal_manager_v1.create. The compositor then - shows the modal overlay on top of every other surface. - - When the user clicks or taps on the modal overlay, the compositor sends - out the liri_modal.done event and the client dismisses the modal dialog. - - The modal overlay and the dialog itself are created using the - wlr_layer_shell_unstable_v1 protocol. - - This interface can only be bound once, by an authorized client. - - - - - Tell the compositor to show the modal overlay and - act as an implicit grab. - - - - - - - - - - When the user clicks or taps on the modal overlay, the compositor sends - out the zliri_modal_v1.done event and the client dismisses the modal dialog. - - - - - This request destroys the zliri_modal_v1 object. - - - - - - This event is sent out when a modal is dismissed by the compositor. - The client should destroy the zliri_modal_v1 object at this point. - - - - diff --git a/src/imports/taskmanager/CMakeLists.txt b/src/imports/taskmanager/CMakeLists.txt index 83c799f6..b75e08a2 100644 --- a/src/imports/taskmanager/CMakeLists.txt +++ b/src/imports/taskmanager/CMakeLists.txt @@ -54,7 +54,7 @@ ecm_qt_declare_logging_category( aurora_generate_wayland_protocol_client_sources(TaskManagerQmlPlugin FILES - wlr-foreign-toplevel-management-unstable-v1.xml + ${PROJECT_SOURCE_DIR}/data/protocols/wlr-foreign-toplevel-management-unstable-v1.xml ) ecm_finalize_qml_module(TaskManagerQmlPlugin)