notebookbar: early init

- read settings from loolwsd.xml
- in case of notebookbar activated send :notebookbar parameter
- for mobile apps I left empty parameter in setupKitEnvironment calls

Change-Id: I5813589564b37eecc1e77c5d0eb737eca5f92f04
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97233
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <[email protected]>
Reviewed-by: Szymon Kłos <[email protected]>

android/lib/src/main/cpp/androidapp.cpp

@@ -45,7 +45,7 @@ JNI_OnLoad(JavaVM* vm, void*) {
         return JNI_ERR; // JNI version not supported.
     }
 
-    setupKitEnvironment();
+    setupKitEnvironment("");
 
     // Uncomment the following to see the logs from the core too
     //setenv("SAL_LOG", "+WARN+INFO", 0);

ios/Mobile/AppDelegate.mm

@@ -185,7 +185,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     if (!trace)
         trace = strdup("warning");
 
-    setupKitEnvironment();
+    setupKitEnvironment("");
 
     Log::initialize("Mobile", trace, false, false, {});
     Util::setThreadName("main");

kit/ForKit.cpp

@@ -52,6 +52,8 @@ static bool SingleKit = false;
 #endif
 #endif
 
+static std::string UserInterface;
+
 static bool DisplayVersion = false;
 static std::string UnitTestLibrary;
 static std::string LogLevel;
@@ -539,6 +541,12 @@ int main(int argc, char** argv)
             LOG_ERR("Security: Running without the ability to filter system calls is ill advised.");
             NoSeccomp = true;
         }
+
+        else if (std::strstr(cmd, "--ui") == cmd)
+        {
+            eq = std::strchr(cmd, '=');
+            UserInterface = std::string(eq+1);
+        }
     }
 
     if (loSubPath.empty() || sysTemplate.empty() ||
@@ -555,7 +563,7 @@ int main(int argc, char** argv)
         return EX_USAGE;
     }
 
-    setupKitEnvironment();
+    setupKitEnvironment(UserInterface);
 
     if (!std::getenv("LD_BIND_NOW")) // must be set by parent.
         LOG_INF("Note: LD_BIND_NOW is not set.");

kit/Kit.cpp

@@ -2505,7 +2505,7 @@ void wakeCallback(void* pData)
 #endif
 }
 
-void setupKitEnvironment()
+void setupKitEnvironment(const std::string& userInterface)
 {
     // Setup & check environment
     const std::string layers(
@@ -2536,6 +2536,10 @@ void setupKitEnvironment()
     if (Log::logger().trace())
         options += ":profile_events";
 #endif
+
+    if (userInterface == "notebookbar")
+        options += ":notebookbar";
+
 //    options += ":sc_no_grid_bg"; // leave this disabled for now, merged-cells needs more work.
     ::setenv("SAL_LOK_OPTIONS", options.c_str(), 0);
 }
@@ -2555,6 +2559,7 @@ void lokit_main(
                 bool displayVersion,
 #else
                 int docBrokerSocket,
+                const std::string& userInterface,
 #endif
                 size_t numericIdentifier
                 )
@@ -2818,7 +2823,7 @@ void lokit_main(
 #ifndef IOS
         // Was not done by the preload.
         // For iOS we call it in -[AppDelegate application: didFinishLaunchingWithOptions:]
-        setupKitEnvironment();
+        setupKitEnvironment(userInterface);
 #endif
 
 #if defined(__linux) && !defined(__ANDROID__)

kit/Kit.hpp

@@ -38,6 +38,7 @@ void lokit_main(
                 bool displayVersion,
 #else
                 int docBrokerSocket,
+                const std::string& userInterface,
 #endif
                 size_t numericIdentifier
                 );
@@ -47,7 +48,7 @@ void runKitLoopInAThread();
 #endif
 
 /// We need to get several env. vars right
-void setupKitEnvironment();
+void setupKitEnvironment(const std::string& userInterface);
 
 bool globalPreinit(const std::string& loTemplate);
 /// Wrapper around private Document::ViewCallback().

wsd/LOOLWSD.cpp

@@ -531,7 +531,7 @@ std::shared_ptr<ChildProcess> getNewChild_Blocks(unsigned mobileAppDocId)
 #endif
                     // Ugly to have that static global LOOLWSD::prisonerServerSocketFD, Otoh we know
                     // there is just one LOOLWSD object. (Even in real Online.)
-                    lokit_main(LOOLWSD::prisonerServerSocketFD, mobileAppDocId);
+                    lokit_main(LOOLWSD::prisonerServerSocketFD, LOOLWSD::UserInterface, mobileAppDocId);
                 }).detach();
 #endif
 
@@ -728,6 +728,7 @@ std::string LOOLWSD::HostIdentifier;
 std::string LOOLWSD::ConfigFile = LOOLWSD_CONFIGDIR "/loolwsd.xml";
 std::string LOOLWSD::ConfigDir = LOOLWSD_CONFIGDIR "/conf.d";
 std::string LOOLWSD::LogLevel = "trace";
+std::string LOOLWSD::UserInterface = "classic";
 bool LOOLWSD::AnonymizeUserData = false;
 bool LOOLWSD::CheckLoolUser = true;
 bool LOOLWSD::IsProxyPrefixEnabled = false;
@@ -999,6 +1000,9 @@ void LOOLWSD::initialize(Application& self)
     // Allow UT to manipulate before using configuration values.
     UnitWSD::get().configure(config());
 
+    // Setup user interface mode
+    UserInterface = getConfigValue<std::string>(conf, "user_interface.mode", "classic");
+
     // Set the log-level after complete initialization to force maximum details at startup.
     LogLevel = getConfigValue<std::string>(conf, "logging.level", "trace");
     setenv("LOOL_LOGLEVEL", LogLevel.c_str(), true);
@@ -1790,6 +1794,8 @@ bool LOOLWSD::createForKit()
     if (NoSeccomp)
         args.push_back("--noseccomp");
 
+    args.push_back("--ui=" + UserInterface);
+
     if (!CheckLoolUser)
         args.push_back("--disable-lool-user-checking");
 
@@ -3493,6 +3499,7 @@ class LOOLWSDServer
            << "\n  CheckLoolUser: " << (LOOLWSD::CheckLoolUser ? "yes" : "no")
            << "\n  IsProxyPrefixEnabled: " << (LOOLWSD::IsProxyPrefixEnabled ? "yes" : "no")
            << "\n  OverrideWatermark: " << LOOLWSD::OverrideWatermark
+           << "\n  UserInterface: " << LOOLWSD::UserInterface
             ;
 
         os << "\nServer poll:\n";

wsd/LOOLWSD.hpp

@@ -230,6 +230,7 @@ class LOOLWSD : public Poco::Util::ServerApplication
     static bool DummyLOK;
     static std::string FuzzFileName;
 #endif
+    static std::string UserInterface;
     static std::string ConfigFile;
     static std::string ConfigDir;
     static std::string SysTemplate;