From 519f9cb01b41a9f44eeeee58d213449f7a470120 Mon Sep 17 00:00:00 2001 From: Marius Vlad Date: Wed, 15 Apr 2020 19:59:55 +0300 Subject: [PATCH] app: Add the app state events Signed-off-by: Marius Vlad --- app/app.pro | 8 ++- app/eventhandler.cpp | 110 ++++++++++++++++++++++++++++++++++++ app/eventhandler.h | 4 ++ app/main.cpp | 2 + app/protocol/agl-shell-desktop.xml | 113 +++++++++++++++++++++++++++++++++++++ 5 files changed, 235 insertions(+), 2 deletions(-) create mode 100644 app/protocol/agl-shell-desktop.xml diff --git a/app/app.pro b/app/app.pro index de19410..6f39c05 100644 --- a/app/app.pro +++ b/app/app.pro @@ -15,9 +15,10 @@ TEMPLATE = app TARGET = onscreenapp -QT += quickcontrols2 quick qml -CONFIG += c++11 link_pkgconfig +QT += quickcontrols2 quick qml gui-private +CONFIG += c++11 link_pkgconfig wayland-scanner pkgdatadir DESTDIR = $${OUT_PWD}/../package/root/bin +PKGCONFIG += wayland-client #PKGCONFIG += qlibwindowmanager libhomescreen HEADERS += \ @@ -34,3 +35,6 @@ RESOURCES += \ images/images.qrc LIBS += -ljson-c + +WAYLANDCLIENTSOURCES += \ + protocol/agl-shell-desktop.xml diff --git a/app/eventhandler.cpp b/app/eventhandler.cpp index dfa0a12..e1ece21 100644 --- a/app/eventhandler.cpp +++ b/app/eventhandler.cpp @@ -17,12 +17,14 @@ #include #include #include +#include #include #include #include #include #include #include +#include #include "eventhandler.h" @@ -37,6 +39,108 @@ const char _application_id[] = "application_id"; void* EventHandler::myThis = 0; +static struct wl_output * +getWlOutput(QScreen *screen) +{ + QPlatformNativeInterface *native = qApp->platformNativeInterface(); + void *output = native->nativeResourceForScreen("output", screen); + return static_cast(output); +} + +static void +global_add(void *data, struct wl_registry *reg, uint32_t name, + const char *interface, uint32_t version) +{ + struct agl_shell_desktop **shell = + static_cast(data); + + if (strcmp(interface, agl_shell_desktop_interface.name) == 0) { + *shell = static_cast( + wl_registry_bind(reg, name, &agl_shell_desktop_interface, version) + ); + } +} + +static void global_remove(void *data, struct wl_registry *reg, uint32_t id) +{ + (void) data; + (void) reg; + (void) id; +} + +static const struct wl_registry_listener registry_listener = { + global_add, + global_remove, +}; + +static void +application_id_event(void *data, struct agl_shell_desktop *agl_shell_desktop, + const char *app_id) +{ + EventHandler *ev_handler = static_cast(data); + (void) agl_shell_desktop; + + // should probably add here to a list the application or trigger emit + // for QML code, also note that we get here our own application + if (strcmp(app_id, APP_ID) == 0) + return; + + qInfo() << "app_id: " << app_id; +} + +static void +application_state_event(void *data, struct agl_shell_desktop *agl_shell_desktop, + const char *app_id, const char *app_data, + uint32_t app_state, uint32_t app_role) +{ + EventHandler *ev_handler = static_cast(data); + (void) agl_shell_desktop; + + qInfo() << "got application_state_event() for app_id=" << + app_id << ", state=" << app_state << ", role=" << app_role; + + if (strcmp(app_id, APP_ID)) + return; + + if (app_state != AGL_SHELL_DESKTOP_APP_STATE_ACTIVATED) + return; + + if (app_role != AGL_SHELL_DESKTOP_APP_ROLE_POPUP) + return; + + qInfo() << "Got message " << app_data; + + // should signal that we got the message + emit ev_handler->updateModel(QVariant(app_data)); + emit ev_handler->showOnScreen(); +} + +static const struct agl_shell_desktop_listener agl_shell_desk_listener = { + application_id_event, + application_state_event, +}; + +static struct agl_shell_desktop * +register_agl_shell_desktop(void) +{ + struct wl_display *wl; + struct wl_registry *registry; + struct agl_shell_desktop *shell = nullptr; + + QPlatformNativeInterface *native = qApp->platformNativeInterface(); + + wl = static_cast(native->nativeResourceForIntegration("display")); + registry = wl_display_get_registry(wl); + + wl_registry_add_listener(registry, ®istry_listener, &shell); + // Roundtrip to get all globals advertised by the compositor + wl_display_roundtrip(wl); + wl_registry_destroy(registry); + + return shell; +} + + EventHandler::EventHandler(QObject *parent) : QObject(parent), m_dsp_sts(false) @@ -45,12 +149,18 @@ EventHandler::EventHandler(QObject *parent) : EventHandler::~EventHandler() { + if (shell_desktop) + agl_shell_desktop_destroy(shell_desktop); } void EventHandler::init(int port, const char *token) { (void) port; (void) token; + + shell_desktop = register_agl_shell_desktop(); + if (shell_desktop) + agl_shell_desktop_add_listener(shell_desktop, &agl_shell_desk_listener, this); #if 0 myThis = this; mp_wm = new QLibWindowmanager(); diff --git a/app/eventhandler.h b/app/eventhandler.h index 1fe910b..e4fbb6b 100644 --- a/app/eventhandler.h +++ b/app/eventhandler.h @@ -23,6 +23,9 @@ #include #include "hmi-debug.h" +#include +#include "wayland-agl-shell-desktop-client-protocol.h" + #define APP_ID "onscreenapp" class QQmlApplicationEngine; @@ -61,6 +64,7 @@ private: void activateWindow(const char *role, const char *area = "normal.full"); QPair m_req, m_dsp; + struct agl_shell_desktop *shell_desktop = nullptr; int m_dsp_sts = HIDING; }; #endif // HOMESCREENHANDLER_H diff --git a/app/main.cpp b/app/main.cpp index e6dd562..da8710a 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -128,6 +128,7 @@ int main(int argc, char *argv[]) HMI_DEBUG(APP_ID, "onscreenapp started!"); /* fake(s) an event */ +#if 0 QTimer::singleShot(1000, [eventHandler](){ struct json_object *json = build_fake_json(); const char *json_str = json_object_to_json_string_ext(json, @@ -135,6 +136,7 @@ int main(int argc, char *argv[]) emit eventHandler->updateModel(QVariant(json_str)); emit eventHandler->showOnScreen(); }); +#endif return app.exec(); } diff --git a/app/protocol/agl-shell-desktop.xml b/app/protocol/agl-shell-desktop.xml new file mode 100644 index 0000000..05a3725 --- /dev/null +++ b/app/protocol/agl-shell-desktop.xml @@ -0,0 +1,113 @@ + + + + Copyright © 2020 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. + + + + This extension can be used by regular application to instruct to compositor + to activate or switch to other running (regular) applications. The client + is responsbile for filtering their own app_id when receiving application id. + + Note that other (regular) applications can bind to this interface and there is + no mechanism to place to restrict or limit that. + + + + + + + + + + + + + + + The compositor may choose to advertise one or more application ids which + can be used to activate/switch to. + + When this global is bound, the compositor will send all application ids + available for activation, but may send additional application id at any + time (when they've been mapped in the compositor). + + + + + + + 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. + + + + + + + + + Ask the compositor to make a toplevel obey the app_role and, depending + on the role, to use the the x and y values as initial positional values. + The x and y values would only make sense for certain roles. + + See xdg_toplevel.set_app_id from the xdg-shell protocol for a + description of app_id. + + + + + + + + + + + Ask the compositor to hide the toplevel window for window + management purposes. Depending on the window role, this request + will either display the previously active window (or the background + in case there's no previously activate surface) or temporarly (or + until a 'activate_app' is called upon) hide the surface. All + the surfaces are identifiable by using the app_id, and no actions are + taken in case the app_id is not/was not present. + + See xdg_toplevel.set_app_id from the xdg-shell protocol for a + description of app_id. + + + + + + + Notifies application(s) when other application have suffered state modifications. + + + + + + + + + -- 2.16.6