Modify graphic role

[apps/mixer.git] / app / main.cpp

diff --git a/app/main.cpp b/app/main.cpp
index 52a0ff9..bdc0c5f 100644 (file)
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -40,7 +40,7 @@
 
 int main(int argc, char *argv[])
 {
-       QString myname = QString("Mixer");
+       QString graphic_role = QString("mixer");
 
        QGuiApplication app(argc, argv);
 
@@ -81,31 +81,25 @@ int main(int argc, char *argv[])
                if(qwm->init(port,secret) != 0){
                        exit(EXIT_FAILURE);
                }
+               AGLScreenInfo screenInfo(qwm->get_scale_factor());
+               engine.rootContext()->setContextProperty(QStringLiteral("screenInfo"), &screenInfo);
                // Request a surface as described in layers.json windowmanager’s file
-               if (qwm->requestSurface(myname) != 0) {
+               if (qwm->requestSurface(graphic_role) != 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*) {
+            qwm->set_event_handler(QLibWindowmanager::Event_SyncDraw, [qwm, &graphic_role](json_object*) {
                                fprintf(stderr, "Surface got syncDraw!\n");
-                               qwm->endDraw(myname);
+                               qwm->endDraw(graphic_role);
                        });
 
                // 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)
-                               {
-                                       qDebug("Surface %s got tapShortcut\n", appname);
-                                       qwm->activateSurface(myname);
-                               }
-                       }
+               hs->set_event_handler(LibHomeScreen::Event_TapShortcut, [qwm, &graphic_role](json_object *object){
+                       qDebug("Surface %s got tapShortcut\n", graphic_role.toStdString().c_str());
+                       qwm->activateWindow(graphic_role);
                });
 #endif
                engine.load(QUrl(QStringLiteral("qrc:/Mixer.qml")));
@@ -123,7 +117,7 @@ int main(int argc, char *argv[])
                 window->setFlags(window->flags() & ~Qt::FramelessWindowHint); // Remove the borderless flag
                 window->setHeight(QGuiApplication::primaryScreen()->geometry().height());
 #else
-                QObject::connect(window, SIGNAL(frameSwapped()), qwm, SLOT(slotActivateSurface()));
+                QObject::connect(window, SIGNAL(frameSwapped()), qwm, SLOT(slotActivateWindow()));
 #endif
        }
         else