From 98dab0eebc3dc0f567be3f80ab129cbcc71738db Mon Sep 17 00:00:00 2001 From: Marius Vlad Date: Mon, 13 Apr 2020 14:48:20 +0300 Subject: app: Fixes and some monior tweaks to the qml file - app.pro: Remove depends on windowmanager and homescreen when building - app: Fake an event - adjust the window size - add the app state events Signed-off-by: Marius Vlad --- app/Onscreen.qml | 4 +- app/app.pro | 10 +- app/eventhandler.cpp | 248 +++++++++++++++++-------------------- app/eventhandler.h | 4 + app/main.cpp | 59 +++++++++ app/main.qml | 19 ++- app/onscreenmodel.cpp | 19 +-- app/onscreenmodel.h | 3 +- app/protocol/agl-shell-desktop.xml | 113 +++++++++++++++++ 9 files changed, 330 insertions(+), 149 deletions(-) create mode 100644 app/protocol/agl-shell-desktop.xml diff --git a/app/Onscreen.qml b/app/Onscreen.qml index 5e53f98..b08179c 100644 --- a/app/Onscreen.qml +++ b/app/Onscreen.qml @@ -4,8 +4,8 @@ import QtQuick.Controls 2.0 Rectangle { id: mainform - height: 300 - width: 1000 + height: 800 + width: 800 radius:2 gradient: Gradient { diff --git a/app/app.pro b/app/app.pro index 0cc31aa..6f39c05 100644 --- a/app/app.pro +++ b/app/app.pro @@ -15,10 +15,11 @@ 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 += qlibwindowmanager libhomescreen +PKGCONFIG += wayland-client +#PKGCONFIG += qlibwindowmanager libhomescreen HEADERS += \ eventhandler.h \ @@ -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 9ffd6bb..b1edfac 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,160 +149,42 @@ 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; -#if 0 - myThis = this; - mp_wm = new QLibWindowmanager(); - mp_wm->init(port, token); - - mp_hs = new LibHomeScreen(); - mp_hs->init(port, token); - - mp_hs->registerCallback(nullptr, EventHandler::onRep_static); - mp_hs->set_event_handler(LibHomeScreen::Event_ShowWindow, [this](json_object *object){ - /* - { - "application_id": "onscreenapp", - "parameter": { - "title": "onscreen title", - "type": "critical,exclamation,question,information", - "contents": "message contents", - "buttons": ["button_name1", "button_name2", "button_name3"], - "replyto":"caller application id" - } - } */ - HMI_DEBUG(APP_ID, "recived json message is[%s]", json_object_get_string(object)); - - struct json_object *param; - if(!json_object_object_get_ex(object, _parameter, ¶m) - || json_object_get_type(param) != json_type_object) { - HMI_DEBUG(APP_ID, "parameter error!"); - return; - } - - struct json_object *replyid; - const char *replyto = nullptr; - if(json_object_object_get_ex(param, _replyto, &replyid)) - replyto = json_object_get_string(replyid); - if(replyto == nullptr) { - HMI_DEBUG(APP_ID, "received replyto is null!"); - return; - } - m_req = qMakePair(QString(replyto), QString(json_object_to_json_string(param))); - - if (this->getDisplayStatus() == HIDING) { - this->activateWindow(_myrole, "on_screen"); - } - else if(this->getDisplayStatus() == SHOWING) { - this->setDisplayStatus(SWAPPING); - emit this->hideOnScreen(); - } - else { - HMI_DEBUG(APP_ID, "onscreen swapping!"); - } - HMI_DEBUG(APP_ID, "received showWindow event, end!, line=%d", __LINE__); - }); - - mp_hs->set_event_handler(LibHomeScreen::Event_HideWindow, [this](json_object *object){ - emit this->hideOnScreen(); - HMI_DEBUG(APP_ID, "hideWindow json_object=%s", json_object_get_string(object)); - }); - - if (mp_wm->requestSurface(_myrole) != 0) { - HMI_DEBUG(APP_ID, "!!!!LayoutHandler requestSurface Failed!!!!!"); - exit(EXIT_FAILURE); - } - - mp_wm->set_event_handler(QLibWindowmanager::Event_SyncDraw, [this](json_object *object) { - HMI_DEBUG(APP_ID, "Surface %s got syncDraw!", _myrole); - this->mp_wm->endDraw(QString(_myrole)); - }); - - mp_wm->set_event_handler(QLibWindowmanager::Event_Visible, [this](json_object *object) { - struct json_object *value; - json_object_object_get_ex(object, _drawing_name, &value); - const char *name = json_object_get_string(value); - if(!strcasecmp(_myrole, name)){ - this->setDisplayStatus(SHOWING); - this->m_dsp = this->m_req; - this->updateModel(QVariant(this->m_dsp.second)); - emit this->showOnScreen(); - } - - HMI_DEBUG(APP_ID, "Event_Visible kKeyDrawingName = %s", name); - }); - - mp_wm->set_event_handler(QLibWindowmanager::Event_Invisible, [this](json_object *object) { - struct json_object *value; - json_object_object_get_ex(object, _drawing_name, &value); - const char *name = json_object_get_string(value); - - HMI_DEBUG(APP_ID, "Event_Invisible kKeyDrawingName = %s", name); - }); - - HMI_DEBUG(APP_ID, "LayoutHander::init() finished."); -#endif -} -#if 0 -void EventHandler::onRep_static(struct json_object* reply_contents) -{ - static_cast(EventHandler::myThis)->onRep(reply_contents); + shell_desktop = register_agl_shell_desktop(); + if (shell_desktop) + agl_shell_desktop_add_listener(shell_desktop, &agl_shell_desk_listener, this); } -void EventHandler::onRep(struct json_object* reply_contents) -{ - const char* str = json_object_to_json_string(reply_contents); - HMI_DEBUG(APP_ID, "EventHandler::onReply %s", str); -} -#endif - void EventHandler::activateWindow(const char *role, const char *area) { -#if 0 - HMI_DEBUG(APP_ID, "EventHandler::activateWindow()"); - mp_wm->activateWindow(role, area); -#endif - fprintf(stdout, "EventHandler::activateWindow() role %s, area %s\n", + fprintf(stderr, "EventHandler::activateWindow() role %s, area %s\n", role, area); } void EventHandler::deactivateWindow() { -#if 0 - HMI_DEBUG(APP_ID, "EventHandler::deactivateWindow()"); - if(getDisplayStatus() == SWAPPING) { - setDisplayStatus(SHOWING); - m_dsp = m_req; - updateModel(QVariant(this->m_dsp.second)); - emit showOnScreen(); - } - else { - this->setDisplayStatus(HIDING); - mp_wm->deactivateWindow(_myrole); - } -#endif int display_status = getDisplayStatus(); - fprintf(stdout, "EventHandler::deactivateWindow(), " + fprintf(stderr, "EventHandler::deactivateWindow(), " "display_status %d\n", display_status); + + if (shell_desktop) { + agl_shell_desktop_deactivate_app(shell_desktop, APP_ID); + } } void EventHandler::onScreenReply(const QString &ons_title, const QString &btn_name) { -#if 0 - HMI_DEBUG(APP_ID, "ons_title=%s btn_name=%s", ons_title.toStdString().c_str(), btn_name.toStdString().c_str()); + fprintf(stderr, "ons_title=%s btn_name=%s\n", ons_title.toStdString().c_str(), btn_name.toStdString().c_str()); emit this->hideOnScreen(); - struct json_object* j_param = json_object_new_object(); - json_object_object_add(j_param, _onscreen_title, json_object_new_string(ons_title.toStdString().c_str())); - json_object_object_add(j_param, _button_name, json_object_new_string(btn_name.toStdString().c_str())); - mp_hs->replyShowWindow(m_dsp.first.toStdString().c_str(), j_param); -#endif - fprintf(stdout, "EventHandler::onScreenReply with ons_title %s, btn_name %s\n", + fprintf(stderr, "EventHandler::onScreenReply with ons_title %s, btn_name %s\n", ons_title.toStdString().c_str(), btn_name.toStdString().c_str()); } 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 381b9a2..7b6dc62 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -22,10 +22,54 @@ #include #include #include +#include +#include + +#include #include "eventhandler.h" #include "onscreenmodel.h" +/* +{ + "application_id": "onscreenapp", + "title": "onscreen title", + "type": "information", + "contents": "message contents", + "buttons": ["button_name1"], + "replyto":"onstestapp" +} +*/ +static struct json_object * +build_fake_json(void) +{ + struct json_object *tmp; + struct json_object *obj = json_object_new_object(); + struct json_object *array = json_object_new_array(); + + tmp = json_object_new_string("Big Title"); + json_object_object_add(obj, "title", tmp); + + tmp = json_object_new_string("Informatin"); + json_object_object_add(obj, "type", tmp); + + tmp = json_object_new_string("Our message contents"); + json_object_object_add(obj, "contents", tmp); + + tmp = json_object_new_string("onstestapp"); + json_object_object_add(obj, "replyto", tmp); + + /* array */ + tmp = json_object_new_string("Button"); + json_object_array_add(array, tmp); + json_object_object_add(obj, "buttons", array); + + tmp = json_object_new_string(APP_ID); + json_object_object_add(obj, "application_id", tmp); + + /* adds the entire object */ + return obj; +} int main(int argc, char *argv[]) { @@ -80,7 +124,22 @@ int main(int argc, char *argv[]) QObject::connect(eventHandler, SIGNAL(showOnScreen()), window, SLOT(showOnScreen())); QObject::connect(eventHandler, SIGNAL(hideOnScreen()), window, SLOT(hideOnScreen())); + HMI_DEBUG(APP_ID, "onscreenapp started!"); + +#if 0 + /* fake(s) an event */ + + /* this was used before to fake an event before onscreenapp was hooked-up */ + QTimer::singleShot(1000, [eventHandler](){ + struct json_object *json = build_fake_json(); + const char *json_str = json_object_to_json_string_ext(json, + JSON_C_TO_STRING_SPACED | JSON_C_TO_STRING_PRETTY); + emit eventHandler->updateModel(QVariant(json_str)); + emit eventHandler->showOnScreen(); + }); +#endif + return app.exec(); } diff --git a/app/main.qml b/app/main.qml index 99d50f8..b66e454 100644 --- a/app/main.qml +++ b/app/main.qml @@ -25,10 +25,10 @@ Window { id: root flags: Qt.FramelessWindowHint visible: true - x: 0 - y: 218 - width: 1080 - height: 1488 + x: 0 // note, these are not set here + y: 218 // note, these are not set here + width: 800 + height: 800 color: '#00000000' Onscreen { @@ -108,6 +108,13 @@ Window { ons.btn1Name = onscreenModel.buttonName(0) ons.btn2Name = onscreenModel.buttonName(1) ons.btn3Name = onscreenModel.buttonName(2) + + console.log("dsp_title = " + ons.dsp_title + ", dsp_contents = " + ons.dsp_contents) + if (ons.btnNum > 0) { + console.log("Got ons.btNum > 0 " + ons.btnNum) + } else { + console.log("ons.btNum is " + ons.btnNum) + } ons_timer.running = ons.btnNum > 0 ? false : true ons.dsp_sts = "show" } @@ -122,4 +129,8 @@ Window { console.log(qsTr('onscreenapp >>> setModel status: ' + data)); onscreenModel.setModel(data) } + + function clearOnScreenModel() { + onscreenModel.clearModel() + } } diff --git a/app/onscreenmodel.cpp b/app/onscreenmodel.cpp index 184d1a6..c36f0e9 100644 --- a/app/onscreenmodel.cpp +++ b/app/onscreenmodel.cpp @@ -27,34 +27,38 @@ const char _buttons[] = "buttons"; void OnScreenModel::setModel(QVariant data) { - HMI_DEBUG(_modelName, "setModel start!"); + fprintf(stderr, "OnScreenModel::setModel: setModel start!\n"); + clearModel(); struct json_object *j_title = nullptr, *j_type = nullptr, *j_contents = nullptr, *j_buttons = nullptr; struct json_object *j_param = json_tokener_parse(data.toString().toStdString().c_str()); + + fprintf(stderr, "OnScreenModel::setModel receiving end: %s\n", data.toString().toStdString().c_str()); + if(json_object_object_get_ex(j_param, _title, &j_title)) { m_title = json_object_get_string(j_title); } else { - HMI_DEBUG(_modelName, "title input is null"); + fprintf(stderr, "OnScreenModel::setModel: title input is null\n"); } if(json_object_object_get_ex(j_param, _type, &j_type)) { m_type = json_object_get_string(j_type); } else { - HMI_DEBUG(_modelName, "type input is null"); + fprintf(stderr, "OnScreenModel::setModel: type input is null\n"); } if(json_object_object_get_ex(j_param, _contents, &j_contents)) { m_contents = json_object_get_string(j_contents); } else { - HMI_DEBUG(_modelName, "contents input is null"); + fprintf(stderr, "OnScreenModel::setModel: contents input is null\n"); } if(json_object_object_get_ex(j_param, _buttons, &j_buttons)) { if(json_object_get_type(j_buttons) != json_type_array) { - HMI_DEBUG(_modelName, "buttons josn type isn't array!"); + fprintf(stderr, "OnScreenModel::setModel buttons josn type isn't array!\n"); } else { m_buttons.clear(); @@ -67,9 +71,10 @@ void OnScreenModel::setModel(QVariant data) } } else { - HMI_DEBUG("OnScreenModel", "buttons input is null"); + fprintf(stderr, "OnScreenModel::setModel: buttons input is null\n"); } - HMI_DEBUG(_modelName, "setModel end!titile=%s,type=%s,contents=%s,btnNum=%d", + + fprintf(stderr, "OnScreenModel::setModel setModel end!titile=%s,type=%s,contents=%s,btnNum=%d\n", m_title.toStdString().c_str(), m_type.toStdString().c_str(), m_contents.toStdString().c_str(), m_buttons.size()); } diff --git a/app/onscreenmodel.h b/app/onscreenmodel.h index e12b269..4227cf8 100644 --- a/app/onscreenmodel.h +++ b/app/onscreenmodel.h @@ -35,10 +35,9 @@ public: Q_INVOKABLE int buttonNum(void) const {return m_buttons.size();} Q_INVOKABLE QString buttonName(int index) const; Q_INVOKABLE void setModel(QVariant data); + Q_INVOKABLE void clearModel(void); private: - void clearModel(void); - QString m_title; QString m_type; QString m_contents; 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. + + + + + + + + + -- cgit 1.2.3-korg