Another large batch of work on the new unified desktop.

1) Get the RootWindow up and functional.
2) Get the lumina-desktop-unified binary functional for starting to test the various pieces (not ready yet for general use)
3) Get the start-lumina-desktop binary setup to launch the new unified binary for testing if the "--unified" flag is used.

1 files changed, 5 insertions, 1 deletions

diff --git a/src-qt5/core/lumina-session/main.cpp b/src-qt5/core/lumina-session/main.cpp
index 0e076ac3..ed391e04 100644
--- a/src-qt5/core/lumina-session/main.cpp
+++ b/src-qt5/core/lumina-session/main.cpp
@@ -24,10 +24,13 @@
 
 int main(int argc, char ** argv)
 {
+    bool unified = false;
     if (argc > 1) {
       if (QString(argv[1]) == QString("--version")){
         qDebug() << LDesktopUtils::LuminaDesktopVersion();
         return 0;
+      }else if(QString(argv[1]) == QString("--unified")){
+        unified = true;
       }
     }
     if(!QFile::exists(LOS::LuminaShare())){
@@ -41,6 +44,7 @@ int main(int argc, char ** argv)
       //No X session found. Go ahead and re-init this binary within an xinit call
       QString prog = QString(argv[0]).section("/",-1);
       LUtils::isValidBinary(prog); //will adjust the path to be absolute
+      if(unified){ prog = prog+" --unified"; }
       QStringList args; args << prog;
       //if(LUtils::isValidBinary("x11vnc")){ args << "--" << "-listen" << "tcp"; } //need to be able to VNC into this session
       return QProcess::execute("xinit", args);
@@ -78,7 +82,7 @@ int main(int argc, char ** argv)
     //Startup the session
     QCoreApplication a(argc, argv);
     LSession sess;
-      sess.start();
+      sess.start(unified);
     int retCode = a.exec();
     qDebug() << "Finished Closing Down Lumina";
     return retCode;