diff options
author | Marius Vlad <marius.vlad@collabora.com> | 2020-04-21 15:21:28 +0300 |
---|---|---|
committer | Marius Vlad <marius.vlad@collabora.com> | 2020-04-21 15:23:47 +0300 |
commit | 0b53ebc5e8c0df2fad64ea5b60fda05ae0aafb3b (patch) | |
tree | ad7af5454f1eeff115e8490632a67037ae50f36c | |
parent | 232d4b9e7116bc712f670676223183914246cfc0 (diff) |
agl-shell-desktop: Updates to the latest protocolsandbox/mvlad/agl-compositor-old
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
-rw-r--r-- | launcher/protocol/agl-shell-desktop.xml | 17 | ||||
-rw-r--r-- | launcher/src/shell-desktop.cpp | 2 |
2 files changed, 18 insertions, 1 deletions
diff --git a/launcher/protocol/agl-shell-desktop.xml b/launcher/protocol/agl-shell-desktop.xml index 6d53f92..05a3725 100644 --- a/launcher/protocol/agl-shell-desktop.xml +++ b/launcher/protocol/agl-shell-desktop.xml @@ -37,6 +37,11 @@ <entry name="fullscreen" value="1"/> </enum> + <enum name="app_state"> + <entry name="activated" value="0"/> + <entry name="deactivated" value="1"/> + </enum> + <event name="application"> <description summary="advertise application id"> The compositor may choose to advertise one or more application ids which @@ -58,6 +63,7 @@ description of app_id. </description> <arg name="app_id" type="string"/> + <arg name="app_data" type="string" allow-null="true"/> <arg name="output" type="object" interface="wl_output"/> </request> @@ -92,5 +98,16 @@ </description> <arg name="app_id" type="string"/> </request> + + <event name="state_app"> + <description summary="event sent when application has suffered state modification"> + Notifies application(s) when other application have suffered state modifications. + </description> + <arg name="app_id" type="string"/> + <arg name="app_data" type="string" allow-null="true"/> + <arg name="state" type="uint" enum="app_state"/> + <arg name="role" type="uint" enum="app_role"/> + </event> + </interface> </protocol> diff --git a/launcher/src/shell-desktop.cpp b/launcher/src/shell-desktop.cpp index 8503c01..6573433 100644 --- a/launcher/src/shell-desktop.cpp +++ b/launcher/src/shell-desktop.cpp @@ -49,5 +49,5 @@ void Shell::activate_app(QWindow *win, const QString &app_id) output = getWlOutput(screen); qDebug() << "will activate app: " << app_id; agl_shell_desktop_activate_app(this->shell.get(), - app_id.toStdString().c_str(), output); + app_id.toStdString().c_str(), NULL, output); } |