From 187fffa9f0a05359678887f30b58091cf7c5fc47 Mon Sep 17 00:00:00 2001 From: Marius Vlad Date: Thu, 1 Jul 2021 12:46:15 +0300 Subject: homescreen.pro: Use system() to figure out where to pull the protocol Bug-AGL: SPEC-3423 Signed-off-by: Marius Vlad Change-Id: I0960ac6bee938cc4466f877467ea57e592d61593 --- homescreen/homescreen.pro | 4 +- homescreen/protocol/agl-shell.xml | 117 -------------------------------------- 2 files changed, 2 insertions(+), 119 deletions(-) delete mode 100644 homescreen/protocol/agl-shell.xml diff --git a/homescreen/homescreen.pro b/homescreen/homescreen.pro index ca9ea3b..7e65d56 100644 --- a/homescreen/homescreen.pro +++ b/homescreen/homescreen.pro @@ -62,5 +62,5 @@ RESOURCES += \ qml/images/SpeechChrome/speechchrome.qrc -WAYLANDCLIENTSOURCES += \ - protocol/agl-shell.xml +AGL_SHELL_PATH = $$system(pkg-config --variable=pkgdatadir agl-compositor-0.0.19-protocols) +WAYLANDCLIENTSOURCES += $$AGL_SHELL_PATH/agl-shell.xml diff --git a/homescreen/protocol/agl-shell.xml b/homescreen/protocol/agl-shell.xml deleted file mode 100644 index 1096c64..0000000 --- a/homescreen/protocol/agl-shell.xml +++ /dev/null @@ -1,117 +0,0 @@ - - - - Copyright © 2019 Collabora, Ltd. - - 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. - - - - - - - - - - - - - - - - - - - - - Tell the server that this client is ready to be shown. The server - will delay presentation during start-up until all shell clients are - ready to be shown, and will display a black screen instead. - This gives the client an oppurtunity to set up and configure several - surfaces into a coherent interface. - - The client that binds to this interface must send this request, otherwise - they may stall the compositor unnecessarily. - - If this request is called after the compositor has already finished - start-up, no operation is performed. - - - - - - Set the surface to act as the background of an output. After this - request, the server will immediately send a configure event with - the dimensions the client should use to cover the entire output. - - The surface must have a "desktop" surface role, as supported by - libweston-desktop. - - Only a single surface may be the background for any output. If a - background surface already exists, a protocol error is raised. - - - - - - - - Set the surface to act as a panel of an output. The 'edge' argument - says what edge of the output the surface will be anchored to. - After this request, the server will send a configure event with the - correponding width/height that the client should use, and 0 for the - other dimension. E.g. if the edge is 'top', the width will be the - output's width, and the height will be 0. - - The surface must have a "desktop" surface role, as supported by - libweston-desktop. - - The compositor will take the panel's window geometry into account when - positioning other windows, so the panels are not covered. - - XXX: What happens if e.g. both top and left are used at the same time? - Who gets to have the corner? - - Only a single surface may be the panel for an output's edge. If a - surface already exists on an edge, a protocol error is raised. - - - - - - - - - Ask the compositor to make a toplevel to become the current/focused - window for window management purposes. - - See xdg_toplevel.set_app_id from the xdg-shell protocol for a - description of app_id. - - If multiple toplevels have the same app_id, the result is unspecified. - - XXX: Do we need feedback to say it didn't work? (e.g. client does - not exist) - - - - - - -- cgit 1.2.3-korg