From b7cfcddf4b89d73a4d5e5e854421219c50bf1f9e Mon Sep 17 00:00:00 2001 From: Tasuku Suzuki Date: Wed, 27 Dec 2017 20:32:36 +0900 Subject: Desktop PC development support Add tests if libhomescreen and qlibwindowmanager are available and use them only when they are available. Change-Id: I6b219721b279542bf474f3df34bfb3adbc6e9ff0 Signed-off-by: Tasuku Suzuki --- app/app.pri | 15 ++++ app/app.pro | 3 - app/config.tests/libhomescreen/libhomescreen.pro | 2 +- .../qlibwindowmanager/qlibwindowmanager.cpp | 8 ++ .../qlibwindowmanager/qlibwindowmanager.pro | 5 ++ app/main.cpp | 93 +++++++++++++--------- 6 files changed, 83 insertions(+), 43 deletions(-) create mode 100644 app/config.tests/qlibwindowmanager/qlibwindowmanager.cpp create mode 100644 app/config.tests/qlibwindowmanager/qlibwindowmanager.pro (limited to 'app') diff --git a/app/app.pri b/app/app.pri index e535cbc..590c154 100644 --- a/app/app.pri +++ b/app/app.pri @@ -2,4 +2,19 @@ TEMPLATE = app load(configure) +qtCompileTest(libhomescreen) +qtCompileTest(qlibwindowmanager) + +config_libhomescreen { + CONFIG += link_pkgconfig + PKGCONFIG += libhomescreen + DEFINES += HAVE_LIBHOMESCREEN +} + +config_qlibwindowmanager { + CONFIG += link_pkgconfig + PKGCONFIG += qlibwindowmanager + DEFINES += HAVE_QLIBWINDOWMANAGER +} + DESTDIR = $${OUT_PWD}/../package/root/bin diff --git a/app/app.pro b/app/app.pro index 6cd3ead..da4e8a4 100644 --- a/app/app.pro +++ b/app/app.pro @@ -3,9 +3,6 @@ QT = quick qml SOURCES = main.cpp -CONFIG += link_pkgconfig -PKGCONFIG += libhomescreen libwindowmanager qlibwindowmanager - RESOURCES += \ hvac.qrc \ images/images.qrc diff --git a/app/config.tests/libhomescreen/libhomescreen.pro b/app/config.tests/libhomescreen/libhomescreen.pro index eb4e8f3..7d43112 100644 --- a/app/config.tests/libhomescreen/libhomescreen.pro +++ b/app/config.tests/libhomescreen/libhomescreen.pro @@ -2,4 +2,4 @@ SOURCES = libhomescreen.cpp CONFIG -= qt CONFIG += link_pkgconfig -PKGCONFIG += homescreen +PKGCONFIG += libhomescreen diff --git a/app/config.tests/qlibwindowmanager/qlibwindowmanager.cpp b/app/config.tests/qlibwindowmanager/qlibwindowmanager.cpp new file mode 100644 index 0000000..bb95c93 --- /dev/null +++ b/app/config.tests/qlibwindowmanager/qlibwindowmanager.cpp @@ -0,0 +1,8 @@ +#include + +int main(int argc,char **argv) +{ + QLibWindowmanager qwm; + return 0; +} + diff --git a/app/config.tests/qlibwindowmanager/qlibwindowmanager.pro b/app/config.tests/qlibwindowmanager/qlibwindowmanager.pro new file mode 100644 index 0000000..cb51d98 --- /dev/null +++ b/app/config.tests/qlibwindowmanager/qlibwindowmanager.pro @@ -0,0 +1,5 @@ +SOURCES = qlibwindowmanager.cpp + +CONFIG += qt +CONFIG += link_pkgconfig +PKGCONFIG += qlibwindowmanager diff --git a/app/main.cpp b/app/main.cpp index 574e9a5..b793ef3 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -20,9 +20,14 @@ #include #include #include -#include +#include + +#ifdef HAVE_LIBHOMESCREEN #include +#endif +#ifdef HAVE_QLIBWINDOWMANAGER #include +#endif int main(int argc, char *argv[]) { @@ -42,10 +47,12 @@ int main(int argc, char *argv[]) QStringList positionalArguments = parser.positionalArguments(); QQmlApplicationEngine engine; + QQmlContext *context = engine.rootContext(); + QUrl bindingAddress; + if (positionalArguments.length() == 2) { int port = positionalArguments.takeFirst().toInt(); QString secret = positionalArguments.takeFirst(); - QUrl bindingAddress; bindingAddress.setScheme(QStringLiteral("ws")); bindingAddress.setHost(QStringLiteral("localhost")); bindingAddress.setPort(port); @@ -53,49 +60,57 @@ int main(int argc, char *argv[]) QUrlQuery query; query.addQueryItem(QStringLiteral("token"), secret); bindingAddress.setQuery(query); - QQmlContext *context = engine.rootContext(); - context->setContextProperty(QStringLiteral("bindingAddress"), bindingAddress); + } + context->setContextProperty(QStringLiteral("bindingAddress"), bindingAddress); +#ifdef HAVE_QLIBWINDOWMANAGER + QLibWindowmanager* qwm = new QLibWindowmanager(); - 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 callbnewack 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); + }); +#endif - // 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 callbnewack 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); - }); +#ifdef HAVE_LIBHOMESCREEN + LibHomeScreen* hs = new LibHomeScreen(); - // 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)) + // HomeScreen + std::string token = secret.toStdString(); + 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) { - const char *appname = json_object_get_string(appnameJ); - if(myname == appname) - { - qDebug("Surface %s got tapShortcut\n", appname); - qwm->activateSurface(myname); - } + qDebug("Surface %s got tapShortcut\n", appname); + qwm->activateSurface(myname); } - }); + } + }); +#endif + + engine.load(QUrl(QStringLiteral("qrc:/HVAC.qml"))); + QObject *root = engine.rootObjects().first(); + QQuickWindow *window = qobject_cast(root); +#ifdef HAVE_QLIBWINDOWMANAGER + QObject::connect(window, SIGNAL(frameSwapped()), qwm, SLOT(slotActivateSurface())); +#else + window->resize(1080, 1920 - 218 - 215); + window->setVisible(true); +#endif - engine.load(QUrl(QStringLiteral("qrc:/HVAC.qml"))); - QObject *root = engine.rootObjects().first(); - QQuickWindow *window = qobject_cast(root); - QObject::connect(window, SIGNAL(frameSwapped()), qwm, SLOT(slotActivateSurface() - )); - } return app.exec(); } -- cgit 1.2.3-korg