summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/app.pro2
-rw-r--r--app/main.cpp54
-rw-r--r--package/config.xml2
3 files changed, 44 insertions, 14 deletions
diff --git a/app/app.pro b/app/app.pro
index bc1ab2f..3bb385a 100644
--- a/app/app.pro
+++ b/app/app.pro
@@ -7,7 +7,7 @@ HEADERS = phone.h
SUBDIRS = telephony-binding
CONFIG += link_pkgconfig
-PKGCONFIG += qtappfw
+PKGCONFIG += libhomescreen qlibwindowmanager qtappfw
RESOURCES += \
phone.qrc \
diff --git a/app/main.cpp b/app/main.cpp
index 09e501f..7e56138 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -22,24 +22,16 @@
#include <QtQml/QQmlApplicationEngine>
#include <QtQml/QQmlContext>
#include <QtQuickControls2/QQuickStyle>
-
-#ifdef HAVE_LIBHOMESCREEN
+#include <QQuickWindow>
#include <libhomescreen.hpp>
-#endif
+#include <qlibwindowmanager.h>
#include <telephony.h>
#include "phone.h"
int main(int argc, char *argv[])
{
-#ifdef HAVE_LIBHOMESCREEN
- LibHomeScreen libHomeScreen;
-
- if (!libHomeScreen.renderAppToAreaAllowed(0, 1)) {
- qWarning() << "renderAppToAreaAllowed is denied";
- return -1;
- }
-#endif
+ QString myname = QString("Phone");
QGuiApplication app(argc, argv);
@@ -72,10 +64,46 @@ int main(int argc, char *argv[])
Phone *phone = new Phone(telephony);
context->setContextProperty("phone", phone);
QObject::connect(telephony, &Telephony::callStateChanged, phone, &Phone::onCallStateChanged);
- }
+ std::string token = secret.toStdString();
+ LibHomeScreen* hs = new LibHomeScreen();
+ QLibWindowmanager* qwm = new QLibWindowmanager();
+
+ // WindowManager
+ if(qwm->init(port,secret) != 0){
+ exit(EXIT_FAILURE);
+ }
+ // Request a surface as described in layers.json windowmanager’s file
+ if (qwm->requestSurface(myname) != 0) {
+ exit(EXIT_FAILURE);
+ }
+ // Create an event callback against an event type. Here a lambda is called when SyncDraw event occurs
+ qwm->set_event_handler(QLibWindowmanager::Event_SyncDraw, [qwm, myname](json_object *object) {
+ fprintf(stderr, "Surface got syncDraw!\n");
+ qwm->endDraw(myname);
+ });
- engine.load(QUrl(QStringLiteral("qrc:/Phone.qml")));
+ // HomeScreen
+ hs->init(port, token.c_str());
+ // Set the event handler for Event_TapShortcut which will activate the surface for windowmanager
+ hs->set_event_handler(LibHomeScreen::Event_TapShortcut, [qwm, myname](json_object *object){
+ json_object *appnameJ = nullptr;
+ if(json_object_object_get_ex(object, "application_name", &appnameJ))
+ {
+ const char *appname = json_object_get_string(appnameJ);
+ if(myname == appname)
+ {
+ qDebug("Surface %s got tapShortcut\n", appname);
+ qwm->activateSurface(myname);
+ }
+ }
+ });
+ engine.load(QUrl(QStringLiteral("qrc:/Phone.qml")));
+ QObject *root = engine.rootObjects().first();
+ QQuickWindow *window = qobject_cast<QQuickWindow *>(root);
+ QObject::connect(window, SIGNAL(frameSwapped()), qwm, SLOT(slotActivateSurface()
+ ));
+ }
return app.exec();
}
diff --git a/package/config.xml b/package/config.xml
index 6cff9d8..e716936 100644
--- a/package/config.xml
+++ b/package/config.xml
@@ -7,6 +7,8 @@
<author>Qt</author>
<license>APL 2.0</license>
<feature name="urn:AGL:widget:required-api">
+ <param name="windowmanager" value="ws" />
+ <param name="homescreen" value="ws" />
<param name="lib/libtelephony-binding.so" value="local" />
</feature>
<feature name="urn:AGL:widget:required-permission">